summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CTAN.sites6
-rw-r--r--FILES.byname801
-rw-r--r--FILES.byname.gzbin2315935 -> 2315816 bytes
-rw-r--r--FILES.last07days676
-rw-r--r--biblio/bibtex/contrib/econ-bst/CHANGES.md33
-rw-r--r--biblio/bibtex/contrib/econ-bst/README.md14
-rw-r--r--biblio/bibtex/contrib/econ-bst/customization/README.md3
-rw-r--r--biblio/bibtex/contrib/econ-bst/customization/cited-part.tex13
-rw-r--r--biblio/bibtex/contrib/econ-bst/customization/econ-a.pdfbin76080 -> 143958 bytes
-rw-r--r--biblio/bibtex/contrib/econ-bst/customization/econ-a.tex1
-rw-r--r--biblio/bibtex/contrib/econ-bst/customization/econ-abbr.pdfbin112011 -> 199485 bytes
-rw-r--r--biblio/bibtex/contrib/econ-bst/customization/econ-abbr.tex1
-rw-r--r--biblio/bibtex/contrib/econ-bst/customization/econ-aea.pdfbin121138 -> 226736 bytes
-rw-r--r--biblio/bibtex/contrib/econ-bst/customization/econ-aea.tex1
-rw-r--r--biblio/bibtex/contrib/econ-bst/customization/econ-b.pdfbin121534 -> 213457 bytes
-rw-r--r--biblio/bibtex/contrib/econ-bst/customization/econ-b.tex1
-rw-r--r--biblio/bibtex/contrib/econ-bst/customization/econ-default.pdfbin112695 -> 200352 bytes
-rw-r--r--biblio/bibtex/contrib/econ-bst/customization/econ-default.tex1
-rw-r--r--biblio/bibtex/contrib/econ-bst/customization/econ-econometrica.pdfbin116350 -> 207437 bytes
-rw-r--r--biblio/bibtex/contrib/econ-bst/customization/econ-econometrica.tex1
-rw-r--r--biblio/bibtex/contrib/econ-bst/customization/econ-jet.pdfbin103734 -> 189836 bytes
-rw-r--r--biblio/bibtex/contrib/econ-bst/customization/econ-jet.tex1
-rw-r--r--biblio/bibtex/contrib/econ-bst/customization/econ-jie.tex1
-rw-r--r--biblio/bibtex/contrib/econ-bst/customization/econ-jpe.pdfbin110347 -> 199002 bytes
-rw-r--r--biblio/bibtex/contrib/econ-bst/customization/econ-jpe.tex1
-rw-r--r--biblio/bibtex/contrib/econ-bst/customization/econ-no-sort.pdfbin111927 -> 199606 bytes
-rw-r--r--biblio/bibtex/contrib/econ-bst/customization/econ-no-sort.tex1
-rw-r--r--biblio/bibtex/contrib/econ-bst/customization/econ-numbers.pdfbin111368 -> 198716 bytes
-rw-r--r--biblio/bibtex/contrib/econ-bst/customization/econ-numbers.tex1
-rw-r--r--biblio/bibtex/contrib/econ-bst/customization/econ-old.pdfbin113122 -> 201072 bytes
-rw-r--r--biblio/bibtex/contrib/econ-bst/customization/econ-old.tex1
-rw-r--r--biblio/bibtex/contrib/econ-bst/econ-a.bst200
-rw-r--r--biblio/bibtex/contrib/econ-bst/econ-abbr.bst200
-rw-r--r--biblio/bibtex/contrib/econ-bst/econ-aea.bst214
-rw-r--r--biblio/bibtex/contrib/econ-bst/econ-b.bst202
-rw-r--r--biblio/bibtex/contrib/econ-bst/econ-econometrica.bst208
-rw-r--r--biblio/bibtex/contrib/econ-bst/econ-example.bib142
-rw-r--r--biblio/bibtex/contrib/econ-bst/econ-example.pdfbin190003 -> 305652 bytes
-rw-r--r--biblio/bibtex/contrib/econ-bst/econ-example.tex96
-rw-r--r--biblio/bibtex/contrib/econ-bst/econ-jet.bst202
-rw-r--r--biblio/bibtex/contrib/econ-bst/econ-jie.bst202
-rw-r--r--biblio/bibtex/contrib/econ-bst/econ-jpe.bst210
-rw-r--r--biblio/bibtex/contrib/econ-bst/econ-no-sort.bst200
-rw-r--r--biblio/bibtex/contrib/econ-bst/econ-old.bst1
-rw-r--r--biblio/bibtex/contrib/econ-bst/econ.bst200
-rw-r--r--macros/generic/expkv-cs/README.md2
-rw-r--r--macros/generic/expkv-cs/expkv-cs.dtx290
-rw-r--r--macros/generic/expkv-cs/expkv-cs.pdfbin346046 -> 363784 bytes
-rw-r--r--macros/generic/expkv-def/README.md2
-rw-r--r--macros/generic/expkv-def/expkv-def.dtx149
-rw-r--r--macros/generic/expkv-def/expkv-def.pdfbin390122 -> 406256 bytes
-rw-r--r--macros/generic/expkv/README.md2
-rw-r--r--macros/generic/expkv/expkv.dtx559
-rw-r--r--macros/generic/expkv/expkv.pdfbin444584 -> 481077 bytes
-rw-r--r--macros/latex/contrib/huawei/README.md9
-rw-r--r--macros/latex/contrib/huawei/huawei.cls12
-rw-r--r--macros/latex/contrib/huawei/huawei.pdfbin362961 -> 363871 bytes
-rw-r--r--macros/latex/contrib/huawei/huawei.tex34
-rw-r--r--macros/latex/contrib/huawei/images/huawei-cover.pdfbin0 -> 253724 bytes
-rw-r--r--macros/latex/contrib/huawei/samples/huawei-cfp.tex53
-rw-r--r--macros/latex/contrib/huawei/samples/huawei-charter.tex67
-rw-r--r--macros/latex/contrib/lwarp/README.txt2
-rw-r--r--macros/latex/contrib/lwarp/lwarp.dtx990
-rw-r--r--macros/latex/contrib/lwarp/lwarp.ins6
-rw-r--r--macros/latex/contrib/lwarp/lwarp.pdfbin3184136 -> 3202256 bytes
-rwxr-xr-xmacros/latex/contrib/lwarp/lwarpmk.lua2
-rw-r--r--macros/latex/contrib/ninecolors/ninecolors.pdfbin32345 -> 32344 bytes
-rw-r--r--macros/latex/contrib/ninecolors/ninecolors.sty3
-rw-r--r--macros/latex/contrib/ninecolors/ninecolors.tex2
-rw-r--r--macros/latex/contrib/pbalance/pbalance.dtx10
-rw-r--r--macros/latex/contrib/pbalance/pbalance.pdfbin242707 -> 242951 bytes
-rw-r--r--macros/latex/contrib/siunitx/CHANGELOG.md15
-rw-r--r--macros/latex/contrib/siunitx/siunitx-code.pdfbin1441845 -> 1443594 bytes
-rw-r--r--macros/latex/contrib/siunitx/siunitx-compound.dtx67
-rw-r--r--macros/latex/contrib/siunitx/siunitx-emulation.dtx3
-rw-r--r--macros/latex/contrib/siunitx/siunitx-number.dtx6
-rw-r--r--macros/latex/contrib/siunitx/siunitx-print.dtx75
-rw-r--r--macros/latex/contrib/siunitx/siunitx-table.dtx4
-rw-r--r--macros/latex/contrib/siunitx/siunitx.dtx2
-rw-r--r--macros/latex/contrib/siunitx/siunitx.pdfbin605308 -> 598400 bytes
-rw-r--r--macros/latex/contrib/siunitx/siunitx.tex2
-rw-r--r--macros/latex/contrib/springer/sr-vorl/README2
-rw-r--r--macros/latex/contrib/springer/sr-vorl/sr-vorl.dtx538
-rw-r--r--macros/latex/contrib/springer/sr-vorl/sr-vorl.pdfbin446965 -> 451934 bytes
-rw-r--r--macros/latex/contrib/suftesi/suftesi.dtx2868
-rw-r--r--macros/latex/contrib/suftesi/suftesi.pdfbin841881 -> 837570 bytes
-rw-r--r--systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl4
-rw-r--r--systems/texlive/tlnet/tlpkg/texlive.tlpdb187
-rw-r--r--systems/texlive/tlnet/tlpkg/texlive.tlpdb.md52
-rw-r--r--systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha5122
-rw-r--r--systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc14
-rw-r--r--systems/texlive/tlnet/tlpkg/texlive.tlpdb.xzbin2307844 -> 2308016 bytes
-rw-r--r--systems/win32/miktex/setup/deb/dists/bionic/InRelease40
-rw-r--r--systems/win32/miktex/setup/deb/dists/bionic/Release26
-rw-r--r--systems/win32/miktex/setup/deb/dists/bionic/Release.gpg14
-rw-r--r--systems/win32/miktex/setup/deb/dists/bionic/universe/Contents-amd64.gzbin1868 -> 1510 bytes
-rw-r--r--systems/win32/miktex/setup/deb/dists/bionic/universe/binary-amd64/Packages48
-rw-r--r--systems/win32/miktex/setup/deb/dists/bionic/universe/binary-amd64/Packages.bz2bin2237 -> 1778 bytes
-rw-r--r--systems/win32/miktex/setup/deb/dists/bionic/universe/binary-amd64/Packages.gzbin1849 -> 1490 bytes
-rw-r--r--systems/win32/miktex/setup/deb/dists/buster/InRelease40
-rw-r--r--systems/win32/miktex/setup/deb/dists/buster/Release26
-rw-r--r--systems/win32/miktex/setup/deb/dists/buster/Release.gpg14
-rw-r--r--systems/win32/miktex/setup/deb/dists/buster/universe/Contents-amd64.gzbin1868 -> 1510 bytes
-rw-r--r--systems/win32/miktex/setup/deb/dists/buster/universe/binary-amd64/Packages48
-rw-r--r--systems/win32/miktex/setup/deb/dists/buster/universe/binary-amd64/Packages.bz2bin2304 -> 1820 bytes
-rw-r--r--systems/win32/miktex/setup/deb/dists/buster/universe/binary-amd64/Packages.gzbin1891 -> 1539 bytes
-rw-r--r--systems/win32/miktex/setup/deb/dists/focal/InRelease40
-rw-r--r--systems/win32/miktex/setup/deb/dists/focal/Release26
-rw-r--r--systems/win32/miktex/setup/deb/dists/focal/Release.gpg14
-rw-r--r--systems/win32/miktex/setup/deb/dists/focal/universe/Contents-amd64.gzbin1764 -> 1510 bytes
-rw-r--r--systems/win32/miktex/setup/deb/dists/focal/universe/binary-amd64/Packages22
-rw-r--r--systems/win32/miktex/setup/deb/dists/focal/universe/binary-amd64/Packages.bz2bin2107 -> 2003 bytes
-rw-r--r--systems/win32/miktex/setup/deb/dists/focal/universe/binary-amd64/Packages.gzbin1757 -> 1633 bytes
-rw-r--r--systems/win32/miktex/setup/deb/dists/stretch/InRelease40
-rw-r--r--systems/win32/miktex/setup/deb/dists/stretch/Release26
-rw-r--r--systems/win32/miktex/setup/deb/dists/stretch/Release.gpg14
-rw-r--r--systems/win32/miktex/setup/deb/dists/stretch/universe/Contents-amd64.gzbin1868 -> 1510 bytes
-rw-r--r--systems/win32/miktex/setup/deb/dists/stretch/universe/binary-amd64/Packages48
-rw-r--r--systems/win32/miktex/setup/deb/dists/stretch/universe/binary-amd64/Packages.bz2bin2303 -> 1803 bytes
-rw-r--r--systems/win32/miktex/setup/deb/dists/stretch/universe/binary-amd64/Packages.gzbin1885 -> 1532 bytes
-rw-r--r--systems/win32/miktex/setup/deb/dists/xenial/InRelease40
-rw-r--r--systems/win32/miktex/setup/deb/dists/xenial/Release26
-rw-r--r--systems/win32/miktex/setup/deb/dists/xenial/Release.gpg14
-rw-r--r--systems/win32/miktex/setup/deb/dists/xenial/universe/Contents-amd64.gzbin1868 -> 1510 bytes
-rw-r--r--systems/win32/miktex/setup/deb/dists/xenial/universe/binary-amd64/Packages48
-rw-r--r--systems/win32/miktex/setup/deb/dists/xenial/universe/binary-amd64/Packages.bz2bin2256 -> 1794 bytes
-rw-r--r--systems/win32/miktex/setup/deb/dists/xenial/universe/binary-amd64/Packages.gzbin1845 -> 1490 bytes
-rw-r--r--systems/win32/miktex/tm/packages/next/files.csv.lzmabin576226 -> 576227 bytes
-rw-r--r--systems/win32/miktex/tm/packages/next/pr.ini8
-rw-r--r--systems/win32/miktex/tm/packages/pr.ini8
-rw-r--r--timestamp2
131 files changed, 6411 insertions, 4041 deletions
diff --git a/CTAN.sites b/CTAN.sites
index 327ea4f29a..ca70a2b109 100644
--- a/CTAN.sites
+++ b/CTAN.sites
@@ -356,6 +356,12 @@ by country):
URL: ftp://ftp.gust.org.pl/TeX/
URL: https://ftp.gust.org.pl/TeX/
+ repo.skni.umcs.pl (Poland)
+ URL: ftp://repo.skni.umcs.pl/ctan/
+ URL: http://repo.skni.umcs.pl/ctan/
+ URL: rsync://repo.skni.umcs.pl/ctan/
+ URL: https://repo.skni.umcs.pl/ctan/
+
sunsite.icm.edu.pl (Poland)
URL: ftp://sunsite.icm.edu.pl/pub/CTAN/
URL: https://sunsite.icm.edu.pl/pub/CTAN/
diff --git a/FILES.byname b/FILES.byname
index c171275477..f037c112ea 100644
--- a/FILES.byname
+++ b/FILES.byname
@@ -307,48 +307,48 @@
2006/05/22 | 446643 | biblio/bibtex/contrib/dk-bib.zip
2007/01/10 | 533445 | biblio/bibtex/contrib/doc/btxFAQ.pdf
2007/01/10 | 1504 | biblio/bibtex/contrib/doc/README
-2020/03/03 | 10969 | biblio/bibtex/contrib/econ-bst/CHANGES.md
-2020/03/03 | 2131 | biblio/bibtex/contrib/econ-bst/customization/cited-part.tex
-2020/03/03 | 112011 | biblio/bibtex/contrib/econ-bst/customization/econ-abbr.pdf
-2020/03/03 | 1508 | biblio/bibtex/contrib/econ-bst/customization/econ-abbr.tex
-2020/03/03 | 121138 | biblio/bibtex/contrib/econ-bst/customization/econ-aea.pdf
-2020/03/03 | 1590 | biblio/bibtex/contrib/econ-bst/customization/econ-aea.tex
-2020/03/03 | 76080 | biblio/bibtex/contrib/econ-bst/customization/econ-a.pdf
-2020/03/03 | 1383 | biblio/bibtex/contrib/econ-bst/customization/econ-a.tex
-2020/03/03 | 121534 | biblio/bibtex/contrib/econ-bst/customization/econ-b.pdf
-2020/03/03 | 1383 | biblio/bibtex/contrib/econ-bst/customization/econ-b.tex
-2020/03/03 | 112695 | biblio/bibtex/contrib/econ-bst/customization/econ-default.pdf
-2020/03/03 | 1425 | biblio/bibtex/contrib/econ-bst/customization/econ-default.tex
-2020/03/03 | 116350 | biblio/bibtex/contrib/econ-bst/customization/econ-econometrica.pdf
-2020/03/03 | 1456 | biblio/bibtex/contrib/econ-bst/customization/econ-econometrica.tex
-2020/03/03 | 103734 | biblio/bibtex/contrib/econ-bst/customization/econ-jet.pdf
-2020/03/03 | 1459 | biblio/bibtex/contrib/econ-bst/customization/econ-jet.tex
-2020/03/03 | 1453 | biblio/bibtex/contrib/econ-bst/customization/econ-jie.tex
-2020/03/03 | 110347 | biblio/bibtex/contrib/econ-bst/customization/econ-jpe.pdf
-2020/03/03 | 1446 | biblio/bibtex/contrib/econ-bst/customization/econ-jpe.tex
-2020/03/03 | 111927 | biblio/bibtex/contrib/econ-bst/customization/econ-no-sort.pdf
-2020/03/03 | 1496 | biblio/bibtex/contrib/econ-bst/customization/econ-no-sort.tex
-2020/03/03 | 111368 | biblio/bibtex/contrib/econ-bst/customization/econ-numbers.pdf
-2020/03/03 | 2184 | biblio/bibtex/contrib/econ-bst/customization/econ-numbers.tex
-2020/03/03 | 113122 | biblio/bibtex/contrib/econ-bst/customization/econ-old.pdf
-2020/03/03 | 1428 | biblio/bibtex/contrib/econ-bst/customization/econ-old.tex
-2020/03/03 | 2879 | biblio/bibtex/contrib/econ-bst/customization/README.md
-2020/03/03 | 114128 | biblio/bibtex/contrib/econ-bst/econ-abbr.bst
-2020/03/03 | 83001 | biblio/bibtex/contrib/econ-bst/econ-a.bst
-2020/03/03 | 83221 | biblio/bibtex/contrib/econ-bst/econ-aea.bst
-2020/03/03 | 83135 | biblio/bibtex/contrib/econ-bst/econ-b.bst
-2020/03/03 | 82814 | biblio/bibtex/contrib/econ-bst/econ.bst
-2020/03/03 | 84370 | biblio/bibtex/contrib/econ-bst/econ-econometrica.bst
-2020/03/03 | 35068 | biblio/bibtex/contrib/econ-bst/econ-example.bib
-2020/03/03 | 190003 | biblio/bibtex/contrib/econ-bst/econ-example.pdf
-2020/03/03 | 30768 | biblio/bibtex/contrib/econ-bst/econ-example.tex
-2020/03/03 | 114012 | biblio/bibtex/contrib/econ-bst/econ-jet.bst
-2020/03/03 | 82760 | biblio/bibtex/contrib/econ-bst/econ-jie.bst
-2020/03/03 | 115988 | biblio/bibtex/contrib/econ-bst/econ-jpe.bst
-2020/03/03 | 82814 | biblio/bibtex/contrib/econ-bst/econ-no-sort.bst
-2020/03/03 | 82738 | biblio/bibtex/contrib/econ-bst/econ-old.bst
-2020/03/03 | 2689 | biblio/bibtex/contrib/econ-bst/README.md
-2020/03/03 | 1600999 | biblio/bibtex/contrib/econ-bst.zip
+2021/05/25 | 11920 | biblio/bibtex/contrib/econ-bst/CHANGES.md
+2021/05/25 | 2558 | biblio/bibtex/contrib/econ-bst/customization/cited-part.tex
+2021/05/25 | 199485 | biblio/bibtex/contrib/econ-bst/customization/econ-abbr.pdf
+2021/05/25 | 1529 | biblio/bibtex/contrib/econ-bst/customization/econ-abbr.tex
+2021/05/25 | 226736 | biblio/bibtex/contrib/econ-bst/customization/econ-aea.pdf
+2021/05/25 | 1611 | biblio/bibtex/contrib/econ-bst/customization/econ-aea.tex
+2021/05/25 | 143958 | biblio/bibtex/contrib/econ-bst/customization/econ-a.pdf
+2021/05/25 | 1404 | biblio/bibtex/contrib/econ-bst/customization/econ-a.tex
+2021/05/25 | 213457 | biblio/bibtex/contrib/econ-bst/customization/econ-b.pdf
+2021/05/25 | 1404 | biblio/bibtex/contrib/econ-bst/customization/econ-b.tex
+2021/05/25 | 200352 | biblio/bibtex/contrib/econ-bst/customization/econ-default.pdf
+2021/05/25 | 1446 | biblio/bibtex/contrib/econ-bst/customization/econ-default.tex
+2021/05/25 | 207437 | biblio/bibtex/contrib/econ-bst/customization/econ-econometrica.pdf
+2021/05/25 | 1477 | biblio/bibtex/contrib/econ-bst/customization/econ-econometrica.tex
+2021/05/25 | 189836 | biblio/bibtex/contrib/econ-bst/customization/econ-jet.pdf
+2021/05/25 | 1480 | biblio/bibtex/contrib/econ-bst/customization/econ-jet.tex
+2021/05/25 | 1474 | biblio/bibtex/contrib/econ-bst/customization/econ-jie.tex
+2021/05/25 | 199002 | biblio/bibtex/contrib/econ-bst/customization/econ-jpe.pdf
+2021/05/25 | 1467 | biblio/bibtex/contrib/econ-bst/customization/econ-jpe.tex
+2021/05/25 | 199606 | biblio/bibtex/contrib/econ-bst/customization/econ-no-sort.pdf
+2021/05/25 | 1517 | biblio/bibtex/contrib/econ-bst/customization/econ-no-sort.tex
+2021/05/25 | 198716 | biblio/bibtex/contrib/econ-bst/customization/econ-numbers.pdf
+2021/05/25 | 2205 | biblio/bibtex/contrib/econ-bst/customization/econ-numbers.tex
+2021/05/25 | 201072 | biblio/bibtex/contrib/econ-bst/customization/econ-old.pdf
+2021/05/25 | 1449 | biblio/bibtex/contrib/econ-bst/customization/econ-old.tex
+2021/05/24 | 3018 | biblio/bibtex/contrib/econ-bst/customization/README.md
+2021/05/25 | 115702 | biblio/bibtex/contrib/econ-bst/econ-abbr.bst
+2021/05/25 | 84575 | biblio/bibtex/contrib/econ-bst/econ-a.bst
+2021/05/25 | 84892 | biblio/bibtex/contrib/econ-bst/econ-aea.bst
+2021/05/25 | 84709 | biblio/bibtex/contrib/econ-bst/econ-b.bst
+2021/05/25 | 84388 | biblio/bibtex/contrib/econ-bst/econ.bst
+2021/05/25 | 86019 | biblio/bibtex/contrib/econ-bst/econ-econometrica.bst
+2021/05/24 | 40885 | biblio/bibtex/contrib/econ-bst/econ-example.bib
+2021/05/25 | 305652 | biblio/bibtex/contrib/econ-bst/econ-example.pdf
+2021/05/25 | 33772 | biblio/bibtex/contrib/econ-bst/econ-example.tex
+2021/05/25 | 115588 | biblio/bibtex/contrib/econ-bst/econ-jet.bst
+2021/05/25 | 84324 | biblio/bibtex/contrib/econ-bst/econ-jie.bst
+2021/05/25 | 117644 | biblio/bibtex/contrib/econ-bst/econ-jpe.bst
+2021/05/25 | 84388 | biblio/bibtex/contrib/econ-bst/econ-no-sort.bst
+2021/05/25 | 82760 | biblio/bibtex/contrib/econ-bst/econ-old.bst
+2021/05/25 | 1634 | biblio/bibtex/contrib/econ-bst/README.md
+2021/05/24 | 2685056 | biblio/bibtex/contrib/econ-bst.zip
2008/09/22 | 26812 | biblio/bibtex/contrib/economic/aer.bst
2008/09/22 | 14828 | biblio/bibtex/contrib/economic/aer-cje-ex.bib
2008/12/31 | 920 | biblio/bibtex/contrib/economic/aer-cje-ex.tex
@@ -5087,7 +5087,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
-2021/05/23 | 124543 | FILES.last07days
+2021/05/24 | 129113 | FILES.last07days
2020/08/14 | 104065 | fonts/academicons/academicons.pdf
2020/08/14 | 17247 | fonts/academicons/academicons.sty
2020/08/14 | 6546 | fonts/academicons/academicons.tex
@@ -172811,9 +172811,9 @@
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/04/12 | 362710 | install/macros/generic/expkv-cs.tds.zip
-2021/04/10 | 404359 | install/macros/generic/expkv-def.tds.zip
-2021/04/12 | 465298 | install/macros/generic/expkv.tds.zip
+2021/05/24 | 379753 | install/macros/generic/expkv-cs.tds.zip
+2021/05/24 | 418865 | install/macros/generic/expkv-def.tds.zip
+2021/05/24 | 503688 | install/macros/generic/expkv.tds.zip
2020/03/06 | 222075 | install/macros/generic/iftex.tds.zip
2012/09/20 | 321508 | install/macros/generic/langcode.tds.zip
2020/09/14 | 619816 | install/macros/generic/markdown.tds.zip
@@ -173000,7 +173000,7 @@
2012/05/03 | 406018 | install/macros/latex/contrib/lstaddons.tds.zip
2011/03/25 | 10183 | install/macros/latex/contrib/ltxdockit.tds.zip
2021/02/18 | 340623 | install/macros/latex/contrib/luacolor.tds.zip
-2021/04/08 | 4221936 | install/macros/latex/contrib/lwarp.tds.zip
+2021/05/24 | 4247690 | install/macros/latex/contrib/lwarp.tds.zip
2019/11/29 | 336437 | install/macros/latex/contrib/magicnum.tds.zip
2009/09/03 | 125014 | install/macros/latex/contrib/makecmds.tds.zip
2018/08/09 | 330020 | install/macros/latex/contrib/marginnote.tds.zip
@@ -173081,7 +173081,7 @@
2012/09/24 | 130991 | install/macros/latex/contrib/scrjrnl.tds.zip
2020/02/15 | 1097592 | install/macros/latex/contrib/sdaps.tds.zip
2019/12/10 | 544332 | install/macros/latex/contrib/selinput.tds.zip
-2021/05/21 | 2199205 | install/macros/latex/contrib/siunitx.tds.zip
+2021/05/24 | 2193308 | install/macros/latex/contrib/siunitx.tds.zip
2019/10/15 | 315856 | install/macros/latex/contrib/skmath.tds.zip
2019/10/16 | 345652 | install/macros/latex/contrib/skrapport.tds.zip
2019/12/15 | 357584 | install/macros/latex/contrib/soulutf8.tds.zip
@@ -173094,7 +173094,7 @@
2019/03/20 | 7942984 | install/macros/latex/contrib/stex.tds.zip
2011/12/21 | 204538 | install/macros/latex/contrib/storebox.tds.zip
2019/11/30 | 800764 | install/macros/latex/contrib/stringenc.tds.zip
-2021/05/20 | 1577056 | install/macros/latex/contrib/suftesi.tds.zip
+2021/05/24 | 1572245 | install/macros/latex/contrib/suftesi.tds.zip
2012/05/06 | 463336 | install/macros/latex/contrib/svn-multi.tds.zip
2010/04/24 | 261363 | install/macros/latex/contrib/svn-prov.tds.zip
2014/05/20 | 721827 | install/macros/latex/contrib/sympytexpackage.tds.zip
@@ -187035,23 +187035,23 @@
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/04/12 | 78261 | macros/generic/expkv-cs/expkv-cs.dtx
-2021/04/12 | 346046 | macros/generic/expkv-cs/expkv-cs.pdf
-2021/04/12 | 1296 | macros/generic/expkv-cs/README.md
-2021/04/12 | 356836 | macros/generic/expkv-cs.zip
-2021/04/10 | 75043 | macros/generic/expkv-def/expkv-def.dtx
-2021/04/10 | 390122 | macros/generic/expkv-def/expkv-def.pdf
-2021/04/10 | 1268 | macros/generic/expkv-def/README.md
-2021/04/10 | 397792 | macros/generic/expkv-def.zip
-2021/04/12 | 96122 | macros/generic/expkv/expkv.dtx
-2021/04/12 | 444584 | macros/generic/expkv/expkv.pdf
+2021/05/24 | 84163 | macros/generic/expkv-cs/expkv-cs.dtx
+2021/05/24 | 363784 | macros/generic/expkv-cs/expkv-cs.pdf
+2021/05/24 | 1296 | macros/generic/expkv-cs/README.md
+2021/05/24 | 373867 | macros/generic/expkv-cs.zip
+2021/05/24 | 78490 | macros/generic/expkv-def/expkv-def.dtx
+2021/05/24 | 406256 | macros/generic/expkv-def/expkv-def.pdf
+2021/05/24 | 1269 | macros/generic/expkv-def/README.md
+2021/05/24 | 412328 | macros/generic/expkv-def.zip
+2021/05/24 | 109400 | macros/generic/expkv/expkv.dtx
+2021/05/24 | 481077 | macros/generic/expkv/expkv.pdf
2021/04/05 | 29651 | macros/generic/expkv-opt/expkv-opt-2020-10-10.dtx
2021/04/05 | 33095 | macros/generic/expkv-opt/expkv-opt.dtx
2021/04/05 | 268534 | macros/generic/expkv-opt/expkv-opt.pdf
2021/04/05 | 1126 | macros/generic/expkv-opt/README.md
2021/04/05 | 279098 | macros/generic/expkv-opt.zip
-2021/04/12 | 1431 | macros/generic/expkv/README.md
-2021/04/12 | 459616 | macros/generic/expkv.zip
+2021/05/24 | 1430 | macros/generic/expkv/README.md
+2021/05/24 | 497557 | macros/generic/expkv.zip
2007/04/19 | 1285 | macros/generic/fenixpar/fenixpar.sty
2011/11/18 | 8382 | macros/generic/fenixpar/fenixtok.sty
2011/11/18 | 312 | macros/generic/fenixpar/README
@@ -202042,11 +202042,14 @@
2011/04/29 | 319943 | macros/latex/contrib/hrefhide/hrefhide.pdf
2011/04/29 | 4295 | macros/latex/contrib/hrefhide/README
2011/04/29 | 441688 | macros/latex/contrib/hrefhide.zip
-2021/05/13 | 16393 | macros/latex/contrib/huawei/huawei.cls
-2021/05/13 | 362961 | macros/latex/contrib/huawei/huawei.pdf
-2021/05/13 | 6749 | macros/latex/contrib/huawei/huawei.tex
-2021/05/13 | 1208 | macros/latex/contrib/huawei/README.md
-2021/05/13 | 372353 | macros/latex/contrib/huawei.zip
+2021/05/24 | 16621 | macros/latex/contrib/huawei/huawei.cls
+2021/05/24 | 363871 | macros/latex/contrib/huawei/huawei.pdf
+2021/05/24 | 8002 | macros/latex/contrib/huawei/huawei.tex
+2021/05/24 | 253724 | macros/latex/contrib/huawei/images/huawei-cover.pdf
+2021/05/24 | 1362 | macros/latex/contrib/huawei/README.md
+2021/05/24 | 1934 | macros/latex/contrib/huawei/samples/huawei-cfp.tex
+2021/05/24 | 2054 | macros/latex/contrib/huawei/samples/huawei-charter.tex
+2021/05/24 | 630208 | macros/latex/contrib/huawei.zip
2020/11/03 | 174943 | macros/latex/contrib/hulipsum/hulipsum.dtx
2020/11/01 | 1704 | macros/latex/contrib/hulipsum/hulipsum.ins
2020/11/03 | 145394 | macros/latex/contrib/hulipsum/hulipsum.pdf
@@ -204915,15 +204918,15 @@
1999/06/10 | 980 | macros/latex/contrib/lucold/t1hlos.fd
1999/05/25 | 407 | macros/latex/contrib/lucold/test.tex
2005/04/30 | 25682 | macros/latex/contrib/lucold.zip
-2021/04/08 | 719 | macros/latex/contrib/lwarp/lwarp_baseline_marker.eps
-2021/04/08 | 89 | macros/latex/contrib/lwarp/lwarp_baseline_marker.png
-2021/04/08 | 2713677 | macros/latex/contrib/lwarp/lwarp.dtx
-2021/04/08 | 32733 | macros/latex/contrib/lwarp/lwarp.ins
-2021/04/08 | 29001 | macros/latex/contrib/lwarp/lwarpmk.lua
-2021/04/08 | 3184136 | macros/latex/contrib/lwarp/lwarp.pdf
-2021/04/08 | 2947 | macros/latex/contrib/lwarp/lwarp_tutorial.txt
-2021/04/08 | 1624 | macros/latex/contrib/lwarp/README.txt
-2021/04/08 | 3645731 | macros/latex/contrib/lwarp.zip
+2021/05/24 | 719 | macros/latex/contrib/lwarp/lwarp_baseline_marker.eps
+2021/05/24 | 89 | macros/latex/contrib/lwarp/lwarp_baseline_marker.png
+2021/05/24 | 2728530 | macros/latex/contrib/lwarp/lwarp.dtx
+2021/05/24 | 33073 | macros/latex/contrib/lwarp/lwarp.ins
+2021/05/24 | 29001 | macros/latex/contrib/lwarp/lwarpmk.lua
+2021/05/24 | 3202256 | macros/latex/contrib/lwarp/lwarp.pdf
+2021/05/24 | 2947 | macros/latex/contrib/lwarp/lwarp_tutorial.txt
+2021/05/24 | 1624 | macros/latex/contrib/lwarp/README.txt
+2021/05/24 | 3667099 | macros/latex/contrib/lwarp.zip
2006/09/11 | 4093 | macros/latex/contrib/lyx/sikumuna/article-sikumuna.layout
2006/09/11 | 781 | macros/latex/contrib/lyx/sikumuna/README
2006/09/11 | 1806 | macros/latex/contrib/lyx/sikumuna.zip
@@ -206887,11 +206890,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/07 | 32345 | macros/latex/contrib/ninecolors/ninecolors.pdf
-2021/05/07 | 16523 | macros/latex/contrib/ninecolors/ninecolors.sty
-2021/05/07 | 4921 | macros/latex/contrib/ninecolors/ninecolors.tex
+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/07 | 35599 | macros/latex/contrib/ninecolors.zip
+2021/05/24 | 35632 | 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
@@ -207851,12 +207854,12 @@
1998/01/16 | 939 | macros/latex/contrib/pawpict/README
2005/04/30 | 11803 | macros/latex/contrib/pawpict.zip
2012/04/23 | 6491 | macros/latex/contrib/pax/README
-2021/04/27 | 538 | macros/latex/contrib/pbalance/LICENSE
-2021/04/27 | 40134 | macros/latex/contrib/pbalance/pbalance.dtx
-2021/04/27 | 2071 | macros/latex/contrib/pbalance/pbalance.ins
-2021/04/27 | 242707 | macros/latex/contrib/pbalance/pbalance.pdf
-2021/04/27 | 898 | macros/latex/contrib/pbalance/README.md
-2021/05/06 | 256210 | macros/latex/contrib/pbalance.zip
+2021/05/24 | 538 | macros/latex/contrib/pbalance/LICENSE
+2021/05/24 | 40223 | macros/latex/contrib/pbalance/pbalance.dtx
+2021/05/24 | 2071 | macros/latex/contrib/pbalance/pbalance.ins
+2021/05/24 | 242951 | macros/latex/contrib/pbalance/pbalance.pdf
+2021/05/24 | 898 | macros/latex/contrib/pbalance/README.md
+2021/05/24 | 256471 | macros/latex/contrib/pbalance.zip
1998/10/20 | 17982 | macros/latex/contrib/pb-diagram/COPYING
1997/01/26 | 23407 | macros/latex/contrib/pb-diagram/lamsarrow.sty
1998/11/30 | 35960 | macros/latex/contrib/pb-diagram/pb-diagram.sty
@@ -211718,33 +211721,33 @@
2007/12/02 | 2971 | macros/latex/contrib/SIunits/SIunits.ins
2007/12/02 | 328621 | macros/latex/contrib/SIunits/SIunits.pdf
2007/12/02 | 296391 | macros/latex/contrib/SIunits.zip
-2021/05/21 | 39406 | macros/latex/contrib/siunitx/CHANGELOG.md
-2021/05/21 | 964 | macros/latex/contrib/siunitx/README.md
-2021/05/21 | 10106 | macros/latex/contrib/siunitx/siunitx-abbreviation.dtx
-2021/05/21 | 4748 | macros/latex/contrib/siunitx/siunitx-abbreviations.cfg
-2021/05/21 | 16529 | macros/latex/contrib/siunitx/siunitx-angle.dtx
-2021/05/21 | 1729 | macros/latex/contrib/siunitx/siunitx-binary.cfg
-2021/05/21 | 2883 | macros/latex/contrib/siunitx/siunitx-binary.dtx
-2021/05/21 | 1441845 | macros/latex/contrib/siunitx/siunitx-code.pdf
-2021/05/21 | 2426 | macros/latex/contrib/siunitx/siunitx-code.tex
-2021/05/21 | 8762 | macros/latex/contrib/siunitx/siunitx-command.dtx
-2021/05/21 | 25719 | macros/latex/contrib/siunitx/siunitx-complex.dtx
-2021/05/21 | 31368 | macros/latex/contrib/siunitx/siunitx-compound.dtx
-2021/05/21 | 19541 | macros/latex/contrib/siunitx/siunitx.dtx
-2021/05/21 | 27620 | macros/latex/contrib/siunitx/siunitx-emulation.dtx
-2021/05/21 | 3687 | macros/latex/contrib/siunitx/siunitx.ins
-2021/05/21 | 4629 | macros/latex/contrib/siunitx/siunitx-locale.dtx
-2021/05/21 | 113800 | macros/latex/contrib/siunitx/siunitx-number.dtx
-2021/05/21 | 605308 | macros/latex/contrib/siunitx/siunitx.pdf
-2021/05/21 | 31335 | macros/latex/contrib/siunitx/siunitx-print.dtx
-2021/05/21 | 14351 | macros/latex/contrib/siunitx/siunitx-quantity.dtx
-2021/05/21 | 10045 | macros/latex/contrib/siunitx/siunitx-symbol.dtx
-2021/05/21 | 47497 | macros/latex/contrib/siunitx/siunitx-table.dtx
-2021/05/21 | 138579 | macros/latex/contrib/siunitx/siunitx.tex
-2021/05/21 | 96848 | macros/latex/contrib/siunitx/siunitx-unit.dtx
-2021/05/21 | 273398 | macros/latex/contrib/siunitx/siunitx-v2.sty
-2021/05/21 | 31738 | macros/latex/contrib/siunitx/siunitx-version-1.cfg
-2021/05/21 | 2161925 | macros/latex/contrib/siunitx.zip
+2021/05/24 | 39772 | macros/latex/contrib/siunitx/CHANGELOG.md
+2021/05/24 | 964 | macros/latex/contrib/siunitx/README.md
+2021/05/24 | 10106 | macros/latex/contrib/siunitx/siunitx-abbreviation.dtx
+2021/05/24 | 4748 | macros/latex/contrib/siunitx/siunitx-abbreviations.cfg
+2021/05/24 | 16529 | macros/latex/contrib/siunitx/siunitx-angle.dtx
+2021/05/24 | 1729 | macros/latex/contrib/siunitx/siunitx-binary.cfg
+2021/05/24 | 2883 | macros/latex/contrib/siunitx/siunitx-binary.dtx
+2021/05/24 | 1443594 | macros/latex/contrib/siunitx/siunitx-code.pdf
+2021/05/24 | 2426 | macros/latex/contrib/siunitx/siunitx-code.tex
+2021/05/24 | 8762 | macros/latex/contrib/siunitx/siunitx-command.dtx
+2021/05/24 | 25719 | macros/latex/contrib/siunitx/siunitx-complex.dtx
+2021/05/24 | 33130 | macros/latex/contrib/siunitx/siunitx-compound.dtx
+2021/05/24 | 19541 | macros/latex/contrib/siunitx/siunitx.dtx
+2021/05/24 | 27645 | macros/latex/contrib/siunitx/siunitx-emulation.dtx
+2021/05/24 | 3687 | macros/latex/contrib/siunitx/siunitx.ins
+2021/05/24 | 4629 | macros/latex/contrib/siunitx/siunitx-locale.dtx
+2021/05/24 | 113651 | macros/latex/contrib/siunitx/siunitx-number.dtx
+2021/05/24 | 598400 | macros/latex/contrib/siunitx/siunitx.pdf
+2021/05/24 | 30628 | macros/latex/contrib/siunitx/siunitx-print.dtx
+2021/05/24 | 14351 | macros/latex/contrib/siunitx/siunitx-quantity.dtx
+2021/05/24 | 10045 | macros/latex/contrib/siunitx/siunitx-symbol.dtx
+2021/05/24 | 47501 | macros/latex/contrib/siunitx/siunitx-table.dtx
+2021/05/24 | 138574 | macros/latex/contrib/siunitx/siunitx.tex
+2021/05/24 | 96848 | macros/latex/contrib/siunitx/siunitx-unit.dtx
+2021/05/24 | 273398 | macros/latex/contrib/siunitx/siunitx-v2.sty
+2021/05/24 | 31738 | macros/latex/contrib/siunitx/siunitx-version-1.cfg
+2021/05/24 | 2155910 | macros/latex/contrib/siunitx.zip
2011/06/03 | 662398 | macros/latex/contrib/skb/doc/skb.pdf
2011/03/15 | 1485 | macros/latex/contrib/skb/doc/user-guide/database/acronyms.tex
2011/03/15 | 722 | macros/latex/contrib/skb/doc/user-guide/database/bibliography.tex
@@ -212154,11 +212157,11 @@
2019/02/27 | 106870 | macros/latex/contrib/spreadtab/spreadtab-fr.tex
2019/02/27 | 100070 | macros/latex/contrib/spreadtab/spreadtab.sty
2019/02/27 | 1251115 | macros/latex/contrib/spreadtab.zip
-2014/09/08 | 771 | macros/latex/contrib/springer/sr-vorl/README
-2016/01/31 | 59845 | macros/latex/contrib/springer/sr-vorl/sr-vorl.dtx
+2021/05/24 | 819 | macros/latex/contrib/springer/sr-vorl/README
+2021/05/24 | 69895 | macros/latex/contrib/springer/sr-vorl/sr-vorl.dtx
2016/01/30 | 4406 | macros/latex/contrib/springer/sr-vorl/sr-vorl.ins
-2016/01/31 | 446965 | macros/latex/contrib/springer/sr-vorl/sr-vorl.pdf
-2016/01/31 | 463796 | macros/latex/contrib/springer/sr-vorl.zip
+2021/05/24 | 451934 | macros/latex/contrib/springer/sr-vorl/sr-vorl.pdf
+2021/05/24 | 470367 | macros/latex/contrib/springer/sr-vorl.zip
2000/09/19 | 1772 | macros/latex/contrib/springer/svjour/actinf/actinf.dvi
2000/09/19 | 81871 | macros/latex/contrib/springer/svjour/actinf/actinf.pdf
2000/09/19 | 1037 | macros/latex/contrib/springer/svjour/actinf/actinf.tex
@@ -212980,11 +212983,11 @@
2006/03/25 | 2275 | macros/latex/contrib/sudoku/sudoku.ins
2006/03/25 | 67384 | macros/latex/contrib/sudoku/sudoku.pdf
2006/03/25 | 60808 | macros/latex/contrib/sudoku.zip
-2021/05/20 | 1670 | macros/latex/contrib/suftesi/README
-2021/05/20 | 232596 | macros/latex/contrib/suftesi/suftesi.dtx
-2021/05/20 | 841881 | macros/latex/contrib/suftesi/suftesi.pdf
-2021/05/20 | 681675 | macros/latex/contrib/suftesi/templates.zip
-2021/05/20 | 1560182 | macros/latex/contrib/suftesi.zip
+2021/05/24 | 1670 | macros/latex/contrib/suftesi/README
+2021/05/24 | 229551 | macros/latex/contrib/suftesi/suftesi.dtx
+2021/05/24 | 837570 | macros/latex/contrib/suftesi/suftesi.pdf
+2021/05/24 | 681675 | macros/latex/contrib/suftesi/templates.zip
+2021/05/24 | 1555297 | macros/latex/contrib/suftesi.zip
2020/02/02 | 856 | macros/latex/contrib/supertabular/CATALOG
2020/02/02 | 13567 | macros/latex/contrib/supertabular/ChangeLog
2020/01/24 | 502 | macros/latex/contrib/supertabular/MANIFEST
@@ -261790,7 +261793,7 @@
2021/05/03 | 1121 | support/TeX4ht/source/README
2021/05/03 | 1744 | support/TeX4ht/source/t1fontmake.lua
2021/05/03 | 297 | support/TeX4ht/source/t1fontsample.tex
-2021/05/16 | 1091266 | support/TeX4ht/source/tex4ht-4ht.tex
+2021/05/24 | 1091102 | support/TeX4ht/source/tex4ht-4ht.tex
2021/05/03 | 7127 | support/TeX4ht/source/tex4ht-auto-script.tex
2021/05/16 | 1539 | support/TeX4ht/source/tex4ht-bibtex2.tex
2021/05/03 | 21247 | support/TeX4ht/source/tex4ht-cond4ht.tex
@@ -266283,8 +266286,8 @@
2020/04/22 | 787504 | systems/texlive/tlnet/archive/bearwear.doc.r54826.tar.xz
2020/04/22 | 2376 | systems/texlive/tlnet/archive/bearwear.r54826.tar.xz
2020/04/22 | 5992 | systems/texlive/tlnet/archive/bearwear.source.r54826.tar.xz
-2021/03/19 | 275784 | systems/texlive/tlnet/archive/beaulivre.doc.r58503.tar.xz
-2021/03/19 | 3024 | systems/texlive/tlnet/archive/beaulivre.r58503.tar.xz
+2021/05/24 | 479340 | systems/texlive/tlnet/archive/beaulivre.doc.r59320.tar.xz
+2021/05/24 | 2856 | systems/texlive/tlnet/archive/beaulivre.r59320.tar.xz
2021/05/23 | 880688 | systems/texlive/tlnet/archive/beebe.r59302.tar.xz
2019/02/28 | 709916 | systems/texlive/tlnet/archive/begingreek.doc.r36294.tar.xz
2019/02/28 | 1664 | systems/texlive/tlnet/archive/begingreek.r36294.tar.xz
@@ -267501,8 +267504,8 @@
2019/02/28 | 2020 | systems/texlive/tlnet/archive/colorinfo.r15878.tar.xz
2019/02/28 | 25984 | systems/texlive/tlnet/archive/coloring.doc.r41042.tar.xz
2019/02/28 | 1480 | systems/texlive/tlnet/archive/coloring.r41042.tar.xz
-2021/03/17 | 54348 | systems/texlive/tlnet/archive/colorist.doc.r58434.tar.xz
-2021/03/17 | 7328 | systems/texlive/tlnet/archive/colorist.r58434.tar.xz
+2021/05/24 | 91372 | systems/texlive/tlnet/archive/colorist.doc.r59316.tar.xz
+2021/05/24 | 8672 | systems/texlive/tlnet/archive/colorist.r59316.tar.xz
2019/02/28 | 27632 | systems/texlive/tlnet/archive/colorprofiles.doc.r49086.tar.xz
2019/02/28 | 87972 | systems/texlive/tlnet/archive/colorprofiles.r49086.tar.xz
2019/02/28 | 1884 | systems/texlive/tlnet/archive/colorsep.r13293.tar.xz
@@ -268924,8 +268927,8 @@
2019/02/28 | 4224 | systems/texlive/tlnet/archive/eiad-ltx.source.r15878.tar.xz
2019/02/28 | 25636 | systems/texlive/tlnet/archive/eiad.r15878.tar.xz
2019/02/28 | 6960 | systems/texlive/tlnet/archive/eijkhout.r15878.tar.xz
-2021/03/16 | 262400 | systems/texlive/tlnet/archive/einfart.doc.r58414.tar.xz
-2021/03/16 | 3112 | systems/texlive/tlnet/archive/einfart.r58414.tar.xz
+2021/05/24 | 380244 | systems/texlive/tlnet/archive/einfart.doc.r59321.tar.xz
+2021/05/24 | 2968 | systems/texlive/tlnet/archive/einfart.r59321.tar.xz
2020/10/23 | 362512 | systems/texlive/tlnet/archive/ejpecp.doc.r56728.tar.xz
2020/10/23 | 5228 | systems/texlive/tlnet/archive/ejpecp.r56728.tar.xz
2020/10/23 | 6904 | systems/texlive/tlnet/archive/ejpecp.source.r56728.tar.xz
@@ -271602,8 +271605,8 @@
2020/11/08 | 344060 | systems/texlive/tlnet/archive/leaflet.doc.r56878.tar.xz
2020/11/08 | 5652 | systems/texlive/tlnet/archive/leaflet.r56878.tar.xz
2020/11/08 | 13844 | systems/texlive/tlnet/archive/leaflet.source.r56878.tar.xz
-2021/03/19 | 273048 | systems/texlive/tlnet/archive/lebhart.doc.r58503.tar.xz
-2021/03/19 | 3044 | systems/texlive/tlnet/archive/lebhart.r58503.tar.xz
+2021/05/24 | 445972 | systems/texlive/tlnet/archive/lebhart.doc.r59322.tar.xz
+2021/05/24 | 2880 | systems/texlive/tlnet/archive/lebhart.r59322.tar.xz
2019/02/28 | 1126000 | systems/texlive/tlnet/archive/lecturer.doc.r23916.tar.xz
2019/02/28 | 18668 | systems/texlive/tlnet/archive/lecturer.r23916.tar.xz
2020/02/03 | 2080 | systems/texlive/tlnet/archive/lectures.doc.r53642.tar.xz
@@ -272460,8 +272463,8 @@
2019/02/28 | 1092 | systems/texlive/tlnet/archive/mceinleger.r15878.tar.xz
2019/02/28 | 241840 | systems/texlive/tlnet/archive/mcexam.doc.r46155.tar.xz
2019/02/28 | 11424 | systems/texlive/tlnet/archive/mcexam.r46155.tar.xz
-2021/05/06 | 909748 | systems/texlive/tlnet/archive/mcf2graph.doc.r59086.tar.xz
-2021/05/06 | 23336 | systems/texlive/tlnet/archive/mcf2graph.r59086.tar.xz
+2021/05/24 | 916312 | systems/texlive/tlnet/archive/mcf2graph.doc.r59314.tar.xz
+2021/05/24 | 23476 | systems/texlive/tlnet/archive/mcf2graph.r59314.tar.xz
2019/02/28 | 138716 | systems/texlive/tlnet/archive/mcite.doc.r18173.tar.xz
2019/02/28 | 391980 | systems/texlive/tlnet/archive/mciteplus.doc.r31648.tar.xz
2019/02/28 | 34344 | systems/texlive/tlnet/archive/mciteplus.r31648.tar.xz
@@ -272732,8 +272735,8 @@
2019/02/28 | 435560 | systems/texlive/tlnet/archive/minifp.doc.r32559.tar.xz
2019/02/28 | 10000 | systems/texlive/tlnet/archive/minifp.r32559.tar.xz
2019/02/28 | 43836 | systems/texlive/tlnet/archive/minifp.source.r32559.tar.xz
-2021/03/16 | 53552 | systems/texlive/tlnet/archive/minimalist.doc.r58395.tar.xz
-2021/03/16 | 6420 | systems/texlive/tlnet/archive/minimalist.r58395.tar.xz
+2021/05/24 | 90148 | systems/texlive/tlnet/archive/minimalist.doc.r59317.tar.xz
+2021/05/24 | 6176 | systems/texlive/tlnet/archive/minimalist.r59317.tar.xz
2019/02/28 | 72252 | systems/texlive/tlnet/archive/minipage-marginpar.doc.r15878.tar.xz
2019/02/28 | 1588 | systems/texlive/tlnet/archive/minipage-marginpar.r15878.tar.xz
2019/02/28 | 6140 | systems/texlive/tlnet/archive/minipage-marginpar.source.r15878.tar.xz
@@ -273219,8 +273222,8 @@
2019/02/28 | 196212 | systems/texlive/tlnet/archive/newspaper.doc.r15878.tar.xz
2019/02/28 | 1924 | systems/texlive/tlnet/archive/newspaper.r15878.tar.xz
2019/02/28 | 6804 | systems/texlive/tlnet/archive/newspaper.source.r15878.tar.xz
-2021/05/20 | 966784 | systems/texlive/tlnet/archive/newtx.doc.r59277.tar.xz
-2021/05/20 | 5604344 | systems/texlive/tlnet/archive/newtx.r59277.tar.xz
+2021/05/24 | 966880 | systems/texlive/tlnet/archive/newtx.doc.r59313.tar.xz
+2021/05/24 | 5604344 | systems/texlive/tlnet/archive/newtx.r59313.tar.xz
2021/05/17 | 332420 | systems/texlive/tlnet/archive/newtxsf.doc.r59227.tar.xz
2021/05/17 | 105908 | systems/texlive/tlnet/archive/newtxsf.r59227.tar.xz
2020/03/24 | 171356 | systems/texlive/tlnet/archive/newtxtt.doc.r54512.tar.xz
@@ -273516,8 +273519,8 @@
2019/02/28 | 21248 | systems/texlive/tlnet/archive/otibet.doc.r45777.tar.xz
2019/02/28 | 96688 | systems/texlive/tlnet/archive/otibet.r45777.tar.xz
2019/02/28 | 19456 | systems/texlive/tlnet/archive/otibet.source.r45777.tar.xz
-2019/02/28 | 81048 | systems/texlive/tlnet/archive/ot-tableau.doc.r44889.tar.xz
-2019/02/28 | 2096 | systems/texlive/tlnet/archive/ot-tableau.r44889.tar.xz
+2021/05/24 | 66132 | systems/texlive/tlnet/archive/ot-tableau.doc.r59318.tar.xz
+2021/05/24 | 2392 | systems/texlive/tlnet/archive/ot-tableau.r59318.tar.xz
2019/02/28 | 60352 | systems/texlive/tlnet/archive/oubraces.doc.r21833.tar.xz
2019/02/28 | 1660 | systems/texlive/tlnet/archive/oubraces.r21833.tar.xz
2021/03/23 | 511092 | systems/texlive/tlnet/archive/oup-authoring-template.doc.r58661.tar.xz
@@ -274824,8 +274827,8 @@
2020/12/30 | 3968 | systems/texlive/tlnet/archive/puyotikz.r57254.tar.xz
2021/03/18 | 9048 | systems/texlive/tlnet/archive/pwebmac.doc.r58478.tar.xz
2021/03/18 | 7788 | systems/texlive/tlnet/archive/pwebmac.r58478.tar.xz
-2019/02/28 | 160380 | systems/texlive/tlnet/archive/pxbase.doc.r44756.tar.xz
-2019/02/28 | 11640 | systems/texlive/tlnet/archive/pxbase.r44756.tar.xz
+2021/05/24 | 145104 | systems/texlive/tlnet/archive/pxbase.doc.r59315.tar.xz
+2021/05/24 | 12068 | systems/texlive/tlnet/archive/pxbase.r59315.tar.xz
2020/10/05 | 312660 | systems/texlive/tlnet/archive/pxchfon.doc.r56537.tar.xz
2020/10/05 | 19104 | systems/texlive/tlnet/archive/pxchfon.r56537.tar.xz
2019/02/28 | 195556 | systems/texlive/tlnet/archive/pxcjkcat.doc.r47266.tar.xz
@@ -275523,8 +275526,8 @@
2019/02/28 | 4412 | systems/texlive/tlnet/archive/simplewick.source.r15878.tar.xz
2019/02/28 | 942836 | systems/texlive/tlnet/archive/simplified-latex.doc.r20620.tar.xz
2019/02/28 | 380 | systems/texlive/tlnet/archive/simplified-latex.r20620.tar.xz
-2021/03/16 | 271784 | systems/texlive/tlnet/archive/simplivre.doc.r58414.tar.xz
-2021/03/16 | 3072 | systems/texlive/tlnet/archive/simplivre.r58414.tar.xz
+2021/05/24 | 449068 | systems/texlive/tlnet/archive/simplivre.doc.r59323.tar.xz
+2021/05/24 | 2940 | systems/texlive/tlnet/archive/simplivre.r59323.tar.xz
2019/02/28 | 136908 | systems/texlive/tlnet/archive/simurgh.doc.r31719.tar.xz
2019/02/28 | 246476 | systems/texlive/tlnet/archive/simurgh.r31719.tar.xz
2020/03/04 | 323444 | systems/texlive/tlnet/archive/SIstyle.doc.r54080.tar.xz
@@ -276079,8 +276082,8 @@
2019/02/28 | 462992 | systems/texlive/tlnet/archive/tcldoc.doc.r22018.tar.xz
2019/02/28 | 7004 | systems/texlive/tlnet/archive/tcldoc.r22018.tar.xz
2019/02/28 | 41140 | systems/texlive/tlnet/archive/tcldoc.source.r22018.tar.xz
-2020/10/10 | 4716812 | systems/texlive/tlnet/archive/tcolorbox.doc.r56610.tar.xz
-2020/10/10 | 230544 | systems/texlive/tlnet/archive/tcolorbox.r56610.tar.xz
+2021/05/24 | 4770092 | systems/texlive/tlnet/archive/tcolorbox.doc.r59319.tar.xz
+2021/05/24 | 231064 | systems/texlive/tlnet/archive/tcolorbox.r59319.tar.xz
2019/02/28 | 244100 | systems/texlive/tlnet/archive/tdclock.doc.r33043.tar.xz
2019/02/28 | 3944 | systems/texlive/tlnet/archive/tdclock.r33043.tar.xz
2019/02/28 | 232652 | systems/texlive/tlnet/archive/tds.doc.r15878.tar.xz
@@ -276157,14 +276160,14 @@
2021/02/27 | 109184 | systems/texlive/tlnet/archive/tex4ht.amd64-freebsd.r57941.tar.xz
2021/02/24 | 87364 | systems/texlive/tlnet/archive/tex4ht.amd64-netbsd.r57877.tar.xz
2021/02/27 | 69944 | systems/texlive/tlnet/archive/tex4ht.armhf-linux.r57957.tar.xz
-2021/05/18 | 136384 | systems/texlive/tlnet/archive/tex4ht.doc.r59249.tar.xz
+2021/05/24 | 136384 | systems/texlive/tlnet/archive/tex4ht.doc.r59324.tar.xz
2021/03/16 | 51080 | systems/texlive/tlnet/archive/tex4ht.i386-cygwin.r58387.tar.xz
2021/02/27 | 93092 | systems/texlive/tlnet/archive/tex4ht.i386-freebsd.r57961.tar.xz
2021/02/24 | 89116 | systems/texlive/tlnet/archive/tex4ht.i386-linux.r57878.tar.xz
2021/02/24 | 76196 | systems/texlive/tlnet/archive/tex4ht.i386-netbsd.r57877.tar.xz
2021/02/27 | 83896 | systems/texlive/tlnet/archive/tex4ht.i386-solaris.r57938.tar.xz
-2021/05/18 | 901928 | systems/texlive/tlnet/archive/tex4ht.r59249.tar.xz
-2021/05/18 | 1210104 | systems/texlive/tlnet/archive/tex4ht.source.r59249.tar.xz
+2021/05/24 | 901988 | systems/texlive/tlnet/archive/tex4ht.r59324.tar.xz
+2021/05/24 | 1209160 | systems/texlive/tlnet/archive/tex4ht.source.r59324.tar.xz
2021/02/25 | 185088 | systems/texlive/tlnet/archive/tex4ht.universal-darwin.r57908.tar.xz
2021/04/08 | 57760 | systems/texlive/tlnet/archive/tex4ht.win32.r58783.tar.xz
2021/03/16 | 58360 | systems/texlive/tlnet/archive/tex4ht.x86_64-cygwin.r58387.tar.xz
@@ -276397,7 +276400,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
-2021/05/23 | 397412 | systems/texlive/tlnet/archive/texlive-scripts.doc.r59302.tar.xz
+2021/05/24 | 397408 | systems/texlive/tlnet/archive/texlive-scripts.doc.r59312.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
@@ -276421,7 +276424,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
-2021/05/23 | 107976 | systems/texlive/tlnet/archive/texlive-scripts.r59302.tar.xz
+2021/05/24 | 107992 | systems/texlive/tlnet/archive/texlive-scripts.r59312.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
@@ -278123,16 +278126,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/05/02 | 105152 | systems/texlive/tlnet/install-tl
-2021/05/23 | 6812424 | systems/texlive/tlnet/install-tl-unx.tar.gz
-2021/05/23 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
-2021/05/23 | 455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
+2021/05/24 | 6812825 | systems/texlive/tlnet/install-tl-unx.tar.gz
+2021/05/24 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
+2021/05/24 | 455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
2021/04/11 | 4945 | systems/texlive/tlnet/install-tl-windows.bat
-2021/05/23 | 20808435 | systems/texlive/tlnet/install-tl-windows.exe
-2021/05/23 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
-2021/05/23 | 455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
-2021/05/23 | 25584669 | systems/texlive/tlnet/install-tl.zip
-2021/05/23 | 145 | systems/texlive/tlnet/install-tl.zip.sha512
-2021/05/23 | 455 | systems/texlive/tlnet/install-tl.zip.sha512.asc
+2021/05/24 | 20807384 | systems/texlive/tlnet/install-tl-windows.exe
+2021/05/24 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
+2021/05/24 | 455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
+2021/05/24 | 25584692 | systems/texlive/tlnet/install-tl.zip
+2021/05/24 | 145 | systems/texlive/tlnet/install-tl.zip.sha512
+2021/05/24 | 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/03/15 | 6571 | systems/texlive/tlnet/tlpkg/gpg/pubring.gpg
@@ -278142,7 +278145,7 @@
2021/03/15 | 1280 | systems/texlive/tlnet/tlpkg/gpg/trustdb.gpg
2021/05/07 | 49598 | systems/texlive/tlnet/tlpkg/installer/config.guess
2010/11/11 | 11651 | systems/texlive/tlnet/tlpkg/installer/COPYING.MinGW-runtime.txt
-2021/05/22 | 6743 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
+2021/05/23 | 6872 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
2020/04/15 | 223687 | 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
@@ -278184,12 +278187,12 @@
2021/05/16 | 20371 | systems/texlive/tlnet/tlpkg/TeXLive/TLCrypto.pm
2021/05/16 | 5402 | systems/texlive/tlnet/tlpkg/TeXLive/TLDownload.pm
2021/05/16 | 27555 | systems/texlive/tlnet/tlpkg/TeXLive/TLPaper.pm
-2021/05/23 | 17249196 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
-2021/05/23 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
+2021/05/24 | 17249900 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
+2021/05/24 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
2021/05/16 | 86511 | systems/texlive/tlnet/tlpkg/TeXLive/TLPDB.pm
-2021/05/23 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
-2021/05/23 | 455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
-2021/05/23 | 2307588 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
+2021/05/24 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
+2021/05/24 | 455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
+2021/05/24 | 2307844 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
2021/05/16 | 58801 | systems/texlive/tlnet/tlpkg/TeXLive/TLPOBJ.pm
2021/05/16 | 42084 | systems/texlive/tlnet/tlpkg/TeXLive/TLPSRC.pm
2021/05/16 | 16103 | systems/texlive/tlnet/tlpkg/TeXLive/TLTREE.pm
@@ -281354,46 +281357,46 @@
2019/05/28 | 101 | systems/win32/miktex/README.md
2021/02/22 | 58721055 | systems/win32/miktex/setup/darwin-x86_64/miktex-21.2-darwin-x86_64.dmg
2021/03/25 | 61132306 | systems/win32/miktex/setup/darwin-x86_64/miktex-21.3-darwin-x86_64.dmg
-2021/03/25 | 2034 | systems/win32/miktex/setup/deb/dists/bionic/InRelease
-2021/03/25 | 1512 | systems/win32/miktex/setup/deb/dists/bionic/Release
-2021/03/25 | 473 | systems/win32/miktex/setup/deb/dists/bionic/Release.gpg
-2021/03/25 | 13252 | systems/win32/miktex/setup/deb/dists/bionic/universe/binary-amd64/Packages
-2021/03/25 | 2237 | systems/win32/miktex/setup/deb/dists/bionic/universe/binary-amd64/Packages.bz2
-2021/03/25 | 1849 | systems/win32/miktex/setup/deb/dists/bionic/universe/binary-amd64/Packages.gz
-2021/03/25 | 89 | systems/win32/miktex/setup/deb/dists/bionic/universe/binary-amd64/Release
-2021/03/25 | 1868 | systems/win32/miktex/setup/deb/dists/bionic/universe/Contents-amd64.gz
-2021/03/25 | 2034 | systems/win32/miktex/setup/deb/dists/buster/InRelease
-2021/03/25 | 1512 | systems/win32/miktex/setup/deb/dists/buster/Release
-2021/03/25 | 473 | systems/win32/miktex/setup/deb/dists/buster/Release.gpg
-2021/03/25 | 13904 | systems/win32/miktex/setup/deb/dists/buster/universe/binary-amd64/Packages
-2021/03/25 | 2304 | systems/win32/miktex/setup/deb/dists/buster/universe/binary-amd64/Packages.bz2
-2021/03/25 | 1891 | systems/win32/miktex/setup/deb/dists/buster/universe/binary-amd64/Packages.gz
-2021/03/25 | 89 | systems/win32/miktex/setup/deb/dists/buster/universe/binary-amd64/Release
-2021/03/25 | 1868 | systems/win32/miktex/setup/deb/dists/buster/universe/Contents-amd64.gz
-2021/03/25 | 2030 | systems/win32/miktex/setup/deb/dists/focal/InRelease
-2021/03/25 | 1508 | systems/win32/miktex/setup/deb/dists/focal/Release
-2021/03/25 | 473 | systems/win32/miktex/setup/deb/dists/focal/Release.gpg
-2021/03/25 | 12516 | systems/win32/miktex/setup/deb/dists/focal/universe/binary-amd64/Packages
-2021/03/25 | 2107 | systems/win32/miktex/setup/deb/dists/focal/universe/binary-amd64/Packages.bz2
-2021/03/25 | 1757 | systems/win32/miktex/setup/deb/dists/focal/universe/binary-amd64/Packages.gz
-2021/03/25 | 86 | systems/win32/miktex/setup/deb/dists/focal/universe/binary-amd64/Release
-2021/03/25 | 1764 | systems/win32/miktex/setup/deb/dists/focal/universe/Contents-amd64.gz
-2021/03/25 | 2038 | systems/win32/miktex/setup/deb/dists/stretch/InRelease
-2021/03/25 | 1516 | systems/win32/miktex/setup/deb/dists/stretch/Release
-2021/03/25 | 473 | systems/win32/miktex/setup/deb/dists/stretch/Release.gpg
-2021/03/25 | 13797 | systems/win32/miktex/setup/deb/dists/stretch/universe/binary-amd64/Packages
-2021/03/25 | 2303 | systems/win32/miktex/setup/deb/dists/stretch/universe/binary-amd64/Packages.bz2
-2021/03/25 | 1885 | systems/win32/miktex/setup/deb/dists/stretch/universe/binary-amd64/Packages.gz
-2021/03/25 | 92 | systems/win32/miktex/setup/deb/dists/stretch/universe/binary-amd64/Release
-2021/03/25 | 1868 | systems/win32/miktex/setup/deb/dists/stretch/universe/Contents-amd64.gz
-2021/03/25 | 2034 | systems/win32/miktex/setup/deb/dists/xenial/InRelease
-2021/03/25 | 1512 | systems/win32/miktex/setup/deb/dists/xenial/Release
-2021/03/25 | 473 | systems/win32/miktex/setup/deb/dists/xenial/Release.gpg
-2021/03/25 | 13535 | systems/win32/miktex/setup/deb/dists/xenial/universe/binary-amd64/Packages
-2021/03/25 | 2256 | systems/win32/miktex/setup/deb/dists/xenial/universe/binary-amd64/Packages.bz2
-2021/03/25 | 1845 | systems/win32/miktex/setup/deb/dists/xenial/universe/binary-amd64/Packages.gz
-2021/03/25 | 89 | systems/win32/miktex/setup/deb/dists/xenial/universe/binary-amd64/Release
-2021/03/25 | 1868 | systems/win32/miktex/setup/deb/dists/xenial/universe/Contents-amd64.gz
+2021/05/24 | 2034 | systems/win32/miktex/setup/deb/dists/bionic/InRelease
+2021/05/24 | 1512 | systems/win32/miktex/setup/deb/dists/bionic/Release
+2021/05/24 | 473 | systems/win32/miktex/setup/deb/dists/bionic/Release.gpg
+2021/05/24 | 9286 | systems/win32/miktex/setup/deb/dists/bionic/universe/binary-amd64/Packages
+2021/05/24 | 1778 | systems/win32/miktex/setup/deb/dists/bionic/universe/binary-amd64/Packages.bz2
+2021/05/24 | 1490 | systems/win32/miktex/setup/deb/dists/bionic/universe/binary-amd64/Packages.gz
+2021/05/24 | 89 | systems/win32/miktex/setup/deb/dists/bionic/universe/binary-amd64/Release
+2021/05/24 | 1510 | systems/win32/miktex/setup/deb/dists/bionic/universe/Contents-amd64.gz
+2021/05/24 | 2034 | systems/win32/miktex/setup/deb/dists/buster/InRelease
+2021/05/24 | 1512 | systems/win32/miktex/setup/deb/dists/buster/Release
+2021/05/24 | 473 | systems/win32/miktex/setup/deb/dists/buster/Release.gpg
+2021/05/24 | 9752 | systems/win32/miktex/setup/deb/dists/buster/universe/binary-amd64/Packages
+2021/05/24 | 1820 | systems/win32/miktex/setup/deb/dists/buster/universe/binary-amd64/Packages.bz2
+2021/05/24 | 1539 | systems/win32/miktex/setup/deb/dists/buster/universe/binary-amd64/Packages.gz
+2021/05/24 | 89 | systems/win32/miktex/setup/deb/dists/buster/universe/binary-amd64/Release
+2021/05/24 | 1510 | systems/win32/miktex/setup/deb/dists/buster/universe/Contents-amd64.gz
+2021/05/24 | 2030 | systems/win32/miktex/setup/deb/dists/focal/InRelease
+2021/05/24 | 1508 | systems/win32/miktex/setup/deb/dists/focal/Release
+2021/05/24 | 473 | systems/win32/miktex/setup/deb/dists/focal/Release.gpg
+2021/05/24 | 10957 | systems/win32/miktex/setup/deb/dists/focal/universe/binary-amd64/Packages
+2021/05/24 | 2003 | systems/win32/miktex/setup/deb/dists/focal/universe/binary-amd64/Packages.bz2
+2021/05/24 | 1633 | systems/win32/miktex/setup/deb/dists/focal/universe/binary-amd64/Packages.gz
+2021/05/24 | 86 | systems/win32/miktex/setup/deb/dists/focal/universe/binary-amd64/Release
+2021/05/24 | 1510 | systems/win32/miktex/setup/deb/dists/focal/universe/Contents-amd64.gz
+2021/05/24 | 2038 | systems/win32/miktex/setup/deb/dists/stretch/InRelease
+2021/05/24 | 1516 | systems/win32/miktex/setup/deb/dists/stretch/Release
+2021/05/24 | 473 | systems/win32/miktex/setup/deb/dists/stretch/Release.gpg
+2021/05/24 | 9675 | systems/win32/miktex/setup/deb/dists/stretch/universe/binary-amd64/Packages
+2021/05/24 | 1803 | systems/win32/miktex/setup/deb/dists/stretch/universe/binary-amd64/Packages.bz2
+2021/05/24 | 1532 | systems/win32/miktex/setup/deb/dists/stretch/universe/binary-amd64/Packages.gz
+2021/05/24 | 92 | systems/win32/miktex/setup/deb/dists/stretch/universe/binary-amd64/Release
+2021/05/24 | 1510 | systems/win32/miktex/setup/deb/dists/stretch/universe/Contents-amd64.gz
+2021/05/24 | 2034 | systems/win32/miktex/setup/deb/dists/xenial/InRelease
+2021/05/24 | 1512 | systems/win32/miktex/setup/deb/dists/xenial/Release
+2021/05/24 | 473 | systems/win32/miktex/setup/deb/dists/xenial/Release.gpg
+2021/05/24 | 9482 | systems/win32/miktex/setup/deb/dists/xenial/universe/binary-amd64/Packages
+2021/05/24 | 1794 | systems/win32/miktex/setup/deb/dists/xenial/universe/binary-amd64/Packages.bz2
+2021/05/24 | 1490 | systems/win32/miktex/setup/deb/dists/xenial/universe/binary-amd64/Packages.gz
+2021/05/24 | 89 | systems/win32/miktex/setup/deb/dists/xenial/universe/binary-amd64/Release
+2021/05/24 | 1510 | systems/win32/miktex/setup/deb/dists/xenial/universe/Contents-amd64.gz
2020/10/11 | 30031352 | systems/win32/miktex/setup/deb/pool/universe/m/miktex/miktex_20.10-bionic1_amd64.deb
2020/10/11 | 29468194 | systems/win32/miktex/setup/deb/pool/universe/m/miktex/miktex_20.10-buster1_amd64.deb
2020/10/11 | 30314662 | systems/win32/miktex/setup/deb/pool/universe/m/miktex/miktex_20.10-focal1_amd64.deb
@@ -281429,19 +281432,6 @@
2021/03/25 | 31854552 | systems/win32/miktex/setup/deb/pool/universe/m/miktex/miktex_21.3-focal1_amd64.deb
2021/03/25 | 31481650 | systems/win32/miktex/setup/deb/pool/universe/m/miktex/miktex_21.3-stretch1_amd64.deb
2021/03/25 | 30746074 | systems/win32/miktex/setup/deb/pool/universe/m/miktex/miktex_21.3-xenial1_amd64.deb
-2020/03/22 | 29810262 | systems/win32/miktex/setup/deb/pool/universe/m/miktex/miktex_2.9.7350-bionic1_amd64.deb
-2020/03/22 | 29213170 | systems/win32/miktex/setup/deb/pool/universe/m/miktex/miktex_2.9.7350-buster1_amd64.deb
-2020/03/22 | 29324886 | systems/win32/miktex/setup/deb/pool/universe/m/miktex/miktex_2.9.7350-stretch1_amd64.deb
-2020/03/22 | 28764416 | systems/win32/miktex/setup/deb/pool/universe/m/miktex/miktex_2.9.7350-xenial1_amd64.deb
-2020/04/29 | 29935332 | systems/win32/miktex/setup/deb/pool/universe/m/miktex/miktex_2.9.7400-bionic1_amd64.deb
-2020/04/29 | 29369466 | systems/win32/miktex/setup/deb/pool/universe/m/miktex/miktex_2.9.7400-buster1_amd64.deb
-2020/04/29 | 29464796 | systems/win32/miktex/setup/deb/pool/universe/m/miktex/miktex_2.9.7400-stretch1_amd64.deb
-2020/04/29 | 28898388 | systems/win32/miktex/setup/deb/pool/universe/m/miktex/miktex_2.9.7400-xenial1_amd64.deb
-2020/05/23 | 29745762 | systems/win32/miktex/setup/deb/pool/universe/m/miktex/miktex_2.9.7445-bionic1_amd64.deb
-2020/05/23 | 29192670 | systems/win32/miktex/setup/deb/pool/universe/m/miktex/miktex_2.9.7445-buster1_amd64.deb
-2020/05/23 | 30014570 | systems/win32/miktex/setup/deb/pool/universe/m/miktex/miktex_2.9.7445-focal1_amd64.deb
-2020/05/23 | 29293442 | systems/win32/miktex/setup/deb/pool/universe/m/miktex/miktex_2.9.7445-stretch1_amd64.deb
-2020/05/23 | 28722842 | systems/win32/miktex/setup/deb/pool/universe/m/miktex/miktex_2.9.7445-xenial1_amd64.deb
2020/06/28 | 248 | systems/win32/miktex/setup/README.md
2020/01/26 | 107 | systems/win32/miktex/setup/rpm/centos-8.repo
2020/10/11 | 22891716 | systems/win32/miktex/setup/rpm/fedora/28/miktex-20.10-1.fc28.x86_64.rpm
@@ -282878,7 +282868,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
-2021/05/23 | 576615 | systems/win32/miktex/tm/packages/files.csv.lzma
+2021/05/24 | 576615 | 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
@@ -284079,9 +284069,9 @@
2018/01/12 | 157226 | systems/win32/miktex/tm/packages/miktex-zip-bin-x64.tar.lzma
2021/03/15 | 39247 | systems/win32/miktex/tm/packages/miktex-zlib-bin-2.9.tar.lzma
2021/03/15 | 43386 | systems/win32/miktex/tm/packages/miktex-zlib-bin-x64-2.9.tar.lzma
-2021/05/23 | 209601 | systems/win32/miktex/tm/packages/miktex-zzdb1-2.9.tar.lzma
-2021/05/23 | 1272221 | systems/win32/miktex/tm/packages/miktex-zzdb2-2.9.tar.lzma
-2021/05/23 | 1188048 | systems/win32/miktex/tm/packages/miktex-zzdb3-2.9.tar.lzma
+2021/05/24 | 209613 | systems/win32/miktex/tm/packages/miktex-zzdb1-2.9.tar.lzma
+2021/05/24 | 1272214 | systems/win32/miktex/tm/packages/miktex-zzdb2-2.9.tar.lzma
+2021/05/24 | 1187846 | systems/win32/miktex/tm/packages/miktex-zzdb3-2.9.tar.lzma
2021/03/15 | 13447 | systems/win32/miktex/tm/packages/miktex-zzip-bin-2.9.tar.lzma
2021/03/15 | 14320 | 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
@@ -284242,190 +284232,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
-2021/05/23 | 576226 | systems/win32/miktex/tm/packages/next/files.csv.lzma
-2021/05/23 | 50846 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-2.9.tar.lzma
-2021/05/23 | 56456 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-x64-2.9.tar.lzma
-2021/05/23 | 968694 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-2.9.tar.lzma
-2021/05/23 | 1078877 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-x64-2.9.tar.lzma
-2021/05/23 | 29055 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-2.9.tar.lzma
-2021/05/23 | 31343 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-x64-2.9.tar.lzma
-2021/05/23 | 29871 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-2.9.tar.lzma
-2021/05/23 | 34633 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-x64-2.9.tar.lzma
-2021/05/23 | 49971 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-2.9.tar.lzma
-2021/05/23 | 57597 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-x64-2.9.tar.lzma
-2021/05/23 | 84774 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-2.9.tar.lzma
-2021/05/23 | 94739 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-x64-2.9.tar.lzma
-2021/05/23 | 67681 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-2.9.tar.lzma
-2021/05/23 | 75418 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-x64-2.9.tar.lzma
-2021/05/23 | 27182 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-2.9.tar.lzma
-2021/05/23 | 30886 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-x64-2.9.tar.lzma
-2021/05/23 | 330233 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-2.9.tar.lzma
-2021/05/23 | 392596 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-x64-2.9.tar.lzma
-2021/05/23 | 32744 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-2.9.tar.lzma
-2021/05/23 | 36679 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-x64-2.9.tar.lzma
-2021/05/23 | 51432 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-2.9.tar.lzma
-2021/05/23 | 56718 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-x64-2.9.tar.lzma
-2021/05/23 | 4707 | systems/win32/miktex/tm/packages/next/miktex-config-2.9.tar.lzma
-2021/05/23 | 239477 | systems/win32/miktex/tm/packages/next/miktex-console-bin-2.9.tar.lzma
-2021/05/23 | 261963 | systems/win32/miktex/tm/packages/next/miktex-console-bin-x64-2.9.tar.lzma
-2021/05/23 | 179379 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-2.9.tar.lzma
-2021/05/23 | 195663 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-x64-2.9.tar.lzma
-2021/05/23 | 52475 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-2.9.tar.lzma
-2021/05/23 | 59145 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-x64-2.9.tar.lzma
-2021/05/23 | 21128 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-2.9.tar.lzma
-2021/05/23 | 23291 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-x64-2.9.tar.lzma
-2021/05/23 | 461397 | systems/win32/miktex/tm/packages/next/miktex-doc.tar.lzma
-2021/05/23 | 45648 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-2.9.tar.lzma
-2021/05/23 | 51160 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-x64-2.9.tar.lzma
-2021/05/23 | 282106 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-2.9.tar.lzma
-2021/05/23 | 321894 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-x64-2.9.tar.lzma
-2021/05/23 | 41104 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-2.9.tar.lzma
-2021/05/23 | 45277 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-x64-2.9.tar.lzma
-2021/05/23 | 116932 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-2.9.tar.lzma
-2021/05/23 | 131489 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-x64-2.9.tar.lzma
-2021/05/23 | 1281104 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-2.9.tar.lzma
-2021/05/23 | 1425981 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-x64-2.9.tar.lzma
-2021/05/23 | 87637 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-2.9.tar.lzma
-2021/05/23 | 99605 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-x64-2.9.tar.lzma
-2021/05/23 | 43057 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-2.9.tar.lzma
-2021/05/23 | 47877 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-x64-2.9.tar.lzma
-2021/05/23 | 25154 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-2.9.tar.lzma
-2021/05/23 | 28009 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-x64-2.9.tar.lzma
-2021/05/23 | 55821 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-2.9.tar.lzma
-2021/05/23 | 62801 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-x64-2.9.tar.lzma
-2021/05/23 | 135005 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-2.9.tar.lzma
-2021/05/23 | 152762 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-x64-2.9.tar.lzma
-2021/05/23 | 73181 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-2.9.tar.lzma
-2021/05/23 | 77858 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-x64-2.9.tar.lzma
-2021/05/23 | 71567 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-2.9.tar.lzma
-2021/05/23 | 80661 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-x64-2.9.tar.lzma
-2021/05/23 | 258665 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-2.9.tar.lzma
-2021/05/23 | 295554 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-x64-2.9.tar.lzma
-2021/05/23 | 22040 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-2.9.tar.lzma
-2021/05/23 | 25001 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-x64-2.9.tar.lzma
-2021/05/23 | 97491 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-2.9.tar.lzma
-2021/05/23 | 112252 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-x64-2.9.tar.lzma
-2021/05/23 | 63836 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-2.9.tar.lzma
-2021/05/23 | 72861 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-x64-2.9.tar.lzma
-2021/05/23 | 96145 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-2.9.tar.lzma
-2021/05/23 | 115470 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-x64-2.9.tar.lzma
-2021/05/23 | 38070 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-2.9.tar.lzma
-2021/05/23 | 42626 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-x64-2.9.tar.lzma
-2021/05/23 | 484058 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-2.9.tar.lzma
-2021/05/23 | 567627 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-x64-2.9.tar.lzma
-2021/05/23 | 147140 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-2.9.tar.lzma
-2021/05/23 | 159968 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-x64-2.9.tar.lzma
-2021/05/23 | 94802 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-2.9.tar.lzma
-2021/05/23 | 109274 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-x64-2.9.tar.lzma
-2021/05/23 | 16328 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-2.9.tar.lzma
-2021/05/23 | 17957 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-x64-2.9.tar.lzma
-2021/05/23 | 28120 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-2.9.tar.lzma
-2021/05/23 | 30037 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-x64-2.9.tar.lzma
-2021/05/23 | 625283 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-2.9.tar.lzma
-2021/05/23 | 680052 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-x64-2.9.tar.lzma
-2021/05/23 | 532039 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-2.9.tar.lzma
-2021/05/23 | 594871 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-x64-2.9.tar.lzma
-2021/05/23 | 475935 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-2.9.tar.lzma
-2021/05/23 | 511633 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-x64-2.9.tar.lzma
-2021/05/23 | 94267 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-2.9.tar.lzma
-2021/05/23 | 103322 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-x64-2.9.tar.lzma
-2021/05/23 | 1725548 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-2.9.tar.lzma
-2021/05/23 | 2009492 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-x64-2.9.tar.lzma
-2021/05/23 | 67650 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-2.9.tar.lzma
-2021/05/23 | 74164 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-x64-2.9.tar.lzma
-2021/05/23 | 27361 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-2.9.tar.lzma
-2021/05/23 | 31593 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-x64-2.9.tar.lzma
-2021/05/23 | 7747 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-2.9.tar.lzma
-2021/05/23 | 8773 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-x64-2.9.tar.lzma
-2021/05/23 | 195567 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-2.9.tar.lzma
-2021/05/23 | 214105 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-x64-2.9.tar.lzma
-2021/05/23 | 250213 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-2.9.tar.lzma
-2021/05/23 | 283978 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-x64-2.9.tar.lzma
-2021/05/23 | 97134 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-2.9.tar.lzma
-2021/05/23 | 101762 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-x64-2.9.tar.lzma
-2021/05/23 | 60550 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-2.9.tar.lzma
-2021/05/23 | 67928 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-x64-2.9.tar.lzma
-2021/05/23 | 124972 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-2.9.tar.lzma
-2021/05/23 | 136428 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-x64-2.9.tar.lzma
-2021/05/23 | 147150 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-2.9.tar.lzma
-2021/05/23 | 163655 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-x64-2.9.tar.lzma
-2021/05/23 | 199701 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-2.9.tar.lzma
-2021/05/23 | 180046 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-x64-2.9.tar.lzma
-2021/05/23 | 67452 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-2.9.tar.lzma
-2021/05/23 | 77487 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-x64-2.9.tar.lzma
-2021/05/23 | 31192 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-2.9.tar.lzma
-2021/05/23 | 35064 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-x64-2.9.tar.lzma
-2021/05/23 | 38066 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-2.9.tar.lzma
-2021/05/23 | 42573 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-x64-2.9.tar.lzma
-2021/05/23 | 42924 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-2.9.tar.lzma
-2021/05/23 | 47008 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-x64-2.9.tar.lzma
-2021/05/23 | 45937 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-2.9.tar.lzma
-2021/05/23 | 52454 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-x64-2.9.tar.lzma
-2021/05/23 | 193716 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-2.9.tar.lzma
-2021/05/23 | 211053 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-x64-2.9.tar.lzma
-2021/05/23 | 35462 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin.tar.lzma
-2021/05/23 | 39690 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin-x64.tar.lzma
-2021/05/23 | 748362 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-2.9.tar.lzma
-2021/05/23 | 816072 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-x64-2.9.tar.lzma
-2021/05/23 | 198129 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-2.9.tar.lzma
-2021/05/23 | 202555 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-x64-2.9.tar.lzma
-2021/05/23 | 208181 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-2.9.tar.lzma
-2021/05/23 | 243480 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-x64-2.9.tar.lzma
-2021/05/23 | 78746 | systems/win32/miktex/tm/packages/next/miktex-png-bin-2.9.tar.lzma
-2021/05/23 | 87704 | systems/win32/miktex/tm/packages/next/miktex-png-bin-x64-2.9.tar.lzma
-2021/05/23 | 1171731 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-2.9.tar.lzma
-2021/05/23 | 1307725 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-x64-2.9.tar.lzma
-2021/05/23 | 20121 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-2.9.tar.lzma
-2021/05/23 | 23883 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-x64-2.9.tar.lzma
-2021/05/23 | 31544 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-2.9.tar.lzma
-2021/05/23 | 37244 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-x64-2.9.tar.lzma
-2021/05/23 | 64015 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-2.9.tar.lzma
-2021/05/23 | 72150 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-x64-2.9.tar.lzma
-2021/05/23 | 43678 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-2.9.tar.lzma
-2021/05/23 | 51979 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-x64-2.9.tar.lzma
-2021/05/23 | 1295411 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-2.9.tar.lzma
-2021/05/23 | 1424811 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-x64-2.9.tar.lzma
-2021/05/23 | 42388 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-2.9.tar.lzma
-2021/05/23 | 51797 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-x64-2.9.tar.lzma
-2021/05/23 | 56222 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin.tar.lzma
-2021/05/23 | 59831 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-x64.tar.lzma
-2021/05/23 | 25341 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-2.9.tar.lzma
-2021/05/23 | 27274 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-x64-2.9.tar.lzma
-2021/05/23 | 16110 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-2.9.tar.lzma
-2021/05/23 | 18096 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-x64-2.9.tar.lzma
-2021/05/23 | 63675 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-2.9.tar.lzma
-2021/05/23 | 70110 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-x64-2.9.tar.lzma
-2021/05/23 | 153890 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-2.9.tar.lzma
-2021/05/23 | 167906 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-x64-2.9.tar.lzma
-2021/05/23 | 56910 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-2.9.tar.lzma
-2021/05/23 | 65321 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-x64-2.9.tar.lzma
-2021/05/23 | 98519 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-2.9.tar.lzma
-2021/05/23 | 104625 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-x64-2.9.tar.lzma
-2021/05/23 | 2499404 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-2.9.tar.lzma
-2021/05/23 | 2616931 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-x64-2.9.tar.lzma
-2021/05/23 | 55218 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-2.9.tar.lzma
-2021/05/23 | 62227 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-x64-2.9.tar.lzma
-2021/05/23 | 33441 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin.tar.lzma
-2021/05/23 | 37293 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin-x64.tar.lzma
-2021/05/23 | 27198 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-2.9.tar.lzma
-2021/05/23 | 33151 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-x64-2.9.tar.lzma
-2021/05/23 | 65732 | systems/win32/miktex/tm/packages/next/miktex-web-bin-2.9.tar.lzma
-2021/05/23 | 70325 | systems/win32/miktex/tm/packages/next/miktex-web-bin-x64-2.9.tar.lzma
-2021/05/23 | 311191 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-2.9.tar.lzma
-2021/05/23 | 345367 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-x64-2.9.tar.lzma
-2021/05/23 | 55563 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin.tar.lzma
-2021/05/23 | 57066 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin-x64.tar.lzma
-2021/05/23 | 583630 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-2.9.tar.lzma
-2021/05/23 | 618766 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-x64-2.9.tar.lzma
-2021/05/23 | 39564 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-2.9.tar.lzma
-2021/05/23 | 43392 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-x64-2.9.tar.lzma
-2021/05/23 | 209580 | systems/win32/miktex/tm/packages/next/miktex-zzdb1-2.9.tar.lzma
-2021/05/23 | 1272577 | systems/win32/miktex/tm/packages/next/miktex-zzdb2-2.9.tar.lzma
-2021/05/23 | 1188097 | systems/win32/miktex/tm/packages/next/miktex-zzdb3-2.9.tar.lzma
-2021/05/23 | 13470 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-2.9.tar.lzma
-2021/05/23 | 14354 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-x64-2.9.tar.lzma
+2021/05/24 | 576227 | systems/win32/miktex/tm/packages/next/files.csv.lzma
+2021/05/24 | 51026 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-2.9.tar.lzma
+2021/05/24 | 56413 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-x64-2.9.tar.lzma
+2021/05/24 | 972707 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-2.9.tar.lzma
+2021/05/24 | 1075242 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-x64-2.9.tar.lzma
+2021/05/24 | 29079 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-2.9.tar.lzma
+2021/05/24 | 31326 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-x64-2.9.tar.lzma
+2021/05/24 | 29842 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-2.9.tar.lzma
+2021/05/24 | 34651 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-x64-2.9.tar.lzma
+2021/05/24 | 50142 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-2.9.tar.lzma
+2021/05/24 | 57580 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-x64-2.9.tar.lzma
+2021/05/24 | 83418 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-2.9.tar.lzma
+2021/05/24 | 95456 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-x64-2.9.tar.lzma
+2021/05/24 | 67478 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-2.9.tar.lzma
+2021/05/24 | 75582 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-x64-2.9.tar.lzma
+2021/05/24 | 27185 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-2.9.tar.lzma
+2021/05/24 | 30806 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-x64-2.9.tar.lzma
+2021/05/24 | 330962 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-2.9.tar.lzma
+2021/05/24 | 392975 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-x64-2.9.tar.lzma
+2021/05/24 | 32644 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-2.9.tar.lzma
+2021/05/24 | 36640 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-x64-2.9.tar.lzma
+2021/05/24 | 51311 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-2.9.tar.lzma
+2021/05/24 | 56655 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-x64-2.9.tar.lzma
+2021/05/24 | 239844 | systems/win32/miktex/tm/packages/next/miktex-console-bin-2.9.tar.lzma
+2021/05/24 | 262206 | systems/win32/miktex/tm/packages/next/miktex-console-bin-x64-2.9.tar.lzma
+2021/05/24 | 179817 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-2.9.tar.lzma
+2021/05/24 | 195700 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-x64-2.9.tar.lzma
+2021/05/24 | 52688 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-2.9.tar.lzma
+2021/05/24 | 59108 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-x64-2.9.tar.lzma
+2021/05/24 | 21213 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-2.9.tar.lzma
+2021/05/24 | 23343 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-x64-2.9.tar.lzma
+2021/05/24 | 461991 | systems/win32/miktex/tm/packages/next/miktex-doc.tar.lzma
+2021/05/24 | 45911 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-2.9.tar.lzma
+2021/05/24 | 51118 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-x64-2.9.tar.lzma
+2021/05/24 | 281964 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-2.9.tar.lzma
+2021/05/24 | 321605 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-x64-2.9.tar.lzma
+2021/05/24 | 41085 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-2.9.tar.lzma
+2021/05/24 | 45339 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-x64-2.9.tar.lzma
+2021/05/24 | 117609 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-2.9.tar.lzma
+2021/05/24 | 131707 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-x64-2.9.tar.lzma
+2021/05/24 | 1293150 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-2.9.tar.lzma
+2021/05/24 | 1416033 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-x64-2.9.tar.lzma
+2021/05/24 | 100385 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-2.9.tar.lzma
+2021/05/24 | 112683 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-x64-2.9.tar.lzma
+2021/05/24 | 43042 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-2.9.tar.lzma
+2021/05/24 | 48261 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-x64-2.9.tar.lzma
+2021/05/24 | 25023 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-2.9.tar.lzma
+2021/05/24 | 28138 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-x64-2.9.tar.lzma
+2021/05/24 | 56299 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-2.9.tar.lzma
+2021/05/24 | 62718 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-x64-2.9.tar.lzma
+2021/05/24 | 134951 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-2.9.tar.lzma
+2021/05/24 | 152234 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-x64-2.9.tar.lzma
+2021/05/24 | 73040 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-2.9.tar.lzma
+2021/05/24 | 77920 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-x64-2.9.tar.lzma
+2021/05/24 | 71818 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-2.9.tar.lzma
+2021/05/24 | 81013 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-x64-2.9.tar.lzma
+2021/05/24 | 258884 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-2.9.tar.lzma
+2021/05/24 | 295419 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-x64-2.9.tar.lzma
+2021/05/24 | 22021 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-2.9.tar.lzma
+2021/05/24 | 24979 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-x64-2.9.tar.lzma
+2021/05/24 | 97304 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-2.9.tar.lzma
+2021/05/24 | 112280 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-x64-2.9.tar.lzma
+2021/05/24 | 64387 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-2.9.tar.lzma
+2021/05/24 | 73195 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-x64-2.9.tar.lzma
+2021/05/24 | 96160 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-2.9.tar.lzma
+2021/05/24 | 115518 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-x64-2.9.tar.lzma
+2021/05/24 | 38113 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-2.9.tar.lzma
+2021/05/24 | 42978 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-x64-2.9.tar.lzma
+2021/05/24 | 483043 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-2.9.tar.lzma
+2021/05/24 | 566496 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-x64-2.9.tar.lzma
+2021/05/24 | 147355 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-2.9.tar.lzma
+2021/05/24 | 159439 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-x64-2.9.tar.lzma
+2021/05/24 | 94794 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-2.9.tar.lzma
+2021/05/24 | 109065 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-x64-2.9.tar.lzma
+2021/05/24 | 16346 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-2.9.tar.lzma
+2021/05/24 | 17975 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-x64-2.9.tar.lzma
+2021/05/24 | 28287 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-2.9.tar.lzma
+2021/05/24 | 30029 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-x64-2.9.tar.lzma
+2021/05/24 | 629963 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-2.9.tar.lzma
+2021/05/24 | 681260 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-x64-2.9.tar.lzma
+2021/05/24 | 532034 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-2.9.tar.lzma
+2021/05/24 | 596999 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-x64-2.9.tar.lzma
+2021/05/24 | 476719 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-2.9.tar.lzma
+2021/05/24 | 511069 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-x64-2.9.tar.lzma
+2021/05/24 | 94270 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-2.9.tar.lzma
+2021/05/24 | 103444 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-x64-2.9.tar.lzma
+2021/05/24 | 1688059 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-2.9.tar.lzma
+2021/05/24 | 2002630 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-x64-2.9.tar.lzma
+2021/05/24 | 67606 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-2.9.tar.lzma
+2021/05/24 | 74245 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-x64-2.9.tar.lzma
+2021/05/24 | 27383 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-2.9.tar.lzma
+2021/05/24 | 31608 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-x64-2.9.tar.lzma
+2021/05/24 | 7716 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-2.9.tar.lzma
+2021/05/24 | 8761 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-x64-2.9.tar.lzma
+2021/05/24 | 196519 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-2.9.tar.lzma
+2021/05/24 | 214715 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-x64-2.9.tar.lzma
+2021/05/24 | 250366 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-2.9.tar.lzma
+2021/05/24 | 283982 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-x64-2.9.tar.lzma
+2021/05/24 | 98116 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-2.9.tar.lzma
+2021/05/24 | 103492 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-x64-2.9.tar.lzma
+2021/05/24 | 60653 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-2.9.tar.lzma
+2021/05/24 | 68119 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-x64-2.9.tar.lzma
+2021/05/24 | 124752 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-2.9.tar.lzma
+2021/05/24 | 136483 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-x64-2.9.tar.lzma
+2021/05/24 | 147751 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-2.9.tar.lzma
+2021/05/24 | 163869 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-x64-2.9.tar.lzma
+2021/05/24 | 199543 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-2.9.tar.lzma
+2021/05/24 | 180216 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-x64-2.9.tar.lzma
+2021/05/24 | 67437 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-2.9.tar.lzma
+2021/05/24 | 76856 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-x64-2.9.tar.lzma
+2021/05/24 | 31197 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-2.9.tar.lzma
+2021/05/24 | 35061 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-x64-2.9.tar.lzma
+2021/05/24 | 37859 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-2.9.tar.lzma
+2021/05/24 | 42707 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-x64-2.9.tar.lzma
+2021/05/24 | 42842 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-2.9.tar.lzma
+2021/05/24 | 46756 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-x64-2.9.tar.lzma
+2021/05/24 | 45949 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-2.9.tar.lzma
+2021/05/24 | 52401 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-x64-2.9.tar.lzma
+2021/05/24 | 194116 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-2.9.tar.lzma
+2021/05/24 | 206250 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-x64-2.9.tar.lzma
+2021/05/24 | 35352 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin.tar.lzma
+2021/05/24 | 39839 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin-x64.tar.lzma
+2021/05/24 | 750269 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-2.9.tar.lzma
+2021/05/24 | 815662 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-x64-2.9.tar.lzma
+2021/05/24 | 198280 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-2.9.tar.lzma
+2021/05/24 | 203207 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-x64-2.9.tar.lzma
+2021/05/24 | 207958 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-2.9.tar.lzma
+2021/05/24 | 243372 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-x64-2.9.tar.lzma
+2021/05/24 | 78758 | systems/win32/miktex/tm/packages/next/miktex-png-bin-2.9.tar.lzma
+2021/05/24 | 87666 | systems/win32/miktex/tm/packages/next/miktex-png-bin-x64-2.9.tar.lzma
+2021/05/24 | 1169898 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-2.9.tar.lzma
+2021/05/24 | 1301561 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-x64-2.9.tar.lzma
+2021/05/24 | 20124 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-2.9.tar.lzma
+2021/05/24 | 23908 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-x64-2.9.tar.lzma
+2021/05/24 | 31549 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-2.9.tar.lzma
+2021/05/24 | 37244 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-x64-2.9.tar.lzma
+2021/05/24 | 64031 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-2.9.tar.lzma
+2021/05/24 | 72241 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-x64-2.9.tar.lzma
+2021/05/24 | 44639 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-2.9.tar.lzma
+2021/05/24 | 51551 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-x64-2.9.tar.lzma
+2021/05/24 | 1306688 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-2.9.tar.lzma
+2021/05/24 | 1427856 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-x64-2.9.tar.lzma
+2021/05/24 | 42367 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-2.9.tar.lzma
+2021/05/24 | 51742 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-x64-2.9.tar.lzma
+2021/05/24 | 56193 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin.tar.lzma
+2021/05/24 | 59798 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-x64.tar.lzma
+2021/05/24 | 25220 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-2.9.tar.lzma
+2021/05/24 | 27284 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-x64-2.9.tar.lzma
+2021/05/24 | 16464 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-2.9.tar.lzma
+2021/05/24 | 18143 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-x64-2.9.tar.lzma
+2021/05/24 | 63746 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-2.9.tar.lzma
+2021/05/24 | 69935 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-x64-2.9.tar.lzma
+2021/05/24 | 154419 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-2.9.tar.lzma
+2021/05/24 | 168529 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-x64-2.9.tar.lzma
+2021/05/24 | 56734 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-2.9.tar.lzma
+2021/05/24 | 65305 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-x64-2.9.tar.lzma
+2021/05/24 | 97961 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-2.9.tar.lzma
+2021/05/24 | 105058 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-x64-2.9.tar.lzma
+2021/05/24 | 2671939 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-2.9.tar.lzma
+2021/05/24 | 2793419 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-x64-2.9.tar.lzma
+2021/05/24 | 56330 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-2.9.tar.lzma
+2021/05/24 | 62378 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-x64-2.9.tar.lzma
+2021/05/24 | 33584 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin.tar.lzma
+2021/05/24 | 37315 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin-x64.tar.lzma
+2021/05/24 | 27717 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-2.9.tar.lzma
+2021/05/24 | 33649 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-x64-2.9.tar.lzma
+2021/05/24 | 65548 | systems/win32/miktex/tm/packages/next/miktex-web-bin-2.9.tar.lzma
+2021/05/24 | 70483 | systems/win32/miktex/tm/packages/next/miktex-web-bin-x64-2.9.tar.lzma
+2021/05/24 | 312519 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-2.9.tar.lzma
+2021/05/24 | 346549 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-x64-2.9.tar.lzma
+2021/05/24 | 55513 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin.tar.lzma
+2021/05/24 | 57127 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin-x64.tar.lzma
+2021/05/24 | 586345 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-2.9.tar.lzma
+2021/05/24 | 621415 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-x64-2.9.tar.lzma
+2021/05/24 | 39034 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-2.9.tar.lzma
+2021/05/24 | 43420 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-x64-2.9.tar.lzma
+2021/05/24 | 209568 | systems/win32/miktex/tm/packages/next/miktex-zzdb1-2.9.tar.lzma
+2021/05/24 | 1271577 | systems/win32/miktex/tm/packages/next/miktex-zzdb2-2.9.tar.lzma
+2021/05/24 | 1188814 | systems/win32/miktex/tm/packages/next/miktex-zzdb3-2.9.tar.lzma
+2021/05/24 | 13461 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-2.9.tar.lzma
+2021/05/24 | 14343 | 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
-2021/05/23 | 1153 | systems/win32/miktex/tm/packages/next/pr.ini
+2021/05/24 | 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
@@ -284761,7 +284750,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
-2021/05/23 | 839 | systems/win32/miktex/tm/packages/pr.ini
+2021/05/24 | 839 | 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
@@ -286172,7 +286161,7 @@
2004/06/04 | 404 | tds/tds.sed
2004/06/23 | 65418 | tds/tds.tex
2019/05/29 | 304264 | tds.zip
-2021/05/24 | 186 | timestamp
+2021/05/25 | 186 | timestamp
2002/08/26 | 61898 | usergrps/dante/antrag.pdf
2002/08/26 | 118217 | usergrps/dante/antrag.ps
2017/06/30 | 917 | usergrps/dante/dtk/doc/beispiel.bib
diff --git a/FILES.byname.gz b/FILES.byname.gz
index 3e697a7a6c..26fca9edc6 100644
--- a/FILES.byname.gz
+++ b/FILES.byname.gz
Binary files differ
diff --git a/FILES.last07days b/FILES.last07days
index 175dbc86b8..628523a16e 100644
--- a/FILES.last07days
+++ b/FILES.last07days
@@ -1,276 +1,465 @@
-2021/05/23 | 99605 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-x64-2.9.tar.lzma
+2021/05/25 | 86019 | biblio/bibtex/contrib/econ-bst/econ-econometrica.bst
+2021/05/25 | 84892 | biblio/bibtex/contrib/econ-bst/econ-aea.bst
+2021/05/25 | 84709 | biblio/bibtex/contrib/econ-bst/econ-b.bst
+2021/05/25 | 84575 | biblio/bibtex/contrib/econ-bst/econ-a.bst
+2021/05/25 | 84388 | biblio/bibtex/contrib/econ-bst/econ-no-sort.bst
+2021/05/25 | 84388 | biblio/bibtex/contrib/econ-bst/econ.bst
+2021/05/25 | 84324 | biblio/bibtex/contrib/econ-bst/econ-jie.bst
+2021/05/25 | 82760 | biblio/bibtex/contrib/econ-bst/econ-old.bst
+2021/05/25 | 33772 | biblio/bibtex/contrib/econ-bst/econ-example.tex
+2021/05/25 | 305652 | biblio/bibtex/contrib/econ-bst/econ-example.pdf
+2021/05/25 | 2558 | biblio/bibtex/contrib/econ-bst/customization/cited-part.tex
+2021/05/25 | 226736 | biblio/bibtex/contrib/econ-bst/customization/econ-aea.pdf
+2021/05/25 | 2205 | biblio/bibtex/contrib/econ-bst/customization/econ-numbers.tex
+2021/05/25 | 213457 | biblio/bibtex/contrib/econ-bst/customization/econ-b.pdf
+2021/05/25 | 207437 | biblio/bibtex/contrib/econ-bst/customization/econ-econometrica.pdf
+2021/05/25 | 201072 | biblio/bibtex/contrib/econ-bst/customization/econ-old.pdf
+2021/05/25 | 200352 | biblio/bibtex/contrib/econ-bst/customization/econ-default.pdf
+2021/05/25 | 199606 | biblio/bibtex/contrib/econ-bst/customization/econ-no-sort.pdf
+2021/05/25 | 199485 | biblio/bibtex/contrib/econ-bst/customization/econ-abbr.pdf
+2021/05/25 | 199002 | biblio/bibtex/contrib/econ-bst/customization/econ-jpe.pdf
+2021/05/25 | 198716 | biblio/bibtex/contrib/econ-bst/customization/econ-numbers.pdf
+2021/05/25 | 189836 | biblio/bibtex/contrib/econ-bst/customization/econ-jet.pdf
+2021/05/25 | 1634 | biblio/bibtex/contrib/econ-bst/README.md
+2021/05/25 | 1611 | biblio/bibtex/contrib/econ-bst/customization/econ-aea.tex
+2021/05/25 | 1529 | biblio/bibtex/contrib/econ-bst/customization/econ-abbr.tex
+2021/05/25 | 1517 | biblio/bibtex/contrib/econ-bst/customization/econ-no-sort.tex
+2021/05/25 | 1480 | biblio/bibtex/contrib/econ-bst/customization/econ-jet.tex
+2021/05/25 | 1477 | biblio/bibtex/contrib/econ-bst/customization/econ-econometrica.tex
+2021/05/25 | 1474 | biblio/bibtex/contrib/econ-bst/customization/econ-jie.tex
+2021/05/25 | 1467 | biblio/bibtex/contrib/econ-bst/customization/econ-jpe.tex
+2021/05/25 | 1449 | biblio/bibtex/contrib/econ-bst/customization/econ-old.tex
+2021/05/25 | 1446 | biblio/bibtex/contrib/econ-bst/customization/econ-default.tex
+2021/05/25 | 143958 | biblio/bibtex/contrib/econ-bst/customization/econ-a.pdf
+2021/05/25 | 1404 | biblio/bibtex/contrib/econ-bst/customization/econ-b.tex
+2021/05/25 | 1404 | biblio/bibtex/contrib/econ-bst/customization/econ-a.tex
+2021/05/25 | 11920 | biblio/bibtex/contrib/econ-bst/CHANGES.md
+2021/05/25 | 117644 | biblio/bibtex/contrib/econ-bst/econ-jpe.bst
+2021/05/25 | 115702 | biblio/bibtex/contrib/econ-bst/econ-abbr.bst
+2021/05/25 | 115588 | biblio/bibtex/contrib/econ-bst/econ-jet.bst
+2021/05/24 | 98116 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-2.9.tar.lzma
+2021/05/24 | 97961 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-2.9.tar.lzma
+2021/05/24 | 9752 | systems/win32/miktex/setup/deb/dists/buster/universe/binary-amd64/Packages
+2021/05/24 | 97304 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-2.9.tar.lzma
+2021/05/24 | 972707 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-2.9.tar.lzma
+2021/05/24 | 96848 | macros/latex/contrib/siunitx/siunitx-unit.dtx
+2021/05/24 | 9675 | systems/win32/miktex/setup/deb/dists/stretch/universe/binary-amd64/Packages
+2021/05/24 | 966880 | systems/texlive/tlnet/archive/newtx.doc.r59313.tar.xz
+2021/05/24 | 964 | macros/latex/contrib/siunitx/README.md
+2021/05/24 | 96160 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-2.9.tar.lzma
+2021/05/24 | 95456 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-x64-2.9.tar.lzma
+2021/05/24 | 9482 | systems/win32/miktex/setup/deb/dists/xenial/universe/binary-amd64/Packages
+2021/05/24 | 94794 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-2.9.tar.lzma
+2021/05/24 | 94270 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-2.9.tar.lzma
+2021/05/24 | 92 | systems/win32/miktex/setup/deb/dists/stretch/universe/binary-amd64/Release
+2021/05/24 | 9286 | systems/win32/miktex/setup/deb/dists/bionic/universe/binary-amd64/Packages
+2021/05/24 | 916312 | systems/texlive/tlnet/archive/mcf2graph.doc.r59314.tar.xz
+2021/05/24 | 91372 | systems/texlive/tlnet/archive/colorist.doc.r59316.tar.xz
+2021/05/24 | 901988 | systems/texlive/tlnet/archive/tex4ht.r59324.tar.xz
+2021/05/24 | 90148 | systems/texlive/tlnet/archive/minimalist.doc.r59317.tar.xz
+2021/05/24 | 89 | systems/win32/miktex/setup/deb/dists/xenial/universe/binary-amd64/Release
+2021/05/24 | 89 | systems/win32/miktex/setup/deb/dists/buster/universe/binary-amd64/Release
+2021/05/24 | 89 | systems/win32/miktex/setup/deb/dists/bionic/universe/binary-amd64/Release
+2021/05/24 | 89 | macros/latex/contrib/lwarp/lwarp_baseline_marker.png
+2021/05/24 | 898 | macros/latex/contrib/pbalance/README.md
+2021/05/24 | 87666 | systems/win32/miktex/tm/packages/next/miktex-png-bin-x64-2.9.tar.lzma
+2021/05/24 | 8762 | macros/latex/contrib/siunitx/siunitx-command.dtx
+2021/05/24 | 8761 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-x64-2.9.tar.lzma
+2021/05/24 | 86 | systems/win32/miktex/setup/deb/dists/focal/universe/binary-amd64/Release
+2021/05/24 | 8672 | systems/texlive/tlnet/archive/colorist.r59316.tar.xz
+2021/05/24 | 84163 | macros/generic/expkv-cs/expkv-cs.dtx
+2021/05/24 | 839 | systems/win32/miktex/tm/packages/pr.ini
+2021/05/24 | 837570 | macros/latex/contrib/suftesi/suftesi.pdf
+2021/05/24 | 83418 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-2.9.tar.lzma
+2021/05/24 | 819 | macros/latex/contrib/springer/sr-vorl/README
+2021/05/24 | 815662 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-x64-2.9.tar.lzma
+2021/05/24 | 81013 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-x64-2.9.tar.lzma
+2021/05/24 | 8002 | macros/latex/contrib/huawei/huawei.tex
+2021/05/24 | 78758 | systems/win32/miktex/tm/packages/next/miktex-png-bin-2.9.tar.lzma
+2021/05/24 | 78490 | macros/generic/expkv-def/expkv-def.dtx
+2021/05/24 | 77920 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-x64-2.9.tar.lzma
+2021/05/24 | 7716 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-2.9.tar.lzma
+2021/05/24 | 76856 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-x64-2.9.tar.lzma
+2021/05/24 | 75582 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-x64-2.9.tar.lzma
+2021/05/24 | 750269 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-2.9.tar.lzma
+2021/05/24 | 74245 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-x64-2.9.tar.lzma
+2021/05/24 | 73195 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-x64-2.9.tar.lzma
+2021/05/24 | 73040 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-2.9.tar.lzma
+2021/05/24 | 72241 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-x64-2.9.tar.lzma
+2021/05/24 | 719 | macros/latex/contrib/lwarp/lwarp_baseline_marker.eps
+2021/05/24 | 71818 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-2.9.tar.lzma
+2021/05/24 | 70483 | systems/win32/miktex/tm/packages/next/miktex-web-bin-x64-2.9.tar.lzma
+2021/05/24 | 69935 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-x64-2.9.tar.lzma
+2021/05/24 | 69895 | macros/latex/contrib/springer/sr-vorl/sr-vorl.dtx
+2021/05/24 | 681675 | macros/latex/contrib/suftesi/templates.zip
+2021/05/24 | 6812825 | systems/texlive/tlnet/install-tl-unx.tar.gz
+2021/05/24 | 681260 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-x64-2.9.tar.lzma
+2021/05/24 | 68119 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-x64-2.9.tar.lzma
+2021/05/24 | 67606 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-2.9.tar.lzma
+2021/05/24 | 67478 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-2.9.tar.lzma
+2021/05/24 | 67437 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-2.9.tar.lzma
+2021/05/24 | 66132 | systems/texlive/tlnet/archive/ot-tableau.doc.r59318.tar.xz
+2021/05/24 | 65548 | systems/win32/miktex/tm/packages/next/miktex-web-bin-2.9.tar.lzma
+2021/05/24 | 65305 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-x64-2.9.tar.lzma
+2021/05/24 | 64387 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-2.9.tar.lzma
+2021/05/24 | 64031 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-2.9.tar.lzma
+2021/05/24 | 63746 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-2.9.tar.lzma
+2021/05/24 | 630208 | macros/latex/contrib/huawei.zip
+2021/05/24 | 629963 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-2.9.tar.lzma
+2021/05/24 | 62718 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-x64-2.9.tar.lzma
+2021/05/24 | 62378 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-x64-2.9.tar.lzma
+2021/05/24 | 621415 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-x64-2.9.tar.lzma
+2021/05/24 | 6176 | systems/texlive/tlnet/archive/minimalist.r59317.tar.xz
+2021/05/24 | 60653 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-2.9.tar.lzma
+2021/05/24 | 598400 | macros/latex/contrib/siunitx/siunitx.pdf
+2021/05/24 | 59798 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-x64.tar.lzma
+2021/05/24 | 596999 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-x64-2.9.tar.lzma
+2021/05/24 | 59108 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-x64-2.9.tar.lzma
+2021/05/24 | 586345 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-2.9.tar.lzma
+2021/05/24 | 576615 | systems/win32/miktex/tm/packages/files.csv.lzma
+2021/05/24 | 576227 | systems/win32/miktex/tm/packages/next/files.csv.lzma
+2021/05/24 | 57580 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-x64-2.9.tar.lzma
+2021/05/24 | 57127 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin-x64.tar.lzma
+2021/05/24 | 56734 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-2.9.tar.lzma
+2021/05/24 | 56655 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-x64-2.9.tar.lzma
+2021/05/24 | 566496 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-x64-2.9.tar.lzma
+2021/05/24 | 56413 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-x64-2.9.tar.lzma
+2021/05/24 | 56330 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-2.9.tar.lzma
+2021/05/24 | 56299 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-2.9.tar.lzma
+2021/05/24 | 56193 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin.tar.lzma
+2021/05/24 | 5604344 | systems/texlive/tlnet/archive/newtx.r59313.tar.xz
+2021/05/24 | 55513 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin.tar.lzma
+2021/05/24 | 538 | macros/latex/contrib/pbalance/LICENSE
+2021/05/24 | 532034 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-2.9.tar.lzma
+2021/05/24 | 52688 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-2.9.tar.lzma
+2021/05/24 | 52401 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-x64-2.9.tar.lzma
+2021/05/24 | 51742 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-x64-2.9.tar.lzma
+2021/05/24 | 51551 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-x64-2.9.tar.lzma
+2021/05/24 | 51311 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-2.9.tar.lzma
+2021/05/24 | 51118 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-x64-2.9.tar.lzma
+2021/05/24 | 511069 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-x64-2.9.tar.lzma
+2021/05/24 | 51026 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-2.9.tar.lzma
+2021/05/24 | 503688 | install/macros/generic/expkv.tds.zip
+2021/05/24 | 50142 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-2.9.tar.lzma
+2021/05/24 | 497557 | macros/generic/expkv.zip
+2021/05/24 | 4921 | macros/latex/contrib/ninecolors/ninecolors.tex
+2021/05/24 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
+2021/05/24 | 483043 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-2.9.tar.lzma
+2021/05/24 | 48261 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-x64-2.9.tar.lzma
+2021/05/24 | 481077 | macros/generic/expkv/expkv.pdf
+2021/05/24 | 479340 | systems/texlive/tlnet/archive/beaulivre.doc.r59320.tar.xz
+2021/05/24 | 4770092 | systems/texlive/tlnet/archive/tcolorbox.doc.r59319.tar.xz
+2021/05/24 | 476719 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-2.9.tar.lzma
+2021/05/24 | 47501 | macros/latex/contrib/siunitx/siunitx-table.dtx
+2021/05/24 | 4748 | macros/latex/contrib/siunitx/siunitx-abbreviations.cfg
+2021/05/24 | 473 | systems/win32/miktex/setup/deb/dists/xenial/Release.gpg
+2021/05/24 | 473 | systems/win32/miktex/setup/deb/dists/stretch/Release.gpg
+2021/05/24 | 473 | systems/win32/miktex/setup/deb/dists/focal/Release.gpg
+2021/05/24 | 473 | systems/win32/miktex/setup/deb/dists/buster/Release.gpg
+2021/05/24 | 473 | systems/win32/miktex/setup/deb/dists/bionic/Release.gpg
+2021/05/24 | 470367 | macros/latex/contrib/springer/sr-vorl.zip
+2021/05/24 | 46756 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-x64-2.9.tar.lzma
+2021/05/24 | 4629 | macros/latex/contrib/siunitx/siunitx-locale.dtx
+2021/05/24 | 461991 | systems/win32/miktex/tm/packages/next/miktex-doc.tar.lzma
+2021/05/24 | 45949 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-2.9.tar.lzma
+2021/05/24 | 45911 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-2.9.tar.lzma
+2021/05/24 | 455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
+2021/05/24 | 455 | systems/texlive/tlnet/install-tl.zip.sha512.asc
+2021/05/24 | 455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
+2021/05/24 | 455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
+2021/05/24 | 45339 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-x64-2.9.tar.lzma
+2021/05/24 | 451934 | macros/latex/contrib/springer/sr-vorl/sr-vorl.pdf
+2021/05/24 | 449068 | systems/texlive/tlnet/archive/simplivre.doc.r59323.tar.xz
+2021/05/24 | 44639 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-2.9.tar.lzma
+2021/05/24 | 445972 | systems/texlive/tlnet/archive/lebhart.doc.r59322.tar.xz
+2021/05/24 | 43420 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-x64-2.9.tar.lzma
+2021/05/24 | 43042 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-2.9.tar.lzma
+2021/05/24 | 42978 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-x64-2.9.tar.lzma
+2021/05/24 | 42842 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-2.9.tar.lzma
+2021/05/24 | 42707 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-x64-2.9.tar.lzma
+2021/05/24 | 4247690 | install/macros/latex/contrib/lwarp.tds.zip
+2021/05/24 | 42367 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-2.9.tar.lzma
+2021/05/24 | 418865 | install/macros/generic/expkv-def.tds.zip
+2021/05/24 | 412328 | macros/generic/expkv-def.zip
+2021/05/24 | 41085 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-2.9.tar.lzma
+2021/05/24 | 40885 | biblio/bibtex/contrib/econ-bst/econ-example.bib
+2021/05/24 | 406256 | macros/generic/expkv-def/expkv-def.pdf
+2021/05/24 | 40223 | macros/latex/contrib/pbalance/pbalance.dtx
+2021/05/24 | 39839 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin-x64.tar.lzma
+2021/05/24 | 39772 | macros/latex/contrib/siunitx/CHANGELOG.md
+2021/05/24 | 397408 | systems/texlive/tlnet/archive/texlive-scripts.doc.r59312.tar.xz
+2021/05/24 | 392975 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-x64-2.9.tar.lzma
+2021/05/24 | 39034 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-2.9.tar.lzma
+2021/05/24 | 38113 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-2.9.tar.lzma
+2021/05/24 | 380244 | systems/texlive/tlnet/archive/einfart.doc.r59321.tar.xz
+2021/05/24 | 379753 | install/macros/generic/expkv-cs.tds.zip
+2021/05/24 | 37859 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-2.9.tar.lzma
+2021/05/24 | 373867 | macros/generic/expkv-cs.zip
+2021/05/24 | 37315 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin-x64.tar.lzma
+2021/05/24 | 37244 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-x64-2.9.tar.lzma
+2021/05/24 | 3687 | macros/latex/contrib/siunitx/siunitx.ins
+2021/05/24 | 3667099 | macros/latex/contrib/lwarp.zip
+2021/05/24 | 36640 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-x64-2.9.tar.lzma
+2021/05/24 | 363871 | macros/latex/contrib/huawei/huawei.pdf
+2021/05/24 | 363784 | macros/generic/expkv-cs/expkv-cs.pdf
+2021/05/24 | 35632 | macros/latex/contrib/ninecolors.zip
+2021/05/24 | 35352 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin.tar.lzma
+2021/05/24 | 35061 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-x64-2.9.tar.lzma
+2021/05/24 | 346549 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-x64-2.9.tar.lzma
+2021/05/24 | 34651 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-x64-2.9.tar.lzma
+2021/05/24 | 33649 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-x64-2.9.tar.lzma
+2021/05/24 | 33584 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin.tar.lzma
+2021/05/24 | 33130 | macros/latex/contrib/siunitx/siunitx-compound.dtx
+2021/05/24 | 330962 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-2.9.tar.lzma
+2021/05/24 | 33073 | macros/latex/contrib/lwarp/lwarp.ins
+2021/05/24 | 32644 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-2.9.tar.lzma
+2021/05/24 | 32344 | macros/latex/contrib/ninecolors/ninecolors.pdf
+2021/05/24 | 321605 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-x64-2.9.tar.lzma
+2021/05/24 | 3202256 | macros/latex/contrib/lwarp/lwarp.pdf
+2021/05/24 | 31738 | macros/latex/contrib/siunitx/siunitx-version-1.cfg
+2021/05/24 | 31608 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-x64-2.9.tar.lzma
+2021/05/24 | 31549 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-2.9.tar.lzma
+2021/05/24 | 31326 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-x64-2.9.tar.lzma
+2021/05/24 | 312519 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-2.9.tar.lzma
+2021/05/24 | 31197 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-2.9.tar.lzma
+2021/05/24 | 30806 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-x64-2.9.tar.lzma
+2021/05/24 | 30628 | macros/latex/contrib/siunitx/siunitx-print.dtx
+2021/05/24 | 3018 | biblio/bibtex/contrib/econ-bst/customization/README.md
+2021/05/24 | 30029 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-x64-2.9.tar.lzma
+2021/05/24 | 29842 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-2.9.tar.lzma
+2021/05/24 | 2968 | systems/texlive/tlnet/archive/einfart.r59321.tar.xz
+2021/05/24 | 295419 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-x64-2.9.tar.lzma
+2021/05/24 | 2947 | macros/latex/contrib/lwarp/lwarp_tutorial.txt
+2021/05/24 | 2940 | systems/texlive/tlnet/archive/simplivre.r59323.tar.xz
+2021/05/24 | 29079 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-2.9.tar.lzma
+2021/05/24 | 29001 | macros/latex/contrib/lwarp/lwarpmk.lua
+2021/05/24 | 2883 | macros/latex/contrib/siunitx/siunitx-binary.dtx
+2021/05/24 | 2880 | systems/texlive/tlnet/archive/lebhart.r59322.tar.xz
+2021/05/24 | 2856 | systems/texlive/tlnet/archive/beaulivre.r59320.tar.xz
+2021/05/24 | 283982 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-x64-2.9.tar.lzma
+2021/05/24 | 28287 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-2.9.tar.lzma
+2021/05/24 | 281964 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-2.9.tar.lzma
+2021/05/24 | 28138 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-x64-2.9.tar.lzma
+2021/05/24 | 2793419 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-x64-2.9.tar.lzma
+2021/05/24 | 27717 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-2.9.tar.lzma
+2021/05/24 | 27645 | macros/latex/contrib/siunitx/siunitx-emulation.dtx
+2021/05/24 | 27383 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-2.9.tar.lzma
+2021/05/24 | 273398 | macros/latex/contrib/siunitx/siunitx-v2.sty
+2021/05/24 | 2728530 | macros/latex/contrib/lwarp/lwarp.dtx
+2021/05/24 | 27284 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-x64-2.9.tar.lzma
+2021/05/24 | 27185 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-2.9.tar.lzma
+2021/05/24 | 2685056 | biblio/bibtex/contrib/econ-bst.zip
+2021/05/24 | 2671939 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-2.9.tar.lzma
+2021/05/24 | 262206 | systems/win32/miktex/tm/packages/next/miktex-console-bin-x64-2.9.tar.lzma
+2021/05/24 | 258884 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-2.9.tar.lzma
+2021/05/24 | 25719 | macros/latex/contrib/siunitx/siunitx-complex.dtx
+2021/05/24 | 256471 | macros/latex/contrib/pbalance.zip
+2021/05/24 | 25584692 | systems/texlive/tlnet/install-tl.zip
+2021/05/24 | 253724 | macros/latex/contrib/huawei/images/huawei-cover.pdf
+2021/05/24 | 25220 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-2.9.tar.lzma
+2021/05/24 | 250366 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-2.9.tar.lzma
+2021/05/24 | 25023 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-2.9.tar.lzma
+2021/05/24 | 24979 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-x64-2.9.tar.lzma
+2021/05/24 | 243372 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-x64-2.9.tar.lzma
+2021/05/24 | 242951 | macros/latex/contrib/pbalance/pbalance.pdf
+2021/05/24 | 2426 | macros/latex/contrib/siunitx/siunitx-code.tex
+2021/05/24 | 239844 | systems/win32/miktex/tm/packages/next/miktex-console-bin-2.9.tar.lzma
+2021/05/24 | 2392 | systems/texlive/tlnet/archive/ot-tableau.r59318.tar.xz
+2021/05/24 | 23908 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-x64-2.9.tar.lzma
+2021/05/24 | 23476 | systems/texlive/tlnet/archive/mcf2graph.r59314.tar.xz
+2021/05/24 | 23343 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-x64-2.9.tar.lzma
+2021/05/24 | 231064 | systems/texlive/tlnet/archive/tcolorbox.r59319.tar.xz
+2021/05/24 | 2307844 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
+2021/05/24 | 229551 | macros/latex/contrib/suftesi/suftesi.dtx
+2021/05/24 | 22021 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-2.9.tar.lzma
+2021/05/24 | 2193308 | install/macros/latex/contrib/siunitx.tds.zip
+2021/05/24 | 2155910 | macros/latex/contrib/siunitx.zip
+2021/05/24 | 214715 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-x64-2.9.tar.lzma
+2021/05/24 | 21213 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-2.9.tar.lzma
+2021/05/24 | 209613 | systems/win32/miktex/tm/packages/miktex-zzdb1-2.9.tar.lzma
+2021/05/24 | 209568 | systems/win32/miktex/tm/packages/next/miktex-zzdb1-2.9.tar.lzma
+2021/05/24 | 20807384 | systems/texlive/tlnet/install-tl-windows.exe
+2021/05/24 | 207958 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-2.9.tar.lzma
+2021/05/24 | 2071 | macros/latex/contrib/pbalance/pbalance.ins
+2021/05/24 | 206250 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-x64-2.9.tar.lzma
+2021/05/24 | 2054 | macros/latex/contrib/huawei/samples/huawei-charter.tex
+2021/05/24 | 2038 | systems/win32/miktex/setup/deb/dists/stretch/InRelease
+2021/05/24 | 2034 | systems/win32/miktex/setup/deb/dists/xenial/InRelease
+2021/05/24 | 2034 | systems/win32/miktex/setup/deb/dists/buster/InRelease
+2021/05/24 | 2034 | systems/win32/miktex/setup/deb/dists/bionic/InRelease
+2021/05/24 | 203207 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-x64-2.9.tar.lzma
+2021/05/24 | 2030 | systems/win32/miktex/setup/deb/dists/focal/InRelease
+2021/05/24 | 20124 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-2.9.tar.lzma
+2021/05/24 | 2003 | systems/win32/miktex/setup/deb/dists/focal/universe/binary-amd64/Packages.bz2
+2021/05/24 | 2002630 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-x64-2.9.tar.lzma
+2021/05/24 | 199543 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-2.9.tar.lzma
+2021/05/24 | 198280 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-2.9.tar.lzma
+2021/05/24 | 196519 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-2.9.tar.lzma
+2021/05/24 | 195700 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-x64-2.9.tar.lzma
+2021/05/24 | 19541 | macros/latex/contrib/siunitx/siunitx.dtx
+2021/05/24 | 194116 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-2.9.tar.lzma
+2021/05/24 | 1934 | macros/latex/contrib/huawei/samples/huawei-cfp.tex
+2021/05/24 | 1820 | systems/win32/miktex/setup/deb/dists/buster/universe/binary-amd64/Packages.bz2
+2021/05/24 | 18143 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-x64-2.9.tar.lzma
+2021/05/24 | 1803 | systems/win32/miktex/setup/deb/dists/stretch/universe/binary-amd64/Packages.bz2
+2021/05/24 | 180216 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-x64-2.9.tar.lzma
+2021/05/24 | 179817 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-2.9.tar.lzma
+2021/05/24 | 17975 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-x64-2.9.tar.lzma
+2021/05/24 | 1794 | systems/win32/miktex/setup/deb/dists/xenial/universe/binary-amd64/Packages.bz2
+2021/05/24 | 1778 | systems/win32/miktex/setup/deb/dists/bionic/universe/binary-amd64/Packages.bz2
+2021/05/24 | 1729 | macros/latex/contrib/siunitx/siunitx-binary.cfg
+2021/05/24 | 17249900 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
+2021/05/24 | 1688059 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-2.9.tar.lzma
+2021/05/24 | 168529 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-x64-2.9.tar.lzma
+2021/05/24 | 1670 | macros/latex/contrib/suftesi/README
+2021/05/24 | 16621 | macros/latex/contrib/huawei/huawei.cls
+2021/05/24 | 16547 | macros/latex/contrib/ninecolors/ninecolors.sty
+2021/05/24 | 16529 | macros/latex/contrib/siunitx/siunitx-angle.dtx
+2021/05/24 | 16464 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-2.9.tar.lzma
+2021/05/24 | 163869 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-x64-2.9.tar.lzma
+2021/05/24 | 16346 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-2.9.tar.lzma
+2021/05/24 | 1633 | systems/win32/miktex/setup/deb/dists/focal/universe/binary-amd64/Packages.gz
+2021/05/24 | 1624 | macros/latex/contrib/lwarp/README.txt
+2021/05/24 | 159439 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-x64-2.9.tar.lzma
+2021/05/24 | 1572245 | install/macros/latex/contrib/suftesi.tds.zip
+2021/05/24 | 1555297 | macros/latex/contrib/suftesi.zip
+2021/05/24 | 154419 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-2.9.tar.lzma
+2021/05/24 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
+2021/05/24 | 1539 | systems/win32/miktex/setup/deb/dists/buster/universe/binary-amd64/Packages.gz
+2021/05/24 | 1532 | systems/win32/miktex/setup/deb/dists/stretch/universe/binary-amd64/Packages.gz
+2021/05/24 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
+2021/05/24 | 152234 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-x64-2.9.tar.lzma
+2021/05/24 | 1516 | systems/win32/miktex/setup/deb/dists/stretch/Release
+2021/05/24 | 1512 | systems/win32/miktex/setup/deb/dists/xenial/Release
+2021/05/24 | 1512 | systems/win32/miktex/setup/deb/dists/buster/Release
+2021/05/24 | 1512 | systems/win32/miktex/setup/deb/dists/bionic/Release
+2021/05/24 | 1510 | systems/win32/miktex/setup/deb/dists/xenial/universe/Contents-amd64.gz
+2021/05/24 | 1510 | systems/win32/miktex/setup/deb/dists/stretch/universe/Contents-amd64.gz
+2021/05/24 | 1510 | systems/win32/miktex/setup/deb/dists/focal/universe/Contents-amd64.gz
+2021/05/24 | 1510 | systems/win32/miktex/setup/deb/dists/buster/universe/Contents-amd64.gz
+2021/05/24 | 1510 | systems/win32/miktex/setup/deb/dists/bionic/universe/Contents-amd64.gz
+2021/05/24 | 1508 | systems/win32/miktex/setup/deb/dists/focal/Release
+2021/05/24 | 1490 | systems/win32/miktex/setup/deb/dists/xenial/universe/binary-amd64/Packages.gz
+2021/05/24 | 1490 | systems/win32/miktex/setup/deb/dists/bionic/universe/binary-amd64/Packages.gz
+2021/05/24 | 147751 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-2.9.tar.lzma
+2021/05/24 | 147355 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-2.9.tar.lzma
+2021/05/24 | 145 | systems/texlive/tlnet/install-tl.zip.sha512
+2021/05/24 | 145104 | systems/texlive/tlnet/archive/pxbase.doc.r59315.tar.xz
+2021/05/24 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
+2021/05/24 | 1443594 | macros/latex/contrib/siunitx/siunitx-code.pdf
+2021/05/24 | 14351 | macros/latex/contrib/siunitx/siunitx-quantity.dtx
+2021/05/24 | 14343 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-x64-2.9.tar.lzma
+2021/05/24 | 1430 | macros/generic/expkv/README.md
+2021/05/24 | 1427856 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-x64-2.9.tar.lzma
+2021/05/24 | 1416033 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-x64-2.9.tar.lzma
+2021/05/24 | 138574 | macros/latex/contrib/siunitx/siunitx.tex
+2021/05/24 | 136483 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-x64-2.9.tar.lzma
+2021/05/24 | 136384 | systems/texlive/tlnet/archive/tex4ht.doc.r59324.tar.xz
+2021/05/24 | 1362 | macros/latex/contrib/huawei/README.md
+2021/05/24 | 134951 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-2.9.tar.lzma
+2021/05/24 | 13461 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-2.9.tar.lzma
+2021/05/24 | 131707 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-x64-2.9.tar.lzma
+2021/05/24 | 1306688 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-2.9.tar.lzma
+2021/05/24 | 1301561 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-x64-2.9.tar.lzma
+2021/05/24 | 1296 | macros/generic/expkv-cs/README.md
+2021/05/24 | 1293150 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-2.9.tar.lzma
+2021/05/24 | 1272214 | systems/win32/miktex/tm/packages/miktex-zzdb2-2.9.tar.lzma
+2021/05/24 | 1271577 | systems/win32/miktex/tm/packages/next/miktex-zzdb2-2.9.tar.lzma
+2021/05/24 | 1269 | macros/generic/expkv-def/README.md
+2021/05/24 | 124752 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-2.9.tar.lzma
+2021/05/24 | 1209160 | systems/texlive/tlnet/archive/tex4ht.source.r59324.tar.xz
+2021/05/24 | 12068 | systems/texlive/tlnet/archive/pxbase.r59315.tar.xz
+2021/05/24 | 1188814 | systems/win32/miktex/tm/packages/next/miktex-zzdb3-2.9.tar.lzma
+2021/05/24 | 1187846 | systems/win32/miktex/tm/packages/miktex-zzdb3-2.9.tar.lzma
+2021/05/24 | 117609 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-2.9.tar.lzma
+2021/05/24 | 1169898 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-2.9.tar.lzma
+2021/05/24 | 115518 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-x64-2.9.tar.lzma
+2021/05/24 | 1153 | systems/win32/miktex/tm/packages/next/pr.ini
+2021/05/24 | 113651 | macros/latex/contrib/siunitx/siunitx-number.dtx
+2021/05/24 | 112683 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-x64-2.9.tar.lzma
+2021/05/24 | 112280 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-x64-2.9.tar.lzma
+2021/05/24 | 10957 | systems/win32/miktex/setup/deb/dists/focal/universe/binary-amd64/Packages
+2021/05/24 | 109400 | macros/generic/expkv/expkv.dtx
+2021/05/24 | 1091102 | support/TeX4ht/source/tex4ht-4ht.tex
+2021/05/24 | 109065 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-x64-2.9.tar.lzma
+2021/05/24 | 107992 | systems/texlive/tlnet/archive/texlive-scripts.r59312.tar.xz
+2021/05/24 | 1075242 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-x64-2.9.tar.lzma
+2021/05/24 | 105058 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-x64-2.9.tar.lzma
+2021/05/24 | 103492 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-x64-2.9.tar.lzma
+2021/05/24 | 103444 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-x64-2.9.tar.lzma
+2021/05/24 | 10106 | macros/latex/contrib/siunitx/siunitx-abbreviation.dtx
+2021/05/24 | 10045 | macros/latex/contrib/siunitx/siunitx-symbol.dtx
+2021/05/24 | 100385 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-2.9.tar.lzma
2021/05/23 | 98872 | macros/latex/contrib/minimalist.zip
-2021/05/23 | 98519 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-2.9.tar.lzma
-2021/05/23 | 97491 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-2.9.tar.lzma
-2021/05/23 | 97134 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-2.9.tar.lzma
-2021/05/23 | 968694 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-2.9.tar.lzma
-2021/05/23 | 96145 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-2.9.tar.lzma
2021/05/23 | 94877 | graphics/mcf2graph/mcf_data_base.mcf
2021/05/23 | 948444 | graphics/mcf2graph.zip
-2021/05/23 | 94802 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-2.9.tar.lzma
-2021/05/23 | 94739 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-x64-2.9.tar.lzma
-2021/05/23 | 94267 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-2.9.tar.lzma
2021/05/23 | 880688 | systems/texlive/tlnet/archive/beebe.r59302.tar.xz
-2021/05/23 | 8773 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-x64-2.9.tar.lzma
-2021/05/23 | 87704 | systems/win32/miktex/tm/packages/next/miktex-png-bin-x64-2.9.tar.lzma
-2021/05/23 | 87637 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-2.9.tar.lzma
-2021/05/23 | 84774 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-2.9.tar.lzma
-2021/05/23 | 839 | systems/win32/miktex/tm/packages/pr.ini
-2021/05/23 | 816072 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-x64-2.9.tar.lzma
2021/05/23 | 81144 | macros/latex/contrib/colorist/colorist-doc.pdf
-2021/05/23 | 80661 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-x64-2.9.tar.lzma
-2021/05/23 | 78746 | systems/win32/miktex/tm/packages/next/miktex-png-bin-2.9.tar.lzma
-2021/05/23 | 77858 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-x64-2.9.tar.lzma
-2021/05/23 | 77487 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-x64-2.9.tar.lzma
-2021/05/23 | 7747 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-2.9.tar.lzma
2021/05/23 | 7746 | macros/unicodetex/latex/beaulivre/beaulivre.cls
2021/05/23 | 7742 | macros/unicodetex/latex/lebhart/lebhart.cls
-2021/05/23 | 75418 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-x64-2.9.tar.lzma
-2021/05/23 | 748362 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-2.9.tar.lzma
-2021/05/23 | 74164 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-x64-2.9.tar.lzma
2021/05/23 | 7352 | language/japanese/pxbase/pxjsfenc.def
-2021/05/23 | 73181 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-2.9.tar.lzma
-2021/05/23 | 72861 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-x64-2.9.tar.lzma
-2021/05/23 | 72150 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-x64-2.9.tar.lzma
-2021/05/23 | 71567 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-2.9.tar.lzma
-2021/05/23 | 70325 | systems/win32/miktex/tm/packages/next/miktex-web-bin-x64-2.9.tar.lzma
-2021/05/23 | 70110 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-x64-2.9.tar.lzma
-2021/05/23 | 6812424 | systems/texlive/tlnet/install-tl-unx.tar.gz
-2021/05/23 | 680052 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-x64-2.9.tar.lzma
-2021/05/23 | 67928 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-x64-2.9.tar.lzma
+2021/05/23 | 6872 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
2021/05/23 | 67907 | macros/latex/contrib/ot-tableau.zip
-2021/05/23 | 67681 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-2.9.tar.lzma
-2021/05/23 | 67650 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-2.9.tar.lzma
-2021/05/23 | 67452 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-2.9.tar.lzma
-2021/05/23 | 65732 | systems/win32/miktex/tm/packages/next/miktex-web-bin-2.9.tar.lzma
-2021/05/23 | 65321 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-x64-2.9.tar.lzma
-2021/05/23 | 64015 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-2.9.tar.lzma
-2021/05/23 | 63836 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-2.9.tar.lzma
-2021/05/23 | 63675 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-2.9.tar.lzma
-2021/05/23 | 62801 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-x64-2.9.tar.lzma
-2021/05/23 | 625283 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-2.9.tar.lzma
-2021/05/23 | 62227 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-x64-2.9.tar.lzma
2021/05/23 | 6217425 | macros/latex/contrib/tcolorbox.zip
-2021/05/23 | 618766 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-x64-2.9.tar.lzma
2021/05/23 | 613 | macros/latex/contrib/ot-tableau/README
-2021/05/23 | 60550 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-2.9.tar.lzma
2021/05/23 | 60480 | systems/texlive/tlnet/archive/siunitx.r59308.tar.xz
-2021/05/23 | 59831 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-x64.tar.lzma
-2021/05/23 | 594871 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-x64-2.9.tar.lzma
2021/05/23 | 59482 | graphics/mcf2graph/mcf_manual.tex
-2021/05/23 | 59145 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-x64-2.9.tar.lzma
-2021/05/23 | 583630 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-2.9.tar.lzma
-2021/05/23 | 576615 | systems/win32/miktex/tm/packages/files.csv.lzma
-2021/05/23 | 576226 | systems/win32/miktex/tm/packages/next/files.csv.lzma
-2021/05/23 | 57597 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-x64-2.9.tar.lzma
-2021/05/23 | 57066 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin-x64.tar.lzma
-2021/05/23 | 56910 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-2.9.tar.lzma
-2021/05/23 | 567627 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-x64-2.9.tar.lzma
-2021/05/23 | 56718 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-x64-2.9.tar.lzma
-2021/05/23 | 56456 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-x64-2.9.tar.lzma
-2021/05/23 | 56222 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin.tar.lzma
-2021/05/23 | 55821 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-2.9.tar.lzma
-2021/05/23 | 55563 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin.tar.lzma
-2021/05/23 | 55218 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-2.9.tar.lzma
2021/05/23 | 55104 | macros/latex/contrib/colorist/colorist.sty
2021/05/23 | 5430 | macros/latex/contrib/ot-tableau/ot-tableau.sty
-2021/05/23 | 532039 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-2.9.tar.lzma
-2021/05/23 | 52475 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-2.9.tar.lzma
-2021/05/23 | 52454 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-x64-2.9.tar.lzma
-2021/05/23 | 51979 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-x64-2.9.tar.lzma
-2021/05/23 | 51797 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-x64-2.9.tar.lzma
-2021/05/23 | 51432 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-2.9.tar.lzma
-2021/05/23 | 511633 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-x64-2.9.tar.lzma
-2021/05/23 | 51160 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-x64-2.9.tar.lzma
-2021/05/23 | 50846 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-2.9.tar.lzma
-2021/05/23 | 49971 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-2.9.tar.lzma
2021/05/23 | 497917 | macros/unicodetex/latex/beaulivre.zip
-2021/05/23 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
2021/05/23 | 484991 | macros/unicodetex/latex/simplivre.zip
-2021/05/23 | 484058 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-2.9.tar.lzma
-2021/05/23 | 47877 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-x64-2.9.tar.lzma
-2021/05/23 | 475935 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-2.9.tar.lzma
-2021/05/23 | 4707 | systems/win32/miktex/tm/packages/next/miktex-config-2.9.tar.lzma
-2021/05/23 | 47008 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-x64-2.9.tar.lzma
2021/05/23 | 462117 | macros/unicodetex/latex/lebhart.zip
-2021/05/23 | 461397 | systems/win32/miktex/tm/packages/next/miktex-doc.tar.lzma
-2021/05/23 | 45937 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-2.9.tar.lzma
-2021/05/23 | 45648 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-2.9.tar.lzma
-2021/05/23 | 455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
-2021/05/23 | 455 | systems/texlive/tlnet/install-tl.zip.sha512.asc
-2021/05/23 | 455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
-2021/05/23 | 455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
2021/05/23 | 455048 | systems/texlive/tlnet/archive/newpx.doc.r59303.tar.xz
-2021/05/23 | 45277 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-x64-2.9.tar.lzma
2021/05/23 | 4485 | graphics/mcf2graph/README
2021/05/23 | 4484 | systems/texlive/tlnet/archive/mindflow.source.r59307.tar.xz
2021/05/23 | 44332 | graphics/mcf2graph/mcf_man_soc.mf
-2021/05/23 | 43678 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-2.9.tar.lzma
2021/05/23 | 434 | language/japanese/pxbase/pxbase.sty
-2021/05/23 | 43392 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-x64-2.9.tar.lzma
-2021/05/23 | 43057 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-2.9.tar.lzma
-2021/05/23 | 42924 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-2.9.tar.lzma
-2021/05/23 | 42626 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-x64-2.9.tar.lzma
-2021/05/23 | 42573 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-x64-2.9.tar.lzma
2021/05/23 | 424 | systems/texlive/tlnet/archive/tlmgrbasics.r59305.tar.xz
-2021/05/23 | 42388 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-2.9.tar.lzma
-2021/05/23 | 41104 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-2.9.tar.lzma
2021/05/23 | 397645 | macros/unicodetex/latex/einfart.zip
-2021/05/23 | 397412 | systems/texlive/tlnet/archive/texlive-scripts.doc.r59302.tar.xz
-2021/05/23 | 39690 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin-x64.tar.lzma
-2021/05/23 | 39564 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-2.9.tar.lzma
-2021/05/23 | 392596 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-x64-2.9.tar.lzma
-2021/05/23 | 38070 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-2.9.tar.lzma
-2021/05/23 | 38066 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-2.9.tar.lzma
2021/05/23 | 377862 | graphics/mcf2graph/mcf_manual.pdf
-2021/05/23 | 37293 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin-x64.tar.lzma
-2021/05/23 | 37244 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-x64-2.9.tar.lzma
-2021/05/23 | 36679 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-x64-2.9.tar.lzma
-2021/05/23 | 35462 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin.tar.lzma
-2021/05/23 | 35064 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-x64-2.9.tar.lzma
-2021/05/23 | 34633 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-x64-2.9.tar.lzma
-2021/05/23 | 345367 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-x64-2.9.tar.lzma
-2021/05/23 | 33441 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin.tar.lzma
-2021/05/23 | 33151 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-x64-2.9.tar.lzma
-2021/05/23 | 330233 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-2.9.tar.lzma
-2021/05/23 | 32744 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-2.9.tar.lzma
-2021/05/23 | 321894 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-x64-2.9.tar.lzma
2021/05/23 | 320314 | graphics/mcf2graph/mcf_example.pdf
-2021/05/23 | 31593 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-x64-2.9.tar.lzma
-2021/05/23 | 31544 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-2.9.tar.lzma
-2021/05/23 | 31343 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-x64-2.9.tar.lzma
2021/05/23 | 3129 | language/japanese/pxbase/upkcat.sty
-2021/05/23 | 31192 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-2.9.tar.lzma
2021/05/23 | 311684 | systems/texlive/tlnet/archive/easybook.doc.r59306.tar.xz
-2021/05/23 | 311191 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-2.9.tar.lzma
-2021/05/23 | 30886 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-x64-2.9.tar.lzma
2021/05/23 | 30100 | systems/texlive/tlnet/archive/easybook.source.r59306.tar.xz
-2021/05/23 | 30037 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-x64-2.9.tar.lzma
2021/05/23 | 300321 | macros/unicodetex/latex/beaulivre/beaulivre-doc-cn.pdf
-2021/05/23 | 29871 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-2.9.tar.lzma
-2021/05/23 | 295554 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-x64-2.9.tar.lzma
2021/05/23 | 2939 | macros/latex/contrib/colorist/colorart.cls
2021/05/23 | 2936 | macros/latex/contrib/colorist/colorbook.cls
-2021/05/23 | 29055 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-2.9.tar.lzma
-2021/05/23 | 283978 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-x64-2.9.tar.lzma
-2021/05/23 | 282106 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-2.9.tar.lzma
-2021/05/23 | 28120 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-2.9.tar.lzma
2021/05/23 | 280208 | macros/unicodetex/latex/lebhart/lebhart-doc-cn.pdf
-2021/05/23 | 28009 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-x64-2.9.tar.lzma
-2021/05/23 | 27361 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-2.9.tar.lzma
-2021/05/23 | 27274 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-x64-2.9.tar.lzma
-2021/05/23 | 27198 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-2.9.tar.lzma
-2021/05/23 | 27182 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-2.9.tar.lzma
2021/05/23 | 2695 | graphics/mcf2graph/mcf_exa_soc.mf
2021/05/23 | 26344 | systems/texlive/tlnet/archive/ltximg.r59309.tar.xz
-2021/05/23 | 261963 | systems/win32/miktex/tm/packages/next/miktex-console-bin-x64-2.9.tar.lzma
-2021/05/23 | 2616931 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-x64-2.9.tar.lzma
-2021/05/23 | 258665 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-2.9.tar.lzma
-2021/05/23 | 25584669 | systems/texlive/tlnet/install-tl.zip
-2021/05/23 | 25341 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-2.9.tar.lzma
-2021/05/23 | 25154 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-2.9.tar.lzma
-2021/05/23 | 250213 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-2.9.tar.lzma
-2021/05/23 | 25001 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-x64-2.9.tar.lzma
-2021/05/23 | 2499404 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-2.9.tar.lzma
2021/05/23 | 245504 | systems/texlive/tlnet/archive/ltximg.doc.r59309.tar.xz
-2021/05/23 | 243480 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-x64-2.9.tar.lzma
-2021/05/23 | 239477 | systems/win32/miktex/tm/packages/next/miktex-console-bin-2.9.tar.lzma
-2021/05/23 | 23883 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-x64-2.9.tar.lzma
2021/05/23 | 2363 | language/japanese/pxbase/README.md
-2021/05/23 | 23291 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-x64-2.9.tar.lzma
2021/05/23 | 2318 | graphics/mcf2graph/mcf_example.tex
-2021/05/23 | 2307588 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
2021/05/23 | 227952 | systems/texlive/tlnet/archive/bmstu-iu8.doc.r59310.tar.xz
-2021/05/23 | 22040 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-2.9.tar.lzma
2021/05/23 | 21729 | macros/unicodetex/latex/beaulivre/beaulivre-doc-en.tex
-2021/05/23 | 214105 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-x64-2.9.tar.lzma
-2021/05/23 | 21128 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-2.9.tar.lzma
-2021/05/23 | 211053 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-x64-2.9.tar.lzma
-2021/05/23 | 209601 | systems/win32/miktex/tm/packages/miktex-zzdb1-2.9.tar.lzma
-2021/05/23 | 209580 | systems/win32/miktex/tm/packages/next/miktex-zzdb1-2.9.tar.lzma
-2021/05/23 | 208181 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-2.9.tar.lzma
-2021/05/23 | 20808435 | systems/texlive/tlnet/install-tl-windows.exe
2021/05/23 | 2071840 | systems/texlive/tlnet/archive/kpfonts-otf.doc.r59304.tar.xz
2021/05/23 | 2068388 | systems/texlive/tlnet/archive/newpx.r59303.tar.xz
2021/05/23 | 20521 | macros/unicodetex/latex/beaulivre/beaulivre-doc-cn.tex
-2021/05/23 | 202555 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-x64-2.9.tar.lzma
2021/05/23 | 20196 | macros/unicodetex/latex/lebhart/lebhart-doc-en.tex
-2021/05/23 | 20121 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-2.9.tar.lzma
-2021/05/23 | 2009492 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-x64-2.9.tar.lzma
2021/05/23 | 20002 | macros/latex/contrib/colorist/colorist-doc.tex
-2021/05/23 | 199701 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-2.9.tar.lzma
-2021/05/23 | 198129 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-2.9.tar.lzma
2021/05/23 | 19729 | language/japanese/pxbase/pxbabel.sty
2021/05/23 | 1959620 | systems/texlive/tlnet/archive/siunitx.doc.r59308.tar.xz
-2021/05/23 | 195663 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-x64-2.9.tar.lzma
-2021/05/23 | 195567 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-2.9.tar.lzma
-2021/05/23 | 193716 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-2.9.tar.lzma
2021/05/23 | 193672 | systems/texlive/tlnet/archive/mindflow.doc.r59307.tar.xz
2021/05/23 | 19265 | macros/unicodetex/latex/lebhart/lebhart-doc-cn.tex
2021/05/23 | 19112 | language/japanese/pxbase/pxbasenc.def
2021/05/23 | 1872 | systems/texlive/tlnet/archive/mindflow.r59307.tar.xz
2021/05/23 | 185959 | macros/unicodetex/latex/beaulivre/beaulivre-doc-en.pdf
2021/05/23 | 184054 | graphics/mcf2graph/mcf_mplib_exa.pdf
-2021/05/23 | 18096 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-x64-2.9.tar.lzma
-2021/05/23 | 180046 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-x64-2.9.tar.lzma
-2021/05/23 | 17957 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-x64-2.9.tar.lzma
2021/05/23 | 17955 | language/japanese/pxbase/pxbabel.tex
-2021/05/23 | 179379 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-2.9.tar.lzma
-2021/05/23 | 1725548 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-2.9.tar.lzma
-2021/05/23 | 17249196 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
2021/05/23 | 168948 | macros/unicodetex/latex/lebhart/lebhart-doc-en.pdf
-2021/05/23 | 167906 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-x64-2.9.tar.lzma
2021/05/23 | 16484 | graphics/mcf2graph/mcf_mplib_exa.tex
2021/05/23 | 164280 | systems/texlive/tlnet/archive/tlmgrbasics.doc.r59305.tar.xz
-2021/05/23 | 163655 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-x64-2.9.tar.lzma
-2021/05/23 | 16328 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-2.9.tar.lzma
2021/05/23 | 161218 | language/japanese/pxbase.zip
-2021/05/23 | 16110 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-2.9.tar.lzma
-2021/05/23 | 159968 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-x64-2.9.tar.lzma
2021/05/23 | 1552 | systems/texlive/tlnet/archive/collection-publishers.r59310.tar.xz
-2021/05/23 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
-2021/05/23 | 153890 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-2.9.tar.lzma
-2021/05/23 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
-2021/05/23 | 152762 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-x64-2.9.tar.lzma
-2021/05/23 | 147150 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-2.9.tar.lzma
-2021/05/23 | 147140 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-2.9.tar.lzma
-2021/05/23 | 145 | systems/texlive/tlnet/install-tl.zip.sha512
-2021/05/23 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
-2021/05/23 | 14354 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-x64-2.9.tar.lzma
-2021/05/23 | 1425981 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-x64-2.9.tar.lzma
-2021/05/23 | 1424811 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-x64-2.9.tar.lzma
2021/05/23 | 13756 | systems/texlive/tlnet/archive/easybook.r59306.tar.xz
-2021/05/23 | 136428 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-x64-2.9.tar.lzma
2021/05/23 | 136058 | language/japanese/pxbase/pxbabel.pdf
-2021/05/23 | 135005 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-2.9.tar.lzma
-2021/05/23 | 13470 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-2.9.tar.lzma
2021/05/23 | 13399 | graphics/mcf2graph/CHANGELOG
-2021/05/23 | 131489 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-x64-2.9.tar.lzma
-2021/05/23 | 1307725 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-x64-2.9.tar.lzma
-2021/05/23 | 1295411 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-2.9.tar.lzma
-2021/05/23 | 1281104 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-2.9.tar.lzma
-2021/05/23 | 1272577 | systems/win32/miktex/tm/packages/next/miktex-zzdb2-2.9.tar.lzma
-2021/05/23 | 1272221 | systems/win32/miktex/tm/packages/miktex-zzdb2-2.9.tar.lzma
2021/05/23 | 12584 | systems/texlive/tlnet/archive/bmstu-iu8.r59310.tar.xz
-2021/05/23 | 124972 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-2.9.tar.lzma
-2021/05/23 | 1188097 | systems/win32/miktex/tm/packages/next/miktex-zzdb3-2.9.tar.lzma
-2021/05/23 | 1188048 | systems/win32/miktex/tm/packages/miktex-zzdb3-2.9.tar.lzma
-2021/05/23 | 1171731 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-2.9.tar.lzma
-2021/05/23 | 116932 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-2.9.tar.lzma
-2021/05/23 | 115470 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-x64-2.9.tar.lzma
-2021/05/23 | 1153 | systems/win32/miktex/tm/packages/next/pr.ini
-2021/05/23 | 112252 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-x64-2.9.tar.lzma
-2021/05/23 | 109274 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-x64-2.9.tar.lzma
2021/05/23 | 1091 | language/japanese/pxbase/LICENSE
2021/05/23 | 1080356 | systems/texlive/tlnet/archive/kpfonts-otf.r59304.tar.xz
-2021/05/23 | 107976 | systems/texlive/tlnet/archive/texlive-scripts.r59302.tar.xz
-2021/05/23 | 1078877 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-x64-2.9.tar.lzma
2021/05/23 | 105080 | graphics/mcf2graph/mcf2graph.mf
-2021/05/23 | 104625 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-x64-2.9.tar.lzma
-2021/05/23 | 103322 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-x64-2.9.tar.lzma
2021/05/23 | 102849 | macros/latex/contrib/colorist.zip
2021/05/23 | 102228 | systems/texlive/tlnet/archive/siunitx.source.r59308.tar.xz
-2021/05/23 | 101762 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-x64-2.9.tar.lzma
2021/05/23 | 10006 | language/japanese/pxbase/README-ja.md
2021/05/22 | 9907 | macros/latex/contrib/tcolorbox/tcolorbox.doc.coremacros.tex
2021/05/22 | 989 | support/texlab/src/syntax/bibtex/snapshots/texlab__syntax__bibtex__parser__tests__entry_complete_parens.snap
@@ -348,7 +537,6 @@
2021/05/22 | 682 | support/texlab/src/syntax/latex/snapshots/texlab__syntax__latex__parser__tests__environment_simple.snap
2021/05/22 | 677 | support/texlab/src/syntax/latex/snapshots/texlab__syntax__latex__parser__tests__structure_siblings.snap
2021/05/22 | 675 | support/texlab/src/syntax/latex/snapshots/texlab__syntax__latex__parser__tests__graphics_include_options.snap
-2021/05/22 | 6743 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
2021/05/22 | 671 | support/texlab/src/syntax/latex/snapshots/texlab__syntax__latex__parser__tests__theorem_definition_full.snap
2021/05/22 | 6691 | macros/latex/contrib/tcolorbox/tcolorbox.doc.s_snippet.sty
2021/05/22 | 668 | support/texlab/src/syntax/latex/snapshots/texlab__syntax__latex__parser__tests__color_definition_simple.snap
@@ -809,9 +997,7 @@
2021/05/21 | 9881 | macros/luatex/generic/luaotfload/fontloader-fonts-gbn.lua
2021/05/21 | 9765 | macros/luatex/generic/luatexja/src/addons/luatexja-ruby.sty
2021/05/21 | 9740 | macros/luatex/generic/lualibs/lualibs-trac-inf.lua
-2021/05/21 | 96848 | macros/latex/contrib/siunitx/siunitx-unit.dtx
2021/05/21 | 966557 | macros/luatex/generic/luaotfload/fontloader-reference.lua
-2021/05/21 | 964 | macros/latex/contrib/siunitx/README.md
2021/05/21 | 945 | macros/luatex/generic/luatexja/tool/table_ivd_aj1.lua
2021/05/21 | 945 | macros/luatex/generic/luatexja/doc/jfm-testf.lua
2021/05/21 | 94470 | macros/luatex/generic/luaotfload/fontloader-font-otr.lua
@@ -821,7 +1007,6 @@
2021/05/21 | 896 | macros/luatex/generic/luatexja/tool/otf-KozMinPr6N-Regular.txt
2021/05/21 | 885 | macros/luatex/generic/luatexja/src/patches/lltjp-stfloats.sty
2021/05/21 | 8840 | macros/luatex/generic/luaotfload/luaotfload-loaders.lua
-2021/05/21 | 8762 | macros/latex/contrib/siunitx/siunitx-command.dtx
2021/05/21 | 864936 | macros/luatex/generic/luaotfload/fontloader-2021-05-20.lua
2021/05/21 | 8609 | macros/luatex/generic/luatexja/src/ltj-otf.lua
2021/05/21 | 8607 | macros/luatex/generic/luatexja/src/ltjltxdoc.dtx
@@ -861,7 +1046,6 @@
2021/05/21 | 6203 | macros/luatex/generic/luatexja/src/ltj-base.sty
2021/05/21 | 617 | macros/luatex/generic/luatexja/src/patches/lltjp-array.sty
2021/05/21 | 6060 | macros/luatex/generic/luatexja/tool/kyoikukanjiChars.tex
-2021/05/21 | 605308 | macros/latex/contrib/siunitx/siunitx.pdf
2021/05/21 | 5940 | macros/luatex/generic/luatexja/src/ltj-lotf_aux.lua
2021/05/21 | 59344 | macros/luatex/generic/luaotfload/fontloader-font-ttf.lua
2021/05/21 | 5885 | macros/luatex/generic/luaotfload/fontloader-reference-load-order.tex
@@ -892,10 +1076,7 @@
2021/05/21 | 4871 | macros/luatex/generic/luatexja/src/ltj-stack.lua
2021/05/21 | 48217 | macros/luatex/generic/luatexja/src/ltj-jfont.lua
2021/05/21 | 4808 | macros/luatex/generic/luatexja/src/jfm-tmin.lua
-2021/05/21 | 47497 | macros/latex/contrib/siunitx/siunitx-table.dtx
-2021/05/21 | 4748 | macros/latex/contrib/siunitx/siunitx-abbreviations.cfg
2021/05/21 | 4740 | macros/luatex/generic/lualibs/README.md
-2021/05/21 | 4629 | macros/latex/contrib/siunitx/siunitx-locale.dtx
2021/05/21 | 46091 | macros/luatex/generic/luaotfload/fontloader-basics-chr.lua
2021/05/21 | 4588 | macros/luatex/generic/lualibs/lualibs-number.lua
2021/05/21 | 457434 | macros/luatex/generic/luatexja/doc/ltjsclasses.pdf
@@ -916,7 +1097,6 @@
2021/05/21 | 40024 | macros/luatex/generic/luaotfload/filegraph.pdf
2021/05/21 | 39711 | macros/luatex/generic/luatexja/src/ltj-direction.lua
2021/05/21 | 3961 | macros/luatex/generic/luatexja/src/ltj-charrange.lua
-2021/05/21 | 39406 | macros/latex/contrib/siunitx/CHANGELOG.md
2021/05/21 | 388666 | macros/latex/contrib/projlib.zip
2021/05/21 | 387444 | macros/latex/contrib/fontsize.zip
2021/05/21 | 38735 | macros/luatex/generic/luaotfload/fontloader-l-lpeg.lua
@@ -932,7 +1112,6 @@
2021/05/21 | 3748 | macros/luatex/generic/luatexja/src/ltj-compat.lua
2021/05/21 | 3693 | macros/luatex/generic/luatexja/src/patches/lltjp-siunitx.sty
2021/05/21 | 3693 | macros/luatex/generic/luaotfload/fontloader-font-imp-italics.lua
-2021/05/21 | 3687 | macros/latex/contrib/siunitx/siunitx.ins
2021/05/21 | 3674 | macros/luatex/generic/luaotfload/fontloader-fonts-syn.lua
2021/05/21 | 361 | macros/luatex/generic/luaotfload/fontloader-l-function.lua
2021/05/21 | 3580 | macros/luatex/generic/luaotfload/fontloader-font-imp-ligatures.lua
@@ -954,11 +1133,8 @@
2021/05/21 | 319369 | support/ltximg/ltximg-doc.pdf
2021/05/21 | 31802 | macros/luatex/generic/luaotfload/fontloader-font-otc.lua
2021/05/21 | 317 | macros/luatex/generic/luatexja/tool/otf-AdobeSongStd-Light.txt
-2021/05/21 | 31738 | macros/latex/contrib/siunitx/siunitx-version-1.cfg
2021/05/21 | 3141 | macros/luatex/generic/lualibs/NEWS
-2021/05/21 | 31368 | macros/latex/contrib/siunitx/siunitx-compound.dtx
2021/05/21 | 31349 | macros/luatex/generic/luaotfload/fontloader-font-one.lua
-2021/05/21 | 31335 | macros/latex/contrib/siunitx/siunitx-print.dtx
2021/05/21 | 312353 | macros/latex/contrib/easybook/easybook.pdf
2021/05/21 | 31152 | macros/luatex/generic/luaotfload/luaotfload-configuration.lua
2021/05/21 | 3100 | macros/luatex/generic/luatexja/tool/table_jisx0208.tex
@@ -967,13 +1143,10 @@
2021/05/21 | 29580 | macros/luatex/generic/luaotfload/luaotfload-features.lua
2021/05/21 | 29536 | macros/luatex/generic/luatexja/src/luatexja-core.sty
2021/05/21 | 29181 | macros/luatex/generic/luatexja/src/addons/luatexja-preset.sty
-2021/05/21 | 2883 | macros/latex/contrib/siunitx/siunitx-binary.dtx
2021/05/21 | 27866 | support/ltximg/ltximg.man1.pdf
2021/05/21 | 27823 | macros/luatex/generic/lualibs/lualibs.dtx
-2021/05/21 | 27620 | macros/latex/contrib/siunitx/siunitx-emulation.dtx
2021/05/21 | 275 | macros/luatex/generic/luaotfload/luaotfload-main.lua
2021/05/21 | 273734 | install/macros/luatex/generic/lualibs.tds.zip
-2021/05/21 | 273398 | macros/latex/contrib/siunitx/siunitx-v2.sty
2021/05/21 | 26934 | macros/luatex/generic/luatexja/src/lltjext.sty
2021/05/21 | 2667 | macros/luatex/generic/luaotfload/fontloader-font-vfc.lua
2021/05/21 | 266042 | macros/luatex/generic/lualibs.zip
@@ -981,12 +1154,10 @@
2021/05/21 | 2586 | macros/luatex/generic/luatexja/src/jfm-kaiming.lua
2021/05/21 | 2582 | macros/luatex/generic/luaotfload/luaotfload-suppress.lua
2021/05/21 | 2575 | macros/luatex/generic/luatexja/src/jfm-quanjiao.lua
-2021/05/21 | 25719 | macros/latex/contrib/siunitx/siunitx-complex.dtx
2021/05/21 | 2555 | macros/luatex/generic/luaotfload/fontloader-l-math.lua
2021/05/21 | 25336 | macros/luatex/generic/luaotfload/luaotfload-filelist.lua
2021/05/21 | 25264 | macros/luatex/generic/luaotfload/fontloader-font-ocl.lua
2021/05/21 | 2506 | macros/luatex/generic/luaotfload/luaotfload-scripts.lua
-2021/05/21 | 2426 | macros/latex/contrib/siunitx/siunitx-code.tex
2021/05/21 | 2374 | macros/luatex/generic/luatexja/src/patches/lltjp-unicode-math.sty
2021/05/21 | 2342 | macros/luatex/generic/luatexja/src/jfm-jis.lua
2021/05/21 | 23399 | macros/luatex/generic/luaotfload/fontloader-fonts-tfm.lua
@@ -998,11 +1169,9 @@
2021/05/21 | 2247 | fonts/newpx/tex/t1zpltosf.fd
2021/05/21 | 22175 | macros/luatex/generic/luaotfload/fontloader-l-file.lua
2021/05/21 | 2207 | macros/luatex/generic/luatexja/src/jfm-CCT.lua
-2021/05/21 | 2199205 | install/macros/latex/contrib/siunitx.tds.zip
2021/05/21 | 2193 | macros/luatex/generic/luatexja/src/addons/luatexja-zhfonts.sty
2021/05/21 | 21858 | macros/luatex/generic/luaotfload/luaotfload-diagnostics.lua
2021/05/21 | 21837 | macros/luatex/generic/luaotfload/scripts-demo.pdf
-2021/05/21 | 2161925 | macros/latex/contrib/siunitx.zip
2021/05/21 | 21136 | macros/luatex/generic/luatexja/src/luatexja.lua
2021/05/21 | 2109 | fonts/newpx/tex/ot1zpltlf.fd
2021/05/21 | 2109 | fonts/newpx/tex/ot1zplosf.fd
@@ -1023,7 +1192,6 @@
2021/05/21 | 19572 | macros/luatex/generic/luatexja/src/ltj-adjust.lua
2021/05/21 | 19570 | macros/luatex/generic/luaotfload/fontloader-font-map.lua
2021/05/21 | 19549 | macros/luatex/generic/luaotfload/luaotfload-init.lua
-2021/05/21 | 19541 | macros/latex/contrib/siunitx/siunitx.dtx
2021/05/21 | 19516 | macros/luatex/generic/luaotfload/luaotfload-letterspace.lua
2021/05/21 | 19410 | macros/luatex/generic/lualibs/lualibs-os.lua
2021/05/21 | 1936005 | install/macros/luatex/generic/luaotfload.tds.zip
@@ -1047,11 +1215,9 @@
2021/05/21 | 1794 | macros/luatex/generic/luaotfload/fontloader-font-ini.lua
2021/05/21 | 177581 | macros/luatex/generic/luatexja/src/ltjclasses.dtx
2021/05/21 | 1765 | macros/luatex/generic/luatexja/src/ltj-inputbuf.lua
-2021/05/21 | 1729 | macros/latex/contrib/siunitx/siunitx-binary.cfg
2021/05/21 | 16675 | macros/luatex/generic/luaotfload/luaotfload-latex.tex
2021/05/21 | 166557 | macros/luatex/generic/luatexja/doc/lltjp-geometry.pdf
2021/05/21 | 16548 | macros/luatex/generic/luaotfload/luaotfload.conf.5
-2021/05/21 | 16529 | macros/latex/contrib/siunitx/siunitx-angle.dtx
2021/05/21 | 1637 | macros/luatex/generic/luatexja/src/addons/luatexja-fontspec.sty
2021/05/21 | 16116 | macros/luatex/generic/luaotfload/luaotfload-tool.rst
2021/05/21 | 15954 | macros/luatex/generic/luaotfload/luaotfload-colors.lua
@@ -1068,11 +1234,8 @@
2021/05/21 | 14709 | macros/luatex/generic/luatexja/src/patches/lltjp-listings.sty
2021/05/21 | 14517 | macros/luatex/generic/luatexja/src/ltj-rmlgbm.lua
2021/05/21 | 1449 | macros/luatex/generic/luaotfload/fontloader-font-lua.lua
-2021/05/21 | 1441845 | macros/latex/contrib/siunitx/siunitx-code.pdf
-2021/05/21 | 14351 | macros/latex/contrib/siunitx/siunitx-quantity.dtx
2021/05/21 | 1397 | macros/luatex/generic/luatexja/tool/ivslist.tex
2021/05/21 | 13899 | macros/luatex/generic/luatexja/src/jfm-ujis.lua
-2021/05/21 | 138579 | macros/latex/contrib/siunitx/siunitx.tex
2021/05/21 | 13788 | macros/luatex/generic/luaotfload/luaotfload.lua
2021/05/21 | 13726 | macros/luatex/generic/luatexja/doc/lltjp-geometry.tex
2021/05/21 | 13657 | macros/luatex/generic/luaotfload/luaotfload-harf-define.lua
@@ -1102,7 +1265,6 @@
2021/05/21 | 1159 | macros/latex/contrib/colorist/README.md
2021/05/21 | 11552 | macros/luatex/generic/luaotfload/fontloader-util-fil.lua
2021/05/21 | 11506 | macros/luatex/generic/luatexja/src/jfm-ujisv.lua
-2021/05/21 | 113800 | macros/latex/contrib/siunitx/siunitx-number.dtx
2021/05/21 | 11335 | macros/luatex/generic/luatexja/tool/unicodeBlocks.tex
2021/05/21 | 11323 | macros/luatex/generic/luaotfload/luaotfload-log.lua
2021/05/21 | 1130 | macros/luatex/generic/luatexja/tool/function_uax50.lua
@@ -1113,12 +1275,9 @@
2021/05/21 | 10599 | support/ltximg/ltximg.1
2021/05/21 | 102502 | macros/luatex/generic/luaotfload/luaotfload-glyphlist.lua
2021/05/21 | 10200 | macros/luatex/generic/luaotfload/fontloader-basics-nod.lua
-2021/05/21 | 10106 | macros/latex/contrib/siunitx/siunitx-abbreviation.dtx
2021/05/21 | 1004 | macros/luatex/generic/luaotfload/luaotfload-embolden.lua
-2021/05/21 | 10045 | macros/latex/contrib/siunitx/siunitx-symbol.dtx
2021/05/20 | 999995 | macros/latex/contrib/acrotex/doc/eformman.pdf
2021/05/20 | 9875 | support/texdoc/script/texdoclib-score.tlu
-2021/05/20 | 966784 | systems/texlive/tlnet/archive/newtx.doc.r59277.tar.xz
2021/05/20 | 9482 | support/texdoc/script/texdoclib-view.tlu
2021/05/20 | 948160 | systems/texlive/tlnet/archive/powerdot.doc.r59272.tar.xz
2021/05/20 | 93301 | macros/xetex/generic/xetexko/xetexko.sty
@@ -1126,7 +1285,6 @@
2021/05/20 | 8600 | systems/texlive/tlnet/archive/covington.r59266.tar.xz
2021/05/20 | 84310 | support/texdoc/doc/texdoc.pdf
2021/05/20 | 842246 | macros/latex/contrib/acmart/acmart.pdf
-2021/05/20 | 841881 | macros/latex/contrib/suftesi/suftesi.pdf
2021/05/20 | 834009 | systems/win32/w32tex/ChangeLog
2021/05/20 | 8296 | fonts/newpx/tfm/zpl-Slanted-lf-sc-ly1.tfm
2021/05/20 | 8292 | fonts/newpx/tfm/zpl-Slanted-osf-sc-ly1.tfm
@@ -1154,7 +1312,6 @@
2021/05/20 | 7396 | fonts/newpx/tfm/zplth-Italic-tlf-ly1.tfm
2021/05/20 | 7060 | support/texdoc/script/texdoclib-cli.tlu
2021/05/20 | 6916 | systems/texlive/tlnet/archive/alterqcm.r59265.tar.xz
-2021/05/20 | 681675 | macros/latex/contrib/suftesi/templates.zip
2021/05/20 | 677458 | systems/win32/miktex/tm/packages/pm-isomath.tar.lzma
2021/05/20 | 67080 | systems/texlive/tlnet/archive/powerdot.source.r59272.tar.xz
2021/05/20 | 668 | macros/xetex/generic/xetexko/xetexko-hanging.sty
@@ -1172,7 +1329,6 @@
2021/05/20 | 598279 | macros/latex/contrib/acmart/samples/sample-manuscript.pdf
2021/05/20 | 596225 | macros/latex/contrib/acmart/samples/sample-acmsmall.pdf
2021/05/20 | 586372 | macros/latex/contrib/acmart/samples/sample-acmlarge.pdf
-2021/05/20 | 5604344 | systems/texlive/tlnet/archive/newtx.r59277.tar.xz
2021/05/20 | 543905 | macros/latex/contrib/acmart/samples/sample-acmtog.pdf
2021/05/20 | 542664 | macros/latex/contrib/acrotex/doc/aeb_man.tex
2021/05/20 | 53784 | systems/texlive/tlnet/archive/xetexko.r59282.tar.xz
@@ -1234,7 +1390,6 @@
2021/05/20 | 2448 | systems/texlive/tlnet/archive/suppose.r59281.tar.xz
2021/05/20 | 24459 | support/texdoc/script/texdoclib-search.tlu
2021/05/20 | 236172 | macros/unicodetex/latex/einfart/einfart-doc-cn.pdf
-2021/05/20 | 232596 | macros/latex/contrib/suftesi/suftesi.dtx
2021/05/20 | 23241 | fonts/newpx/map/newpx.map
2021/05/20 | 2255476 | macros/latex/contrib/acrotex/doc/aeb_man.pdf
2021/05/20 | 222934 | macros/latex/contrib/projlib/ProjLib-doc-cn.pdf
@@ -1254,16 +1409,13 @@
2021/05/20 | 1812 | macros/xetex/generic/xetexko/hanjacom_hangul.tab
2021/05/20 | 17204 | support/texdoc/texdoc.cnf
2021/05/20 | 1673509 | systems/win32/miktex/tm/packages/bxjscls.tar.lzma
-2021/05/20 | 1670 | macros/latex/contrib/suftesi/README
2021/05/20 | 1609 | fonts/newpx/tex/ly1zplth-tosf.fd
2021/05/20 | 1608 | fonts/newpx/tex/ot1zplth-tosf.fd
2021/05/20 | 1586 | fonts/newpx/tex/t1zplth-tosf.fd
-2021/05/20 | 1577056 | install/macros/latex/contrib/suftesi.tds.zip
2021/05/20 | 1570 | fonts/newpx/tex/ot1zplth-tlf.fd
2021/05/20 | 1570 | fonts/newpx/tex/ot1zplth-osf.fd
2021/05/20 | 1570 | fonts/newpx/tex/ly1zplth-tlf.fd
2021/05/20 | 1570 | fonts/newpx/tex/ly1zplth-osf.fd
-2021/05/20 | 1560182 | macros/latex/contrib/suftesi.zip
2021/05/20 | 1549 | fonts/newpx/tex/t1zplth-osf.fd
2021/05/20 | 1540 | fonts/newpx/tex/t1zplth-tlf.fd
2021/05/20 | 1532 | fonts/newpx/tex/ot1zplth-lf.fd
@@ -1363,7 +1515,6 @@
2021/05/18 | 9383 | macros/latex/contrib/tuda-ci/tex/beamerouterthemeTUDa.sty
2021/05/18 | 930770 | systems/win32/miktex/tm/packages/unravel.tar.lzma
2021/05/18 | 9294 | macros/latex/contrib/tuda-ci/tex/tudamecheng.cfg
-2021/05/18 | 901928 | systems/texlive/tlnet/archive/tex4ht.r59249.tar.xz
2021/05/18 | 9008 | systems/texlive/tlnet/archive/musixtex.source.r59240.tar.xz
2021/05/18 | 89431 | systems/win32/miktex/tm/packages/codehigh.tar.lzma
2021/05/18 | 87704 | language/japanese/BX/bxjscls/bxjscls-manual.tex
@@ -1497,7 +1648,6 @@
2021/05/18 | 144274 | macros/latex/contrib/apa7/apa7.dtx
2021/05/18 | 143299 | systems/win32/miktex/tm/packages/plautopatch.tar.lzma
2021/05/18 | 13710 | macros/latex/contrib/tuda-ci/tex/tudaleaflet.cls
-2021/05/18 | 136384 | systems/texlive/tlnet/archive/tex4ht.doc.r59249.tar.xz
2021/05/18 | 1344643 | systems/win32/miktex/tm/packages/paresse.tar.lzma
2021/05/18 | 133720 | systems/texlive/tlnet/archive/bnumexpr.doc.r59244.tar.xz
2021/05/18 | 1329888 | systems/texlive/tlnet/archive/libertinust1math.doc.r59241.tar.xz
@@ -1506,7 +1656,6 @@
2021/05/18 | 130712608 | systems/win32/w32tex/web2c-lib.tar.xz
2021/05/18 | 1278 | macros/latex/contrib/apa7/README.txt
2021/05/18 | 126693 | systems/win32/miktex/tm/packages/tiscreen.tar.lzma
-2021/05/18 | 1210104 | systems/texlive/tlnet/archive/tex4ht.source.r59249.tar.xz
2021/05/18 | 117951 | systems/win32/miktex/tm/packages/lua-ul.tar.lzma
2021/05/18 | 1178317 | language/japanese/BX/bxjscls/bxjscls.pdf
2021/05/18 | 11500989 | systems/win32/miktex/tm/packages/l3kernel.tar.lzma
@@ -1520,42 +1669,3 @@
2021/05/18 | 1022019 | systems/win32/miktex/tm/packages/biblatex-gost.tar.lzma
2021/05/18 | 1011384 | systems/texlive/tlnet/archive/libertinust1math.r59241.tar.xz
2021/05/18 | 10078 | macros/latex/contrib/tuda-ci/tex/beamerthemeTUDa-mecheng.sty
-2021/05/17 | 950 | macros/latex/contrib/euclideangeometry/README.txt
-2021/05/17 | 830360 | systems/texlive/tlnet/archive/babel.doc.r59229.tar.xz
-2021/05/17 | 79556 | macros/latex/contrib/bnumexpr/bnumexpr.dtx
-2021/05/17 | 6892 | systems/texlive/tlnet/archive/qrbill.r59232.tar.xz
-2021/05/17 | 685196 | systems/texlive/tlnet/archive/babel.source.r59229.tar.xz
-2021/05/17 | 68217 | macros/latex/contrib/euclideangeometry/euclideangeometry.dtx
-2021/05/17 | 607417 | support/TeX4ht/source/tex4ht-html4.tex
-2021/05/17 | 576312 | systems/texlive/tlnet/archive/l3kernel.source.r59231.tar.xz
-2021/05/17 | 459194 | support/latexmk.zip
-2021/05/17 | 443469 | macros/latex/contrib/euclideangeometry/euclideangeometry.pdf
-2021/05/17 | 414397 | support/latexmk/latexmk.pl
-2021/05/17 | 3640 | systems/texlive/tlnet/archive/paresse.r59228.tar.xz
-2021/05/17 | 36348 | support/latexmk/CHANGES
-2021/05/17 | 3577 | macros/latex/contrib/alterqcm/doc/latex/doc-aq-greek.tex
-2021/05/17 | 332420 | systems/texlive/tlnet/archive/newtxsf.doc.r59227.tar.xz
-2021/05/17 | 3210 | macros/latex/contrib/acrotex/exerquiz.ins
-2021/05/17 | 3182 | macros/latex/contrib/bnumexpr/README.md
-2021/05/17 | 2733232 | systems/texlive/tlnet/archive/dviout.win32.r59222.tar.xz
-2021/05/17 | 26220 | macros/latex/contrib/alterqcm/doc/latex/doc-aq-globales.tex
-2021/05/17 | 2424239 | macros/musixtex.zip
-2021/05/17 | 211589 | support/latexmk/latexmk.txt
-2021/05/17 | 193225 | support/latexmk/latexmk.pdf
-2021/05/17 | 18449 | support/latexmk/INSTALL
-2021/05/17 | 179988 | systems/texlive/tlnet/archive/babel.r59229.tar.xz
-2021/05/17 | 17566664 | graphics/pgf/contrib/pgfplots.zip
-2021/05/17 | 170748 | support/latexmk/latexmk.1
-2021/05/17 | 166956 | systems/texlive/tlnet/archive/l3kernel.r59231.tar.xz
-2021/05/17 | 154576 | systems/texlive/tlnet/archive/qrbill.doc.r59232.tar.xz
-2021/05/17 | 154447 | macros/latex/contrib/bnumexpr.zip
-2021/05/17 | 14060 | systems/texlive/tlnet/archive/paresse.source.r59228.tar.xz
-2021/05/17 | 1335464 | systems/texlive/tlnet/archive/paresse.doc.r59228.tar.xz
-2021/05/17 | 131719 | macros/latex/contrib/bnumexpr/bnumexpr.pdf
-2021/05/17 | 12832 | support/latexmk/README
-2021/05/17 | 11744 | systems/texlive/tlnet/archive/qrbill.source.r59232.tar.xz
-2021/05/17 | 115671 | macros/latex/contrib/hvfloat/doc/hvfloat.tex
-2021/05/17 | 1104801 | macros/latex/contrib/euclideangeometry.zip
-2021/05/17 | 10905440 | systems/texlive/tlnet/archive/l3kernel.doc.r59231.tar.xz
-2021/05/17 | 105908 | systems/texlive/tlnet/archive/newtxsf.r59227.tar.xz
-2021/05/17 | 10280 | macros/latex/contrib/acrotex/examples/jquiztst.tex
diff --git a/biblio/bibtex/contrib/econ-bst/CHANGES.md b/biblio/bibtex/contrib/econ-bst/CHANGES.md
index b441437e0d..076367319b 100644
--- a/biblio/bibtex/contrib/econ-bst/CHANGES.md
+++ b/biblio/bibtex/contrib/econ-bst/CHANGES.md
@@ -8,6 +8,37 @@ Changelogs for econ.bst
## Changelogs
+## Ver. 3.1
+
+* 2021-05-23: Fixed a bug in label for sorting.
+
+* 2021-05-23: Added sample bibliography items with sortname field.
+
+* 2021-05-23: Suported sortname field. If you add sortname field to a
+ bibliography entry, the value of sortname field is used for sorting instead of
+ author or editor. For the details, see ``sorting'' section in
+ econ-example.pdf.
+
+
+## Ver. 3.0
+
+* 2020-12-29: bst files in the customization folder are updated.
+
+* 2020-06-23: In the new econ.bst, if the number of authors is greater than N1,
+ only the first N2 authors' names are displayed in the reference part (and
+ other authors' names are omitted by "et el.").
+
+ N1 is determined by `bst.max.author.num` (the default value = 8).
+ N2 is determined by `bst.max.author.num.displayed` (the default value = 3).
+
+ See econ-example.pdf or econ-many-authors.pdf in the customization folder.
+
+
+## Ver. 2.9
+
+* 2020-03-26: Fixed the bug related to book editors.
+
+
## Ver. 2.8
* 2020-03-03: Changed the directory structure.
@@ -340,7 +371,7 @@ Changelogs for econ.bst
Local Variables:
mode: markdown
fill-column: 80
-coding: utf-8-dos
+coding: utf-8-unix
End:
-->
diff --git a/biblio/bibtex/contrib/econ-bst/README.md b/biblio/bibtex/contrib/econ-bst/README.md
index 938baee618..1468375d06 100644
--- a/biblio/bibtex/contrib/econ-bst/README.md
+++ b/biblio/bibtex/contrib/econ-bst/README.md
@@ -29,18 +29,6 @@ features:
| [`CHANGES.md`](CHANGES.md) | Changelog file. |
| `README.md` | This file. |
-| bst file | Explanation |
-|:------------------------|:----------------------------------------------------------|
-| `econ-a.bst` | A simple style. |
-| `econ-b.bst` | A style with much decoration. |
-| `econ-no-sort.bst` | This style lists entries in citation order. |
-| `econ-abbr.bst` | This style uses abbreviated journal name. |
-| `econ-aea.bst` | The style for AEA journals such as AER, JEL, AEJ and JEP. |
-| `econ-econometrica.bst` | The style for Econometrica. |
-| `econ-jpe.bst` | The style for JPE (Journal of Poilitical Economy). |
-| `econ-jet.bst` | The style for JET (Journal of Economic Theoriy). |
-| `econ-jie.bst` | The style for JIE (Journal of International Economics). |
-| `econ-old.bst` | The style of the old econ.bst. |
<!-- リンクã®ä½œæˆæ–¹æ³• -->
<!-- [リンクテキスト](URLを記入) -->
@@ -50,7 +38,7 @@ features:
Local Variables:
mode: markdown
fill-column: 80
-coding: utf-8-dos
+coding: utf-8-unix
End:
-->
diff --git a/biblio/bibtex/contrib/econ-bst/customization/README.md b/biblio/bibtex/contrib/econ-bst/customization/README.md
index b8fafc3153..c267a0f6ce 100644
--- a/biblio/bibtex/contrib/econ-bst/customization/README.md
+++ b/biblio/bibtex/contrib/econ-bst/customization/README.md
@@ -2,7 +2,7 @@
Author: Shiro Takeda
e-mail <shiro.takeda@gmail.com>
First-written: <2016-03-16>
-Time-stamp: <2020-02-26 13:55:53 st>
+Time-stamp: <2020-06-24 23:43:29 st>
-->
Contents of this folder
@@ -27,6 +27,7 @@ Contents of this folder
| `econ-jie.bst` | [`econ-jie.pdf`](econ-jie.pdf) | The style for JIE (Journal of International Economics). |
| `econ-old.bst` | [`econ-old.pdf`](econ-old.pdf) | The style of the old econ.bst. |
| | [`econ-numbers.pdf`](econ-numbers.pdf) | An example with numerical citation mode. |
+| | [`econ-many-authors.pdf`](econ-many-authors.pdf) | An example with a very large number of authros |
| File | Explanation |
diff --git a/biblio/bibtex/contrib/econ-bst/customization/cited-part.tex b/biblio/bibtex/contrib/econ-bst/customization/cited-part.tex
index ace7e41136..eae5945317 100644
--- a/biblio/bibtex/contrib/econ-bst/customization/cited-part.tex
+++ b/biblio/bibtex/contrib/econ-bst/customization/cited-part.tex
@@ -53,7 +53,17 @@
\citet{Rivers-2005-CombiningTop-Downand},
\citet{WilsonMannOtsuki-2005-AssessingBenefitsof},
\citet{zhang2016Deep},
-\citet{imbens2019Optimized}.
+\citet{imbens2019Optimized},
+\citet{Attwood06:SexedUp_art},
+\citet{Attwood09:Mainstreaming},
+\citet{attwood2010porn},
+\citet{jones84:_handb_inter_econom},
+\citet{jones85:_handb_inter_econom},
+\citet{jones97:_handb_inter_econom}.
+\citet{d'Aspremont-2004-BalancedBayesianMechanisms},
+\citet{d'Aspremont-2003-CorrelationIndependenceAndBayesian},
+\citet{Chung-1999-ANoteOnMatsushima's},
+\citet{d'Aspremont-1998-LinearInequalityMethodsTo},
\\
\vspace*{1em}
@@ -67,5 +77,6 @@
% --------------------
% Local Variables:
% fill-column: 80
+% coding: utf-8-unix
% End:
diff --git a/biblio/bibtex/contrib/econ-bst/customization/econ-a.pdf b/biblio/bibtex/contrib/econ-bst/customization/econ-a.pdf
index c9fcf77fc2..202a7009f5 100644
--- a/biblio/bibtex/contrib/econ-bst/customization/econ-a.pdf
+++ b/biblio/bibtex/contrib/econ-bst/customization/econ-a.pdf
Binary files differ
diff --git a/biblio/bibtex/contrib/econ-bst/customization/econ-a.tex b/biblio/bibtex/contrib/econ-bst/customization/econ-a.tex
index c1f366e76f..a218313cd6 100644
--- a/biblio/bibtex/contrib/econ-bst/customization/econ-a.tex
+++ b/biblio/bibtex/contrib/econ-bst/customization/econ-a.tex
@@ -52,4 +52,5 @@ This document uses ``\verb|econ-a.bst|''.
% --------------------
% Local Variables:
% fill-column: 80
+% coding: utf-8-unix
% End:
diff --git a/biblio/bibtex/contrib/econ-bst/customization/econ-abbr.pdf b/biblio/bibtex/contrib/econ-bst/customization/econ-abbr.pdf
index 76230bae9f..edd5d8b607 100644
--- a/biblio/bibtex/contrib/econ-bst/customization/econ-abbr.pdf
+++ b/biblio/bibtex/contrib/econ-bst/customization/econ-abbr.pdf
Binary files differ
diff --git a/biblio/bibtex/contrib/econ-bst/customization/econ-abbr.tex b/biblio/bibtex/contrib/econ-bst/customization/econ-abbr.tex
index 5d10761c4b..2e96a446d1 100644
--- a/biblio/bibtex/contrib/econ-bst/customization/econ-abbr.tex
+++ b/biblio/bibtex/contrib/econ-bst/customization/econ-abbr.tex
@@ -53,4 +53,5 @@ names such as ``\textit{Am. Econ. Rev.}'' for ``\textit{American Economic Review
% --------------------
% Local Variables:
% fill-column: 80
+% coding: utf-8-unix
% End:
diff --git a/biblio/bibtex/contrib/econ-bst/customization/econ-aea.pdf b/biblio/bibtex/contrib/econ-bst/customization/econ-aea.pdf
index 476a1d473b..20bf7a332a 100644
--- a/biblio/bibtex/contrib/econ-bst/customization/econ-aea.pdf
+++ b/biblio/bibtex/contrib/econ-bst/customization/econ-aea.pdf
Binary files differ
diff --git a/biblio/bibtex/contrib/econ-bst/customization/econ-aea.tex b/biblio/bibtex/contrib/econ-bst/customization/econ-aea.tex
index adf2074476..b78abb60a7 100644
--- a/biblio/bibtex/contrib/econ-bst/customization/econ-aea.tex
+++ b/biblio/bibtex/contrib/econ-bst/customization/econ-aea.tex
@@ -55,4 +55,5 @@ Journals}.
% --------------------
% Local Variables:
% fill-column: 80
+% coding: utf-8-unix
% End:
diff --git a/biblio/bibtex/contrib/econ-bst/customization/econ-b.pdf b/biblio/bibtex/contrib/econ-bst/customization/econ-b.pdf
index fab03cb781..422dd8d5d0 100644
--- a/biblio/bibtex/contrib/econ-bst/customization/econ-b.pdf
+++ b/biblio/bibtex/contrib/econ-bst/customization/econ-b.pdf
Binary files differ
diff --git a/biblio/bibtex/contrib/econ-bst/customization/econ-b.tex b/biblio/bibtex/contrib/econ-bst/customization/econ-b.tex
index 549aa78783..9f49104c7e 100644
--- a/biblio/bibtex/contrib/econ-bst/customization/econ-b.tex
+++ b/biblio/bibtex/contrib/econ-bst/customization/econ-b.tex
@@ -52,4 +52,5 @@ This document uses ``\verb|econ-b.bst|''.
% --------------------
% Local Variables:
% fill-column: 80
+% coding: utf-8-unix
% End:
diff --git a/biblio/bibtex/contrib/econ-bst/customization/econ-default.pdf b/biblio/bibtex/contrib/econ-bst/customization/econ-default.pdf
index 0977859dbd..4bbc355ff3 100644
--- a/biblio/bibtex/contrib/econ-bst/customization/econ-default.pdf
+++ b/biblio/bibtex/contrib/econ-bst/customization/econ-default.pdf
Binary files differ
diff --git a/biblio/bibtex/contrib/econ-bst/customization/econ-default.tex b/biblio/bibtex/contrib/econ-bst/customization/econ-default.tex
index e6a2b5ed13..366196c498 100644
--- a/biblio/bibtex/contrib/econ-bst/customization/econ-default.tex
+++ b/biblio/bibtex/contrib/econ-bst/customization/econ-default.tex
@@ -55,4 +55,5 @@ This document uses ``\verb|econ.bst|''.
% --------------------
% Local Variables:
% fill-column: 80
+% coding: utf-8-unix
% End:
diff --git a/biblio/bibtex/contrib/econ-bst/customization/econ-econometrica.pdf b/biblio/bibtex/contrib/econ-bst/customization/econ-econometrica.pdf
index 8646918e29..c7a43683e2 100644
--- a/biblio/bibtex/contrib/econ-bst/customization/econ-econometrica.pdf
+++ b/biblio/bibtex/contrib/econ-bst/customization/econ-econometrica.pdf
Binary files differ
diff --git a/biblio/bibtex/contrib/econ-bst/customization/econ-econometrica.tex b/biblio/bibtex/contrib/econ-bst/customization/econ-econometrica.tex
index 9c43e4d35b..2b8d5a3c1b 100644
--- a/biblio/bibtex/contrib/econ-bst/customization/econ-econometrica.tex
+++ b/biblio/bibtex/contrib/econ-bst/customization/econ-econometrica.tex
@@ -52,4 +52,5 @@ This document uses ``\verb|econ-econometrica.bst|''. The style like {\itshape Ec
% --------------------
% Local Variables:
% fill-column: 80
+% coding: utf-8-unix
% End:
diff --git a/biblio/bibtex/contrib/econ-bst/customization/econ-jet.pdf b/biblio/bibtex/contrib/econ-bst/customization/econ-jet.pdf
index 438938c75a..4587051df1 100644
--- a/biblio/bibtex/contrib/econ-bst/customization/econ-jet.pdf
+++ b/biblio/bibtex/contrib/econ-bst/customization/econ-jet.pdf
Binary files differ
diff --git a/biblio/bibtex/contrib/econ-bst/customization/econ-jet.tex b/biblio/bibtex/contrib/econ-bst/customization/econ-jet.tex
index d446886609..2e9c332f2e 100644
--- a/biblio/bibtex/contrib/econ-bst/customization/econ-jet.tex
+++ b/biblio/bibtex/contrib/econ-bst/customization/econ-jet.tex
@@ -53,4 +53,5 @@ Economic Theory (JET)''}.
% --------------------
% Local Variables:
% fill-column: 80
+% coding: utf-8-unix
% End:
diff --git a/biblio/bibtex/contrib/econ-bst/customization/econ-jie.tex b/biblio/bibtex/contrib/econ-bst/customization/econ-jie.tex
index 9743a21a9b..3a280c7237 100644
--- a/biblio/bibtex/contrib/econ-bst/customization/econ-jie.tex
+++ b/biblio/bibtex/contrib/econ-bst/customization/econ-jie.tex
@@ -53,4 +53,5 @@ International Economics}).
% --------------------
% Local Variables:
% fill-column: 80
+% coding: utf-8-unix
% End:
diff --git a/biblio/bibtex/contrib/econ-bst/customization/econ-jpe.pdf b/biblio/bibtex/contrib/econ-bst/customization/econ-jpe.pdf
index 0f5e899d60..e5c59392f5 100644
--- a/biblio/bibtex/contrib/econ-bst/customization/econ-jpe.pdf
+++ b/biblio/bibtex/contrib/econ-bst/customization/econ-jpe.pdf
Binary files differ
diff --git a/biblio/bibtex/contrib/econ-bst/customization/econ-jpe.tex b/biblio/bibtex/contrib/econ-bst/customization/econ-jpe.tex
index 373181586b..eb3e3cf8e7 100644
--- a/biblio/bibtex/contrib/econ-bst/customization/econ-jpe.tex
+++ b/biblio/bibtex/contrib/econ-bst/customization/econ-jpe.tex
@@ -53,4 +53,5 @@ Polictical Economy}.
% --------------------
% Local Variables:
% fill-column: 80
+% coding: utf-8-unix
% End:
diff --git a/biblio/bibtex/contrib/econ-bst/customization/econ-no-sort.pdf b/biblio/bibtex/contrib/econ-bst/customization/econ-no-sort.pdf
index 85f101163d..bbe956b94d 100644
--- a/biblio/bibtex/contrib/econ-bst/customization/econ-no-sort.pdf
+++ b/biblio/bibtex/contrib/econ-bst/customization/econ-no-sort.pdf
Binary files differ
diff --git a/biblio/bibtex/contrib/econ-bst/customization/econ-no-sort.tex b/biblio/bibtex/contrib/econ-bst/customization/econ-no-sort.tex
index 65581ff0b9..a0dba812bf 100644
--- a/biblio/bibtex/contrib/econ-bst/customization/econ-no-sort.tex
+++ b/biblio/bibtex/contrib/econ-bst/customization/econ-no-sort.tex
@@ -55,4 +55,5 @@ alphabetical order).
% --------------------
% Local Variables:
% fill-column: 80
+% coding: utf-8-unix
% End:
diff --git a/biblio/bibtex/contrib/econ-bst/customization/econ-numbers.pdf b/biblio/bibtex/contrib/econ-bst/customization/econ-numbers.pdf
index ce42db86b9..b19d6651d3 100644
--- a/biblio/bibtex/contrib/econ-bst/customization/econ-numbers.pdf
+++ b/biblio/bibtex/contrib/econ-bst/customization/econ-numbers.pdf
Binary files differ
diff --git a/biblio/bibtex/contrib/econ-bst/customization/econ-numbers.tex b/biblio/bibtex/contrib/econ-bst/customization/econ-numbers.tex
index db2f9821c4..97f74ee749 100644
--- a/biblio/bibtex/contrib/econ-bst/customization/econ-numbers.tex
+++ b/biblio/bibtex/contrib/econ-bst/customization/econ-numbers.tex
@@ -69,4 +69,5 @@ To use numerical mode of \texttt{natbib.sty}, we use the following setting.
% --------------------
% Local Variables:
% fill-column: 80
+% coding: utf-8-unix
% End:
diff --git a/biblio/bibtex/contrib/econ-bst/customization/econ-old.pdf b/biblio/bibtex/contrib/econ-bst/customization/econ-old.pdf
index 28790193ee..823c74a8bc 100644
--- a/biblio/bibtex/contrib/econ-bst/customization/econ-old.pdf
+++ b/biblio/bibtex/contrib/econ-bst/customization/econ-old.pdf
Binary files differ
diff --git a/biblio/bibtex/contrib/econ-bst/customization/econ-old.tex b/biblio/bibtex/contrib/econ-bst/customization/econ-old.tex
index 108f4cb46c..4bb7d6d325 100644
--- a/biblio/bibtex/contrib/econ-bst/customization/econ-old.tex
+++ b/biblio/bibtex/contrib/econ-bst/customization/econ-old.tex
@@ -55,4 +55,5 @@ This document uses ``\verb|econ-old.bst|''.
% --------------------
% Local Variables:
% fill-column: 80
+% coding: utf-8-unix
% End:
diff --git a/biblio/bibtex/contrib/econ-bst/econ-a.bst b/biblio/bibtex/contrib/econ-bst/econ-a.bst
index 6a047e97d0..2d5330e22a 100644
--- a/biblio/bibtex/contrib/econ-bst/econ-a.bst
+++ b/biblio/bibtex/contrib/econ-bst/econ-a.bst
@@ -4,7 +4,7 @@
% Maintainer: Shiro Takeda
% Copyright (C) 2001-2018 Shiro Takeda
% First-written: <2007/07/28>
-% Version: 2.7
+% Version: 3.1
% Keywords: TeX, BibTeX, bst
% URL: https://github.com/ShiroTakeda/econ-bst
@@ -37,7 +37,7 @@
% For changelogs, see CHANGES.txt file.
% version number
-FUNCTION {econ.version} { "2.7" }
+FUNCTION {econ.version} { "3.1" }
% File name
FUNCTION {econ.file} { "econ.bst" }
@@ -53,7 +53,7 @@ ENTRY
institution journal key month note number organization pages publisher
school series title type url volume year
% Fields specific to econ.bst
- order absorder nameorder
+ order absorder nameorder sortname
}
% Definition of entry variable. The entry variable is a variable which has
@@ -317,10 +317,18 @@ FUNCTION {bst.cite.and.nameorder}
FUNCTION {bst.and.others.num}
{ #3 } % If the number of authors is greater or equal to three (default).
-% If the number of authors is greater or equal to bst.max.author.num, only
-% first author is listed and other authors' names are abbreviated as "et al.".
+% If the number of authors is greater than N1, only the first N2 authors are
+% displayed in the reference part (and other authors' names are omitted by "et
+% al".
+%
+% The following function determines the value of N1.
FUNCTION {bst.max.author.num}
-{ #12 } % If the number of authors is greater or equal to 12 (default).
+{ #8 } % (default).
+
+% The following function determines the value of N2.
+FUNCTION {bst.max.author.num.display}
+{ #3 } % (default).
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -828,7 +836,7 @@ STRINGS { item.type }
STRINGS { tempa tempb }
%% Integer global variables:
-INTEGERS { nameptr namesleft numnames name.num }
+INTEGERS { nameptr namesleft numnames name.num numtrunc }
INTEGERS { multiresult }
INTEGERS { index }
INTEGERS { len }
@@ -1188,6 +1196,11 @@ FUNCTION {bst.and.others.output}
%%% author and editor
+% nameptr: author number
+% numnames: the total number of authors
+% namesleft: the number of authors which have not been processed.
+% numtrunc: bst.max.author.num.display
+
%%% name
FUNCTION {format.names}
{ 's :=
@@ -1196,11 +1209,20 @@ FUNCTION {format.names}
% Set the number of authors to numnames.
s num.names$ 'numnames :=
numnames 'namesleft :=
- % Repeat if namesleft > 0
+
+ numnames bst.max.author.num >
+ % If numnames > bst.max.author.num
+ { bst.max.author.num.display 'numtrunc := }
+ { #0 'numtrunc := }
+ if$
+
+ % Repeat if namesleft > 0 ---- Repeat from here
{ namesleft #0 > }
- { nameptr #1 =
- % First author
+ {
+ % Block A starts
+ nameptr #1 =
+ % A-1: If the author is the 1st author
{ bst.author.name #0 =
bst.author.name #1 =
or
@@ -1216,7 +1238,7 @@ FUNCTION {format.names}
}
if$
}
- % The second or later authors
+ % A-2: If the author is the second or later authors (not the 1st author).
{ bst.author.name #0 =
bst.author.name #2 =
or
@@ -1233,27 +1255,49 @@ FUNCTION {format.names}
if$
}
if$
+ % Block A ends
+ % Block B starts
nameptr #1 >
- % The second or later authors
- { numnames bst.max.author.num >
- { bst.and.others *
- #1 'namesleft := }
- { nameorder.temp "random" =
- bst.use.nameorder #0 = not and
- { bst.and.nameorder * t * }
- { namesleft #1 >
- % More than one authors left
- { ", " * t * }
- % Only one author left
- { t "others" =
- { bst.and.others.output * }
- { numnames #2 =
- % Entry with two authors
- { bst.and * t * }
- { bst.ands * t * }
- if$
- }
+
+ % B-1: If the author is the second or later authors
+ {
+
+ nameptr #1 - numtrunc =
+ % If nameptr - 1 = numtrunc
+ { #1 'namesleft :=
+ "others" 't := }
+ 'skip$
+ if$
+
+ % If numnames <= bst.max.author.num
+ nameorder.temp "random" =
+ bst.use.nameorder #0 = not and
+
+ % If random ordering is used
+ { bst.and.nameorder * t * }
+
+ % If random ordering is not used
+ { namesleft #1 >
+
+ % If more than one authors are left
+ { ", " * t * }
+
+ % If the author is the last author.
+ { t "others" =
+
+ % If the name is "others"
+ { bst.and.others.output * }
+
+ % If the name is not "others"
+ { numnames #2 =
+
+ % If the entry have two authors
+ { bst.and * t * }
+
+ % If the entry have more than two authors
+ { bst.ands * t * }
+
if$
}
if$
@@ -1262,12 +1306,17 @@ FUNCTION {format.names}
}
if$
}
+
+ % When the author is the first author.
't
if$
+ % Block B ends
+
nameptr #1 + 'nameptr :=
namesleft #1 - 'namesleft :=
+
}
- while$
+ while$ % ---- Repeat until here
}
% remove successive periods (commas) from author
@@ -1392,10 +1441,6 @@ FUNCTION {format.editors.alt}
{ "\bysame " }
{ bst.author.pre editor remove.ss.period.auth * }
if$
- editor num.names$ #1 >
- { bst.editors * }
- { bst.editor * }
- if$
}
if$
}
@@ -2635,7 +2680,7 @@ FUNCTION {format.lab.names.abb}
% if the number of authors is less than bst.and.others.num, full name.
{ s format.lab.names.full }
% if the number of authors is equal or more than bst.and.others.num, abbreviated name.
- { s #1 "{ll}" format.name$ bst.and.others.output * }
+ { s #1 "{vv~}{ll}" format.name$ bst.and.others.output * }
if$
}
@@ -2693,58 +2738,74 @@ FUNCTION {format.names.full.wo.and}
}
FUNCTION {author.key.full.wo.and}
-{ author empty$
- { key empty$
- { cite$ #1 #3 substring$ }
- { key #3 text.prefix$ }
+{ sortname empty$ not
+ { sortname format.names.full.wo.and }
+ { author empty$ not
+ { author format.names.full.wo.and }
+ { key empty$ not
+ { key #3 text.prefix$ }
+ { cite$ #1 #3 substring$ }
+ if$
+ }
if$
}
- { author format.names.full.wo.and }
if$
}
FUNCTION {author.editor.key.full.wo.and}
-{ author empty$
- { editor empty$
- { key empty$
- { cite$ #1 #3 substring$ }
- { key #3 text.prefix$ }
+{ sortname empty$ not
+ { sortname format.names.full.wo.and }
+ { author empty$ not
+ { author format.names.full.wo.and }
+ { editor empty$ not
+ { editor format.names.full.wo.and }
+ { key empty$
+ { cite$ #1 #3 substring$ }
+ { key #3 text.prefix$ }
+ if$
+ }
if$
}
- { editor format.names.full.wo.and }
if$
}
- { author format.names.full.wo.and }
if$
}
FUNCTION {editor.key.organization.key.full.wo.and}
-{ editor empty$
- { key empty$
- { organization empty$
- { cite$ #1 #3 substring$ }
- { "The " #4 organization chop.word #3 text.prefix$ }
+{ sortname empty$ not
+ { sortname format.names.full.wo.and }
+ { editor empty$ not
+ { editor format.names.full.wo.and }
+ { key empty$ not
+ { key #3 text.prefix$ }
+ { organization empty$ not
+ { "The " #4 organization chop.word #3 text.prefix$ }
+ { cite$ #1 #3 substring$ }
+ if$
+ }
if$
}
- { key #3 text.prefix$ }
if$
}
- { editor format.names.full.wo.and }
if$
}
FUNCTION {author.key.organization.key.full.wo.and}
-{ author empty$
- { key empty$
- { organization empty$
- { cite$ #1 #3 substring$ }
- { "The " #4 organization chop.word #3 text.prefix$ }
+{ sortname empty$ not
+ { sortname format.names.full.wo.and }
+ { author empty$ not
+ { author format.names.full.wo.and }
+ { key empty$ not
+ { key #3 text.prefix$ }
+ { organization empty$ not
+ { "The " #4 organization chop.word #3 text.prefix$ }
+ { cite$ #1 #3 substring$ }
+ if$
+ }
if$
}
- { key #3 text.prefix$ }
if$
}
- { author format.names.full.wo.and }
if$
}
@@ -2938,13 +2999,17 @@ FUNCTION {calc.cyear}
}
FUNCTION {calc.sort.label.abb}
-{ author empty$
- { editor empty$
- { "" }
- { editor 's := }
+{ sortname empty$ not
+ { sortname 's := }
+ { author empty$ not
+ { author 's := }
+ { editor empty$ not
+ { editor 's := }
+ { "" }
+ if$
+ }
if$
}
- { author 's := }
if$
s sort.format.names.abb 't :=
year empty$
@@ -3594,4 +3659,5 @@ EXECUTE {end.bib}
% Local Variables:
% fill-column: 78
% mode: bst
+% coding: utf-8-unix
% End:
diff --git a/biblio/bibtex/contrib/econ-bst/econ-abbr.bst b/biblio/bibtex/contrib/econ-bst/econ-abbr.bst
index 7beacd5cf6..6b012acc1b 100644
--- a/biblio/bibtex/contrib/econ-bst/econ-abbr.bst
+++ b/biblio/bibtex/contrib/econ-bst/econ-abbr.bst
@@ -4,7 +4,7 @@
% Maintainer: Shiro Takeda
% Copyright (C) 2001-2018 Shiro Takeda
% First-written: <2007/07/28>
-% Version: 2.7
+% Version: 3.1
% Keywords: TeX, BibTeX, bst
% URL: https://github.com/ShiroTakeda/econ-bst
@@ -37,7 +37,7 @@
% For changelogs, see CHANGES.txt file.
% version number
-FUNCTION {econ.version} { "2.7" }
+FUNCTION {econ.version} { "3.1" }
% File name
FUNCTION {econ.file} { "econ.bst" }
@@ -53,7 +53,7 @@ ENTRY
institution journal key month note number organization pages publisher
school series title type url volume year
% Fields specific to econ.bst
- order absorder nameorder
+ order absorder nameorder sortname
}
% Definition of entry variable. The entry variable is a variable which has
@@ -315,10 +315,18 @@ FUNCTION {bst.cite.and.nameorder}
FUNCTION {bst.and.others.num}
{ #3 } % If the number of authors is greater or equal to three (default).
-% If the number of authors is greater or equal to bst.max.author.num, only
-% first author is listed and other authors' names are abbreviated as "et al.".
+% If the number of authors is greater than N1, only the first N2 authors are
+% displayed in the reference part (and other authors' names are omitted by "et
+% al".
+%
+% The following function determines the value of N1.
FUNCTION {bst.max.author.num}
-{ #12 } % If the number of authors is greater or equal to 12 (default).
+{ #8 } % (default).
+
+% The following function determines the value of N2.
+FUNCTION {bst.max.author.num.display}
+{ #3 } % (default).
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -810,7 +818,7 @@ STRINGS { item.type }
STRINGS { tempa tempb }
%% Integer global variables:
-INTEGERS { nameptr namesleft numnames name.num }
+INTEGERS { nameptr namesleft numnames name.num numtrunc }
INTEGERS { multiresult }
INTEGERS { index }
INTEGERS { len }
@@ -2318,6 +2326,11 @@ FUNCTION {bst.and.others.output}
%%% author and editor
+% nameptr: author number
+% numnames: the total number of authors
+% namesleft: the number of authors which have not been processed.
+% numtrunc: bst.max.author.num.display
+
%%% name
FUNCTION {format.names}
{ 's :=
@@ -2326,11 +2339,20 @@ FUNCTION {format.names}
% Set the number of authors to numnames.
s num.names$ 'numnames :=
numnames 'namesleft :=
- % Repeat if namesleft > 0
+
+ numnames bst.max.author.num >
+ % If numnames > bst.max.author.num
+ { bst.max.author.num.display 'numtrunc := }
+ { #0 'numtrunc := }
+ if$
+
+ % Repeat if namesleft > 0 ---- Repeat from here
{ namesleft #0 > }
- { nameptr #1 =
- % First author
+ {
+ % Block A starts
+ nameptr #1 =
+ % A-1: If the author is the 1st author
{ bst.author.name #0 =
bst.author.name #1 =
or
@@ -2346,7 +2368,7 @@ FUNCTION {format.names}
}
if$
}
- % The second or later authors
+ % A-2: If the author is the second or later authors (not the 1st author).
{ bst.author.name #0 =
bst.author.name #2 =
or
@@ -2363,27 +2385,49 @@ FUNCTION {format.names}
if$
}
if$
+ % Block A ends
+ % Block B starts
nameptr #1 >
- % The second or later authors
- { numnames bst.max.author.num >
- { bst.and.others *
- #1 'namesleft := }
- { nameorder.temp "random" =
- bst.use.nameorder #0 = not and
- { bst.and.nameorder * t * }
- { namesleft #1 >
- % More than one authors left
- { ", " * t * }
- % Only one author left
- { t "others" =
- { bst.and.others.output * }
- { numnames #2 =
- % Entry with two authors
- { bst.and * t * }
- { bst.ands * t * }
- if$
- }
+
+ % B-1: If the author is the second or later authors
+ {
+
+ nameptr #1 - numtrunc =
+ % If nameptr - 1 = numtrunc
+ { #1 'namesleft :=
+ "others" 't := }
+ 'skip$
+ if$
+
+ % If numnames <= bst.max.author.num
+ nameorder.temp "random" =
+ bst.use.nameorder #0 = not and
+
+ % If random ordering is used
+ { bst.and.nameorder * t * }
+
+ % If random ordering is not used
+ { namesleft #1 >
+
+ % If more than one authors are left
+ { ", " * t * }
+
+ % If the author is the last author.
+ { t "others" =
+
+ % If the name is "others"
+ { bst.and.others.output * }
+
+ % If the name is not "others"
+ { numnames #2 =
+
+ % If the entry have two authors
+ { bst.and * t * }
+
+ % If the entry have more than two authors
+ { bst.ands * t * }
+
if$
}
if$
@@ -2392,12 +2436,17 @@ FUNCTION {format.names}
}
if$
}
+
+ % When the author is the first author.
't
if$
+ % Block B ends
+
nameptr #1 + 'nameptr :=
namesleft #1 - 'namesleft :=
+
}
- while$
+ while$ % ---- Repeat until here
}
% remove successive periods (commas) from author
@@ -2522,10 +2571,6 @@ FUNCTION {format.editors.alt}
{ "\bysame " }
{ bst.author.pre editor remove.ss.period.auth * }
if$
- editor num.names$ #1 >
- { bst.editors * }
- { bst.editor * }
- if$
}
if$
}
@@ -3765,7 +3810,7 @@ FUNCTION {format.lab.names.abb}
% if the number of authors is less than bst.and.others.num, full name.
{ s format.lab.names.full }
% if the number of authors is equal or more than bst.and.others.num, abbreviated name.
- { s #1 "{ll}" format.name$ bst.and.others.output * }
+ { s #1 "{vv~}{ll}" format.name$ bst.and.others.output * }
if$
}
@@ -3823,58 +3868,74 @@ FUNCTION {format.names.full.wo.and}
}
FUNCTION {author.key.full.wo.and}
-{ author empty$
- { key empty$
- { cite$ #1 #3 substring$ }
- { key #3 text.prefix$ }
+{ sortname empty$ not
+ { sortname format.names.full.wo.and }
+ { author empty$ not
+ { author format.names.full.wo.and }
+ { key empty$ not
+ { key #3 text.prefix$ }
+ { cite$ #1 #3 substring$ }
+ if$
+ }
if$
}
- { author format.names.full.wo.and }
if$
}
FUNCTION {author.editor.key.full.wo.and}
-{ author empty$
- { editor empty$
- { key empty$
- { cite$ #1 #3 substring$ }
- { key #3 text.prefix$ }
+{ sortname empty$ not
+ { sortname format.names.full.wo.and }
+ { author empty$ not
+ { author format.names.full.wo.and }
+ { editor empty$ not
+ { editor format.names.full.wo.and }
+ { key empty$
+ { cite$ #1 #3 substring$ }
+ { key #3 text.prefix$ }
+ if$
+ }
if$
}
- { editor format.names.full.wo.and }
if$
}
- { author format.names.full.wo.and }
if$
}
FUNCTION {editor.key.organization.key.full.wo.and}
-{ editor empty$
- { key empty$
- { organization empty$
- { cite$ #1 #3 substring$ }
- { "The " #4 organization chop.word #3 text.prefix$ }
+{ sortname empty$ not
+ { sortname format.names.full.wo.and }
+ { editor empty$ not
+ { editor format.names.full.wo.and }
+ { key empty$ not
+ { key #3 text.prefix$ }
+ { organization empty$ not
+ { "The " #4 organization chop.word #3 text.prefix$ }
+ { cite$ #1 #3 substring$ }
+ if$
+ }
if$
}
- { key #3 text.prefix$ }
if$
}
- { editor format.names.full.wo.and }
if$
}
FUNCTION {author.key.organization.key.full.wo.and}
-{ author empty$
- { key empty$
- { organization empty$
- { cite$ #1 #3 substring$ }
- { "The " #4 organization chop.word #3 text.prefix$ }
+{ sortname empty$ not
+ { sortname format.names.full.wo.and }
+ { author empty$ not
+ { author format.names.full.wo.and }
+ { key empty$ not
+ { key #3 text.prefix$ }
+ { organization empty$ not
+ { "The " #4 organization chop.word #3 text.prefix$ }
+ { cite$ #1 #3 substring$ }
+ if$
+ }
if$
}
- { key #3 text.prefix$ }
if$
}
- { author format.names.full.wo.and }
if$
}
@@ -4068,13 +4129,17 @@ FUNCTION {calc.cyear}
}
FUNCTION {calc.sort.label.abb}
-{ author empty$
- { editor empty$
- { "" }
- { editor 's := }
+{ sortname empty$ not
+ { sortname 's := }
+ { author empty$ not
+ { author 's := }
+ { editor empty$ not
+ { editor 's := }
+ { "" }
+ if$
+ }
if$
}
- { author 's := }
if$
s sort.format.names.abb 't :=
year empty$
@@ -4724,4 +4789,5 @@ EXECUTE {end.bib}
% Local Variables:
% fill-column: 78
% mode: bst
+% coding: utf-8-unix
% End:
diff --git a/biblio/bibtex/contrib/econ-bst/econ-aea.bst b/biblio/bibtex/contrib/econ-bst/econ-aea.bst
index 21f2fb4803..cb6c44f4ea 100644
--- a/biblio/bibtex/contrib/econ-bst/econ-aea.bst
+++ b/biblio/bibtex/contrib/econ-bst/econ-aea.bst
@@ -4,7 +4,7 @@
% Maintainer: Shiro Takeda
% Copyright (C) 2001-2018 Shiro Takeda
% First-written: <2007/07/28>
-% Version: 2.7
+% Version: 3.1
% Keywords: TeX, BibTeX, bst
% URL: https://github.com/ShiroTakeda/econ-bst
@@ -36,7 +36,7 @@
% https://github.com/ShiroTakeda/econ-bst
% version number
-FUNCTION {econ.version} { "2.7" }
+FUNCTION {econ.version} { "3.1" }
% File name
FUNCTION {econ.file} { "aer.bst" }
@@ -52,7 +52,7 @@ ENTRY
institution journal key month note number organization pages publisher
school series title type url volume year
% Fields specific to econ.bst
- order absorder nameorder
+ order absorder nameorder sortname
}
% Definition of entry variable. The entry variable is a variable which has
@@ -316,10 +316,18 @@ FUNCTION {bst.cite.and.nameorder}
FUNCTION {bst.and.others.num}
{ #3 } % If the number of authors is greater or equal to three (default).
-% If the number of authors is greater or equal to bst.max.author.num, only
-% first author is listed and other authors' names are abbreviated as "et al.".
+% If the number of authors is greater than N1, only the first N2 authors are
+% displayed in the reference part (and other authors' names are omitted by "et
+% al".
+%
+% The following function determines the value of N1.
FUNCTION {bst.max.author.num}
-{ #12 } % If the number of authors is greater or equal to 12 (default).
+{ #8 } % (default).
+
+% The following function determines the value of N2.
+FUNCTION {bst.max.author.num.display}
+{ #3 } % (default).
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -584,8 +592,8 @@ FUNCTION {bst.address.post}
% You can choose the order of address and publisher by this function.
%
-% If #0, address -> publisher order (the default value).
-% If non-zero, publisher -> address order.
+% If #0, address -> publisher order (the default value).
+% If non-zero, publisher -> address order.
FUNCTION {bst.address.position}
{ #0 } % Address is placed before publisher (default)
@@ -828,7 +836,7 @@ STRINGS { item.type }
STRINGS { tempa tempb }
%% Integer global variables:
-INTEGERS { nameptr namesleft numnames name.num }
+INTEGERS { nameptr namesleft numnames name.num numtrunc }
INTEGERS { multiresult }
INTEGERS { index }
INTEGERS { len }
@@ -1188,6 +1196,11 @@ FUNCTION {bst.and.others.output}
%%% author and editor
+% nameptr: author number
+% numnames: the total number of authors
+% namesleft: the number of authors which have not been processed.
+% numtrunc: bst.max.author.num.display
+
%%% name
FUNCTION {format.names}
{ 's :=
@@ -1196,11 +1209,20 @@ FUNCTION {format.names}
% Set the number of authors to numnames.
s num.names$ 'numnames :=
numnames 'namesleft :=
- % Repeat if namesleft > 0
+
+ numnames bst.max.author.num >
+ % If numnames > bst.max.author.num
+ { bst.max.author.num.display 'numtrunc := }
+ { #0 'numtrunc := }
+ if$
+
+ % Repeat if namesleft > 0 ---- Repeat from here
{ namesleft #0 > }
- { nameptr #1 =
- % First author
+ {
+ % Block A starts
+ nameptr #1 =
+ % A-1: If the author is the 1st author
{ bst.author.name #0 =
bst.author.name #1 =
or
@@ -1216,7 +1238,7 @@ FUNCTION {format.names}
}
if$
}
- % The second or later authors
+ % A-2: If the author is the second or later authors (not the 1st author).
{ bst.author.name #0 =
bst.author.name #2 =
or
@@ -1233,27 +1255,49 @@ FUNCTION {format.names}
if$
}
if$
+ % Block A ends
+ % Block B starts
nameptr #1 >
- % The second or later authors
- { numnames bst.max.author.num >
- { bst.and.others *
- #1 'namesleft := }
- { nameorder.temp "random" =
- bst.use.nameorder #0 = not and
- { bst.and.nameorder * t * }
- { namesleft #1 >
- % More than one authors left
- { ", " * t * }
- % Only one author left
- { t "others" =
- { bst.and.others.output * }
- { numnames #2 =
- % Entry with two authors
- { bst.and * t * }
- { bst.ands * t * }
- if$
- }
+
+ % B-1: If the author is the second or later authors
+ {
+
+ nameptr #1 - numtrunc =
+ % If nameptr - 1 = numtrunc
+ { #1 'namesleft :=
+ "others" 't := }
+ 'skip$
+ if$
+
+ % If numnames <= bst.max.author.num
+ nameorder.temp "random" =
+ bst.use.nameorder #0 = not and
+
+ % If random ordering is used
+ { bst.and.nameorder * t * }
+
+ % If random ordering is not used
+ { namesleft #1 >
+
+ % If more than one authors are left
+ { ", " * t * }
+
+ % If the author is the last author.
+ { t "others" =
+
+ % If the name is "others"
+ { bst.and.others.output * }
+
+ % If the name is not "others"
+ { numnames #2 =
+
+ % If the entry have two authors
+ { bst.and * t * }
+
+ % If the entry have more than two authors
+ { bst.ands * t * }
+
if$
}
if$
@@ -1262,12 +1306,17 @@ FUNCTION {format.names}
}
if$
}
+
+ % When the author is the first author.
't
if$
+ % Block B ends
+
nameptr #1 + 'nameptr :=
namesleft #1 - 'namesleft :=
+
}
- while$
+ while$ % ---- Repeat until here
}
% remove successive periods (commas) from author
@@ -1313,7 +1362,7 @@ FUNCTION {compare.names.aer}
s i.aer "{ff }{vv }{ll}{ jj}" format.name$
=
{ #1 i.aer <
- { " and " * } % \bysame ‚ÅÈ—ª‚·‚é’˜ŽÒ‚Ì‘O‚ɂ‚­ and
+ { " and " * } % \bysame ã§çœç•¥ã™ã‚‹è‘—者ã®å‰ã«ã¤ã and
{ }
if$
"\bysame{}" *
@@ -1392,10 +1441,6 @@ FUNCTION {format.editors.alt}
{ "\bysame " }
{ bst.author.pre editor remove.ss.period.auth * }
if$
- editor num.names$ #1 >
- { bst.editors * }
- { bst.editor * }
- if$
}
if$
}
@@ -1407,8 +1452,8 @@ FUNCTION {format.editors.x}
{ bst.editor.btitle.order #0 =
{ "" }
{ editor num.names$ #1 >
- { " edited by " }
- { " edited by " }
+ { " edited by " } % For econ-aea.bst
+ { " edited by " } % For econ-aea.bst
% { bst.editors " by " * }
% { bst.editor " by " * }
if$
@@ -1550,7 +1595,7 @@ FUNCTION {format.bvolume}
{ volume empty$
{ "" }
% { bst.volume.pre volume * bst.volume.post *
- { " Volume " volume * "." *
+ { " Volume " volume * "." * % For econ-aea.bst
series empty$
'skip$
%% If there is series field
@@ -1880,7 +1925,7 @@ FUNCTION {format.address}
FUNCTION {format.publisher}
{ publisher empty$
{ "" }
- { address empty$
+ { address empty$ % For econ-aea.bst
{ ", " publisher * bst.publisher.post * }
{ bst.publisher.pre publisher * bst.publisher.post * }
if$
@@ -2642,7 +2687,7 @@ FUNCTION {format.lab.names.abb}
% if the number of authors is less than bst.and.others.num, full name.
{ s format.lab.names.full }
% if the number of authors is equal or more than bst.and.others.num, abbreviated name.
- { s #1 "{ll}" format.name$ bst.and.others.output * }
+ { s #1 "{vv~}{ll}" format.name$ bst.and.others.output * }
if$
}
@@ -2700,58 +2745,74 @@ FUNCTION {format.names.full.wo.and}
}
FUNCTION {author.key.full.wo.and}
-{ author empty$
- { key empty$
- { cite$ #1 #3 substring$ }
- { key #3 text.prefix$ }
+{ sortname empty$ not
+ { sortname format.names.full.wo.and }
+ { author empty$ not
+ { author format.names.full.wo.and }
+ { key empty$ not
+ { key #3 text.prefix$ }
+ { cite$ #1 #3 substring$ }
+ if$
+ }
if$
}
- { author format.names.full.wo.and }
if$
}
FUNCTION {author.editor.key.full.wo.and}
-{ author empty$
- { editor empty$
- { key empty$
- { cite$ #1 #3 substring$ }
- { key #3 text.prefix$ }
+{ sortname empty$ not
+ { sortname format.names.full.wo.and }
+ { author empty$ not
+ { author format.names.full.wo.and }
+ { editor empty$ not
+ { editor format.names.full.wo.and }
+ { key empty$
+ { cite$ #1 #3 substring$ }
+ { key #3 text.prefix$ }
+ if$
+ }
if$
}
- { editor format.names.full.wo.and }
if$
}
- { author format.names.full.wo.and }
if$
}
FUNCTION {editor.key.organization.key.full.wo.and}
-{ editor empty$
- { key empty$
- { organization empty$
- { cite$ #1 #3 substring$ }
- { "The " #4 organization chop.word #3 text.prefix$ }
+{ sortname empty$ not
+ { sortname format.names.full.wo.and }
+ { editor empty$ not
+ { editor format.names.full.wo.and }
+ { key empty$ not
+ { key #3 text.prefix$ }
+ { organization empty$ not
+ { "The " #4 organization chop.word #3 text.prefix$ }
+ { cite$ #1 #3 substring$ }
+ if$
+ }
if$
}
- { key #3 text.prefix$ }
if$
}
- { editor format.names.full.wo.and }
if$
}
FUNCTION {author.key.organization.key.full.wo.and}
-{ author empty$
- { key empty$
- { organization empty$
- { cite$ #1 #3 substring$ }
- { "The " #4 organization chop.word #3 text.prefix$ }
+{ sortname empty$ not
+ { sortname format.names.full.wo.and }
+ { author empty$ not
+ { author format.names.full.wo.and }
+ { key empty$ not
+ { key #3 text.prefix$ }
+ { organization empty$ not
+ { "The " #4 organization chop.word #3 text.prefix$ }
+ { cite$ #1 #3 substring$ }
+ if$
+ }
if$
}
- { key #3 text.prefix$ }
if$
}
- { author format.names.full.wo.and }
if$
}
@@ -2945,13 +3006,17 @@ FUNCTION {calc.cyear}
}
FUNCTION {calc.sort.label.abb}
-{ author empty$
- { editor empty$
- { "" }
- { editor 's := }
+{ sortname empty$ not
+ { sortname 's := }
+ { author empty$ not
+ { author 's := }
+ { editor empty$ not
+ { editor 's := }
+ { "" }
+ if$
+ }
if$
}
- { author 's := }
if$
s sort.format.names.abb 't :=
year empty$
@@ -3601,4 +3666,5 @@ EXECUTE {end.bib}
% Local Variables:
% fill-column: 78
% mode: bst
+% coding: utf-8-unix
% End:
diff --git a/biblio/bibtex/contrib/econ-bst/econ-b.bst b/biblio/bibtex/contrib/econ-bst/econ-b.bst
index 2e668eb9e0..1388401e63 100644
--- a/biblio/bibtex/contrib/econ-bst/econ-b.bst
+++ b/biblio/bibtex/contrib/econ-bst/econ-b.bst
@@ -4,7 +4,7 @@
% Maintainer: Shiro Takeda
% Copyright (C) 2001-2018 Shiro Takeda
% First-written: <2007/07/28>
-% Version: 2.7
+% Version: 3.1
% Keywords: TeX, BibTeX, bst
% URL: https://github.com/ShiroTakeda/econ-bst
@@ -37,7 +37,7 @@
% For changelogs, see CHANGES.txt file.
% version number
-FUNCTION {econ.version} { "2.7" }
+FUNCTION {econ.version} { "3.1" }
% File name
FUNCTION {econ.file} { "econ.bst" }
@@ -53,7 +53,7 @@ ENTRY
institution journal key month note number organization pages publisher
school series title type url volume year
% Fields specific to econ.bst
- order absorder nameorder
+ order absorder nameorder sortname
}
% Definition of entry variable. The entry variable is a variable which has
@@ -322,12 +322,20 @@ FUNCTION {bst.and.others.num}
% { #3 } % If the number of authors is greater or equal to three (default).
{ #4 }
- If the number of authors is greater or equal to bst.max.author.num, only
-% first author is listed and other authors' names are abbreviated as "et al.".
+% If the number of authors is greater than N1, only the first N2 authors are
+% displayed in the reference part (and other authors' names are omitted by "et
+% al".
+%
+% The following function determines the value of N1.
FUNCTION {bst.max.author.num}
-{ #12 } % If the number of authors is greater or equal to 12 (default).
+{ #8 } % (default).
+
+% The following function determines the value of N2.
+FUNCTION {bst.max.author.num.display}
+{ #3 } % (default).
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -832,7 +840,7 @@ STRINGS { item.type }
STRINGS { tempa tempb }
%% Integer global variables:
-INTEGERS { nameptr namesleft numnames name.num }
+INTEGERS { nameptr namesleft numnames name.num numtrunc }
INTEGERS { multiresult }
INTEGERS { index }
INTEGERS { len }
@@ -1192,6 +1200,11 @@ FUNCTION {bst.and.others.output}
%%% author and editor
+% nameptr: author number
+% numnames: the total number of authors
+% namesleft: the number of authors which have not been processed.
+% numtrunc: bst.max.author.num.display
+
%%% name
FUNCTION {format.names}
{ 's :=
@@ -1200,11 +1213,20 @@ FUNCTION {format.names}
% Set the number of authors to numnames.
s num.names$ 'numnames :=
numnames 'namesleft :=
- % Repeat if namesleft > 0
+
+ numnames bst.max.author.num >
+ % If numnames > bst.max.author.num
+ { bst.max.author.num.display 'numtrunc := }
+ { #0 'numtrunc := }
+ if$
+
+ % Repeat if namesleft > 0 ---- Repeat from here
{ namesleft #0 > }
- { nameptr #1 =
- % First author
+ {
+ % Block A starts
+ nameptr #1 =
+ % A-1: If the author is the 1st author
{ bst.author.name #0 =
bst.author.name #1 =
or
@@ -1220,7 +1242,7 @@ FUNCTION {format.names}
}
if$
}
- % The second or later authors
+ % A-2: If the author is the second or later authors (not the 1st author).
{ bst.author.name #0 =
bst.author.name #2 =
or
@@ -1237,27 +1259,49 @@ FUNCTION {format.names}
if$
}
if$
+ % Block A ends
+ % Block B starts
nameptr #1 >
- % The second or later authors
- { numnames bst.max.author.num >
- { bst.and.others *
- #1 'namesleft := }
- { nameorder.temp "random" =
- bst.use.nameorder #0 = not and
- { bst.and.nameorder * t * }
- { namesleft #1 >
- % More than one authors left
- { ", " * t * }
- % Only one author left
- { t "others" =
- { bst.and.others.output * }
- { numnames #2 =
- % Entry with two authors
- { bst.and * t * }
- { bst.ands * t * }
- if$
- }
+
+ % B-1: If the author is the second or later authors
+ {
+
+ nameptr #1 - numtrunc =
+ % If nameptr - 1 = numtrunc
+ { #1 'namesleft :=
+ "others" 't := }
+ 'skip$
+ if$
+
+ % If numnames <= bst.max.author.num
+ nameorder.temp "random" =
+ bst.use.nameorder #0 = not and
+
+ % If random ordering is used
+ { bst.and.nameorder * t * }
+
+ % If random ordering is not used
+ { namesleft #1 >
+
+ % If more than one authors are left
+ { ", " * t * }
+
+ % If the author is the last author.
+ { t "others" =
+
+ % If the name is "others"
+ { bst.and.others.output * }
+
+ % If the name is not "others"
+ { numnames #2 =
+
+ % If the entry have two authors
+ { bst.and * t * }
+
+ % If the entry have more than two authors
+ { bst.ands * t * }
+
if$
}
if$
@@ -1266,12 +1310,17 @@ FUNCTION {format.names}
}
if$
}
+
+ % When the author is the first author.
't
if$
+ % Block B ends
+
nameptr #1 + 'nameptr :=
namesleft #1 - 'namesleft :=
+
}
- while$
+ while$ % ---- Repeat until here
}
% remove successive periods (commas) from author
@@ -1396,10 +1445,6 @@ FUNCTION {format.editors.alt}
{ "\bysame " }
{ bst.author.pre editor remove.ss.period.auth * }
if$
- editor num.names$ #1 >
- { bst.editors * }
- { bst.editor * }
- if$
}
if$
}
@@ -2639,7 +2684,7 @@ FUNCTION {format.lab.names.abb}
% if the number of authors is less than bst.and.others.num, full name.
{ s format.lab.names.full }
% if the number of authors is equal or more than bst.and.others.num, abbreviated name.
- { s #1 "{ll}" format.name$ bst.and.others.output * }
+ { s #1 "{vv~}{ll}" format.name$ bst.and.others.output * }
if$
}
@@ -2697,58 +2742,74 @@ FUNCTION {format.names.full.wo.and}
}
FUNCTION {author.key.full.wo.and}
-{ author empty$
- { key empty$
- { cite$ #1 #3 substring$ }
- { key #3 text.prefix$ }
+{ sortname empty$ not
+ { sortname format.names.full.wo.and }
+ { author empty$ not
+ { author format.names.full.wo.and }
+ { key empty$ not
+ { key #3 text.prefix$ }
+ { cite$ #1 #3 substring$ }
+ if$
+ }
if$
}
- { author format.names.full.wo.and }
if$
}
FUNCTION {author.editor.key.full.wo.and}
-{ author empty$
- { editor empty$
- { key empty$
- { cite$ #1 #3 substring$ }
- { key #3 text.prefix$ }
+{ sortname empty$ not
+ { sortname format.names.full.wo.and }
+ { author empty$ not
+ { author format.names.full.wo.and }
+ { editor empty$ not
+ { editor format.names.full.wo.and }
+ { key empty$
+ { cite$ #1 #3 substring$ }
+ { key #3 text.prefix$ }
+ if$
+ }
if$
}
- { editor format.names.full.wo.and }
if$
}
- { author format.names.full.wo.and }
if$
}
FUNCTION {editor.key.organization.key.full.wo.and}
-{ editor empty$
- { key empty$
- { organization empty$
- { cite$ #1 #3 substring$ }
- { "The " #4 organization chop.word #3 text.prefix$ }
+{ sortname empty$ not
+ { sortname format.names.full.wo.and }
+ { editor empty$ not
+ { editor format.names.full.wo.and }
+ { key empty$ not
+ { key #3 text.prefix$ }
+ { organization empty$ not
+ { "The " #4 organization chop.word #3 text.prefix$ }
+ { cite$ #1 #3 substring$ }
+ if$
+ }
if$
}
- { key #3 text.prefix$ }
if$
}
- { editor format.names.full.wo.and }
if$
}
FUNCTION {author.key.organization.key.full.wo.and}
-{ author empty$
- { key empty$
- { organization empty$
- { cite$ #1 #3 substring$ }
- { "The " #4 organization chop.word #3 text.prefix$ }
+{ sortname empty$ not
+ { sortname format.names.full.wo.and }
+ { author empty$ not
+ { author format.names.full.wo.and }
+ { key empty$ not
+ { key #3 text.prefix$ }
+ { organization empty$ not
+ { "The " #4 organization chop.word #3 text.prefix$ }
+ { cite$ #1 #3 substring$ }
+ if$
+ }
if$
}
- { key #3 text.prefix$ }
if$
}
- { author format.names.full.wo.and }
if$
}
@@ -2942,13 +3003,17 @@ FUNCTION {calc.cyear}
}
FUNCTION {calc.sort.label.abb}
-{ author empty$
- { editor empty$
- { "" }
- { editor 's := }
+{ sortname empty$ not
+ { sortname 's := }
+ { author empty$ not
+ { author 's := }
+ { editor empty$ not
+ { editor 's := }
+ { "" }
+ if$
+ }
if$
}
- { author 's := }
if$
s sort.format.names.abb 't :=
year empty$
@@ -3598,4 +3663,5 @@ EXECUTE {end.bib}
% Local Variables:
% fill-column: 78
% mode: bst
+% coding: utf-8-unix
% End:
diff --git a/biblio/bibtex/contrib/econ-bst/econ-econometrica.bst b/biblio/bibtex/contrib/econ-bst/econ-econometrica.bst
index 81bc4063ff..9a20f53de7 100644
--- a/biblio/bibtex/contrib/econ-bst/econ-econometrica.bst
+++ b/biblio/bibtex/contrib/econ-bst/econ-econometrica.bst
@@ -4,7 +4,7 @@
% Maintainer: Shiro Takeda
% Copyright (C) 2001-2018 Shiro Takeda
% First-written: <2007/07/28>
-% Version: 2.7
+% Version: 3.1
% Keywords: TeX, BibTeX, bst
% URL: https://github.com/ShiroTakeda/econ-bst
@@ -29,7 +29,7 @@
% For changelogs, see CHANGES.txt file.
% version number
-FUNCTION {econ.version} { "2.7" }
+FUNCTION {econ.version} { "3.1" }
% File name
FUNCTION {econ.file} { "econ-econometrica.bst" }
@@ -45,7 +45,7 @@ ENTRY
institution journal key month note number organization pages publisher
school series title type url volume year
% Fields specific to econ.bst
- order absorder nameorder
+ order absorder nameorder sortname
}
% Definition of entry variable. The entry variable is a variable which has
@@ -308,10 +308,18 @@ FUNCTION {bst.cite.and.nameorder}
FUNCTION {bst.and.others.num}
{ #3 } % If the number of authors is greater or equal to three (default).
-% If the number of authors is greater or equal to bst.max.author.num, only
-% first author is listed and other authors' names are abbreviated as "et al.".
+% If the number of authors is greater than N1, only the first N2 authors are
+% displayed in the reference part (and other authors' names are omitted by "et
+% al".
+%
+% The following function determines the value of N1.
FUNCTION {bst.max.author.num}
-{ #12 } % If the number of authors is greater or equal to 12 (default).
+{ #8 } % (default).
+
+% The following function determines the value of N2.
+FUNCTION {bst.max.author.num.display}
+{ #3 } % (default).
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -810,7 +818,7 @@ STRINGS { item.type }
STRINGS { tempa tempb }
%% Integer global variables:
-INTEGERS { nameptr namesleft numnames name.num }
+INTEGERS { nameptr namesleft numnames name.num numtrunc }
INTEGERS { multiresult }
INTEGERS { index }
INTEGERS { len }
@@ -1170,6 +1178,11 @@ FUNCTION {bst.and.others.output}
%%% author and editor
+% nameptr: author number
+% numnames: the total number of authors
+% namesleft: the number of authors which have not been processed.
+% numtrunc: bst.max.author.num.display
+
%%% name
FUNCTION {format.names}
{ 's :=
@@ -1178,11 +1191,20 @@ FUNCTION {format.names}
% Set the number of authors to numnames.
s num.names$ 'numnames :=
numnames 'namesleft :=
- % Repeat if namesleft > 0
+
+ numnames bst.max.author.num >
+ % If numnames > bst.max.author.num
+ { bst.max.author.num.display 'numtrunc := }
+ { #0 'numtrunc := }
+ if$
+
+ % Repeat if namesleft > 0 ---- Repeat from here
{ namesleft #0 > }
- { nameptr #1 =
- % First author
+ {
+ % Block A starts
+ nameptr #1 =
+ % A-1: If the author is the 1st author
{ bst.author.name #0 =
bst.author.name #1 =
or
@@ -1198,7 +1220,7 @@ FUNCTION {format.names}
}
if$
}
- % The second or later authors
+ % A-2: If the author is the second or later authors (not the 1st author).
{ bst.author.name #0 =
bst.author.name #2 =
or
@@ -1215,27 +1237,49 @@ FUNCTION {format.names}
if$
}
if$
+ % Block A ends
+ % Block B starts
nameptr #1 >
- % The second or later authors
- { numnames bst.max.author.num >
- { bst.and.others *
- #1 'namesleft := }
- { nameorder.temp "random" =
- bst.use.nameorder #0 = not and
- { bst.and.nameorder * t * }
- { namesleft #1 >
- % More than one authors left
- { ", " * t * }
- % Only one author left
- { t "others" =
- { bst.and.others.output * }
- { numnames #2 =
- % Entry with two authors
- { bst.and * t * }
- { bst.ands * t * }
- if$
- }
+
+ % B-1: If the author is the second or later authors
+ {
+
+ nameptr #1 - numtrunc =
+ % If nameptr - 1 = numtrunc
+ { #1 'namesleft :=
+ "others" 't := }
+ 'skip$
+ if$
+
+ % If numnames <= bst.max.author.num
+ nameorder.temp "random" =
+ bst.use.nameorder #0 = not and
+
+ % If random ordering is used
+ { bst.and.nameorder * t * }
+
+ % If random ordering is not used
+ { namesleft #1 >
+
+ % If more than one authors are left
+ { ", " * t * }
+
+ % If the author is the last author.
+ { t "others" =
+
+ % If the name is "others"
+ { bst.and.others.output * }
+
+ % If the name is not "others"
+ { numnames #2 =
+
+ % If the entry have two authors
+ { bst.and * t * }
+
+ % If the entry have more than two authors
+ { bst.ands * t * }
+
if$
}
if$
@@ -1244,15 +1288,20 @@ FUNCTION {format.names}
}
if$
}
+
+ % When the author is the first author.
't
if$
+ % Block B ends
+
nameptr #1 + 'nameptr :=
namesleft #1 - 'namesleft :=
+
}
- while$
+ while$ % ---- Repeat until here
}
-% For Econometrica, we define `format.name.ed` in addition to `format.name`.
+% For econ-econometrica.bst, we define `format.name.ed` in addition to `format.name`.
FUNCTION {format.names.ed}
{ 's :=
% insert 1 to nameptr.
@@ -1430,10 +1479,6 @@ FUNCTION {format.editors.alt}
{ "\bysame " }
{ bst.author.pre editor remove.ss.period.auth * }
if$
- editor num.names$ #1 >
- { bst.editors * }
- { bst.editor * }
- if$
}
if$
}
@@ -1450,7 +1495,7 @@ FUNCTION {format.editors.x}
if$
}
if$
- editor format.names.ed *
+ editor format.names.ed * % For econ-econometrica.bst
% editor format.names *
bst.editor.btitle.order #0 =
{ editor num.names$ #1 >
@@ -1586,7 +1631,7 @@ FUNCTION {either.or.check}
FUNCTION {format.bvolume}
{ volume empty$
{ "" }
- { " Volume " volume * bst.volume.post *
+ { " Volume " volume * bst.volume.post * % For econ-econometrica.bst
% { bst.volume.pre volume * bst.volume.post *
series empty$
'skip$
@@ -2257,7 +2302,7 @@ FUNCTION {incollection}
format.in.ed.booktitle "booktitle" output.check.nocomma
format.bvolume output.nocomma
- % For Econometrica, publisher and its address are placed before edition,
+ % For econ-econometrica.bst, publisher and its address are placed before edition,
% chapter and page number.
output.address.organization.publisher
format.edition output.nocomma
@@ -2678,7 +2723,7 @@ FUNCTION {format.lab.names.abb}
% if the number of authors is less than bst.and.others.num, full name.
{ s format.lab.names.full }
% if the number of authors is equal or more than bst.and.others.num, abbreviated name.
- { s #1 "{ll}" format.name$ bst.and.others.output * }
+ { s #1 "{vv~}{ll}" format.name$ bst.and.others.output * }
if$
}
@@ -2736,58 +2781,74 @@ FUNCTION {format.names.full.wo.and}
}
FUNCTION {author.key.full.wo.and}
-{ author empty$
- { key empty$
- { cite$ #1 #3 substring$ }
- { key #3 text.prefix$ }
+{ sortname empty$ not
+ { sortname format.names.full.wo.and }
+ { author empty$ not
+ { author format.names.full.wo.and }
+ { key empty$ not
+ { key #3 text.prefix$ }
+ { cite$ #1 #3 substring$ }
+ if$
+ }
if$
}
- { author format.names.full.wo.and }
if$
}
FUNCTION {author.editor.key.full.wo.and}
-{ author empty$
- { editor empty$
- { key empty$
- { cite$ #1 #3 substring$ }
- { key #3 text.prefix$ }
+{ sortname empty$ not
+ { sortname format.names.full.wo.and }
+ { author empty$ not
+ { author format.names.full.wo.and }
+ { editor empty$ not
+ { editor format.names.full.wo.and }
+ { key empty$
+ { cite$ #1 #3 substring$ }
+ { key #3 text.prefix$ }
+ if$
+ }
if$
}
- { editor format.names.full.wo.and }
if$
}
- { author format.names.full.wo.and }
if$
}
FUNCTION {editor.key.organization.key.full.wo.and}
-{ editor empty$
- { key empty$
- { organization empty$
- { cite$ #1 #3 substring$ }
- { "The " #4 organization chop.word #3 text.prefix$ }
+{ sortname empty$ not
+ { sortname format.names.full.wo.and }
+ { editor empty$ not
+ { editor format.names.full.wo.and }
+ { key empty$ not
+ { key #3 text.prefix$ }
+ { organization empty$ not
+ { "The " #4 organization chop.word #3 text.prefix$ }
+ { cite$ #1 #3 substring$ }
+ if$
+ }
if$
}
- { key #3 text.prefix$ }
if$
}
- { editor format.names.full.wo.and }
if$
}
FUNCTION {author.key.organization.key.full.wo.and}
-{ author empty$
- { key empty$
- { organization empty$
- { cite$ #1 #3 substring$ }
- { "The " #4 organization chop.word #3 text.prefix$ }
+{ sortname empty$ not
+ { sortname format.names.full.wo.and }
+ { author empty$ not
+ { author format.names.full.wo.and }
+ { key empty$ not
+ { key #3 text.prefix$ }
+ { organization empty$ not
+ { "The " #4 organization chop.word #3 text.prefix$ }
+ { cite$ #1 #3 substring$ }
+ if$
+ }
if$
}
- { key #3 text.prefix$ }
if$
}
- { author format.names.full.wo.and }
if$
}
@@ -2981,13 +3042,17 @@ FUNCTION {calc.cyear}
}
FUNCTION {calc.sort.label.abb}
-{ author empty$
- { editor empty$
- { "" }
- { editor 's := }
+{ sortname empty$ not
+ { sortname 's := }
+ { author empty$ not
+ { author 's := }
+ { editor empty$ not
+ { editor 's := }
+ { "" }
+ if$
+ }
if$
}
- { author 's := }
if$
s sort.format.names.abb 't :=
year empty$
@@ -3637,4 +3702,5 @@ EXECUTE {end.bib}
% Local Variables:
% fill-column: 78
% mode: bst
+% coding: utf-8-unix
% End:
diff --git a/biblio/bibtex/contrib/econ-bst/econ-example.bib b/biblio/bibtex/contrib/econ-bst/econ-example.bib
index 720ec7a504..b489e70c3b 100644
--- a/biblio/bibtex/contrib/econ-bst/econ-example.bib
+++ b/biblio/bibtex/contrib/econ-bst/econ-example.bib
@@ -468,6 +468,104 @@
pages = {264-278}
}
+@ARTICLE{Attwood06:SexedUp_art,
+ title = {Sexed Up: Theorizing the Sexualization of Culture},
+ author = {Attwood, Feona},
+ journal = {Sexualities},
+ volume = 9,
+ number = 1,
+ pages = {77--94},
+ month = feb,
+ year = 2006
+}
+
+@article{Chung-1999-ANoteOnMatsushima's,
+ title = {A Note on {Matsushima}'s Regularity Condition},
+ author = {Chung, Kim-Sau},
+ year = 1999,
+ volume = 87,
+ pages = {429--433},
+ issn = {0022-0531},
+ doi = {10.1006/jeth.1999.2545},
+ abstract = {This note first uses a simple example to show that
+ H. Matsushima's (1991, J. Econ. Theory54, 198\textendash 203)
+ regularity condition, to the contrary of his claim, actually
+ does not imply C. d'Aspremont and L.-A. G\'erard-Varet's
+ (1979, J. Public Econ.11, 25\textendash 45) compatibility
+ condition. It then proves a stronger version of Matsushima's
+ proposition, namely that efficient public decision rules can
+ be truthfully implemented with budget-balancing mechanisms
+ under the weak regularity condition. Journal of Economic
+ Literature Classification Numbers: C72, D82.},
+ journal = {Journal of Economic Theory},
+ number = 2
+}
+
+@article{d'Aspremont-1998-LinearInequalityMethodsTo,
+ title = {Linear Inequality Methods to Enforce Partnerships under
+ Uncertainty: {{An}} Overview},
+ author = {{d'Aspremont}, Claude and {G{\'e}rard-Varet}, Louis-Andr{\'e}},
+ year = 1998,
+ volume = 25,
+ pages = {311--336},
+ issn = {0899-8256},
+ doi = {10.1006/game.1998.0675},
+ abstract = {We review different (generic) conditions on stochastic outcome
+ functions to enforce either efficient or nearly efficient
+ partnerships. Their logical relationship is explored. Two
+ kinds of conditions are considered. However, the property for
+ an action profile to be ``compatible'' plays a crucial role in
+ both kinds. Also, two kinds of enforcement mechanisms are
+ considered: enforcement through utility transfers and
+ enforcement through repetition.Journal of Economic
+ LiteratureClassification Numbers: D2, D7.},
+ journal = {Games and Economic Behavior},
+ keywords = {folk theorem,mechanism design,partnership,team moral hazard},
+ number = 2,
+ sortname = {Aspremont, Claude and {G{\'e}rard-Varet}, Louis-Andr{\'e}},
+}
+
+@article{d'Aspremont-2003-CorrelationIndependenceAndBayesian,
+ title = {Correlation, Independence, and {{Bayesian}} Incentives},
+ author = {{d'Aspremont}, Claude and Cr{\'e}mer, Jacques and
+ {G{\'e}rard-Varet}, Louis-Andr{\'e}},
+ year = 2003,
+ month = oct,
+ volume = 21,
+ pages = {281--310},
+ issn = {0176-1714, 1432-217X},
+ doi = {10.1007/s00355-003-0260-8},
+ journal = {Social Choice and Welfare},
+ number = 2,
+ sortname = {Aspremont, Claude and Cr{\'e}mer, Jacques and
+ {G{\'e}rard-Varet}, Louis-Andr{\'e}},
+}
+
+@article{d'Aspremont-2004-BalancedBayesianMechanisms,
+ title = {Balanced Bayesian Mechanisms},
+ author = {{d'Aspremont}, Claude and Cr{\'e}mer, Jacques and
+ {G{\'e}rard-Varet}, Louis-Andr{\'e}},
+ year = 2004,
+ volume = 115,
+ pages = {385--396},
+ issn = {0022-0531},
+ doi = {10.1016/j.jet.2003.07.001},
+ abstract = {In the transferable utility case, a number of authors have
+ identified conditions on beliefs that guarantee the existence
+ of Bayesian incentive compatible mechanisms with balanced
+ transfers. We present a new, easy to interpret, condition and
+ we show that it is (strictly) more general than all the other
+ conditions found in the literature. We also study conditions
+ guaranteeing the Bayesian implementability of all social
+ decision rules with balanced budget mechanisms.},
+ journal = {Journal of Economic Theory},
+ keywords = {Bayesian implementation,Bayesian incentive
+ compatibility,Mechanism design},
+ number = 2,
+ sortname = {Aspremont, Claude and Cr{\'e}mer, Jacques and
+ {G{\'e}rard-Varet}, Louis-Andr{\'e}},
+}
+
%%%%%%%%%%%%%%%%%%%%%%%%%%
% Book
@Book{krugman91:_geogr_trade,
@@ -518,6 +616,48 @@
address = {New York}
}
+@book{jones84:_handb_inter_econom,
+ editor = {Ronald W. Jones and Peter B. Kenen},
+ title = {Handbook of International Economics},
+ publisher = {Elsevier},
+ year = 1984,
+ volume = 1,
+ address = {Amsterdam}
+}
+
+@book{jones85:_handb_inter_econom,
+ editor = {Ronald W. Jones and Peter B. Kenen},
+ title = {Handbook of International Economics},
+ publisher = {Elsevier},
+ year = 1985,
+ volume = 2,
+ address = {Amsterdam}
+}
+
+@book{jones97:_handb_inter_econom,
+ title = {Handbook of International Economics},
+ editor = {Jones, Ronald W. and Grossman, Gene M. and Kenen, Peter B.
+ and Rogoff, Kenneth},
+ volume = 3,
+ year = 1997,
+ publisher = {Elsevier},
+ address = {Amsterdam}
+}
+
+@book{Attwood09:Mainstreaming,
+ title = {Mainstreaming Sex: the Sexualization of Western Culture},
+ editor = {Feona Attwood},
+ publisher = {I.~B. Tauris},
+ year = 2009,
+}
+
+@book{attwood2010porn,
+ title = {Porn.com: Making Sense of Online Pornography},
+ editor = {Feona Attwood},
+ year = 2010,
+ publisher = {Peter Lang}
+}
+
%%%%%%%%%%%%%%%%%%%%%%%%%%
% Incollection
@InCollection{krugman91:_is_bilat_bad,
@@ -896,5 +1036,5 @@
% Local Variables:
% mode: bibtex
% fill-column: 80
-% code: utf-8-dos
+% code: utf-8-unix
% End:
diff --git a/biblio/bibtex/contrib/econ-bst/econ-example.pdf b/biblio/bibtex/contrib/econ-bst/econ-example.pdf
index 248c366936..65f8fb0ae7 100644
--- a/biblio/bibtex/contrib/econ-bst/econ-example.pdf
+++ b/biblio/bibtex/contrib/econ-bst/econ-example.pdf
Binary files differ
diff --git a/biblio/bibtex/contrib/econ-bst/econ-example.tex b/biblio/bibtex/contrib/econ-bst/econ-example.tex
index a12cc33087..1a5bc65dc4 100644
--- a/biblio/bibtex/contrib/econ-bst/econ-example.tex
+++ b/biblio/bibtex/contrib/econ-bst/econ-example.tex
@@ -55,12 +55,12 @@
%%% title, author, acknowledgement, and date
\title{\texttt{econ.bst}:\\
-\BibTeX{} style for economics\thanks{\texttt{econ.bst} is available at
+\BibTeX{} style for economics\\(ver. 3.1)\thanks{\texttt{econ.bst} is available at
\url{https://github.com/ShiroTakeda/econ-bst}}
}
\author{Shiro Takeda\thanks{email: {\ttfamily shiro.takeda@gmail.com}.}}
-\date{2020/03/03}
+\date{2021-05-23}
%#####################################################################
%######################### Document Starts ###########################
@@ -552,6 +552,28 @@ Krugman, Paul~R. (1991) ``Is Bilateralism Bad?'' in Elhanan Helpman and Assaf
Cambridge, MA, pp. 9--23.
\end{Frame}
+\subsubsection{When the number of authors is very large}
+
+In some research areas, the number of authors of a paper is sometimes very large
+(more than 100 ). In such a bibliographic entry, it is not possible to list all
+authors names in the reference part. To handle a bibliographic entry with many
+authors, ``\texttt{econ.bst}'' lists only a part of authors when the number of
+authors is large. In particular, econ.bst works as follows:
+\begin{itemize}
+ \item If the number of authors is greater than N1, only the first N2 authors'
+ names are displayed in the reference part (and other authors' names are
+ omitted by ``et el.'').
+ \item N1 is determined by `bst.max.author.num' (the default value = 8).
+ \item N2 is determined by `bst.max.author.num.displayed' (the default value =
+ 3).
+\end{itemize}
+
+This function is applied to The following three entries:
+\citet{essd-10-405-2018}, \citet{luthi08:_high}, and
+\citet{doi:10.1175/2009BAMS2778.1}. In addition, \texttt{econ-many-authors.tex}
+in the customization folder includes other examples.
+
+
\subsection{Customization of citation part}
We have so far seen the customization of reference part. ``\texttt{econ.bst}''
@@ -588,9 +610,9 @@ change the style of citation part by changing commands and options provided by
See the manual of \texttt{natbib.sty} for the details.
\begin{itemize}
\item The manual of \texttt{natbib.sty}:
- \href{http://mirror.ctan.org/macros/latex/contrib/natbib/natbib.pdf}{natbib.pdf}
+ \href{https://mirror.ctan.org/macros/latex/contrib/natbib/natbib.pdf}{natbib.pdf}
\item The reference sheet of \texttt{natbib.sty}:
- \href{http://mirror.ctan.org/macros/latex/contrib/natbib/natnotes.pdf}{natnotex.pdf}
+ \href{https://mirror.ctan.org/macros/latex/contrib/natbib/natnotes.pdf}{natnotex.pdf}
\end{itemize}
\subsubsection{Citation by number index}
@@ -762,6 +784,10 @@ order of priority:
\item Value of ``\texttt{absorder}'' field (if ``\texttt{absorder}'' field has
a value)
\item Value of ``\texttt{author}'' (or ``\texttt{editor}'') field.
+ \begin{itemize}
+ \item If ``\texttt{sortname}'' field is assigned a value, it is used
+ instead of ``\texttt{author}'' and ``\texttt{editor}''.
+ \end{itemize}
\item Value of ``\texttt{year}'' field.
\item Value of ``\texttt{order}'' field.
\item Value of ``\texttt{month}'' field.
@@ -772,7 +798,7 @@ By default,
\begin{itemize}
\item ``\texttt{bst.sort.entry.type}'' and ``\texttt{bst.sort.year}'' have
zero,
- \item \textbf{''\texttt{absorder}''} and \textbf{''\texttt{order}''}
+ \item \textbf{``\texttt{absorder}''} and \textbf{``\texttt{order}''}
fields are not assigned values because they are fields specific
to ``\texttt{econ.bst}''.
\end{itemize}
@@ -840,11 +866,11 @@ FUNCTION {bst.sort.year}
By default, old references are listed first. But if you set non-zero to
``\texttt{bst.reverse.year}'', new references are listed first.
-\subsection{Sorting by ''\texttt{absorder}'' field}
+\subsection{Sorting by ``\texttt{absorder}'' field}
If ``\texttt{absorder}'' is defined in bib file,
``\texttt{econ.bst}'' uses its content as the primary sorting key.
-You can set number 0--999 to ''\texttt{absorder}'' field.
+You can set number 0--999 to ``\texttt{absorder}'' field.
\begin{Frame}
\begin{center}
@@ -858,7 +884,7 @@ with the key \citet{takeda10:_cge_analy_welfar_effec_trade} has 999 for
``\texttt{absorder}'' field and thus listed in the last.
-\subsubsection{Ignore ''\texttt{absorder}'' field}
+\subsubsection{Ignore ``\texttt{absorder}'' field}
If you set some values for ``\texttt{absorder}'' fields in bib file,
but if you want to ignore them, set non-zero to
@@ -870,6 +896,47 @@ FUNCTION {bst.notuse.absorder.field}
\end{verbatim}
\end{Frame}
+\subsection{Sorting by ``\texttt{sortname}'' field}
+
+If ``\texttt{sortname}'' field is assigned a value, it is used for sorting
+instead of ``\texttt{author}'' or ``\texttt{editor}''.
+
+For example, the first author name of the following bibliography
+entry starts with the letter "d", so it is listed after the
+documents with author names that start with the letter c.
+\begin{Frame}
+\begin{verbatim}
+@article{d'Aspremont-2004-BalancedBayesianMechanisms,
+ title = {Balanced Bayesian Mechanisms},
+ author = {{d'Aspremont}, Claude and Cr{\'e}mer, Jacques and
+ {G{\'e}rard-Varet}, Louis-Andr{\'e}},
+ year = 2004,
+ volume = 115,
+ pages = {385--396},
+ issn = {0022-0531},
+ doi = {10.1016/j.jet.2003.07.001},
+ journal = {Journal of Economic Theory},
+ number = 2,
+}
+\end{verbatim}
+\end{Frame}
+
+However, for the name ``d'Aspremont'' we should think that it starts with the
+letter a.In this case, you had better to add the following ``\texttt{sortname}''
+field
+\begin{Frame}
+\begin{verbatim}
+ sortname = {Aspremont, Claude and Cr{\'e}mer, Jacques and
+ {G{\'e}rard-Varet}, Louis-Andr{\'e}},
+\end{verbatim}
+\end{Frame}
+
+Then, this entry is listed as author whose name begin with letter A. The
+following three entries have sortname fields:
+\citet{d'Aspremont-2004-BalancedBayesianMechanisms},
+\citet{d'Aspremont-2003-CorrelationIndependenceAndBayesian}, and
+\citet{d'Aspremont-1998-LinearInequalityMethodsTo}.
+
\section{Misc.}
\begin{itemize}
@@ -889,13 +956,17 @@ FUNCTION {bst.notuse.absorder.field}
\citet{BabikerRutherford-2005-EconomicEffectsof},
\citet{goldin:katz:2011}, \citet{goldin:katz:2008}, \citet{goldin:katz:2000}.
\citet{stakeda2019web},
-\citet{essd-10-405-2018},
-\citet{luthi08:_high},
-\citet{doi:10.1175/2009BAMS2778.1},
\citet{Rivers-2005-CombiningTop-Downand},
\citet{WilsonMannOtsuki-2005-AssessingBenefitsof},
\citet{zhang2016Deep},
-\citet{imbens2019Optimized}.
+\citet{imbens2019Optimized},
+\citet{essd-10-405-2018},
+\citet{luthi08:_high},
+\citet{doi:10.1175/2009BAMS2778.1},
+\citet{d'Aspremont-2004-BalancedBayesianMechanisms},
+\citet{d'Aspremont-2003-CorrelationIndependenceAndBayesian},
+\citet{Chung-1999-ANoteOnMatsushima's},
+\citet{d'Aspremont-1998-LinearInequalityMethodsTo},
\vspace*{1em}
@@ -916,5 +987,6 @@ FUNCTION {bst.notuse.absorder.field}
% --------------------
% Local Variables:
% fill-column: 80
+% coding: utf-8-unix
% End:
diff --git a/biblio/bibtex/contrib/econ-bst/econ-jet.bst b/biblio/bibtex/contrib/econ-bst/econ-jet.bst
index 67a00ed083..ed0329ab39 100644
--- a/biblio/bibtex/contrib/econ-bst/econ-jet.bst
+++ b/biblio/bibtex/contrib/econ-bst/econ-jet.bst
@@ -1,10 +1,10 @@
-%% econ-jet.bst: BibTeX style file for "Journal of Economic Theory".
+nn%% econ-jet.bst: BibTeX style file for "Journal of Economic Theory".
%
% Author: Shiro Takeda
% Maintainer: Shiro Takeda
% Copyright (C) 2001-2018 Shiro Takeda
% First-written: <2007/07/28>
-% Version: 2.7
+% Version: 3.1
% Keywords: TeX, BibTeX, bst
% URL: https://github.com/ShiroTakeda/econ-bst
@@ -29,7 +29,7 @@
% For changelogs, see CHANGES.txt file.
% version number
-FUNCTION {econ.version} { "2.7" }
+FUNCTION {econ.version} { "3.1" }
% File name
FUNCTION {econ.file} { "econ-jet.bst" }
@@ -45,7 +45,7 @@ ENTRY
institution journal key month note number organization pages publisher
school series title type url volume year
% Fields specific to econ.bst
- order absorder nameorder
+ order absorder nameorder sortname
}
% Definition of entry variable. The entry variable is a variable which has
@@ -309,10 +309,18 @@ FUNCTION {bst.cite.and.nameorder}
FUNCTION {bst.and.others.num}
{ #3 } % If the number of authors is greater or equal to three (default).
-% If the number of authors is greater or equal to bst.max.author.num, only
-% first author is listed and other authors' names are abbreviated as "et al.".
+% If the number of authors is greater than N1, only the first N2 authors are
+% displayed in the reference part (and other authors' names are omitted by "et
+% al".
+%
+% The following function determines the value of N1.
FUNCTION {bst.max.author.num}
-{ #12 } % If the number of authors is greater or equal to 12 (default).
+{ #8 } % (default).
+
+% The following function determines the value of N2.
+FUNCTION {bst.max.author.num.display}
+{ #3 } % (default).
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -819,7 +827,7 @@ STRINGS { item.type }
STRINGS { tempa tempb }
%% Integer global variables:
-INTEGERS { nameptr namesleft numnames name.num }
+INTEGERS { nameptr namesleft numnames name.num numtrunc }
INTEGERS { multiresult }
INTEGERS { index }
INTEGERS { len }
@@ -2327,6 +2335,11 @@ FUNCTION {bst.and.others.output}
%%% author and editor
+% nameptr: author number
+% numnames: the total number of authors
+% namesleft: the number of authors which have not been processed.
+% numtrunc: bst.max.author.num.display
+
%%% name
FUNCTION {format.names}
{ 's :=
@@ -2335,11 +2348,20 @@ FUNCTION {format.names}
% Set the number of authors to numnames.
s num.names$ 'numnames :=
numnames 'namesleft :=
- % Repeat if namesleft > 0
+
+ numnames bst.max.author.num >
+ % If numnames > bst.max.author.num
+ { bst.max.author.num.display 'numtrunc := }
+ { #0 'numtrunc := }
+ if$
+
+ % Repeat if namesleft > 0 ---- Repeat from here
{ namesleft #0 > }
- { nameptr #1 =
- % First author
+ {
+ % Block A starts
+ nameptr #1 =
+ % A-1: If the author is the 1st author
{ bst.author.name #0 =
bst.author.name #1 =
or
@@ -2355,7 +2377,7 @@ FUNCTION {format.names}
}
if$
}
- % The second or later authors
+ % A-2: If the author is the second or later authors (not the 1st author).
{ bst.author.name #0 =
bst.author.name #2 =
or
@@ -2372,27 +2394,49 @@ FUNCTION {format.names}
if$
}
if$
+ % Block A ends
+ % Block B starts
nameptr #1 >
- % The second or later authors
- { numnames bst.max.author.num >
- { bst.and.others *
- #1 'namesleft := }
- { nameorder.temp "random" =
- bst.use.nameorder #0 = not and
- { bst.and.nameorder * t * }
- { namesleft #1 >
- % More than one authors left
- { ", " * t * }
- % Only one author left
- { t "others" =
- { bst.and.others.output * }
- { numnames #2 =
- % Entry with two authors
- { bst.and * t * }
- { bst.ands * t * }
- if$
- }
+
+ % B-1: If the author is the second or later authors
+ {
+
+ nameptr #1 - numtrunc =
+ % If nameptr - 1 = numtrunc
+ { #1 'namesleft :=
+ "others" 't := }
+ 'skip$
+ if$
+
+ % If numnames <= bst.max.author.num
+ nameorder.temp "random" =
+ bst.use.nameorder #0 = not and
+
+ % If random ordering is used
+ { bst.and.nameorder * t * }
+
+ % If random ordering is not used
+ { namesleft #1 >
+
+ % If more than one authors are left
+ { ", " * t * }
+
+ % If the author is the last author.
+ { t "others" =
+
+ % If the name is "others"
+ { bst.and.others.output * }
+
+ % If the name is not "others"
+ { numnames #2 =
+
+ % If the entry have two authors
+ { bst.and * t * }
+
+ % If the entry have more than two authors
+ { bst.ands * t * }
+
if$
}
if$
@@ -2401,12 +2445,17 @@ FUNCTION {format.names}
}
if$
}
+
+ % When the author is the first author.
't
if$
+ % Block B ends
+
nameptr #1 + 'nameptr :=
namesleft #1 - 'namesleft :=
+
}
- while$
+ while$ % ---- Repeat until here
}
% remove successive periods (commas) from author
@@ -2531,10 +2580,6 @@ FUNCTION {format.editors.alt}
{ "\bysame " }
{ bst.author.pre editor remove.ss.period.auth * }
if$
- editor num.names$ #1 >
- { bst.editors * }
- { bst.editor * }
- if$
}
if$
}
@@ -3774,7 +3819,7 @@ FUNCTION {format.lab.names.abb}
% if the number of authors is less than bst.and.others.num, full name.
{ s format.lab.names.full }
% if the number of authors is equal or more than bst.and.others.num, abbreviated name.
- { s #1 "{ll}" format.name$ bst.and.others.output * }
+ { s #1 "{vv~}{ll}" format.name$ bst.and.others.output * }
if$
}
@@ -3832,58 +3877,74 @@ FUNCTION {format.names.full.wo.and}
}
FUNCTION {author.key.full.wo.and}
-{ author empty$
- { key empty$
- { cite$ #1 #3 substring$ }
- { key #3 text.prefix$ }
+{ sortname empty$ not
+ { sortname format.names.full.wo.and }
+ { author empty$ not
+ { author format.names.full.wo.and }
+ { key empty$ not
+ { key #3 text.prefix$ }
+ { cite$ #1 #3 substring$ }
+ if$
+ }
if$
}
- { author format.names.full.wo.and }
if$
}
FUNCTION {author.editor.key.full.wo.and}
-{ author empty$
- { editor empty$
- { key empty$
- { cite$ #1 #3 substring$ }
- { key #3 text.prefix$ }
+{ sortname empty$ not
+ { sortname format.names.full.wo.and }
+ { author empty$ not
+ { author format.names.full.wo.and }
+ { editor empty$ not
+ { editor format.names.full.wo.and }
+ { key empty$
+ { cite$ #1 #3 substring$ }
+ { key #3 text.prefix$ }
+ if$
+ }
if$
}
- { editor format.names.full.wo.and }
if$
}
- { author format.names.full.wo.and }
if$
}
FUNCTION {editor.key.organization.key.full.wo.and}
-{ editor empty$
- { key empty$
- { organization empty$
- { cite$ #1 #3 substring$ }
- { "The " #4 organization chop.word #3 text.prefix$ }
+{ sortname empty$ not
+ { sortname format.names.full.wo.and }
+ { editor empty$ not
+ { editor format.names.full.wo.and }
+ { key empty$ not
+ { key #3 text.prefix$ }
+ { organization empty$ not
+ { "The " #4 organization chop.word #3 text.prefix$ }
+ { cite$ #1 #3 substring$ }
+ if$
+ }
if$
}
- { key #3 text.prefix$ }
if$
}
- { editor format.names.full.wo.and }
if$
}
FUNCTION {author.key.organization.key.full.wo.and}
-{ author empty$
- { key empty$
- { organization empty$
- { cite$ #1 #3 substring$ }
- { "The " #4 organization chop.word #3 text.prefix$ }
+{ sortname empty$ not
+ { sortname format.names.full.wo.and }
+ { author empty$ not
+ { author format.names.full.wo.and }
+ { key empty$ not
+ { key #3 text.prefix$ }
+ { organization empty$ not
+ { "The " #4 organization chop.word #3 text.prefix$ }
+ { cite$ #1 #3 substring$ }
+ if$
+ }
if$
}
- { key #3 text.prefix$ }
if$
}
- { author format.names.full.wo.and }
if$
}
@@ -4077,13 +4138,17 @@ FUNCTION {calc.cyear}
}
FUNCTION {calc.sort.label.abb}
-{ author empty$
- { editor empty$
- { "" }
- { editor 's := }
+{ sortname empty$ not
+ { sortname 's := }
+ { author empty$ not
+ { author 's := }
+ { editor empty$ not
+ { editor 's := }
+ { "" }
+ if$
+ }
if$
}
- { author 's := }
if$
s sort.format.names.abb 't :=
year empty$
@@ -4733,4 +4798,5 @@ EXECUTE {end.bib}
% Local Variables:
% fill-column: 78
% mode: bst
+% coding: utf-8-unix
% End:
diff --git a/biblio/bibtex/contrib/econ-bst/econ-jie.bst b/biblio/bibtex/contrib/econ-bst/econ-jie.bst
index 06a2cfbe50..f151baaed0 100644
--- a/biblio/bibtex/contrib/econ-bst/econ-jie.bst
+++ b/biblio/bibtex/contrib/econ-bst/econ-jie.bst
@@ -4,7 +4,7 @@
% Maintainer: Shiro Takeda
% Copyright (C) 2001-2018 Shiro Takeda
% First-written: <2007/07/28>
-% Version: 2.7
+% Version: 3.1
% Keywords: TeX, BibTeX, bst
% URL: https://github.com/ShiroTakeda/econ-bst
@@ -31,7 +31,7 @@
% For changelogs, see CHANGES.txt file.
% version number
-FUNCTION {econ.version} { "2.7" }
+FUNCTION {econ.version} { "3.1" }
% File name
FUNCTION {econ.file} { "econ-jie.bst" }
@@ -47,7 +47,7 @@ ENTRY
institution journal key month note number organization pages publisher
school series title type url volume year
% Fields specific to econ.bst
- order absorder nameorder
+ order absorder nameorder sortname
}
% Definition of entry variable. The entry variable is a variable which has
@@ -311,10 +311,18 @@ FUNCTION {bst.cite.and.nameorder}
FUNCTION {bst.and.others.num}
{ #3 } % If the number of authors is greater or equal to three (default).
-% If the number of authors is greater or equal to bst.max.author.num, only
-% first author is listed and other authors' names are abbreviated as "et al.".
+% If the number of authors is greater than N1, only the first N2 authors are
+% displayed in the reference part (and other authors' names are omitted by "et
+% al".
+%
+% The following function determines the value of N1.
FUNCTION {bst.max.author.num}
-{ #12 } % If the number of authors is greater or equal to 12 (default).
+{ #8 } % (default).
+
+% The following function determines the value of N2.
+FUNCTION {bst.max.author.num.display}
+{ #3 } % (default).
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -728,7 +736,7 @@ FUNCTION {bst.doi.post}
% #2 -> Only DOI field is displayed
%
FUNCTION {bst.url.doi}
-% { #0 } % (default) -> Both fields are displayed
+% { #0 } % -> Both fields are displayed
% { #1 } % -> Only URL field is displayed
{ #2 } % (default) --> Only DOI field is displayed
@@ -825,7 +833,7 @@ STRINGS { item.type }
STRINGS { tempa tempb }
%% Integer global variables:
-INTEGERS { nameptr namesleft numnames name.num }
+INTEGERS { nameptr namesleft numnames name.num numtrunc }
INTEGERS { multiresult }
INTEGERS { index }
INTEGERS { len }
@@ -1185,6 +1193,11 @@ FUNCTION {bst.and.others.output}
%%% author and editor
+% nameptr: author number
+% numnames: the total number of authors
+% namesleft: the number of authors which have not been processed.
+% numtrunc: bst.max.author.num.display
+
%%% name
FUNCTION {format.names}
{ 's :=
@@ -1193,11 +1206,20 @@ FUNCTION {format.names}
% Set the number of authors to numnames.
s num.names$ 'numnames :=
numnames 'namesleft :=
- % Repeat if namesleft > 0
+
+ numnames bst.max.author.num >
+ % If numnames > bst.max.author.num
+ { bst.max.author.num.display 'numtrunc := }
+ { #0 'numtrunc := }
+ if$
+
+ % Repeat if namesleft > 0 ---- Repeat from here
{ namesleft #0 > }
- { nameptr #1 =
- % First author
+ {
+ % Block A starts
+ nameptr #1 =
+ % A-1: If the author is the 1st author
{ bst.author.name #0 =
bst.author.name #1 =
or
@@ -1213,7 +1235,7 @@ FUNCTION {format.names}
}
if$
}
- % The second or later authors
+ % A-2: If the author is the second or later authors (not the 1st author).
{ bst.author.name #0 =
bst.author.name #2 =
or
@@ -1230,27 +1252,49 @@ FUNCTION {format.names}
if$
}
if$
+ % Block A ends
+ % Block B starts
nameptr #1 >
- % The second or later authors
- { numnames bst.max.author.num >
- { bst.and.others *
- #1 'namesleft := }
- { nameorder.temp "random" =
- bst.use.nameorder #0 = not and
- { bst.and.nameorder * t * }
- { namesleft #1 >
- % More than one authors left
- { ", " * t * }
- % Only one author left
- { t "others" =
- { bst.and.others.output * }
- { numnames #2 =
- % Entry with two authors
- { bst.and * t * }
- { bst.ands * t * }
- if$
- }
+
+ % B-1: If the author is the second or later authors
+ {
+
+ nameptr #1 - numtrunc =
+ % If nameptr - 1 = numtrunc
+ { #1 'namesleft :=
+ "others" 't := }
+ 'skip$
+ if$
+
+ % If numnames <= bst.max.author.num
+ nameorder.temp "random" =
+ bst.use.nameorder #0 = not and
+
+ % If random ordering is used
+ { bst.and.nameorder * t * }
+
+ % If random ordering is not used
+ { namesleft #1 >
+
+ % If more than one authors are left
+ { ", " * t * }
+
+ % If the author is the last author.
+ { t "others" =
+
+ % If the name is "others"
+ { bst.and.others.output * }
+
+ % If the name is not "others"
+ { numnames #2 =
+
+ % If the entry have two authors
+ { bst.and * t * }
+
+ % If the entry have more than two authors
+ { bst.ands * t * }
+
if$
}
if$
@@ -1259,12 +1303,17 @@ FUNCTION {format.names}
}
if$
}
+
+ % When the author is the first author.
't
if$
+ % Block B ends
+
nameptr #1 + 'nameptr :=
namesleft #1 - 'namesleft :=
+
}
- while$
+ while$ % ---- Repeat until here
}
% remove successive periods (commas) from author
@@ -1389,10 +1438,6 @@ FUNCTION {format.editors.alt}
{ "\bysame " }
{ bst.author.pre editor remove.ss.period.auth * }
if$
- editor num.names$ #1 >
- { bst.editors * }
- { bst.editor * }
- if$
}
if$
}
@@ -2632,7 +2677,7 @@ FUNCTION {format.lab.names.abb}
% if the number of authors is less than bst.and.others.num, full name.
{ s format.lab.names.full }
% if the number of authors is equal or more than bst.and.others.num, abbreviated name.
- { s #1 "{ll}" format.name$ bst.and.others.output * }
+ { s #1 "{vv~}{ll}" format.name$ bst.and.others.output * }
if$
}
@@ -2690,58 +2735,74 @@ FUNCTION {format.names.full.wo.and}
}
FUNCTION {author.key.full.wo.and}
-{ author empty$
- { key empty$
- { cite$ #1 #3 substring$ }
- { key #3 text.prefix$ }
+{ sortname empty$ not
+ { sortname format.names.full.wo.and }
+ { author empty$ not
+ { author format.names.full.wo.and }
+ { key empty$ not
+ { key #3 text.prefix$ }
+ { cite$ #1 #3 substring$ }
+ if$
+ }
if$
}
- { author format.names.full.wo.and }
if$
}
FUNCTION {author.editor.key.full.wo.and}
-{ author empty$
- { editor empty$
- { key empty$
- { cite$ #1 #3 substring$ }
- { key #3 text.prefix$ }
+{ sortname empty$ not
+ { sortname format.names.full.wo.and }
+ { author empty$ not
+ { author format.names.full.wo.and }
+ { editor empty$ not
+ { editor format.names.full.wo.and }
+ { key empty$
+ { cite$ #1 #3 substring$ }
+ { key #3 text.prefix$ }
+ if$
+ }
if$
}
- { editor format.names.full.wo.and }
if$
}
- { author format.names.full.wo.and }
if$
}
FUNCTION {editor.key.organization.key.full.wo.and}
-{ editor empty$
- { key empty$
- { organization empty$
- { cite$ #1 #3 substring$ }
- { "The " #4 organization chop.word #3 text.prefix$ }
+{ sortname empty$ not
+ { sortname format.names.full.wo.and }
+ { editor empty$ not
+ { editor format.names.full.wo.and }
+ { key empty$ not
+ { key #3 text.prefix$ }
+ { organization empty$ not
+ { "The " #4 organization chop.word #3 text.prefix$ }
+ { cite$ #1 #3 substring$ }
+ if$
+ }
if$
}
- { key #3 text.prefix$ }
if$
}
- { editor format.names.full.wo.and }
if$
}
FUNCTION {author.key.organization.key.full.wo.and}
-{ author empty$
- { key empty$
- { organization empty$
- { cite$ #1 #3 substring$ }
- { "The " #4 organization chop.word #3 text.prefix$ }
+{ sortname empty$ not
+ { sortname format.names.full.wo.and }
+ { author empty$ not
+ { author format.names.full.wo.and }
+ { key empty$ not
+ { key #3 text.prefix$ }
+ { organization empty$ not
+ { "The " #4 organization chop.word #3 text.prefix$ }
+ { cite$ #1 #3 substring$ }
+ if$
+ }
if$
}
- { key #3 text.prefix$ }
if$
}
- { author format.names.full.wo.and }
if$
}
@@ -2935,13 +2996,17 @@ FUNCTION {calc.cyear}
}
FUNCTION {calc.sort.label.abb}
-{ author empty$
- { editor empty$
- { "" }
- { editor 's := }
+{ sortname empty$ not
+ { sortname 's := }
+ { author empty$ not
+ { author 's := }
+ { editor empty$ not
+ { editor 's := }
+ { "" }
+ if$
+ }
if$
}
- { author 's := }
if$
s sort.format.names.abb 't :=
year empty$
@@ -3591,4 +3656,5 @@ EXECUTE {end.bib}
% Local Variables:
% fill-column: 78
% mode: bst
+% coding: utf-8-unix
% End:
diff --git a/biblio/bibtex/contrib/econ-bst/econ-jpe.bst b/biblio/bibtex/contrib/econ-bst/econ-jpe.bst
index ee6d4364ab..2fac0d1b56 100644
--- a/biblio/bibtex/contrib/econ-bst/econ-jpe.bst
+++ b/biblio/bibtex/contrib/econ-bst/econ-jpe.bst
@@ -4,7 +4,7 @@
% Maintainer: Shiro Takeda
% Copyright (C) 2001-2018 Shiro Takeda
% First-written: <2007/07/28>
-% Version: 2.7
+% Version: 3.1
% Keywords: TeX, BibTeX, bst
% URL: https://github.com/ShiroTakeda/econ-bst
@@ -37,7 +37,7 @@
% For changelogs, see CHANGES.txt file.
% version number
-FUNCTION {econ.version} { "2.7" }
+FUNCTION {econ.version} { "3.1" }
% File name
FUNCTION {econ.file} { "econ-jpe.bst" }
@@ -53,7 +53,7 @@ ENTRY
institution journal key month note number organization pages publisher
school series title type url volume year
% Fields specific to econ.bst
- order absorder nameorder
+ order absorder nameorder sortname
}
% Definition of entry variable. The entry variable is a variable which has
@@ -316,10 +316,18 @@ FUNCTION {bst.cite.and.nameorder}
FUNCTION {bst.and.others.num}
{ #3 } % If the number of authors is greater or equal to three (default).
-% If the number of authors is greater or equal to bst.max.author.num, only
-% first author is listed and other authors' names are abbreviated as "et al.".
+% If the number of authors is greater than N1, only the first N2 authors are
+% displayed in the reference part (and other authors' names are omitted by "et
+% al".
+%
+% The following function determines the value of N1.
FUNCTION {bst.max.author.num}
-{ #12 } % If the number of authors is greater or equal to 12 (default).
+{ #8 } % (default).
+
+% The following function determines the value of N2.
+FUNCTION {bst.max.author.num.display}
+{ #3 } % (default).
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -824,7 +832,7 @@ STRINGS { item.type }
STRINGS { tempa tempb }
%% Integer global variables:
-INTEGERS { nameptr namesleft numnames name.num }
+INTEGERS { nameptr namesleft numnames name.num numtrunc }
INTEGERS { multiresult }
INTEGERS { index }
INTEGERS { len }
@@ -2332,6 +2340,11 @@ FUNCTION {bst.and.others.output}
%%% author and editor
+% nameptr: author number
+% numnames: the total number of authors
+% namesleft: the number of authors which have not been processed.
+% numtrunc: bst.max.author.num.display
+
%%% name
FUNCTION {format.names}
{ 's :=
@@ -2340,11 +2353,20 @@ FUNCTION {format.names}
% Set the number of authors to numnames.
s num.names$ 'numnames :=
numnames 'namesleft :=
- % Repeat if namesleft > 0
+
+ numnames bst.max.author.num >
+ % If numnames > bst.max.author.num
+ { bst.max.author.num.display 'numtrunc := }
+ { #0 'numtrunc := }
+ if$
+
+ % Repeat if namesleft > 0 ---- Repeat from here
{ namesleft #0 > }
- { nameptr #1 =
- % First author
+ {
+ % Block A starts
+ nameptr #1 =
+ % A-1: If the author is the 1st author
{ bst.author.name #0 =
bst.author.name #1 =
or
@@ -2360,7 +2382,7 @@ FUNCTION {format.names}
}
if$
}
- % The second or later authors
+ % A-2: If the author is the second or later authors (not the 1st author).
{ bst.author.name #0 =
bst.author.name #2 =
or
@@ -2377,27 +2399,49 @@ FUNCTION {format.names}
if$
}
if$
+ % Block A ends
+ % Block B starts
nameptr #1 >
- % The second or later authors
- { numnames bst.max.author.num >
- { bst.and.others *
- #1 'namesleft := }
- { nameorder.temp "random" =
- bst.use.nameorder #0 = not and
- { bst.and.nameorder * t * }
- { namesleft #1 >
- % More than one authors left
- { ", " * t * }
- % Only one author left
- { t "others" =
- { bst.and.others.output * }
- { numnames #2 =
- % Entry with two authors
- { bst.and * t * }
- { bst.ands * t * }
- if$
- }
+
+ % B-1: If the author is the second or later authors
+ {
+
+ nameptr #1 - numtrunc =
+ % If nameptr - 1 = numtrunc
+ { #1 'namesleft :=
+ "others" 't := }
+ 'skip$
+ if$
+
+ % If numnames <= bst.max.author.num
+ nameorder.temp "random" =
+ bst.use.nameorder #0 = not and
+
+ % If random ordering is used
+ { bst.and.nameorder * t * }
+
+ % If random ordering is not used
+ { namesleft #1 >
+
+ % If more than one authors are left
+ { ", " * t * }
+
+ % If the author is the last author.
+ { t "others" =
+
+ % If the name is "others"
+ { bst.and.others.output * }
+
+ % If the name is not "others"
+ { numnames #2 =
+
+ % If the entry have two authors
+ { bst.and * t * }
+
+ % If the entry have more than two authors
+ { bst.ands * t * }
+
if$
}
if$
@@ -2406,15 +2450,20 @@ FUNCTION {format.names}
}
if$
}
+
+ % When the author is the first author.
't
if$
+ % Block B ends
+
nameptr #1 + 'nameptr :=
namesleft #1 - 'namesleft :=
+
}
- while$
+ while$ % ---- Repeat until here
}
-% For JPE, we define `format.name.ed` in addition to `format.name`.
+% For econ-jpe.bst, we define `format.name.ed` in addition to `format.name`.
FUNCTION {format.names.ed}
{ 's :=
% insert 1 to nameptr.
@@ -2592,10 +2641,6 @@ FUNCTION {format.editors.alt}
{ "\bysame " }
{ bst.author.pre editor remove.ss.period.auth * }
if$
- editor num.names$ #1 >
- { bst.editors * }
- { bst.editor * }
- if$
}
if$
}
@@ -2607,14 +2652,14 @@ FUNCTION {format.editors.x}
{ bst.editor.btitle.order #0 =
{ "" }
{ editor num.names$ #1 >
- { " edited by " }
- { " edited by " }
+ { " edited by " } % For econ-jpe.bst
+ { " edited by " } % For econ-jpe.bst
% { bst.editors " by " * }
% { bst.editor " by " * }
if$
}
if$
- editor format.names.ed *
+ editor format.names.ed * % For econ-jpe.bst
bst.editor.btitle.order #0 =
{ editor num.names$ #1 >
{ bst.editors * }
@@ -3419,7 +3464,7 @@ FUNCTION {incollection}
format.in.ed.booktitle "booktitle" output.check.nocomma
format.bvolume output.nocomma
- % For JPE, publisher and its address are placed before edition,
+ % For econ-jpe.bst, publisher and its address are placed before edition,
% chapter and page number.
output.address.organization.publisher
format.edition output.nocomma
@@ -3840,7 +3885,7 @@ FUNCTION {format.lab.names.abb}
% if the number of authors is less than bst.and.others.num, full name.
{ s format.lab.names.full }
% if the number of authors is equal or more than bst.and.others.num, abbreviated name.
- { s #1 "{ll}" format.name$ bst.and.others.output * }
+ { s #1 "{vv~}{ll}" format.name$ bst.and.others.output * }
if$
}
@@ -3898,58 +3943,74 @@ FUNCTION {format.names.full.wo.and}
}
FUNCTION {author.key.full.wo.and}
-{ author empty$
- { key empty$
- { cite$ #1 #3 substring$ }
- { key #3 text.prefix$ }
+{ sortname empty$ not
+ { sortname format.names.full.wo.and }
+ { author empty$ not
+ { author format.names.full.wo.and }
+ { key empty$ not
+ { key #3 text.prefix$ }
+ { cite$ #1 #3 substring$ }
+ if$
+ }
if$
}
- { author format.names.full.wo.and }
if$
}
FUNCTION {author.editor.key.full.wo.and}
-{ author empty$
- { editor empty$
- { key empty$
- { cite$ #1 #3 substring$ }
- { key #3 text.prefix$ }
+{ sortname empty$ not
+ { sortname format.names.full.wo.and }
+ { author empty$ not
+ { author format.names.full.wo.and }
+ { editor empty$ not
+ { editor format.names.full.wo.and }
+ { key empty$
+ { cite$ #1 #3 substring$ }
+ { key #3 text.prefix$ }
+ if$
+ }
if$
}
- { editor format.names.full.wo.and }
if$
}
- { author format.names.full.wo.and }
if$
}
FUNCTION {editor.key.organization.key.full.wo.and}
-{ editor empty$
- { key empty$
- { organization empty$
- { cite$ #1 #3 substring$ }
- { "The " #4 organization chop.word #3 text.prefix$ }
+{ sortname empty$ not
+ { sortname format.names.full.wo.and }
+ { editor empty$ not
+ { editor format.names.full.wo.and }
+ { key empty$ not
+ { key #3 text.prefix$ }
+ { organization empty$ not
+ { "The " #4 organization chop.word #3 text.prefix$ }
+ { cite$ #1 #3 substring$ }
+ if$
+ }
if$
}
- { key #3 text.prefix$ }
if$
}
- { editor format.names.full.wo.and }
if$
}
FUNCTION {author.key.organization.key.full.wo.and}
-{ author empty$
- { key empty$
- { organization empty$
- { cite$ #1 #3 substring$ }
- { "The " #4 organization chop.word #3 text.prefix$ }
+{ sortname empty$ not
+ { sortname format.names.full.wo.and }
+ { author empty$ not
+ { author format.names.full.wo.and }
+ { key empty$ not
+ { key #3 text.prefix$ }
+ { organization empty$ not
+ { "The " #4 organization chop.word #3 text.prefix$ }
+ { cite$ #1 #3 substring$ }
+ if$
+ }
if$
}
- { key #3 text.prefix$ }
if$
}
- { author format.names.full.wo.and }
if$
}
@@ -4143,13 +4204,17 @@ FUNCTION {calc.cyear}
}
FUNCTION {calc.sort.label.abb}
-{ author empty$
- { editor empty$
- { "" }
- { editor 's := }
+{ sortname empty$ not
+ { sortname 's := }
+ { author empty$ not
+ { author 's := }
+ { editor empty$ not
+ { editor 's := }
+ { "" }
+ if$
+ }
if$
}
- { author 's := }
if$
s sort.format.names.abb 't :=
year empty$
@@ -4799,4 +4864,5 @@ EXECUTE {end.bib}
% Local Variables:
% fill-column: 78
% mode: bst
+% coding: utf-8-unix
% End:
diff --git a/biblio/bibtex/contrib/econ-bst/econ-no-sort.bst b/biblio/bibtex/contrib/econ-bst/econ-no-sort.bst
index b2cbcd057e..6a9e8f51eb 100644
--- a/biblio/bibtex/contrib/econ-bst/econ-no-sort.bst
+++ b/biblio/bibtex/contrib/econ-bst/econ-no-sort.bst
@@ -4,7 +4,7 @@
% Maintainer: Shiro Takeda
% Copyright (C) 2001-2018 Shiro Takeda
% First-written: <2007/07/28>
-% Version: 2.7
+% Version: 3.1
% Keywords: TeX, BibTeX, bst
% URL: https://github.com/ShiroTakeda/econ-bst
@@ -37,7 +37,7 @@
% For changelogs, see CHANGES.txt file.
% version number
-FUNCTION {econ.version} { "2.7" }
+FUNCTION {econ.version} { "3.1" }
% File name
FUNCTION {econ.file} { "econ.bst" }
@@ -53,7 +53,7 @@ ENTRY
institution journal key month note number organization pages publisher
school series title type url volume year
% Fields specific to econ.bst
- order absorder nameorder
+ order absorder nameorder sortname
}
% Definition of entry variable. The entry variable is a variable which has
@@ -315,10 +315,18 @@ FUNCTION {bst.cite.and.nameorder}
FUNCTION {bst.and.others.num}
{ #3 } % If the number of authors is greater or equal to three (default).
-% If the number of authors is greater or equal to bst.max.author.num, only
-% first author is listed and other authors' names are abbreviated as "et al.".
+% If the number of authors is greater than N1, only the first N2 authors are
+% displayed in the reference part (and other authors' names are omitted by "et
+% al".
+%
+% The following function determines the value of N1.
FUNCTION {bst.max.author.num}
-{ #12 } % If the number of authors is greater or equal to 12 (default).
+{ #8 } % (default).
+
+% The following function determines the value of N2.
+FUNCTION {bst.max.author.num.display}
+{ #3 } % (default).
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -810,7 +818,7 @@ STRINGS { item.type }
STRINGS { tempa tempb }
%% Integer global variables:
-INTEGERS { nameptr namesleft numnames name.num }
+INTEGERS { nameptr namesleft numnames name.num numtrunc }
INTEGERS { multiresult }
INTEGERS { index }
INTEGERS { len }
@@ -1170,6 +1178,11 @@ FUNCTION {bst.and.others.output}
%%% author and editor
+% nameptr: author number
+% numnames: the total number of authors
+% namesleft: the number of authors which have not been processed.
+% numtrunc: bst.max.author.num.display
+
%%% name
FUNCTION {format.names}
{ 's :=
@@ -1178,11 +1191,20 @@ FUNCTION {format.names}
% Set the number of authors to numnames.
s num.names$ 'numnames :=
numnames 'namesleft :=
- % Repeat if namesleft > 0
+
+ numnames bst.max.author.num >
+ % If numnames > bst.max.author.num
+ { bst.max.author.num.display 'numtrunc := }
+ { #0 'numtrunc := }
+ if$
+
+ % Repeat if namesleft > 0 ---- Repeat from here
{ namesleft #0 > }
- { nameptr #1 =
- % First author
+ {
+ % Block A starts
+ nameptr #1 =
+ % A-1: If the author is the 1st author
{ bst.author.name #0 =
bst.author.name #1 =
or
@@ -1198,7 +1220,7 @@ FUNCTION {format.names}
}
if$
}
- % The second or later authors
+ % A-2: If the author is the second or later authors (not the 1st author).
{ bst.author.name #0 =
bst.author.name #2 =
or
@@ -1215,27 +1237,49 @@ FUNCTION {format.names}
if$
}
if$
+ % Block A ends
+ % Block B starts
nameptr #1 >
- % The second or later authors
- { numnames bst.max.author.num >
- { bst.and.others *
- #1 'namesleft := }
- { nameorder.temp "random" =
- bst.use.nameorder #0 = not and
- { bst.and.nameorder * t * }
- { namesleft #1 >
- % More than one authors left
- { ", " * t * }
- % Only one author left
- { t "others" =
- { bst.and.others.output * }
- { numnames #2 =
- % Entry with two authors
- { bst.and * t * }
- { bst.ands * t * }
- if$
- }
+
+ % B-1: If the author is the second or later authors
+ {
+
+ nameptr #1 - numtrunc =
+ % If nameptr - 1 = numtrunc
+ { #1 'namesleft :=
+ "others" 't := }
+ 'skip$
+ if$
+
+ % If numnames <= bst.max.author.num
+ nameorder.temp "random" =
+ bst.use.nameorder #0 = not and
+
+ % If random ordering is used
+ { bst.and.nameorder * t * }
+
+ % If random ordering is not used
+ { namesleft #1 >
+
+ % If more than one authors are left
+ { ", " * t * }
+
+ % If the author is the last author.
+ { t "others" =
+
+ % If the name is "others"
+ { bst.and.others.output * }
+
+ % If the name is not "others"
+ { numnames #2 =
+
+ % If the entry have two authors
+ { bst.and * t * }
+
+ % If the entry have more than two authors
+ { bst.ands * t * }
+
if$
}
if$
@@ -1244,12 +1288,17 @@ FUNCTION {format.names}
}
if$
}
+
+ % When the author is the first author.
't
if$
+ % Block B ends
+
nameptr #1 + 'nameptr :=
namesleft #1 - 'namesleft :=
+
}
- while$
+ while$ % ---- Repeat until here
}
% remove successive periods (commas) from author
@@ -1374,10 +1423,6 @@ FUNCTION {format.editors.alt}
{ "\bysame " }
{ bst.author.pre editor remove.ss.period.auth * }
if$
- editor num.names$ #1 >
- { bst.editors * }
- { bst.editor * }
- if$
}
if$
}
@@ -2617,7 +2662,7 @@ FUNCTION {format.lab.names.abb}
% if the number of authors is less than bst.and.others.num, full name.
{ s format.lab.names.full }
% if the number of authors is equal or more than bst.and.others.num, abbreviated name.
- { s #1 "{ll}" format.name$ bst.and.others.output * }
+ { s #1 "{vv~}{ll}" format.name$ bst.and.others.output * }
if$
}
@@ -2675,58 +2720,74 @@ FUNCTION {format.names.full.wo.and}
}
FUNCTION {author.key.full.wo.and}
-{ author empty$
- { key empty$
- { cite$ #1 #3 substring$ }
- { key #3 text.prefix$ }
+{ sortname empty$ not
+ { sortname format.names.full.wo.and }
+ { author empty$ not
+ { author format.names.full.wo.and }
+ { key empty$ not
+ { key #3 text.prefix$ }
+ { cite$ #1 #3 substring$ }
+ if$
+ }
if$
}
- { author format.names.full.wo.and }
if$
}
FUNCTION {author.editor.key.full.wo.and}
-{ author empty$
- { editor empty$
- { key empty$
- { cite$ #1 #3 substring$ }
- { key #3 text.prefix$ }
+{ sortname empty$ not
+ { sortname format.names.full.wo.and }
+ { author empty$ not
+ { author format.names.full.wo.and }
+ { editor empty$ not
+ { editor format.names.full.wo.and }
+ { key empty$
+ { cite$ #1 #3 substring$ }
+ { key #3 text.prefix$ }
+ if$
+ }
if$
}
- { editor format.names.full.wo.and }
if$
}
- { author format.names.full.wo.and }
if$
}
FUNCTION {editor.key.organization.key.full.wo.and}
-{ editor empty$
- { key empty$
- { organization empty$
- { cite$ #1 #3 substring$ }
- { "The " #4 organization chop.word #3 text.prefix$ }
+{ sortname empty$ not
+ { sortname format.names.full.wo.and }
+ { editor empty$ not
+ { editor format.names.full.wo.and }
+ { key empty$ not
+ { key #3 text.prefix$ }
+ { organization empty$ not
+ { "The " #4 organization chop.word #3 text.prefix$ }
+ { cite$ #1 #3 substring$ }
+ if$
+ }
if$
}
- { key #3 text.prefix$ }
if$
}
- { editor format.names.full.wo.and }
if$
}
FUNCTION {author.key.organization.key.full.wo.and}
-{ author empty$
- { key empty$
- { organization empty$
- { cite$ #1 #3 substring$ }
- { "The " #4 organization chop.word #3 text.prefix$ }
+{ sortname empty$ not
+ { sortname format.names.full.wo.and }
+ { author empty$ not
+ { author format.names.full.wo.and }
+ { key empty$ not
+ { key #3 text.prefix$ }
+ { organization empty$ not
+ { "The " #4 organization chop.word #3 text.prefix$ }
+ { cite$ #1 #3 substring$ }
+ if$
+ }
if$
}
- { key #3 text.prefix$ }
if$
}
- { author format.names.full.wo.and }
if$
}
@@ -2920,13 +2981,17 @@ FUNCTION {calc.cyear}
}
FUNCTION {calc.sort.label.abb}
-{ author empty$
- { editor empty$
- { "" }
- { editor 's := }
+{ sortname empty$ not
+ { sortname 's := }
+ { author empty$ not
+ { author 's := }
+ { editor empty$ not
+ { editor 's := }
+ { "" }
+ if$
+ }
if$
}
- { author 's := }
if$
s sort.format.names.abb 't :=
year empty$
@@ -3576,4 +3641,5 @@ EXECUTE {end.bib}
% Local Variables:
% fill-column: 78
% mode: bst
+% coding: utf-8-unix
% End:
diff --git a/biblio/bibtex/contrib/econ-bst/econ-old.bst b/biblio/bibtex/contrib/econ-bst/econ-old.bst
index e16c585fff..3211980e1b 100644
--- a/biblio/bibtex/contrib/econ-bst/econ-old.bst
+++ b/biblio/bibtex/contrib/econ-bst/econ-old.bst
@@ -3576,4 +3576,5 @@ EXECUTE {end.bib}
% Local Variables:
% fill-column: 78
% mode: bst
+% coding: utf-8-unix
% End:
diff --git a/biblio/bibtex/contrib/econ-bst/econ.bst b/biblio/bibtex/contrib/econ-bst/econ.bst
index f74137a79d..070b7299f9 100644
--- a/biblio/bibtex/contrib/econ-bst/econ.bst
+++ b/biblio/bibtex/contrib/econ-bst/econ.bst
@@ -4,7 +4,7 @@
% Maintainer: Shiro Takeda
% Copyright (C) 2001-2018 Shiro Takeda
% First-written: <2007/07/28>
-% Version: 2.7
+% Version: 3.1
% Keywords: TeX, BibTeX, bst
% URL: https://github.com/ShiroTakeda/econ-bst
@@ -37,7 +37,7 @@
% For changelogs, see CHANGES.txt file.
% version number
-FUNCTION {econ.version} { "2.7" }
+FUNCTION {econ.version} { "3.1" }
% File name
FUNCTION {econ.file} { "econ.bst" }
@@ -53,7 +53,7 @@ ENTRY
institution journal key month note number organization pages publisher
school series title type url volume year
% Fields specific to econ.bst
- order absorder nameorder
+ order absorder nameorder sortname
}
% Definition of entry variable. The entry variable is a variable which has
@@ -315,10 +315,18 @@ FUNCTION {bst.cite.and.nameorder}
FUNCTION {bst.and.others.num}
{ #3 } % If the number of authors is greater or equal to three (default).
-% If the number of authors is greater or equal to bst.max.author.num, only
-% first author is listed and other authors' names are abbreviated as "et al.".
+% If the number of authors is greater than N1, only the first N2 authors are
+% displayed in the reference part (and other authors' names are omitted by "et
+% al".
+%
+% The following function determines the value of N1.
FUNCTION {bst.max.author.num}
-{ #12 } % If the number of authors is greater or equal to 12 (default).
+{ #8 } % (default).
+
+% The following function determines the value of N2.
+FUNCTION {bst.max.author.num.display}
+{ #3 } % (default).
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -810,7 +818,7 @@ STRINGS { item.type }
STRINGS { tempa tempb }
%% Integer global variables:
-INTEGERS { nameptr namesleft numnames name.num }
+INTEGERS { nameptr namesleft numnames name.num numtrunc }
INTEGERS { multiresult }
INTEGERS { index }
INTEGERS { len }
@@ -1170,6 +1178,11 @@ FUNCTION {bst.and.others.output}
%%% author and editor
+% nameptr: author number
+% numnames: the total number of authors
+% namesleft: the number of authors which have not been processed.
+% numtrunc: bst.max.author.num.display
+
%%% name
FUNCTION {format.names}
{ 's :=
@@ -1178,11 +1191,20 @@ FUNCTION {format.names}
% Set the number of authors to numnames.
s num.names$ 'numnames :=
numnames 'namesleft :=
- % Repeat if namesleft > 0
+
+ numnames bst.max.author.num >
+ % If numnames > bst.max.author.num
+ { bst.max.author.num.display 'numtrunc := }
+ { #0 'numtrunc := }
+ if$
+
+ % Repeat if namesleft > 0 ---- Repeat from here
{ namesleft #0 > }
- { nameptr #1 =
- % First author
+ {
+ % Block A starts
+ nameptr #1 =
+ % A-1: If the author is the 1st author
{ bst.author.name #0 =
bst.author.name #1 =
or
@@ -1198,7 +1220,7 @@ FUNCTION {format.names}
}
if$
}
- % The second or later authors
+ % A-2: If the author is the second or later authors (not the 1st author).
{ bst.author.name #0 =
bst.author.name #2 =
or
@@ -1215,27 +1237,49 @@ FUNCTION {format.names}
if$
}
if$
+ % Block A ends
+ % Block B starts
nameptr #1 >
- % The second or later authors
- { numnames bst.max.author.num >
- { bst.and.others *
- #1 'namesleft := }
- { nameorder.temp "random" =
- bst.use.nameorder #0 = not and
- { bst.and.nameorder * t * }
- { namesleft #1 >
- % More than one authors left
- { ", " * t * }
- % Only one author left
- { t "others" =
- { bst.and.others.output * }
- { numnames #2 =
- % Entry with two authors
- { bst.and * t * }
- { bst.ands * t * }
- if$
- }
+
+ % B-1: If the author is the second or later authors
+ {
+
+ nameptr #1 - numtrunc =
+ % If nameptr - 1 = numtrunc
+ { #1 'namesleft :=
+ "others" 't := }
+ 'skip$
+ if$
+
+ % If numnames <= bst.max.author.num
+ nameorder.temp "random" =
+ bst.use.nameorder #0 = not and
+
+ % If random ordering is used
+ { bst.and.nameorder * t * }
+
+ % If random ordering is not used
+ { namesleft #1 >
+
+ % If more than one authors are left
+ { ", " * t * }
+
+ % If the author is the last author.
+ { t "others" =
+
+ % If the name is "others"
+ { bst.and.others.output * }
+
+ % If the name is not "others"
+ { numnames #2 =
+
+ % If the entry have two authors
+ { bst.and * t * }
+
+ % If the entry have more than two authors
+ { bst.ands * t * }
+
if$
}
if$
@@ -1244,12 +1288,17 @@ FUNCTION {format.names}
}
if$
}
+
+ % When the author is the first author.
't
if$
+ % Block B ends
+
nameptr #1 + 'nameptr :=
namesleft #1 - 'namesleft :=
+
}
- while$
+ while$ % ---- Repeat until here
}
% remove successive periods (commas) from author
@@ -1374,10 +1423,6 @@ FUNCTION {format.editors.alt}
{ "\bysame " }
{ bst.author.pre editor remove.ss.period.auth * }
if$
- editor num.names$ #1 >
- { bst.editors * }
- { bst.editor * }
- if$
}
if$
}
@@ -2617,7 +2662,7 @@ FUNCTION {format.lab.names.abb}
% if the number of authors is less than bst.and.others.num, full name.
{ s format.lab.names.full }
% if the number of authors is equal or more than bst.and.others.num, abbreviated name.
- { s #1 "{ll}" format.name$ bst.and.others.output * }
+ { s #1 "{vv~}{ll}" format.name$ bst.and.others.output * }
if$
}
@@ -2675,58 +2720,74 @@ FUNCTION {format.names.full.wo.and}
}
FUNCTION {author.key.full.wo.and}
-{ author empty$
- { key empty$
- { cite$ #1 #3 substring$ }
- { key #3 text.prefix$ }
+{ sortname empty$ not
+ { sortname format.names.full.wo.and }
+ { author empty$ not
+ { author format.names.full.wo.and }
+ { key empty$ not
+ { key #3 text.prefix$ }
+ { cite$ #1 #3 substring$ }
+ if$
+ }
if$
}
- { author format.names.full.wo.and }
if$
}
FUNCTION {author.editor.key.full.wo.and}
-{ author empty$
- { editor empty$
- { key empty$
- { cite$ #1 #3 substring$ }
- { key #3 text.prefix$ }
+{ sortname empty$ not
+ { sortname format.names.full.wo.and }
+ { author empty$ not
+ { author format.names.full.wo.and }
+ { editor empty$ not
+ { editor format.names.full.wo.and }
+ { key empty$
+ { cite$ #1 #3 substring$ }
+ { key #3 text.prefix$ }
+ if$
+ }
if$
}
- { editor format.names.full.wo.and }
if$
}
- { author format.names.full.wo.and }
if$
}
FUNCTION {editor.key.organization.key.full.wo.and}
-{ editor empty$
- { key empty$
- { organization empty$
- { cite$ #1 #3 substring$ }
- { "The " #4 organization chop.word #3 text.prefix$ }
+{ sortname empty$ not
+ { sortname format.names.full.wo.and }
+ { editor empty$ not
+ { editor format.names.full.wo.and }
+ { key empty$ not
+ { key #3 text.prefix$ }
+ { organization empty$ not
+ { "The " #4 organization chop.word #3 text.prefix$ }
+ { cite$ #1 #3 substring$ }
+ if$
+ }
if$
}
- { key #3 text.prefix$ }
if$
}
- { editor format.names.full.wo.and }
if$
}
FUNCTION {author.key.organization.key.full.wo.and}
-{ author empty$
- { key empty$
- { organization empty$
- { cite$ #1 #3 substring$ }
- { "The " #4 organization chop.word #3 text.prefix$ }
+{ sortname empty$ not
+ { sortname format.names.full.wo.and }
+ { author empty$ not
+ { author format.names.full.wo.and }
+ { key empty$ not
+ { key #3 text.prefix$ }
+ { organization empty$ not
+ { "The " #4 organization chop.word #3 text.prefix$ }
+ { cite$ #1 #3 substring$ }
+ if$
+ }
if$
}
- { key #3 text.prefix$ }
if$
}
- { author format.names.full.wo.and }
if$
}
@@ -2920,13 +2981,17 @@ FUNCTION {calc.cyear}
}
FUNCTION {calc.sort.label.abb}
-{ author empty$
- { editor empty$
- { "" }
- { editor 's := }
+{ sortname empty$ not
+ { sortname 's := }
+ { author empty$ not
+ { author 's := }
+ { editor empty$ not
+ { editor 's := }
+ { "" }
+ if$
+ }
if$
}
- { author 's := }
if$
s sort.format.names.abb 't :=
year empty$
@@ -3575,5 +3640,6 @@ EXECUTE {end.bib}
% --------------------
% Local Variables:
% fill-column: 78
+% coding: utf-8-unix
% mode: bst
% End:
diff --git a/macros/generic/expkv-cs/README.md b/macros/generic/expkv-cs/README.md
index 5b56601a5d..a9df8b801f 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-04-12 v0.8
+Version 2021-05-24 v0.9
Released under the LaTeX Project Public License v1.3c or later
See http://www.latex-project.org/lppl.txt
diff --git a/macros/generic/expkv-cs/expkv-cs.dtx b/macros/generic/expkv-cs/expkv-cs.dtx
index 5847a4980b..38a70349d7 100644
--- a/macros/generic/expkv-cs/expkv-cs.dtx
+++ b/macros/generic/expkv-cs/expkv-cs.dtx
@@ -64,6 +64,19 @@ and the derived files expkv-cs.pdf
\RequirePackage[oldstylenums,nott]{kpfonts}
\input{glyphtounicode}
\pdfgentounicode=1
+\RequirePackage{tcolorbox}
+\newtcolorbox{exresult}[2][]
+ {colback=expkvgrey!10!white,colframe=expkvgrey,fontupper=\small,width={#2},#1}
+\newtcbox\exres[1][]
+ {
+ colback=expkvgrey!10!white
+ ,colframe=expkvgrey
+ ,size=small
+ ,nobeforeafter
+ ,tcbox raise base
+ ,fontupper=\small
+ ,#1
+ }
\RequirePackage{listings}
\RequirePackage{booktabs}
\RequirePackage{array}
@@ -73,26 +86,127 @@ and the derived files expkv-cs.pdf
\RequirePackage{caption}
\RequirePackage{microtype}
\RequirePackage{accsupp}
+\lstdefinelanguage{expkvd}[primitive]{TeX}
+ {
+ ,moretexcs=[4]^^A e-TeX
+ {
+ expanded,
+ numexpr,
+ protected,
+ }
+ ,moretexcs=[5]^^A plain/LaTeX
+ {
+ approx,
+ begin,
+ empty,
+ item,
+ LaTeX,
+ makeatletter,makeatother,multicolumn,
+ newcommand,newdimen,
+ RequirePackage,
+ rule,
+ TeX,
+ textit,texttt,
+ usepackage,
+ }
+ ,moretexcs=[6]^^A used packages
+ {
+ ^^A xfp
+ fpeval,
+ ^^A keyval
+ setkeys,
+ ^^A yax
+ defactiveparameter,storevalue,setparameterlist
+ }
+ ,moretexcs=[2]^^A expkv-cs macros
+ {
+ ekvcSplit,ekvcSplitAndForward,ekvcSplitAndUse,
+ ekvcHash,ekvcHashAndForward,ekvcHashAndUse,
+ ekvcValue,ekvcValueFast,ekvcValueSplit,ekvcValueSplitFast,
+ ekvcSecondaryKeys,
+ ekvcFlagNew,
+ ekvcFlagHeight,
+ ekvcFlagRaise,
+ ekvcFlagSetTrue,ekvcFlagSetFalse,
+ ekvcFlagIf,ekvcFlagIfRaised,
+ ekvcFlagReset,
+ ekvcFlagGetHeight,ekvcFlagGetHeights
+ }
+ ,moretexcs=[3]^^A expkv-pkg macros
+ {
+ ^^A expkv
+ ekvdef,ekvdefNoVal,^^A
+ ekvlet,ekvletNoVal,ekvletkv,ekvletkvNoVal,^^A
+ ekvdefunknown,ekvdefunknownNoVal,^^A
+ ekvredirectunknown,ekvredirectunknownNoVal,^^A
+ ekvset,ekvsetSneaked,^^A
+ ekvsetdef,ekvsetSneakeddef,ekvsetdefSneaked,^^A
+ ekvparse,^^A
+ ekvVersion,ekvDate,^^A
+ ekvifdefined,ekvifdefinedNoVal,ekvifdefinedset,^^A
+ ekvbreak,ekvbreakPreSneak,ekvbreakPostSneak,^^A
+ ekvsneak,ekvsneakPre,^^A
+ ekvchangeset,^^A
+ ekvoptarg,ekvoptargTF,^^A
+ ekverr,
+ ^^A expkv-def
+ ekvdefinekeys
+ }
+ }
+\colorlet{codeparam}{cyan!65!black}
+\def\mylstwd{.55em}
\lstset
{
+ ,language=expkvd
,flexiblecolumns=false
- ,basewidth=.53em
+ ,basewidth=\mylstwd
,gobble=2
,basicstyle=\fontfamily{jkp}\itshape
- ,morekeywords=^^A
- {^^A
- \ekvcSplit,\ekvcSplitAndForward,\ekvcSplitAndUse
- \ekvcHash,\ekvcHashAndForward,\ekvcHashAndUse
- \ekvcValue,\ekvcValueFast,
- \ekvcSecondaryKeys
- }
- ,morecomment=[l]\%
+ ,texcsstyle=*[1]{\bfseries\color{expkvgrey}} ^^A primitives
+ ,texcsstyle=*[2]{\bfseries\color{expkvred}} ^^A expkv
+ ,texcsstyle=*[3]{\color{expkvred}} ^^A expkv-pkg
+ ,texcsstyle=*[4]{\bfseries\color{expkvgrey}} ^^A e-TeX
+ ,texcsstyle=*[5]{\bfseries\color{expkvgrey}} ^^A plain/LaTeX macros
+ ,texcsstyle=*[6]{} ^^A macros of other packages
,commentstyle=\color[gray]{0.4}
- ,literate={\{}{{\CodeSymbol\{}}{1}
- {\}}{{\CodeSymbol\}}}{1}
+ ,literate=
+ {\{} {{\CodeUpBf\{}}{1}
+ {\}} {{\CodeUpBf\}}}{1}
+ {$} {{\CodeUpBf\$}}{1}
+ {[} {{\CodeUp[}}{1}
+ {]} {{\CodeUp]}}{1}
+ {(} {{\CodeUp(}}{1}
+ {)} {{\CodeUp)}}{1}
+ {*} {{$*$}}{1}
+ {1} {{\CodeUp{1}}}{1}
+ {2} {{\CodeUp{2}}}{1}
+ {3} {{\CodeUp{3}}}{1}
+ {4} {{\CodeUp{4}}}{1}
+ {5} {{\CodeUp{5}}}{1}
+ {6} {{\CodeUp{6}}}{1}
+ {7} {{\CodeUp{7}}}{1}
+ {8} {{\CodeUp{8}}}{1}
+ {9} {{\CodeUp{9}}}{1}
+ {0} {{\CodeUp{0}}}{1}
+ {##} {{\CodeColored{codeparam}{1}{\#}}}{1}
+ {##1}{{\CodeColored{codeparam}{2}{\#1}}}{2}
+ {##2}{{\CodeColored{codeparam}{2}{\#2}}}{2}
+ {##3}{{\CodeColored{codeparam}{2}{\#3}}}{2}
+ {##4}{{\CodeColored{codeparam}{2}{\#4}}}{2}
+ {##5}{{\CodeColored{codeparam}{2}{\#5}}}{2}
+ {##6}{{\CodeColored{codeparam}{2}{\#6}}}{2}
+ {##7}{{\CodeColored{codeparam}{2}{\#7}}}{2}
+ {##8}{{\CodeColored{codeparam}{2}{\#8}}}{2}
+ {##9}{{\CodeColored{codeparam}{2}{\#9}}}{2}
+ {<key>}{{$\langle$}key{$\rangle$}}{5}
+ {<set>}{{$\langle$}set{$\rangle$}}{5}
+ {<set1>}{{$\langle$}set1{$\rangle$}}{6}
+ {<set2>}{{$\langle$}set2{$\rangle$}}{6}
^^A,literate=*{<key>}{\key}{4}{<set>}{\set}{4}
}
-\newcommand*\CodeSymbol[1]{\kern-1pt\textbf{#1}\kern1pt}
+\newcommand*\CodeColored[3]{\textcolor{#1}{\makebox[\dimexpr\mylstwd*#2]{#3}}}
+\newcommand*\CodeUpBf[1]{\makebox[\mylstwd]{\textup{\textbf{#1}}}}
+\newcommand*\CodeUp[1]{\makebox[\mylstwd]{\textup{#1}}}
\RequirePackage{randtext}
\let\metaORIG\meta
\protected\def\meta #1{\texttt{\metaORIG{#1}}}
@@ -705,7 +819,7 @@ and the derived files expkv-cs.pdf
% alias pos = possessive,
% nmeta me =
% {
-% name=Jonathan P. Spratte,
+% name=Jonathan,
% age=a young,
% nationality=Germany,
% hobby=\TeX\ coding,
@@ -738,15 +852,54 @@ and the derived files expkv-cs.pdf
% As one might see, the |lady| key could actually have been an |nmeta| key as
% well, as all that is done with the argument is using it as a \kv\ list.
%
-% Using \pkg{xparse} and forwarding arguments one can easily define \kv\ macros
-% with actual optional and mandatory arguments as well. A small nonsense example
-% (which should perhaps use |\ekvcSplitAndForward| instead of
-% |\ekvcHashAndForward| since it only uses four keys and one other argument --
-% and isn't expandable since it uses a \env{tabular} environment):
+% The result of all the first two usages would be:
+% \begin{exresult}{\linewidth}
+% \ekvcSplit\character
+% {
+% name=John Doe,
+% age=any,
+% nationality=the Universe,
+% hobby=to exist,
+% type=Mister,
+% pronoun=He,
+% possessive=his,
+% }
+% {#1 is a #5 from #3. #6 is of #2 age and #7 hobby is #4.\par}
+% \ekvcSecondaryKeys\character
+% {
+% alias pro = pronoun,
+% alias pos = possessive,
+% nmeta me =
+% {
+% name=Jonathan,
+% age=a young,
+% nationality=Germany,
+% hobby=\TeX\ coding,
+% },
+% meta lady =
+% {type=Lady, pronoun=She, possessive=her, name=Jane Doe, #1},
+% nmeta paulo =
+% {
+% name=Paulo,
+% type=duck,
+% age=a young,
+% nationality=Brazil,
+% hobby=to quack,
+% }
+% }
+% \character{}
+% \character{me}
+% \end{exresult}
+%
+% Using \pkg{xparse} or \expkv's \cs{ekvoptarg} or \cs{ekvoptargTF} and
+% forwarding arguments one can easily define \kv\ macros with actual optional
+% and mandatory arguments as well. A small nonsense example (which should
+% perhaps use |\ekvcSplitAndForward| instead of |\ekvcHashAndForward| since it
+% only uses four keys and one other argument -- and isn't expandable since it
+% uses a \env{tabular} environment):
% \begin{lstlisting}
-% \usepackage{xparse}
% \makeatletter
-% \NewExpandableDocumentCommand\nonsense{O{} m}{\nonsense@a{#1}{#2}}
+% \newcommand*\nonsense{\ekvoptarg\nonsense@a{}}
% \ekvcHashAndForward\nonsense@a\nonsense@b
% {
% keyA = A,
@@ -762,17 +915,44 @@ and the derived files expkv-cs.pdf
% & C & \ekvcValue{keyC}{#1} \\
% & D & \ekvcValue{keyD}{#1} \\
% \multicolumn{2}{l}{mandatory} & #2 \\
-% \end{tabular}\par
+% \end{tabular}%
% }
% \makeatother
% \end{lstlisting}
-% And then we would be able to do some nonsense:
+% And then we would be able to do some nonsense
% \begin{lstlisting}
% \nonsense{}
% \nonsense[keyA=hihi]{haha}
% \nonsense[keyA=hihi, keyB=A]{hehe}
% \nonsense[keyC=huhu, keyA=hihi, keyB=A]{haha}
% \end{lstlisting}
+% resulting in
+% \begin{exresult}{\linewidth}
+% \makeatletter
+% \newcommand*\nonsense{\ekvoptarg\nonsense@a{}}
+% \ekvcHashAndForward\nonsense@a\nonsense@b
+% {
+% keyA = A,
+% keyB = B,
+% keyC = c,
+% keyD = d,
+% }
+% \newcommand*\nonsense@b[2]
+% {%
+% \begin{tabular}{lll}
+% key & A & \ekvcValue{keyA}{#1} \\
+% & B & \ekvcValue{keyB}{#1} \\
+% & C & \ekvcValue{keyC}{#1} \\
+% & D & \ekvcValue{keyD}{#1} \\
+% \multicolumn{2}{l}{mandatory} & #2 \\
+% \end{tabular}%
+% }
+% \makeatother
+% \nonsense{}
+% \nonsense[keyA=hihi]{haha}
+% \nonsense[keyA=hihi, keyB=A]{hehe}
+% \nonsense[keyC=huhu, keyA=hihi, keyB=A]{haha}
+% \end{exresult}
%
%
% \subsection{Speed Considerations}\label{sec:speed}
@@ -945,8 +1125,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{0.8}
-\def\ekvcDate{2021-04-12}
+\def\ekvcVersion{0.9}
+\def\ekvcDate{2021-05-24}
% \end{macrocode}
% \end{macro}
%
@@ -993,8 +1173,26 @@ and the derived files expkv-cs.pdf
% Some macros will have to be defined long. These two will be let to |\long|
% when this should be the case.
% \begin{macrocode}
-\def\ekvc@long{}
-\def\ekvc@any@long{}
+\let\ekvc@long\ekv@empty
+\let\ekvc@any@long\ekv@empty
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}[internal]{\ekvc@ifdefined}
+% We want to test whether a macro is already defined. This test checks for a
+% defined macro that isn't |\relax|.
+% \begin{macrocode}
+\long\def\ekvc@ifdefined#1%
+ {%
+ \ifdefined#1%
+ \ifx\relax#1%
+ \ekv@fi@gobble
+ \fi
+ \@firstofone
+ \ekv@fi@firstoftwo
+ \fi
+ \@secondoftwo
+ }
% \end{macrocode}
% \end{macro}
%
@@ -1009,7 +1207,8 @@ and the derived files expkv-cs.pdf
% a little magic trick to get the macro parameter |#1| for the macro
% definition this is used in, even though we're calling |\unexpanded|. We do
% that by splitting the expanded |\ekvset| at some marks and place |##1| in
-% between.
+% between. At this spot we also add |\ekv@alignsafe| and |\ekv@endalignsafe|
+% to ensure that macros created with \expkvc\ are alignment safe.
% \begin{macrocode}
\def\ekvc@ekvset@pre@expander#1%
{%
@@ -1021,7 +1220,9 @@ and the derived files expkv-cs.pdf
}
\def\ekvc@ekvset@pre@expander@b#1\ekvc@stop#2\ekvc@stop
{%
+ \unexpanded\expandafter{\ekv@alignsafe}%
\unexpanded{#1}##1\unexpanded{#2}%
+ \unexpanded\expandafter{\ekv@endalignsafe}%
}
% \end{macrocode}
% \end{macro}
@@ -1035,7 +1236,7 @@ and the derived files expkv-cs.pdf
\protected\long\def\ekvcSplitAndUse#1#2%
{%
\let\ekvc@helpers@needed\@firstoftwo
- \ekv@ifdefined{\expandafter\@gobble\string#1}%
+ \ekvc@ifdefined#1%
{\ekvc@err@already@defined#1}%
{\ekvcSplitAndUse@#1{}{#2}}%
}
@@ -1083,7 +1284,7 @@ and the derived files expkv-cs.pdf
\protected\long\def\ekvcSplitAndForward#1#2#3%
{%
\let\ekvc@helpers@needed\@firstoftwo
- \ekv@ifdefined{\expandafter\@gobble\string#1}%
+ \ekvc@ifdefined#1%
{\ekvc@err@already@defined#1}%
{\ekvcSplitAndUse@#1{{#2}}{#3}}%
}
@@ -1098,7 +1299,7 @@ and the derived files expkv-cs.pdf
\protected\long\def\ekvcSplit#1#2#3%
{%
\let\ekvc@helpers@needed\@secondoftwo
- \ekv@ifdefined{\expandafter\@gobble\string#1}%
+ \ekvc@ifdefined#1%
{\ekvc@err@already@defined#1}%
{%
\expandafter
@@ -1154,8 +1355,8 @@ and the derived files expkv-cs.pdf
\protected\long\def\ekvc@SetupSplitKeys
{%
\ekvc@keycount=0
- \def\ekvc@any@long{}%
- \def\ekvc@initials{}%
+ \let\ekvc@any@long\ekv@empty
+ \let\ekvc@initials\ekv@empty
\ekvparse\ekvc@err@value@required\ekvc@SetupSplitKeys@a
}
% \end{macrocode}
@@ -1165,7 +1366,7 @@ and the derived files expkv-cs.pdf
\protected\def\ekvc@SetupSplitKeys@a#1%
{%
\advance\ekvc@keycount1
- \def\ekvc@long{}%
+ \let\ekvc@long\ekv@empty
\ekvc@ifspace{#1}%
{\ekvc@SetupSplitKeys@b#1\ekvc@stop}%
{\ekvc@SetupSplitKeys@c{#1}}%
@@ -1355,7 +1556,7 @@ and the derived files expkv-cs.pdf
\protected\long\def\ekvcHashAndUse#1#2%
{%
\let\ekvc@helpers@needed\@firstoftwo
- \ekv@ifdefined{\expandafter\@gobble\string#1}%
+ \ekvc@ifdefined#1%
{\ekvc@err@already@defined#1}%
{\ekvcHashAndUse@#1{}{#2}}%
}
@@ -1398,7 +1599,7 @@ and the derived files expkv-cs.pdf
\protected\long\def\ekvcHashAndForward#1#2#3%
{%
\let\ekvc@helpers@needed\@firstoftwo
- \ekv@ifdefined{\expandafter\@gobble\string#1}%
+ \ekvc@ifdefined#1%
{\ekvc@err@already@defined#1}%
{\ekvcHashAndUse@#1{{#2}}{#3}}%
}
@@ -1413,7 +1614,7 @@ and the derived files expkv-cs.pdf
\protected\long\def\ekvcHash#1#2#3%
{%
\let\ekvc@helpers@needed\@secondoftwo
- \ekv@ifdefined{\expandafter\@gobble\string#1}%
+ \ekvc@ifdefined#1%
{\ekvc@err@already@defined#1}%
{%
\expandafter
@@ -1441,13 +1642,13 @@ and the derived files expkv-cs.pdf
% \begin{macrocode}
\protected\long\def\ekvc@SetupHashKeys#1%
{%
- \def\ekvc@any@long{}%
- \def\ekvc@initials{}%
+ \let\ekvc@any@long\ekv@empty
+ \let\ekvc@initials\ekv@empty
\ekvparse\ekvc@err@value@required\ekvc@SetupHashKeys@a{#1}%
}
\protected\def\ekvc@SetupHashKeys@a#1%
{%
- \def\ekvc@long{}%
+ \let\ekvc@long\ekv@empty
\ekvc@ifspace{#1}%
{\ekvc@SetupHashKeys@b#1\ekvc@stop}%
{\ekvc@SetupHashKeys@c{#1}}%
@@ -1687,7 +1888,7 @@ and the derived files expkv-cs.pdf
}
\protected\def\ekvcSecondaryKeys@a#1%
{%
- \def\ekvc@long{}%
+ \let\ekvc@long\ekv@empty
\ekvc@ifspace{#1}%
{\ekvcSecondaryKeys@b#1\ekvc@stop}%
{\ekvc@err@missing@type{#1}\@gobble}%
@@ -2137,15 +2338,10 @@ and the derived files expkv-cs.pdf
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}[internal]{\ekvc@err,\ekvc@err@}
+% \begin{macro}[internal]{\ekvc@err}
% We need a way to throw error messages expandably in some contexts.
% \begin{macrocode}
-\def\ekvc@err#1%
- {%
- \long\def\ekvc@err##1{\expandafter\ekv@err@\@firstofone{#1##1.}\ekv@stop}%
- }
-\begingroup\expandafter\endgroup
-\expandafter\ekvc@err\csname ! expkv-cs Error:\endcsname
+\ekv@exparg{\long\def\ekvc@err#1}{\ekverr{expkv-cs}{#1}}
% \end{macrocode}
% \end{macro}
%
diff --git a/macros/generic/expkv-cs/expkv-cs.pdf b/macros/generic/expkv-cs/expkv-cs.pdf
index f498bcb298..50dd5124bf 100644
--- a/macros/generic/expkv-cs/expkv-cs.pdf
+++ b/macros/generic/expkv-cs/expkv-cs.pdf
Binary files differ
diff --git a/macros/generic/expkv-def/README.md b/macros/generic/expkv-def/README.md
index f2c9e9cfac..34a6e05db4 100644
--- a/macros/generic/expkv-def/README.md
+++ b/macros/generic/expkv-def/README.md
@@ -1,7 +1,7 @@
-------------------------------------------------------------------------------
# expkv-def -- a key-defining frontend for expkv
-Version 2021-04-10 v0.8
+Version 2021-05-24 v0.8a
Released under the LaTeX Project Public License v1.3c or later
See http://www.latex-project.org/lppl.txt
diff --git a/macros/generic/expkv-def/expkv-def.dtx b/macros/generic/expkv-def/expkv-def.dtx
index eaec17b22c..b69c591a00 100644
--- a/macros/generic/expkv-def/expkv-def.dtx
+++ b/macros/generic/expkv-def/expkv-def.dtx
@@ -64,6 +64,19 @@ and the derived files expkv-def.pdf
\RequirePackage[oldstylenums,nott]{kpfonts}
\input{glyphtounicode}
\pdfgentounicode=1
+\RequirePackage{tcolorbox}
+\newtcolorbox{exresult}[2][]
+ {colback=expkvgrey!10!white,colframe=expkvgrey,fontupper=\small,width={#2},#1}
+\newtcbox\exres[1][]
+ {
+ colback=expkvgrey!10!white
+ ,colframe=expkvgrey
+ ,size=small
+ ,nobeforeafter
+ ,tcbox raise base
+ ,fontupper=\small
+ ,#1
+ }
\RequirePackage{listings}
\RequirePackage{booktabs}
\RequirePackage{array}
@@ -73,23 +86,117 @@ and the derived files expkv-def.pdf
\RequirePackage{caption}
\RequirePackage{microtype}
\RequirePackage{accsupp}
+\lstdefinelanguage{expkvd}[primitive]{TeX}
+ {
+ ,moretexcs=[4]^^A e-TeX
+ {
+ expanded,
+ numexpr,
+ protected,
+ }
+ ,moretexcs=[5]^^A plain/LaTeX
+ {
+ approx,
+ begin,
+ empty,
+ item,
+ LaTeX,
+ makeatletter,makeatother,
+ newcommand,newdimen,
+ RequirePackage,
+ rule,
+ TeX,
+ textit,texttt,
+ usepackage,
+ }
+ ,moretexcs=[6]^^A used packages
+ {
+ ^^A xfp
+ fpeval,
+ ^^A keyval
+ setkeys,
+ ^^A yax
+ defactiveparameter,storevalue,setparameterlist
+ }
+ ,moretexcs=[2]^^A expkv-def macros
+ {
+ ekvdefinekeys
+ }
+ ,moretexcs=[3]^^A expkv-pkg macros
+ {
+ ^^A expkv
+ ekvdef,ekvdefNoVal,^^A
+ ekvlet,ekvletNoVal,ekvletkv,ekvletkvNoVal,^^A
+ ekvdefunknown,ekvdefunknownNoVal,^^A
+ ekvredirectunknown,ekvredirectunknownNoVal,^^A
+ ekvset,ekvsetSneaked,^^A
+ ekvsetdef,ekvsetSneakeddef,ekvsetdefSneaked,^^A
+ ekvparse,^^A
+ ekvVersion,ekvDate,^^A
+ ekvifdefined,ekvifdefinedNoVal,ekvifdefinedset,^^A
+ ekvbreak,ekvbreakPreSneak,ekvbreakPostSneak,^^A
+ ekvsneak,ekvsneakPre,^^A
+ ekvchangeset,^^A
+ ekvoptarg,ekvoptargTF,^^A
+ ekverr,
+ ^^A expkv-cs
+ ekvcSecondaryKeys,ekvcSplitAndForward,
+ }
+ }
+\colorlet{codeparam}{cyan!65!black}
+\def\mylstwd{.55em}
\lstset
{
+ ,language=expkvd
,flexiblecolumns=false
- ,basewidth=.53em
+ ,basewidth=\mylstwd
,gobble=2
,basicstyle=\fontfamily{jkp}\itshape
- ,morekeywords=^^A
- {^^A
- \ekvdefinekeys
- }
- ,morecomment=[l]\%
+ ,texcsstyle=*[1]{\bfseries\color{expkvgrey}} ^^A primitives
+ ,texcsstyle=*[2]{\bfseries\color{expkvred}} ^^A expkv
+ ,texcsstyle=*[3]{\color{expkvred}} ^^A expkv-pkg
+ ,texcsstyle=*[4]{\bfseries\color{expkvgrey}} ^^A e-TeX
+ ,texcsstyle=*[5]{\bfseries\color{expkvgrey}} ^^A plain/LaTeX macros
+ ,texcsstyle=*[6]{} ^^A macros of other packages
,commentstyle=\color[gray]{0.4}
- ,literate={\{}{{\CodeSymbol\{}}{1}
- {\}}{{\CodeSymbol\}}}{1}
+ ,literate=
+ {\{} {{\CodeUpBf\{}}{1}
+ {\}} {{\CodeUpBf\}}}{1}
+ {$} {{\CodeUpBf\$}}{1}
+ {[} {{\CodeUp[}}{1}
+ {]} {{\CodeUp]}}{1}
+ {(} {{\CodeUp(}}{1}
+ {)} {{\CodeUp)}}{1}
+ {*} {{$*$}}{1}
+ {1} {{\CodeUp{1}}}{1}
+ {2} {{\CodeUp{2}}}{1}
+ {3} {{\CodeUp{3}}}{1}
+ {4} {{\CodeUp{4}}}{1}
+ {5} {{\CodeUp{5}}}{1}
+ {6} {{\CodeUp{6}}}{1}
+ {7} {{\CodeUp{7}}}{1}
+ {8} {{\CodeUp{8}}}{1}
+ {9} {{\CodeUp{9}}}{1}
+ {0} {{\CodeUp{0}}}{1}
+ {##} {{\CodeColored{codeparam}{1}{\#}}}{1}
+ {##1}{{\CodeColored{codeparam}{2}{\#1}}}{2}
+ {##2}{{\CodeColored{codeparam}{2}{\#2}}}{2}
+ {##3}{{\CodeColored{codeparam}{2}{\#3}}}{2}
+ {##4}{{\CodeColored{codeparam}{2}{\#4}}}{2}
+ {##5}{{\CodeColored{codeparam}{2}{\#5}}}{2}
+ {##6}{{\CodeColored{codeparam}{2}{\#6}}}{2}
+ {##7}{{\CodeColored{codeparam}{2}{\#7}}}{2}
+ {##8}{{\CodeColored{codeparam}{2}{\#8}}}{2}
+ {##9}{{\CodeColored{codeparam}{2}{\#9}}}{2}
+ {<key>}{{$\langle$}key{$\rangle$}}{5}
+ {<set>}{{$\langle$}set{$\rangle$}}{5}
+ {<set1>}{{$\langle$}set1{$\rangle$}}{6}
+ {<set2>}{{$\langle$}set2{$\rangle$}}{6}
^^A,literate=*{<key>}{\key}{4}{<set>}{\set}{4}
}
-\newcommand*\CodeSymbol[1]{\textbf{#1}}
+\newcommand*\CodeColored[3]{\textcolor{#1}{\makebox[\dimexpr\mylstwd*#2]{#3}}}
+\newcommand*\CodeUpBf[1]{\makebox[\mylstwd]{\textup{\textbf{#1}}}}
+\newcommand*\CodeUp[1]{\makebox[\mylstwd]{\textup{#1}}}
\RequirePackage{randtext}
\let\metaORIG\meta
\protected\def\meta #1{\texttt{\metaORIG{#1}}}
@@ -511,7 +618,7 @@ and the derived files expkv-def.pdf
% \begin{syntax}
% toks \key\ = \meta{cs} \prefixes2212
% \end{syntax}
-% The \meta{cs} should be a single control sequence, such as |\foo|.
+% The \meta{cs} should be a single control sequence, such as |\foo|.
% Store \val\ inside of a toks-register. The |g| variants use |\global|, the
% |app| variants append \val\ to the contents of that register. If \meta{cs}
% is not yet defined it will be initialised with |\newtoks|.
@@ -730,7 +837,7 @@ and the derived files expkv-def.pdf
% in Italics. If a person has no hobbies the description item will be silently
% left out. The result of the above code looks like this:
%
-% \begingroup
+% \begin{exresult}{\linewidth}
% \ekvdefinekeys{ex}
% {
% data name = \Pname
@@ -751,7 +858,7 @@ and the derived files expkv-def.pdf
% \Person{name=Jonathan P. Spratte, age=young, hobby=\TeX\ coding}
% \Person{name=Some User, age=unknown, hobby=Reading Documentation}
% \Person{name=Anybody, age=any}
-% \endgroup
+% \end{exresult}
%
% \subsection{License}
%
@@ -824,8 +931,8 @@ and the derived files expkv-def.pdf
% \begin{macro}{\ekvdVersion,\ekvdDate}
% We're on our first input, so lets store the version and date in a macro.
% \begin{macrocode}
-\def\ekvdVersion{0.8}
-\def\ekvdDate{2021-04-10}
+\def\ekvdVersion{0.8a}
+\def\ekvdDate{2021-05-24}
% \end{macrocode}
% \end{macro}
%
@@ -2075,7 +2182,7 @@ and the derived files expkv-def.pdf
}%
}
\protected\def\ekvd@err@not@new
- {\ekvd@errm{The key for `\ekvd@cur' is already defined}}
+ {\ekvd@errm{The key for `\ekvd@cur' is already defined}}
\protected\long\def\ekvd@err@misused@unknown
{\ekvd@errm{Misuse of the unknown type found while processing `\ekvd@cur'}}
% \end{macrocode}
@@ -2111,7 +2218,7 @@ and the derived files expkv-def.pdf
{%
\ekv@ifdefined{\ekvd@unknown@choice@name{#1}{#2}}%
{\csname\ekvd@unknown@choice@name{#1}{#2}\endcsname{#3}}%
- {\ekvd@err{invalid choice `#3' (`#2', set `#1')}}%
+ {\ekvd@err{invalid choice `#3' for `#2' in set `#1'}}%
}
}
% \end{macrocode}
@@ -2119,15 +2226,9 @@ and the derived files expkv-def.pdf
%
% \begin{macro}[internal]{\ekvd@err}
% The expandable error messages use |\ekvd@err|, which is just like |\ekv@err|
-% from \expkv\ or the way \pkg{expl3} throws expandable error messages. It uses
-% an undefined control sequence to start the error message.
+% from \expkv. It uses a runaway argument to start the error message.
% \begin{macrocode}
-\def\ekvd@err#1%
- {%
- \long\def\ekvd@err##1{\expandafter\ekv@err@\@firstofone{#1##1.}\ekv@stop}%
- }
-\begingroup\expandafter\endgroup
-\expandafter\ekvd@err\csname ! expkv-def Error:\endcsname
+\ekv@exparg{\long\def\ekvd@err#1}{\ekverr{expkv-def}{#1}}
% \end{macrocode}
% \end{macro}
%
diff --git a/macros/generic/expkv-def/expkv-def.pdf b/macros/generic/expkv-def/expkv-def.pdf
index b483ade6c1..8acb39cdb7 100644
--- a/macros/generic/expkv-def/expkv-def.pdf
+++ b/macros/generic/expkv-def/expkv-def.pdf
Binary files differ
diff --git a/macros/generic/expkv/README.md b/macros/generic/expkv/README.md
index 512cd829ca..adc545fd80 100644
--- a/macros/generic/expkv/README.md
+++ b/macros/generic/expkv/README.md
@@ -1,7 +1,7 @@
-------------------------------------------------------------------------------
# expkv -- an expandable key=val implementation
-Version 2021-04-11 v1.7a
+Version 2021-05-24 v1.8
Released under the LaTeX Project Public License v1.3c or later
See http://www.latex-project.org/lppl.txt
diff --git a/macros/generic/expkv/expkv.dtx b/macros/generic/expkv/expkv.dtx
index 553065f32b..37a67fc781 100644
--- a/macros/generic/expkv/expkv.dtx
+++ b/macros/generic/expkv/expkv.dtx
@@ -76,34 +76,130 @@ and the derived files expkv.pdf
\RequirePackage{microtype}
\RequirePackage{accsupp}
\RequirePackage{enumitem}
+\RequirePackage{tcolorbox}
+\newtcolorbox{exresult}[2][]
+ {colback=expkvgrey!10!white,colframe=expkvgrey,fontupper=\small,width={#2},#1}
+\newtcbox\exres[1][]
+ {
+ colback=expkvgrey!10!white
+ ,colframe=expkvgrey
+ ,size=small
+ ,nobeforeafter
+ ,tcbox raise base
+ ,fontupper=\small
+ ,#1
+ }
+\def\mylstwd{.55em}
+\lstdefinelanguage{expkv}[primitive]{TeX}
+ {
+ ,moretexcs=[4]^^A e-TeX
+ {
+ expanded,
+ numexpr,
+ protected,
+ }
+ ,moretexcs=[5]^^A plain/LaTeX
+ {
+ approx,
+ begin,
+ empty,
+ item,
+ LaTeX,
+ makeatletter,makeatother,
+ newcommand,newdimen,
+ RequirePackage,
+ rule,
+ TeX,
+ textit,texttt,
+ usepackage,
+ }
+ ,moretexcs=[6]^^A used packages
+ {
+ ^^A xfp
+ fpeval,
+ ^^A keyval
+ setkeys,
+ ^^A yax
+ defactiveparameter,storevalue,setparameterlist
+ }
+ ,moretexcs=[2]^^A expkv macros
+ {
+ ekvdef,ekvdefNoVal,^^A
+ ekvlet,ekvletNoVal,ekvletkv,ekvletkvNoVal,^^A
+ ekvdefunknown,ekvdefunknownNoVal,^^A
+ ekvredirectunknown,ekvredirectunknownNoVal,^^A
+ ekvset,ekvsetSneaked,^^A
+ ekvsetdef,ekvsetSneakeddef,ekvsetdefSneaked,^^A
+ ekvparse,^^A
+ ekvVersion,ekvDate,^^A
+ ekvifdefined,ekvifdefinedNoVal,ekvifdefinedset,^^A
+ ekvbreak,ekvbreakPreSneak,ekvbreakPostSneak,^^A
+ ekvsneak,ekvsneakPre,^^A
+ ekvchangeset,^^A
+ ekvoptarg,ekvoptargTF,^^A
+ ekverr
+ }
+ ,moretexcs=[3]^^A expkv-pkg macros
+ {
+ ^^A expkv-cs
+ ekvcSecondaryKeys,ekvcSplitAndForward,
+ ^^A expkv-def
+ ekvdefinekeys
+ }
+ }
+\colorlet{codeparam}{cyan!65!black}
\lstset
{
+ ,language=expkv
,flexiblecolumns=false
- ,basewidth=.53em
+ ,basewidth=\mylstwd
,gobble=2
,basicstyle=\fontfamily{jkp}\itshape
- ,morekeywords=^^A
- {^^A
- \ekvdef,\ekvdefNoVal,^^A
- \ekvlet,\ekvletNoVal,\ekvletkv,\ekvletkvNoVal,^^A
- \ekvdefunknown,\ekvdefunknownNoVal,^^A
- \ekvredirectunknown,\ekvredirectunknownNoVal,^^A
- \ekvset,\ekvsetSneaked,^^A
- \ekvsetdef,\ekvsetSneakeddef,\ekvsetdefSneaked,^^A
- \ekvparse,^^A
- \ekvVersion,\ekvDate,^^A
- \ekvifdefined,\ekvifdefinedNoVal,\ekvifdefinedset,^^A
- \ekvbreak,\ekvbreakPreSneak,\ekvbreakPostSneak,^^A
- \ekvsneak,\ekvsneakPre,^^A
- \ekvchangeset
- }
- ,morecomment=[l]\%
+ ,texcsstyle=*[1]{\bfseries\color{expkvgrey}} ^^A primitives
+ ,texcsstyle=*[2]{\bfseries\color{expkvred}} ^^A expkv
+ ,texcsstyle=*[3]{\color{expkvred}} ^^A expkv-pkg
+ ,texcsstyle=*[4]{\bfseries\color{expkvgrey}} ^^A e-TeX
+ ,texcsstyle=*[5]{\bfseries\color{expkvgrey}} ^^A plain/LaTeX macros
+ ,texcsstyle=*[6]{} ^^A macros of other packages
,commentstyle=\color[gray]{0.4}
- ,literate={\{}{{\CodeSymbol\{}}{1}
- {\}}{{\CodeSymbol\}}}{1}
+ ,literate=
+ {\{} {{\CodeUpBf\{}}{1}
+ {\}} {{\CodeUpBf\}}}{1}
+ {$} {{\CodeUpBf\$}}{1}
+ {[} {{\CodeUp[}}{1}
+ {]} {{\CodeUp]}}{1}
+ {(} {{\CodeUp(}}{1}
+ {)} {{\CodeUp)}}{1}
+ {*} {{$*$}}{1}
+ {1} {{\CodeUp{1}}}{1}
+ {2} {{\CodeUp{2}}}{1}
+ {3} {{\CodeUp{3}}}{1}
+ {4} {{\CodeUp{4}}}{1}
+ {5} {{\CodeUp{5}}}{1}
+ {6} {{\CodeUp{6}}}{1}
+ {7} {{\CodeUp{7}}}{1}
+ {8} {{\CodeUp{8}}}{1}
+ {9} {{\CodeUp{9}}}{1}
+ {0} {{\CodeUp{0}}}{1}
+ {##} {{\CodeColored{codeparam}{1}{\#}}}{1}
+ {##1}{{\CodeColored{codeparam}{2}{\#1}}}{2}
+ {##2}{{\CodeColored{codeparam}{2}{\#2}}}{2}
+ {##3}{{\CodeColored{codeparam}{2}{\#3}}}{2}
+ {##4}{{\CodeColored{codeparam}{2}{\#4}}}{2}
+ {##5}{{\CodeColored{codeparam}{2}{\#5}}}{2}
+ {##6}{{\CodeColored{codeparam}{2}{\#6}}}{2}
+ {##7}{{\CodeColored{codeparam}{2}{\#7}}}{2}
+ {##8}{{\CodeColored{codeparam}{2}{\#8}}}{2}
+ {##9}{{\CodeColored{codeparam}{2}{\#9}}}{2}
+ {<key>}{{$\langle$}key{$\rangle$}}{5}
+ {<set>}{{$\langle$}set{$\rangle$}}{5}
+ {<set1>}{{$\langle$}set1{$\rangle$}}{6}
+ {<set2>}{{$\langle$}set2{$\rangle$}}{6}
^^A,literate=*{<key>}{\key}{4}{<set>}{\set}{4}
}
-\newcommand*\CodeSymbol[1]{\textbf{#1}}
+\newcommand*\CodeColored[3]{\textcolor{#1}{\makebox[\dimexpr\mylstwd*#2]{#3}}}
+\newcommand*\CodeUpBf[1]{\makebox[\mylstwd]{\textup{\textbf{#1}}}}
+\newcommand*\CodeUp[1]{\makebox[\mylstwd]{\textup{#1}}}
\RequirePackage{randtext}
\let\metaORIG\meta
\protected\def\meta #1{\texttt{\metaORIG{#1}}}
@@ -474,7 +570,13 @@ and the derived files expkv.pdf
% executed. If \kv\ contains more than a single unhidden equal sign, it will
% be split at the first one and the others are considered part of the value.
% |\ekvset| should be nestable.
+%
+% |\ekvset| is currently \emph{not} alignment safe.\footnotemark\ As a result,
+% key names and values that contain an |&| must be wrapped in braces when
+% |\ekvset| is used inside an alignment (like \LaTeXe's |tabular| environment)
+% or you have to create a wrapper that ensures an alignment safe context.
% \end{function}
+% \footnotetext{This might change in the future, I've not decided yet.}
% \example Parse |key=arg, key| in the set |foo|:
% \begin{lstlisting}[aboveskip=0pt,belowskip=0pt]
% \ekvset{foo}{key=arg, key}
@@ -564,11 +666,15 @@ and the derived files expkv.pdf
% only keys as an argument to \meta{code1}, and those which are a \kv\ pair
% to \meta{code2} as two arguments. It is fully expandable as well and returns
% each element of the parsed list in |\unexpanded|, which has no effect
-% outside of an |\expanded| or |\edef| context\footnotemark.
-% If you need control over the necessary steps of expansion you
-% can use |\expanded| around it. You can use multiple tokens in \meta{code1}
-% and \meta{code2} or just a single control sequence name. In both cases the
-% found \key\ and \val\ are provided as a brace group following them.
+% outside of an |\expanded| or |\edef| context.
+% Also |\ekvparse| expands in exactly two steps of expansion.
+% You can use multiple tokens in \meta{code1} and \meta{code2} or just a
+% single control sequence name. In both cases the found \key\ and \val\ are
+% provided as a brace group following them.
+%
+% |\ekvparse| is alignment safe, meaning that you don't have to take any
+% precautions if it is used inside an alignment context (like \LaTeXe's
+% |tabular| environment) and any key or value can contain an |&|.
%
% |\ekvbreak|, |\ekvsneak|, and |\ekvchangeset| and their relatives don't work
% in |\ekvparse|. It is analogue to \pkg{expl3}'s |\keyval_parse:NNn|, but
@@ -576,14 +682,6 @@ and the derived files expkv.pdf
% multiple equal signs per \kv\ pair and on empty \key\ names in a \kv\ pair,
% both of which |\ekvparse| doesn't deal with.
% \end{function}
-% \footnotetext
-% {^^A
-% This is a change in behaviour, previously (v0.3 and before) \cs{ekvparse}
-% would expand in exactly two steps. This isn't always necessary, but makes
-% the parsing considerably slower. If this is necessary for your application
-% you can put an \cs[no-index]{expanded} around it and will still be faster
-% since you need only a single \cs[no-index]{expandafter} this way.^^A
-% }
% \example
% \begin{lstlisting}
% \ekvparse{\handlekey{S}}{\handlekeyval{S}}{foo = bar, key, baz={zzz}}
@@ -599,11 +697,11 @@ and the derived files expkv.pdf
% another macro, you should use |\expanded| as only then the input stream will
% contain the output above:
% \begin{lstlisting}
-% \expandafter\handle\expanded{\ekvparse\k\kv{foo = bar, key, baz={zzz}}}
+% \expandafter\parse\expanded{\ekvparse\k\kv{foo = bar, key, baz={zzz}}}
% \end{lstlisting}
% would expand to
% \begin{lstlisting}
-% \handle\kv{foo}{bar}\k{key}\kv{baz}{zzz}
+% \parse\kv{foo}{bar}\k{key}\kv{baz}{zzz}
% \end{lstlisting}
%
% \subsection{Other Macros}
@@ -673,7 +771,7 @@ and the derived files expkv.pdf
% list everything that has been |\ekvsneak|ed will be left in the input
% stream. A small usage example is shown in \autoref{sec:sneakex}.
% \end{function}
-% \example Define a key |secret| in the set |foo| that will sneak out a macro
+% \example Define a key |secret| in the set |foo| that will sneak out
% |\foo@secretly@sneaked|:
% \begin{lstlisting}[aboveskip=0pt,belowskip=0pt]
% \ekvdefNoVal{foo}{secret}{\ekvsneak{\foo@secretly@sneaked}}
@@ -696,6 +794,124 @@ and the derived files expkv.pdf
% {\ekvifdefinedset{#1}{\ekvchangeset{#1}}{\ekvbreak{\foo@cd@error}}}
% \end{lstlisting}
%
+% \begin{function}{\ekvoptarg}
+% \begin{syntax}
+% \cs{ekvoptarg}\marg{next}\marg{default}
+% \end{syntax}
+% This macro will check for a following optional argument in brackets (|[]|)
+% expandably. After the optional argument there has to be a mandatory one. The
+% code in \meta{next} should expect two arguments (the processed optional
+% argument and the mandatory one). If there was an optional argument the
+% result will be \meta{next}\marg{optional}\meta{mandatory} (so the optional
+% argument will be wrapped in braces, the mandatory argument will be
+% untouched). If there was no optional argument the result will be
+% \meta{next}\marg{default}\marg{mandatory} (so the default will be used and
+% the mandatory argument will be wrapped in braces).
+% \end{function}
+% |\ekvoptarg| expands in exactly two steps and is alignment safe. It has its
+% limitations however. It can't tell the difference between |[| and |{[}|, so it
+% doesn't work if the mandatory argument is a single bracket. Also if the
+% optional argument should contain a nested closing bracket, the optional
+% argument has to use nested braces like so: |[{arg]ument}]|.
+% \example Say we have a macro that should take an optional argument defaulting
+% to 1:
+% \begin{lstlisting}[aboveskip=0pt,belowskip=0pt]
+% \newcommand\foo{\ekvoptarg\@foo{1}}
+% \newcommand\@foo[2]{Mandatory: #2\par Optional: #1}
+% \end{lstlisting}
+%
+% \begin{function}{\ekvoptargTF}
+% \begin{syntax}
+% \cs{ekvoptargTF}\marg{true}\marg{false}
+% \end{syntax}
+% This macro is similar to |\ekvoptarg|, but will result in
+% \meta{true}\marg{optional}\meta{mandatory} or \meta{false}\marg{mandatory}
+% instead of placing a default value.
+% \end{function}
+% |\ekvoptargTF| expands in exactly two steps and is alignment safe. It has the
+% same limitations as |\ekvoptarg|.
+% \example Say we have a macro that should behave differently depending on
+% whether there was an optional argument or not. This could be done with:
+% \begin{lstlisting}[aboveskip=0pt,belowskip=0pt]
+% \newcommand\foo{\ekvoptargTF\foo@a\foo@b}
+% \newcommand\foo@a[2]{Mandatory: #2\par Optional: #1}
+% \newcommand\foo@b[1]{Mandatory: #1\par No optional.}
+% \end{lstlisting}
+%
+% \begin{function}{\ekverr}
+% \begin{syntax}
+% \cs{ekverr}\marg{package}\marg{message}
+% \end{syntax}
+% This macro will throw an error fully expandably.\footnotemark\ The error
+% length is limited to a total length of 69~characters, and since ten
+% characters will be added for the formatting (\verb*|! | and
+% \verb*| Error: |) that leaves us with a total length for \meta{package} plus
+% \meta{message} of 59~characters. If the message gets longer \TeX\ will only
+% display the first 69~characters and append |\ETC.| to the end.
+%
+% Neither \meta{package} nor \meta{message} expand any further. Also
+% \meta{package} must not contain an explicit |\par| token or the token
+% |\thanks@jfbu|. No such restriction applies to \meta{message}.
+%
+% If |^^J| is set up as the |\newlinechar| (which is the case in \LaTeXe\ but
+% not in plain \TeX\ by default) you can use that to introduce line breaks in
+% your error message. However that doesn't change the message length limit.
+% \end{function}
+% \footnotetext{The used mechanism was to the best of my knowledge first
+% implemented by Jean-François Burnol.}
+% After your own error message some further text will be placed. The
+% formatting of that text will look good if |^^J| is the |\newlinechar|, else
+% not so much. That text will read:
+% \begin{verbatim}
+% ! Paragraph ended before \<an-expandable-macro>
+% completed due to above exception. If the error
+% summary is not comprehensible see the package
+% documentation.
+% I will try to recover now. If you're in inter-
+% active mode hit <return> at the ? prompt and I
+% continue hoping recovery was complete.
+% \end{verbatim}
+% Any clean up has to be done by you, |\ekverr| will expand to nothing after
+% throwing the error message.
+% \example Say we set up a small calculation which works with user input. In our
+% calculation we need a division, so have to watch out for division by zero. If
+% we detect such a case we throw an error and do the recovery by using the
+% biggest integer allowed in \TeX\ as the result.
+% \begin{lstlisting}
+% \newcommand*\mydivision[2]
+% {%
+% \number\numexpr
+% \ifnum\numexpr#2=0 % space here on purpose
+% \ekverr{my}{division by 0. Setting result to 2147483647.}%
+% 2147483647%
+% \else
+% (#1)/(#2)%
+% \fi
+% \relax
+% }
+% $(10+5)/(3-3)\approx\mydivision{10+5}{3-3}$
+% \end{lstlisting}
+% If that code gets executed the following will be the terminal output
+% \begin{verbatim}
+% Runaway argument?
+% ! my Error: division by 0. Setting result to 2147483647.
+% ! Paragraph ended before \<an-expandable-macro>
+% completed due to above exception. If the error
+% summary is not comprehensible see the package
+% documentation.
+% I will try to recover now. If you're in inter-
+% active mode hit <return> at the ? prompt and I
+% continue hoping recovery was complete.
+% <to be read again>
+% \par
+% l.15 $(10+5)/(3-3)\approx\mydivision{10+5}{3-3}
+% $
+% ?
+% \end{verbatim}
+% and the output would contain
+% \exres{$(10+5)/(3-3)\approx2147483647$}
+% if we continued the \TeX\ run at the prompt.
+%
% \bigskip
%
% \begin{function}{\ekv@name,\ekv@name@set,\ekv@name@key}
@@ -744,17 +960,18 @@ and the derived files expkv.pdf
% \end{lstlisting}
% Now we set up our macro to use this \kv\ interface
% \begin{lstlisting}
-% \protected\def\ourmacro#1{\begingroup\ekvset{our}{#1}\the\ourdim\endgroup}
+% \protected\def\ourmacro#1%
+% {\begingroup\ekvset{our}{#1}\the\ourdim\endgroup}
% \end{lstlisting}
% Finally we can use our macro like in the following\\
-% \begin{minipage}{6cm}
+% \begin{minipage}{.5\linewidth}
% \begin{lstlisting}
% \ourmacro{}\par
% \ourmacro{width}\par
% \ourmacro{width=5pt}\par
% \end{lstlisting}
% \end{minipage}^^A
-% \begin{minipage}{\dimexpr\linewidth-6cm\relax}
+% \begin{exresult}[nobeforeafter,box align=center]{.5\linewidth}
% \newdimen\ourdim\ourdim=150pt
% \protected\ekvdef{our}{width}{\ourdim=#1\relax}^^A
% \protected\ekvdefNoVal{our}{width}{\ourdim=.9\hsize}^^A
@@ -763,7 +980,7 @@ and the derived files expkv.pdf
% \ourmacro{}\par
% \ourmacro{width}\par
% \ourmacro{width=5pt}\par
-% \end{minipage}
+% \end{exresult}
%
% \paragraph{The same keys using \protect\expkvd}
% Using \expkvd\ we can set up the equivalent key using a \kv\ interface, after
@@ -785,7 +1002,7 @@ and the derived files expkv.pdf
%
% Another small example could be a \kv\ driven |\rule| alternative, because I
% keep forgetting the correct order of its arguments. First we define the keys
-% (and initialize the used macros to store the keys):
+% (and initialize the macros used to store the keys):
% \begin{lstlisting}
% \makeatletter
% \newcommand*\myrule@ht{1ex}
@@ -794,12 +1011,14 @@ and the derived files expkv.pdf
% \protected\ekvdef{myrule}{ht}{\def\myrule@ht{#1}}
% \protected\ekvdef{myrule}{wd}{\def\myrule@wd{#1}}
% \protected\ekvdef{myrule}{raise}{\def\myrule@raise{#1}}
+% \protected\ekvdef{myrule}{lower}{\def\myrule@raise{-#1}}
% \end{lstlisting}
% Then we define a macro to change the defaults outside of |\myrule| and
% |\myrule| itself:
% \begin{lstlisting}
% \ekvsetdef\myruleset{myrule}
-% \newcommand*\myrule[1][]{\begingroup\myruleset{#1}\myrule@out\endgroup}
+% \newcommand*\myrule[1][]
+% {\begingroup\myruleset{#1}\myrule@out\endgroup}
% \end{lstlisting}
% And finally the output:
% \begin{lstlisting}
@@ -807,15 +1026,15 @@ and the derived files expkv.pdf
% \makeatother
% \end{lstlisting}
% And we can use it:\\
-% \begin{minipage}{7cm}
+% \begin{minipage}{.5\linewidth}
% \begin{lstlisting}
% a\myrule\par
-% a\myrule[ht=2ex,raise=-.5ex]\par
+% a\myrule[ht=2ex,lower=.5ex]\par
% \myruleset{wd=5pt}
% a\myrule
% \end{lstlisting}
% \end{minipage}^^A
-% \begin{minipage}{\dimexpr\linewidth-7cm\relax}
+% \begin{exresult}[nobeforeafter,box align=center]{.5\linewidth}
% \makeatletter
% \newcommand*\myrule@ht{1ex}
% \newcommand*\myrule@wd{0.1em}
@@ -823,16 +1042,17 @@ and the derived files expkv.pdf
% \protected\ekvdef{myrule}{ht}{\def\myrule@ht{#1}}
% \protected\ekvdef{myrule}{wd}{\def\myrule@wd{#1}}
% \protected\ekvdef{myrule}{raise}{\def\myrule@raise{#1}}
+% \protected\ekvdef{myrule}{lower}{\def\myrule@raise{-#1}}
% \ekvsetdef\myruleset{myrule}
% \newcommand*\myrule[1][]{\begingroup\myruleset{#1}\myrule@out\endgroup}
% \newcommand*\myrule@out{\rule[\myrule@raise]\myrule@wd\myrule@ht}
% \makeatother
% a\myrule\par
-% a\myrule[ht=2ex,raise=-.5ex]\par
+% a\myrule[ht=2ex,lower=.5ex]\par
% \myruleset{wd=5pt}
% a\myrule
-% \end{minipage}
-%
+% \end{exresult}
+%
%
% \subsubsection{An Expandable \kv\ Macro Using \cs[no-index]{ekvsneak}}
% \label{sec:sneakex}
@@ -877,7 +1097,10 @@ and the derived files expkv.pdf
% First we set up our keys according to our earlier considerations and set up
% the user facing macro |\sine|. The end marker of the parsing list will be a
% |\sine@stop| token, which we don't need to define and we put our defaults
-% right before it.
+% right before it. The user macro |\sine| uses |\ekvoptargTF| to check for the
+% optional argument short cutting to the final step if no optional argument was
+% found. This way we safe some time in this case, though we have to specify the
+% default values twice.
%
% \begin{lstlisting}
% \RequirePackage{xfp}
@@ -887,13 +1110,10 @@ and the derived files expkv.pdf
% \ekvdefNoVal{expex}{degree}{\ekvsneakPre{\deg{d}}}
% \ekvdefNoVal{expex}{radian}{\ekvsneakPre{\deg{}}}
% \ekvdefNoVal{expex}{internal}{\ekvsneakPre{\sine@rnd}}
-% \newcommand*\sine[2]
+% \newcommand*\sine{\ekvoptargTF\sine@args{\sine@final{sin}{d}{3}}}
+% \newcommand*\sine@args[2]
% {\ekvset{expex}{#1,internal}\rnd{3}\deg{d}\f{sin}\sine@stop{#2}}
% \end{lstlisting}
-% For the sake of simplicity we defined the macro |\sine| with two mandatory
-% arguments, the first being the \kv\ list, the second the argument to the
-% trigonometric function. We could've used \pkg{xparse}'s facilities here to
-% define an expandable macro which takes an optional argument instead.
%
% Now we need to define some internal macros to extract the value of each key's
% last usage (remember that this will be the group after the first special
@@ -922,33 +1142,34 @@ and the derived files expkv.pdf
% \makeatother
% \end{lstlisting}
% Let's test our macro:\\
-% \begin{minipage}{.7\linewidth}
+% \begin{minipage}{.75\linewidth}
% \begin{lstlisting}[gobble=4]
-% \sine{}{60}\par
-% \sine{round=10}{60}\par
-% \sine{f=cos,radian}{pi}\par
-% \edef\myval{\sine{f=tan}{1}}\texttt{\meaning\myval}
+% \sine{60}\par
+% \sine[round=10]{60}\par
+% \sine[f=cos,radian]{pi}\par
+% \edef\myval{\sine[f=tan]{1}}\texttt{\meaning\myval}
% \end{lstlisting}
-% \end{minipage}\hfill
-% \begin{minipage}{.2\linewidth}
+% \end{minipage}^^A
+% \begin{exresult}[nobeforeafter,box align=center]{.25\linewidth}
% \makeatletter
% \ekvdef{expex}{f}{\ekvsneakPre{\f{#1}}}^^A
% \ekvdef{expex}{round}{\ekvsneakPre{\rnd{#1}}}^^A
% \ekvdefNoVal{expex}{degree}{\ekvsneakPre{\deg{d}}}^^A
% \ekvdefNoVal{expex}{radian}{\ekvsneakPre{\deg{}}}^^A
% \ekvdefNoVal{expex}{internal}{\ekvsneakPre{\sine@rnd}}^^A
-% \newcommand*\sine[2]
-% {\ekvset{expex}{#1,internal}\rnd{3}\deg{d}\f{sin}\sine@stop{#2}}^^A
+% \newcommand*\sine{\ekvoptargTF\sine@args{\sine@final{sin}{d}{3}}}
+% \newcommand*\sine@args[2]
+% {\ekvset{expex}{#1,internal}\rnd{3}\deg{d}\f{sin}\sine@stop{#2}}
% \def\sine@rnd#1\rnd#2#3\sine@stop{\sine@deg#1#3\sine@stop{#2}}^^A
% \def\sine@deg#1\deg#2#3\sine@stop{\sine@f#1#3\sine@stop{#2}}^^A
% \def\sine@f#1\f#2#3\sine@stop{\sine@final{#2}}^^A
% \newcommand*\sine@final[4]{\fpeval{round(#1#2(#4),#3)}}^^A
% \makeatother
-% \sine{}{60}\par
-% \sine{round=10}{60}\par
-% \sine{f=cos,radian}{pi}\par
-% \edef\myval{\sine{f=tan}{1}}\texttt{\meaning\myval}
-% \end{minipage}
+% \sine{60}\par
+% \sine[round=10]{60}\par
+% \sine[f=cos,radian]{pi}\par
+% \edef\myval{\sine[f=tan]{1}}\texttt{\meaning\myval}
+% \end{exresult}
%
% \paragraph{The same macro using \protect\expkvc}
% Using \expkvc\ we can set up something equivalent with a bit less code. The
@@ -956,18 +1177,19 @@ and the derived files expkv.pdf
% way easier to code for the user.
% \begin{lstlisting}
% \makeatletter
-% \ekvcSplitAndForward\sine\sine@
+% \newcommand*\sine{\ekvoptargTF\sine@a{\sine@b{sin}{d}{3}}}
+% \ekvcSplitAndForward\sine@a\sine@b
% {
% f=sin,
% unit=d,
% round=3,
% }
-% \ekvcSecondaryKeys\sine
+% \ekvcSecondaryKeys\sine@a
% {
% nmeta degree={unit=d},
% nmeta radian={unit={}},
% }
-% \newcommand*\sine@[4]{\fpeval{round(#1#2(#4),#3)}}
+% \newcommand*\sine@b[4]{\fpeval{round(#1#2(#4),#3)}}
% \makeatother
% \end{lstlisting}
% The resulting macro will behave just like the one previously defined, but will
@@ -982,8 +1204,8 @@ and the derived files expkv.pdf
%
% \subsubsection{Load Time}
%
-% \file{expkv.tex} checks whether \eTeX\ is available. If it isn't, an error
-% will be thrown using |\errmessage|:
+% \file{expkv.tex} checks whether \eTeX\ and the |\expanded| primitive are
+% available. If it isn't, an error will be thrown using |\errmessage|:
% \begin{lstlisting}
% ! expkv Error: e-TeX required.
% \end{lstlisting}
@@ -1010,57 +1232,52 @@ and the derived files expkv.pdf
% \subsubsection{Using Keys}
%
% This subsubsection contains the errors thrown during |\ekvset|. The errors are
-% thrown in an expandable manner by providing an undefined macro. In the
-% following messages \lstinline|<key>| gets replaced with the problematic key's
-% name, and \lstinline|<set>| with the corresponding set. If any errors during
-% \kv\ handling are encountered, the entry in the comma separated list will be
+% thrown in an expandable manner using |\ekverr|. In the following messages
+% \lstinline|<key>| gets replaced with the problematic key's name, and
+% \lstinline|<set>| with the corresponding set. If any errors during \kv\
+% handling are encountered, the entry in the comma separated list will be
% omitted after the error is thrown and the next \kv\ pair will be parsed.
%
% If you're using an undefined key you'll get:
% \begin{lstlisting}
-% ! Undefined control sequence.
-% <argument> \! expkv Error:
-% unknown key (`<key>', set `<set>').
+% Runaway argument?
+% ! expkv Error: unknown key `<key>' in set `<set>'
% \end{lstlisting}
%
% If you're using a key for which only a normal version and no |NoVal| version
% is defined, but don't provide a value, you'll get:
% \begin{lstlisting}
-% ! Undefined control sequence.
-% <argument> \! expkv Error:
-% value required (`<key>', set `<set>').
+% Runaway argument?
+% ! expkv Error: missing value for `<key>' in set `<set>'
% \end{lstlisting}
%
% If you're using a key for which only a |NoVal| version and no normal version
% is defined, but provide a value, you'll get:
% \begin{lstlisting}
-% ! Undefined control sequence.
-% <argument> \! expkv Error:
-% value forbidden (`<key>', set `<set>').
+% Runaway argument?
+% ! expkv Error: unwanted value for `<key>' in set `<set>'
% \end{lstlisting}
%
% If you're using an undefined key in a set for which |\ekvredirectunknown| was
% used, and the key isn't found in any of the other sets as well, you'll get:
% \begin{lstlisting}
-% ! Undefined control sequence.
-% <argument> \! expkv Error:
-% no key `<key>' in sets {<set1>}{<set2>}...
+% Runaway argument?
+% ! expkv Error: no key `<key>' in sets {<set1>}{<set2>}...
% \end{lstlisting}
%
% If you're using an undefined |NoVal| key in a set for which
% |\ekvredirectunknownNoVal| was used, and the key isn't found in any of the
% other sets as well, you'll get:
% \begin{lstlisting}
-% ! Undefined control sequence.
-% <argument> \! expkv Error:
-% no NoVal key `<key>' in sets {<set1>}...
+% Runaway argument?
+% ! expkv Error: no NoVal key `<key>' in sets {<set1>}{<set2>}...
% \end{lstlisting}
%
% If you're using a set for which you never executed one of the defining macros
% from \autoref{sec:define} you'll get a low level \TeX\ error, as that isn't
% actively tested by the parser (and hence will lead to undefined behaviour and
% not be gracefully ignored). The error will look like
-% \begin{lstlisting}
+% \begin{lstlisting}[language={}]
% ! Missing \endcsname inserted.
% <to be read again>
% \! expkv Error: Set `<set>' undefined.
@@ -1197,8 +1414,8 @@ and the derived files expkv.pdf
% loading \yax\ broke \pkg{options} for me. The tested definition was:
% \begin{lstlisting}[belowskip=0pt]
% \usepackage{yax}
-% \defactiveparameter yax {\storevalue\myheight yax:height } % key setup
-% \setparameterlist{yax}{ height = 6 } % benchmarked
+% \defactiveparameter yax {\storevalue\myheight yax:height } % setup
+% \setparameterlist{yax}{ height = 6 } % benchmark
% \end{lstlisting}
%
% \begin{table}
@@ -1313,11 +1530,16 @@ and the derived files expkv.pdf
\fi
% \end{macrocode}
%
-% Check whether \eTeX\ is available -- \expkv\ requires \eTeX.
+% Check whether \eTeX\ and |\expanded| are available -- \expkv\ requires \eTeX.
% \begin{macrocode}
-\begingroup\expandafter\expandafter\expandafter\endgroup
-\expandafter\ifx\csname numexpr\endcsname\relax
- \errmessage{expkv requires e-TeX}
+\begingroup
+ \edef\ekvtmpa{\string\expanded}
+ \edef\ekvtmpb{\meaning\expanded}
+ \expandafter
+\endgroup
+\ifx\ekvtmpa\ekvtmpb
+\else
+ \errmessage{expkv Error: e-TeX and \noexpand\expanded required}
\expandafter\endinput
\fi
% \end{macrocode}
@@ -1325,8 +1547,8 @@ and the derived files expkv.pdf
% \begin{macro}{\ekvVersion,\ekvDate}
% We're on our first input, so lets store the version and date in a macro.
% \begin{macrocode}
-\def\ekvVersion{1.7a}
-\def\ekvDate{2021-04-11}
+\def\ekvVersion{1.8}
+\def\ekvDate{2021-05-24}
% \end{macrocode}
% \end{macro}
%
@@ -2092,9 +2314,12 @@ and the derived files expkv.pdf
% macro, that has the same scope as |\keyval_parse:NNn| from \pkg{expl3}.
% This is pretty analogue to the |\ekvset| implementation, we just put an
% |\unexpanded| here and there instead of other macros to stop the |\expanded|
-% on our output.
+% on our output. The |\unexpanded\expanded{{...}}| ensures that the material is
+% in an alignment safe group at all time, and that it doesn't expand any further
+% in an |\edef| or |\expanded| context.
% \begin{macrocode}
-\long\def\ekvparse##1##2##3{\ekv@parse{##1}{##2}\ekv@mark##3#1\ekv@stop#1}
+\long\def\ekvparse##1##2##3%
+ {\unexpanded\expanded{{\ekv@parse{##1}{##2}\ekv@mark##3#1\ekv@stop#1}}}
% \end{macrocode}
% \end{macro}
%
@@ -2440,18 +2665,124 @@ and the derived files expkv.pdf
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}[internal]{\ekv@err,\ekv@err@}
+% \begin{macro}[internal]{\ekv@alignsafe,\ekv@endalignsafe}
+% These macros protect the usage of ampersands inside of alignment contexts.
+% \begin{macrocode}
+\begingroup
+\catcode`\^^@=2
+\@firstofone{\endgroup
+ \def\ekv@alignsafe{\romannumeral\iffalse{\fi`^^@ }
+}
+\def\ekv@endalignsafe{\ifnum`{=\ekv@zero}\fi}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\ekvoptarg,\ekvoptargTF}
+% Provide macros to expandably collect an optional argument in brackets. The
+% macros here are pretty simple in nature compared to \pkg{xparse}'s
+% possibilities (they don't care for nested bracket levels).
+%
+% We start with a temporary definition to pre-expand |\ekv@alignsafe| (will be
+% |#1|) and |\ekv@endalignsafe| (will be |#2|).
+% \begin{macrocode}
+\begingroup
+\def\ekvoptarg#1#2{%
+\endgroup
+% \end{macrocode}
+% The real definition starts an expansion context after grabbing the arguments.
+% |#1| will be the next step, |#2| the default value, and |#3| might be an
+% opening bracket, or the mandatory argument. We check for the opening bracket,
+% if it is found grab the optional argument, else leave |#1{#2}| in the input
+% stream after ending the expansion context.
+% \begin{macrocode}
+\long\def\ekvoptarg##1##2##3%
+ {%
+ \romannumeral
+ #1%
+ \ekv@optarg@if\ekv@mark##3\ekv@mark\ekv@optarg\ekv@mark[\ekv@mark
+ #2%
+ \@firstofone{\ekv@zero##1}{##2}{##3}%
+ }
+% \end{macrocode}
+% The other variant of this will do roughly the same. Here, |#1| will be the
+% next step if an optional argument is found, |#2| the next step else, and |#3|
+% might be the opening bracket or mandatory argument.
+% \begin{macrocode}
+\long\def\ekvoptargTF##1##2##3%
+ {%
+ \romannumeral
+ #1%
+ \ekv@optarg@if\ekv@mark##3\ekv@mark\ekv@optargTF{##1}\ekv@mark[\ekv@mark
+ #2%
+ \@firstofone{\ekv@zero##2}{##3}%
+ }
+% \end{macrocode}
+% The two macros to grab the optional argument have to remove the remainder of
+% the test and the wrong next step as well as grabbing the argument.
+% \begin{macrocode}
+\long\def\ekv@optarg\ekv@mark[\ekv@mark\ifnum`##1\fi\@firstofone##2##3##4##5]%
+ {#2##2{##5}}
+\long\def\ekv@optargTF##1\ekv@mark[\ekv@mark\ifnum`##2\fi\@firstofone##3##4##5]%
+ {#2\ekv@zero##1{##5}}
+}
+% \end{macrocode}
+% Do the definitions and add the test macro.
+% \begin{macrocode}
+\ekv@exparg{\expandafter\ekvoptarg\expandafter{\ekv@alignsafe}}\ekv@endalignsafe
+\long\def\ekv@optarg@if#1\ekv@mark[\ekv@mark{}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\ekverr}
+% \begin{macro}[internal]{\ekv@err@collect,\ekv@err@cleanup}
% Since |\ekvset| is fully expandable as long as the code of the keys is (which
% is unlikely) we want to somehow throw expandable errors, in our case via
-% undefined control sequences.
-% \begin{macrocode}
-\def\ekv@err#1%
+% a runaway argument (to my knowledge the first version of this method was
+% implemented by Jean-François Burnol, many thanks to him). The first step is to
+% ensure that the second argument (which might contain user input) doesn't
+% contain tokens we use as delimiters (in this case |\par|), this will be done
+% by the front facing macro |\ekverr|. But first we set some other things up.
+%
+% We use a temporary definition for |\ekverr| to get multiple consecutive
+% spaces. Then we set up the macro that will collect the error and the macro
+% that will throw the error. The latter will have an unreasonable long name.
+% This way we can convey more information. Though the information in the macro
+% name is static and has to be somewhat general to fit every occurence. The
+% important bit is that the long named macro has a delimited argument and is
+% short which will throw the error at the |\par| at the end of
+% |\ekv@err@collect|. This macro has the drawback that it will only print nicely
+% if the |\newlinechar| is |^^J|.
+% \begin{macrocode}
+\def\ekv@err@cleanup\par{}
+\def\ekv@err@collect#1%
{%
- \long\def\ekv@err##1{\expandafter\ekv@err@\@firstofone{#1##1.}\ekv@stop}%
+ \def\ekv@err@collect##1\par##2%
+ {%
+ \expandafter
+ \ekv@err@cleanup
+ #1! ##2 Error: ##1\par
+ }%
+ \def#1##1\thanks@jfbu{}%
}
-\begingroup\expandafter\endgroup
-\expandafter\ekv@err\csname ! expkv Error:\endcsname
-\def\ekv@err@{\expandafter\ekv@gobbleto@stop}
+\def\ekverr{ }
+\expandafter\ekv@err@collect\csname <an-expandable-macro>^^J%
+ completed due to above exception. \ekverr If the error^^J%
+ summary is \ekverr not comprehensible \ekverr see the package^^J%
+ documentation.^^J%
+ I will try to recover now. \ekverr If you're in inter-^^J%
+ active mode hit <return> \ekverr at the ? prompt and I^^J%
+ continue hoping recovery\endcsname
+% \end{macrocode}
+% \begin{macrocode}
+\long\def\ekverr#1#2{\expandafter\ekv@err@collect\detokenize{#2}\par{#1}}
+% \end{macrocode}
+% \end{macro}
+% \end{macro}
+%
+% \begin{macro}[internal]{\ekv@err}
+% We define a shorthand to throw errors in \expkv.
+% \begin{macrocode}
+\ekv@exparg{\long\def\ekv@err#1}{\ekverr{expkv}{#1}}
% \end{macrocode}
% \end{macro}
%
@@ -2465,10 +2796,10 @@ and the derived files expkv.pdf
% \begin{macrocode}
\long\def\ekv@err@common #1#2{\expandafter\ekv@err@common@\string#2{#1}}
\ekv@exparg{\long\def\ekv@err@common@#1`#2' #3.#4#5}%
- {\ekv@err{#4 (`#5', set `#2')}}
+ {\ekv@err{#4 `#5' in set `#2'}}
\ekv@exparg{\long\def\ekv@err@unknown#1}{\ekv@err@common{unknown key}{#1}}
-\ekv@exparg{\long\def\ekv@err@noarg #1}{\ekv@err@common{value forbidden}{#1}}
-\ekv@exparg{\long\def\ekv@err@reqval #1}{\ekv@err@common{value required}{#1}}
+\ekv@exparg{\long\def\ekv@err@noarg #1}{\ekv@err@common{unwanted value for}{#1}}
+\ekv@exparg{\long\def\ekv@err@reqval #1}{\ekv@err@common{missing value for}{#1}}
\ekv@exparg{\long\def\ekv@err@redirect@kv@notfound#1#2#3\ekv@stop}%
{\ekv@err{no key `#2' in sets #3}}
\ekv@exparg{\def\ekv@err@redirect@k@notfound#1#2\ekv@stop}%
diff --git a/macros/generic/expkv/expkv.pdf b/macros/generic/expkv/expkv.pdf
index 95b8d60b57..1f9248c9ec 100644
--- a/macros/generic/expkv/expkv.pdf
+++ b/macros/generic/expkv/expkv.pdf
Binary files differ
diff --git a/macros/latex/contrib/huawei/README.md b/macros/latex/contrib/huawei/README.md
index a6ae6ec72c..c3a9ad9132 100644
--- a/macros/latex/contrib/huawei/README.md
+++ b/macros/latex/contrib/huawei/README.md
@@ -11,17 +11,20 @@ and then use in the preamble:
```tex
\documentclass[landscape]{huawei}
-\author{Yegor Bugayenko}
-\title{An Interesting Document About Something}
+\renewcommand*\theauthor{Yegor Bugayenko}
+\renewcommand*\thetitle{An Interesting Document About Something}
\begin{document}
+\maketitle
Hello, world!
\end{document}
```
+Read the detailed documentation [in PDF](http://mirrors.ctan.org/macros/latex/contrib/huawei/huawei.pdf).
+
Find more examples in the [`samples/`](/samples) directory.
If you need more formatting options,
-[submit an issue](https://github.com/cqfn/huawei-latex/issues),
+[submit an issue](https://github.com/yegor256/huawei.cls/issues),
I'll implement them.
If you want to contribute yourself, make a fork, then create a branch,
diff --git a/macros/latex/contrib/huawei/huawei.cls b/macros/latex/contrib/huawei/huawei.cls
index 1a8c9c2ef3..ef8f26da25 100644
--- a/macros/latex/contrib/huawei/huawei.cls
+++ b/macros/latex/contrib/huawei/huawei.cls
@@ -21,13 +21,16 @@
% SOFTWARE.
\NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{huawei}[13/05/2021 0.2.0 Template for Huawei documents]
+\ProvidesClass{huawei}[2021/05/24 0.3.0 Template for Huawei documents]
+
\newif\ifnosecurity
\DeclareOption{nosecurity}{\nosecuritytrue}
\newif\ifnobrand
\DeclareOption{nobrand}{\nobrandtrue}
\newif\ifnodate
\DeclareOption{nodate}{\nodatetrue}
+\newif\ifnocover
+\DeclareOption{nocover}{\nocovertrue}
\newif\ifnopaging
\DeclareOption{nopaging}{\nopagingtrue}
\newif\iflandscape
@@ -35,7 +38,9 @@
\newif\ifanonymous
\DeclareOption{anonymous}{\anonymoustrue}
\ProcessOptions\relax
+
\LoadClass[12pt]{article}
+
\RequirePackage{geometry}
\iflandscape
\geometry{paperwidth=16in, paperheight=9in, left=4in, right=2in, top=1.5in, bottom=1.5in}
@@ -269,6 +274,11 @@
\fi
\vspace*{0.5in}
\maketitle
+ \iflandscape\ifnocover\else
+ \begin{textblock}{14}[1,1](14,14)
+ \raggedleft\includegraphics[height=3.6in]{images/huawei-cover.pdf}
+ \end{textblock}
+ \fi\fi
}
\newcommand\PrintLastPage{
diff --git a/macros/latex/contrib/huawei/huawei.pdf b/macros/latex/contrib/huawei/huawei.pdf
index 0c4cfd48e1..a5a50cb96c 100644
--- a/macros/latex/contrib/huawei/huawei.pdf
+++ b/macros/latex/contrib/huawei/huawei.pdf
Binary files differ
diff --git a/macros/latex/contrib/huawei/huawei.tex b/macros/latex/contrib/huawei/huawei.tex
index dc2d76e5cf..dc9904a0d4 100644
--- a/macros/latex/contrib/huawei/huawei.tex
+++ b/macros/latex/contrib/huawei/huawei.tex
@@ -1,3 +1,25 @@
+% (The MIT License)
+%
+% Copyright (c) 2021 Yegor Bugayenko
+%
+% Permission is hereby granted, free of charge, to any person obtaining a copy
+% of this software and associated documentation files (the 'Software'), to deal
+% in the Software without restriction, including without limitation the rights
+% to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+% copies of the Software, and to permit persons to whom the Software is
+% furnished to do so, subject to the following conditions:
+%
+% The above copyright notice and this permission notice shall be included in all
+% copies or substantial portions of the Software.
+%
+% THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+% IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+% FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+% AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+% LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+% OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+% SOFTWARE.
+
\documentclass[nobrand,nosecurity]{./huawei}
\renewcommand*\thetitle{\LaTeX{} Class \ff{huawei}}
\renewcommand*\thesubtitle{User's Guide}
@@ -5,9 +27,9 @@
\begin{document}
\maketitle
-\ff{Version: 0.2.0}
+\ff{Version: 0.3.0}
\newline
-\ff{Date: 13/05/2021}
+\ff{Date: 2021/05/24}
\section{Overview}
@@ -74,6 +96,10 @@ the layout of your document:
\href{https://en.wikipedia.org/wiki/Paper_size}{A4}),
making it perfect for presentations.
+\ff{nocover}
+ avoid printing the cover images on the first page by the
+ \ff{\textbackslash{}PrintTitlePage} command.
+
\ff{anonymous}
removes the name of the author everywhere, including the bottom
of the page, where the author's name stays next to the name of the
@@ -199,7 +225,7 @@ Here goes the second column content.
\end{document}
\end{minted}
-A more complete example is in the\ff{samples/charter.tex}.
+A more complete example is in the \ff{samples/huawei-charter.tex}.
\subsection{Crumbs}
@@ -220,6 +246,6 @@ we recommend you to use ``crumbs'':
\end{document}
\end{minted}
-A more complete example is in the\ff{samples/charter.tex}.
+A more complete example is in the \ff{samples/huawei-charter.tex}.
\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/huawei/images/huawei-cover.pdf b/macros/latex/contrib/huawei/images/huawei-cover.pdf
new file mode 100644
index 0000000000..6717a9ff35
--- /dev/null
+++ b/macros/latex/contrib/huawei/images/huawei-cover.pdf
Binary files differ
diff --git a/macros/latex/contrib/huawei/samples/huawei-cfp.tex b/macros/latex/contrib/huawei/samples/huawei-cfp.tex
new file mode 100644
index 0000000000..7668137254
--- /dev/null
+++ b/macros/latex/contrib/huawei/samples/huawei-cfp.tex
@@ -0,0 +1,53 @@
+% (The MIT License)
+%
+% Copyright (c) 2021 Yegor Bugayenko
+%
+% Permission is hereby granted, free of charge, to any person obtaining a copy
+% of this software and associated documentation files (the 'Software'), to deal
+% in the Software without restriction, including without limitation the rights
+% to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+% copies of the Software, and to permit persons to whom the Software is
+% furnished to do so, subject to the following conditions:
+%
+% The above copyright notice and this permission notice shall be included in all
+% copies or substantial portions of the Software.
+%
+% THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+% IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+% FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+% AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+% LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+% OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+% SOFTWARE.
+
+\documentclass[nobrand,nosecurity,anonymous,nopaging]{../huawei}
+\renewcommand*\thetitle{Test Call for Proposal}
+\renewcommand*\theauthor{Yegor Bugayenko}
+\addbibresource{main.bib}
+\begin{document}
+
+\maketitle
+
+In this document you don't see the logo, because we use \ff{nobrand}
+option of the class:
+
+\begin{minted}{text}
+\documentclass[nobrand]{huawei}
+\begin{document}
+The rest of the document...
+\end{document}
+\end{minted}
+
+By the way, we use \TeX{} created by~\citet{knuth1984texbook}
+and \LaTeX{} created by~\citet{lamport1994latex}. The citations
+provided at the bottom of the document are printed via
+\ff{\textbackslash{}PrintBibliography}.
+
+The text in small font at the bottom of the page is printed by
+the \ff{\textbackslash{}PrintDisclaimer} command.
+
+\PrintDisclaimer
+
+\PrintBibliography
+
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/huawei/samples/huawei-charter.tex b/macros/latex/contrib/huawei/samples/huawei-charter.tex
new file mode 100644
index 0000000000..0cbc02b9d2
--- /dev/null
+++ b/macros/latex/contrib/huawei/samples/huawei-charter.tex
@@ -0,0 +1,67 @@
+% (The MIT License)
+%
+% Copyright (c) 2021 Yegor Bugayenko
+%
+% Permission is hereby granted, free of charge, to any person obtaining a copy
+% of this software and associated documentation files (the 'Software'), to deal
+% in the Software without restriction, including without limitation the rights
+% to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+% copies of the Software, and to permit persons to whom the Software is
+% furnished to do so, subject to the following conditions:
+%
+% The above copyright notice and this permission notice shall be included in all
+% copies or substantial portions of the Software.
+%
+% THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+% IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+% FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+% AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+% LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+% OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+% SOFTWARE.
+
+\documentclass[landscape,nocover]{../huawei}
+\renewcommand*\thetitle{Test Charter}
+\renewcommand*\thesubtitle{Technology Project Charter}
+\renewcommand*\theauthor{Yegor Bugayenko}
+\begin{document}
+
+\PrintFirstPage{}
+
+\newpage
+\section*{Project Details}
+\begin{multicols}{2}
+\raggedright
+\crumb{Author and Project Manager}{\theauthor / \theid}
+
+\crumb{Project Name}{Making Compression 15\% Faster}
+
+\crumb{Technical Adviser}{Jeff Lebowski, 00112233}
+
+\crumb{Cooperation Manager}{Walter Sobchak, 00889977}
+
+\crumb{Budget}{\$99,999}
+
+\crumb{Duration}{8 months}
+
+\crumb{Export Control}{No}
+
+\crumb{AI Technology Involved}{No}
+
+\crumb{Hardware Supply}{No}
+
+\end{multicols}
+
+\newpage
+\begin{multicols}{2}
+\section*{Objectives}
+The main objective of the project is to win the war
+against poverty in the world.
+\columnbreak
+\section*{Novelty}
+The idea of this project is very new and breakthrough.
+\end{multicols}
+
+\PrintLastPage
+
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/lwarp/README.txt b/macros/latex/contrib/lwarp/README.txt
index bf13a2f01a..62aa9f2f2f 100644
--- a/macros/latex/contrib/lwarp/README.txt
+++ b/macros/latex/contrib/lwarp/README.txt
@@ -1,5 +1,5 @@
-LaTeX lwarp package v0.896 README.txt
+LaTeX lwarp package v0.897 README.txt
Files included are:
diff --git a/macros/latex/contrib/lwarp/lwarp.dtx b/macros/latex/contrib/lwarp/lwarp.dtx
index bcd587f552..b326554a47 100644
--- a/macros/latex/contrib/lwarp/lwarp.dtx
+++ b/macros/latex/contrib/lwarp/lwarp.dtx
@@ -16,7 +16,7 @@
% \iffalse
%<package>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
%<package>\ProvidesPackage{lwarp}
-%<package> [2021/04/08 v0.896 Allows LaTeX to directly produce HTML5 output.]
+%<package> [2021/05/24 v0.897 Allows LaTeX to directly produce HTML5 output.]
%
%<*driver>
\documentclass{ltxdoc}
@@ -1696,7 +1696,29 @@ It is recommended to use \pkg{cleveref} instead of \pkg{ntheorem}'s
}
\newcommand{\limitsgraphics}{%
-\limitsincludegraphicsscale
+Per \cref{tab:includegraphicsfilenames},
+image filenames may be specified either with or without an extension.
+\trouble[case sensitive]{image>not displayed}
+\trouble{image>extension case}
+\trouble{filename>image extension}
+\gindex{image>file names}
+\gindex{graphics>file names}
+\gindex{includegraphics=\cs{includegraphics}>file names}
+\gindex{filename>graphics}
+\gindex{filename>images}
+If an extension is given it will be used as-is, for either print or \HTML\ output.
+If no extension is given, a list of possible extensions is tried, which depends
+on whether print or \HTML\ is being generated. This allows a \PDF\ file for
+print and a \SVG\ file for \HTML, for example.
+If no extension is given, the automatic search will only return lowercase extensions,
+even if the filename actually has an uppercase extension, and \pkg{lwarp} cannot
+get around this problem, so image file extensions must be lowercase
+to be seen by the \HTML\ browser with \pkg{lwarp}.
+For example, name the image file \filenm{image.pdf} instead of \filenm{image.PDF},
+but refer to it in the source as \filenm{image}, without an extension.
+For images which may be used as-is with either print or \HTML, such as \JPG\ or \PNG,
+you may use a capitalized extension if it is specified in the source, such as
+\filenm{image.JPG}.
For \cs{includegraphics} with \filenm{.pdf} or \filenm{.eps} files,
\gindex{graphics>file formats}
@@ -1805,6 +1827,8 @@ Likewise, the \cs{includegraphics} \optn{alt} key adds an \HTML\ \attribute{alt}
an image, and is ignored for print output. If not assigned, each
image is given an \attribute{alt} tag according to \cs{ImageAltText}.
+\limitsincludegraphicsscale
+
\cs{rotatebox} accepts the optional \optn{origin} key.
\margintag{\cs{rotatebox}}
@@ -2807,6 +2831,14 @@ a virtual 6-inch wide minipage, which then corrupts the \optn{lw} option.)
}
\newcommand{\limitssiunitx}{%
+\pkg{sunitx} v3 is not yet supported. For now, specify version 2:
+\trouble[v3 not yet!]{siunitx=\pkg{siunitx}>v3}
+\begin{sourcedisplay}
+\cs{usepackage}\{siunitx\}\textred{[=v2]}
+\end{sourcedisplay}
+This may be also be necessary before loading other packages which also use \pkg{siunitx},
+such as \pkg{chemmacros}.
+
Due to \prog{pdftotext} limitations, fraction output is replaced by symbol
\margintag{fractions}
output for \optn{per-mode} and \optn{quotient-mode}.
@@ -2969,6 +3001,11 @@ it will be necessary to move the todo outside of the caption.
External layouts (\cs{fxloadlayouts}) are not supported.
\trouble[external layouts]{fixme=\pkg{fixme}}
+Customized layouts are overwritten by \pkg{lwarp}'s versions \cs{AtBeginDocument}
+in order to provide the \HTML\ conversion. If creating a new layout, see
+\pkg{lwarp}'s changes to provide similar for the new layout,
+inside a \env{warpHTML} environment.
+
User control is provided for setting the \HTML\ styling of the ``faces''.
The defaults are as follows, and may be changed in the preamble after
\pkg{fixme} is loaded:
@@ -3061,7 +3098,7 @@ This boolean may be tested by the user for later use.
%<*package>
% \fi
%
-% \CheckSum{54091}
+% \CheckSum{54242}
%
% \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
@@ -3199,6 +3236,7 @@ This boolean may be tested by the user for later use.
% \changes{v0.894}{2020/12/24}{\ 2020/12/24}
% \changes{v0.895}{2021/02/18}{\ 2021/02/18}
% \changes{v0.896}{2021/04/08}{\ 2021/04/08}
+% \changes{v0.897}{2021/05/24}{\ 2021/05/24}
@@ -3422,6 +3460,22 @@ This boolean may be tested by the user for later use.
%
% \begin{description}
% \needspace{2\baselineskip}
+% \item[v0.897:] \pkg{siunitx} rollback.
+% \begin{itemize}
+% \item Added a table of file extensions to use with \cs{includegraphics}.
+% See \cref{tab:includegraphicsfilenames}.
+% \margintag{docs}
+% \item Added tests for additional incompatible packages.
+% \margintag{core}
+% \item \pkg{siunitx}: Supports rollback to v2. Does not yet support v3.
+% \margintag{packages}
+% \item \pkg{fixme}: Improved to work if the user modifies layouts.
+% \item \pkg{float}: Improved integration with \pkg{newfloat}, \pkg{keyfloat}.
+% \item Added \pkg{centerlastline}, \pkg{decorule}, \pkg{fancypar},
+% \pkg{froufrou}, \pkg{pbalance}.
+% \item Verified works as-is with \pkg{fnpct}.
+% \end{itemize}
+% \needspace{2\baselineskip}
% \item[v0.896:] Back references, accessibility.
% \begin{itemize}
% \item \textred{Due to changes in cross referencing, \watchout
@@ -5579,9 +5633,10 @@ This boolean may be tested by the user for later use.
% \midrule
%
% Page layout: & \ipkg{2in1}, \ipkg{2up}, \ipkg{a4}, \ipkg{a4wide}, \ipkg{a5comb},
-% \ipkg{addlines}, \ipkg{anysize}, \mpkg{atbegshi},
-% \ipkg{blowup}, \ipkg{booklet}, \ipkg{bophook}, \ipkg{bounddvi}, \ipkg{bxpapersize},
-% \ipkg{canoniclayout}, \mpkg{changelayout},
+% \ipkg{addlines}, \ipkg{anysize}, \mpkg{atbegshi}, \ipkg{balance},
+% \ipkg{blowup}, \ipkg{booklet}, \ipkg{bophook}, \ipkg{bounddvi},
+% \ipkg{bxpapersize},
+% \ipkg{canoniclayout}, \ipkg{centerlastline}, \mpkg{changelayout},
% \epkg{changepage}, \ipkg{chngpage}, \ipkg{clrdblpg},
% \ipkg{continue}, \ipkg{draftcopy}, \ipkg{draftfigure}, \ipkg{draftwatermark},
% \ipkg{ebook}, \ipkg{everyshi},
@@ -5592,6 +5647,7 @@ This boolean may be tested by the user for later use.
% \ipkg{layaureo}, \ipkg{layout}, \ipkg{layouts}, \ipkg{leading}, \ipkg{lscape},
% \ipkg{ltxgrid}, \ipkg{nccfancyhdr}, \ipkg{notespages}, \ipkg{nowidow},
% \ipkg{pagegrid}, \ipkg{pagesel}, \epkg{parallel}, \epkg{parcolumns},
+% \ipkg{pbalance},
% \ipkg{pdfcolparallel}, \ipkg{pdfcolparcolumns}, \ipkg{pdfcrypt},
% \ipkg{pdflscape}, \ipkg{pdfprivacy},
% \ipkg{preview}, \epkg{ragged2e}, \ipkg{returntogrid}, \ipkg{rmpage},
@@ -5608,7 +5664,8 @@ This boolean may be tested by the user for later use.
% Sectioning: & Adds \progcode{FileDepth} for splitting the \HTML\ output.
% Files may be numbered sequentially or named according to section name.
% Common short words and punctuation are removed from the filenames.
-% \epkg{anonchap}, \ipkg{bsheaders}, \ipkg{fncychap}, \epkg{hypbmsec},
+% \epkg{anonchap}, \ipkg{bsheaders}, \mpkg{decorule}, \ipkg{fncychap},
+% \mpkg{froufrou}, \epkg{hypbmsec},
% \epkg{indentfirst}, \epkg{quotchap},
% \ipkg{section}, \mpkg{sectionbreak}, \spkg{secdot}, \ipkg{sectsty},
% \ipkg{titlesec}, \spkg{tocvsec2}.
@@ -5662,7 +5719,7 @@ This boolean may be tested by the user for later use.
% \brand{MathJax} emulation for \cs{footnote}, and also as marked in the following:
% \epkg{bigfoot}, \ipkg{dblfnote},
% \ipkg{endheads}, \mpkg{endnotes}\ejax, \mpkg{enotez}\ejax, \spkg{fixfoot},
-% \ipkg{fnbreak}, \ipkg{fnpara}, \ipkg{fnpos},
+% \ipkg{fnbreak}, \ipkg{fnpara}, \spkg{fnpct}, \ipkg{fnpos},
% \epkg{footmisc}, \mpkg{footnote}, \ipkg{footnotebackref},
% \mpkg{footnoterange}, \ipkg{footnpag}, \epkg{manyfoot},
% \epkg{marginnote}\ejax, \spkg{nccfoots}\ejax, \spkg{pagenote}\ejax,
@@ -5794,8 +5851,9 @@ This boolean may be tested by the user for later use.
%
% Environments: & Standard \LaTeX{} environments. \\
%
-% \env{minipage}, \cs{parbox}: & Some \HTMLfive-imposed limitations.
-% Nested minipages are supported. \mpkg{eqparbox}, \mpkg{minibox}, \epkg{pbox},
+% Paragraphs, \env{minipage}, \cs{parbox}: & Some \HTMLfive-imposed limitations.
+% Nested minipages are supported. \mpkg{eqparbox}, \mpkg{fancypar},
+% \mpkg{minibox}, \epkg{pbox},
% \ipkg{shapepar}. \\
%
% Quotations: & \epkg{copyrightbox}, \spkg{csquotes}, \epkg{epigraph},
@@ -10439,6 +10497,34 @@ This boolean may be tested by the user for later use.
%
% \DescribePackage{graphics}%
% \DescribePackage{graphicx}%
+%
+% \begin{table}
+% \caption{\cs{includegraphics} and file names}
+% \label{tab:includegraphicsfilenames}
+% \begin{center}
+% \begin{threeparttable}
+% \begin{tabular}{ccl}
+% \toprule
+% Print image file & \HTML\ image file & Command to use \\
+% \midrule
+% \filenm{image.pdf}\tnote{a} & \filenm{image.svg}\tnote{a} & |\includegraphics{image}| \\
+% \filenm{image.eps}\tnote{a} & \filenm{image.svg}\tnote{a} & |\includegraphics{image}| \\
+% \filenm{image.jpg} & ---\tnote{b} & |\includegraphics{image}| \\
+% \filenm{image.png} & ---\tnote{b} & |\includegraphics{image}| \\
+% \filenm{image.JPG} & ---\tnote{b} & |\includegraphics{image.JPG}|\tnote{c} \\
+% \filenm{image.PNG} & ---\tnote{b} & |\includegraphics{image.PNG}|\tnote{c} \\
+% \filenm{image.jpg} & \filenm{image.gif} & |\includegraphics{image}| \\
+% \bottomrule
+% \end{tabular}
+% \begin{tablenotes}
+% \item[a:] Must be a lowercase file extension.
+% \item[b:] The same file is used for print and \HTML.
+% \item[c:] The uppercase extension must be specified.
+% \end{tablenotes}
+% \end{threeparttable}
+% \end{center}
+% \end{table}
+%
% \limitsgraphics
%
%
@@ -12698,16 +12784,16 @@ This boolean may be tested by the user for later use.
% \begin{macro}{\LWR@checkloadbefore}
-% \marg{thispackagename} \marg{packagename}
+% \marg{packagename}
%
-% If package names match, error if it is loaded after \pkg{lwarp}.
+% Given \cs{LWR@tempone} is the package name to compare to,
+% if package names match, error if it is loaded after \pkg{lwarp}.
%
% \changes{v0.63}{2018/12/02}{Added.}
%
% \begin{macrocode}
-\newcommand*{\LWR@checkloadbefore}[2]{%
- \edef\LWR@tempone{#1}%
- \ifdefstring{\LWR@tempone}{#2}{%
+\newcommand*{\LWR@checkloadbefore}[1]{%
+ \ifdefstring{\LWR@tempone}{#1}{%
\LWR@loadbefore{#1}%
}{}%
}
@@ -12718,41 +12804,51 @@ This boolean may be tested by the user for later use.
% \begin{macro}{\LWR@loadnever} \marg{badpackagename} \marg{replacementpkgnames}
%
% The first packages is not supported, so tell the user to use the second instead.
+% Factored from \cs{LWR@checkloadnever} and \cs{LWR@earlyloadnever}.
%
% \changes{v0.25}{2017/03/16}{Added the ability to prevent conflicting packages.}
+% \changes{v0.897}{2021/05/08}{Replacements now optional.}
%
% \begin{macrocode}
\newcommand*{\LWR@loadnever}[2]{%
\PackageError{lwarp}
{%
- Package #1 is not supported\MessageBreak
- by lwarp's HTML conversion.\MessageBreak
- Package(s)\MessageBreak
- \space\space#2\MessageBreak
- may be useful instead%
+ Package #1 is not yet supported\MessageBreak
+ by lwarp's HTML conversion%
+ \ifblank{#2}{}{%
+ .\MessageBreak
+ Package(s)\MessageBreak
+ \space\space#2\MessageBreak
+ may be useful instead%
+ }%
}
{%
Package #1 might conflict with lwarp in some way,\MessageBreak
- or is superceded by another package.\MessageBreak
- For a possible alternative, see package(s) #2.
+ or is superceded by another package.%
+ \ifblank{#2}{}{%
+ \MessageBreak
+ For possible alternatives, see package(s) #2.%
+ }%
}
}
% \end{macrocode}
% \end{macro}
%
%
-% \begin{macro}{\LWR@checkloadnever}
-% \marg{thispackagename} \marg{badpackagename} \marg{replacementpkgnames}
%
-% If this package name is the bad packagename, suggest the replacements instead.
+% \begin{macro}{\LWR@afterloadnever}
+% \marg{badpackagename} \marg{replacementpkgnames}
+%
+% Given: \cs{LWR@tempone} is set to the package name being tested against,
+% if this package name is the bad packagename, suggest the replacements instead.
+% This is used when loading packages after \pkg{lwarp}.
%
-% \changes{v0.63}{2018/12/01}{Added.}
+% \changes{v0.897}{2021/05/08}{Refactored.}
%
% \begin{macrocode}
-\newcommand*{\LWR@checkloadnever}[3]{%
- \edef\LWR@tempone{#1}%
- \ifdefstring{\LWR@tempone}{#2}{%
- \LWR@loadnever{#2}{#3}%
+\newcommand*{\LWR@afterloadnever}[2]{%
+ \ifdefstring{\LWR@tempone}{#1}{%
+ \LWR@loadnever{#1}{#2}%
}{}%
}
% \end{macrocode}
@@ -12762,10 +12858,10 @@ This boolean may be tested by the user for later use.
% \begin{macro}{\LWR@earlyloadnever} \marg{badpackagename} \marg{replacementpkgname}
%
% The first package is not supported, so tell the user to use the second instead.
-% This version checks immediately for packages which may have been loaded before \pkg{lwarp}.
+% This version checks immediately for packages which
+% may have been loaded before \pkg{lwarp}.
%
-% \changes{v0.54}{2018/04/06}{Added.}
-% \changes{v0.79}{2020/01/09}{Factored.}
+% \changes{v0.897}{2021/05/08}{Refactored.}
%
% \begin{macrocode}
\newcommand*{\LWR@earlyloadnever}[2]{%
@@ -12783,6 +12879,7 @@ This boolean may be tested by the user for later use.
% This version checks immediately for classes which may have been loaded before \pkg{lwarp}.
%
% \changes{v0.63}{2018/11/25}{Added.}
+% \changes{v0.897}{2021/05/08}{Replacements now optional.}
%
% \begin{macrocode}
\newcommand*{\LWR@earlyclassloadnever}[2]{%
@@ -12790,13 +12887,19 @@ This boolean may be tested by the user for later use.
\PackageError{lwarp}
{%
Class #1 is not supported\MessageBreak
- by lwarp's HTML conversion.\MessageBreak
- Class(es) #2 may be useful instead
+ by lwarp's HTML conversion%
+ \ifblank{#2}{}{%
+ .\MessageBreak
+ Class(es) #2 may be useful instead%
+ }%
}
{%
Class #1 might conflict with lwarp in some way,\MessageBreak
- or is superceded by another class.\MessageBreak
- For a possible alternative, see class(es) #2.
+ or is superceded by another class.%
+ \ifblank{#2}{}{%
+ \MessageBreak
+ For a possible alternative, see class(es) #2.%
+ }%
}
}{\relax}%
}
@@ -12805,6 +12908,7 @@ This boolean may be tested by the user for later use.
%
%
% \subsection{Error for disallowed packages and classes loaded before lwarp}
+%
% \changes{v0.54}{2018/04/06}{Added early check for disallowed packages.}
% \changes{v0.54}{2018/09/26}{Never load \pkg{aecompl}.}
% \changes{v0.62}{2018/11/18}{Added early checks for \pkg{CJK}, \pkg{CJKutf8}.}
@@ -12820,60 +12924,188 @@ This boolean may be tested by the user for later use.
% \changes{v0.893}{2020/11/15}{Allowed \pkg{picinpar}.}
% \changes{v0.895}{2021/01/19}{Allowed \pkg{epsf}.}
%
+%
+% \begin{macro}{\LWR@checkloadnevers}
+% Checks against a list of incompatible packages.
+%
+% \changes{v0.897}{2021/05/08}{Refactored.}
+%
% ^^A *earlyloadnever *loadnever
% \begin{macrocode}
-\LWR@earlyclassloadnever{jarticle}{ujarticle}
-\LWR@earlyclassloadnever{jbook}{ujbook}
-\LWR@earlyclassloadnever{jreport}{ujreport}
-\LWR@earlyclassloadnever{tarticle}{utarticle}
-\LWR@earlyclassloadnever{tbook}{utbook}
-\LWR@earlyclassloadnever{treport}{utreport}
-\LWR@earlyloadnever{ae}{cm-super, lmodern}
-\LWR@earlyloadnever{aecompl}{cm-super, lmodern}
-\LWR@earlyloadnever{aecc}{cm-super, lmodern}
-\LWR@earlyloadnever{alg}{algorithm2e, algorithmicx}
-\LWR@earlyloadnever{algorithmic}{algorithm2e, algorithmicx}
-\LWR@earlyloadnever{bitfield}{bytefield}
-\LWR@earlyloadnever{caption2}{caption}
-% \LWR@earlyloadnever{ccaption}{caption}% might be preloaded by memoir
-\LWR@earlyloadnever{colortab}{colortbl}
-\LWR@earlyloadnever{csvtools}{datatool}
-\LWR@earlyloadnever{doublespace}{setspace}
-\LWR@earlyloadnever{fancyheadings}{fancyhdr}
-\LWR@earlyloadnever{fncylab}{cleveref}
-\LWR@earlyloadnever{formula}{siunitx}
-\LWR@earlyloadnever{glossary}{glossaries}
-\LWR@earlyloadnever{hyper}{hyperref}
-\LWR@earlyloadnever{libgreek}{libertinust1math, newtx}
-\LWR@earlyloadnever{newthm}{ntheorem}
-\LWR@earlyloadnever{pdfcprot}{microtype}
-\LWR@earlyloadnever{picins}{floatflt, wrapfig}
-\LWR@earlyloadnever{rplain}{fancyhdr}
-\LWR@earlyloadnever{si}{siunitx}
-\LWR@earlyloadnever{sistyle}{siunitx}
-\LWR@earlyloadnever{slashbox}{diagbox}
-\LWR@earlyloadnever{statex}{statex2}
-\LWR@earlyloadnever{t1enc}{fontenc, inputenc, inputenx}
-\LWR@earlyloadnever{ucs}{inputenc, inputencx}
-\LWR@earlyloadnever{wasysym}{textcomp, amssymb, amsfonts, mnsymbol, fdsymbol}
+\newcommand*{\LWR@checkloadnevers}{
+\LWR@checkloadnever{ae}{cm-super, lmodern}
+\LWR@checkloadnever{aecompl}{cm-super, lmodern}
+\LWR@checkloadnever{aecc}{cm-super, lmodern}
+\LWR@checkloadnever{alg}{algorithm2e, algorithmicx}
+\LWR@checkloadnever{algorithmic}{algorithm2e, algorithmicx}
+\LWR@checkloadnever{bitfield}{bytefield}
% \end{macrocode}
-% The older \pkg{CJK} and \pkg{CJKutf8} only work with \pkg{xeCJK}:
+% \pkg{bxcjkatype} is based on \pkg{CJK}:
% \begin{macrocode}
-\@ifpackageloaded{xeCJK}{}{
- \LWR@earlyloadnever{CJK}{ctex, xeCJK}
- \LWR@earlyloadnever{CJKutf8}{ctex, xeCJK}
-}
+\LWR@checkloadnever{bxcjkjatype}{upLaTeX, bxjsarticle, ujarticle, utarticle}
% \end{macrocode}
-% \pkg{bxcjkatype} is based on \pkg{CJK}:
% \begin{macrocode}
-\LWR@earlyloadnever{bxcjkjatype}{upLaTeX, bxjsarticle, ujarticle, utarticle}
+\LWR@checkloadnever{caption2}{caption}
+% \LWR@checkloadnever{ccaption}{caption}% might be preloaded by memoir
+\LWR@checkloadnever{colortab}{colortbl}
+\LWR@checkloadnever{csvtools}{datatool}
+\LWR@checkloadnever{doublespace}{setspace}
+\LWR@checkloadnever{fancyheadings}{fancyhdr}
+\LWR@checkloadnever{fncylab}{cleveref}
+\LWR@checkloadnever{formula}{siunitx}
+\LWR@checkloadnever{glossary}{glossaries}
% \end{macrocode}
% \pkg{hangul} is not in TeXLive, and is not tested:
% \begin{macrocode}
-\LWR@earlyloadnever{hangul}{kotex, xetexko, luatexko}
+\LWR@checkloadnever{hangul}{kotex, xetexko, luatexko}
+% \end{macrocode}
+% \begin{macrocode}
+\LWR@checkloadnever{hyper}{hyperref}
+\LWR@checkloadnever{libgreek}{libertinust1math, newtx}
+\LWR@checkloadnever{newthm}{ntheorem}
+\LWR@checkloadnever{pdfcprot}{microtype}
+\LWR@checkloadnever{picins}{floatflt, wrapfig}
+\LWR@checkloadnever{rplain}{fancyhdr}
+\LWR@checkloadnever{si}{siunitx}
+\LWR@checkloadnever{sistyle}{siunitx}
+\LWR@checkloadnever{slashbox}{diagbox}
+\LWR@checkloadnever{statex}{statex2}
+\LWR@checkloadnever{t1enc}{fontenc, inputenc, inputenx}
+\LWR@checkloadnever{ucs}{inputenc, inputencx}
+\LWR@checkloadnever{wasysym}{textcomp, amssymb, amsfonts, mnsymbol, fdsymbol}
+% \end{macrocode}
+%
+% The following may one day be supported by lwarp:
+%
+% ^^A *notyet
+% \begin{macrocode}
+% \LWR@checkloadnever{adjustbox}{}% req'd for menukeys
+\LWR@checkloadnever{animate}{}
+\LWR@checkloadnever{auto-pst-pdf}{}
+\LWR@checkloadnever{auto-pst-pdf-lua}{}
+\LWR@checkloadnever{algorithms}{}
+\LWR@checkloadnever{arraycols}{}
+\LWR@checkloadnever{beamer}{}
+\LWR@checkloadnever{bidi}{}
+\LWR@checkloadnever{cals}{}
+\LWR@checkloadnever{cellspace}{}
+\LWR@checkloadnever{cgloss4e}{}
+\LWR@checkloadnever{colophon}{}
+\LWR@checkloadnever{cooltooltips}{}
+\LWR@checkloadnever{covington}{}
+\LWR@checkloadnever{crbox}{}
+\LWR@checkloadnever{decision-table}{}
+\LWR@checkloadnever{dvgloss}{}
+\LWR@checkloadnever{ednotes}{}
+\LWR@checkloadnever{edfnotes}{}
+\LWR@checkloadnever{eledform}{}
+\LWR@checkloadnever{eledmac}{}
+\LWR@checkloadnever{embedfile}{}
+\LWR@checkloadnever{endnotes-hy}{endnotes}
+\LWR@checkloadnever{expex}{}
+\LWR@checkloadnever{fancytooltips}{}
+\LWR@checkloadnever{fixocgx}{}
+\LWR@checkloadnever{flowfram}{}
+\LWR@checkloadnever{gb4e}{}
+\LWR@checkloadnever{gmverse}{}
+\LWR@checkloadnever{graphbox}{}
+\LWR@checkloadnever{graphicxbox}{}
+\LWR@checkloadnever{hvfloat}{}
+\LWR@checkloadnever{inline-images}{}
+\LWR@checkloadnever{isorot}{rotating}
+\LWR@checkloadnever{ledmac}{}
+\LWR@checkloadnever{linguex}{}
+\LWR@checkloadnever{longdiv}{}
+\LWR@checkloadnever{longfigure}{}
+\LWR@checkloadnever{longtabu}{}
+\LWR@checkloadnever{mdwenv}{}
+\LWR@checkloadnever{mdwlist}{}
+\LWR@checkloadnever{mdwtab}{}
+\LWR@checkloadnever{navigator}{}
+\LWR@checkloadnever{nccpic}{}
+\LWR@checkloadnever{nccsect}{}
+\LWR@checkloadnever{newvbtm}{}
+\LWR@checkloadnever{ocg-p}{}
+\LWR@checkloadnever{ocgtools}{}
+\LWR@checkloadnever{ocgx}{}
+\LWR@checkloadnever{ocgx2}{}
+\LWR@checkloadnever{parrun}{}
+\LWR@checkloadnever{poemscol}{}
+\LWR@checkloadnever{poetry}{}
+\LWR@checkloadnever{program}{}
+\LWR@checkloadnever{proofread}{}
+\LWR@checkloadnever{pst-pdf}{}
+\LWR@checkloadnever{refstyle}{}
+\LWR@checkloadnever{robustindex}{}
+\LWR@checkloadnever{robustglossary}{}
+\LWR@checkloadnever{semioneside}{}
+\LWR@checkloadnever{slemph}{}
+\LWR@checkloadnever{snotez}{sidenotes}
+\LWR@checkloadnever{spacingtricks}{}
+\LWR@checkloadnever{sverb}{verbatim, fancyvrb}
+\LWR@checkloadnever{syntax}{}
+\LWR@checkloadnever{tablists}{}
+\LWR@checkloadnever{tabto}{}
+\LWR@checkloadnever{tabu}{}
+\LWR@checkloadnever{tabularht}{}
+\LWR@checkloadnever{tabularkv}{}
+\LWR@checkloadnever{thumby}{}
+\LWR@checkloadnever{titles}{}
+\LWR@checkloadnever{typehtml}{}
+\LWR@checkloadnever{unicode-bidi}{}
+\LWR@checkloadnever{vcell}{}
+\LWR@checkloadnever{xhfill}{}
+}
+% \end{macrocode}
+% \end{macro}
+%
+%
+% \begin{macro}{\LWR@checkloadnever} \marg{badpackagename} \marg{replacementpkgname}
+%
+% The first package is not supported, so tell the user to use the second instead.
+%
+% When \pkg{lwarp} is first loaded, this is set to \cs{LWR@earlyloadnever}
+% to check for incompatible packages which were loaded before \pkg{lwarp}.
+% After \pkg{lwarp} is loaded, this is changed to \cs{LWR@afterloadnever} to
+% check for incompatible packages during \cs{usepackage}.
+%
+% \changes{v0.897}{2021/05/08}{Refactored.}
+%
+% \begin{macrocode}
+\LetLtxMacro\LWR@checkloadnever\LWR@earlyloadnever
+% \end{macrocode}
+% \end{macro}
+%
+%
+% Now check for incompatible packages which have been loaded before \pkg{lwarp}:
+% \begin{macrocode}
+\LWR@checkloadnevers
+% \end{macrocode}
+%
+%
+% The older \pkg{CJK} and \pkg{CJKutf8} only work with \pkg{xeCJK}:
+% \begin{macrocode}
+\@ifpackageloaded{xeCJK}{}{
+ \LWR@checkloadnever{CJK}{ctex, xeCJK}
+ \LWR@checkloadnever{CJKutf8}{ctex, xeCJK}
+}
+% \end{macrocode}
+%
+%
+% Some classes do not work with \pkg{lwarp}:
+% \begin{macrocode}
+\LWR@earlyclassloadnever{jarticle}{ujarticle}
+\LWR@earlyclassloadnever{jbook}{ujbook}
+\LWR@earlyclassloadnever{jreport}{ujreport}
+\LWR@earlyclassloadnever{tarticle}{utarticle}
+\LWR@earlyclassloadnever{tbook}{utbook}
+\LWR@earlyclassloadnever{treport}{utreport}
+\LWR@earlyclassloadnever{novel}{}
+\LWR@earlyclassloadnever{powerdot}{}
% \end{macrocode}
%
%
+%
% \subsection{Enforcing package loading after \pkg{lwarp}}
%
% Packages which should only be loaded after \pkg{lwarp} are tested
@@ -12961,6 +13193,7 @@ This boolean may be tested by the user for later use.
\LWR@loadafter{cases}
% catoptions is supported by the lwarp core
% \LWR@loadafter{ccaption}% may be preloaded by memoir
+\LWR@loadafter{centerlastline}
% \LWR@loadafter{centernot}% may be preloaded by newtx
\LWR@loadafter{changebar}
\LWR@loadafter{changelayout}
@@ -12995,6 +13228,7 @@ This boolean may be tested by the user for later use.
\LWR@loadafter{dblfnote}
\LWR@notmemoirloadafter{dcolumn}
\LWR@loadafter{decimal}
+\LWR@loadafter{decorule}
\LWR@loadafter{diagbox}
\LWR@loadafter{dingbat}
\LWR@loadafter{DotArrow}
@@ -13036,6 +13270,7 @@ This boolean may be tested by the user for later use.
\LWR@loadafter{extramarks}
\LWR@loadafter{fancybox}
\LWR@loadafter{fancyhdr}
+\LWR@loadafter{fancypar}
\LWR@loadafter{fancyref}
\LWR@loadafter{fancytabs}
\LWR@loadafter{fancyvrb}
@@ -13076,6 +13311,7 @@ This boolean may be tested by the user for later use.
\LWR@loadafter{fouridx}
% fourier may be loaded before lwarp
\LWR@loadafter{framed}
+\LWR@loadafter{froufrou}
\LWR@loadafter{ftcap}
\LWR@loadafter{ftnright}
\LWR@loadafter{fullminipage}
@@ -13240,6 +13476,7 @@ This boolean may be tested by the user for later use.
\LWR@loadafter{parcolumns}
\LWR@loadafter{parnotes}
\LWR@notmemoirloadafter{parskip}
+\LWR@loadafter{pbalance}
\LWR@loadafter{pbox}
\LWR@loadafter{pdfcol}
\LWR@loadafter{pdfcolfoot}
@@ -13330,6 +13567,7 @@ This boolean may be tested by the user for later use.
\LWR@loadafter{simplebnf}
\LWR@loadafter{SIunits}
\LWR@loadafter{siunitx}
+\LWR@loadafter{siunitx-v2}
\LWR@loadafter{skmath}
\LWR@loadafter{slantsc}
\LWR@loadafter{slashed}
@@ -15514,6 +15752,10 @@ This boolean may be tested by the user for later use.
% \section{Loading packages}
%
%
+% \cs{RequirePackage} and \cs{usepackage} are modified to error-check
+% for certain packages, and for \HTML\ they load the \pkg{lwarp-} version if
+% it exists.
+%
% \codeall
% \begin{macrocode}
\begin{warpall}
@@ -15566,10 +15808,18 @@ This boolean may be tested by the user for later use.
}
% \end{macrocode}
% \end{macro}
-%
-
-
-
+%
+%
+% \begin{macro}{\LWR@checkloadnever} \marg{bad package name} \marg{replacement package names}
+%
+% From now on, check for incompatible packages loaded via \cs{usepackage},
+% instead of packages loaded before \pkg{lwarp}:
+% \begin{macrocode}
+\LetLtxMacro\LWR@checkloadnever\LWR@afterloadnever
+% \end{macrocode}
+% \end{macro}
+%
+%
% \begin{macro}{\LWR@checkloadfilename} \marg{filename}
% Checks if this filename should be loaded after \pkg{lwarp},
% or never at all.
@@ -15589,65 +15839,48 @@ This boolean may be tested by the user for later use.
% \changes{v0.893}{2020/11/15}{Allowed \pkg{picinpar}.}
% \changes{v0.895}{2021/01/19}{Allowed \pkg{epsf}.}
-% The following should never be loaded:
%
-% ^^A *checkload *loadnever
+% ^^A *checkload
% \begin{macrocode}
\newcommand*{\LWR@checkloadfilename}[1]{%
-\LWR@checkloadnever{#1}{ae}{cm-super, lmodern}
-\LWR@checkloadnever{#1}{aecc}{cm-super, lmodern}
-\LWR@checkloadnever{#1}{aecompl}{cm-super, lmodern}
-\LWR@checkloadnever{#1}{alg}{algorithm2e, algorithmicx}
-\LWR@checkloadnever{#1}{algorithmic}{algorithm2e, algorithmicx}
-\LWR@checkloadnever{#1}{bitfield}{bytefield}
-\LWR@checkloadnever{#1}{caption2}{caption}
-\LWR@checkloadnever{#1}{ccaption}{caption}% might be preloaded by memoir
-\LWR@checkloadnever{#1}{colortab}{colortbl}
-\LWR@checkloadnever{#1}{csvtools}{datatool}
-\LWR@checkloadnever{#1}{doublespace}{setspace}
-\LWR@checkloadnever{#1}{fancyheadings}{fancyhdr}
-\LWR@checkloadnever{#1}{fncylab}{cleveref}
-\LWR@checkloadnever{#1}{formula}{siunitx}
-\LWR@checkloadnever{#1}{glossary}{glossaries}
-\LWR@checkloadnever{#1}{hyper}{hyperref}
-\LWR@checkloadnever{#1}{libgreek}{libertinust1math, newtx}
-\LWR@checkloadnever{#1}{newthm}{ntheorem}
-\LWR@checkloadnever{#1}{pdfcprot}{microtype}
-\LWR@checkloadnever{#1}{picins}{floatflt, wrapfig}
-\LWR@checkloadnever{#1}{rplain}{fancyhdr}
-\LWR@checkloadnever{#1}{si}{siunitx}
-\LWR@checkloadnever{#1}{sistyle}{siunitx}
-\LWR@checkloadnever{#1}{slashbox}{diagbox}
-\LWR@checkloadnever{#1}{statex}{statex2}
-\LWR@checkloadnever{#1}{t1enc}{fontenc, inputenc, inputenx}
-\LWR@checkloadnever{#1}{ucs}{inputenc, inputencx}
-\LWR@checkloadnever{#1}{wasysym}{textcomp, amssymb, amsfonts, mnsymbol, fdsymbol}
-\LWR@checkloadnever{#1}{bxcjkjatype}{upLaTeX, bxjsarticle, ujarticle, utarticle}
-\LWR@checkloadnever{#1}{hangul}{kotex, xetexko, luatexko}
% \end{macrocode}
%
+% Remember the package name to compare with, to be used
+% by \cs{LWR@checkloadnever} and \cs{LWR@checkloadbefore}.
+% \begin{macrocode}
+ \edef\LWR@tempone{#1}%
+% \end{macrocode}
+%
+% Check against the list of packages which should never be loaded:
+%
+% \changes{v0.897}{2021/05/08}{Refactored.}
+% \begin{macrocode}
+ \LWR@checkloadnevers
+% \end{macrocode}
+%
+%
% ^^A *loadbefore
% The following should only be loaded before \pkg{lwarp}:
% \changes{v0.895}{2021/01/14}{\pkg{kpfonts} load before \pkg{lwarp}.}
% \begin{macrocode}
-\LWR@checkloadbefore{#1}{ctex}
-\LWR@checkloadbefore{#1}{fontspec}
-\LWR@checkloadbefore{#1}{inputenc}
-\LWR@checkloadbefore{#1}{inputenx}
-\LWR@checkloadbefore{#1}{nfssext-cfr}
-\LWR@checkloadbefore{#1}{fontaxes}
-\LWR@checkloadbefore{#1}{kotex}
-\LWR@checkloadbefore{#1}{kpfonts}% textcomp option clash
-\LWR@checkloadbefore{#1}{luatexja}
-\LWR@checkloadbefore{#1}{luatexja-fontspec}
-\LWR@checkloadbefore{#1}{luatexko}
-\LWR@checkloadbefore{#1}{morewrites}
-\LWR@checkloadbefore{#1}{newclude}
-\LWR@checkloadbefore{#1}{newunicodechar}
-\LWR@checkloadbefore{#1}{plext}
-\LWR@checkloadbefore{#1}{xeCJK}
-\LWR@checkloadbefore{#1}{xetexko}
-\LWR@checkloadbefore{#1}{zxjatype}
+ \LWR@checkloadbefore{ctex}
+ \LWR@checkloadbefore{fontspec}
+ \LWR@checkloadbefore{inputenc}
+ \LWR@checkloadbefore{inputenx}
+ \LWR@checkloadbefore{nfssext-cfr}
+ \LWR@checkloadbefore{fontaxes}
+ \LWR@checkloadbefore{kotex}
+ \LWR@checkloadbefore{kpfonts}% textcomp option clash
+ \LWR@checkloadbefore{luatexja}
+ \LWR@checkloadbefore{luatexja-fontspec}
+ \LWR@checkloadbefore{luatexko}
+ \LWR@checkloadbefore{morewrites}
+ \LWR@checkloadbefore{newclude}
+ \LWR@checkloadbefore{newunicodechar}
+ \LWR@checkloadbefore{plext}
+ \LWR@checkloadbefore{xeCJK}
+ \LWR@checkloadbefore{xetexko}
+ \LWR@checkloadbefore{zxjatype}
}
% \end{macrocode}
% \end{macro}
@@ -15772,16 +16005,17 @@ This boolean may be tested by the user for later use.
% Error if braces are used in optional argument.
% This can cause an error, so tell how to avoid.
% \changes{v0.896}{2021/03/14}{Warn if package option has braces.}
+% \changes{v0.897}{2021/05/08}{Fixed warning.}
% \begin{macrocode}
\IfSubStr{\detokenize\expandafter{#1}}{\LWRleftbrace}%
{%
\PackageError{lwarp}{%
You used:\MessageBreak
- \protect\requirepackage[#1]{#2}\MessageBreak
+ \protect\usepackage[#1]{#2}\MessageBreak
Braces in the package options will fail with Lwarp.\MessageBreak
Instead, use:\MessageBreak
\protect\PassOptionsToPackage{#1}{#2}\MessageBreak
- \protect\requirepackage{#2}\MessageBreak
+ \protect\usepackage{#2}\MessageBreak
near the line number given below.\MessageBreak
Enter 'h' for more info%
}%
@@ -20280,7 +20514,7 @@ MathJax = {
-- Copyright 2016-2021 Brian Dunn
-printversion = "v0.896"
+printversion = "v0.897"
requiredconfversion = "2" -- also at *lwarpmk.conf
function printhelp ()
@@ -33774,7 +34008,7 @@ end -- not --version
-% \begin{macro}{\LWR@href} \oarg{options} \marg{URL}
+% \begin{macro}{\LWR@href} \oarg{options} \marg{URL} \marg{text}
%
% Create a link with accompanying text:
%
@@ -34741,19 +34975,22 @@ end -- not --version
% \end{macro}
-% \subsection{High-level \TOC\ commands}
+% \subsection{\TOC\ commands}
% \label{sec:listof}
-% \begin{macro}{\listof} \marg{type} \marg{title}
+% \begin{macro}{\LWR@listof} \marg{type} \marg{title}
%
-% Emulate the \cs{listof} command from the \pkg{float} package (\cref{sec:newfloat}).
+% Emulate the \cs{listof} command
+% from the \pkg{float} package (\cref{sec:float}).
% Used to create lists of custom float types. Also used to redefine
-% the standard \LaTeX{} \cs{listoffigures} and \cs{listoftables} commands.
+% the standard \LaTeX{} \cs{listoffigures} and \cs{listoftables} commands,
+% and in \pkg{tocloft} and \pkg{memoir}.
%
% \changes{v0.57}{2018/05/26}{Fix: Provide \cs{l@name} if not defined.}
% \changes{v0.61}{2018/09/26}{Fix: \pkg{newfloat} lists.}
+% \changes{v0.897}{2021/05/18}{Improved compatibility with \pkg{newfloat}, \pkg{keyfloat}.}
% \begin{macrocode}
-\NewDocumentCommand{\listof}{m +m}{%
+\NewDocumentCommand{\LWR@listof}{m +m}{%
\@ifundefined{l@#1}{%
\csdef{l@#1}##1##2{\hypertocfloat{1}{#1}{\@nameuse{ext@#1}}{##1}{##2}}%
}{}%
@@ -38876,6 +39113,7 @@ end -- not --version
% Options for siunitx:
% \changes{v0.50}{2018/02/24}{\pkg{siunitx}: Improved units.}
+% \changes{v0.897}{2021/05/23}{\pkg{siunitx}: Rollback for v2.}
% \begin{macrocode}
\newrobustcmd{\LWR@siunitx@textcelsius}{\HTMLentity{deg}C}
\newrobustcmd{\LWR@siunitx@textdegree}{\HTMLentity{deg}}
@@ -38898,7 +39136,7 @@ end -- not --version
text-degree = {\LWR@siunitx@textdegree},
text-arcminute = {\LWR@siunitx@textprime} ,
text-arcsecond = {\LWR@siunitx@textdblprime} ,
-}{siunitx}
+}{siunitx-v2}
% \end{macrocode}
% \begin{macrocode}
@@ -41819,7 +42057,7 @@ color:\LWR@origpound\LWR@tempcolor%
% \changes{v0.45}{2017/12/03}{\pkg{memoir}: Added.}
% \changes{v0.84}{2020/03/31}{\pkg{memoir}: Preloads \pkg{xcolor}.}
%
-% \codeall
+% \codeprint
% \begin{macrocode}
\begin{warpprint}
\@ifclassloaded{memoir}{\LWR@origRequirePackage{xcolor}}{}
@@ -47789,6 +48027,34 @@ s%
%
%
%
+% \iffalse
+%<*centerlastline>
+% \fi
+%
+% \part{lwarp-centerlastline.sty}
+%
+% \section{centerlastline}
+%
+% \DescribePackage{centerlastline}
+% \pkg{centerlastline} is ignored.
+%
+% \changes{v0.897}{2021/04/18}{\pkg{centerlastline}: Added.}
+%
+% \codehtml
+%
+% \begin{macrocode}
+\LWR@ProvidesPackageDrop{centerlastline}[2020/10/12]
+% \end{macrocode}
+%
+% \begin{macrocode}
+\providecommand{\centerlastline}{}
+\def\endcenterlastline{\par}
+% \end{macrocode}
+%
+% \iffalse
+%</centerlastline>
+% \fi
+%
%
% \iffalse
%<*centernot>
@@ -51391,6 +51657,45 @@ name = \chemmacros_translate:n {scheme-name}
%
%
% \iffalse
+%<*decorule>
+% \fi
+%
+% \part{lwarp-decorule.sty}
+%
+% \section{decorule}
+%
+% \credits{Peter Flynn}
+%
+% \DescribePackage{decorule}
+% \pkg{decorule} is patched for use by \pkg{lwarp}.
+%
+% \changes{v0.897}{2021/05/02}{\pkg{decorule}: Added.}
+%
+% \codehtml
+%
+% \begin{macrocode}
+\LWR@ProvidesPackagePass{decorule}[2020/04/01]
+% \end{macrocode}
+%
+% \begin{macrocode}
+\xpretocmd{\decorule}
+ {\begin{lateximage}*[decorule]}
+ {}
+ {\LWR@patcherror{decorule}{decorule A}}
+
+\xapptocmd{\decorule}
+ {\end{lateximage}}
+ {}
+ {\LWR@patcherror{decorule}{decorule B}}
+% \end{macrocode}
+%
+% \iffalse
+%</decorule>
+% \fi
+%
+%
+%
+% \iffalse
%<*diagbox>
% \fi
%
@@ -54276,6 +54581,96 @@ name = \chemmacros_translate:n {scheme-name}
%
%
% \iffalse
+%<*fancypar>
+% \fi
+%
+% \part{lwarp-fancypar.sty}
+%
+% \section{fancypar}
+%
+% \credits{Gonzalo Medina}
+%
+% \DescribePackage{fancypar}
+% \pkg{fancypar} is used as-is for print output,
+% and emulated for \HTML.
+%
+% \cs{NotebookPar} and related are used as-is inside a \env{lateximage},
+% \trouble[\CSS\ classes]{fancypar=\pkg{fancypar}}
+% but for \HTML\ these are emulated as a \element{div} of
+% class \attribute{NotebookPar}, etc.
+% For \HTML, the package options and the macro optional arguments are ignored.
+% The user must provide custom \CSS\ for each if visual effects are required.
+% See \cref{sec:csscustomization}.
+%
+% If using a custom paragraph style,
+% \trouble[custom styles]{fancypar=\pkg{fancypar}}
+% such as \cs{MyStylePar} from the documentation,
+% use the following to generate an \HTML\ \element{div} of class \attribute{MyStylePar}:
+% \begin{sourceverb}
+% ... (existing definiton of \MyStylePar, print version) ...
+% \begin{warpHTML}
+% \AddFancyparClass{MyStyle}
+% \end{warpHTML}
+% \end{sourceverb}
+% \cs{MyStylePar} is then modified to emulate \HTML.
+% An optional argument is allowed, which is ignored.
+%
+% \changes{v0.897}{2021/05/02}{\pkg{fancypar}: Added.}
+%
+% \codehtml
+%
+% \begin{macrocode}
+\LWR@ProvidesPackagePass{fancypar}[2019/01/18]
+% \end{macrocode}
+%
+% \begin{macrocode}
+\begin{warpHTML}
+\makeatletter
+
+\newcommand{\LWR@fancypar}[2]{%
+ \begin{BlockClass}{#1Par}
+ #2
+ \end{BlockClass}
+}
+
+\newcommand{\LWR@HTML@NotebookPar}[2][]{\LWR@fancypar{Notebook}{#2}}
+\LWR@formatted{NotebookPar}
+
+\newcommand{\LWR@HTML@ZebraPar}[2][]{\LWR@fancypar{Zebra}{#2}}
+\LWR@formatted{ZebraPar}
+
+\newcommand{\LWR@HTML@DashedPar}[2][]{\LWR@fancypar{Dashed}{#2}}
+\LWR@formatted{DashedPar}
+
+\newcommand{\LWR@HTML@MarkedPar}[2][]{\LWR@fancypar{Marked}{#2}}
+\LWR@formatted{MarkedPar}
+
+\newcommand{\LWR@HTML@UnderlinedPar}[2][]{\LWR@fancypar{Underlined}{#2}}
+\LWR@formatted{UnderlinedPar}
+
+
+\newcommand{\LWR@HTML@add@fancy@format}{}
+\LWR@formatted{add@fancy@format}
+
+
+\newcommand{\AddFancyparClass}[1]{%
+ \expandafter\newcommand\csname LWR@HTML@#1Par\endcsname[2][]{%
+ \LWR@fancypar{#1}{##2}%
+ }
+ \LWR@formatted{#1Par}
+}
+
+\makeatother
+\end{warpHTML}
+% \end{macrocode}
+%
+% \iffalse
+%</fancypar>
+% \fi
+%
+%
+%
+% \iffalse
%<*fancyref>
% \fi
%
@@ -55210,7 +55605,7 @@ solid {\FancyVerbRuleColor{\LWR@origpound\LWR@tempcolor}} ; % space
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackagePass{fixme}[2017/03/05]
+\LWR@ProvidesPackagePass{fixme}[2019/01/03]
% \end{macrocode}
%
% Restore \pkg{lwarp}'s version of \cs{@wrindex},
@@ -55231,35 +55626,41 @@ solid {\FancyVerbRuleColor{\LWR@origpound\LWR@tempcolor}} ; % space
}
% \end{macrocode}
%
-% Other modifications:
+% Other modifications.
+% Done \cs{AtBeginDocument} to hopefully work if the user customizes the layouts.
+% \changes{v0.897}{2021/04/19}{\pkg{fixme}: Modified \cs{AtBeginDocument}.}
% \begin{macrocode}
+\AtBeginDocument{
+
\def\FXFaceInlineHTMLStyle{font-weight:bold}
-\renewcommand*\FXLayoutInline[3]{ %
-\InlineClass[\FXFaceInlineHTMLStyle]{fixmeinline}%
- {\@fxtextstd{#1}{#2}{#3}}%
+\renewcommand*\FXLayoutInline[3]{ % space
+ \InlineClass[\FXFaceInlineHTMLStyle]{fixmeinline}%
+ {\@fxtextstd{#1}{#2}{#3}}%
}
\def\FXFaceEnvHTMLStyle{font-weight:bold}
\renewcommand*\FXEnvLayoutPlainBegin[2]{%
-\BlockClass[\FXFaceEnvHTMLStyle]{fixmebold}
-\ignorespaces#2 \fxnotename{#1}: \ignorespaces}
+ \BlockClass[\FXFaceEnvHTMLStyle]{fixmebold}
+ \ignorespaces#2 \fxnotename{#1}: \ignorespaces%
+}
\renewcommand*\FXEnvLayoutPlainEnd[2]{\endBlockClass}
\renewcommand*\FXEnvLayoutSignatureBegin[2]{%
-\BlockClass[\FXFaceEnvHTMLStyle]{fixmebold}
-\fxnotename{#1}: \ignorespaces}
+ \BlockClass[\FXFaceEnvHTMLStyle]{fixmebold}
+ \fxnotename{#1}: \ignorespaces%
+}
\renewcommand*\FXEnvLayoutSignatureEnd[2]{\@fxsignature{#2}\endBlockClass}
\def\FXFaceSignatureHTMLStyle{font-style:italic}
\DeclareRobustCommand*\@fxsignature[1]{%
-\ifthenelse{\equal{#1}{}}%
- {}%
- { -- {\InlineClass[\FXFaceSignatureHTMLStyle]{fixmesignature}{#1}}}%
+ \ifthenelse{\equal{#1}{}}%
+ {}%
+ { -- {\InlineClass[\FXFaceSignatureHTMLStyle]{fixmesignature}{#1}}}%
}
@@ -55268,6 +55669,8 @@ solid {\FancyVerbRuleColor{\LWR@origpound\LWR@tempcolor}} ; % space
\renewcommand\FXTargetLayoutPlain[2]{%
\InlineClass[\FXFaceTargetHTMLStyle]{fixmetarget}{#2}%
}
+
+}% \AtBeginDocument
% \end{macrocode}
% \iffalse
@@ -55410,6 +55813,10 @@ solid {\FancyVerbRuleColor{\LWR@origpound\LWR@tempcolor}} ; % space
% |boxed|, or |ruled|, so \CSS\ may be used to format by float style as well.
% Default formatting by \CSS\ is provided for |ruled| and |boxed| styles.
%
+% Always declare a \cs{newfloat} before modifying it with \cs{floatname}, etc.
+% \trouble[not seem to be a floating environment]{float>not seem to be a floating environment}
+% \trouble{float=\pkg{float}}
+%
% \changes{v0.20}{2017/01/22}{\pkg{float}: Improved float caption type handling.}
%
% \codehtml
@@ -55417,8 +55824,9 @@ solid {\FancyVerbRuleColor{\LWR@origpound\LWR@tempcolor}} ; % space
\LWR@ProvidesPackageDrop{float}[2001/11/08]
% \end{macrocode}
+
% \begin{macro}{\LWR@floatstyle}
-% The default float style:
+% The default float style.
% \begin{macrocode}
\newcommand*{\LWR@floatstyle}{plain}
% \end{macrocode}
@@ -55437,11 +55845,13 @@ solid {\FancyVerbRuleColor{\LWR@origpound\LWR@tempcolor}} ; % space
{\DeclareFloatingEnvironment[fileext=#3,within=#4]{#1}}%
{\DeclareFloatingEnvironment[fileext=#3]{#1}}%
% \end{macrocode}
+%
% Remember the float style:
% \changes{v0.57}{2018/05/14}{\pkg{float}: Added float styles.}
% \begin{macrocode}
\csedef{LWR@floatstyle@#1}{\LWR@floatstyle}%
% \end{macrocode}
+%
% \pkg{newfloat} package automatically creates the \cs{listof} command
% for new floats, but \pkg{float} does not,
% so remove \cs{listof} here in case it is manually created later.
@@ -55449,6 +55859,7 @@ solid {\FancyVerbRuleColor{\LWR@origpound\LWR@tempcolor}} ; % space
\cslet{listof#1s}\relax%
\cslet{listof#1es}\relax%
% \end{macrocode}
+%
% Likesize, \pkg{newfloat} also creates \cs{l@<type>}, but \pkg{float} does not,
% so remove it here:
% \changes{v0.57}{2018/05/26}{\pkg{float}: Fix: Do not pre-define \cs{l@name}.}
@@ -55474,6 +55885,7 @@ solid {\FancyVerbRuleColor{\LWR@origpound\LWR@tempcolor}} ; % space
% \end{macrocode}
% \end{noindmacro}
+
% \begin{noindmacro}{\floatplacement} \marg{type} \marg{placement}
%
% Float placement is ignored.
@@ -55484,16 +55896,18 @@ solid {\FancyVerbRuleColor{\LWR@origpound\LWR@tempcolor}} ; % space
% \end{macrocode}
% \end{noindmacro}
+
% \begin{noindmacro}{\floatstyle} \marg{style}
%
% Remember the style for future floats:
% \begin{macrocode}
\newcommand{\floatstyle}[1]{%
\def\LWR@floatstyle{#1}%
-}
+}%
% \end{macrocode}
% \end{noindmacro}
+
% \begin{noindmacro}{\restylefloat} * \marg{type}
%
% Remember the style for this float:
@@ -55504,8 +55918,13 @@ solid {\FancyVerbRuleColor{\LWR@origpound\LWR@tempcolor}} ; % space
% \end{macrocode}
% \end{noindmacro}
+
% \begin{noindmacro}{\listof}
-% See \cref{sec:listof} for the \cs{listof} command in the \pkg{lwarp} core.
+% See \cref{sec:listof} for the \cs{LWR@listof} command in the \pkg{lwarp} core.
+% \changes{v0.897}{2021/05/18}{\pkg{float}: Improved compatibility with \pkg{newfloat}, \pkg{keyfloat}.}
+% \begin{macrocode}
+\newcommand{\listof}{\LWR@listof}
+% \end{macrocode}
% \end{noindmacro}
% \iffalse
@@ -57119,6 +57538,54 @@ solid {\FancyVerbRuleColor{\LWR@origpound\LWR@tempcolor}} ; % space
%
%
%
+% \iffalse
+%<*froufrou>
+% \fi
+%
+% \part{lwarp-froufrou.sty}
+%
+% \section{froufrou}
+%
+% \credits{Nelson Lago}
+%
+% \DescribePackage{froufrou}
+% \pkg{froufrou} is patched for use by \pkg{lwarp}.
+%
+% \changes{v0.897}{2021/05/02}{\pkg{froufrou}: Added.}
+%
+% \codehtml
+%
+% \begin{macrocode}
+\LWR@ProvidesPackagePass{froufrou}[2020/12/22]
+% \end{macrocode}
+%
+% \begin{macrocode}
+\ExplSyntaxOn
+\xpretocmd{\setfroufrou}
+ {\edef\LWR@latestfroufrou{\detokenize{#1}}}
+ {}
+ {\LWR@patcherror{froufrou}{setfroufrou}}
+\ExplSyntaxOff
+
+\xpatchcmd{\@realfroufrou}
+ {\@froufrouOrnament}
+ {%
+ \begin{center}
+ \begin{lateximage}*[froufrou][\LWR@latestfroufrou]%
+ \@froufrouOrnament%
+ \end{lateximage}
+ \end{center}
+ }
+ {}
+ {\LWR@patcherror{froufrou}{@realfroufrou}}
+% \end{macrocode}
+%
+% \iffalse
+%</froufrou>
+% \fi
+%
+%
+%
%
% \iffalse
%<*ftcap>
@@ -58429,9 +58896,9 @@ solid {\FancyVerbRuleColor{\LWR@origpound\LWR@tempcolor}} ; % space
% \begin{noindmacro}{\LWR@includegraphicsb} * \oarg{2: options} \oarg{3: options} \marg{4: filename}
%
-% \pkg{graphics} syntax is \cs{includegraphics} * \oarg{llx,lly} \oarg{urx,ury} \marg{file}
+% \pkg{graphics} syntax is \cs{includegraphics} * \oarg{llx,lly} \oarg{urx,ury} \marg{filename}
%
-% \pkg{graphicx} syntax is \cs{includegraphics} \oarg{key values} \marg{file}
+% \pkg{graphicx} syntax is \cs{includegraphics} \oarg{key values} \marg{filename}
%
% If |#3| is empty, only one optional argument was given, thus \pkg{graphicx} syntax.
%
@@ -58507,6 +58974,10 @@ solid {\FancyVerbRuleColor{\LWR@origpound\LWR@tempcolor}} ; % space
%
% Fully expand and detokenize the filename,
% changing the file extension to \filenm{.svg} if necessary.
+%
+% Note that uppercase file extensions are detected and reported as lowercase,
+% so \pkg{lwarp} can only report to the browser lowercase extensions,
+% so all images must have lowercase file extensions.
% \changes{v0.59}{2018/08/28}{\pkg{graphics}: Fix: Expand filename.}
% \changes{v0.61}{2018/10/01}{\pkg{graphics}: Set keys before using filename, for \pkg{epsfig}.}
% \begin{macrocode}
@@ -71852,6 +72323,36 @@ do not attempt to patch lwarp's version of `nameref'.)\MessageBreak
%
%
%
+% \iffalse
+%<*pbalance>
+% \fi
+%
+% \part{lwarp-pbalance.sty}
+%
+% \section{pbalance}
+%
+% \DescribePackage{pbalance}
+% \pkg{pbalance} is ignored.
+%
+% \changes{v0.897}{2021/04/18}{\pkg{pbalance}: Added.}
+%
+% \codehtml
+%
+% \begin{macrocode}
+\RequirePackage{balance}
+
+\LWR@ProvidesPackageDrop{pbalance}[2020/12/16]
+% \end{macrocode}
+%
+% \begin{macrocode}
+\newcommand\shrinkLastPage[1]{}
+% \end{macrocode}
+%
+% \iffalse
+%</pbalance>
+% \fi
+%
+%
%
%
% \iffalse
@@ -77113,7 +77614,64 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
% \credits{Joseph Wright}
%
% \DescribePackage{siunitx}
-% \pkg{siunitx} is patched for use by \pkg{lwarp},
+% \pkg{siunitx-v2} is patched for use by \pkg{lwarp},
+% and is emulated for \brand{MathJax}.
+% Use as:
+% \begin{sourceverb}
+% \usepackage{siunitx}[=v2]
+% \end{sourceverb}
+%
+% \pkg{siunitx} v3 is not yet supported.
+%
+% ^^A \limitssiunitx
+%
+% \changes{v0.897}{2021/05/23}{\pkg{siunitx}: Rollback for v2.}
+%
+% \codehtml
+%
+% \begin{macrocode}
+\providecommand\DeclareRelease[3]{}
+\providecommand\DeclareCurrentRelease[2]{}
+
+\DeclareRelease{2}{2010-05-23}{lwarp-siunitx-v2.sty}
+\DeclareRelease{v2}{2010-05-23}{lwarp-siunitx-v2.sty}
+\DeclareCurrentRelease{}{2021-05-17}
+
+\PackageWarningNoLine{lwarp}
+ {%
+ **************\MessageBreak
+ Siunitx version 3 is not yet supported by Lwarp.\MessageBreak
+ V2 emulation is used here.\MessageBreak
+ **************
+ }
+
+\RequirePackage{xcolor}% for \convertcolorspec
+
+% \LWR@ProvidesPackagePass{siunitx}[2021-05-21]
+
+\RequirePackage{siunitx-v2}
+% \end{macrocode}
+
+% \iffalse
+%</siunitx>
+% \fi
+%
+%
+%
+%
+%
+% \iffalse
+%<*siunitx-v2>
+% \fi
+%
+% \part{lwarp-siunitx-v2.sty}
+
+% \section{siunitx-v2}
+%
+% \credits{Joseph Wright}
+%
+% \DescribePackage{siunitx-v2}
+% \pkg{siunitx-v2} is patched for use by \pkg{lwarp},
% and is emulated for \brand{MathJax}.
%
% \limitssiunitx
@@ -77122,24 +77680,25 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
% \changes{v0.37}{2017/08/17}{\pkg{siunitx}: Improved symbol support.}
% \changes{v0.38}{2017/08/26}{\pkg{siunitx}: Removed from \pkg{lwarp} core.}
% \changes{v0.50}{2018/10/23}{\pkg{siunitx}: Fix: Loads \pkg{xcolor}.}
+% \changes{v0.897}{2021/05/23}{\pkg{siunitx-v2}: Rollback for v2.}
%
% \codehtml
%
% \begin{macrocode}
\RequirePackage{xcolor}% for \convertcolorspec
-\LWR@ProvidesPackagePass{siunitx}[2018/05/17]
+\LWR@ProvidesPackagePass{siunitx-v2}[2021-04-17]
% \end{macrocode}
% \changes{v0.50}{2018/02/24}{\pkg{siunitx}: Improved units.}
% \begin{macrocode}
\AtBeginDocument{% in case textcomp was not loaded
-\DeclareSIUnit\bohr{\textit{a}\textsubscript{0}}
-\DeclareSIUnit\clight{\textit{c}\textsubscript{0}}
-\DeclareSIUnit\elementarycharge{\textit{e}}
-\DeclareSIUnit\electronmass{\textit{m}\textsubscript{e}}
-\DeclareSIUnit\hartree{\textit{E}\textsubscript{h}}
-\DeclareSIUnit\planckbar{\LWR@siunitx@textplanckbar}
+ \DeclareSIUnit\bohr{\textit{a}\textsubscript{0}}
+ \DeclareSIUnit\clight{\textit{c}\textsubscript{0}}
+ \DeclareSIUnit\elementarycharge{\textit{e}}
+ \DeclareSIUnit\electronmass{\textit{m}\textsubscript{e}}
+ \DeclareSIUnit\hartree{\textit{E}\textsubscript{h}}
+ \DeclareSIUnit\planckbar{\LWR@siunitx@textplanckbar}
}% AtBeginDocument
% \end{macrocode}
%
@@ -77158,44 +77717,53 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
% Modified to set set \HTML\ \cs{textcolor} if not black:
% \changes{v0.48}{2018/02/14}{\pkg{siunitx}: Improved color output.}
% \begin{macrocode}
-\cs_undefine:N \__siunitx_print_aux:
-\cs_new_protected:Npn \__siunitx_print_aux:
+\cs_set_protected:Npn \__siunitx_print_aux:
{
\text
{
\__siunitx_ensure_ltr:n
{
- \color@begingroup
+% \end{macrocode}
+% \cs{color@endgroup} was adding a paragraph break, so use a regular group instead.
+% \changes{v0.897}{2021/05/23}{\pkg{siunitx-v2}: Regular group instead of color group.}
+% \begin{macrocode}
+% \color@begingroup
+ \begingroup% lwarp
+%
\__siunitx_print_color:
\__siunitx_font_shape:
\__siunitx_font_weight:
\use:c
{
- @@_ \l__siunitx_print_type_tl _
+ __siunitx_ \l__siunitx_print_type_tl _
text \l__siunitx_font_family_tl :
}
- \bool_if:NTF \l__siunitx_font_math_mode_bool
- { \__siunitx_print_math: }
- {
- \LWR@findcurrenttextcolor% lwarp
- \ifdefstring{\LWR@tempcolor}{000000}% lwarp
- {\__siunitx_print_text:}% lwarp
- {% lwarp
- \LWR@textcurrentcolor{% lwarp
- \__siunitx_print_text:
- }% lwarp
- }% lwarp
- }
- \color@endgroup
+% \end{macrocode}
+% \changes{v0.897}{2021/05/23}{\pkg{siunitx-v2}: Do not use math mode.}
+% \begin{macrocode}
+% \bool_if:NTF \l__siunitx_font_math_mode_bool
+% {
+% \__siunitx_print_math:
+% }
+ {
+ \LWR@findcurrenttextcolor% lwarp
+ \ifdefstring{\LWR@tempcolor}{000000}% lwarp
+ {\__siunitx_print_text:}% lwarp
+ {% lwarp
+ \LWR@textcurrentcolor{% lwarp
+ \__siunitx_print_text:
+ }% lwarp
+ }% lwarp
+ }
+% \color@endgroup
+ \endgroup% lwarp
+%
}
}
}
-
-\cs_undefine:N \__siunitx_set_math_fam:n
-\cs_new_protected:Npn \__siunitx_set_math_fam:n #1 {
- \int_new:c { c__siunitx_math #1 _int }
- \group_begin:% lwarp
+\cs_set_protected:Npn \__siunitx_set_math_fam:n #1 {
+ \group_begin:
\LetLtxMacro\@ensuredmath\LWR@origensuredmath% lwarp
\LetLtxMacro\mbox\LWR@print@mbox% lwarp
\hbox_set:Nn \l__siunitx_tmp_box
@@ -77204,15 +77772,15 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
{
\use:c { math #1 }
{
- \int_gset:cn { c__siunitx_math #1 _int } { \fam }
+ \int_const:cn { c__siunitx_math #1 _int } { \fam }
}
}
}
- \group_end:% lwarp
+ \group_end:
}
-\cs_undefine:N \__siunitx_combined_output:n
-\cs_new_protected:Npn \__siunitx_combined_output:n #1 {
+\cs_set_protected:Npn \__siunitx_combined_output:n #1 {
+%
\group_begin:% lwarp
\LetLtxMacro\@ensuredmath\LWR@origensuredmath% lwarp
\LetLtxMacro\mbox\LWR@print@mbox% lwarp
@@ -77243,10 +77811,12 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
\endgroup% lwarp
\__siunitx_unit_output_print:
}
- \group_end:% lwarp
+ \group_end:% lwarp
+%
}
% \end{macrocode}
%
+%
% For |parse-numbers=false|:
% \changes{v0.79}{2020/01/21}{\pkg{siunitx}: Improved \brand{MathJax}.}
% \begin{macrocode}
@@ -77269,7 +77839,7 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
\LWR@subsingledollar{% lwarp
\textbackslash( \LWR@HTMLsanitize{#1} \textbackslash)% lwarp
}{siunitx}{%
- \__siunitx_print:nn { number } {
+ \__siunitx_print:nn { number } {%
\LWR@origensuredmath{#1}%
} % lwarp
}% lwarp
@@ -77294,7 +77864,7 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
}{siunitx}{%
\__siunitx_print:nn { number } {
\LWR@origensuredmath{#1}%
- } % lwarp
+ }% lwarp
}% lwarp
\endgroup% lwarp
\__siunitx_unit_output_print:
@@ -77302,11 +77872,11 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
}
%
% \end{macrocode}
+%
% For quotients, the fraction code is replaced by the symbol code:
% \changes{v0.48}{2018/02/14}{\pkg{siunitx}: Changes fraction to symbol.}
% \begin{macrocode}
-\cs_undefine:N \__siunitx_number_output_quotient_fraction:
-\cs_new_protected:Npn \__siunitx_number_output_quotient_fraction: {
+\cs_set_protected:Npn \__siunitx_number_output_quotient_fraction: {
\bool_set_true:N \l__siunitx_number_compound_bool
\__siunitx_number_output_quotient_aux_i:
\tl_set_eq:NN \l__siunitx_number_out_tl
@@ -77317,11 +77887,11 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
\__siunitx_number_output_single_aux:
}
% \end{macrocode}
+%
% For units, the fraction code is replaced by the symbol code:
% \changes{v0.48}{2018/02/14}{\pkg{siunitx}: Changes fraction to symbol.}
% \begin{macrocode}
-\cs_undefine:N \__siunitx_unit_format_fraction_fraction:
-\cs_new_protected:Npn \__siunitx_unit_format_fraction_fraction: {
+\cs_set_protected:Npn \__siunitx_unit_format_fraction_fraction: {
\__siunitx_unit_format_fraction_symbol_aux:
\int_compare:nNnT { \l__siunitx_unit_denominator_int } > { 1 }
{
@@ -77336,10 +77906,10 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
\tl_put_right:NV \l__siunitx_unit_tl \l__siunitx_unit_denominator_tl
}
% \end{macrocode}
+%
% \changes{v0.50}{2018/02/24}{\pkg{siunitx}: Improved units.}
% \begin{macrocode}
-\cs_undefine:N \__siunitx_angle_print_astronomy_aux:
-\cs_new_protected:Npn \__siunitx_angle_print_astronomy_aux: {
+\cs_set_protected:Npn \__siunitx_angle_print_astronomy_aux: {
\prop_get:NnNT \l__siunitx_number_out_prop { mantissa-integer }
\l__siunitx_tmpa_tl
{ \__siunitx_print:nV { number } \l__siunitx_tmpa_tl }
@@ -77378,8 +77948,7 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
%
% \changes{v0.79}{2020/01/20}{\pkg{siunitx}: Fix: \cs{square}, \cs{cubed}.}
% \begin{macrocode}
-\cs_undefine:N \__siunitx_textsuperscript:n
-\cs_new_protected:Npn \__siunitx_textsuperscript:n #1 {\textsuperscript{#1}}
+\cs_set_protected:Npn \__siunitx_textsuperscript:n #1 {\textsuperscript{#1}}
% \end{macrocode}
%
% \begin{noindmacro}{\num} \oarg{options} \marg{value}
@@ -77447,6 +78016,7 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
% \end{macrocode}
% \end{noindmacro}
%
+%
% \begin{noindmacro}{\SIrange} \oarg{options} \marg{value1} \marg{value2} \marg{unit}
% \begin{macrocode}
\RenewDocumentCommand{\SIrange}{o m m m}
@@ -77938,13 +78508,12 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
% \end{macrocode}
% \iffalse
-%</siunitx>
+%</siunitx-v2>
% \fi
%
%
%
%
-%
% \iffalse
%<*skmath>
% \fi
@@ -84384,7 +84953,7 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
\@ifundefined{c@#3depth}{\newcounter{#3depth}}{}%
\setcounter{#3depth}{1}%
\@namedef{cftmark#3}{}%
- \@namedef{listof#2}{\listof{#2}{#4}}%
+ \@namedef{listof#2}{\LWR@listof{#2}{#4}}%
\@namedef{@cftmake#3title}{}%
\expandafter\newlength\csname cftbefore#3titleskip\endcsname%
\expandafter\newlength\csname cftafter#3titleskip\endcsname%
@@ -89871,7 +90440,7 @@ height:\LWR@printlength{\LWR@tempheight}%
\@ifundefined{c@#3depth}{\newcounter{#3depth}}{}%
\setcounter{#3depth}{1}%
\@namedef{#3mark}{}%
- \@namedef{#2}{\listof{#2}{#4}}%
+ \@namedef{#2}{\LWR@listof{#2}{#4}}%
\@namedef{@cftmake#3title}{}%
\@ifundefined{cftbefore#3titleskip}{%
\expandafter\newlength\csname cftbefore#3titleskip\endcsname%
@@ -90170,6 +90739,7 @@ height:\LWR@printlength{\LWR@tempheight}%
\renewcommand*{\epigraphpicture}{}
% \end{macrocode}
%
+%
% \subsection{Poetry}
%
% \begin{macrocode}
diff --git a/macros/latex/contrib/lwarp/lwarp.ins b/macros/latex/contrib/lwarp/lwarp.ins
index 0ce71e74ae..498f83ae47 100644
--- a/macros/latex/contrib/lwarp/lwarp.ins
+++ b/macros/latex/contrib/lwarp/lwarp.ins
@@ -103,6 +103,7 @@ version 2005/12/01 or later.
\file{lwarp-caption.sty}{\from{lwarp.dtx}{caption}}
\file{lwarp-caption3.sty}{\from{lwarp.dtx}{caption3}}
\file{lwarp-cases.sty}{\from{lwarp.dtx}{cases}}
+\file{lwarp-centerlastline.sty}{\from{lwarp.dtx}{centerlastline}}
\file{lwarp-centernot.sty}{\from{lwarp.dtx}{centernot}}
\file{lwarp-changebar.sty}{\from{lwarp.dtx}{changebar}}
\file{lwarp-changelayout.sty}{\from{lwarp.dtx}{changelayout}}
@@ -139,6 +140,7 @@ version 2005/12/01 or later.
\file{lwarp-dblfnote.sty}{\from{lwarp.dtx}{dblfnote}}
\file{lwarp-dcolumn.sty}{\from{lwarp.dtx}{dcolumn}}
\file{lwarp-decimal.sty}{\from{lwarp.dtx}{decimal}}
+\file{lwarp-decorule.sty}{\from{lwarp.dtx}{decorule}}
\file{lwarp-diagbox.sty}{\from{lwarp.dtx}{diagbox}}
\file{lwarp-dingbat.sty}{\from{lwarp.dtx}{dingbat}}
\file{lwarp-DotArrow.sty}{\from{lwarp.dtx}{DotArrow}}
@@ -180,6 +182,7 @@ version 2005/12/01 or later.
\file{lwarp-extramarks.sty}{\from{lwarp.dtx}{extramarks}}
\file{lwarp-fancybox.sty}{\from{lwarp.dtx}{fancybox}}
\file{lwarp-fancyhdr.sty}{\from{lwarp.dtx}{fancyhdr}}
+\file{lwarp-fancypar.sty}{\from{lwarp.dtx}{fancypar}}
\file{lwarp-fancyref.sty}{\from{lwarp.dtx}{fancyref}}
\file{lwarp-fancytabs.sty}{\from{lwarp.dtx}{fancytabs}}
\file{lwarp-fancyvrb.sty}{\from{lwarp.dtx}{fancyvrb}}
@@ -220,6 +223,7 @@ version 2005/12/01 or later.
\file{lwarp-fouridx.sty}{\from{lwarp.dtx}{fouridx}}
\file{lwarp-fourier.sty}{\from{lwarp.dtx}{fourier}}
\file{lwarp-framed.sty}{\from{lwarp.dtx}{framed}}
+\file{lwarp-froufrou.sty}{\from{lwarp.dtx}{froufrou}}
\file{lwarp-ftcap.sty}{\from{lwarp.dtx}{ftcap}}
\file{lwarp-ftnright.sty}{\from{lwarp.dtx}{ftnright}}
\file{lwarp-fullminipage.sty}{\from{lwarp.dtx}{fullminipage}}
@@ -381,6 +385,7 @@ version 2005/12/01 or later.
\file{lwarp-parcolumns.sty}{\from{lwarp.dtx}{parcolumns}}
\file{lwarp-parnotes.sty}{\from{lwarp.dtx}{parnotes}}
\file{lwarp-parskip.sty}{\from{lwarp.dtx}{parskip}}
+\file{lwarp-pbalance.sty}{\from{lwarp.dtx}{pbalance}}
\file{lwarp-pbox.sty}{\from{lwarp.dtx}{pbox}}
\file{lwarp-pdfcol.sty}{\from{lwarp.dtx}{pdfcol}}
\file{lwarp-pdfcolfoot.sty}{\from{lwarp.dtx}{pdfcolfoot}}
@@ -472,6 +477,7 @@ version 2005/12/01 or later.
\file{lwarp-simplebnf.sty}{\from{lwarp.dtx}{simplebnf}}
\file{lwarp-SIunits.sty}{\from{lwarp.dtx}{SIunits}}
\file{lwarp-siunitx.sty}{\from{lwarp.dtx}{siunitx}}
+\file{lwarp-siunitx-v2.sty}{\from{lwarp.dtx}{siunitx-v2}}
\file{lwarp-skmath.sty}{\from{lwarp.dtx}{skmath}}
\file{lwarp-slantsc.sty}{\from{lwarp.dtx}{slantsc}}
\file{lwarp-slashed.sty}{\from{lwarp.dtx}{slashed}}
diff --git a/macros/latex/contrib/lwarp/lwarp.pdf b/macros/latex/contrib/lwarp/lwarp.pdf
index d280510a29..03031ceb9c 100644
--- a/macros/latex/contrib/lwarp/lwarp.pdf
+++ b/macros/latex/contrib/lwarp/lwarp.pdf
Binary files differ
diff --git a/macros/latex/contrib/lwarp/lwarpmk.lua b/macros/latex/contrib/lwarp/lwarpmk.lua
index 7357f24b90..0b09a9acaf 100755
--- a/macros/latex/contrib/lwarp/lwarpmk.lua
+++ b/macros/latex/contrib/lwarp/lwarpmk.lua
@@ -2,7 +2,7 @@
-- Copyright 2016-2021 Brian Dunn
-printversion = "v0.896"
+printversion = "v0.897"
requiredconfversion = "2" -- also at *lwarpmk.conf
function printhelp ()
diff --git a/macros/latex/contrib/ninecolors/ninecolors.pdf b/macros/latex/contrib/ninecolors/ninecolors.pdf
index 9ef44d1880..99648b72b1 100644
--- a/macros/latex/contrib/ninecolors/ninecolors.pdf
+++ b/macros/latex/contrib/ninecolors/ninecolors.pdf
Binary files differ
diff --git a/macros/latex/contrib/ninecolors/ninecolors.sty b/macros/latex/contrib/ninecolors/ninecolors.sty
index d6ba17f10c..012310dfe2 100644
--- a/macros/latex/contrib/ninecolors/ninecolors.sty
+++ b/macros/latex/contrib/ninecolors/ninecolors.sty
@@ -7,8 +7,9 @@
%%% ----------------------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{ninecolors}[2021/05/07 v2021B Select colors with proper color contrast]
+\ProvidesClass{ninecolors}[2021/05/24 v2021C Select colors with proper color contrast]
\RequirePackage{xcolor}
+\RequirePackage{xparse}
\ExplSyntaxOn
diff --git a/macros/latex/contrib/ninecolors/ninecolors.tex b/macros/latex/contrib/ninecolors/ninecolors.tex
index 812ea72a9b..675cb08beb 100644
--- a/macros/latex/contrib/ninecolors/ninecolors.tex
+++ b/macros/latex/contrib/ninecolors/ninecolors.tex
@@ -11,7 +11,7 @@
urlcolor=blue3,
}
-\newcommand*{\myversion}{2021B}
+\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}
diff --git a/macros/latex/contrib/pbalance/pbalance.dtx b/macros/latex/contrib/pbalance/pbalance.dtx
index ea00526085..9f984e0e11 100644
--- a/macros/latex/contrib/pbalance/pbalance.dtx
+++ b/macros/latex/contrib/pbalance/pbalance.dtx
@@ -15,7 +15,7 @@
% \iffalse
%
%<package>\NeedsTeXFormat{LaTeX2e}[2015/01/01]
-%<package>\ProvidesPackage{pbalance}[2021/04/26 v1.1.0 Poor man's balance]
+%<package>\ProvidesPackage{pbalance}[2021/05/24 v1.1.1 Poor man's balance]
%
%<*driver>
@@ -58,6 +58,8 @@
% \changes{v1.0}{2020/09/14}{Initial version}
% \changes{v1.0.1}{2020/12/16}{Improvements to documentation}
% \changes{v1.1.0}{2021/04/26}{Do not crash in one-column mode}
+% \changes{v1.1.1}{2021/05/24}{Do not use balance package if
+% there are dbltop floats}
%
% \GetFileInfo{pbalance.sty}
%
@@ -449,8 +451,7 @@
\newcommand\@PBifbotfloat[2]{\ifx\@botlist\empty #2\else #1\fi}
\newcommand\@PBiffootnote[2]{\ifvoid\footins #2\else #1\fi}
\newcommand\@PBiffloatcol[2]{\if@fcolmade #1\else #2\fi}
-% dbltop floats are apparently ok with the balance package
-%%%\newcommand\@PBifdbltopfloat[2]{\ifx\@dbltoplist\empty #2\else #1\fi}
+\newcommand\@PBifdbltopfloat[2]{\ifx\@dbltoplist\empty #2\else #1\fi}
% dblbotlist only exists with package stfloats
\newcommand\@PBifdblbotfloat[2]{%
\ifdefvoid{\@dblbotlist}
@@ -469,7 +470,8 @@
\ifboolexpr
{
test {\@PBifmidfloat} or test {\@PBiftopfloat} or
- test {\@PBifbotfloat} or test {\@PBifdblbotfloat}
+ test {\@PBifbotfloat} or test {\@PBifdblbotfloat} or
+ test {\@PBifdbltopfloat}
}
{\global\toggletrue{@PBtmpHasFloats}}
{}
diff --git a/macros/latex/contrib/pbalance/pbalance.pdf b/macros/latex/contrib/pbalance/pbalance.pdf
index 7b8f149a1a..43fc1c40f8 100644
--- a/macros/latex/contrib/pbalance/pbalance.pdf
+++ b/macros/latex/contrib/pbalance/pbalance.pdf
Binary files differ
diff --git a/macros/latex/contrib/siunitx/CHANGELOG.md b/macros/latex/contrib/siunitx/CHANGELOG.md
index 093b87bada..a473e9cd49 100644
--- a/macros/latex/contrib/siunitx/CHANGELOG.md
+++ b/macros/latex/contrib/siunitx/CHANGELOG.md
@@ -7,6 +7,18 @@ Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to
## [Unreleased]
+## [v3.0.5]
+
+### Changed
+- Documentation improvements
+
+### Fixed
+- Bracket separate uncertainties in compound quantities
+ (issue #441)
+- Color negative values in table cells correctly (issue #444)
+- Avoid consumption of any math alphabets (issue #445)
+- Mark `\bar` as removed (issue #448)
+
## [v3.0.4]
### Changed
@@ -1289,7 +1301,8 @@ Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to
### Added
- First public testing release (as `si`)
-[Unreleased]: https://github.com/josephwright/siunitx/compare/v3.0.4...HEAD
+[Unreleased]: https://github.com/josephwright/siunitx/compare/v3.0.5...HEAD
+[v3.0.5]: https://github.com/josephwright/siunitx/compare/v3.0.4...v3.0.5
[v3.0.4]: https://github.com/josephwright/siunitx/compare/v3.0.3...v3.0.4
[v3.0.3]: https://github.com/josephwright/siunitx/compare/v3.0.2...v3.0.3
[v3.0.2]: https://github.com/josephwright/siunitx/compare/v3.0.1...v3.0.2
diff --git a/macros/latex/contrib/siunitx/siunitx-code.pdf b/macros/latex/contrib/siunitx/siunitx-code.pdf
index 718aeef446..d8f5d6536e 100644
--- a/macros/latex/contrib/siunitx/siunitx-code.pdf
+++ b/macros/latex/contrib/siunitx/siunitx-code.pdf
Binary files differ
diff --git a/macros/latex/contrib/siunitx/siunitx-compound.dtx b/macros/latex/contrib/siunitx/siunitx-compound.dtx
index 83da873e6c..a164d883b7 100644
--- a/macros/latex/contrib/siunitx/siunitx-compound.dtx
+++ b/macros/latex/contrib/siunitx/siunitx-compound.dtx
@@ -310,8 +310,9 @@
% \end{macrocode}
% \end{variable}
%
-% \begin{variable}{\l_@@_unit_tl}
+% \begin{variable}{\l_@@_unit_bool, \l_@@_unit_tl}
% \begin{macrocode}
+\bool_new:N \l_@@_unit_bool
\tl_new:N \l_@@_unit_tl
% \end{macrocode}
% \end{variable}
@@ -412,6 +413,7 @@
%
% \begin{macro}{\siunitx_compound_number:n}
% \begin{macro}{\@@_format:n}
+% \begin{macro}{\@@_format:nn}
% \begin{macro}{\@@_format:nnn}
% Printing a generic set starts with the question of whether we want to
% extract exponents. If we do, then there is the work to do with extraction.
@@ -421,6 +423,7 @@
\cs_new_protected:Npn \siunitx_compound_number:n #1
{
\group_begin:
+ \bool_set_false:N \l_@@_unit_bool
\@@_format:nn {#1} { }
\@@_print:N \siunitx_print_number:x
\group_end:
@@ -445,16 +448,25 @@
\cs_new_protected:Npn \@@_format:nnn #1#2#3
{
\siunitx_number_parse:nN {#1} \l_@@_tmp_tl
- \tl_if_blank:nTF {#3}
- { \siunitx_number_process:NN \l_@@_tmp_tl \l_@@_first_tl }
+ \bool_if:NTF \l_@@_unit_bool
{ \@@_format_units:nn {#2} {#3} }
+ { \siunitx_number_process:NN \l_@@_tmp_tl \l_@@_first_tl }
\bool_lazy_and:nnTF
{ \l_@@_exp_combine_bool }
{ \int_compare_p:nNn { \tl_count:n {#2} } > 0 }
{ \@@_extract_exponents: }
{
- \tl_set:Nx \l_@@_tmp_tl
- { \siunitx_number_output:N \l_@@_first_tl }
+ \bool_if:NTF \l_@@_unit_bool
+ {
+ \tl_set:Nx \l_@@_tmp_tl
+ { \siunitx_number_output:NN \l_@@_first_tl \q_nil }
+ \tl_set:Nx \l_@@_tmp_tl
+ { \@@_uncert_bracket:N \l_@@_tmp_tl }
+ }
+ {
+ \tl_set:Nx \l_@@_tmp_tl
+ { \siunitx_number_output:N \l_@@_first_tl }
+ }
\seq_put_right:NV \l_@@_tmp_seq \l_@@_tmp_tl
}
\tl_map_function:nN {#2} \@@_parsed:n
@@ -464,7 +476,7 @@
% \end{macro}
% \end{macro}
%
-% \begin{macro}{\@@_extract_exponents:N}
+% \begin{macro}{\@@_extract_exponents:}
% \begin{macro}{\@@_extract_exponents_auxi:w}
% \begin{macro}{\@@_extract_exponents_auxii:nw}
% \begin{macro}{\@@_extract_exponents_auxiii:nnnnnnn}
@@ -508,13 +520,23 @@
% \end{macro}
% \end{macro}
% \end{macro}
+% \end{macro}
%
% \begin{macro}{\@@_parsed:n, \@@_unparsed:n}
% The simple cases for parsing (or not) all entries.
% \begin{macrocode}
\cs_new_protected:Npn \@@_parsed:n #1
{
- \siunitx_number_format:nN {#1} \l_@@_tmp_tl
+ \bool_if:NTF \l_@@_unit_bool
+ {
+ \siunitx_number_parse:nN {#1} \l_@@_tmp_tl
+ \siunitx_number_process:NN \l_@@_tmp_tl \l_@@_tmp_tl
+ \tl_set:Nx \l_@@_tmp_tl
+ { \siunitx_number_output:NN \l_@@_tmp_tl \q_nil }
+ \tl_set:Nx \l_@@_tmp_tl
+ { \@@_uncert_bracket:N \l_@@_tmp_tl }
+ }
+ { \siunitx_number_format:nN {#1} \l_@@_tmp_tl }
\seq_put_right:NV \l_@@_tmp_seq \l_@@_tmp_tl
}
\cs_new_protected:Npn \@@_unparsed:n #1
@@ -642,6 +664,7 @@
{ \l_@@_unit_bracket_bool }
{ ! \l_@@_unit_repeat_bool }
{ \bool_set_false:N \l_siunitx_number_bracket_ambiguous_bool }
+ \bool_set_true:N \l_@@_unit_bool
\@@_format:nn {#1} {#2}
\str_if_eq:VnT \l_siunitx_quantity_prefix_mode_tl { combine-exponent }
{ \tl_clear:N \l_@@_exp_tl }
@@ -785,6 +808,36 @@
% \end{macro}
% \end{macro}
%
+% \begin{macro}[EXP]{\@@_uncert_bracket:N}
+% \begin{macro}[EXP]{\@@_uncert_bracket:w}
+% \begin{macro}[EXP]{\@@_uncert_bracket:nnw}
+% Check for the case where there is a separate uncertainty but not exponent,
+% when we are handling units.
+% \begin{macrocode}
+\cs_new:Npn \@@_uncert_bracket:N #1
+ { \exp_after:wN \@@_uncert_bracket:w #1 \q_stop }
+\cs_new:Npn \@@_uncert_bracket:w
+ #1 \q_nil #2 \q_nil #3 \q_nil #4 \q_nil #5 \q_nil #6 \q_nil #7 \q_nil
+ #8 \q_nil #9 \q_stop
+ { \@@_uncert_bracket:nnw {#1#2#3#4#5#6} {#7#8} #9 \q_stop }
+\cs_new:Npn \@@_uncert_bracket:nnw #1#2 #3 \q_nil #4 \q_nil #5 \q_stop
+ {
+ \bool_lazy_or:nnTF
+ { \tl_if_blank_p:n {#2#3} }
+ { ! \tl_if_blank_p:n {#5} }
+ { \exp_not:n {#1#2#3#4#5} }
+ {
+ \exp_not:V \l_@@_bracket_open_tl
+ \exp_not:n {#1#2#3}
+ \exp_not:V \l_@@_bracket_close_tl
+ \exp_not:n {#4#5}
+ }
+ }
+% \end{macrocode}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+%
% \subsection{Lists}
%
% Identify the internal prefix (\LaTeX3 \pkg{DocStrip} convention): only
diff --git a/macros/latex/contrib/siunitx/siunitx-emulation.dtx b/macros/latex/contrib/siunitx/siunitx-emulation.dtx
index 4ae6cd1590..48648e3c13 100644
--- a/macros/latex/contrib/siunitx/siunitx-emulation.dtx
+++ b/macros/latex/contrib/siunitx/siunitx-emulation.dtx
@@ -1002,12 +1002,13 @@
{
\angstrom ,
\atomicmassunit ,
+ \bar ,
\bohr ,
\clight ,
\electronmass ,
\elementarycharge ,
\hartree ,
- \plackbar
+ \planckbar
}
{
\siunitx_declare_unit:Nx #1
diff --git a/macros/latex/contrib/siunitx/siunitx-number.dtx b/macros/latex/contrib/siunitx/siunitx-number.dtx
index dec433df02..67c9580ca6 100644
--- a/macros/latex/contrib/siunitx/siunitx-number.dtx
+++ b/macros/latex/contrib/siunitx/siunitx-number.dtx
@@ -472,12 +472,6 @@
% \end{syntax}
% \end{function}
%
-% \begin{function}{separate-uncertainty}
-% \begin{syntax}
-% |separate-uncertainty| = |true|\verb"|"|false|
-% \end{syntax}
-% \end{function}
-%
% \begin{function}{tight-spacing}
% \begin{syntax}
% |tight-spacing| = |true|\verb"|"|false|
diff --git a/macros/latex/contrib/siunitx/siunitx-print.dtx b/macros/latex/contrib/siunitx/siunitx-print.dtx
index 8cdc068b91..cc26177ef1 100644
--- a/macros/latex/contrib/siunitx/siunitx-print.dtx
+++ b/macros/latex/contrib/siunitx/siunitx-print.dtx
@@ -82,6 +82,9 @@
% in text mode
% \item \pkg{amstext}: the \cs{text} command for printing in text mode
% \end{itemize}
+% For detection of math mode fonts, as well as \cs{mathrm}, the existence of
+% \cs{symoperators} is assumed; other math font commands are not
+% \emph{required} to exist.
%
% \begin{function}
% {
@@ -317,52 +320,13 @@
% \end{macrocode}
% \end{macro}
%
-% \begin{variable}{\l_@@_tmp_box, \l_@@_tmp_tl}
+% \begin{variable}{\l_@@_tmp_tl}
% Scratch space.
% \begin{macrocode}
-\box_new:N \l_@@_tmp_box
\tl_new:N \l_@@_tmp_tl
% \end{macrocode}
% \end{variable}
%
-% \begin{macro}{\document}
-% \begin{macro}{\@@_store_fam:n}
-% \begin{variable}{\c_@@_mathrm_int, \c_@@_mathsf_int, \c_@@_mathtt_int}
-% In order to test math fonts, we need information about the \cs{fam} used
-% by the various options. As we are doing typesetting (if only in a box), we
-% need to be right at the start of the document: this also avoids any issue
-% with \pkg{fontspec}. With a sufficiently recent \LaTeXe{} this is easy;
-% for older kernels, we have to do things manually.
-% \begin{macrocode}
-\IfFormatAtLeastTF { 2020-10-01 }
- { \hook_gput_code:nnn { begindocument/end } { siunitx } }
- { \tl_put_right:Nn \document }
- {
- \@@_store_fam:n { rm }
- \@@_store_fam:n { sf }
- \@@_store_fam:n { tt }
- }
-\IfFormatAtLeastTF { 2020-10-01 }
- { }
- { \tl_put_right:Nn \document { \ignorespaces } }
-\cs_new_protected:Npn \@@_store_fam:n #1
- {
- \group_begin:
- \hbox_set:Nn \l_@@_tmp_box
- {
- \ensuremath
- {
- \use:c { math #1 }
- { \int_const:cn { c_@@_math #1 _int } { \fam } }
- }
- }
- \group_end:
- }
-% \end{macrocode}
-% \end{variable}
-% \end{macro}
-% \end{macro}
-%
% \subsection{Printing routines}
%
% \begin{variable}
@@ -559,6 +523,8 @@
% \@@_math_auxiv:n,
% \@@_math_auxv:n
% }
+% \begin{macro}{\@@_math_aux:N}
+% \begin{macro}{\@@_math_aux:w}
% \begin{macro}{\@@_math_aux:Nn, \@@_math_aux:cn}
% \begin{macro}{\@@_math_sub:n, \@@_math_super:n, \@@_math_script:n}
% \begin{macro}{\@@_math_text:n}
@@ -656,20 +622,12 @@
% cases. First, we are retaining the current math font, and the active one is
% \cs{mathsf} or \cs{mathtt}: that needs to be applied to the argument.
% Alternatively, if the current font is not retained, ensure that
-% normal math mode rules are active. The parts here are split up to allow
-% reuse when picking up the text family.
+% normal math mode rules are active.
% \begin{macrocode}
\cs_new_protected:Npn \@@_math_auxiv:n #1
{
\bool_if:NTF \l_@@_math_font_bool
- {
- \int_case:nnF \fam
- {
- \c_@@_mathsf_int { \@@_math_aux:Nn \mathsf }
- \c_@@_mathtt_int { \@@_math_aux:Nn \mathtt }
- }
- { \use:n }
- }
+ { \@@_math_aux:N \mathsf \mathtt \q_recursion_tail \q_recursion_stop }
{ \@@_math_auxv:n }
{#1}
}
@@ -677,11 +635,24 @@
{
\bool_lazy_or:nnTF
{ \int_compare_p:nNn \fam = { -1 } }
- { \int_compare_p:nNn \fam = \c_@@_mathrm_int }
+ { \int_compare_p:nNn \fam = \symoperators }
{ \use:n }
{ \mathrm }
{#1}
}
+\cs_new_protected:Npn \@@_math_aux:N #1
+ {
+ \quark_if_recursion_tail_stop_do:Nn #1 { \use:n }
+ \exp_after:wN \exp_after:wN \exp_after:wN \@@_math_aux:w
+ \cs:w \cs_to_str:N #1 \c_space_tl \cs_end:
+ \use@mathgroup ? { -2 } \q_stop #1
+ }
+\cs_new_protected:Npn \@@_math_aux:w #1 \use@mathgroup #2#3 #4 \q_stop #5
+ {
+ \int_compare:nNnTF \fam = {#3}
+ { \use_i_delimit_by_q_recursion_stop:nw { \@@_math_aux:Nn #5 } }
+ { \@@_math_aux:N }
+ }
% \end{macrocode}
% Search-and-replace fun: deal with any font commands in the argument and
% also inside sub/superscripts.
@@ -744,6 +715,8 @@
% \end{macro}
% \end{macro}
% \end{macro}
+% \end{macro}
+% \end{macro}
%
% \begin{macro}{\siunitx_print_text:n}
% \begin{macro}{\@@_text_replace:n}
diff --git a/macros/latex/contrib/siunitx/siunitx-table.dtx b/macros/latex/contrib/siunitx/siunitx-table.dtx
index 3f8673c2fc..c033090022 100644
--- a/macros/latex/contrib/siunitx/siunitx-table.dtx
+++ b/macros/latex/contrib/siunitx/siunitx-table.dtx
@@ -1196,7 +1196,6 @@
\exp_not:N \q_mark
\siunitx_number_output:NN \l_@@_tmp_tl \q_nil
}
- \@@_color_check:N \l_@@_tmp_tl
\exp_after:wN \@@_print_format_auxi:w
\l_@@_tmp_tl \q_stop
\hbox_set:Nn \l_@@_tmp_box { \l_@@_after_model_tl }
@@ -1213,7 +1212,7 @@
\box_use_drop:N \l_@@_before_box
\box_use_drop:N \l_@@_integer_box
\box_use_drop:N \l_@@_decimal_box
- \box_use_drop:N \l_@@_after_box
+ \box_use_drop:N \l_@@_after_box
}
}
\cs_new:Npn \@@_print_format:nnnnnn #1#2#3#4#5#6#7
@@ -1226,6 +1225,7 @@
\cs_new_protected:Npn \@@_print_format_auxi:w
#1 \q_nil #2 \q_mark #3 \q_nil #4 \q_stop
{
+ \@@_color_check:w #3 \q_nil \q_stop
\@@_print_format_box:Nn \l_@@_tmp_box {#1}
\bool_if:NTF \l_@@_align_before_bool
{
diff --git a/macros/latex/contrib/siunitx/siunitx.dtx b/macros/latex/contrib/siunitx/siunitx.dtx
index 40ba293d81..7c75d7a983 100644
--- a/macros/latex/contrib/siunitx/siunitx.dtx
+++ b/macros/latex/contrib/siunitx/siunitx.dtx
@@ -121,7 +121,7 @@
%
% Identify the package and give the over all version information.
% \begin{macrocode}
-\ProvidesExplPackage {siunitx} {2021-05-21} {3.0.4}
+\ProvidesExplPackage {siunitx} {2021-05-24} {3.0.5}
{A comprehensive (SI) units package}
% \end{macrocode}
%
diff --git a/macros/latex/contrib/siunitx/siunitx.pdf b/macros/latex/contrib/siunitx/siunitx.pdf
index 3a8e7d0277..3632749811 100644
--- a/macros/latex/contrib/siunitx/siunitx.pdf
+++ b/macros/latex/contrib/siunitx/siunitx.pdf
Binary files differ
diff --git a/macros/latex/contrib/siunitx/siunitx.tex b/macros/latex/contrib/siunitx/siunitx.tex
index 857a1569a6..8af64c2708 100644
--- a/macros/latex/contrib/siunitx/siunitx.tex
+++ b/macros/latex/contrib/siunitx/siunitx.tex
@@ -451,7 +451,7 @@ The \meta{number} and \meta{unit} arguments work exactly like those for the
It is possible to set up the unit macros to be available outside of the
\cs{qty} and \cs{unit} functions. This is not the standard behaviour as there
-is the risk of name clashes (for example, \cs{bar} is used by other packages,
+is the risk of name clashes (for example, \cs{day} is a \TeX{} primitive
and several packages define \cs{degree}). Full details of using \enquote{stand
alone} units are found in \ref{sec:units:creating}.
diff --git a/macros/latex/contrib/springer/sr-vorl/README b/macros/latex/contrib/springer/sr-vorl/README
index e8223c04d3..9bad61cb26 100644
--- a/macros/latex/contrib/springer/sr-vorl/README
+++ b/macros/latex/contrib/springer/sr-vorl/README
@@ -2,4 +2,4 @@ This LaTeX class provides a template for books to be published at Springer Gable
You find the class documentation in file sr-vorl.pdf. The source code can be found in sr-vorl.dtx and sr-vorl.ins. By compiling sr-vorl.dtx with pdflatex, you get the documentation, while compiling sr-vorl.ins gives you the cls-file and the template files frontmatter_sr-vorl.tex, mainmatter_sr-vorl.tex, backmatter_sr-vorl.tex and hauptdatei_sr-vorl.tex.
-All of this ma­te­rial is sub­ject to the LaTeX Project Public Li­cense.
+All of this ma­te­rial is sub­ject to the LaTeX Project Public Li­cense version 1.3c (or at your option later versions).
diff --git a/macros/latex/contrib/springer/sr-vorl/sr-vorl.dtx b/macros/latex/contrib/springer/sr-vorl/sr-vorl.dtx
index c1520cceda..d021a05d33 100644
--- a/macros/latex/contrib/springer/sr-vorl/sr-vorl.dtx
+++ b/macros/latex/contrib/springer/sr-vorl/sr-vorl.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright 2013-2016 by Jonas L. Dabelow
+% Copyright 2013-2021 by Jonas L. Dabelow
%
% Dieses Werk darf nach den Bedingungen der LaTeX Project Public License,
% entweder Version 1.3c oder (nach Ihrer Wahl) jeder spaeteren Version,
@@ -11,8 +11,8 @@
%
% Dieses Werk hat den LPPL-Betreuungs-Status "author-maintained" (vom Autor betreut).
%
-% Dieses Werk besteht aus den Dateien sr-vorl.dtx and sr-vorl.ins
-% and the derived files sr-vorl.cls, frontmatter_sr-vorl.tex,
+% Dieses Werk besteht aus den Dateien sr-vorl.dtx und sr-vorl.ins
+% und den daraus abgeleiteten Dateien sr-vorl.cls, frontmatter_sr-vorl.tex,
% mainmatter_sr-vorl.tex, backmatter_sr-vorl.tex und hauptdatei_sr-vorl.tex.
%
%
@@ -37,7 +37,7 @@
%<class>\NeedsTeXFormat{LaTeX2e}
%<class>\ProvidesClass{sr-vorl}
%<*class>
- [2016/01/30 v1.1 Vorlage fuer Autoren bei Springer Research]
+ [2021/05/24 v1.2 Vorlage fuer Autoren bei Springer Research]
%</class>
%
%<*driver>
@@ -62,7 +62,7 @@
\usepackage{scrextend}
\usepackage{doc}
\usepackage{hyperref}
-\usepackage[german]{cleveref}
+\usepackage[german,nameinlink]{cleveref}
\hypersetup{%
@@ -151,12 +151,12 @@
{\href{#1}{\texttt{#2}}}%
}
-% #1: Versionsnummer
-% #2: was wurde geaendert?
-% #3: Kommentar
-\newcommand{\aenderung}[3]{% Aenderung fuer Liste der Aenderungen
- \item[#2~(Version #1)]~\\
- #3%
+
+% #1: was wurde geaendert?
+% #2: Kommentar
+\newcommand{\aenderung}[2]{% Aenderung fuer Liste der Aenderungen
+ \item[#1]~\\
+ #2%
}
\setlength{\parindent}{1em}
@@ -186,28 +186,25 @@
@online{l2tabu,
author = {M. Ensenbach and M. Trettin},
title = {Das \LaTeX2$_\varepsilon$-Sündenregister},
- year = {2011},
- url = {http://ftp.fernuni-hagen.de/ftp-dir/pub/mirrors/www.ctan.org/info/l2tabu/german/l2tabu.pdf},
- urldate = {2016-01-30},
+ year = {2016},
+ url = {http://tug.ctan.org/info/l2tabu/german/l2tabu.pdf},
+ urldate = {2021-05-24},
}
@online{l2kurz,
author = {M. Daniel and P. Gundlach and W. Schmidt and J. Knappen and H. Partl and I. Hyna},
title = {\LaTeX2$_\varepsilon$-Kurzbeschreibung},
- year = {2013},
+ year = {2018},
url = {ftp://ftp.rrzn.uni-hannover.de/pub/mirror/tex-archive/info/lshort/german/l2kurz.pdf},
- urldate = {2016-01-30},
+ urldate = {2021-05-24},
}
@Book{koma,
author = {M. Kohm},
title = {\textsf{KOMA}-Script},
- publisher = {Lehmanns Media},
- year = {2014},
- edition = {5.~Auf"|lage},
- address = {Berlin},
+ year = {2021},
url = {ftp://ftp.tu-chemnitz.de/pub/tex/macros/latex/contrib/koma-script/doc/scrguide.pdf},
- urldate = {2016-01-30},
+ urldate = {2021-05-24},
}
@online{ctan,
@@ -215,48 +212,54 @@
title = {Comprehensive \TeX\ Archive Network},
year = {1993},
url = {http://www.ctan.org/},
- urldate = {2016-01-30},
+ urldate = {2021-05-24},
}
@online{caption,
author = {A. Sommerfeldt},
title = {Anpassen der Abbildungs- und Tabellenbeschriftungen},
- year = {2011},
+ year = {2020},
url = {ftp://ftp.fu-berlin.de/tex/CTAN/macros/latex/contrib/caption/caption-deu.pdf},
- urldate = {2016-01-30},
+ urldate = {2021-05-24},
}
@online{geometry,
author = {H. Umeki},
- translator = {H.-M. Haase},
- title = {Das \paket{geometry} Paket},
- year = {2010},
- url = {http://ftp.fernuni-hagen.de/ftp-dir/pub/mirrors/www.ctan.org/macros/latex/contrib/geometry-de/geometry-de.pdf},
- urldate = {2016-01-30},
+ title = {The \paket{geometry} package},
+ year = {2020},
+ url = {ftp://ftp.rrzn.uni-hannover.de/pub/mirror/tex-archive/macros/latex/contrib/geometry/geometry.pdf},
+ urldate = {2021-05-24},
+ }
+
+ @online{mathptmx,
+ author = {Walter Schmidt},
+ title = {Using common PostScript fonts with \LaTeX},
+ year = {2020},
+ url = {ftp://ftp.mpi-sb.mpg.de/pub/tex/mirror/ftp.dante.de/pub/tex/macros/latex/required/psnfss/psnfss2e.pdf},
+ urldate = {2021-05-24},
}
@online{enumitem,
author = {J. Bezos},
- translator = {M. Ludwig and C. Römer},
- title = {Anpassen von Listen mit dem Paket \paket{enumitem}},
- year = {2011},
- url = {ftp://ftp.mpi-sb.mpg.de/pub/tex/mirror/ftp.dante.de/pub/tex/info/translations/enumitem/de/enumitem-de.pdf},
- urldate = {2016-01-30},
+ title = {Customizing lists with the \paket{enumitem} package},
+ year = {2019},
+ url = {https://ftp.rrze.uni-erlangen.de/ctan/macros/latex/contrib/enumitem/enumitem.pdf},
+ urldate = {2021-05-24},
}
@online{amsldoc,
author = {American Mathematical Society},
title = {User's Guide for the \paket{amsmath} Package},
- year = {2002},
- url = {ftp://ftp.mpi-sb.mpg.de/pub/tex/mirror/ftp.dante.de/pub/tex/macros/latex/required/amslatex/math/amsldoc.pdf},
- urldate = {2016-01-30},
+ year = {2020},
+ url = {https://ctan.mc1.root.project-creative.net/macros/latex/required/amsmath/amsldoc.pdf},
+ urldate = {2021-05-24},
}
@online{wikibooks-floats,
author = {Wikibooks},
title = {\LaTeX/Floats, Figures and Captions},
url = {http://en.wikibooks.org/wiki/LaTeX/Floats,_Figures_and_Captions},
- urldate = {2016-01-30},
+ urldate = {2021-05-24},
}
@online{float,
@@ -264,7 +267,7 @@
title = {An Improved Environment for Floats},
year = {2001},
url = {http://ftp.fau.de/ctan/macros/latex/contrib/float/float.pdf},
- urldate = {2016-01-30},
+ urldate = {2021-05-24},
}
@Book{texbook,
@@ -278,9 +281,9 @@
@online{rotating,
author = {R. Fairbairns and S. Rahtz and L. Barroca},
title = {A package for rotated objects in \LaTeX},
- year = {2010},
- url = {ftp://ftp.rrzn.uni-hannover.de/pub/mirror/tex-archive/macros/latex/contrib/rotating/rotating.pdf},
- urldate = {2016-01-30},
+ year = {2020},
+ url = {ftp://ftp.mpi-sb.mpg.de/pub/tex/mirror/ftp.dante.de/pub/tex/macros/latex/required/graphics/rotating.pdf},
+ urldate = {2021-05-24},
}
@Book{voss-mathe,
@@ -292,108 +295,98 @@
edition = {1.~Auf"|lage},
}
- @online{voss-mathe-online,
- author = {H. Voß},
- title = {Math Mode},
- year = {2014},
- url = {http://sunsite.informatik.rwth-aachen.de/ftp/pub/mirror/ctan/info/math/voss/mathmode/Mathmode.pdf},
- urldate = {2016-01-30},
- }
-
@online{microtype,
author = {R. Schlicht},
- title = {Das \paket{microtype} Paket},
- url = {http://ftp.gwdg.de/pub/ctan/info/translations/microtype/de/microtype-DE.pdf},
- urldate = {2016-01-30},
+ title = {The \paket{microtype} package},
+ year = {2021},
+ url = {https://mirror.clientvps.com/CTAN/macros/latex/contrib/microtype/microtype.pdf},
+ urldate = {2021-05-24},
}
@online{babel,
author = {J. Braams and J. Bezos},
title = {Babel},
- year = {2016},
+ year = {2021},
url = {ftp://ftp.fu-berlin.de/tex/CTAN/macros/latex/required/babel/base/babel.pdf},
- urldate = {2016-01-30},
+ urldate = {2021-05-24},
}
@online{onlyamsmath,
author = {H. Harders},
title = {The \paket{onlyamsmath} package},
- year = {2012},
+ year = {2017},
url = {http://ftp.fau.de/ctan/macros/latex/contrib/onlyamsmath/onlyamsmath.pdf},
- urldate = {2016-01-30},
+ urldate = {2021-05-24},
}
@online{wikibooks-silbentrennung,
author = {Wikibooks},
title = {\LaTeX-Wörterbuch: Silbentrennung},
url = {http://de.wikibooks.org/wiki/LaTeX-Wörterbuch:_Silbentrennung},
- urldate = {2016-01-30},
+ urldate = {2021-05-24},
}
@online{wikibooks-latex,
author = {Wikibooks},
title = {\LaTeX},
url = {http://en.wikibooks.org/wiki/LaTeX},
- urldate = {2016-01-30},
+ urldate = {2021-05-24},
}
@online{booktabs,
author = {S. Fear},
- translator = {T. Manderla and C. Römer},
- title = {Anfertigen von hochwertigen Tabellen mit \LaTeX},
- year = {2011},
- url = {ftp://ftp.rrzn.uni-hannover.de/pub/mirror/tex-archive/macros/latex/contrib/booktabs-de/booktabs-de.pdf},
- urldate = {2016-01-30},
+ title = {Publication quality tables in \LaTeX},
+ year = {2020},
+ url = {https://ctan.mc1.root.project-creative.net/macros/latex/contrib/booktabs/booktabs.pdf},
+ urldate = {2021-05-24},
}
@online{csquotes,
- author = {P. Lehman},
- translator = {T. Conrad and P. Faßbender and C. Römer},
- title = {Das \paket{csquotes}-Paket},
- year = {2011},
- url = {ftp://ftp.rrzn.uni-hannover.de/pub/mirror/tex-archive/info/translations/csquotes/de/csquotes-DE.pdf},
- urldate = {2016-01-30},
+ author = {P. Lehman and J. Wright},
+ title = {The \paket{csquotes} Package},
+ year = {2018},
+ url = {ftp://ftp.fu-berlin.de/tex/CTAN/macros/latex/contrib/csquotes/csquotes.pdf},
+ urldate = {2018-09-27},
}
@online{cleveref,
author = {T. Cubitt},
title = {The \paket{cleveref} package},
- year = {2013},
+ year = {2018},
url = {http://ftp.uni-erlangen.de/ctan/macros/latex/contrib/cleveref/cleveref.pdf},
- urldate = {2016-01-30},
+ urldate = {2021-05-24},
}
@online{varioref,
author = {F. Mittelbach},
title = {The \paket{varioref} package},
- year = {2015},
+ year = {2020},
url = {http://sunsite.informatik.rwth-aachen.de/ftp/pub/mirror/ctan/macros/latex/required/tools/varioref.pdf},
- urldate = {2016-01-30},
+ urldate = {2021-05-24},
}
@online{siunitx,
author = {J. Wright},
title = {\paket{siunitx} --~A comprehensive (SI) units package},
- year = {2016},
+ year = {2021},
url = {ftp://ftp.rrzn.uni-hannover.de/pub/mirror/tex-archive/macros/latex/contrib/siunitx/siunitx.pdf},
- urldate = {2016-01-30},
+ urldate = {2021-05-24},
}
@online{etoolbox,
- author = {P. Lehman},
- translator = {T. Enderling},
- title = {Das Paket \paket{etoolbox}},
- year = {2011},
- url = {ftp://ftp.fu-berlin.de/tex/CTAN/info/translations/etoolbox/de/etoolbox-DE.pdf},
- urldate = {2016-01-30},
+ author = {P. Lehman and J. Wright},
+ title = {The \paket{etoolbox} Package},
+ year = {2020},
+ url = {ftp://ftp.rrzn.uni-hannover.de/pub/mirror/tex-archive/macros/latex/contrib/etoolbox/etoolbox.pdf},
+ urldate = {2021-05-24},
}
@online{ragged2e,
author = {M. Schröder},
title = {The \paket{ragged2e}-package},
- year = {2009},
- url = {http://ftp.fernuni-hagen.de/ftp-dir/pub/mirrors/www.ctan.org/macros/latex/contrib/ms/ragged2e.pdf},
- urldate = {2016-01-30},
+ year = {2021},
+ url = {https://ctan.kako-dev.de/macros/latex/contrib/ragged2e/ragged2e.pdf},
+ urldate = {2021-05-24},
}
@online{juergens1,
@@ -401,7 +394,7 @@
title = {\LaTeX\ --~eine Einführung und ein bisschen mehr\dots},
year = {2000},
url = {http://www.wiwiss.fu-berlin.de/fachbereich/vwl/iso/links/latex_einfuehrung_manuela_juergens.pdf},
- urldate = {2016-01-30},
+ urldate = {2021-05-24},
}
@online{juergens2,
@@ -409,7 +402,7 @@
title = {\LaTeX\ --~Fortgeschrittene Anwendungen},
year = {1995},
url = {ftp://ftp.fernuni-hagen.de/pub/pdf/urz-broschueren/broschueren/a0279510.pdf},
- urldate = {2016-01-30},
+ urldate = {2021-05-24},
}
@online{buxbaum-presentation,
@@ -417,7 +410,7 @@
title = {The \LaTeX\ document preparation system},
year = {2008},
url = {ftp://ftp.rrzn.uni-hannover.de/pub/mirror/tex-archive/info/latex-course/LaTeX-Course.pdf},
- urldate = {2016-01-30},
+ urldate = {2021-05-24},
}
@online{simplified-introduction,
@@ -425,7 +418,7 @@
title = {A Simplified Introduction to \LaTeX},
year = {2010},
url = {http://sunsite.informatik.rwth-aachen.de/ftp/pub/mirror/ctan/info/simplified-latex/simplified-intro.pdf},
- urldate = {2016-01-30},
+ urldate = {2021-05-24},
}
@online{beginners-introduction,
@@ -433,7 +426,7 @@
title = {A beginner's introduction to typesetting with \LaTeX},
year = {2005},
url = {http://sunsite.informatik.rwth-aachen.de/ftp/pub/mirror/ctan/info/beginlatex/beginlatex-3.6.pdf},
- urldate = {2016-01-30},
+ urldate = {2021-05-24},
}
@Book{more-math,
@@ -444,23 +437,23 @@
address = {New York},
edition = {4.~Auf"|lage},
url = {http://ctan.space-pro.be/tex-archive/info/Math_into_LaTeX-4/Short_Course.pdf},
- urldate = {2016-01-30},
+ urldate = {2021-05-24},
}
@online{xkeyval,
author = {H. Adriaens},
title = {The \paket{xkeyval} package},
- year = {2014},
+ year = {2020},
url = {http://ftp.gwdg.de/pub/ctan/macros/latex/contrib/xkeyval/xkeyval.pdf},
- urldate = {2016-01-30},
+ urldate = {2021-05-24},
}
@online{xstring,
author = {C. Tellechea},
title = {\paket{xstring}},
- year = {2013},
- url = {http://sunsite.informatik.rwth-aachen.de/ftp/pub/mirror/ctan/macros/generic/xstring/xstring_doc_en.pdf},
- urldate = {2016-01-30},
+ year = {2019},
+ url = {https://ftp.mpi-inf.mpg.de/pub/tex/mirror/ftp.dante.de/pub/tex/macros/generic/xstring/xstring-en.pdf},
+ urldate = {2021-05-24},
}
@online{varwidth,
@@ -468,15 +461,15 @@
title = {The \paket{varwidth} package},
year = {2011},
url = {ftp://ftp.mpi-sb.mpg.de/pub/tex/mirror/ftp.dante.de/pub/tex/macros/latex/contrib/varwidth/varwidth-doc.pdf},
- urldate = {2016-01-30},
+ urldate = {2021-05-24},
}
@online{chngcntr,
author = {P. Wilson},
title = {The \paket{chngcntr} package},
- year = {2009},
+ year = {2018},
url = {http://ctan.space-pro.be/tex-archive/macros/latex/contrib/chngcntr/chngcntr.pdf},
- urldate = {2016-01-30},
+ urldate = {2021-05-24},
}
\end{filecontents}
@@ -496,8 +489,8 @@
\title{sr-vorl.cls\\[1ex]\normalsize Eine \LaTeX-Klasse für Bücher bei Springer Research (Springer Gabler Research, Springer Vieweg Research, Springer Spektrum Research) und Springer VS (Springer VS Research, Springer VS Forschung)
}
-\author{Copyright 2013--2016 by Jonas~L.~Dabelow\footnote{\href{mailto:J.L.Dabelow@gmx.net}{\texttt{J.L.Dabelow@gmx.net}}}}
-\date{Version~1.1 (31.\,Januar~2016)}
+\author{Copyright 2013--2021 by Jonas~L.~Dabelow\footnote{\href{mailto:J.L.Dabelow@gmx.net}{\texttt{J.L.Dabelow@gmx.net}}}}
+\date{Version~1.2 (24.\,Mai~2021)}
\maketitle
@@ -516,7 +509,7 @@
%
%
% \section{Einleitung}
-% Diese \LaTeX-Klasse wurde erstellt, um Bücher zu setzen, die bei Springer Research (\textbf{Springer Gabler Research}, \textbf{Springer Vieweg Research}, \textbf{Springer Spektrum Research}) oder Springer~VS (\textbf{Springer VS Research}, \textbf{Springer VS Forschung}) veröffentlicht werden sollen (Beachte hierzu auch die Klassenoption \optref{format}!).
+% Diese \LaTeX-Klasse wurde erstellt, um Bücher zu setzen, die bei Springer Research (\textbf{Springer Gabler Research}, \textbf{Springer Vieweg Research}, \textbf{Springer Spektrum Research}) oder Springer~VS (\textbf{Springer VS Research}, \textbf{Springer VS Forschung}) veröffentlicht werden sollen (beachte hierzu auch die Klassenoption \optref{format}).
% Mit dieser Klasse werden viele Gestaltungsvorgaben des Verlags bereits umgesetzt.
% Der Autor der Klasse gibt jedoch keine Garantie, dass damit alle Vorgaben bereits umgesetzt sind.
% Dies ist in einigen Fällen auch nicht möglich, da die Autoren eines Buches einige Dinge \enquote{von Hand} umsetzen müssen, da \LaTeX\ hierfür keine vollständige Automatisierung ermöglicht (z.\,B. Silbentrennung, Platzierung von Gleitobjekten\dots).
@@ -532,6 +525,7 @@
%
%
% \subsection{Nutzung der Klasse}
+% \label{sec:nutzung}%
% Sie können diese Klasse wie jede andere \LaTeX-Klasse auch nutzen.
% Binden Sie sie einfach mit dem Befehl \fmacro{documentclass}\oarg{Optionen}\sarg{sr-vorl} ein.
% Dazu muss die Datei \datei{sr-vorl.cls} in einem Ordner liegen, der von \LaTeX\ durchsucht wird (z.\,B. der Ordner, in dem sich Ihre Hauptdatei befindet).\par
@@ -544,7 +538,7 @@
% Die Nutzung mit anderen Treibern wie \programm{xetex}, \programm{luatex} oder \programm{context} ist nicht getestet!
%
% \subsection{Erzeugung der Klassendatei und Hilfsdateien sowie der Dokumentation (falls notwendig)}
-% \label{sec:erzeugung}
+% \label{sec:erzeugung}%
% Die vorliegende Klasse inklusive aller zugehörigen Dateien kann --~wie üblicherweise jede \LaTeX-Klasse~-- aus einer \datei{.dtx}- und einer \datei{.ins}-Datei erzeugt werden.\par
% Sofern Sie keinen Zugriff auf die Klassendatei \datei{sr-vorl.cls}, aber auf die Dateien \datei{sr-vorl.dtx} und \datei{sr-vorl.ins} haben, können Sie die Klassendatei erzeugen, indem Sie \datei{sr-vorl.ins} mit \programm{tex}, \programm{latex} oder \programm{pdflatex} kompilieren:\\
% \texttt{tex sr-vorl.ins}\\
@@ -576,7 +570,7 @@
% Sie wird rechtsbündig, in kursiver Schrift auf eine rechte Seite gesetzt.
% Vertikal ist sie so ausgerichtet, dass das Verhältnis von oberem und unterem Abstand den Goldenen Schnitt bildet.\par
% Als optionales Argument kann eine Überschrift angegeben werden (die ebenfalls rechtsbündig gesetzt wird).
-% Wir kein optionales Argument angegeben, so erhält die Widmung keine Überschrift.\macropar
+% Wird kein optionales Argument angegeben, so erhält die Widmung keine Überschrift.\macropar
%
% \pagebreak
% \macrodescription{geleitwort}%
@@ -604,13 +598,25 @@
%
% \subsection{Der Hauptteil}
% \label{sec:hauptteil}
-% \noindent\macrodescription{kapitel}\oarg{Titel im Inhaltsverzeichnis}\marg{Titel}\marg{Autor(en)}\descriptionpar
+% \noindent\macrodescription{kapitel}\oarg{Kurztitel}\marg{Titel}\marg{Autor(en)}\descriptionpar
% Dieser Befehl ist für die Verwendung in Mehrautorenbüchern (siehe Klassenoption \optref{format}).
% Er ist dort statt des Standard-\LaTeX-Befehls \fmacro{chapter} zu nutzen!
% Die ersten beiden Argumente funktionieren wie die von \fmacro{chapter}.
+% Der Kurztitel aus dem ersten Argument taucht sowohl im Inhaltsverzeichnis als auch in der Kopfzeile auf.
% Im dritten Argument wird der Autor bzw. die Autoren des Kapitels angegeben.
% Es erscheint unterhalb der Kapitelüberschrift.\macropar
%
+% \noindent\macrodescription{kapitelmituntertitel}\oarg{Kurztitel}\marg{Titel}\marg{Untertitel}\marg{Autor(en)}\descriptionpar
+% Dieser Befehl ist für die Verwendung in Mehrautorenbüchern (siehe Klassenoption \optref{format}).
+% Er entspricht dem Befehl \macroref{kapitel}, hat aber noch ein zusätzliches Argument für einen Untertitel.
+% Dieser wird zwischen dem Titel und der Autorenangabe des Kapitels gesetzt.
+% Er erscheint weder in der Kopfzeile noch im Inhaltsverzeichnis.\\
+% Der etwas sperrige Befehlsname ist so gewählt, damit der Befehl \macroref{kapitel} weiter genauso funktioniert wie in den vohergehenden Versionen dieser Klasse.\macropar
+%
+% \noindent\macrodescription{chaptermituntertitel}\oarg{Kurztitel}\marg{Titel}\marg{Untertitel}\descriptionpar
+% Dieser Befehl stellt eine Version des Befehls \fmacro{chapter} mit Untertitel dar.
+% Er funktioniert genauso, wie der Befehl \macroref{kapitelmituntertitel}, ist aber für die Verwendung in Nicht-Mehrautorenbüchern (siehe Klassenoption \optref{format}) gedacht, hat also kein Argument für die Angabe von Kapitelautoren.\macropar
+%
% \section{Klassenoptionen}
% \label{sec:optionen}
% Die vorliegende \LaTeX-Klasse ist für deutsch- und englischsprachige Dokumente entwickelt worden.
@@ -631,8 +637,8 @@
% \optdescription[format]{format=\farg{Buchart}}
% Mit der vorliegenden Klasse können sowohl Monografien in verschiedenen Formaten als auch Mehrautorenbücher gesetzt werden.
% Damit alle Formatierungen entsprechend angepasst werden, muss die Art des Buches mit Hilfe der \option{format}-Option angegeben werden.\par
-% Folgende Angaben sind möglich: \option{a5-monografie}, \option{handbuch-monografie} und \option{a5-mehrautorenbuch} für Bücher bei \textbf{Springer Gabler Research}, \textbf{Springer Vieweg Research} und \textbf{Springer Spektrum Research} sowie \option{vs} für Bücher bei \textbf{Springer VS Research} und \textbf{Springer VS Forschung}.\par
-% Für die Einstellung \option{a5-mehrautorenbuch} wird zusätzlich der Befehl \fmacro{kapitel} bereitgestellt (siehe \cref{sec:vorspann}).\par
+% Folgende Angaben sind möglich: \option{a5-monografie}, \option{handbuch-monografie} und \option{a5-mehrautorenbuch} für Bücher bei \textbf{Springer Gabler Research}, \textbf{Springer Vieweg Research} und \textbf{Springer Spektrum Research}, \option{vs} für Bücher bei \textbf{Springer VS Research} und \textbf{Springer VS Forschung} sowie \option{autouni} für Bücher aus der AutoUni-Schriftenreihe von Springer.\par
+% Für die Einstellung \option{a5-mehrautorenbuch} werden zusätzlich die Befehle \fmacro{kapitel} und \fmacro{kapitelmituntertitel} bereitgestellt (siehe \cref{sec:hauptteil}).\par
% Wird kein Format angegeben, so wird automatisch \option{a5-monografie} eingestellt.\descriptionpar
%
% \optdescription{no-shorthands}
@@ -655,13 +661,18 @@
%
% \optdescription{test}
% Diese Option ist dazu da, den Satz eines Dokuments zu überprüfen.
-% Sie schaltet einen Rahmen um den Satzspiegel ein, so dass Abweichungen davon leichter überprüft werden können.
-% Zudem werden \emph{overfull boxes} (z.\,B. überlange Zeilen) \cite{texbook,latex-begleiter} durch schwarze Kästchen markiert.\descriptionpar
+% Sie schaltet einen Rahmen um den Satzspiegel ein, so dass Abweichungen davon leichter überprüft werden können.\descriptionpar
%
-% \optdescription{schriftgroesse=\farg{Wert}}
+% \optdescription[schriftgroesse]{schriftgroesse=\farg{Wert}}
% Mit dieser Option kann die (Standard-)Schriftgröße Ihres Dokuments eingestellt werden.
% Die Angabe \farg{Wert} gibt die Schriftgröße in pt an.
-% Diese sollte nicht kleiner als 10\,pt sein, voreingestellt sind 11\,pt.\descriptionpar
+% Diese sollte nicht kleiner als 10\,pt sein, voreingestellt sind 10\,pt für die Buchart \option{autouni} und 11\,pt für alle anderen (betrachte dazu die Option \optref{format}).\descriptionpar
+%
+% \optdescription{autor-in-toc}
+% Diese Option lässt die Kapitelautoren in Mehrautorenbüchern im Inhaltsverzeichnis erscheinen.
+% Die Formatierung kann geändert werden, indem der Befehl \fmacro{AutorinTOCFormatierung} umdefiniert wird.
+% Die voreingestellte Formatierung ist \fmacro{itshape}\fmacro{mdseries}\fmacro{rmfamily} (kursive, nicht-fette Serifenschrift).\par
+% Diese funktioniert nur für Mehrautorenbüchern, bei anderen Bucharten hat sie keine Funktion (siehe dazu die Option \optref{format}).
%
% \section{Gestaltungshinweise}
% \label{sec:hinweise}
@@ -781,7 +792,7 @@
% Für einfache abgesetzte Formeln sind dies im Wesentlichen die \env{equation}-Umgebung (für einzelne Formeln) und die \env{align}-Umgebung (für mehrere Formeln) bzw. deren Sternversionen \env{equation*} und \env{align*} für nicht nummerierte Formeln.\par
% In dieser Klasse wird das Paket \paket{onlyamsmath} verwendet, das einen Fehler ausgibt, wenn Matheumgebungen genutzt werden, die nicht von der AMS stammen \cite{onlyamsmath}.
% Möchten Sie dieses Verhalten vermeiden, so nutzen Sie die Klassenoption \optref{non-ams}.\par
-% Nützliche Hinweise zum Mathematiksatz in \LaTeX\ finden Sie in \cite{amsldoc,voss-mathe,voss-mathe-online,latex-begleiter,more-math}.
+% Nützliche Hinweise zum Mathematiksatz in \LaTeX\ finden Sie in \cite{amsldoc,voss-mathe,latex-begleiter,more-math}.
%
%
% \section{Weiterführendes}
@@ -814,18 +825,24 @@
% Das Wissen, welche Pakete geladen werden, kann wichtig sein, wenn der Nutzer der Klasse andere Pakete laden möchte, die mit den von der Klasse geladenen in Konflikt stehen könnten.\par
% Die Optionen, mit denen diese Pakete geladen werden, sind teilweise von den verwendeten Klassenoptionen abhängig (besonders von \optref{format}) und deshalb hier nicht aufgeführt.
% Sie sind bei Bedarf der Quelltextdatei \datei{sr-vorl.dtx} zu entnehmen.
-% \begin{labeling}{\paket{onlyamsmath}\cite{onlyamsmath}}
+% \begin{labeling}{\paket{scrlayer-scrpage} \cite{koma}}
% \item[\paket{scrbook} \cite{koma}]
% Dies ist die verwendete Dokumentenklasse aus dem \textsf{KOMA}-Script-Bündel.
% \item[\paket{xkeyval} \cite{xkeyval}]
% Notwendig zum Erstellen einiger Klassenoptionen.
% \item[\paket{etoolbox} \cite{etoolbox}]
% Stellt verschiedene if-Abfragen und Hooks zur Verfügung.
+% \item[\paket{xstring} \cite{xstring}]
+% Das Paket bietet viele Befehle zur String-Verarbeitung und "~auswertung.
+% Es wird zur unter anderem Auswertung der Klassenoptionen verwendet.
+% \item[\paket{mathptmx} \cite{mathptmx}]
+% Paket zur Verwendung von Times als Schriftart.
+% Dieses Paket wird nur für Bücher aus der AutoUni-Schriftenreihe verwendet (beachte die Option \optref{format}).
% \item[\paket{babel} \cite{babel}]
% Lädt die Sprachen.
% \item[\paket{geometry} \cite{geometry}]
% Wird zur Einstellung des Satzspiegels genutzt.
-% \item[\paket{scrpage2} \cite{koma}]
+% \item[\paket{scrlayer-scrpage} \cite{koma}]
% Für die Definition der Kopf- und Fußzeilen.
% Der definierte Standard-Seitenstil heißt \option{sr-standard}.
% \item[\paket{caption} \cite{caption}]
@@ -834,18 +851,17 @@
% Verbesserter Flattersatz.
% \item[\paket{enumitem} \cite{enumitem}]
% Einstellungen für Listen.
-% \item[\paket{xstring} \cite{xstring}]
-% Das Paket bietet viele Befehle zur String-Verarbeitung und "~auswertung.
-% Es wird zur unter anderem Auswertung der Klassenoptionen verwendet.
% \item[\paket{chngcntr} \cite{chngcntr}]
% Das Paket dient der Modifikation von Zählern.
% Es wird zur Anpassung der Kapitel-, Abbildungs- und anderer Zähler bei Mehrautorenbüchern verwendet.
-% \item[\paket{varwidth}] \cite{varwidth}
+% \item[\paket{varwidth} \cite{varwidth}]
% Stellt die \env{varwidth}-Umgebung als Erweiterung der \env{minipage}-Umgebung bereit.
% \item[\paket{onlyamsmath} \cite{onlyamsmath}]
-% Verhindert die Nutzung von Mathe-Umgebungen, die nicht von der AMS stammen (siehe auch die Option \optref{non-ams} in \cref{sec:optionen}).
+% Verhindert die Nutzung von Mathe-Umgebungen, die nicht von der AMS stammen.
+% % Das Laden dieses Pakets kann mit der Option \optref{non-ams} verhindert werden.
% \item[\paket{microtype} \cite{microtype}]
-% Verbesserte Mikrotypographie (siehe auch die Option \optref{no-microtype} in \cref{sec:optionen}).
+% Verbesserte Mikrotypographie.
+% Das Laden dieses Pakets kann mit der Option \optref{no-microtype} verhindert werden.
% \end{labeling}
%
% \subsection{Literaturtipps}
@@ -856,7 +872,7 @@
% Gerade bei Werken älteren Datums muss man vor veralteten Befehlen auf der Hut sein.
% Eine Hilfe hierzu bietet \cite{l2tabu}.
% Dort sind einige veraltete Befehle und Pakete sowie sonstige Fehlerquellen benannt.\par
-% Für den Mathematiksatz sei auf die bereits in \cref{sec:mathesatz} erwähnten Werke \cite{amsldoc,voss-mathe,voss-mathe-online,latex-begleiter,more-math} verwiesen.\par
+% Für den Mathematiksatz sei auf die bereits in \cref{sec:mathesatz} erwähnten Werke \cite{amsldoc,voss-mathe,latex-begleiter,more-math} verwiesen.\par
% Weitere Orientierung bieten \cite{latex-begleiter,texbook,wikibooks-latex}.
% Nahezu alle Pakete inklusive ihrer Beschreibungen sowie weitere nützliche Dokumente finden Sie im \emph{Comprehensive \TeX\ Archive Network} \cite{ctan}.
% Viele dieser Dokumente und Beschreibungen finden Sie auch in Ihrem \LaTeX-System auf Ihrem Rechner, indem Sie in der Konsole (Terminal, Bash, Eingabeaufforderung) folgendes eingeben: \texttt{texdoc \meta{Paketname}}\par
@@ -887,10 +903,25 @@
% \addcontentsline{toc}{section}{Liste der Änderungen}
% Hier finden Sie eine Übersicht über die Änderungen, die an dieser Klasse im Verlauf ihrer Versionen vorgenommen wurden.
%
+% \subsection*{Änderungen in Version 1.1}
+% \addcontentsline{toc}{subsection}{Änderungen in Version 1.1}
+% \begin{description}
+% \aenderung{Option \optref{format}}{Neue Einstellungsmöglichkeit \option{vs} für Bücher bei Springer~VS.}
+% \aenderung{Befehl \macroref{verfasser}}{Neuer Befehl zum Satz von Autor und Ort des Geleitwortes.}
+% \aenderung{Umstellung auf \programm{biber}}{Die Bibliografie dieser Dokumentation wird nun mit \programm{biber} erzeugt.}
+% \end{description}
+%
+% \subsection*{Änderungen in Version 1.2}
+% \addcontentsline{toc}{subsection}{Änderungen in Version 1.2}
% \begin{description}
-% \aenderung{1.1}{Option \optref{format}}{Neue Einstellungsmöglichkeit \option{vs} für Bücher bei Springer VS.}
-% \aenderung{1.1}{Befehl \macroref{verfasser}}{Neuer Befehl zum Satz von Autor und Ort des Geleitwortes.}
-% \aenderung{1.1}{Umstellung auf \programm{biber}}{Die Bibliografie dieser Dokumentation wird nun mit \programm{biber} erzeugt.}
+% \aenderung{Option \optref{format}}{Neue Einstellungsmöglichkeit \option{autouni} für Bücher aus der AutoUni-Schriftenreihe.}
+% \aenderung{Befehl \macroref{kapitelmituntertitel}}{Neuer Befehl für den Beginn eines Kapitels, dessen Titel einen Untertitel haben soll (für Mehrautorenbücher).}
+% \aenderung{Befehl \macroref{chaptermituntertitel}}{Neuer Befehl für den Beginn eines Kapitels, dessen Titel einen Untertitel haben soll (für Nicht-Mehrautorenbücher).}
+% \aenderung{Option \optref{autor-in-toc}}{Neue Option, die es bei Mehrautorenbüchern (siehe auch die Option \optref{format}) ermöglicht, die jeweiligen Kapitelautoren im Inhaltsverzeichnis anzuzeigen.}
+% \aenderung{Änderung der Kopfzeile}{Vor Beginn des ersten Unterkapitels eines Kapitels erscheint auf rechten Seiten in der Kopfzeile nun der Kapiteltitel (bisher stand dort nichts). Nach Beginn des ersten Unterkapitels steht dort der Titel des Unterkapitels. Dies gilt nicht für Mehrautorenbücher (bei denen dort die Namen der Kapitelautoren stehen).}
+% \aenderung{Kopfzeile im Vorspann}{Im Vorspann (siehe auch \fmacro{frontmatter} in \cref{sec:nutzung}) wird in der Kopfzeile nun auf beiden Seiten der Kapiteltitel (z.\,B.~\enquote{Inhaltsverzeichnis}) angezeigt.}
+% \aenderung{Abstand bei Überschriften bei Springer~VS}{Anpassung eines fehlerhaften Abstands bei Überschriften für Bücher bei Springer~VS (siehe auch die Option \optref{format}).}
+% \aenderung{Paketänderung für Kopf- und Fußzeilen}{Für die Erzeugung der Kopf- und Fußzeilen wird nun nicht mehr das (obsolete) Paket \paket{scrpage2} verwendet, sondern das Paket \paket{scrlayer-scrpage}.}
% \end{description}
%
%\StopEventually{}
@@ -934,7 +965,7 @@
\DeclareOptionX[sr]{englisch}{%
\PassOptionsToPackage{ngerman,british}{babel}%
\ifGermanshorthands%
- \AfterPackage+{babel}{%
+ \AfterAtEndOfPackage*{babel}{%
\useshorthands{"}%
\addto\extrasbritish{\languageshorthands{ngerman}}%
}%
@@ -951,8 +982,10 @@
\global\AMSfalse%
}
+\DeclareOptionX[sr]{autor-in-toc}{%
+ \global\autorintoctrue%
+}
-\gdef\sr@schriftgroesse{11}% Standard-Schriftgroesse
\gdef\sr@format{a5-monografie}% Standard-Format
\newif\ifMicrotype% soll microtype eingebunden werden
@@ -961,6 +994,9 @@
\newif\ifAMS% soll onlyamsmath eingebunden werden
\AMStrue
+\newif\ifautorintoc% soll onlyamsmath eingebunden werden
+\autorintocfalse
+
\newif\ifGermanshorthands% sollen die deutschen shorthands auch im Englischen nutzbar sein
\Germanshorthandstrue
@@ -968,19 +1004,20 @@
\DeclareOptionX[sr]{format}[a5-monografie]{\gdef\sr@format{#1}}
+
\ProcessOptions\relax
\ProcessOptionsX[sr]\relax
+\RequirePackage{xstring}
-
+\IfStrEq{\sr@format}{autouni}{\RequirePackage{mathptmx}}{}% Times-Paket laden, falls format=autouni
\RequirePackage{babel}
\RequirePackage{geometry}
-\RequirePackage{scrpage2}
+\RequirePackage{scrlayer-scrpage}
\RequirePackage{caption}
\RequirePackage{ragged2e}
\RequirePackage{enumitem}
-\RequirePackage{xstring}
\RequirePackage{chngcntr}
\RequirePackage{varwidth}
\ifAMS
@@ -1025,9 +1062,23 @@
(0pt,0pt)%
}%
+\defpagestyle{sr-frontmatter}% Frontmatter-pagestyle
+ {%
+ (0pt,0pt)%
+ {\pagemark\hfill\headmark}%
+ {\headmark\hfill\pagemark}%
+ {}%
+ (\textwidth,0.5pt)%
+ }%
+ {%
+ (0pt,0pt)%
+ {}%
+ {}%
+ {}%
+ (0pt,0pt)%
+ }%
\KOMAoptions{% Einstellungen der KOMA-Klasse
- fontsize=\sr@schriftgroesse pt,%
open=right,%
captions=signature,%
captions=abovetable,%
@@ -1037,6 +1088,11 @@
\gdef\frontmatter{%
\pagenumbering{Roman}%
\setcounter{page}{5}%
+ \pagestyle{sr-frontmatter}
+}
+
+\gappto\mainmatter{%
+ \pagestyle{sr-standard}%
}
@@ -1055,12 +1111,25 @@
\raggedbottom% vertikalen Seitenausgleich abschalten
}
+\let\old@chapterheadstartvskip\chapterheadstartvskip% Sicherung des alten Abstandes vor Kapitelanfaengen
+\let\old@chapterheadendvskip\chapterheadendvskip% Sicherung des alten Abstandes nach Kapitelanfaengen
+\newcommand{\sr@chapterheadstartvskip}{% Definition eines neuen Abstands vor Kapitelanfaengen fuer angepasste Kapitelbefehle
+ \vspace*{1.8\baselineskip}%
+}%
+\newcommand{\sr@chapterheadendvskip}{% Definition eines neuen Abstands nach Kapitelanfaengen fuer angepasste Kapitelbefehle
+ \vspace{.5\baselineskip plus 0.1\baselineskip minus .05\baselineskip}%
+}%
+
% Einstellungen fuer die verschiedenen Formate
\IfStrEqCase{\sr@format}{%
{a5-monografie}%
{%
+ \ifundef{\sr@schriftgroesse}%
+ {\gdef\sr@schriftgroesse{11}}%
+ {}%
\KOMAoptions{%
+ fontsize=\sr@schriftgroesse pt,%
paper=a4,%
twoside,%
pagesize=auto,%
@@ -1071,7 +1140,9 @@
textwidth=11.5cm,%
height=18cm,%
}%
- \automark[section]{chapter}
+ \automark[section]{chapter}%
+ \csgpreto{chapter}{\automark[chapter]{chapter}}% Abfangen, falls keine Section im Chapter vorhanden (oder erst spaeter vorhanden)
+ \csgpreto{section}{\automark[section]{chapter}}% Aufheben des Abfangens (s. o.)
\defpagestyle{sr-standard}% Standard pagestyle
{%
(0pt,0pt)%
@@ -1090,7 +1161,11 @@
}%
{handbuch-monografie}%
{%
+ \ifundef{\sr@schriftgroesse}%
+ {\gdef\sr@schriftgroesse{11}}%
+ {}%
\KOMAoptions{%
+ fontsize=\sr@schriftgroesse pt,%
paper=16.8cm:24cm,%
twoside,%
pagesize=auto,%
@@ -1101,7 +1176,9 @@
textwidth=12.5cm,%
height=20cm,%
}%
- \automark[section]{chapter}
+ \automark[section]{chapter}%
+ \csgpreto{chapter}{\automark[chapter]{chapter}}% Abfangen, falls keine Section im Chapter vorhanden (oder erst spaeter vorhanden)
+ \csgpreto{section}{\automark[section]{chapter}}% Aufheben des Abfangens (s. o.)
\defpagestyle{sr-standard}% Standard pagestyle
{%
(0pt,0pt)%
@@ -1120,7 +1197,11 @@
}%
{a5-mehrautorenbuch}% Einstellungen fuer Mehrautorenbuecher
{%
+ \ifundef{\sr@schriftgroesse}%
+ {\gdef\sr@schriftgroesse{11}}%
+ {}%
\KOMAoptions{%
+ fontsize=\sr@schriftgroesse pt,%
paper=a4,%
twoside,%
pagesize=auto,%
@@ -1148,14 +1229,6 @@
(0pt,0pt)%
}%
\gdef\KapitelAutor{}%
- \newcommand{\sr@chapterheadstartvskip}{% Definition eines neuen Abstands vor Kapitelanfaengen
- \vspace*{1.8\baselineskip}%
- }%
- \newcommand{\sr@chapterheadendvskip}{% Definition eines neuen Abstands nach Kapitelanfaengen
- \vspace{.5\baselineskip plus 0.1\baselineskip minus .05\baselineskip}%
- }%
- \let\old@chapterheadstartvskip\chapterheadstartvskip% Sicherung des alten Abstandes vor Kapitelanfaengen
- \let\old@chapterheadendvskip\chapterheadendvskip% Sicherung des alten Abstandes nach Kapitelanfaengen
\counterwithout{section}{chapter}%
\counterwithout{figure}{chapter}%
\counterwithout{table}{chapter}%
@@ -1168,7 +1241,11 @@
}%
{vs}% Einstellungen fuer Buch bei Springer VS
{%
+ \ifundef{\sr@schriftgroesse}%
+ {\gdef\sr@schriftgroesse{11}}%
+ {}%
\KOMAoptions{%
+ fontsize=\sr@schriftgroesse pt,%
paper=a4,%
twoside,%
pagesize=auto,%
@@ -1179,7 +1256,9 @@
textwidth=11.5cm,%
height=18cm,%
}%
- \automark[section]{chapter}
+ \automark[section]{chapter}%
+ \csgpreto{chapter}{\automark[chapter]{chapter}}% Abfangen, falls keine Section im Chapter vorhanden (oder erst spaeter vorhanden)
+ \csgpreto{section}{\automark[section]{chapter}}% Aufheben des Abfangens (s. o.)
\defpagestyle{sr-standard}% Standard pagestyle
{%
(0pt,0pt)%
@@ -1198,16 +1277,59 @@
\gdef\frontmatter{%
\pagenumbering{arabic}%
\setcounter{page}{5}%
+ \pagestyle{sr-frontmatter}%
}%
- \let\old@chapterheadstartvskip\chapterheadstartvskip%
- \let\old@chapterheadendvskip\chapterheadendvskip%
- \renewcommand*{\chapterheadstartvskip}{\vspace*{-\topskip}}%
- \renewcommand*{\chapterheadendvskip}{\vspace{72pt}}%
+% \renewcommand*{\chapterheadstartvskip}{\vspace*{-\topskip}}% auskommentiert in Version 1.2 (Grund fuer vorherige Verwendung unklar)
+% \renewcommand*{\chapterheadendvskip}{\vspace{72pt}}% auskommentiert in Version 1.2 (Grund fuer vorherige Verwendung unklar)
\deffootnote%
{1em}%
{1em}%
{\thefootnotemark\ }%
}%
+ {autouni}% Einstellungen fuer die AutoUni-Schriftenreihe
+ {%
+ \ifundef{\sr@schriftgroesse}%
+ {\gdef\sr@schriftgroesse{10}}%
+ {}%
+ \KOMAoptions{%
+ fontsize=\sr@schriftgroesse pt,%
+ paper=a4,%
+ twoside,%
+ pagesize=auto,%
+ }%
+ \recalctypearea
+ \geometry{% Einstellungen fuer Satzspiegel (mittels geometry-Paket)
+ includehead,%
+ textwidth=11.5cm,%
+ height=18cm,%
+ }%
+ \setkomafont{disposition}{\normalfont\bfseries}%
+ \setkomafont{chapter}{\normalfont\bfseries\fontsize{18}{22}\selectfont}%
+ \setkomafont{section}{\normalfont\bfseries\fontsize{14}{17}\selectfont}%
+ \setkomafont{subsection}{\normalfont\bfseries}%
+ \setkomafont{subsubsection}{\normalfont\bfseries}%
+ \setkomafont{paragraph}{\normalfont\bfseries}%
+ \setkomafont{subparagraph}{\normalfont\bfseries}%
+
+ \automark[section]{chapter}%
+ \csgpreto{chapter}{\automark[chapter]{chapter}}% Abfangen, falls keine Section im Chapter vorhanden (oder erst spaeter vorhanden)
+ \csgpreto{section}{\automark[section]{chapter}}% Aufheben des Abfangens (s. o.)
+ \defpagestyle{sr-standard}% Standard pagestyle
+ {%
+ (0pt,0pt)%
+ {\pagemark\hfill\headmark}%
+ {\headmark\hfill\pagemark}%
+ {}%
+ (\textwidth,0.5pt)%
+ }%
+ {%
+ (0pt,0pt)%
+ {}%
+ {}%
+ {}%
+ (0pt,0pt)%
+ }%
+ }%
}
@@ -1216,6 +1338,26 @@
\newlength{\sr@verfasserbreite@ort}% Breite des Ortes im Befehl \verfasser
\newlength{\sr@verfasserbreite@name}% Breite des Namens im Befehl \verfasser
+% Das folgende Macro ist noch in der Entwicklung!
+% \begin{macro}{\schriftgrad}
+% Einstellung der Schriftgröße.
+% \begin{macrocode}
+%\newcommand{\schriftgrad}[2][]{%
+% \ifblank{#1}
+% {%
+% \pgfmathparse{1.2*#2}%
+% \fontsize{#2}{\pgfmathresult}%
+% \selectfont%
+% }%
+% {%
+% \fontsize{#2}{#1}%
+% \selectfont%
+% }%
+%}
+% \end{macrocode}
+% \end{macro}
+
+
% \begin{environment}{widmung}
% Widmung
@@ -1265,11 +1407,12 @@
% \begin{macrocode}
\newcommand{\geleitwort}{%
\addchap*{\GeleitwortTitel}%
- \markboth{\GeleitwortTitel}{\GeleitwortTitel}
+ \markboth{\GeleitwortTitel}{\GeleitwortTitel}%
}
% \end{macrocode}
% \end{macro}
+
% \begin{macro}{\verfasser}
% Geleitwort-Kapitel
% \begin{macrocode}
@@ -1304,17 +1447,34 @@
% \end{macro}
+\gdef\sr@AutorinTOCFormatierung{\itshape\mdseries\rmfamily}% Interner Befehl fuer die Formatierung der Autoren im Inhaltsverzeichnis bei Mehrautorenbuechern
+
+\gdef\AutorinTOCFormatierung{\sr@AutorinTOCFormatierung}% Aenderbarer Befehl fuer die Formatierung der Autoren im Inhaltsverzeichnis bei Mehrautorenbuechern
+
+
% \begin{macro}{\kapitel}
% Kapitel-Befehl fuer Mehrautorenbuecher
% \begin{macrocode}
\newcommand{\kapitel}[3][]{%
+ \ifblank{#1}%
+ {%
+ \gdef\KapitelKurztitel{#2}%
+ }%
+ {%
+ \gdef\KapitelKurztitel{#1}%
+ }%
+ \gdef\KapitelTitel{#2}%
\gdef\KapitelAutor{#3}%
+ \ifautorintoc% pruefen, ob KapitelAutor ins TOC soll
+ \gdef\KapitelimTOC{\KapitelKurztitel\newline\AutorinTOCFormatierung\KapitelAutor}%
+ \else%
+ \gdef\KapitelimTOC{\KapitelKurztitel}%
+ \fi%
\stepcounter{chapter}
\let\chapterheadstartvskip\sr@chapterheadstartvskip%
\let\chapterheadendvskip\sr@chapterheadendvskip%
- \ifblank{#1}%
- {\addchap{#2}}%
- {\addchap[#1]{#2}}%
+ \addchap[\KapitelimTOC]{\KapitelTitel}% Setzen des Kapiteltitels
+ \markboth{\KapitelKurztitel}{\KapitelAutor}%
\let\chapterheadstartvskip\old@chapterheadstartvskip%
\let\chapterheadendvskip\old@chapterheadendvskip%
{\usekomafont{section}\itshape#3}\par%
@@ -1324,6 +1484,86 @@
% \end{macrocode}
% \end{macro}
+% \begin{macro}{\kapitelmituntertitel}
+% Kapitel-Befehl mit Untertitel fuer Mehrautorenbuecher
+% \begin{macrocode}
+\newcommand{\kapitelmituntertitel}[4][]{%
+ \ifblank{#1}%
+ {%
+ \gdef\KapitelKurztitel{#2}%
+ }%
+ {%
+ \gdef\KapitelKurztitel{#1}%
+ }%
+ \gdef\KapitelTitel{#2}%
+ \gdef\KapitelUntertitel{#3}%
+ \gdef\KapitelAutor{#4}%
+ \ifautorintoc% pruefen, ob KapitelAutor ins TOC soll
+ \gdef\KapitelimTOC{\KapitelKurztitel\newline\AutorinTOCFormatierung\KapitelAutor}%
+ \else%
+ \gdef\KapitelimTOC{\KapitelKurztitel}%
+ \fi%
+ \stepcounter{chapter}
+ \let\chapterheadstartvskip\sr@chapterheadstartvskip%
+ \let\chapterheadendvskip\sr@chapterheadendvskip%
+ \addchap[\KapitelimTOC]{\KapitelTitel}% Setzen des Kapiteltitels
+ {\usekomafont{section}\raggedright\KapitelUntertitel\\[.5\baselineskip plus 0.1\baselineskip minus .05\baselineskip]}% Setzen des Untertitels
+ \markboth{\KapitelKurztitel}{\KapitelAutor}%
+ \let\chapterheadstartvskip\old@chapterheadstartvskip%
+ \let\chapterheadendvskip\old@chapterheadendvskip%
+ {\noindent\usekomafont{section}\itshape\KapitelAutor}\par%
+ \vspace*{1.35\baselineskip plus 0.09\baselineskip minus .15\baselineskip}%
+ \noindent%
+}
+% \end{macrocode}
+% \end{macro}
+
+% \begin{macro}{\chaptermituntertitel}
+% Kapitel-Befehl mit Untertitel fuer Nicht-Mehrautorenbuecher
+% \begin{macrocode}
+\newcommand{\chaptermituntertitel}[3][]{%
+ \let\chapterheadendvskip\sr@chapterheadendvskip%
+ \ifblank{#1}%
+ {%
+ \chapter{#2}%
+ {\usekomafont{section}\raggedright#3\\[.5\baselineskip plus 0.1\baselineskip minus .05\baselineskip]}%
+ }%
+ {%
+ \chapter[#1]{#2}%
+ {\usekomafont{section}\raggedright#3\\[.5\baselineskip plus 0.1\baselineskip minus .05\baselineskip]}%
+ }%
+ \let\chapterheadendvskip\old@chapterheadendvskip%
+ \noindent%
+}
+% \end{macrocode}
+% \end{macro}
+
+% \begin{environment}{zusammenfassung}
+% Kapitelzusammenfassung
+% \begin{macrocode}
+\newenvironment{zusammenfassung}[1][]
+ {%
+ \ifblank{#1}%
+ {%
+ \vspace*{-\sr@widmungstretch@oben}%
+ \begin{flushright}%
+ }%
+ {%
+ \let\raggedsection\raggedleft%
+ \setlength{\sr@widmungstretch@oben}{-\baselineskip}%
+ \addtolength{\sr@widmungstretch@oben}{\stretch{1}}%
+ \def\chapterheadstartvskip{\vspace*{\sr@widmungstretch@oben}}%
+ \chapter*{\raggedleft #1}%
+ \begin{flushright}%
+ }%
+ \itshape%
+ }%
+ {%
+ \end{flushright}%
+ \vspace*{\stretch{1.618}}%
+ }%
+% \end{macrocode}
+% \end{environment}
% Einstellungen fuer Gleitobjekte
\setcounter{topnumber}{3}
diff --git a/macros/latex/contrib/springer/sr-vorl/sr-vorl.pdf b/macros/latex/contrib/springer/sr-vorl/sr-vorl.pdf
index 73da9de1ed..dcca4c1f51 100644
--- a/macros/latex/contrib/springer/sr-vorl/sr-vorl.pdf
+++ b/macros/latex/contrib/springer/sr-vorl/sr-vorl.pdf
Binary files differ
diff --git a/macros/latex/contrib/suftesi/suftesi.dtx b/macros/latex/contrib/suftesi/suftesi.dtx
index 7c63defed8..9a8820cb6e 100644
--- a/macros/latex/contrib/suftesi/suftesi.dtx
+++ b/macros/latex/contrib/suftesi/suftesi.dtx
@@ -56,7 +56,7 @@ This work has the LPPL maintenance status "author-maintained".
%<class>\NeedsTeXFormat{LaTeX2e}[2005/12/01]
%<class>\ProvidesClass{suftesi}
%<*class>
- [2021/05/20 v3.1.0 A class for typesetting theses, books and articles]
+ [2021/05/23 v3.1.1 A class for typesetting theses, books and articles]
%</class>
%<*driver>
\documentclass[12pt]{ltxdoc}
@@ -109,7 +109,6 @@ This work has the LPPL maintenance status "author-maintained".
% LAYOUT
%--------------------------------------------------------
\usepackage[skip=1.5ex]{parskip}
-\setcounter{tocdepth}{3}
\usepackage{geometry}
\geometry{
a4paper,
@@ -127,8 +126,8 @@ This work has the LPPL maintenance status "author-maintained".
\addbibresource{suftesi.bib}
\DeclareBibliographyCategory{pkgs-loaded}
\addtocategory{pkgs-loaded}{appendix,caption,color,crop,enumitem,emptypage,
-fancyhdr,fixltxhyph,fontenc,fontsize,mathalpha,libertinust1math,newtx,geometry,
-iftex,microtype,multicol,titlesec,titletoc,xkeyval,cclicenses,fontenc,
+fancyhdr,fixltxhyph,fontsize,mathalpha,libertinust1math,newtx,geometry,
+iftex,microtype,multicol,titlesec,titletoc,xkeyval,cclicenses,
substitutefont,luatex85,lm,textcomp,newpx,biolinum,inconsolata,libertine,
cochineal,mathpazo,bera,amsthm}
\usepackage{array}
@@ -254,7 +253,7 @@ cochineal,mathpazo,bera,amsthm}
% --------------------------------------------------------
% OTHER THUMBNAILS
% --------------------------------------------------------
-\def\shortlipsum{Sed feugiat. Cum sociis natoque penatibus et magnis dis parturient.}
+\def\shortlipsum{The phenomena should only be used as a canon for our understanding. }
\newcommand{\fakechapter}[1]{%
\noindent
\begin{minipage}{.31\textwidth}
@@ -274,7 +273,7 @@ cochineal,mathpazo,bera,amsthm}
\begin{tikzpicture}
\draw[pframe] (0,0) rectangle (\textwidth,4.9);
\node[pnode] at (0.5,4.6)
- {\shortlipsum\shortlipsum\shortlipsum\shortlipsum
+ {\shortlipsum\shortlipsum\shortlipsum\shortlipsum%
\footnote{\scriptsize\shortlipsum\shortlipsum\par}};
\end{tikzpicture}%
\end{minipage}
@@ -286,11 +285,11 @@ cochineal,mathpazo,bera,amsthm}
\begin{tikzpicture}
\draw[pframe] (0,0) rectangle (\textwidth,3.3);
\node[pnode] at (0.3,3.2)
- {\shortlipsum%
+ {\shortlipsum:%
\begin{list}{\color{gray}\textbullet}{\leftmargin=#1\itemsep=0pt}
- \item first item
- \item second item
- \item third item
+ \item immagination
+ \item experience
+ \item emotions
\end{list}};
\end{tikzpicture}%
\end{minipage}
@@ -298,14 +297,14 @@ cochineal,mathpazo,bera,amsthm}
\newcommand{\fakequotation}[1]{%
\noindent
\begin{minipage}{.31\textwidth}
- \footnotesize%
+ \fontsize{9}{10.5}\selectfont%
\begin{tikzpicture}
\draw[pframe] (0,0) rectangle (\textwidth,7);
\node[pnode] at (0.25,6.8)
- {\hskip1em\shortlipsum\shortlipsum
+ {\hskip1em\shortlipsum\shortlipsum\smallskip
\begin{list}{}{#1}
- \item \tiny\shortlipsum\shortlipsum\shortlipsum\shortlipsum
- \end{list}
+ \item \fontsize{7}{8.5}\selectfont\shortlipsum\shortlipsum\shortlipsum\shortlipsum
+ \end{list}\smallskip
\hskip1em\shortlipsum\shortlipsum};
\end{tikzpicture}%
\end{minipage}
@@ -339,7 +338,7 @@ cochineal,mathpazo,bera,amsthm}
%</driver>
% \fi
%
-% \CheckSum{5722}
+% \CheckSum{5685}
%
% \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
@@ -357,6 +356,7 @@ cochineal,mathpazo,bera,amsthm}
% Grave accent \` Left brace \{ Vertical bar \|
% Right brace \} Tilde \~}
%
+% \changes{v3.1.1}{2021/05/23}{Redefined some boolean options. Renamed some private commands. Corrected a bug in headers numbering (\cmd{protect} removed). Disabled automatic partial ToC functionality. Improved \opt{fewfootnotes} option via \sty{zref}. Updated documentation.}
% \changes{v3.1.0}{2021/05/20}{Replaced \cmd{val}\cmd{nr} with \cmd{suftesi@val}\cmd{suftesi@nr}. Corrected a bug with \cmd{maketitle} in \opt{collection} structure. New options \opt{partialtoc} and \opt{maketitlestyle}. New commands for customizing the partial ToC. New value \opt{justify} for \opt{quotestyle} option. Improved \opt{quotesize} option. Renamed the \opt{revauthortitle} option to \opt{reverseauthortitle}. The options \opt{titlefont}, \opt{authorfont}, \opt{reverseauthortitle} now work for every structure. Renewed documentation}
% \changes{v3.0.2}{2021/02/06}{Improved \opt{subsecstyle} and \opt{subsubsecstyle} options.}
% \changes{v3.0.1}{2021/01/27}{Maintenance release.}
@@ -456,7 +456,7 @@ cochineal,mathpazo,bera,amsthm}
% \DoNotIndex{\titlepage,\vss,\vtop,\xdef,\@gobbletwo,\color,\dimexpr}
% \DoNotIndex{\huge,\large,\makebox,\ProcessOptions,\renewcommand}
%
-%\nocite{appendix,caption,color,crop,enumitem,emptypage,fancyhdr,fixltxhyph,fontenc,fontsize,mathalpha,libertinust1math,newtx,geometry,iftex,microtype,multicol,titlesec,titletoc,xkeyval,cclicenses,fontenc,substitutefont,luatex85,lm,textcomp,newpx,biolinum,inconsolata,libertine,cochineal,mathpazo,bera,amsthm}
+%\nocite{appendix,caption,color,crop,enumitem,emptypage,fancyhdr,fixltxhyph,fontsize,mathalpha,libertinust1math,newtx,geometry,iftex,microtype,multicol,titlesec,titletoc,xkeyval,cclicenses,substitutefont,luatex85,lm,textcomp,newpx,biolinum,inconsolata,libertine,cochineal,mathpazo,bera,amsthm,zref}
%
% \thispagestyle{empty}
%
@@ -607,17 +607,30 @@ cochineal,mathpazo,bera,amsthm}
% \centering
% \begin{tabular}{>{\sffamily}r@{}>{\sffamily}l>{\raggedright\arraybackslash}>{\sffamily}p{9.6cm}}
% \toprule
-% & \textrm{Global} & appendix, caption, color, crop, enumitem, emptypage,
-% fancyhdr, fixltxhyph, fontenc, fontsize, geometry, iftex,
-% microtype, multicol, titlesec, titletoc, xkeyval, (cclicenses) \\\midrule
-% & \textrm{\hologo{pdfLaTeX} only} & fontenc, substitutefont \\\midrule
-% & \textrm{\hologo{LuaLaTeX} only} & luatex85 \\\midrule
-% defaultfont~= & ~standard & lmodern \\
-% & ~palatino & textcomp, newpxtext, biolinum, inconsolata, newpxmath \\
-% & ~libertine & textcomp, libertine, biolinum, inconsolata, newtxmath, libertinust1math \\
-% & ~cochineal & textcomp, cochineal, biolinum, inconsolata, newtxmath \\
-% & ~compatibility & mathpazo, beramono \\\midrule
-% mathfont~= & ~extended & amsthm, mathalpha \\\bottomrule
+% \multicolumn{2}{c}{\textbf{Context}} & \multicolumn{1}{c}{\textbf{Packages}} \\
+% \midrule
+% & \textrm{Global} & appendix, caption, color, crop, enumitem, emptypage,
+% fancyhdr, fixltxhyph, fontenc, fontsize, geometry, iftex,
+% microtype, multicol, titlesec, titletoc,
+% xkeyval, cclicenses*, zref** \\
+% \midrule
+% & \textrm{\hologo{pdfLaTeX} only} & fontenc, substitutefont \\
+% \midrule
+% & \textrm{\hologo{LuaLaTeX} only} & luatex85 \\
+% \midrule
+% defaultfont~= & ~standard
+% & lmodern \\
+% & ~palatino & textcomp, newpxtext, biolinum, inconsolata, newpxmath \\
+% & ~libertine & textcomp, libertine, biolinum, inconsolata, newtxmath,
+% libertinust1math \\
+% & ~cochineal & textcomp, cochineal, biolinum, inconsolata, newtxmath \\
+% & ~compatibility & mathpazo, beramono \\
+% \midrule
+% mathfont~= & ~extended & amsthm, mathalpha \\
+% \bottomrule\\[-1.5ex]
+% && \parbox{9.6cm}{\footnotesize
+% * only with \opt{FSPL} styles.\quad ** only with \opt{fewfootnotes} option.
+% }
% \end{tabular}
% \caption{Packages loaded by \sty{suftesi}}\label{tab:pkgloaded}
% \end{table}
@@ -648,9 +661,9 @@ cochineal,mathpazo,bera,amsthm}
% templates are also available online on the CTAN’s website at
% \textcolor{magenta}{\url{http://www.ctan.org/pkg/suftesi}}.
%
-% The class loads the packages listed in table \ref{tab:pkgloaded} and
+% \alert The class loads the packages listed in table \ref{tab:pkgloaded} and
% since version 2.9.5 relies on \sty{appendix} package to manage
-% the appendices \parencite[see][]{appendix}. To get the correct label
+% the appendices \parencite{appendix}. To get the correct label
% in titles, headings and table of
% contents, you should use the \env{appendices} environment.
%
@@ -685,7 +698,7 @@ cochineal,mathpazo,bera,amsthm}
% ^^A
% ^^A ----------------------------------------------------------------
%
-% The class provides eleven page layouts (table \ref{fig:layouts} and figure
+% The class provides eleven page layouts (figure \ref{fig:layouts} and table
% \ref{tab:layouts}). The \opt{standard}
% layout (default) or \opt{standardaureo} layout are aimed to typeset
% A4 documents, while the other nine layouts are particularly suitable
@@ -785,6 +798,42 @@ cochineal,mathpazo,bera,amsthm}
% $\SI{90}{cm} \times \SI{150}{cm}$.
% \end{valuelist}
%
+% You can define your own layouts through the \cmd{geometry} command
+% of the \sty{geometry} package
+% \parencite{geometry} and you can change the value of \cmd{baselineskip}
+% too, possibly through \sty{fontsize} \parencite{fontsize}.
+%
+% \alert If you change the line spacing with
+% the \cmd{linespread} command, you need to add \cmd{normalsize}.
+%
+% ^^A\begin{minipage}{.4\textwidth}
+%\begin{latexcode}
+%\begin{verbatim}
+%\linespread{0.956}\normalsize
+%\geometry{...}
+%\end{verbatim}
+% \end{latexcode}
+% ^^A \geometry{
+% ^^A ignoreall,
+% ^^A paperwidth = 140mm,
+% ^^A paperheight = 210mm,
+% ^^A textheight = 165mm,
+% ^^A textwidth = 100mm,
+% ^^A marginratio = 1:1,
+% ^^A top = 2.07cm,
+% ^^A headsep = 5.5mm,
+% ^^A heightrounded}
+% ^^A\end{minipage}
+% ^^A\hfill
+% ^^A\begin{minipage}{.555\textwidth}
+% ^^A\begin{tikzpicture}[scale=2.81]
+% ^^A\draw (0,0) rectangle (1.40cm,2.10cm);
+% ^^A\draw[xshift=2mm,yshift=2.25mm,fill=gray!20,draw=none] (0,0) rectangle (1.00cm,1.65cm);
+% ^^A\draw[xshift=1.6cm,yshift=2.25mm,fill=gray!20,draw=none] (0,0) rectangle (1.00cm,1.65cm);
+% ^^A\draw[xshift=1.40cm] (0,0) rectangle (1.40cm,2.10cm);
+% ^^A\end{tikzpicture}
+% ^^A\end{minipage}
+%
%\begin{figure}
% \vspace*{-1cm}
%\def\sufsetlengths{\sufsetlengthsA}
@@ -828,66 +877,27 @@ cochineal,mathpazo,bera,amsthm}
% \item[final] Prints the output on a A4 paper, hiding the crop marks.
% Useless with \opt{standard} and \opt{standardaureo} layouts.
% \end{valuelist}
+%
+% \begin{footnotesize}
+%
% Sometimes it is not desirable to have the crop marks on every page.
% In such a case you can use the \cmd{crop}|[off]| command
% after the first page of the document.
%
+% \end{footnotesize}
+%
% \optitem[\cmd{baselineskip}]{parindent}{\meta{dimen}}
% \changes{v0.9b}{2012/09/23}{New option \opt{parindent}}
%
% Sets the indentation of the first line of each paragraph except those following a section title. You can use any unit recognized by \TeX{} (for example: \opt{1em}\OR\opt{1cm}\OR\opt{17pt}, \ldots).
%
%\begin{footnotesize}
-%Note that some packages may set the value of \cmd{parindent} inside the \cmd{AtBeginDocument} hook. In these cases the \opt{parindent} option is ineffective and if you want to change the indentation you have to call \cmd{parindent=}\meta{dimen} after |\begin{document}|.\par
+%
+%Note that some packages may set the value of \cmd{parindent} inside the \cmd{AtBeginDocument} hook. In these cases the \opt{parindent} option is ineffective and if you want to change the indentation you have to call \cmd{parindent=}\meta{dimen} after |\begin{document}|.
+%
%\end{footnotesize}
% \end{optionlist*}
%
-% \subsubsection{Layout customizations}
-%
-% You can define your own layouts through the \cmd{geometry} command
-% and you can change the value of \cmd{baselineskip} too. For example
-% you can resize the typeblock of the \texttt{supercompactaureo} layout
-% to fit particular needs, or simply because the font used requires
-% a smaller line width. As you can see
-% in the following example, you can change many aspects of the layout,
-% using the parameters available for the \cmd{geometry} command.
-% Here we have
-% modified also the margin ratio, the value of the upper margin and the
-% distance between the head and the beginning of the text. For the other parameters
-% sees the documentation of the \sty{geometry} package \parencite{geometry}.
-%
-% \alert Remember that if you change the line spacing with
-% the \cmd{linespread} command, you need to add \cmd{normalsize}.
-%
-% ^^A\begin{minipage}{.4\textwidth}
-%\begin{latexcode}
-%\begin{verbatim}
-%\linespread{0.956}
-%\normalsize
-%\geometry{...}
-%\end{verbatim}
-% \end{latexcode}
-% ^^A \geometry{
-% ^^A ignoreall,
-% ^^A paperwidth = 140mm,
-% ^^A paperheight = 210mm,
-% ^^A textheight = 165mm,
-% ^^A textwidth = 100mm,
-% ^^A marginratio = 1:1,
-% ^^A top = 2.07cm,
-% ^^A headsep = 5.5mm,
-% ^^A heightrounded}
-% ^^A\end{minipage}
-% ^^A\hfill
-% ^^A\begin{minipage}{.555\textwidth}
-% ^^A\begin{tikzpicture}[scale=2.81]
-% ^^A\draw (0,0) rectangle (1.40cm,2.10cm);
-% ^^A\draw[xshift=2mm,yshift=2.25mm,fill=gray!20,draw=none] (0,0) rectangle (1.00cm,1.65cm);
-% ^^A\draw[xshift=1.6cm,yshift=2.25mm,fill=gray!20,draw=none] (0,0) rectangle (1.00cm,1.65cm);
-% ^^A\draw[xshift=1.40cm] (0,0) rectangle (1.40cm,2.10cm);
-% ^^A\end{tikzpicture}
-% ^^A\end{minipage}
-%
% ^^A ----------------------------------------------------------------
% ^^A
% \subsection{Font}\label{sec:fonts}
@@ -926,7 +936,7 @@ cochineal,mathpazo,bera,amsthm}
%
% ^^A ----------------------------------------------------------------
% ^^A
-% \subsubsection{General settings}\label{sec:fonts:options:general}
+% \subsubsection{General options}\label{sec:fonts:options:general}
% ^^A
% ^^A ----------------------------------------------------------------
%
@@ -947,12 +957,11 @@ cochineal,mathpazo,bera,amsthm}
% \item[upper] Prints spaced \textsc{\lsstyle Small Capitals} with uppercase initials.
% \end{valuelist}
%
-% \optitem[cochineal]{defaultfont}{\opt{none}\OR\opt{cochineal}
-% \OR\opt{libertine}\OR\opt{palatino}\OR\opt{standard}}
+% \optitem[cochineal]{defaultfont}{\opt{none}\OR\opt{cochineal}\OR\opt{libertine}\OR\opt{palatino}\OR\opt{standard}}
% \begin{valuelist}
-% \item[none] Does not load any font. Use this option
-% if you want full control over the font selection. This is the default with
-% \hologo{XeLaTeX} or \hologo{LuaLaTeX}.
+% \item[none] Does not load any font (default with
+% \hologo{XeLaTeX} or \hologo{LuaLaTeX}). Use this option
+% if you want full control over the font selection
% \item[cochineal] Loads the Cochineal serif, the Linux Biolinum sans serif and the Inconsolata typewriter.
% \item[libertine] Loads the Linux Libertine serif, the Linux Biolinum sans serif and the Inconsolata typewriter.
% \item[palatino] Loads the New PX serif, the Linux Biolinum sans serif and the Inconsolata typewriter. Note that the New PX font does not provide support for Greek. The \opt{greekfont=artemisia} option offers a very good solution.
@@ -985,9 +994,11 @@ cochineal,mathpazo,bera,amsthm}
%
% Effective only with Cochineal, Libertine and New PX fonts.
% \begin{valuelist}
-% \item[none] Do not load any mathematical support. Use this option if you need some packages that have to be loaded before \sty{newtxmath} and \sty{newpxmath}. This is the default with
-% \hologo{XeLaTeX} or \hologo{LuaLaTeX}.
-% \item[minimal] Loads \sty{newtxmath} (for Cochineal and Linux Libertine) or \sty{newpxmath} (for PX Fonts).
+% \item[none] Do not load any mathematical support (default with
+% \hologo{XeLaTeX} or \hologo{LuaLaTeX}). Use this option if you need
+% some packages that have to be loaded before \sty{newtxmath} and \sty{newpxmath}.
+% \item[minimal] Loads \sty{newtxmath} (for Cochineal and Linux Libertine)
+% or \sty{newpxmath} (for PX Fonts).
% \item[extended] Loads the previous option plus the \sty{amsthm} and \sty{mathalpha} packages.
% \end{valuelist}
% \end{optionlist*}
@@ -1064,8 +1075,8 @@ cochineal,mathpazo,bera,amsthm}
% Actually useless with \opt{defaultfont=none} and not available with \opt{defaultfont=standard} options.
% \changes{v0.9b}{2012/09/23}{New option \opt{greekfont}}
% \begin{valuelist}
-% \item[none] Does not load any Greek font. This is the default with
-% \hologo{XeLaTeX} or \hologo{LuaLaTeX}.
+% \item[none] Does not load any Greek font (default with
+% \hologo{XeLaTeX} or \hologo{LuaLaTeX}).
% \item[artemisia] Loads the Artemisia font by the Greek Font Society.
% \item[porson] Loads the Porson font by the Greek Font Society.
% \item[bodoni] Loads the Bodoni font by the Greek Font Society.
@@ -1117,10 +1128,10 @@ cochineal,mathpazo,bera,amsthm}
% ^^A
% ^^A ----------------------------------------------------------------
%
-% Figure \ref{fig:fakechapter} shows some combinations of the following options.
+% In the following option \meta{level} can be \opt{part}, \opt{chap}, \opt{sec},
+% \opt{subsec}, \opt{subsubsec}, \opt{par}, \opt{subpar}. You can see some
+% combinations of these options in figure \ref{fig:fakechapter}.
%
-% In the following option \meta{level} can be \opt{part}, \opt{chap}, \opt{sec},
-% \opt{subsec}, \opt{subsubsec}, \opt{par}, \opt{subpar}.
% \begin{optionlist*}
% \optitem[roman]{\meta{level}font}{\opt{roman}\OR\opt{italic}\OR
% \opt{smallcaps}}
@@ -1130,10 +1141,7 @@ cochineal,mathpazo,bera,amsthm}
% \item[smallcaps] Prints the \meta{level} title
% in \textsc{\lsstyle spaced small caps}
% \end{valuelist}
-% \end{optionlist*}
-% In the following options \meta{level} can be \opt{part}, \opt{chap}, \opt{sec},
-% \opt{subsec}, \opt{subsubsec}, \opt{par}, \opt{subpar}.
-% \begin{optionlist*}
+%
% \optitem[left]{\meta{level}style}{\opt{left}\OR\opt{center}\OR
% \opt{right}\OR\opt{parleft}\OR\opt{parcenter}\OR
% \opt{parright}}
@@ -1145,7 +1153,7 @@ cochineal,mathpazo,bera,amsthm}
% \item[parcenter] As \opt{center} but with the title below the number.
% \item[parright] As \opt{right} but with the title below the number.
% \end{valuelist}
-% \optitem[Roman/arabic/arabic]{\meta{level}numstyle}{\opt{arabic}\OR
+% \optitem[arabic/Roman {\rmfamily(part)}]{\meta{level}numstyle}{\opt{arabic}\OR
% \opt{roman}\OR\opt{Roman}\OR\opt{dotarabic}\OR\opt{dotroman}\OR
% \opt{dotRoman}}
% \begin{valuelist}
@@ -1228,23 +1236,17 @@ cochineal,mathpazo,bera,amsthm}
%
% \begin{ltxsyntax}
% \cmditem{breakintoc}
-%
-% A manual break which is active for the table of contents but not in the text or in the headers.
-%
-% \begin{latexcode}
-%\begin{verbatim}
-%\section{This title will be break here \breakintoc inside the contents}
-%\end{verbatim}
-% \end{latexcode}
% \cmditem{breakinbody}
% \cmditem{breakinbodyleft}
%
-% Manual breaks which are active in the body text but not in the headers
-% and in the table of contents. The difference between the two
-% commands is that the former executes |\\| while the latter uses \cmd{newline}. The second one should be used with the \opt{\meta{level}style=left} options to avoid bad line alignments.
+% Manual breaks which are active in the the table of contents
+% and in the body text respectivley.
+% The last one replaces \cmd{breakinbody} to avoid bad line alignments
+% when the \opt{\meta{level}style=left} options are used.
%
% \begin{latexcode}
%\begin{verbatim}
+%\section{This title will be break here \breakintoc inside the contents}
%\section{This title will be break here \breakinbody inside the body text}
%\section{This title will be break here \breakinbodyleft inside the body text}
%\end{verbatim}
@@ -1323,12 +1325,15 @@ cochineal,mathpazo,bera,amsthm}
% and the list of tables in two columns.
% \item[all] Prints all the contents lists in two columns.
% \end{valuelist}
+%
% \optitem[false]{partialtoc}{\opt{true}\OR\opt{false}}
-% This option is effective only with the \opt{structure=book} option.
% \begin{valuelist}
-% \item[true] Prints a partial ToC at the beginning of every chapter.
-% \item[false] Does not print any partial ToC.
+% \item[true] Enable the \cmd{printpartialtoc} command to get a
+% partial ToC after the title of chapters
+% (\opt{book} structure) or sections (\opt{article} structure).
+% \item[false] Disables \cmd{printpartialtoc} command.
% \end{valuelist}
+%
% \end{optionlist*}
%
% ^^A ----------------------------------------------------------------
@@ -1337,6 +1342,12 @@ cochineal,mathpazo,bera,amsthm}
% ^^A
% ^^A ----------------------------------------------------------------
%
+% ^^A ----------------------------------------------------------------
+% ^^A
+% \paragraph{General commands}\label{sec:toc:commands:general}
+% ^^A
+% ^^A ----------------------------------------------------------------
+%
% \begin{ltxsyntax}
% \cmditem*{toc\meta{level}font}{definition}
%
@@ -1372,9 +1383,22 @@ cochineal,mathpazo,bera,amsthm}
% \end{latexcode}
% Note that in both cases the definition must be enclosed in a group
% to prevent it from changing what follows (i.e. the part number and the part title).
+% \end{ltxsyntax}
%
-% The following commands allow you to modify some features of the partial ToC
-% printed at the beginning of each chapter when the \opt{partialtoc} option is used.
+%
+% ^^A ----------------------------------------------------------------
+% ^^A
+% \paragraph{Partial ToCs}\label{sec:toc:partialtoc}
+% ^^A
+% ^^A ----------------------------------------------------------------
+%
+% To use the command in this seciton load the \opt{partialtoc} option.
+%
+% \begin{ltxsyntax}
+% \cmditem{printpartialtoc}
+%
+% A command to print a partial ToC to be used after the \cmd{chapter}
+% and \cmd{section} commands, respectively in \opt{book} and \opt{article} structures.
%
% \cmditem*{partialtoc\meta{level}font}{definition}
% \cmditem*{partialtoc\meta{level}labelfont}{definition}
@@ -1411,27 +1435,35 @@ cochineal,mathpazo,bera,amsthm}
%\partialtocsecfont{\bfseries\itshape}
%\partialtocsubsecfont{\itshape}
%\partialtocseclabel{\bfseries}
-%\partialtocbeforecode{\textbf{Contents of this chapter}\smallskip}
+%\partialtocbeforecode{\hrule\smallskip\textbf{Contents}\smallskip}
+%\partialtocaftercode{\smallskip\hrule}
%\end{verbatim}
% \end{latexcode}
% which gives this very questionable result:
%
% \begin{mdframed}[backgroundcolor=philA!10,linecolor=white]
% \footnotesize
-% \textbf{Contents of this chapter}\vskip-.5ex
+% \null\medskip
+%
+% \hrule
+%
+% \textbf{Contents}\vskip-.5ex
%
-% \textbf{\itshape 1.1 Lorem ipsum dolor sit amet, consectetuer adipiscing elit}, 1.
+% \textbf{1.1 \itshape Lorem ipsum dolor sit amet, consectetuer adipiscing elit}, 1.
% 1.1.1 \textit{Ut purus elit, vestibulum ut, placerat ac, adipiscing vitae, felis}, 15.
% 1.1.1.1 Nam arcu libero, nonummy eget, consectetuer id, vulputate a, magna, 17.
% 1.1.1.2 Donec vehicula augue eu neque, 21.
% 1.1.2 \textit{Cras viverra metus rhoncus sem}, 26.
% 1.1.2.1 Nulla et lectus vestibulum urna fringilla ultrices, 29.
% 1.1.2.2 Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas, 34.
-% \textbf{\itshape 1.2 Nulla et lectus vestibulum urna fringilla ultrices}, 35.
+% \textbf{1.2 \itshape Nulla et lectus vestibulum urna fringilla ultrices}, 35.
% 1.2.1 \textit{Cras viverra metus rhoncus sem}, 39.
% 1.2.1.1 Donec vehicula augue eu neque, 40.
% 1.2.1.2 Phasellus eu tellus sit amet tortor gravida placerat, 45.
% 1.2.2 \textit{Mauris ut leo}, 49.
+% \smallskip
+%
+% \hrule
% \end{mdframed}
%
% For more radical changes you can of course define your own partial ToC with your
@@ -1480,30 +1512,6 @@ cochineal,mathpazo,bera,amsthm}
% -- 1.3.3 Nonummy eget, consectetuer id, 63.
% \end{mdframed}
%
-% The last four commands described at the beginning of this section
-% can also be used inside a group to
-% adjust the vertical spacing only for specific chapters. This is useful, for example,
-% for those chapters starting with special quotations or \textit{epigraphs}:
-% \begin{latexcode}
-%\begin{verbatim}
-%\begingroup
-%
-%\partialtocbeforespace{6cm}
-%\setlength{\beforeepigraphskip}{-5cm}
-%\setlength{\afterepigraphskip}{4cm}
-%
-%\chapter{The things in themselves are what first give rise to
-% reason, as is proven in the ontological}
-%
-%\epigraph{As is proven in the ontological manuals,
-% it is obvious that the transcendental unity
-% of apperception proves the
-% validity of the Antinomies}{G.W.F. Hegel}
-%
-%\endgroup
-%\end{verbatim}
-% \end{latexcode}
-%
% ^^A ----------------------------------------------------------------
% ^^A
% \subsection{Headers and footers}
@@ -1686,7 +1694,7 @@ cochineal,mathpazo,bera,amsthm}
% Does not indents the block quotations.
% \end{valuelist}
% \optitem[footnotesize]{quotesize}{\opt{small}, \dots, \opt{footnotesize}, \dots, \opt{scriptsize}, \dots}
-% You can use all the sizes made available by the \sty{fontsize} package.
+% You can use all the sizes made available by the \sty{fontsize} package \parencite{fontsize}.
% \changes{v0.9b}{2012/09/23}{New option \opt{quotationfont}}
%
% \end{optionlist*}
@@ -1904,28 +1912,11 @@ cochineal,mathpazo,bera,amsthm}
% cover page (figure \ref{fig:cover}), inspired by the Italian designer
% Bruno \textcite[85-89]{munari:arte-come-mestiere}. The color used for
% the text and the circle as well as other graphical elements are partially
-% customizable. The cover shown
-% in figure \ref{fig:cover} is obtained with the following code:
-% \begin{latexcode}
-%\begin{verbatim}
-%\Cauthor{Bruce Lee}
-%\Ctitle{The Art of Kicking}
-%\Csubtitle{How to survive in the modern societies}
-%\Ceditor{edited by\\ Walker Texas Ranger}
-%\Cfoot{Punch Press\\ \fbox{\bfseries P\&P}}
-%\Cpagecolor{white!90!black}
-%\Ctextcolor{white}
-%\Cfootcolor{black}
-% \makecover[ball color=DarkBlue,draw=none]
-%\end{verbatim}
-% \end{latexcode}
-%
-% To produce a complete book cover, with spine and dust jacket, you should
+% customizable. Anyway,
+% to produce a complete book cover, with spine and dust jacket, you should
% take a look at the \sty{bookcover} class by Tibor \textcite{bookcover}.
%
-%
% \begin{ltxsyntax}
-% \cmditem{makecover}
% \cmditem{makecover}[tikz options]
%
% Prints the cover page (figure \ref{fig:cover}). This command requires \sty{tikz}
@@ -1968,58 +1959,34 @@ cochineal,mathpazo,bera,amsthm}
%
% \end{ltxsyntax}
%
-% ^^A ----------------------------------------------------------------
-% ^^A
-% \subsubsection*{Some examples of cover pages}
-% ^^A
-% ^^A ----------------------------------------------------------------
-%
-% First you have to declare the informations you want to put in the cover page. It is better to give these informations in the preamble:
-%
+% You can customize the circle using the optional arguments of the
+% \cmd{makecover} command. Some of these \meta{tikz options} require
+% special \sty{tikz} libraries. For example, you can add a shadow to
+% the circle loading the \texttt{shadows} library and using the
+% \texttt{circular drop shadow} otpion.
+% The cover shown
+% in figure \ref{fig:cover} is obtained with the following code:
% \begin{latexcode}
%\begin{verbatim}
+%\documentclass{suftesi}
+%\usepackage[svgnames]{xcolor}
%\usepackage{tikz}
+% \usetikzlibrary{shadows}
%
%\Cauthor{Bruce Lee}
%\Ctitle{The Art of Kicking}
%\Csubtitle{How to survive in the modern societies}
%\Ceditor{edited by\\ Walker Texas Ranger}
-%\Cfoot{Punch Press\\ \includegraphics[width=1cm]{logo}}
-%\end{verbatim}
-% \end{latexcode}
-%
-% Then you can print the cover page with:
-% \begin{ttquote}
-% \cmd{makecover}
-% \end{ttquote}
-%
-% You can customize the circle using the optional arguments of the \cmd{makecover} command. Some of these \meta{tikz options} require special \sty{tikz} libraries. For example, you can add a shadow to the circle loading the \texttt{shadows} library and using the \texttt{circular drop shadow} otpion:
-%
-% \begin{latexcode}
-%\begin{verbatim}
-%\usepackage{tikz}
-%\usetikzlibrary{shadows}
-%...
-%\begin{document}
-% \makecover[circular drop shadow]
-%\end{document}
-%\end{verbatim}
-% \end{latexcode}
-%
-% There are thousands of possibilities. Here is another (not necessarily good) example:
-% \begin{latexcode}
-%\begin{verbatim}
-%\usepackage{tikz}
-%
-%\Cpagecolor{gray!30}
-%\Ctextcolor{blue!50}
+%\Cfoot{Punch Press\\ \fbox{\bfseries P\&P}}
+%\Cpagecolor{white!90!black}
+%\Ctextcolor{white}
%\Cfootcolor{black}
%
%\begin{document}
-% \makecover[fill=blue!30!black,draw=teal,line width=2mm,dashed]
+% \makecover[ball color=DarkBlue,draw=none,circular drop shadow]
%\end{document}
%\end{verbatim}
-% \end{latexcode}
+% \end{latexcode}
%
%\begin{figure}
%\begin{minipage}{.5\textwidth}
@@ -2067,7 +2034,7 @@ cochineal,mathpazo,bera,amsthm}
%\begin{tikzpicture}[scale=0.4]%
%\draw[draw=gray,fill=gray!5,drop shadow] (-\textwidth,0) rectangle (\textwidth,.9\textheight);
% \node at (0,.65\textheight) (c) {};
-% \draw[ball color=DarkBlue,draw=none] (c) circle (4.5cm);
+% \draw[ball color=DarkBlue,draw=none,circular drop shadow] (c) circle (4.5cm);
% \node[scale=0.4,anchor=center,text=white] at (c) {\parbox{6cm}{%
% \centering
% {\scriptsize\scshape Bruce Lee\\}
@@ -2216,13 +2183,11 @@ cochineal,mathpazo,bera,amsthm}
%\begin{article}
%\author{Author}
%\title{Title of the paper}
-% % The abstract is optional.
-% % \begin{abstract}
-% % The abstract
-% % \end{abstract}
-%
+% % The abstract is optional.
+% % \begin{abstract}
+% % The abstract
+% % \end{abstract}
%\maketitle
-%
% Text of the paper
%\end{article}
%\end{verbatim}
@@ -2374,13 +2339,12 @@ cochineal,mathpazo,bera,amsthm}
% \begin{macrocode}
\RequirePackage{xkeyval}
\newif\ifsuftesi@article
-\newif\ifsuftesi@authortitle
\newif\ifsuftesi@collection
-\newif\ifsuftesi@standard
+\newif\ifsuftesi@lmodern
\newif\ifsuftesi@cochineal
\newif\ifsuftesi@libertine
\newif\ifsuftesi@palatino
-\newif\ifsuftesi@compatibility
+\newif\ifsuftesi@mathpazo
\newif\ifsuftesi@nofont
\newif\ifsuftesi@greekfont
\newif\ifsuftesi@porson
@@ -2399,9 +2363,10 @@ cochineal,mathpazo,bera,amsthm}
\newif\ifsuftesi@pocketb
\newif\ifsuftesi@pocketc
\newif\ifsuftesi@screen
+\newif\ifsuftesi@sufplain
\newif\ifsuftesi@screencentered
\newif\ifsuftesi@centerheader
-\newif\ifsuftesi@sufplain
+\newif\ifsuftesi@authortitle
\newif\ifsuftesi@numparpart
\newif\ifsuftesi@numparchap
\newif\ifsuftesi@numparsec
@@ -2413,15 +2378,11 @@ cochineal,mathpazo,bera,amsthm}
\newif\ifsuftesi@twocolumntoc
\newif\ifsuftesi@twocolumnlof
\newif\ifsuftesi@twocolumnlot
-\newif\ifsuftesi@partialtoc
-\newif\ifsuftesi@toccompactsec
-\newif\ifsuftesi@toccompactsubsec
-\newif\ifsuftesi@toccompactsubsubsec
-\newif\ifsuftesi@toccompactpar
-\newif\ifsuftesi@toccompactsubpar
-\newif\ifsuftesi@draftdate
-\newif\ifsuftesi@fewfootnotes
-\newif\ifsuftesi@partpage
+\newif\ifsuftesi@ctocsec
+\newif\ifsuftesi@ctocsubsec
+\newif\ifsuftesi@ctocsubsubsec
+\newif\ifsuftesi@ctocpar
+\newif\ifsuftesi@ctocsubpar
\newif\ifsuftesi@FSPL
% \end{macrocode}
% The class is based on the standard \sty{book} class but the following options are disabled as they contrast with the layouts provided by the class. Specifically, the first five options are actually ineffective, while the \opt{landscape} option rotates the page correctly, but sets the text width according to the class options, effectively making it unusable.
@@ -2460,26 +2421,36 @@ cochineal,mathpazo,bera,amsthm}
\def\SUF@chapswitch{\thechapter.}
\or
\suftesi@articletrue
- \@titlepagefalse
+ \SUF@titlepagefalse
\def\SUF@chapswitch{}
\or
\suftesi@collectiontrue
\setkeys{}{headerstyle=authortitleinner}
\def\SUF@chapswitch{}
\fi}
-\define@choicekey{}{documentstructure}[\suftesi@val\suftesi@nr]
- {book,article,collection}[book]{%
-\ClassWarningNoLine{suftesi}{%
- 'documentstructure' option is deprecated.\MessageBreak
- Use 'structure' option instead}
+% \end{macrocode}
+% \paragraph{View mode}
+% \begin{macrocode}
+\define@choicekey{}{version}[\suftesi@val\suftesi@nr]
+ {screen,cscreen,draft,final}[draft]{%
\ifcase\suftesi@nr\relax
- \setkeys{}{structure=book}
+ \suftesi@screentrue
\or
- \setkeys{}{structure=article}
+ \suftesi@screentrue
+ \suftesi@screencenteredtrue
\or
- \setkeys{}{structure=collection}
+ \relax
+\or
+ \AtBeginDocument{\crop[off]}
\fi}
% \end{macrocode}
+% \paragraph{Other options}
+% \begin{macrocode}
+\define@boolkey[SUF]{}{marginpar}[true]{}
+\define@boolkey[SUF]{}{partpage}[true]{}
+\define@boolkey[SUF]{}{draftdate}[true]{}
+\define@boolkey[SUF]{}{titlepage}[true]{}
+% \end{macrocode}
% \subsubsection{Fonts}
% \paragraph{Roman fonts}
% \begin{macrocode}
@@ -2494,9 +2465,9 @@ cochineal,mathpazo,bera,amsthm}
\or
\suftesi@palatinotrue
\or
- \suftesi@standardtrue
+ \suftesi@lmoderntrue
\or
- \suftesi@compatibilitytrue
+ \suftesi@mathpazotrue
\fi}
\define@choicekey{}{mathfont}[\suftesi@val\suftesi@nr]
{none,minimal,extended}[minimal]{%
@@ -2525,6 +2496,18 @@ cochineal,mathpazo,bera,amsthm}
\suftesi@greekfonttrue\suftesi@cbgreektrue
\fi}
% \end{macrocode}
+% \paragraph{Small capitals style}
+% \begin{macrocode}
+\define@choicekey{}{smallcapsstyle}[\suftesi@val\suftesi@nr]
+ {low,upper}[low]{%
+\ifcase\suftesi@nr\relax
+ \def\SUF@MakeLowercase{\MakeLowercase}
+ \def\SUF@TOCMakeLowercase{\lowercase}
+\or
+ \def\SUF@MakeLowercase{\relax}
+ \def\SUF@TOCMakeLowercase{\relax}
+\fi}
+% \end{macrocode}
% \subsubsection{Layouts}
% \begin{macrocode}
\RequirePackage{geometry}
@@ -2682,7 +2665,7 @@ cochineal,mathpazo,bera,amsthm}
marginparwidth= 12mm,
marginparsep= 7pt}
\or
-\suftesi@pocketBtrue
+\suftesi@pocketbtrue
\DeclareRobustCommand{\SUF@partsize}{\large}
\DeclareRobustCommand{\SUF@chaptersize}{\large}
\DeclareRobustCommand{\SUF@sectionsize}{\normalsize}
@@ -2700,7 +2683,7 @@ cochineal,mathpazo,bera,amsthm}
marginparwidth= 15mm,
marginparsep= 7pt}
\or
-\suftesi@pocketCtrue
+\suftesi@pocketctrue
\DeclareRobustCommand{\SUF@partsize}{\large}
\DeclareRobustCommand{\SUF@chaptersize}{\large}
\DeclareRobustCommand{\SUF@sectionsize}{\normalsize}
@@ -2724,91 +2707,91 @@ cochineal,mathpazo,bera,amsthm}
\define@choicekey{}{partstyle}[\suftesi@val\suftesi@nr]
{left,center,right,parleft,parcenter,parright}[left]{%
\ifcase\suftesi@nr\relax
- \def\SUF@lr@PARTSwitch{\filright}
+ \def\SUF@PART@align{\filright}
\or
- \def\SUF@lr@PARTSwitch{\filcenter}
+ \def\SUF@PART@align{\filcenter}
\or
- \def\SUF@lr@PARTSwitch{\filleft}
+ \def\SUF@PART@align{\filleft}
\or
- \def\SUF@lr@PARTSwitch{\filright}
+ \def\SUF@PART@align{\filright}
\suftesi@numparparttrue
\or
- \def\SUF@lr@PARTSwitch{\filcenter}
+ \def\SUF@PART@align{\filcenter}
\suftesi@numparparttrue
\or
- \def\SUF@lr@PARTSwitch{\filleft}
+ \def\SUF@PART@align{\filleft}
\suftesi@numparparttrue
\fi}
\define@choicekey{}{chapstyle}[\suftesi@val\suftesi@nr]
{left,center,right,parleft,parcenter,parright}[left]{%
\ifcase\suftesi@nr\relax
- \def\SUF@lr@CHAPSwitch{\filright}
+ \def\SUF@CHAP@align{\filright}
\or
- \def\SUF@lr@CHAPSwitch{\filcenter}
+ \def\SUF@CHAP@align{\filcenter}
\or
- \def\SUF@lr@CHAPSwitch{\filleft}
+ \def\SUF@CHAP@align{\filleft}
\or
- \def\SUF@lr@CHAPSwitch{\filright}
+ \def\SUF@CHAP@align{\filright}
\suftesi@numparchaptrue
\or
- \def\SUF@lr@CHAPSwitch{\filcenter}
+ \def\SUF@CHAP@align{\filcenter}
\suftesi@numparchaptrue
\or
- \def\SUF@lr@CHAPSwitch{\filleft}
+ \def\SUF@CHAP@align{\filleft}
\suftesi@numparchaptrue
\fi}
\define@choicekey{}{secstyle}[\suftesi@val\suftesi@nr]
{left,center,right,parleft,parcenter,parright}[left]{%
\ifcase\suftesi@nr\relax
- \def\SUF@lr@SECSwitch{\filright}
+ \def\SUF@SEC@align{\filright}
\or
- \def\SUF@lr@SECSwitch{\filcenter}
+ \def\SUF@SEC@align{\filcenter}
\or
- \def\SUF@lr@SECSwitch{\filleft}
+ \def\SUF@SEC@align{\filleft}
\or
- \def\SUF@lr@SECSwitch{\filright}
+ \def\SUF@SEC@align{\filright}
\suftesi@numparsectrue
\or
- \def\SUF@lr@SECSwitch{\filcenter}
+ \def\SUF@SEC@align{\filcenter}
\suftesi@numparsectrue
\or
- \def\SUF@lr@SECSwitch{\filleft}
+ \def\SUF@SEC@align{\filleft}
\suftesi@numparsectrue
\fi}
\define@choicekey{}{subsecstyle}[\suftesi@val\suftesi@nr]
{left,center,right,parleft,parcenter,parright}[left]{%
\ifcase\suftesi@nr\relax
- \def\SUF@lr@SUBSECSwitch{\filright}
+ \def\SUF@SUBSEC@align{\filright}
\or
- \def\SUF@lr@SUBSECSwitch{\filcenter}
+ \def\SUF@SUBSEC@align{\filcenter}
\or
- \def\SUF@lr@SUBSECSwitch{\filleft}
+ \def\SUF@SUBSEC@align{\filleft}
\or
- \def\SUF@lr@SUBSECSwitch{\filright}
+ \def\SUF@SUBSEC@align{\filright}
\suftesi@numparsubsectrue
\or
- \def\SUF@lr@SUBSECSwitch{\filcenter}
+ \def\SUF@SUBSEC@align{\filcenter}
\suftesi@numparsubsectrue
\or
- \def\SUF@lr@SUBSECSwitch{\filleft}
+ \def\SUF@SUBSEC@align{\filleft}
\suftesi@numparsubsectrue
\fi}
\define@choicekey{}{subsubsecstyle}[\suftesi@val\suftesi@nr]
{left,center,right,parleft,parcenter,parright}[left]{%
\ifcase\suftesi@nr\relax
- \def\SUF@lr@SUBSUBSECSwitch{\filright}
+ \def\SUF@SUBSUBSEC@align{\filright}
\or
- \def\SUF@lr@SUBSUBSECSwitch{\filcenter}
+ \def\SUF@SUBSUBSEC@align{\filcenter}
\or
- \def\SUF@lr@SUBSUBSECSwitch{\filleft}
+ \def\SUF@SUBSUBSEC@align{\filleft}
\or
- \def\SUF@lr@SUBSUBSECSwitch{\filright}
+ \def\SUF@SUBSUBSEC@align{\filright}
\suftesi@numparsubsubsectrue
\or
- \def\SUF@lr@SUBSUBSECSwitch{\filcenter}
+ \def\SUF@SUBSUBSEC@align{\filcenter}
\suftesi@numparsubsubsectrue
\or
- \def\SUF@lr@SUBSUBSECSwitch{\filleft}
+ \def\SUF@SUBSUBSEC@align{\filleft}
\suftesi@numparsubsubsectrue
\fi}
% \end{macrocode}
@@ -2817,77 +2800,65 @@ cochineal,mathpazo,bera,amsthm}
\define@choicekey{}{partfont}[\suftesi@val\suftesi@nr]
{roman,italic,smallcaps}[roman]{%
\ifcase\suftesi@nr\relax
- \def\SUF@PART@StyleSwitch{\relax}
+ \def\SUF@PART@font{\relax}
\or
- \def\SUF@PART@StyleSwitch{\itshape}
+ \def\SUF@PART@font{\itshape}
\or
- \def\SUF@PART@StyleSwitch{\expandafter\SUF@titlesmallcaps}
+ \def\SUF@PART@font{\expandafter\SUF@titlesmallcaps}
\fi}
\define@choicekey{}{chapfont}[\suftesi@val\suftesi@nr]
{roman,italic,smallcaps}[roman]{%
\ifcase\suftesi@nr\relax
- \def\SUF@CHAP@StyleSwitch{\relax}
+ \def\SUF@CHAP@font{\relax}
\or
- \def\SUF@CHAP@StyleSwitch{\itshape}
+ \def\SUF@CHAP@font{\itshape}
\or
- \def\SUF@CHAP@StyleSwitch{\expandafter\SUF@titlesmallcaps}
+ \def\SUF@CHAP@font{\expandafter\SUF@titlesmallcaps}
\fi}
\define@choicekey{}{secfont}[\suftesi@val\suftesi@nr]
{roman,italic,smallcaps}[italic]{%
\ifcase\suftesi@nr\relax
- \def\SUF@SEC@StyleSwitch{\relax}
+ \def\SUF@SEC@font{\relax}
\or
- \def\SUF@SEC@StyleSwitch{\itshape}
+ \def\SUF@SEC@font{\itshape}
\or
- \def\SUF@SEC@StyleSwitch{\expandafter\SUF@titlesmallcaps}
+ \def\SUF@SEC@font{\expandafter\SUF@titlesmallcaps}
\fi}
\define@choicekey{}{subsecfont}[\suftesi@val\suftesi@nr]
{roman,italic,smallcaps}[roman]{%
\ifcase\suftesi@nr\relax
- \def\SUF@SUBSEC@StyleSwitch{\relax}
+ \def\SUF@SUBSEC@font{\relax}
\or
- \def\SUF@SUBSEC@StyleSwitch{\itshape}
+ \def\SUF@SUBSEC@font{\itshape}
\or
- \def\SUF@SUBSEC@StyleSwitch{\expandafter\SUF@titlesmallcaps}
+ \def\SUF@SUBSEC@font{\expandafter\SUF@titlesmallcaps}
\fi}
\define@choicekey{}{subsubsecfont}[\suftesi@val\suftesi@nr]
{roman,italic,smallcaps}[roman]{%
\ifcase\suftesi@nr\relax
- \def\SUF@SUBSUBSEC@StyleSwitch{\relax}
+ \def\SUF@SUBSUBSEC@font{\relax}
\or
- \def\SUF@SUBSUBSEC@StyleSwitch{\itshape}
+ \def\SUF@SUBSUBSEC@font{\itshape}
\or
- \def\SUF@SUBSUBSEC@StyleSwitch{\expandafter\SUF@titlesmallcaps}
+ \def\SUF@SUBSUBSEC@font{\expandafter\SUF@titlesmallcaps}
\fi}
\define@choicekey{}{parfont}[\suftesi@val\suftesi@nr]
{roman,italic,smallcaps}[roman]{%
\ifcase\suftesi@nr\relax
- \def\SUF@PAR@StyleSwitch{\relax}
+ \def\SUF@PAR@font{\relax}
\or
- \def\SUF@PAR@StyleSwitch{\itshape}
+ \def\SUF@PAR@font{\itshape}
\or
- \def\SUF@PAR@StyleSwitch{\expandafter\SUF@titlesmallcaps}
+ \def\SUF@PAR@font{\expandafter\SUF@titlesmallcaps}
\fi}
\define@choicekey{}{subparfont}[\suftesi@val\suftesi@nr]
{roman,italic,smallcaps}[roman]{%
\ifcase\suftesi@nr\relax
- \def\SUF@SUBPAR@StyleSwitch{\relax}
-\or
- \def\SUF@SUBPAR@StyleSwitch{\itshape}
+ \def\SUF@SUBPAR@font{\relax}
\or
- \def\SUF@SUBPAR@StyleSwitch{\expandafter\SUF@titlesmallcaps}
-\fi}
-% \end{macrocode}
-% \paragraph{Small capitals style}
-% \begin{macrocode}
-\define@choicekey{}{smallcapsstyle}[\suftesi@val\suftesi@nr]
- {low,upper}[low]{%
-\ifcase\suftesi@nr\relax
- \def\suftesi@MakeTextLowercase{\MakeLowercase}
- \def\suftesi@MakeTextTOCLowercase{\lowercase}
+ \def\SUF@SUBPAR@font{\itshape}
\or
- \def\suftesi@MakeTextLowercase{\relax}
- \def\suftesi@MakeTextTOCLowercase{\relax}
+ \def\SUF@SUBPAR@font{\expandafter\SUF@titlesmallcaps}
\fi}
% \end{macrocode}
% \subsubsection{Sections number}
@@ -2923,32 +2894,32 @@ cochineal,mathpazo,bera,amsthm}
\def\SUF@thechapter{\arabic{chapter}}
\def\SUF@HEAD@thechapter{\arabic{chapter}}
\def\SUF@dotchap{}
- \def\SUF@CHAP@thecontentslabel{\thecontentslabel}
+ \def\SUF@CHAP@contentslabel{\thecontentslabel}
\or
\def\SUF@thechapter{\textsc{\roman{chapter}}}
\def\SUF@HEAD@thechapter{\textsc{\roman{chapter}}}
\def\SUF@dotchap{}
- \def\SUF@CHAP@thecontentslabel{\textsc{\@roman{\thecontentslabel}}}
+ \def\SUF@CHAP@contentslabel{\textsc{\@roman{\thecontentslabel}}}
\or
\def\SUF@thechapter{\Roman{chapter}}
\def\SUF@HEAD@thechapter{\Roman{chapter}}
\def\SUF@dotchap{}
- \def\SUF@CHAP@thecontentslabel{\@Roman{\thecontentslabel}}
+ \def\SUF@CHAP@contentslabel{\@Roman{\thecontentslabel}}
\or
\def\SUF@thechapter{\arabic{chapter}}
\def\SUF@HEAD@thechapter{\arabic{chapter}}
\def\SUF@dotchap{.}
- \def\SUF@CHAP@thecontentslabel{\thecontentslabel}
+ \def\SUF@CHAP@contentslabel{\thecontentslabel}
\or
\def\SUF@thechapter{\textsc{\roman{chapter}}}
\def\SUF@HEAD@thechapter{\textsc{\roman{chapter}}}
\def\SUF@dotchap{.}
- \def\SUF@CHAP@thecontentslabel{\textsc{\@roman{\thecontentslabel}}}
+ \def\SUF@CHAP@contentslabel{\textsc{\@roman{\thecontentslabel}}}
\or
\def\SUF@thechapter{\Roman{chapter}}
\def\SUF@HEAD@thechapter{\Roman{chapter}}
\def\SUF@dotchap{.}
- \def\SUF@CHAP@thecontentslabel{\@Roman{\thecontentslabel}}
+ \def\SUF@CHAP@contentslabel{\@Roman{\thecontentslabel}}
\fi}
% \end{macrocode}
% \paragraph{Section number style}
@@ -2959,32 +2930,32 @@ cochineal,mathpazo,bera,amsthm}
\def\SUF@thesection{\SUF@chapswitch\arabic{section}}
\def\SUF@HEAD@thesection{\arabic{section}}
\def\SUF@dotsec{}
- \def\SUF@SEC@thecontentslabel{\thecontentslabel}
+ \def\SUF@SEC@contentslabel{\thecontentslabel}
\or
\def\SUF@thesection{\textsc{\SUF@chapswitch\roman{section}}}
\def\SUF@HEAD@thesection{\textsc{\roman{section}}}
\def\SUF@dotsec{}
- \def\SUF@SEC@thecontentslabel{\textsc{\@roman{\thecontentslabel}}}
+ \def\SUF@SEC@contentslabel{\textsc{\@roman{\thecontentslabel}}}
\or
\def\SUF@thesection{\SUF@chapswitch\Roman{section}}
\def\SUF@HEAD@thesection{\Roman{section}}
\def\SUF@dotsec{}
- \def\SUF@SEC@thecontentslabel{\@Roman{\thecontentslabel}}
+ \def\SUF@SEC@contentslabel{\@Roman{\thecontentslabel}}
\or
\def\SUF@thesection{\SUF@chapswitch\arabic{section}}
\def\SUF@HEAD@thesection{\arabic{section}}
\def\SUF@dotsec{.}
- \def\SUF@SEC@thecontentslabel{\thecontentslabel}
+ \def\SUF@SEC@contentslabel{\thecontentslabel}
\or
\def\SUF@thesection{\SUF@chapswitch\textsc{\roman{section}}}
\def\SUF@HEAD@thesection{\textsc{\roman{section}}}
\def\SUF@dotsec{.}
- \def\SUF@SEC@thecontentslabel{\textsc{\@roman{\thecontentslabel}}}
+ \def\SUF@SEC@contentslabel{\textsc{\@roman{\thecontentslabel}}}
\or
\def\SUF@thesection{\SUF@chapswitch\Roman{section}}
\def\SUF@HEAD@thesection{\Roman{section}}
\def\SUF@dotsec{.}
- \def\SUF@SEC@thecontentslabel{\@Roman{\thecontentslabel}}
+ \def\SUF@SEC@contentslabel{\@Roman{\thecontentslabel}}
\fi}
% \end{macrocode}
% \paragraph{Subsection number style}
@@ -2994,27 +2965,27 @@ cochineal,mathpazo,bera,amsthm}
\ifcase\suftesi@nr\relax
\def\SUF@thesubsection{\SUF@thesection.\arabic{subsection}}
\def\SUF@dotsubsec{}
- \def\SUF@SUBSEC@thecontentslabel{\thecontentslabel}
+ \def\SUF@SUBSEC@contentslabel{\thecontentslabel}
\or
\def\SUF@thesubsection{\SUF@thesection.\textsc{\roman{subsection}}}
\def\SUF@dotsubsec{}
- \def\SUF@SUBSEC@thecontentslabel{\textsc{\@roman{\thecontentslabel}}}
+ \def\SUF@SUBSEC@contentslabel{\textsc{\@roman{\thecontentslabel}}}
\or
\def\SUF@thesubsection{\SUF@thesection.\Roman{subsection}}
\def\SUF@dotsubsec{}
- \def\SUF@SUBSEC@thecontentslabel{\@Roman{\thecontentslabel}}
+ \def\SUF@SUBSEC@contentslabel{\@Roman{\thecontentslabel}}
\or
\def\SUF@thesubsection{\SUF@thesection.\arabic{subsection}}
\def\SUF@dotsubsec{.}
- \def\SUF@SUBSEC@thecontentslabel{\thecontentslabel}
+ \def\SUF@SUBSEC@contentslabel{\thecontentslabel}
\or
\def\SUF@thesubsection{\SUF@thesection.\textsc{\roman{subsection}}}
\def\SUF@dotsubsec{.}
- \def\SUF@SUBSEC@thecontentslabel{\textsc{\@roman{\thecontentslabel}}}
+ \def\SUF@SUBSEC@contentslabel{\textsc{\@roman{\thecontentslabel}}}
\or
\def\SUF@thesubsection{\SUF@thesection.\Roman{subsection}}
\def\SUF@dotsubsec{.}
- \def\SUF@SUBSEC@thecontentslabel{\@Roman{\thecontentslabel}}
+ \def\SUF@SUBSEC@contentslabel{\@Roman{\thecontentslabel}}
\fi}
% \end{macrocode}
% \paragraph{Sub-subsection number style}
@@ -3024,27 +2995,27 @@ cochineal,mathpazo,bera,amsthm}
\ifcase\suftesi@nr\relax
\def\SUF@thesubsubsection{\SUF@thesubsection.\arabic{subsubsection}}
\def\SUF@dotsubsubsec{}
- \def\SUF@SUBSUBSEC@thecontentslabel{\thecontentslabel}
+ \def\SUF@SUBSUBSEC@contentslabel{\thecontentslabel}
\or
\def\SUF@thesubsubsection{\SUF@thesubsection.\textsc{\roman{subsubsection}}}
\def\SUF@dotsubsubsec{}
- \def\SUF@SUBSUBSEC@thecontentslabel{\textsc{\@roman{\thecontentslabel}}}
+ \def\SUF@SUBSUBSEC@contentslabel{\textsc{\@roman{\thecontentslabel}}}
\or
\def\SUF@thesubsubsection{\SUF@thesubsection.\Roman{subsubsection}}
\def\SUF@dotsubsubsec{}
- \def\SUF@SUBSUBSEC@thecontentslabel{\@Roman{\thecontentslabel}}
+ \def\SUF@SUBSUBSEC@contentslabel{\@Roman{\thecontentslabel}}
\or
\def\SUF@thesubsubsection{\SUF@thesubsection.\arabic{subsubsection}}
\def\SUF@dotsubsubsec{.}
- \def\SUF@SUBSUBSEC@thecontentslabel{\thecontentslabel}
+ \def\SUF@SUBSUBSEC@contentslabel{\thecontentslabel}
\or
\def\SUF@thesubsubsection{\SUF@thesubsection.\textsc{\roman{subsubsection}}}
\def\SUF@dotsubsubsec{.}
- \def\SUF@SUBSUBSEC@thecontentslabel{\textsc{\@roman{\thecontentslabel}}}
+ \def\SUF@SUBSUBSEC@contentslabel{\textsc{\@roman{\thecontentslabel}}}
\or
\def\SUF@thesubsubsection{\SUF@thesubsection.\Roman{subsubsection}}
\def\SUF@dotsubsubsec{.}
- \def\SUF@SUBSUBSEC@thecontentslabel{\@Roman{\thecontentslabel}}
+ \def\SUF@SUBSUBSEC@contentslabel{\@Roman{\thecontentslabel}}
\fi}
% \end{macrocode}
% \subsubsection{Table of contents}
@@ -3069,41 +3040,41 @@ cochineal,mathpazo,bera,amsthm}
\define@choicekey{}{compacttoc}[\suftesi@val\suftesi@nr]
{sec,subsec,subsubsec,par,subpar}[sec]{%
\ifcase\suftesi@nr\relax
- \suftesi@toccompactsectrue
- \suftesi@toccompactsubsectrue
- \suftesi@toccompactsubsubsectrue
- \suftesi@toccompactpartrue
- \suftesi@toccompactsubpartrue
+ \suftesi@ctocsectrue
+ \suftesi@ctocsubsectrue
+ \suftesi@ctocsubsubsectrue
+ \suftesi@ctocpartrue
+ \suftesi@ctocsubpartrue
\def\SUF@sscorrect{\hskip.5em}
\def\SUF@ssscorrect{\hskip.5em}
\def\SUF@pcorrect{\hskip.5em}
\def\SUF@pcorrect{\hskip.5em}
\or
- \suftesi@toccompactsubsectrue
- \suftesi@toccompactsubsubsectrue
- \suftesi@toccompactpartrue
- \suftesi@toccompactsubpartrue
+ \suftesi@ctocsubsectrue
+ \suftesi@ctocsubsubsectrue
+ \suftesi@ctocpartrue
+ \suftesi@ctocsubpartrue
\def\SUF@sscorrect{\relax}
\def\SUF@ssscorrect{\hskip.5em}
\def\SUF@pcorrect{\hskip.5em}
\def\SUF@pcorrect{\hskip.5em}
\or
- \suftesi@toccompactsubsubsectrue
- \suftesi@toccompactpartrue
- \suftesi@toccompactsubpartrue
+ \suftesi@ctocsubsubsectrue
+ \suftesi@ctocpartrue
+ \suftesi@ctocsubpartrue
\def\SUF@sscorrect{\relax}
\def\SUF@ssscorrect{\relax}
\def\SUF@pcorrect{\hskip.5em}
\def\SUF@pcorrect{\hskip.5em}
\or
- \suftesi@toccompactpartrue
- \suftesi@toccompactsubpartrue
+ \suftesi@ctocpartrue
+ \suftesi@ctocsubpartrue
\def\SUF@sscorrect{\relax}
\def\SUF@ssscorrect{\relax}
\def\SUF@pcorrect{\relax}
\def\SUF@pcorrect{\hskip.5em}
\or
- \suftesi@toccompactsubpartrue
+ \suftesi@ctocsubpartrue
\def\SUF@sscorrect{\relax}
\def\SUF@ssscorrect{\relax}
\def\SUF@pcorrect{\relax}
@@ -3138,13 +3109,7 @@ cochineal,mathpazo,bera,amsthm}
\suftesi@twocolumnlottrue
\setkeys{}{tocstyle=ragged}
\fi}
-\define@choicekey{}{partialtoc}[\suftesi@val\suftesi@nr]
-{true,false}[true]{%
- \ifcase\suftesi@nr\relax
- \suftesi@partialtoctrue
- \or
- \suftesi@partialtocfalse
- \fi}
+\define@boolkey[SUF]{}{partialtoc}[true]{}
% \end{macrocode}
% \paragraph{Table of contents font}
% \begin{macrocode}
@@ -3250,9 +3215,9 @@ cochineal,mathpazo,bera,amsthm}
\def\SUF@Lheadstyle{\itshape}
\def\SUF@thepage{\thepage}
\or
- \def\SUF@Rheadstyle{\SUF@headingsmallcaps}
- \def\SUF@Lheadstyle{\SUF@headingsmallcaps}
- \def\SUF@thepage{\SUF@headingsmallcaps{\thepage}}
+ \def\SUF@Rheadstyle{\SUF@headersmallcaps}
+ \def\SUF@Lheadstyle{\SUF@headersmallcaps}
+ \def\SUF@thepage{\SUF@headersmallcaps{\thepage}}
\fi}
% \end{macrocode}
% \subsubsection{Text elements}
@@ -3319,13 +3284,7 @@ cochineal,mathpazo,bera,amsthm}
\renewcommand\@makefntext{%
\textsuperscript{\@thefnmark}\hskip.3em}
\fi}
-\define@choicekey{}{fewfootnotes}[\suftesi@val\suftesi@nr]
- {true,false}[true]{%
-\ifcase\suftesi@nr\relax
- \suftesi@fewfootnotestrue
-\or
- \relax
-\fi}
+\define@boolkey[SUF]{}{fewfootnotes}[true]{}
% \end{macrocode}
% \paragraph{Captions}
% \begin{macrocode}
@@ -3342,71 +3301,6 @@ cochineal,mathpazo,bera,amsthm}
\captionsetup{labelfont=sc}
\fi}
% \end{macrocode}
-% \paragraph{Marginal notes}
-% \begin{macrocode}
-\define@choicekey{}{marginpar}[\suftesi@val\suftesi@nr]
- {true,false}[true]{%
-\ifcase\suftesi@nr\relax
-\or
- \renewcommand\marginpar[2][]{}
-\fi}
-% \end{macrocode}
-% \subsubsection{Other options}
-% \paragraph{Part page}
-% \begin{macrocode}
-\define@choicekey{}{partpage}[\suftesi@val\suftesi@nr]
- {true,false}[true]{%
-\ifcase\suftesi@nr\relax
- \suftesi@partpagetrue
-\or
- \relax
-\fi}
-% \end{macrocode}
-% \paragraph{Draftdate}
-% \begin{macrocode}
-\define@choicekey{}{draftdate}[\suftesi@val\suftesi@nr]
- {true,false}[true]{%
-\ifcase\suftesi@nr\relax
- \suftesi@draftdatetrue
-\or
- \relax
-\fi}
-% \end{macrocode}
-% \paragraph{View mode}
-% \begin{macrocode}
-\define@choicekey{}{version}[\suftesi@val\suftesi@nr]
- {screen,cscreen,draft,final}[draft]{%
-\ifcase\suftesi@nr\relax
- \suftesi@screentrue
-\or
- \suftesi@screentrue
- \suftesi@screencenteredtrue
-\or
- \relax
-\or
- \AtBeginDocument{\crop[off]}
-\fi}
-\define@choicekey{}{crop}[\suftesi@val\suftesi@nr]
- {true,false}[true]{%
- \ClassWarningNoLine{suftesi}{%
- 'crop' option is deprecated.\MessageBreak
- Use 'version' option instead}
-\ifcase\suftesi@nr\relax
- \setkeys{}{version=draft}
-\or
- \setkeys{}{version=screen}
-\fi}
-% \end{macrocode}
-% \paragraph{Titlepage}
-% \begin{macrocode}
-\define@choicekey{}{titlepage}[\suftesi@val\suftesi@nr]
- {true,false}[true]{%
-\ifcase\suftesi@nr\relax
- \@titlepagetrue
-\or
- \@titlepagefalse
-\fi}
-% \end{macrocode}
% \paragraph{Pre-defined styles}
% \begin{macrocode}
\define@choicekey{}{style}[\suftesi@val\suftesi@nr]
@@ -3591,7 +3485,7 @@ cochineal,mathpazo,bera,amsthm}
\setkeys{}{
chapstyle=parright,
chapfont=smallcaps,
- tocchapfont=smallcaps,file:///tmp/mozilla_ivan0/luatex85.pdf
+ tocchapfont=smallcaps,
secfont=smallcaps,
headerfont=smallcaps}
\or
@@ -3658,75 +3552,50 @@ cochineal,mathpazo,bera,amsthm}
\define@choicekey{}{authortitlealign}[\suftesi@val\suftesi@nr]
{left,center,right}[left]{%
\ifcase\suftesi@nr\relax
- \def\SUF@lr@coll@titleSwitch{\filright}
-\or
- \def\SUF@lr@coll@titleSwitch{\filcenter}
-\or
- \def\SUF@lr@coll@titleSwitch{\filleft}
-\fi}
-\define@choicekey{}{papertitlestyle}[\suftesi@val\suftesi@nr]
- {left,center,right}[left]{%
-\ClassWarningNoLine{suftesi}{%
- 'papertitlestyle' option is deprecated.\MessageBreak
- Use 'authortitlealign' option instead}
-\ifcase\suftesi@nr\relax
- \def\SUF@lr@coll@titleSwitch{\filright}
+ \def\SUF@authortitle@align{\filright}
\or
- \def\SUF@lr@coll@titleSwitch{\filcenter}
+ \def\SUF@authortitle@align{\filcenter}
\or
- \def\SUF@lr@coll@titleSwitch{\filleft}
+ \def\SUF@authortitle@align{\filleft}
\fi}
\define@choicekey{}{reverseauthortitle}[\suftesi@val\suftesi@nr]
- {true,false}[false]{%
-\ifcase\suftesi@nr\relax
- \def\SUF@first{\SUF@Afont@style\SUF@Afont@shape\@author}
- \def\SUF@second{\SUF@Tfont@style\SUF@Tfont@shape\@title}
-\or
- \def\SUF@first{\SUF@Tfont@style\SUF@Tfont@shape\@title}
- \def\SUF@second{\SUF@Afont@style\SUF@Afont@shape\@author}
- \relax
-\fi}
-\define@choicekey{}{revauthortitle}[\suftesi@val\suftesi@nr]
- {true,false}[false]{%
-\ClassWarningNoLine{suftesi}{%
- 'revauthortitle' option is deprecated.\MessageBreak
- Use 'reverseauthortitle' option instead}
+ {true,false}[true]{%
\ifcase\suftesi@nr\relax
- \def\SUF@first{\SUF@Afont@style\SUF@Afont@shape\@author}
- \def\SUF@second{\SUF@Tfont@style\SUF@Tfont@shape\@title}
+ \def\SUF@first{\SUF@authorstyle\SUF@authorfont\@author}
+ \def\SUF@second{\SUF@titlestyle\SUF@titlefont\@title}
\or
- \def\SUF@first{\SUF@Tfont@style\SUF@Tfont@shape\@title}
- \def\SUF@second{\SUF@Afont@style\SUF@Afont@shape\@author}
+ \def\SUF@first{\SUF@titlestyle\SUF@titlefont\@title}
+ \def\SUF@second{\SUF@authorstyle\SUF@authorfont\@author}
\relax
\fi}
\define@choicekey{}{maketitlestyle}[\suftesi@val\suftesi@nr]
{suftesi,standard}[suftesi]{%
\ifcase\suftesi@nr\relax
- \def\SUF@Tfont@style{\SUF@chaptersize\color{sufred}\sffamily}
- \def\SUF@Afont@style{\small}
+ \def\SUF@titlestyle{\SUF@chaptersize\color{sufred}\sffamily}
+ \def\SUF@authorstyle{\small}
\def\SUF@datefont{\small}
\or
- \def\SUF@Tfont@style{\LARGE}
- \def\SUF@Afont@style{\large}
+ \def\SUF@titlestyle{\LARGE}
+ \def\SUF@authorstyle{\large}
\def\SUF@datefont{\small}
\fi}
\define@choicekey{}{titlefont}[\suftesi@val\suftesi@nr]
{roman,italic,smallcaps}[suftesi]{%
\ifcase\suftesi@nr\relax
- \def\SUF@Tfont@shape{\relax}
+ \def\SUF@titlefont{\relax}
\or
- \def\SUF@Tfont@shape{\itshape}
+ \def\SUF@titlefont{\itshape}
\or
- \def\SUF@Tfont@shape{\expandafter\SUF@titlesmallcaps}
+ \def\SUF@titlefont{\expandafter\SUF@titlesmallcaps}
\fi}
\define@choicekey{}{authorfont}[\suftesi@val\suftesi@nr]
{roman,italic,smallcaps}[suftesi]{%
\ifcase\suftesi@nr\relax
- \def\SUF@Afont@shape{\relax}
+ \def\SUF@authorfont{\relax}
\or
- \def\SUF@Afont@shape{\itshape}
+ \def\SUF@authorfont{\itshape}
\or
- \def\SUF@Afont@shape{\expandafter\SUF@titlesmallcaps}
+ \def\SUF@authorfont{\expandafter\SUF@titlesmallcaps}
\fi}
\define@choicekey{}{datefont}[\suftesi@val\suftesi@nr]
{roman,italic,smallcaps}[roman]{%
@@ -3756,8 +3625,59 @@ cochineal,mathpazo,bera,amsthm}
\def\SUF@tocAUT@font{\expandafter\SUF@TOCtitlesmallcaps}
\fi}
% \end{macrocode}
-% \subsubsection{Execute options}
+% \subsubsection{Deprecated options}
% \begin{macrocode}
+\define@choicekey{}{documentstructure}[\suftesi@val\suftesi@nr]
+ {book,article,collection}[book]{%
+\ClassWarningNoLine{suftesi}{%
+ 'documentstructure' option is deprecated.\MessageBreak
+ Use 'structure' option instead}
+\ifcase\suftesi@nr\relax
+ \setkeys{}{structure=book}
+\or
+ \setkeys{}{structure=article}
+\or
+ \setkeys{}{structure=collection}
+\fi}
+\define@choicekey{}{crop}[\suftesi@val\suftesi@nr]
+ {true,false}[true]{%
+ \ClassWarningNoLine{suftesi}{%
+ 'crop' option is deprecated.\MessageBreak
+ Use 'version' option instead}
+\ifcase\suftesi@nr\relax
+ \setkeys{}{version=draft}
+\or
+ \setkeys{}{version=screen}
+\fi}
+\define@choicekey{}{papertitlestyle}[\suftesi@val\suftesi@nr]
+ {left,center,right}[left]{%
+\ClassWarningNoLine{suftesi}{%
+ 'papertitlestyle' option is deprecated.\MessageBreak
+ Use 'authortitlealign' option instead}
+\ifcase\suftesi@nr\relax
+ \def\SUF@authortitle@align{\filright}
+\or
+ \def\SUF@authortitle@align{\filcenter}
+\or
+ \def\SUF@authortitle@align{\filleft}
+\fi}
+\define@choicekey{}{revauthortitle}[\suftesi@val\suftesi@nr]
+ {true,false}[true]{%
+\ClassWarningNoLine{suftesi}{%
+ 'revauthortitle' option is deprecated.\MessageBreak
+ Use 'reverseauthortitle' option instead}
+\ifcase\suftesi@nr\relax
+ \def\SUF@first{\SUF@authorstyle\SUF@authorfont\@author}
+ \def\SUF@second{\SUF@titlestyle\SUF@titlefont\@title}
+\or
+ \def\SUF@first{\SUF@titlestyle\SUF@titlefont\@title}
+ \def\SUF@second{\SUF@authorstyle\SUF@authorfont\@author}
+ \relax
+\fi}
+% \end{macrocode}
+% \subsubsection{Options processing}
+% \begin{macrocode}
+\ProcessOptionsX[SUF]<>\relax
\ExecuteOptionsX<>{
structure=book,
pagelayout=standard,
@@ -3772,7 +3692,6 @@ cochineal,mathpazo,bera,amsthm}
quotesize=footnotesize,
quotestyle=center,
captionstyle=standard,
- marginpar=true,
tocstyle=standard,
partstyle=left,
chapstyle=left,
@@ -3806,40 +3725,41 @@ cochineal,mathpazo,bera,amsthm}
tocauthorfont=roman,
reverseauthortitle=false,
authortitlealign=left}
-\ProcessOptionsX<>\relax
-% \end{macrocode}
-% The use of the \cmd{XKV@useoption} command, provided by
-% the \sty{xkeyval}, is a trick to delete the option given as
-% its argument from the list stored in \cmd{@unusedoptionlist}
-% so that the option will not produce the ``Unused global options''
-% message:
-% \begin{macrocode}
-\XKV@useoption{a4paper}
-\XKV@useoption{10pt}
-\XKV@useoption{11pt}
-\XKV@useoption{12pt}
-\XKV@useoption{oneside}
-\XKV@useoption{twoside}
-\XKV@useoption{onecolumn}
-\XKV@useoption{twocolumn}
-\XKV@useoption{titlepage}
-\XKV@useoption{notitlepage}
-\XKV@useoption{openright}
-\XKV@useoption{openany}
-\XKV@useoption{leqno}
-\XKV@useoption{fleqn}
-\XKV@useoption{a5paper}
-\XKV@useoption{b5paper}
-\XKV@useoption{legalpaper}
-\XKV@useoption{executivepaper}
-\XKV@useoption{landscape}
% \end{macrocode}
% A trick to delete the class options from \cmd{XKV@classoptionslist},
% in order to avoid incompatibility with packages using options
-% defined by \sty{suftesi} too. Thanks to Enrico Gregorio!
+% defined by \sty{suftesi} too. Thanks to Enrico Gregorio! (In previous versions
+% this command was placed after the option processing. Move it back if needed.)
% \begin{macrocode}
\def\XKV@classoptionslist{}
+\ProcessOptionsX<>\relax
% \end{macrocode}
+% ^^A The use of the \cmd{XKV@useoption} command, provided by
+% ^^A the \sty{xkeyval}, is a trick to delete the option given as
+% ^^A its argument from the list stored in \cmd{@unusedoptionlist}
+% ^^A so that the option will not produce the ``Unused global options''
+% ^^A message:
+% ^^A \begin{macrocode}
+% ^^A\XKV@useoption{a4paper}
+% ^^A\XKV@useoption{10pt}
+% ^^A\XKV@useoption{11pt}
+% ^^A\XKV@useoption{12pt}
+% ^^A\XKV@useoption{oneside}
+% ^^A\XKV@useoption{twoside}
+% ^^A\XKV@useoption{onecolumn}
+% ^^A\XKV@useoption{twocolumn}
+% ^^A\XKV@useoption{titlepage}
+% ^^A\XKV@useoption{notitlepage}
+% ^^A\XKV@useoption{openright}
+% ^^A\XKV@useoption{openany}
+% ^^A\XKV@useoption{leqno}
+% ^^A\XKV@useoption{fleqn}
+% ^^A\XKV@useoption{a5paper}
+% ^^A\XKV@useoption{b5paper}
+% ^^A\XKV@useoption{legalpaper}
+% ^^A\XKV@useoption{executivepaper}
+% ^^A\XKV@useoption{landscape}
+% ^^A \end{macrocode}
% \subsection{Basic packages}
% \begin{macrocode}
\RequirePackage{multicol}
@@ -3851,14 +3771,12 @@ cochineal,mathpazo,bera,amsthm}
\RequirePackage{iftex}
\ifLuaTeX
\RequirePackage{luatex85}
- \else
\fi
% \end{macrocode}
% The FSPL style requires a verbose colophon which uses specific icons:
% \begin{macrocode}
\ifsuftesi@FSPL
\RequirePackage{cclicenses}
- \else
\fi
% \end{macrocode}
% If \opt{version=screen} or \opt{version=cscreen} the \sty{crop} package is not loaded. This can create problems if the \cmd{crop} command has been used in the document, for example to remove the crop marks from a certain page onwards (with \cmd{crop}|[off]|). For this reason, the \cmd{crop} command is defined (in practice it is rendered ineffective) so as not to produce errors if it had been used within the document.
@@ -3911,7 +3829,7 @@ cochineal,mathpazo,bera,amsthm}
\suftesi@greekfontfalse
\else\suftesi@greekfontfalse\fi
\else
-\ifsuftesi@standard
+\ifsuftesi@lmodern
\RequirePackage{lmodern}
\ifsuftesi@greekfont
\ClassWarningNoLine{suftesi}{%
@@ -3925,7 +3843,7 @@ cochineal,mathpazo,bera,amsthm}
% Now this combination is provided only
% for backward compatibility.
% \begin{macrocode}
- \ifsuftesi@compatibility
+ \ifsuftesi@mathpazo
\RequirePackage[osf,sc]{mathpazo}
\RequirePackage[scaled=0.8]{beramono}
\renewcommand{\sfdefault}{iwona}
@@ -4151,88 +4069,86 @@ cochineal,mathpazo,bera,amsthm}
\setlength{\sectionsep}{\dimexpr(\baselineskip) plus 1pt minus 1pt}
\unless\ifPDFTeX
\DeclareRobustCommand{\SUF@TOCtitlesmallcaps}[1]{%
- \addfontfeature{LetterSpace=10}\scshape\suftesi@MakeTextTOCLowercase{#1}}
+ \addfontfeature{LetterSpace=10}\scshape\SUF@TOCMakeLowercase{#1}}
\DeclareRobustCommand{\SUF@titlesmallcaps}[1]{%
- \addfontfeature{LetterSpace=10}\scshape\suftesi@MakeTextLowercase{#1}}
- \DeclareRobustCommand{\SUF@headingsmallcaps}[1]{%
- \addfontfeature{LetterSpace=10}\scshape\suftesi@MakeTextLowercase{#1}}
+ \addfontfeature{LetterSpace=10}\scshape\SUF@MakeLowercase{#1}}
+ \DeclareRobustCommand{\SUF@headersmallcaps}[1]{%
+ \addfontfeature{LetterSpace=10}\scshape\SUF@MakeLowercase{#1}}
\else
\DeclareRobustCommand{\SUF@TOCtitlesmallcaps}[1]{%
- \scshape\suftesi@MakeTextTOCLowercase{\textls*{#1}}}%
+ \scshape\SUF@TOCMakeLowercase{\textls*{#1}}}%
\DeclareRobustCommand{\SUF@titlesmallcaps}[1]{%
- \scshape\suftesi@MakeTextLowercase{\textls*{#1}}}%
- \DeclareRobustCommand{\SUF@headingsmallcaps}[1]{%
- \scshape\suftesi@MakeTextLowercase{\textls*{#1}}}%
+ \scshape\SUF@MakeLowercase{\textls*{#1}}}%
+ \DeclareRobustCommand{\SUF@headersmallcaps}[1]{%
+ \scshape\SUF@MakeLowercase{\textls*{#1}}}%
\fi
% \end{macrocode}
% \subsubsection{Default styles}
% \begin{macrocode}
-\newlength\SUF@ADJnumparchap
+\newlength\SUF@chapbeforesep
\def\SUF@default@CHAPTER{
\ifsuftesi@numparchap
\titleformat{\chapter}[display]
- {\startpartialtoc\SUF@chaptersize\SUF@lr@CHAPSwitch}
+ {\startchappartialtoc\SUF@chaptersize\SUF@CHAP@align}
{\SUF@thechapter\SUF@dotchap}
{2ex}
- {\SUF@CHAP@StyleSwitch}
- [\printpartialtoc]
+ {\SUF@CHAP@font}
\else
\titleformat{\chapter}[hang]
- {\startpartialtoc\SUF@chaptersize\SUF@lr@CHAPSwitch}
+ {\startchappartialtoc\SUF@chaptersize\SUF@CHAP@align}
{\SUF@thechapter\SUF@dotchap}
{3em}
- {\SUF@CHAP@StyleSwitch}
- [\printpartialtoc]
+ {\SUF@CHAP@font}
\fi
\ifsuftesi@numparchap
- \setlength{\SUF@ADJnumparchap}{-6ex}
+ \setlength{\SUF@chapbeforesep}{-6ex}
\else
- \setlength{\SUF@ADJnumparchap}{0pt}
+ \setlength{\SUF@chapbeforesep}{0pt}
\fi}
\def\SUF@default@SECTIONS{
\ifsuftesi@numparsec
\titleformat{\section}[display]
- {\SUF@sectionsize\SUF@lr@SECSwitch}
+ {\startsecpartialtoc\SUF@sectionsize\SUF@SEC@align}
{\SUF@thesection\SUF@dotsec}
{0ex}
- {\SUF@SEC@StyleSwitch}
+ {\SUF@SEC@font}
\titlespacing*{\section}{0em}{\sectionsep}{\sectionsep}[0em]
\else
\titleformat{\section}[hang]
- {\SUF@sectionsize\SUF@lr@SECSwitch}
+ {\startsecpartialtoc\SUF@sectionsize\SUF@SEC@align}
{\SUF@thesection\SUF@dotsec}
{1em}
- {\SUF@SEC@StyleSwitch}
+ {\SUF@SEC@font}
\titlespacing*{\section}{0ex}{\sectionsep}{\sectionsep}[0ex]
\fi
\ifsuftesi@numparsubsec
\titleformat{\subsection}[display]
- {\SUF@subsectionsize\SUF@lr@SUBSECSwitch}
+ {\SUF@subsectionsize\SUF@SUBSEC@align}
{\textnormal\SUF@thesubsection\SUF@dotsubsec}
{0ex}
- {\SUF@SUBSEC@StyleSwitch}
+ {\SUF@SUBSEC@font}
\titlespacing*{\subsection}{0em}{\sectionsep}{\sectionsep}[0em]
\else
\titleformat{\subsection}[hang]
- {\SUF@subsectionsize\SUF@lr@SUBSECSwitch}
+ {\SUF@subsectionsize\SUF@SUBSEC@align}
{\textnormal\SUF@thesubsection\SUF@dotsubsec}
{1em}
- {\SUF@SUBSEC@StyleSwitch}
+ {\SUF@SUBSEC@font}
\titlespacing*{\subsection}{\parindent}{\sectionsep}{\sectionsep}[0ex]
\fi
\ifsuftesi@numparsubsubsec
\titleformat{\subsubsection}[display]
- {\SUF@subsectionsize\SUF@lr@SUBSUBSECSwitch}
+ {\SUF@subsectionsize\SUF@SUBSUBSEC@align}
{\textnormal\SUF@thesubsubsection\SUF@dotsubsubsec}
{0ex}
- {\SUF@SUBSUBSEC@StyleSwitch}
+ {\SUF@SUBSUBSEC@font}
\titlespacing*{\subsubsection}{0em}{\sectionsep}{\sectionsep}[0em]
\else
\titleformat{\subsubsection}[hang]
- {\SUF@subsectionsize\SUF@lr@SUBSUBSECSwitch}
+ {\SUF@subsectionsize\SUF@SUBSUBSEC@align}
{\textnormal\SUF@thesubsubsection\SUF@dotsubsubsec}
{1em}
- {\SUF@SUBSUBSEC@StyleSwitch}
+ {\SUF@SUBSUBSEC@font}
\titlespacing*{\subsubsection}{\parindent}{\sectionsep}{\sectionsep}[0ex]
\fi}
\SUF@default@CHAPTER
@@ -4241,43 +4157,43 @@ cochineal,mathpazo,bera,amsthm}
% \subsubsection{Sections spacing}
% \begin{macrocode}
\ifsuftesi@periodical
- \titlespacing*{\chapter}{0em}{\SUF@ADJnumparchap}{18ex}
+ \titlespacing*{\chapter}{0em}{\SUF@chapbeforesep}{18ex}
\titlespacing*{name=\chapter,numberless}{0em}{0pt}{18ex}
\else
\ifsuftesi@periodicalaureo
- \titlespacing*{\chapter}{0em}{\SUF@ADJnumparchap}{18ex}
+ \titlespacing*{\chapter}{0em}{\SUF@chapbeforesep}{18ex}
\titlespacing*{name=\chapter,numberless}{0em}{0pt}{18ex}
\else
\ifsuftesi@compact
- \titlespacing*{\chapter}{0em}{\SUF@ADJnumparchap}{18ex}
+ \titlespacing*{\chapter}{0em}{\SUF@chapbeforesep}{18ex}
\titlespacing*{name=\chapter,numberless}{0em}{0pt}{18ex}
\else
\ifsuftesi@compactaureo
- \titlespacing*{\chapter}{0em}{\SUF@ADJnumparchap}{18ex}
+ \titlespacing*{\chapter}{0em}{\SUF@chapbeforesep}{18ex}
\titlespacing*{name=\chapter,numberless}{0em}{0pt}{18ex}
\else
\ifsuftesi@supercompact
- \titlespacing*{\chapter}{0em}{\SUF@ADJnumparchap}{18ex}
+ \titlespacing*{\chapter}{0em}{\SUF@chapbeforesep}{18ex}
\titlespacing*{name=\chapter,numberless}{0em}{0pt}{18ex}
\else
\ifsuftesi@supercompactaureo
- \titlespacing*{\chapter}{0em}{\SUF@ADJnumparchap}{18ex}
+ \titlespacing*{\chapter}{0em}{\SUF@chapbeforesep}{18ex}
\titlespacing*{name=\chapter,numberless}{0em}{0pt}{18ex}
\else
\ifsuftesi@pocketa
- \titlespacing*{\chapter}{0em}{\SUF@ADJnumparchap}{18ex}
+ \titlespacing*{\chapter}{0em}{\SUF@chapbeforesep}{18ex}
\titlespacing*{name=\chapter,numberless}{0em}{0pt}{18ex}
\else
\ifsuftesi@pocketb
- \titlespacing*{\chapter}{0em}{\SUF@ADJnumparchap}{18ex}
+ \titlespacing*{\chapter}{0em}{\SUF@chapbeforesep}{18ex}
\titlespacing*{name=\chapter,numberless}{0em}{0pt}{18ex}
\else
\ifsuftesi@pocketc
- \titlespacing*{\chapter}{0em}{\SUF@ADJnumparchap}{18ex}
+ \titlespacing*{\chapter}{0em}{\SUF@chapbeforesep}{18ex}
\titlespacing*{name=\chapter,numberless}{0em}{0pt}{18ex}
\else
\titlespacing*{\chapter}{0em}{%
- \dimexpr(6ex+\SUF@ADJnumparchap)}{18ex}
+ \dimexpr(6ex+\SUF@chapbeforesep)}{18ex}
\titlespacing*{name=\chapter,numberless}{0em}{6ex}{18ex}
\fi
\fi
@@ -4313,7 +4229,7 @@ cochineal,mathpazo,bera,amsthm}
% \subsection*{The \cmd{part} command}
% \begin{macrocode}
\renewcommand\part{%
- \ifsuftesi@partpage
+ \ifSUF@partpage
\if@openright
\cleardoublepage
\else
@@ -4327,7 +4243,7 @@ cochineal,mathpazo,bera,amsthm}
\else
\@tempswafalse
\fi
- \ifsuftesi@partpage
+ \ifSUF@partpage
\null\vfil
\fi
\secdef\@part\@spart}
@@ -4343,7 +4259,7 @@ cochineal,mathpazo,bera,amsthm}
\SUF@tocPART@font#1}%
\fi
\markboth{}{}%
- {\SUF@lr@PARTSwitch\SUF@partsize
+ {\SUF@PART@align\SUF@partsize
\interlinepenalty \@M
\ifnum \c@secnumdepth >-2\relax
\addvspace{4ex}
@@ -4354,17 +4270,17 @@ cochineal,mathpazo,bera,amsthm}
\else
\hspace{1em}
\fi
- \noindent\SUF@PART@StyleSwitch#2\par}%
+ \noindent\SUF@PART@font#2\par}%
\@endpart}
\def\@spart#1{%
- {\SUF@lr@PARTSwitch\SUF@partsize
+ {\SUF@PART@align\SUF@partsize
\interlinepenalty \@M
\addvspace{4ex}
- \noindent\SUF@PART@StyleSwitch#1\par}%
+ \noindent\SUF@PART@font#1\par}%
\@endpart}
\ifsuftesi@article
\def\@endpart{%
- \ifsuftesi@partpage
+ \ifSUF@partpage
\vfil\newpage
\if@twoside
\if@openright
@@ -4397,14 +4313,14 @@ cochineal,mathpazo,bera,amsthm}
{}
{\theparagraph}
{.5em}
- {\SUF@PAR@StyleSwitch}
+ {\SUF@PAR@font}
[{.}\hspace*{1em}]
\titlespacing*{\paragraph}{\parindent}{.5\sectionsep}{.5\sectionsep}
\titleformat{\subparagraph}[runin]
{}
{\thesubparagraph}
{.5em}
- {\SUF@SUBPAR@StyleSwitch}
+ {\SUF@SUBPAR@font}
[{.}\hspace*{1em}]
\titlespacing*{\subparagraph}{\parindent}{.5\sectionsep}{.5\sectionsep}
% \end{macrocode}
@@ -4475,487 +4391,88 @@ cochineal,mathpazo,bera,amsthm}
{\relax}}
\fi
% \end{macrocode}
-% \subsection{Cover page}
+% \subsubsection{Commands for sections font}
% \begin{macrocode}
-\newcommand{\Ctitle}[1]{\def\@Ctitle{#1}}
-\newcommand{\Csubtitle}[1]{\def\@Csubtitle{#1}}
-\newcommand{\Cauthor}[1]{\def\@Cauthor{#1}}
-\newcommand{\Ceditor}[1]{\def\@Ceditor{#1}}
-\newcommand{\Cfoot}[1]{\def\@Cfoot{#1}}
-\newcommand{\Cpagecolor}[1]{\def\@Cpagecolor{#1}}
-\newcommand{\Ccirclecolor}[1]{\def\@Ccirclecolor{#1}}
-\newcommand{\Ctextcolor}[1]{\def\@Ctextcolor{#1}}
-\newcommand{\Cfootcolor}[1]{\def\@Cfootcolor{#1}}
-\Cauthor{}
-\Ctitle{}
-\Csubtitle{}
-\Ceditor{}
-\Cfoot{}
-\Cpagecolor{gray!30}
-\Ctextcolor{white}
-\Cfootcolor{black}
-\AtBeginDocument{
-\@ifpackageloaded{tikz}{%
-\newcommand\makecover[1][]{%
-\begin{titlepage}
-\begin{tikzpicture}[overlay,remember picture]
- \draw[draw=none,fill=\@Cpagecolor]
- (current page.north west) rectangle (current page.south east);
- \node[anchor=center,yshift=.22\paperwidth] at (current page.center) (c) {};
- \draw[draw=none,fill=gray,#1]
- (c) circle (.38\paperwidth) ;
- \node[anchor=center] at (c) (author) {%
-\parbox{.7\paperwidth}{%
- \centering
- \ifx\@Cauthor\@empty
- \else
- {\scshape\color{\@Ctextcolor}\@Cauthor\\}
- \vspace*{\baselineskip}
- \fi
-
- \ifx\@Ctitle\@empty
- \else
- {\Huge\bfseries\color{\@Ctextcolor}\@Ctitle\\[1ex]}
- \fi
-
- \ifx\@Csubtitle\@empty
- \else
- {\smallskip\Large\color{\@Ctextcolor}\@Csubtitle\\}
- \fi
-
- \ifx\@Ceditor\@empty
- \else
- {\vspace*{2\baselineskip}\color{\@Ctextcolor}\@Ceditor\\}
- \fi}
-};
-\ifx\@Cfoot\@empty\else
- \node[xshift=.5\paperwidth,yshift=1cm,
- align=center,text=\@Cfootcolor,anchor=south]
- at (current page.south west) {\@Cfoot};
-\fi
-\end{tikzpicture}
-\end{titlepage}
-}
-}
-{\def\makecover{\ClassError{suftesi}{\MessageBreak%
- ***********************************\MessageBreak
- * To use the \noexpand\makecover command\MessageBreak
- * load the 'tikz' package.\MessageBreak
- ************************************}{\MessageBreak%
- ***********************************\MessageBreak
- * To use the \noexpand\makecover command\MessageBreak
- * load the 'tikz' package.\MessageBreak
- ************************************}}}
-}
+\newcommand{\partfont}[1]{\def\SUF@PART@font{#1}}
+\newcommand{\chapfont}[1]{\def\SUF@CHAP@font{#1}}
+\newcommand{\secfont}[1]{\def\SUF@SEC@font{#1}}
+\newcommand{\subsecfont}[1]{\def\SUF@SUBSEC@font{#1}}
+\newcommand{\subsubsecfont}[1]{\def\SUF@SUBSUBSEC@font{#1}}
+\newcommand{\partnumfont}[1]{\def\SUF@PART@font{#1}}\partnumfont{}
+\newcommand{\chapnumfont}[1]{\def\SUF@thechapter{#1}}
+\newcommand{\secnumfont}[1]{\def\SUF@thesection{#1}}
+\newcommand{\subsecnumfont}[1]{\def\SUF@thesubsection{#1}}
+\newcommand{\subsubsecnumfont}[1]{\def\SUF@thesubsubsection{#1}}
+\newcommand{\titlefont}[1]{\def\SUF@titlestyle{#1}\let\SUF@titlefont\relax}
+\newcommand{\authorfont}[1]{\def\SUF@authorstyle{#1}\let\SUF@authorfont\relax}
+\newcommand{\datefont}[1]{\def\SUF@datefont{#1}}
% \end{macrocode}
-% \subsection{Title page}
-% The new \cmd{title} command has an optional argument
-% which can be used in the headers.
+% \subsubsection{Commands for breaking titles}
+% Two commands for manual breaks active, respectively, only in the table of contents and in the body text. The solution was initially made available by Enrico Gregorio many years ago in one of the first versions of the class (at that time the commands were called \cmd{headbreak} and \cmd{xheadbreak}). Later, while I was working on version 3.0, I noticed an alignment problem in the chapter titles when using the \opt{chapstyle=left} option. So I added the \cmd{breakinbodyleft} command and updated the command names to make them more recognizable. Old names are in any case available for backwards compatibility.
% \begin{macrocode}
-\def\isbn#1{\gdef\@isbn{#1}}
-\def\@issn{\@latex@warning@no@line{%
- No \noexpand\isbn given}}
-\def\doi#1{\gdef\@doi{#1}}
-\def\@doi{\@latex@warning@no@line{%
- No \noexpand\doi given}}
-\def\isbn#1{\gdef\@issn{#1}}
-\def\@issn{\@latex@warning@no@line{%
- No \noexpand\isbn given}}
-\renewcommand*{\title}[2][]{\gdef\@headtitle{#1}\gdef\@title{#2}}
-\edef\title{\noexpand\@dblarg
- \expandafter\noexpand\csname\string\title\endcsname}
-\def\@headtitle{--missing title--%
- \protect\ClassWarningNoLine{suftesi}{%
- No \string\title\space given \MessageBreak%
- See the class documentation for explanation}}
-\def\@title{--missing title--%
- \protect\ClassWarningNoLine{suftesi}{%
- No \string\title\space given\MessageBreak%
- See the class documentation for explanation}}
-\def\@author{--missing author--%
- \protect\ClassWarningNoLine{suftesi}{%
- No \string\author\space given\MessageBreak%
- See the class documentation for explanation}}
-\if@titlepage
- \renewcommand\maketitle{%
- \begin{titlepage}
- \let\footnotesize\small
- \let\footnoterule\relax
- \let \footnote \thanks
- \renewcommand\thefootnote{\@fnsymbol\c@footnote}%
- \null\vfil
- \vskip 60\p@
- \begin{center}%
- {\SUF@first\par}%
- \vskip 3em%
- {\lineskip .75em%
- \begin{tabular}[t]{c}%
- \SUF@second
- \end{tabular}\par}%
- \vskip 1.5em%
- {\SUF@datefont\@date\par}%
- \end{center}\par
- \@thanks
- \vfil\null
- \end{titlepage}%
- \setcounter{footnote}{0}%
- \global\let\thanks\relax
- \global\let\maketitle\relax
- \global\let\@thanks\@empty
- \global\let\@date\@empty
- \global\let\date\relax
- \global\let\and\relax}
-\else
-\renewcommand\maketitle{\par
- \begingroup
- \renewcommand\thefootnote{\@fnsymbol\c@footnote}%
- \def\@makefnmark{\rlap{\@textsuperscript{\normalfont\@thefnmark}}}%
- \long\def\@makefntext##1{\parindent 1em\noindent
- \hb@xt@1.8em{%
- \hss\@textsuperscript{\normalfont\@thefnmark}}##1}%
- \if@twocolumn
- \ifnum \col@number=\@ne
- \@maketitle
- \else
- \twocolumn[\@maketitle]%
- \fi
- \else
- \newpage
- \global\@topnum\z@% Prevents figures from going at top of page.
- \@maketitle
- \fi
- \thispagestyle{plain}\@thanks
- \endgroup
- \setcounter{footnote}{0}%
- \global\let\thanks\relax
- \global\let\maketitle\relax
- \global\let\@maketitle\relax
- \global\let\@thanks\@empty
- \global\let\@date\@empty
- \global\let\date\relax
- \global\let\and\relax}
-\def\@maketitle{%
- \newpage
- \null
- \vskip 2em%
- \begin{center}%
- \let \footnote \thanks
- {\SUF@first\par}%
- \vskip 1.5em%
- {\lineskip .5em%
- \begin{tabular}[t]{c}%
- \SUF@second\par
- \end{tabular}\par}%
- \vskip 1em%
- {\SUF@datefont\@date\par}%
- \end{center}%
- \par
- \vskip 1.5em}
-\fi
+\newif\ifbreakintoc\breakintocfalse
+\newif\ifbreakinbody\breakinbodytrue
+\DeclareRobustCommand{\breakintoc}
+ {\ifbreakintoc\\\else\fi}
+\DeclareRobustCommand{\breakinbody}
+ {\ifbreakinbody\\\else\fi}
+\DeclareRobustCommand{\breakinbodyleft}
+ {\ifbreakinbody\newline\else\fi}
+\let\origtableofcontents\tableofcontents
+\renewcommand{\tableofcontents}{%
+ \begingroup
+ \breakintoctrue\breakinbodyfalse%
+ \origtableofcontents
+ \endgroup}
+\DeclareRobustCommand{\headbreak}
+ {\ifbreakintoc\\\else\fi}
+\DeclareRobustCommand{\xheadbreak}
+ {\ifbreakinbody\\\else\fi}
+\DeclareRobustCommand{\yheadbreak}
+ {\ifbreakinbody\newline\else\fi}
% \end{macrocode}
-% \subsection{The \opt{collection} structure}
+% \subsubsection{Abstract}
% \begin{macrocode}
\ifsuftesi@collection
-\newcounter{journalnumber}
-\newcounter{journalvolume}
-\newcounter{issue}
-\newcounter{title}
-\setcounter{title}{1}
-\newcounter{article}
-\setcounter{article}{0}
-\setcounter{journalnumber}{0}
-\setcounter{tocdepth}{0}
-\def\journalname#1{\gdef\@journalname{#1}}
- \def\@journalname{\@latex@warning@no@line{%
- No \noexpand\journalname given}}
-\def\journalvolume#1{\gdef\@journalvolume{#1}}
- \def\@journalvolume{\@latex@warning@no@line{%
- No \noexpand\journalvolume given}}
-\def\journalnumber#1{\gdef\@journalnumber{#1}}
- \def\@journalnumber{\@latex@warning@no@line{%
- No \noexpand\journalnumber given}}
-\def\issue#1{\gdef\@issue{#1}}
- \def\@issue{\@latex@warning@no@line{%
- No \noexpand\issue given}}
-\def\journalyear#1{\gdef\@journalyear{#1}}
- \def\@journalyear{\@latex@warning@no@line{%
- No \noexpand\journalyear given}}
-\def\journalwebsite#1{\gdef\@journalwebsite{\url{#1}}}
- \def\@journalwebsite{\@latex@warning@no@line{%
- No \noexpand\journalwebsite given}}
-\def\thanks#1{\footnotemark\ \protected@xdef\@thanks{%
- \@thanks\protect\footnotetext[\the\c@footnote]{#1}}}
-\def\fulljournal{\emph{\@journalname} \@journalnumber, %
- \@issue{} \@journalyear}
-\def\issuename#1{\gdef\@issuename{#1}}
-\def\collectiontitle#1{\gdef\@collectiontitle{#1}}
- \def\@collectiontitle{\@latex@warning@no@line{%
- No \noexpand\collectiontitle given}}
-\def\collectioneditor#1{\gdef\@collectioneditor{#1}}
- \def\@collectioneditor{\@latex@warning@no@line{%
- No \noexpand\collectioneditor given}}
-\renewcommand*{\title}[2][]{%
- \gdef\@headtitle{#1}\gdef\@title{#2}\markright{#1}}
- \edef\title{\noexpand\@dblarg
- \expandafter\noexpand\csname\string\title\endcsname}
- \def\@headtitle{--missing title--%
- \protect\ClassWarningNoLine{suftesi}{%
- No \string\title\space given \MessageBreak%
- See the class documentation for explanation}}
- \def\@title{--missing title--%
- \protect\ClassWarningNoLine{suftesi}{%
- No \string\title\space given\MessageBreak%
- See the class documentation for explanation}}
- \def\@author{--missing author--%
- \protect\ClassWarningNoLine{suftesi}{%
- No \string\author\space given\MessageBreak%
- See the class documentation for explanation}}
-\newcommand*\l@title[2]{%
- \ifnum \c@tocdepth >\m@ne
- \addpenalty{-\@highpenalty}%
- \vskip 1.0ex \@plus\p@
- \begingroup
- \parindent \z@ \rightskip \@pnumwidth
- \parfillskip -\@pnumwidth
- \advance\leftskip1em
- \hskip -\leftskip
- #1\nobreak%
- \ifsuftesi@dottedtoc\dotfill%
- \nobreak\hb@xt@\@pnumwidth{\hss #2}\par
- \else
- \ifsuftesi@raggedtoc%
- \nobreak\hskip1em #2 \hfill\null\par
- \else
- \ifsuftesi@pagelefttoc
- \ClassError{suftesi}
- {\MessageBreak
- You can not use tocstyle=leftpage\MessageBreak
- with structure=collection}
- {You can not use tocstyle=leftpage\MessageBreak
- with structure=collection}
- \else
- \nobreak\hfill #2\par
- \fi
- \fi
- \fi
- \penalty\@highpenalty
- \endgroup
- \fi}
-\renewcommand\maketitle{\par
- \begingroup
- \renewcommand\thefootnote{\@fnsymbol\c@footnote}%
- \def\@makefnmark{\rlap{\@textsuperscript{\normalfont\@thefnmark}}}%
- \long\def\@makefntext##1{\parindent 1em\noindent
- \hb@xt@1.8em{%
- \hss\@textsuperscript{\normalfont\@thefnmark}}##1}%
- \if@twocolumn
- \ifnum \col@number=\@ne
- \@maketitle
+ \newenvironment{abstract}{%
+ \if@twocolumn
+ \section*{\abstractname}%
\else
- \twocolumn[\@maketitle]%
- \fi
- \else
- \newpage
- \global\@topnum\z@ % Prevents figures from going at top of page.
- \@maketitle
- \fi
- \thispagestyle{plain}\@thanks%
- \endgroup
- \setcounter{section}{0}%
-% \setcounter{footnote}{0}%
-% \global\let\thanks\relax
-% \global\let\maketitle\relax
-% \global\let\@maketitle\relax
-% \global\let\@thanks\@empty
-% \global\let\@author\@empty
-% \global\let\@date\@empty
-% \global\let\@title\@empty
-% \global\let\title\relax
-% \global\let\author\relax
-% \global\let\date\relax
- \global\let\and\relax
- \let\thanks\@gobble}
-\AtBeginDocument{\def\@maketitle{%
- \refstepcounter{article}
- \SUF@chaptersize
- \SUF@lr@coll@titleSwitch
- \let\footnote\thanks
- \parindent=0pt
- {\SUF@second}%
- \label{begin:\thearticle}
-% \end{macrocode}
-% Check if you don't use \sty{hyperrref} provided by Enrico Gregorio
-% (\url{https://tex.stackexchange.com/a/427203/231952}):
-% \begin{macrocode}
- \@ifundefined{Hy@raisedlink}{\let\texorpdfstring\@firstoftwo}{%
- \xdef\@currentHref{title.\thearticle}%
- \Hy@raisedlink{\hyper@anchorstart{\@currentHref}\hyper@anchorend}%
- }%
-% \end{macrocode}
-% \begin{macrocode}
- \csname toc@entry@\endcsname
- \begingroup%
- \let\thanks\@gobble
- \addcontentsline{toc}{title}{%
- {\SUF@tocAUT@font{\@author}}\texorpdfstring{\newline}{, }%
- {\SUF@tocTIT@font{\@headtitle}}}
- \endgroup%
- \par\nobreak\vspace{2ex}
- {\SUF@first%
- \vskip1.5cm}}%
- }
-% \newenvironment{article}
-% {\begingroup
-% \global\let\@thanks\@empty
-% \setcounter{footnote}{0}
-% \refstepcounter{article}
-% \label{begin:\thearticle}
-%}
-% {\label{end:\thearticle}\endgroup
-% }
-\newenvironment{article}
- {\begingroup
- \setcounter{section}{0}
- \setcounter{footnote}{0}
- \setcounter{figure}{0}
- \setcounter{table}{0}}
- {\label{end:\thearticle}
- \cleardoublepage
- \global\let\@thanks\@empty
- \endgroup}
-\newcommand{\collectiontitlepage}{%
- \thispagestyle{empty}%
- \begingroup
- \centering
- \vspace*{\stretch{1}}
-
- {\SUF@chaptersize\@collectiontitle\par}
- \vskip5ex
-
- \@collectioneditor
- \vspace*{\stretch{3}}
-
- \endgroup
- \clearpage}
-\def\frontispiece{\collectiontitlepage}
-% \end{macrocode}
-% In the collection document structure the articles are treated as
-% chapters but you would not need to print in
-% the table of contents all the sections of every article. So first of
-% all we include in the table of contents only the author and the
-% title of each paper. Anyway the sections inside each paper are
-% numbered as in standard articles:
-% \begin{macrocode}
- \setcounter{tocdepth}{0}
- \renewcommand\thesection{%
- \@arabic\c@section}
- \renewcommand\thesubsection{%
- \thesection.\@arabic\c@subsection}
- \renewcommand\thesubsubsection{%
- \thesubsection.\@arabic\c@subsubsection}
- \renewcommand\theparagraph{%
- \thesubsubsection.\@arabic\c@paragraph}
- \renewcommand\thesubparagraph{%
- \theparagraph.\@arabic\c@subparagraph}
- \else
+ \small
+ \begin{center}%
+ {\abstractname\vspace{-.5em}\vspace{\z@}}%
+ \end{center}%
+ \quotation
+ \fi}
+ {\if@twocolumn\else\endquotation\fi\vspace{6ex}}
+\else
+\ifSUF@titlepage
+ \newenvironment{abstract}{%
+ \titlepage
+ \null\vfil
+ \@beginparpenalty\@lowpenalty
+ \begin{center}%
+ \abstractname
+ \@endparpenalty\@M
+ \end{center}}%
+ {\par\vfil\null\endtitlepage}
+\else
+ \newenvironment{abstract}{%
+ \if@twocolumn
+ \section*{\abstractname}%
+ \else
+ \small
+ \begin{center}%
+ {\abstractname\vspace{-.5em}\vspace{\z@}}%
+ \end{center}%
+ \quotation
+ \fi}
+ {\if@twocolumn\else\endquotation\fi}
+ \fi
\fi
+\newcommand\abstractname{Abstract}
% \end{macrocode}
-% \subsection{Frontispiece}
-% \begin{macrocode}
-\AtBeginDocument{%
-\@ifpackagewith{frontespizio}{suftesi}{%
-\ifsuftesi@periodical
- \Margini {5.5cm}{7cm}{4.5cm}{0cm}
- \else
-\ifsuftesi@periodicalaureo
- \Margini {5.5cm}{7cm}{4.5cm}{0cm}
- \else
-\ifsuftesi@compact
- \Margini {4.5cm}{7cm}{4.5cm}{0cm}
- \else
-\ifsuftesi@compactaureo
- \Margini {4.5cm}{7cm}{4.5cm}{0cm}
- \else
-\ifsuftesi@supercompact
- \Margini {4.5cm}{10cm}{6cm}{1cm}
- \else
-\ifsuftesi@supercompactaureo
- \Margini {4.5cm}{10cm}{6cm}{1cm}
- \else
-\ifsuftesi@pocketa
- \Margini {4.5cm}{10cm}{6cm}{1cm}
- \else
-\ifsuftesi@pocketb
- \Margini {4.5cm}{10cm}{6cm}{1cm}
- \else
-\ifsuftesi@pocketc
- \Margini {4.5cm}{10cm}{6cm}{1cm}
- \else
-\fi\fi\fi\fi\fi\fi\fi\fi\fi}
-{\@ifpackageloaded{frontespizio}{%
-\ifsuftesi@periodical
- \Margini {1cm}{7cm}{5cm}{1cm}
- \Rientro{1cm}
- \else
-\ifsuftesi@periodicalaureo
- \Margini {1cm}{7cm}{5cm}{1cm}
- \Rientro{1cm}
- \else
-\ifsuftesi@compact
- \Margini {1cm}{7cm}{6cm}{1cm}
- \Rientro{1cm}
- \else
-\ifsuftesi@compactaureo
- \Margini {1cm}{7cm}{6cm}{1cm}
- \Rientro{1cm}
- \else
-\ifsuftesi@supercompact
- \Margini {1cm}{10cm}{8cm}{1cm}
- \Rientro{1cm}
- \else
-\ifsuftesi@supercompactaureo
- \Margini {1cm}{10cm}{8cm}{1cm}
- \Rientro{1cm}
- \else
-\ifsuftesi@pocketa
- \Margini {1cm}{10cm}{8cm}{1cm}
- \Rientro{1cm}
- \else
-\ifsuftesi@pocketb
- \Margini {1cm}{10cm}{8cm}{1cm}
- \Rientro{1cm}
- \else
-\ifsuftesi@pocketc
- \Margini {1cm}{10cm}{8cm}{1cm}
- \Rientro{1cm}
- \else
-\fi\fi\fi\fi\fi\fi\fi\fi\fi}
-{\relax}}}
-% \end{macrocode}
-% \subsection{Index}
-% \begin{macrocode}
-\renewenvironment{theindex}
- {\if@twocolumn
- \@restonecolfalse
- \else
- \@restonecoltrue
- \fi
- \ifsuftesi@article
- \twocolumn[\section*{\indexname}]%
- \else
- \twocolumn[\@makeschapterhead{\indexname}]%
- \fi
- \@mkboth{\indexname}{\indexname}%
- \thispagestyle{plain}%
- \raggedright%
- \parindent\z@
- \parskip\z@ \@plus .3\p@\relax
- \columnseprule \z@
- \columnsep 35\p@
- \let\item\@idxitem}
- {\if@restonecol\onecolumn\else\clearpage\fi}
-% \end{macrocode}
-% \subsection{Appendices}
+% \subsubsection{Appendices}
% \begin{macrocode}
\RequirePackage{appendix}
\noappendicestocpagenum
@@ -4981,7 +4498,7 @@ cochineal,mathpazo,bera,amsthm}
\interlinepenalty \@M
\normalfont
\SUF@chaptersize
- \SUF@CHAP@StyleSwitch\expandafter\appendixpagename\par}%
+ \SUF@CHAP@font\expandafter\appendixpagename\par}%
\if@dotoc@pp
\addappheadtotoc
\fi
@@ -5004,7 +4521,7 @@ cochineal,mathpazo,bera,amsthm}
\interlinepenalty \@M
\normalfont
\SUF@chaptersize
- \SUF@CHAP@StyleSwitch\expandafter\appendixpagename%
+ \SUF@CHAP@font\expandafter\appendixpagename%
\markboth{}{}\par}%
\if@dotoc@pp
\addappheadtotoc
@@ -5018,7 +4535,7 @@ cochineal,mathpazo,bera,amsthm}
% this label is passed as an argument to \cmd{@Roman} or \cmd{@roman},
% which however accepts only integers. For this reason we must redefine
% all the occurrences of \cmd{titlecontents} in order to have \cmd{thecontentslabel}
-% in place of \cmd{SUF@CHAP@thecontentslabel} or \cmd{SUF@SEC@thecontentslabel}.
+% in place of \cmd{SUF@CHAP@contentslabel} or \cmd{SUF@SEC@contentslabel}.
% \begin{macrocode}
\def\suf@appendixtoc{%
\ifsuftesi@pagelefttoc
@@ -5036,7 +4553,7 @@ cochineal,mathpazo,bera,amsthm}
\hskip\SUF@addto@tochang@chap\SUF@tocCHAP@font}
{}
[\addvspace{1ex}]
- \ifsuftesi@toccompactsec
+ \ifsuftesi@ctocsec
\titlecontents*{section}[\SUF@tochang@chap]{}{%
\thecontentslabel\adjtoclabelsep\SUF@tocSEC@font}{\SUF@tocSEC@font}{,
\thecontentspage.}[][\adjtocpagesep][]
@@ -5068,7 +4585,7 @@ cochineal,mathpazo,bera,amsthm}
\SUF@tocCHAP@font}
{\SUF@chaptitlerule\contentspage}
[\addvspace{1ex}]
- \ifsuftesi@toccompactsec
+ \ifsuftesi@ctocsec
\titlecontents*{section}[\SUF@tocindent@chap]{}{%
\thecontentslabel\adjtoclabelsep\SUF@tocSEC@font}{\SUF@tocSEC@font}{,
\thecontentspage.}[][\adjtocpagesep][]
@@ -5106,289 +4623,28 @@ cochineal,mathpazo,bera,amsthm}
\renewcommand{\thechapter}{\@Alph\c@chapter}}
\fi
% \end{macrocode}
-% \subsection{Headings}
-% \begin{macrocode}
-\RequirePackage{fancyhdr}
-\newcommand{\versionstring}[1]{\def\version@string{#1}}
- \versionstring{Version of}
-\AtBeginDocument{%
- \pagestyle{fancy}
- \renewcommand{\headrulewidth}{0pt}
- \renewcommand{\footnoterule}{}
-\def\SUF@versionstring{\texttt{\version@string{} \today}}
-% \end{macrocode}
-% \paragraph{The \opt{default} headers}
-% \begin{macrocode}
-\renewcommand{\chaptermark}[1]{%
- \markboth{\chaptertitlename\ \protect\SUF@HEAD@thechapter}{#1}}
- \ifsuftesi@article
- \renewcommand{\sectionmark}[1]{\markright{\protect\SUF@HEAD@thesection.\ #1}}
- \else
- \renewcommand{\sectionmark}[1]{}
- \fi
-% \end{macrocode}
-% \paragraph{The \opt{plain} style}
-% \begin{macrocode}
-\fancypagestyle{plain}{\fancyhf{}}
-% \end{macrocode}
-% \paragraph{The \opt{sufplain} style}
-% \begin{macrocode}
-\fancypagestyle{sufplain}{%
- \fancyhf{}%
- \fancyfoot[RE,LO]{%
- \ifsuftesi@draftdate\footnotesize\SUF@versionstring\else\fi}
- \fancyfoot[C]{\footnotesize\SUF@thepage}}
-% \end{macrocode}
-% \paragraph{The \opt{centerheader} style}
-% \begin{macrocode}
-\fancypagestyle{centerheader}{%
- \fancyhf{}%
- \fancyfoot[RE,LO]{%
- \ifsuftesi@draftdate\footnotesize\SUF@versionstring\else\fi}
- \fancyhead[CO]{\footnotesize\breakinbodyfalse\SUF@rightmark}
- \fancyhead[CE]{\footnotesize\breakinbodyfalse%
- \SUF@LR@MarkSwitch}
- \fancyfoot[C]{\footnotesize\SUF@thepage}}
-% \end{macrocode}
-% \paragraph{The \opt{sufdefault} style}
-% \begin{macrocode}
-\fancypagestyle{sufdefault}{%
- \fancyhf{}%
- \fancyfoot[RE,LO]{%
- \ifsuftesi@draftdate\footnotesize\SUF@versionstring\else\fi}
- \fancyhead[LE,RO]{\footnotesize\SUF@thepage}
- \fancyhead[LO]{\footnotesize\breakinbodyfalse\SUF@rightmark}
- \fancyhead[RE]{\footnotesize\breakinbodyfalse%
- \SUF@LR@MarkSwitch}}
-\ifsuftesi@article
- \ifsuftesi@authortitle
- \def\SUF@LR@MarkSwitch{\SUF@leftmark}
- \else
- \def\SUF@LR@MarkSwitch{\SUF@rightmark}
- \fi
-\else
- \def\SUF@LR@MarkSwitch{\SUF@leftmark}
-\fi
-\def\SUF@leftrightmark{%
- \if@mainmatter\leftmark\else\rightmark\fi}
-\pagestyle{sufdefault}
- \ifsuftesi@centerheader\pagestyle{centerheader}\else\fi
- \ifsuftesi@sufplain\pagestyle{sufplain}\else\fi}
-% \end{macrocode}
-% \subsection{Text elements}
-% \paragraph{Block Quotations}
-% New environments for block quotations according to a popular Italian style.
-% The font size is the same of the footnotes and the margins are set to \cmd{parindent}.
-% \begin{macrocode}
-\renewenvironment{quotation}
- {\list{}{\listparindent\parindent%
- \itemindent \listparindent
- \SUF@quote@style
- \parsep \z@ \@plus\p@}%
- \item\relax%
- \SUF@quotation@size%
- \noindent\ignorespaces}
- {\endlist}
-\renewenvironment{quote}
- {\list{}{%
- \SUF@quote@style}%
- \item\relax%
- \SUF@quotation@size}% \ignorespaces?
- {\endlist}
-\renewenvironment{verse}
- {\let\\\@centercr
- \list{}{\itemsep \z@
- \itemindent -1.5em%
- \listparindent\itemindent
- \rightmargin \leftmargin
- \advance\leftmargin 1.5em}%
- \item\relax
- \SUF@quotation@size}
- {\endlist}
-% \end{macrocode}
-% \paragraph{The \opt{fewfootnotes} option}
-% Enable only with three footnotes per page maximum.
-% \begin{macrocode}
-\ifsuftesi@fewfootnotes
-\AtBeginDocument{%
-\def\@fnsymbol#1{\ensuremath{\ifcase#1\or*\or{*}{*}\or{*}{*}{*}\or%
- \ClassError{suftesi}%
- {Too many footnotes\MessageBreak
- Remove the class option 'fewfootnote'}
- {Too many footnotes\MessageBreak
- Remove the class option 'fewfootnote'}
- \else\@ctrerr\fi}}}
-\def\thefootnote{\@fnsymbol\c@footnote}%
-\else\fi
-% \end{macrocode}
-% \paragraph{The \cmd{xfootnote} command} Prints a footnote with discretionary
-% symbol give in the first argument.
-% \begin{macrocode}
-\newcommand*\xfootnote[1][*]{%
- \xdef\@thefnmark{#1}%
- \@footnotemark\@footnotetext}
-% \end{macrocode}
-% \paragraph{Marginal notes}
-% The |\marginpar| command is redefined according to the look
-% of \emph{Classic Thesis} by
-% André \textcite{Miede:2011}\index{Miede, André}.
-% \begin{macrocode}
-\def\SUF@mpsetup{%
- \itshape
- \footnotesize%
- \parindent=0pt \lineskip=0pt \lineskiplimit=0pt%
- \tolerance=2000 \hyphenpenalty=300 \exhyphenpenalty=300%
- \doublehyphendemerits=100000%
- \finalhyphendemerits=\doublehyphendemerits}
- \let\oldmarginpar\marginpar
- \renewcommand{\marginpar}[1]{\oldmarginpar%
- [\SUF@mpsetup\raggedleft\hspace{0pt}{#1}]%
- {\SUF@mpsetup\raggedright\hspace{0pt}{#1}}}
-% \end{macrocode}
-% Redefine an internal command of the \sty{todonotes} package in
-% order to use the class-specific marginal notes when this
-% package is loaded. This redefinition simply substitute
-% \cmd{oldmarginpar} to \cmd{marginpar}:
-% \begin{macrocode}
-\AtBeginDocument{%
-\@ifpackageloaded{todonotes}{%
- \renewcommand{\@todonotes@drawMarginNoteWithLine}{%
- \begin{tikzpicture}[remember picture, overlay, baseline=-0.75ex]%
- \node [coordinate] (inText) {};%
- \end{tikzpicture}%
- \oldmarginpar[{% Draw note in left margin
- \@todonotes@drawMarginNote%
- \@todonotes@drawLineToLeftMargin%
- }]{% Draw note in right margin
- \@todonotes@drawMarginNote%
- \@todonotes@drawLineToRightMargin%
- }
- }
- }
-{\relax}}
-% \end{macrocode}
-% \paragraph{Abstract}
-% \begin{macrocode}
-\ifsuftesi@collection
- \newenvironment{abstract}{%
- \if@twocolumn
- \section*{\abstractname}%
- \else
- \small
- \begin{center}%
- {\abstractname\vspace{-.5em}\vspace{\z@}}%
- \end{center}%
- \quotation
- \fi}
- {\if@twocolumn\else\endquotation\fi\vspace{6ex}}
-\else
-\if@titlepage
- \newenvironment{abstract}{%
- \titlepage
- \null\vfil
- \@beginparpenalty\@lowpenalty
- \begin{center}%
- \abstractname
- \@endparpenalty\@M
- \end{center}}%
- {\par\vfil\null\endtitlepage}
-\else
- \newenvironment{abstract}{%
- \if@twocolumn
- \section*{\abstractname}%
- \else
- \small
- \begin{center}%
- {\abstractname\vspace{-.5em}\vspace{\z@}}%
- \end{center}%
- \quotation
- \fi}
- {\if@twocolumn\else\endquotation\fi}
- \fi
-\fi
-\newcommand\abstractname{Abstract}
-% \end{macrocode}
-% \paragraph{Colophon or copyright notice}
-% \begin{macrocode}
-\newcommand{\colophon}[3][]{%
- \thispagestyle{empty}
- \null
- \vfill
- \def\next{#2}
- \ifx\next\@empty\else
- \noindent Copyright \copyright{} \the\year~#2\\[1ex]
- Tutti i diritti riservati
- \fi
- \vfill
- {\small\noindent Questo lavoro \`e stato composto con \LaTeX{}%
- \def\next{#1}
- \ifx\next\@empty\else su #1
- \fi usando la classe \textsf{suftesi} di
- Ivan Valbusa\index{Valbusa, Ivan}. #3\par}
- \cleardoublepage}
-\newcommand{\bookcolophon}[2]{%
- \thispagestyle{empty}
- \null
- \vfill
- \noindent #1
- \vfill
- {\small\noindent #2\par}
- \cleardoublepage}
-\newcommand{\artcolophon}[1]{%
-\thispagestyle{empty}
- \null
- \vfill
- {\small\noindent #1\par}}
-\newcommand{\finalcolophon}[1]{%
-\thispagestyle{empty}
- \null\vspace*{\stretch{1}}
- \begin{center}
- \begin{minipage}{.5\textwidth}
- \centering\small #1
- \end{minipage}
- \end{center}
- \vspace*{\stretch{6}}}
-% \end{macrocode}
-% \paragraph{The \cmd{FSPL} colophon}
-% This command is defined only for the \opt{style=FSPL*} options.
+% \subsubsection{Index}
% \begin{macrocode}
-\ifsuftesi@FSPL
-\newcommand{\FSPLcolophon}[1][\the\year]{%
-\begingroup
-\thispagestyle{empty}
-\null\vspace{\stretch{1}}
-\noindent \hskip-.5em\cc #1 \@author%
-\vskip1ex
-
-\small\noindent This work is licensed under the Creative Commons
-Attribution-NonCommercial-NoDerivs 3.0 Unported License.
-To view a copy of this license,
-visit http://creativecom mons.org/licenses/by-nc-nd/3.0/.
-
-\endgroup
-
-\begingroup
-\footnotesize
-
-\null\vspace{\stretch{1}}
-
-\noindent Typeset with \LaTeX{} in collaboration with the Joint Project
-\emph{Formal Style for PhD Theses with \LaTeX} (University of Verona,
-Italy) using the \textsf{suftesi} class by Ivan Valbusa. The text face
-is Palatino, designed by Hermann Zapf. The sans serif font is Iwona by
-Janusz M.~Nowacki.
-
-\endgroup
-
-\clearpage}
-\else
-\def\FSPLcolophon{%
- \ClassError{suftesi}
- {\noexpand\FSPLcolophon is defined\MessageBreak
- only for the FSPL styles}
- {\noexpand\FSPLcolophon is defined\MessageBreak
- only for the FSPL styles}}
-\fi
+\renewenvironment{theindex}
+ {\if@twocolumn
+ \@restonecolfalse
+ \else
+ \@restonecoltrue
+ \fi
+ \ifsuftesi@article
+ \twocolumn[\section*{\indexname}]%
+ \else
+ \twocolumn[\@makeschapterhead{\indexname}]%
+ \fi
+ \@mkboth{\indexname}{\indexname}%
+ \thispagestyle{plain}%
+ \raggedright%
+ \parindent\z@
+ \parskip\z@ \@plus .3\p@\relax
+ \columnseprule \z@
+ \columnsep 35\p@
+ \let\item\@idxitem}
+ {\if@restonecol\onecolumn\else\clearpage\fi}
% \end{macrocode}
% \subsection{Contents lists}
% \begin{macrocode}
@@ -5465,7 +4721,7 @@ Janusz M.~Nowacki.
% [0em]
% {\addvspace{3ex}}
% {\partname\hspace*{.5em}\makebox[\SUF@label@part][l]{%
-% \SUF@PART@thecontentslabel}\hspace*{1em}\SUF@tocPART@font}
+% \SUF@PART@contentslabel}\hspace*{1em}\SUF@tocPART@font}
% {\SUF@tocPART@font}
% {}
% [\addvspace{1ex}]
@@ -5534,16 +4790,16 @@ Janusz M.~Nowacki.
\makebox[1em][l]{\thecontentspage}%
\hskip\SUF@addto@tochang@chap%
\makebox[\SUF@label@chap][l]{%
- \SUF@CHAP@thecontentslabel}\hspace*{1em}%
+ \SUF@CHAP@contentslabel}\hspace*{1em}%
\SUF@tocCHAP@font}
{\hskip-\SUF@tochang@chap%
\makebox[1em][l]{\thecontentspage}%
\hskip\SUF@addto@tochang@chap\SUF@tocCHAP@font}
{}
[\addvspace{1ex}]
-\ifsuftesi@toccompactsec
+\ifsuftesi@ctocsec
\titlecontents*{section}[\SUF@tochang@chap]{}{%
- \SUF@SEC@thecontentslabel\adjtoclabelsep\SUF@tocSEC@font}{\SUF@tocSEC@font}{,
+ \SUF@SEC@contentslabel\adjtoclabelsep\SUF@tocSEC@font}{\SUF@tocSEC@font}{,
\thecontentspage.}[][\adjtocpagesep][]
\else
\titlecontents{section}
@@ -5554,16 +4810,16 @@ Janusz M.~Nowacki.
% \makebox[\SUF@label@sec][l]{%
% \ifsuftesi@article\SUF@toclabelnum%
% \else\fi\thecontentslabel}\hspace*{1em}%
- \makebox[\SUF@label@sec][l]{\SUF@SEC@thecontentslabel}\hspace*{1em}%
+ \makebox[\SUF@label@sec][l]{\SUF@SEC@contentslabel}\hspace*{1em}%
\SUF@tocSEC@font}
{\hskip-\SUF@tochang@sec%
\makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@sec%
\SUF@tocSEC@font}
{}
\fi
-\ifsuftesi@toccompactsubsec
+\ifsuftesi@ctocsubsec
\titlecontents*{subsection}[\SUF@tochang@sec]{\SUF@sscorrect}{%
- \SUF@SUBSEC@thecontentslabel\adjtoclabelsep\SUF@tocSUBSEC@font}{\SUF@tocSUBSEC@font}{,
+ \SUF@SUBSEC@contentslabel\adjtoclabelsep\SUF@tocSUBSEC@font}{\SUF@tocSUBSEC@font}{,
\thecontentspage.}[][\adjtocpagesep][]
\else
\titlecontents{subsection}
@@ -5571,16 +4827,16 @@ Janusz M.~Nowacki.
{}
{\hskip-\SUF@tochang@subsec%
\makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@subsec%
- \makebox[\SUF@label@subsec][l]{\SUF@SUBSEC@thecontentslabel}\hspace*{1em}%
+ \makebox[\SUF@label@subsec][l]{\SUF@SUBSEC@contentslabel}\hspace*{1em}%
\SUF@tocSUBSEC@font}
{\hskip-\SUF@tochang@subsec%
\makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@subsec%
\SUF@tocSUBSEC@font}
{}
\fi
-\ifsuftesi@toccompactsubsubsec
+\ifsuftesi@ctocsubsubsec
\titlecontents*{subsubsection}[\SUF@tochang@subsec]{\SUF@ssscorrect}{%
- \SUF@SUBSUBSEC@thecontentslabel\adjtoclabelsep%
+ \SUF@SUBSUBSEC@contentslabel\adjtoclabelsep%
\SUF@tocSUBSUBSEC@font}{\SUF@tocSUBSUBSEC@font}{,
\thecontentspage.}[][\adjtocpagesep][]
\else
@@ -5589,16 +4845,16 @@ Janusz M.~Nowacki.
{}
{\hskip-\SUF@tochang@subsubsec%
\makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@subsubsec%
- \makebox[\SUF@label@subsubsec][l]{\SUF@SUBSUBSEC@thecontentslabel}\hspace*{1em}%
+ \makebox[\SUF@label@subsubsec][l]{\SUF@SUBSUBSEC@contentslabel}\hspace*{1em}%
\SUF@tocSUBSUBSEC@font}
{\hskip-\SUF@tochang@subsubsec%
\makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@subsubsec%
\SUF@tocSUBSUBSEC@font}
{}
\fi
-\ifsuftesi@toccompactpar
+\ifsuftesi@ctocpar
\titlecontents*{paragraph}[\SUF@tochang@subsubsec]{\SUF@pcorrect}{%
- \SUF@PAR@thecontentslabel\adjtoclabelsep%
+ \SUF@PAR@contentslabel\adjtoclabelsep%
\SUF@tocPAR@font}{\SUF@tocPAR@font}{,
\thecontentspage.}[][\adjtocpagesep][]
\else
@@ -5614,9 +4870,9 @@ Janusz M.~Nowacki.
\SUF@tocPAR@font}
{}
\fi
-\ifsuftesi@toccompactsubpar
+\ifsuftesi@ctocsubpar
\titlecontents*{subparagraph}[\SUF@tochang@par]{\SUF@pcorrect}{%
- \SUF@SUBPAR@thecontentslabel\adjtoclabelsep%
+ \SUF@SUBPAR@contentslabel\adjtoclabelsep%
\SUF@tocSUBPAR@font}{\SUF@tocSUBPAR@font}{,
\thecontentspage.}[][\adjtocpagesep][]
\else
@@ -5701,16 +4957,16 @@ Janusz M.~Nowacki.
[\SUF@tocindent@chap]
{\addvspace{2ex}}
{\hskip-\SUF@tocindent@chap%
- \makebox[\SUF@label@chap][l]{\SUF@CHAP@thecontentslabel}%
+ \makebox[\SUF@label@chap][l]{\SUF@CHAP@contentslabel}%
\hspace*{1em}%
\SUF@tocCHAP@font}
{\hskip-\SUF@tocindent@chap%
\SUF@tocCHAP@font}
{\SUF@chaptitlerule\contentspage}
[\addvspace{1ex}]
-\ifsuftesi@toccompactsec
+\ifsuftesi@ctocsec
\titlecontents*{section}[\SUF@tocindent@chap]{}{%
- \SUF@SEC@thecontentslabel\adjtoclabelsep\SUF@tocSEC@font}
+ \SUF@SEC@contentslabel\adjtoclabelsep\SUF@tocSEC@font}
{\SUF@tocSEC@font}{, \thecontentspage.}[][\adjtocpagesep][]
\else
\titlecontents{section}
@@ -5720,31 +4976,31 @@ Janusz M.~Nowacki.
% \makebox[\SUF@label@sec][l]{%
% \ifsuftesi@article\SUF@toclabelnum%
% \else\fi\thecontentslabel}\hspace*{1em}%
- \makebox[\SUF@label@sec][l]{\SUF@SEC@thecontentslabel}\hspace*{1em}%
+ \makebox[\SUF@label@sec][l]{\SUF@SEC@contentslabel}\hspace*{1em}%
\SUF@tocSEC@font}
{\hskip-\dimexpr(\SUF@label@sec+1em)%
\SUF@tocSEC@font}
{\ifsuftesi@article\SUF@chaptitlerule%
\else\SUF@titlerule\fi\contentspage}
\fi
-\ifsuftesi@toccompactsubsec
+\ifsuftesi@ctocsubsec
\titlecontents*{subsection}[\SUF@tocindent@sec]{\SUF@sscorrect}{%
- \SUF@SUBSEC@thecontentslabel\adjtoclabelsep\SUF@tocSUBSEC@font}
+ \SUF@SUBSEC@contentslabel\adjtoclabelsep\SUF@tocSUBSEC@font}
{\SUF@tocSUBSEC@font}{, \thecontentspage.}[][\adjtocpagesep][]
\else
\titlecontents{subsection}
[\SUF@tocindent@subsec]
{}
{\hskip-\dimexpr(\SUF@label@subsec+1em)%
- \makebox[\SUF@label@subsec][l]{\SUF@SUBSEC@thecontentslabel}\hspace*{1em}%
+ \makebox[\SUF@label@subsec][l]{\SUF@SUBSEC@contentslabel}\hspace*{1em}%
\SUF@tocSUBSEC@font}
{\hskip-\dimexpr(\SUF@label@subsec+1em)%
\SUF@tocSUBSEC@font}
{\SUF@titlerule\contentspage}
\fi
-\ifsuftesi@toccompactsubsubsec
+\ifsuftesi@ctocsubsubsec
\titlecontents*{subsubsection}[\SUF@tocindent@subsec]{\SUF@ssscorrect}{%
- \SUF@SUBSUBSEC@thecontentslabel\adjtoclabelsep%
+ \SUF@SUBSUBSEC@contentslabel\adjtoclabelsep%
\SUF@tocSUBSUBSEC@font}{\SUF@tocSUBSUBSEC@font}{,
\thecontentspage.}[][\adjtocpagesep][]
\else
@@ -5752,15 +5008,15 @@ Janusz M.~Nowacki.
[\SUF@tocindent@subsubsec]
{}
{\hskip-\dimexpr(\SUF@label@subsubsec+1em)%
- \makebox[\SUF@label@subsubsec][l]{\SUF@SUBSUBSEC@thecontentslabel}\hspace*{1em}%
+ \makebox[\SUF@label@subsubsec][l]{\SUF@SUBSUBSEC@contentslabel}\hspace*{1em}%
\SUF@tocSUBSUBSEC@font}
{\hskip-\dimexpr(\SUF@label@subsubsec+1em)%
\SUF@tocSUBSUBSEC@font}
{\SUF@titlerule\contentspage}
\fi
-\ifsuftesi@toccompactpar
+\ifsuftesi@ctocpar
\titlecontents*{paragraph}[\SUF@tocindent@subsubsec]{\SUF@pcorrect}{%
- \SUF@PAR@thecontentslabel\adjtoclabelsep%
+ \SUF@PAR@contentslabel\adjtoclabelsep%
\SUF@tocPAR@font}{\SUF@tocPAR@font}{,
\thecontentspage.}[][\adjtocpagesep][]
\else
@@ -5774,9 +5030,9 @@ Janusz M.~Nowacki.
\SUF@tocPAR@font}
{\SUF@titlerule\contentspage}
\fi
-\ifsuftesi@toccompactsubpar
+\ifsuftesi@ctocsubpar
\titlecontents*{subparagraph}[\SUF@tocindent@par]{\SUF@pcorrect}{%
- \SUF@SUBPAR@thecontentslabel\adjtoclabelsep%
+ \SUF@SUBPAR@contentslabel\adjtoclabelsep%
\SUF@tocSUBPAR@font}{\SUF@tocSUBPAR@font}{,
\thecontentspage.}[][\adjtocpagesep][]
\else
@@ -5808,34 +5064,57 @@ Janusz M.~Nowacki.
% \end{macrocode}
% \subparagraph{partial ToC}
% \begin{macrocode}
-\titlecontents*{partialtocsection}[0cm]{}{%
- \@partialtocseclabel\adjtoclabelsep\@partialtocsecfont}
- {\@partialtocsecfont}{, \thecontentspage.}[][\adjtocpagesep][]
-\titlecontents*{partialtocsubsection}[0cm]{\hskip.5em}{%
- \@partialtocsubseclabel\adjtoclabelsep\@partialtocsubsecfont}
- {\@partialtocsubsecfont}{, \thecontentspage.}[][\adjtocpagesep][]
-\titlecontents*{partialtocsubsubsection}[0cm]{\hskip.5em}{%
- \@partialtocsubsubseclabel\adjtoclabelsep\@partialtocsubsubsecfont}
- {\@partialtocsubsubsecfont}{, \thecontentspage.}[][\adjtocpagesep][]
-\titlecontents*{partialtocparagraph}[0cm]{\hskip.5em}{%
- \@partialtocparlabelfont\adjtoclabelsep\@partialtocparfont}
- {\@partialtocparfont}{, \thecontentspage.}[][\adjtocpagesep][]
-\titlecontents*{partialtocsubparagraph}[0cm]{\hskip.5em}{%
- \@partialtocsubparlabelfont\adjtoclabelsep\@partialtocsubparfont}
- {\@partialtocsubparfont}{, \thecontentspage.}[][\adjtocpagesep][]
-\newcommand{\startpartialtoc}{%
- \ifsuftesi@partialtoc\startcontents\fi}
-\newcommand{\printpartialtoc}{%
- \ifsuftesi@partialtoc
- \setcounter{tocdepth}{5}
- \contentsmargin{0cm}
- \@partialtocsize
- \@partialtocbeforespace
- \@partialtocbeforecode\par
- \printcontents{partialtoc}{1}{}
- \par\@partialtocaftercode
- \@partialtocafterspace
- \fi}
+\ifSUF@partialtoc
+ \titlecontents*{partialtocsection}[0cm]{}{%
+ \@partialtocseclabel\adjtoclabelsep\@partialtocsecfont}
+ {\@partialtocsecfont}{, \thecontentspage.}[][\adjtocpagesep][]
+ \ifsuftesi@article
+ \titlecontents*{partialtocsubsection}[0cm]{}{%
+ \@partialtocsubseclabel\adjtoclabelsep\@partialtocsubsecfont}
+ {\@partialtocsubsecfont}{, \thecontentspage.}[][\adjtocpagesep][]
+ \else
+ \titlecontents*{partialtocsubsection}[0cm]{\hskip.5em}{%
+ \@partialtocsubseclabel\adjtoclabelsep\@partialtocsubsecfont}
+ {\@partialtocsubsecfont}{, \thecontentspage.}[][\adjtocpagesep][]
+ \fi
+ \titlecontents*{partialtocsubsubsection}[0cm]{\hskip.5em}{%
+ \@partialtocsubsubseclabel\adjtoclabelsep\@partialtocsubsubsecfont}
+ {\@partialtocsubsubsecfont}{, \thecontentspage.}[][\adjtocpagesep][]
+ \titlecontents*{partialtocparagraph}[0cm]{\hskip.5em}{%
+ \@partialtocparlabelfont\adjtoclabelsep\@partialtocparfont}
+ {\@partialtocparfont}{, \thecontentspage.}[][\adjtocpagesep][]
+ \titlecontents*{partialtocsubparagraph}[0cm]{\hskip.5em}{%
+ \@partialtocsubparlabelfont\adjtoclabelsep\@partialtocsubparfont}
+ {\@partialtocsubparfont}{, \thecontentspage.}[][\adjtocpagesep][]
+ \ifsuftesi@article
+ \let\startsecpartialtoc\startcontents
+ \let\startchappartialtoc\relax
+ \else
+ \let\startchappartialtoc\startcontents
+ \let\startsecpartialtoc\relax
+ \fi
+ \newcommand{\printpartialtoc}{%
+ \setcounter{tocdepth}{5}
+ \contentsmargin{0cm}
+ \@partialtocsize
+ \@partialtocbeforespace
+ \@partialtocbeforecode\par
+ \ifsuftesi@article
+ \printcontents{partialtoc}{2}{}
+ \else
+ \printcontents{partialtoc}{1}{}
+ \fi
+ \par\@partialtocaftercode
+ \@partialtocafterspace
+ }
+\else
+ \let\startchappartialtoc\relax
+ \let\startsecpartialtoc\relax
+ \def\printpartialtoc{%
+ \ClassWarningNoLine{suftesi}%
+ {To activate \string\printpartialtoc\MessageBreak
+ load the 'partialtoc' option}}
+\fi
% \end{macrocode}
% \subparagraph{The ToC, LoF and LoT in the \opt{article} structure}
% \begin{macrocode}
@@ -5947,27 +5226,10 @@ Janusz M.~Nowacki.
}
\fi
% \end{macrocode}
-% \subsection{Customizations}
-% \subsubsection{Sections font}
+% \subsubsection{Commands for sections font in ToC}
% \begin{macrocode}
\newcommand{\tocpartname}[1]{\def\SUF@tocpartname{#1}}
\tocpartname{\partname}
-\newcommand{\partfont}[1]{\def\SUF@PART@StyleSwitch{#1}}
-\newcommand{\chapfont}[1]{\def\SUF@CHAP@StyleSwitch{#1}}
-\newcommand{\secfont}[1]{\def\SUF@SEC@StyleSwitch{#1}}
-\newcommand{\subsecfont}[1]{\def\SUF@SUBSEC@StyleSwitch{#1}}
-\newcommand{\subsubsecfont}[1]{\def\SUF@SUBSUBSEC@StyleSwitch{#1}}
-\newcommand{\partnumfont}[1]{\def\SUF@PART@font{#1}}\partnumfont{}
-\newcommand{\chapnumfont}[1]{\def\SUF@thechapter{#1}}
-\newcommand{\secnumfont}[1]{\def\SUF@thesection{#1}}
-\newcommand{\subsecnumfont}[1]{\def\SUF@thesubsection{#1}}
-\newcommand{\subsubsecnumfont}[1]{\def\SUF@thesubsubsection{#1}}
-\newcommand{\titlefont}[1]{\def\SUF@Tfont@style{#1}\let\SUF@Tfont@shape\relax}
-\newcommand{\authorfont}[1]{\def\SUF@Afont@style{#1}\let\SUF@Afont@shape\relax}
-\newcommand{\datefont}[1]{\def\SUF@datefont{#1}}
-% \end{macrocode}
-% \subsubsection{Sections font in ToC}
-% \begin{macrocode}
\newcommand{\tocpartfont}[1]{\def\SUF@tocPART@font{#1}}
\newcommand{\tocchapfont}[1]{\def\SUF@tocCHAP@font{#1}}
\newcommand{\tocsecfont}[1]{\def\SUF@tocSEC@font{#1}}
@@ -5977,17 +5239,17 @@ Janusz M.~Nowacki.
\newcommand{\tocsubparfont}[1]{\def\SUF@tocSUBPAR@font{#1}}
\newcommand{\tocpartnumfont}[1]{\def\SUF@tocPARTnum@font{#1}}\tocpartnumfont{}
\newcommand{\tocchapnumfont}[1]{%
- \def\SUF@CHAP@thecontentslabel{\begingroup#1\thecontentslabel\endgroup}}
+ \def\SUF@CHAP@contentslabel{\begingroup#1\thecontentslabel\endgroup}}
\newcommand{\tocsecnumfont}[1]{%
- \def\SUF@SEC@thecontentslabel{\begingroup#1\thecontentslabel\endgroup}}
+ \def\SUF@SEC@contentslabel{\begingroup#1\thecontentslabel\endgroup}}
\newcommand{\tocsubsecnumfont}[1]{%
- \def\SUF@SUBSEC@thecontentslabel{\begingroup#1\thecontentslabel\endgroup}}
+ \def\SUF@SUBSEC@contentslabel{\begingroup#1\thecontentslabel\endgroup}}
\newcommand{\tocsubsubsecnumfont}[1]{%
- \def\SUF@SUBSUBSEC@thecontentslabel{\begingroup#1\thecontentslabel\endgroup}}
+ \def\SUF@SUBSUBSEC@contentslabel{\begingroup#1\thecontentslabel\endgroup}}
\newcommand{\tocparnumfont}[1]{%
- \def\SUF@PAR@thecontentslabel{\begingroup#1\thecontentslabel\endgroup}}
+ \def\SUF@PAR@contentslabel{\begingroup#1\thecontentslabel\endgroup}}
\newcommand{\tocsubparnumfont}[1]{%
- \def\SUF@SUBPAR@thecontentslabel{\begingroup#1\thecontentslabel\endgroup}}
+ \def\SUF@SUBPAR@contentslabel{\begingroup#1\thecontentslabel\endgroup}}
\tocparnumfont{}
\tocsubparnumfont{}
% \end{macrocode}
@@ -6006,15 +5268,15 @@ Janusz M.~Nowacki.
\newcommand{\partialtocsubparfont}[1]{%
\def\@partialtocsubparfont{#1}}
\newcommand{\partialtocseclabel}[1]{%
- \def\@partialtocseclabel{\begingroup#1\thecontentslabel\endgroup}}
+ \def\@partialtocseclabel{\begingroup#1\thecontentslabel~\endgroup}}
\newcommand{\partialtocsubseclabel}[1]{%
- \def\@partialtocsubseclabel{\begingroup#1\thecontentslabel\endgroup}}
+ \def\@partialtocsubseclabel{\begingroup#1\thecontentslabel~\endgroup}}
\newcommand{\partialtocsubsubseclabel}[1]{%
- \def\@partialtocsubsubseclabel{\begingroup#1\thecontentslabel\endgroup}}
+ \def\@partialtocsubsubseclabel{\begingroup#1\thecontentslabel~\endgroup}}
\newcommand{\partialtocparlabelfont}[1]{%
- \def\@partialtocparlabelfont{\begingroup#1\thecontentslabel\endgroup}}
+ \def\@partialtocparlabelfont{\begingroup#1\thecontentslabel~\endgroup}}
\newcommand{\partialtocsubparlabelfont}[1]{%
- \def\@partialtocsubparlabelfont{\begingroup#1\thecontentslabel\endgroup}}
+ \def\@partialtocsubparlabelfont{\begingroup#1\thecontentslabel~\endgroup}}
\newcommand{\partialtocbeforespace}[1]{%
\def\@partialtocbeforespace{\vspace*{#1}}}
\newcommand{\partialtocafterspace}[1]{%
@@ -6029,58 +5291,720 @@ Janusz M.~Nowacki.
\partialtocsubsubsecfont{}
\partialtocparfont{}
\partialtocsubparfont{}
-\partialtocseclabel{\itshape}
+\partialtocseclabel{}
\partialtocsubseclabel{}
\partialtocsubsubseclabel{}
\partialtocparlabelfont{}
\partialtocsubparlabelfont{}
-\partialtocbeforespace{18ex}
-\partialtocafterspace{-18ex}
+\partialtocbeforespace{0pt}
+\partialtocafterspace{0pt}
\partialtocbeforecode{}
\partialtocaftercode{}
% \end{macrocode}
-% \subsection{New commands}
-% A command to print an unnumbered introduction at the beginning of the chapter. The \cmd{chapterintroname} defaults to ``Introduzione'' because the class was initially designed primarily for Italian-speaking users.
+% \subsection{Headers and footers}
+% \begin{macrocode}
+\RequirePackage{fancyhdr}
+\newcommand{\versionstring}[1]{\def\version@string{#1}}
+ \versionstring{Version of}
+\ifSUF@draftdate
+ \def\SUF@versionof{\footnotesize\texttt{\version@string{} \today}}
+\else
+ \let\SUF@versionof\relax
+\fi
+\AtBeginDocument{%
+ \pagestyle{fancy}
+ \renewcommand{\headrulewidth}{0pt}
+ \renewcommand{\footnoterule}{}}
+% \end{macrocode}
+% \paragraph{The \opt{default} headers}
+% In previous versions \cmd{SUF@HEAD@thechapter} and
+% \cmd{SUF@HEAD@thesection} were preceded by \cmd{protect}.
+% This caused an error in the headers. Removing \cmd{protect}
+% may cause other bugs. To be tested.
+% \begin{macrocode}
+\renewcommand{\chaptermark}[1]{%
+ \markboth{\chaptertitlename\ \SUF@HEAD@thechapter}{#1}}
+ \ifsuftesi@article
+ \renewcommand{\sectionmark}[1]{\markright{\SUF@HEAD@thesection.\ #1}}
+ \else
+ \renewcommand{\sectionmark}[1]{}
+ \fi
+% \end{macrocode}
+% \paragraph{Page styles}
% \begin{macrocode}
+\fancypagestyle{plain}{\fancyhf{}\fancyfoot[RE,LO]{\SUF@versionof}}
+\fancypagestyle{empty}{\fancyhf{}\fancyfoot[RE,LO]{\SUF@versionof}}
+\fancypagestyle{sufplain}{%
+ \fancyhf{}%
+ \fancyfoot[RE,LO]{\SUF@versionof}
+ \fancyfoot[C]{\footnotesize\SUF@thepage}}
+\fancypagestyle{centerheader}{%
+ \fancyhf{}%
+ \fancyfoot[RE,LO]{\SUF@versionof}
+ \fancyhead[CO]{\footnotesize\breakinbodyfalse\SUF@rightmark}
+ \fancyhead[CE]{\footnotesize\breakinbodyfalse\SUF@mark}
+ \fancyfoot[C]{\footnotesize\SUF@thepage}}
+\fancypagestyle{sufdefault}{%
+ \fancyhf{}%
+ \fancyfoot[RE,LO]{\SUF@versionof}
+ \fancyhead[LE,RO]{\footnotesize\SUF@thepage}
+ \fancyhead[LO]{\footnotesize\breakinbodyfalse\SUF@rightmark}
+ \fancyhead[RE]{\footnotesize\breakinbodyfalse\SUF@mark}}
\ifsuftesi@article
-\def\chapterintro{%
-\ClassError{suftesi}
- {Command \noexpand\chapterintro is undefined\MessageBreak
- using 'structure=article'}
- {Command \noexpand\chapterintro is undefined\MessageBreak
- using 'structure=article'}}
+ \ifsuftesi@authortitle
+ \def\SUF@mark{\SUF@leftmark}
+ \else
+ \def\SUF@mark{\SUF@rightmark}
+ \fi
\else
-\def\chapterintro{\@ifstar{%
- \@tempswafalse\@chapterintro}{\@tempswatrue\@chapterintro}}
-\def\@chapterintro{\phantomsection
- \if@tempswa\section*{\SUF@fchapterintroname}\fi
- \addcontentsline{toc}{section}{\SUF@fchapterintroname}}
-\newcommand{\chapterintroname}[1]{\def\SUF@fchapterintroname{#1}}
-\chapterintroname{Introduzione}
+ \def\SUF@mark{\SUF@leftmark}
\fi
+\def\SUF@leftrightmark{%
+ \if@mainmatter\leftmark\else\rightmark\fi}
+\pagestyle{sufdefault}
+ \ifsuftesi@centerheader\pagestyle{centerheader}\else\fi
+ \ifsuftesi@sufplain\pagestyle{sufplain}\else\fi
% \end{macrocode}
-% Two commands for manual breaks active, respectively, only in the table of contents and in the body text. The solution was initially made available by Enrico Gregorio many years ago in one of the first versions of the class (at that time the commands were called \cmd{headbreak} and \cmd{xheadbreak}). Later, while I was working on version 3.0, I noticed an alignment problem in the chapter titles when using the \opt{chapstyle=left} option. So I added the \cmd{breakinbodyleft} command and updated the command names to make them more recognizable. Old names are in any case available for backwards compatibility.
+% \subsection{Notes and quotations}
+% \paragraph{Block Quotations}
+% New environments for block quotations according to a popular Italian style.
+% The font size is the same of the footnotes and the margins are set to \cmd{parindent}.
% \begin{macrocode}
-\newif\ifbreakintoc\breakintocfalse
-\newif\ifbreakinbody\breakinbodytrue
-\DeclareRobustCommand{\breakintoc}
- {\ifbreakintoc\\\else\fi}
-\DeclareRobustCommand{\breakinbody}
- {\ifbreakinbody\\\else\fi}
-\DeclareRobustCommand{\breakinbodyleft}
- {\ifbreakinbody\newline\else\fi}
-\let\origtableofcontents\tableofcontents
-\renewcommand{\tableofcontents}{%
- \begingroup\suftesi@partialtocfalse
- \breakintoctrue\breakinbodyfalse%
- \origtableofcontents
- \endgroup}
-\DeclareRobustCommand{\headbreak}
- {\ifbreakintoc\\\else\fi}
-\DeclareRobustCommand{\xheadbreak}
- {\ifbreakinbody\\\else\fi}
-\DeclareRobustCommand{\yheadbreak}
- {\ifbreakinbody\newline\else\fi}
+\renewenvironment{quotation}
+ {\list{}{\listparindent\parindent%
+ \itemindent \listparindent
+ \SUF@quote@style
+ \parsep \z@ \@plus\p@}%
+ \item\relax%
+ \SUF@quotation@size%
+ \noindent\ignorespaces}
+ {\endlist}
+\renewenvironment{quote}
+ {\list{}{%
+ \SUF@quote@style}%
+ \item\relax%
+ \SUF@quotation@size}% \ignorespaces?
+ {\endlist}
+\renewenvironment{verse}
+ {\let\\\@centercr
+ \list{}{\itemsep \z@
+ \itemindent -1.5em%
+ \listparindent\itemindent
+ \rightmargin \leftmargin
+ \advance\leftmargin 1.5em}%
+ \item\relax
+ \SUF@quotation@size}
+ {\endlist}
+% \end{macrocode}
+% \paragraph{The \opt{fewfootnotes} option}
+% Enable only with three footnotes per page maximum.
+% \begin{macrocode}
+\ifSUF@fewfootnotes
+\RequirePackage[perpage]{zref}
+ \zmakeperpage{footnote}
+\AtBeginDocument{%
+\def\@fnsymbol#1{%
+ \ifcase#1\or \TextOrMath\textasteriskcentered *\or
+ \TextOrMath {\textasteriskcentered\textasteriskcentered}{**}\or
+ \TextOrMath {\textasteriskcentered%
+ \textasteriskcentered\textasteriskcentered}{***}\or
+ \protect\ClassWarningNoLine{suftesi}%
+ {Too many footnotes per page. Compile again or\MessageBreak
+ remove the class option 'fewfootnote'}
+ \fi
+}%
+}
+\def\thefootnote{\@fnsymbol\c@footnote}%
+\fi
+% \end{macrocode}
+% \paragraph{The \cmd{xfootnote} command} Prints a footnote with discretionary
+% symbol give in the first argument.
+% \begin{macrocode}
+\newcommand*\xfootnote[1][*]{%
+ \xdef\@thefnmark{#1}%
+ \@footnotemark\@footnotetext}
+% \end{macrocode}
+% \paragraph{Marginal notes}
+% The |\marginpar| command is redefined according to the look
+% of \emph{Classic Thesis} by
+% André \textcite{Miede:2011}\index{Miede, André}.
+% \begin{macrocode}
+\let\oldmarginpar\marginpar
+\ifSUF@marginpar
+ \def\SUF@mpsetup{%
+ \itshape
+ \footnotesize%
+ \parindent=0pt \lineskip=0pt \lineskiplimit=0pt%
+ \tolerance=2000 \hyphenpenalty=300 \exhyphenpenalty=300%
+ \doublehyphendemerits=100000%
+ \finalhyphendemerits=\doublehyphendemerits}
+ \renewcommand{\marginpar}[1]{\oldmarginpar%
+ [\SUF@mpsetup\raggedleft\hspace{0pt}{#1}]%
+ {\SUF@mpsetup\raggedright\hspace{0pt}{#1}}}
+\else
+ \renewcommand\marginpar[2][]{}
+\fi
+% \end{macrocode}
+% Redefine an internal command of the \sty{todonotes} package in
+% order to use the class-specific marginal notes when this
+% package is loaded. This redefinition simply substitute
+% \cmd{oldmarginpar} to \cmd{marginpar}:
+% \begin{macrocode}
+\AtBeginDocument{%
+\@ifpackageloaded{todonotes}{%
+ \renewcommand{\@todonotes@drawMarginNoteWithLine}{%
+ \begin{tikzpicture}[remember picture, overlay, baseline=-0.75ex]%
+ \node [coordinate] (inText) {};%
+ \end{tikzpicture}%
+ \oldmarginpar[{% Draw note in left margin
+ \@todonotes@drawMarginNote%
+ \@todonotes@drawLineToLeftMargin%
+ }]{% Draw note in right margin
+ \@todonotes@drawMarginNote%
+ \@todonotes@drawLineToRightMargin%
+ }
+ }
+ }
+{\relax}}
+% \end{macrocode}
+% \subsection{The \opt{collection} structure}
+% \begin{macrocode}
+\ifsuftesi@collection
+\newcounter{journalnumber}
+\newcounter{journalvolume}
+\newcounter{issue}
+\newcounter{title}
+\setcounter{title}{1}
+\newcounter{article}
+\setcounter{article}{0}
+\setcounter{journalnumber}{0}
+\setcounter{tocdepth}{0}
+\def\journalname#1{\gdef\@journalname{#1}}
+ \def\@journalname{\@latex@warning@no@line{%
+ No \noexpand\journalname given}}
+\def\journalvolume#1{\gdef\@journalvolume{#1}}
+ \def\@journalvolume{\@latex@warning@no@line{%
+ No \noexpand\journalvolume given}}
+\def\journalnumber#1{\gdef\@journalnumber{#1}}
+ \def\@journalnumber{\@latex@warning@no@line{%
+ No \noexpand\journalnumber given}}
+\def\issue#1{\gdef\@issue{#1}}
+ \def\@issue{\@latex@warning@no@line{%
+ No \noexpand\issue given}}
+\def\journalyear#1{\gdef\@journalyear{#1}}
+ \def\@journalyear{\@latex@warning@no@line{%
+ No \noexpand\journalyear given}}
+\def\journalwebsite#1{\gdef\@journalwebsite{\url{#1}}}
+ \def\@journalwebsite{\@latex@warning@no@line{%
+ No \noexpand\journalwebsite given}}
+\def\thanks#1{\footnotemark\ \protected@xdef\@thanks{%
+ \@thanks\protect\footnotetext[\the\c@footnote]{#1}}}
+\def\fulljournal{\emph{\@journalname} \@journalnumber, %
+ \@issue{} \@journalyear}
+\def\issuename#1{\gdef\@issuename{#1}}
+\def\collectiontitle#1{\gdef\@collectiontitle{#1}}
+ \def\@collectiontitle{\@latex@warning@no@line{%
+ No \noexpand\collectiontitle given}}
+\def\collectioneditor#1{\gdef\@collectioneditor{#1}}
+ \def\@collectioneditor{\@latex@warning@no@line{%
+ No \noexpand\collectioneditor given}}
+\renewcommand*{\title}[2][]{%
+ \gdef\@headtitle{#1}\gdef\@title{#2}\markright{#1}}
+ \edef\title{\noexpand\@dblarg
+ \expandafter\noexpand\csname\string\title\endcsname}
+ \def\@headtitle{--missing title--%
+ \protect\ClassWarningNoLine{suftesi}{%
+ No \string\title\space given \MessageBreak%
+ See the class documentation for explanation}}
+ \def\@title{--missing title--%
+ \protect\ClassWarningNoLine{suftesi}{%
+ No \string\title\space given\MessageBreak%
+ See the class documentation for explanation}}
+ \def\@author{--missing author--%
+ \protect\ClassWarningNoLine{suftesi}{%
+ No \string\author\space given\MessageBreak%
+ See the class documentation for explanation}}
+\newcommand*\l@title[2]{%
+ \ifnum \c@tocdepth >\m@ne
+ \addpenalty{-\@highpenalty}%
+ \vskip 1.0ex \@plus\p@
+ \begingroup
+ \parindent \z@ \rightskip \@pnumwidth
+ \parfillskip -\@pnumwidth
+ \advance\leftskip1em
+ \hskip -\leftskip
+ #1\nobreak%
+ \ifsuftesi@dottedtoc\dotfill%
+ \nobreak\hb@xt@\@pnumwidth{\hss #2}\par
+ \else
+ \ifsuftesi@raggedtoc%
+ \nobreak\hskip1em #2 \hfill\null\par
+ \else
+ \ifsuftesi@pagelefttoc
+ \ClassError{suftesi}
+ {\MessageBreak
+ You can not use tocstyle=leftpage\MessageBreak
+ with structure=collection}
+ {You can not use tocstyle=leftpage\MessageBreak
+ with structure=collection}
+ \else
+ \nobreak\hfill #2\par
+ \fi
+ \fi
+ \fi
+ \penalty\@highpenalty
+ \endgroup
+ \fi}
+\renewcommand\maketitle{\par
+ \begingroup
+ \renewcommand\thefootnote{\@fnsymbol\c@footnote}%
+ \def\@makefnmark{\rlap{\@textsuperscript{\normalfont\@thefnmark}}}%
+ \long\def\@makefntext##1{\parindent 1em\noindent
+ \hb@xt@1.8em{%
+ \hss\@textsuperscript{\normalfont\@thefnmark}}##1}%
+ \if@twocolumn
+ \ifnum \col@number=\@ne
+ \@maketitle
+ \else
+ \twocolumn[\@maketitle]%
+ \fi
+ \else
+ \newpage
+ \global\@topnum\z@ % Prevents figures from going at top of page.
+ \@maketitle
+ \fi
+ \thispagestyle{plain}\@thanks%
+ \endgroup
+ \setcounter{section}{0}%
+% \setcounter{footnote}{0}%
+% \global\let\thanks\relax
+% \global\let\maketitle\relax
+% \global\let\@maketitle\relax
+% \global\let\@thanks\@empty
+% \global\let\@author\@empty
+% \global\let\@date\@empty
+% \global\let\@title\@empty
+% \global\let\title\relax
+% \global\let\author\relax
+% \global\let\date\relax
+ \global\let\and\relax
+ \let\thanks\@gobble}
+\AtBeginDocument{\def\@maketitle{%
+ \refstepcounter{article}
+ \SUF@chaptersize
+ \SUF@authortitle@align
+ \let\footnote\thanks
+ \parindent=0pt
+ {\SUF@second}%
+ \label{begin:\thearticle}
+% \end{macrocode}
+% Check if you don't use \sty{hyperrref} provided by Enrico Gregorio
+% (\url{https://tex.stackexchange.com/a/427203/231952}):
+% \begin{macrocode}
+ \@ifundefined{Hy@raisedlink}{\let\texorpdfstring\@firstoftwo}{%
+ \xdef\@currentHref{title.\thearticle}%
+ \Hy@raisedlink{\hyper@anchorstart{\@currentHref}\hyper@anchorend}%
+ }%
+% \end{macrocode}
+% \begin{macrocode}
+ \csname toc@entry@\endcsname
+ \begingroup%
+ \let\thanks\@gobble
+ \addcontentsline{toc}{title}{%
+ {\SUF@tocAUT@font{\@author}}\texorpdfstring{\newline}{, }%
+ {\SUF@tocTIT@font{\@headtitle}}}
+ \endgroup%
+ \par\nobreak\vspace{2ex}
+ {\SUF@first%
+ \vskip1.5cm}}%
+ }
+% \newenvironment{article}
+% {\begingroup
+% \global\let\@thanks\@empty
+% \setcounter{footnote}{0}
+% \refstepcounter{article}
+% \label{begin:\thearticle}
+%}
+% {\label{end:\thearticle}\endgroup
+% }
+\newenvironment{article}
+ {\begingroup
+ \setcounter{section}{0}
+ \setcounter{footnote}{0}
+ \setcounter{figure}{0}
+ \setcounter{table}{0}}
+ {\label{end:\thearticle}
+ \cleardoublepage
+ \global\let\@thanks\@empty
+ \endgroup}
+\newcommand{\collectiontitlepage}{%
+ \thispagestyle{empty}%
+ \begingroup
+ \centering
+ \vspace*{\stretch{1}}
+
+ {\SUF@chaptersize\@collectiontitle\par}
+ \vskip5ex
+
+ \@collectioneditor
+ \vspace*{\stretch{3}}
+
+ \endgroup
+ \clearpage}
+\def\frontispiece{\collectiontitlepage}
+% \end{macrocode}
+% In the collection document structure the articles are treated as
+% chapters but you would not need to print in
+% the table of contents all the sections of every article. So first of
+% all we include in the table of contents only the author and the
+% title of each paper. Anyway the sections inside each paper are
+% numbered as in standard articles:
+% \begin{macrocode}
+ \setcounter{tocdepth}{0}
+ \renewcommand\thesection{%
+ \@arabic\c@section}
+ \renewcommand\thesubsection{%
+ \thesection.\@arabic\c@subsection}
+ \renewcommand\thesubsubsection{%
+ \thesubsection.\@arabic\c@subsubsection}
+ \renewcommand\theparagraph{%
+ \thesubsubsection.\@arabic\c@paragraph}
+ \renewcommand\thesubparagraph{%
+ \theparagraph.\@arabic\c@subparagraph}
+ \else
+\fi
+% \end{macrocode}
+% \subsection{Title page}
+% The new \cmd{title} command has an optional argument
+% which can be used in the headers.
+% \begin{macrocode}
+\def\isbn#1{\gdef\@isbn{#1}}
+\def\@issn{\@latex@warning@no@line{%
+ No \noexpand\isbn given}}
+\def\doi#1{\gdef\@doi{#1}}
+\def\@doi{\@latex@warning@no@line{%
+ No \noexpand\doi given}}
+\def\isbn#1{\gdef\@issn{#1}}
+\def\@issn{\@latex@warning@no@line{%
+ No \noexpand\isbn given}}
+\renewcommand*{\title}[2][]{\gdef\@headtitle{#1}\gdef\@title{#2}}
+\edef\title{\noexpand\@dblarg
+ \expandafter\noexpand\csname\string\title\endcsname}
+\def\@headtitle{--missing title--%
+ \protect\ClassWarningNoLine{suftesi}{%
+ No \string\title\space given \MessageBreak%
+ See the class documentation for explanation}}
+\def\@title{--missing title--%
+ \protect\ClassWarningNoLine{suftesi}{%
+ No \string\title\space given\MessageBreak%
+ See the class documentation for explanation}}
+\def\@author{--missing author--%
+ \protect\ClassWarningNoLine{suftesi}{%
+ No \string\author\space given\MessageBreak%
+ See the class documentation for explanation}}
+\ifSUF@titlepage
+ \renewcommand\maketitle{%
+ \begin{titlepage}
+ \let\footnotesize\small
+ \let\footnoterule\relax
+ \let \footnote \thanks
+ \renewcommand\thefootnote{\@fnsymbol\c@footnote}%
+ \null\vfil
+ \vskip 60\p@
+ \begin{center}%
+ {\SUF@first\par}%
+ \vskip 3em%
+ {\lineskip .75em%
+ \begin{tabular}[t]{c}%
+ \SUF@second
+ \end{tabular}\par}%
+ \vskip 1.5em%
+ {\SUF@datefont\@date\par}%
+ \end{center}\par
+ \@thanks
+ \vfil\null
+ \end{titlepage}%
+ \setcounter{footnote}{0}%
+ \global\let\thanks\relax
+ \global\let\maketitle\relax
+ \global\let\@thanks\@empty
+ \global\let\@date\@empty
+ \global\let\date\relax
+ \global\let\and\relax}
+\else
+\renewcommand\maketitle{\par
+ \begingroup
+ \renewcommand\thefootnote{\@fnsymbol\c@footnote}%
+ \def\@makefnmark{\rlap{\@textsuperscript{\normalfont\@thefnmark}}}%
+ \long\def\@makefntext##1{\parindent 1em\noindent
+ \hb@xt@1.8em{%
+ \hss\@textsuperscript{\normalfont\@thefnmark}}##1}%
+ \if@twocolumn
+ \ifnum \col@number=\@ne
+ \@maketitle
+ \else
+ \twocolumn[\@maketitle]%
+ \fi
+ \else
+ \newpage
+ \global\@topnum\z@% Prevents figures from going at top of page.
+ \@maketitle
+ \fi
+ \thispagestyle{plain}\@thanks
+ \endgroup
+ \setcounter{footnote}{0}%
+ \global\let\thanks\relax
+ \global\let\maketitle\relax
+ \global\let\@maketitle\relax
+ \global\let\@thanks\@empty
+ \global\let\@date\@empty
+ \global\let\date\relax
+ \global\let\and\relax}
+\def\@maketitle{%
+ \newpage
+ \null
+ \vskip 2em%
+ \begin{center}%
+ \let \footnote \thanks
+ {\SUF@first\par}%
+ \vskip 1.5em%
+ {\lineskip .5em%
+ \begin{tabular}[t]{c}%
+ \SUF@second\par
+ \end{tabular}\par}%
+ \vskip 1em%
+ {\SUF@datefont\@date\par}%
+ \end{center}%
+ \par
+ \vskip 1.5em}
+\fi
+% \end{macrocode}
+% \subsection{Cover page}
+% \begin{macrocode}
+\newcommand{\Ctitle}[1]{\def\@Ctitle{#1}}
+\newcommand{\Csubtitle}[1]{\def\@Csubtitle{#1}}
+\newcommand{\Cauthor}[1]{\def\@Cauthor{#1}}
+\newcommand{\Ceditor}[1]{\def\@Ceditor{#1}}
+\newcommand{\Cfoot}[1]{\def\@Cfoot{#1}}
+\newcommand{\Cpagecolor}[1]{\def\@Cpagecolor{#1}}
+\newcommand{\Ccirclecolor}[1]{\def\@Ccirclecolor{#1}}
+\newcommand{\Ctextcolor}[1]{\def\@Ctextcolor{#1}}
+\newcommand{\Cfootcolor}[1]{\def\@Cfootcolor{#1}}
+\Cauthor{}
+\Ctitle{}
+\Csubtitle{}
+\Ceditor{}
+\Cfoot{}
+\Cpagecolor{gray!30}
+\Ctextcolor{white}
+\Cfootcolor{black}
+\AtBeginDocument{
+\@ifpackageloaded{tikz}{%
+\newcommand\makecover[1][]{%
+\begin{titlepage}
+\begin{tikzpicture}[overlay,remember picture]
+ \draw[draw=none,fill=\@Cpagecolor]
+ (current page.north west) rectangle (current page.south east);
+ \node[anchor=center,yshift=.22\paperwidth] at (current page.center) (c) {};
+ \draw[draw=none,fill=gray,#1]
+ (c) circle (.38\paperwidth) ;
+ \node[anchor=center] at (c) (author) {%
+\parbox{.7\paperwidth}{%
+ \centering
+ \ifx\@Cauthor\@empty
+ \else
+ {\scshape\color{\@Ctextcolor}\@Cauthor\\}
+ \vspace*{\baselineskip}
+ \fi
+
+ \ifx\@Ctitle\@empty
+ \else
+ {\Huge\bfseries\color{\@Ctextcolor}\@Ctitle\\[1ex]}
+ \fi
+
+ \ifx\@Csubtitle\@empty
+ \else
+ {\smallskip\Large\color{\@Ctextcolor}\@Csubtitle\\}
+ \fi
+
+ \ifx\@Ceditor\@empty
+ \else
+ {\vspace*{2\baselineskip}\color{\@Ctextcolor}\@Ceditor\\}
+ \fi}
+};
+\ifx\@Cfoot\@empty\else
+ \node[xshift=.5\paperwidth,yshift=1cm,
+ align=center,text=\@Cfootcolor,anchor=south]
+ at (current page.south west) {\@Cfoot};
+\fi
+\end{tikzpicture}
+\end{titlepage}
+}
+}
+{\def\makecover{\ClassError{suftesi}{\MessageBreak%
+ ***********************************\MessageBreak
+ * To use the \noexpand\makecover command\MessageBreak
+ * load the 'tikz' package.\MessageBreak
+ ************************************}{\MessageBreak%
+ ***********************************\MessageBreak
+ * To use the \noexpand\makecover command\MessageBreak
+ * load the 'tikz' package.\MessageBreak
+ ************************************}}}
+}
+% \end{macrocode}
+% \subsection{Frontispiece}
+% \begin{macrocode}
+\AtBeginDocument{%
+\@ifpackagewith{frontespizio}{suftesi}{%
+\ifsuftesi@periodical
+ \Margini {5.5cm}{7cm}{4.5cm}{0cm}
+ \else
+\ifsuftesi@periodicalaureo
+ \Margini {5.5cm}{7cm}{4.5cm}{0cm}
+ \else
+\ifsuftesi@compact
+ \Margini {4.5cm}{7cm}{4.5cm}{0cm}
+ \else
+\ifsuftesi@compactaureo
+ \Margini {4.5cm}{7cm}{4.5cm}{0cm}
+ \else
+\ifsuftesi@supercompact
+ \Margini {4.5cm}{10cm}{6cm}{1cm}
+ \else
+\ifsuftesi@supercompactaureo
+ \Margini {4.5cm}{10cm}{6cm}{1cm}
+ \else
+\ifsuftesi@pocketa
+ \Margini {4.5cm}{10cm}{6cm}{1cm}
+ \else
+\ifsuftesi@pocketb
+ \Margini {4.5cm}{10cm}{6cm}{1cm}
+ \else
+\ifsuftesi@pocketc
+ \Margini {4.5cm}{10cm}{6cm}{1cm}
+ \else
+\fi\fi\fi\fi\fi\fi\fi\fi\fi}
+{\@ifpackageloaded{frontespizio}{%
+\ifsuftesi@periodical
+ \Margini {1cm}{7cm}{5cm}{1cm}
+ \Rientro{1cm}
+ \else
+\ifsuftesi@periodicalaureo
+ \Margini {1cm}{7cm}{5cm}{1cm}
+ \Rientro{1cm}
+ \else
+\ifsuftesi@compact
+ \Margini {1cm}{7cm}{6cm}{1cm}
+ \Rientro{1cm}
+ \else
+\ifsuftesi@compactaureo
+ \Margini {1cm}{7cm}{6cm}{1cm}
+ \Rientro{1cm}
+ \else
+\ifsuftesi@supercompact
+ \Margini {1cm}{10cm}{8cm}{1cm}
+ \Rientro{1cm}
+ \else
+\ifsuftesi@supercompactaureo
+ \Margini {1cm}{10cm}{8cm}{1cm}
+ \Rientro{1cm}
+ \else
+\ifsuftesi@pocketa
+ \Margini {1cm}{10cm}{8cm}{1cm}
+ \Rientro{1cm}
+ \else
+\ifsuftesi@pocketb
+ \Margini {1cm}{10cm}{8cm}{1cm}
+ \Rientro{1cm}
+ \else
+\ifsuftesi@pocketc
+ \Margini {1cm}{10cm}{8cm}{1cm}
+ \Rientro{1cm}
+ \else
+\fi\fi\fi\fi\fi\fi\fi\fi\fi}
+{\relax}}}
+% \end{macrocode}
+% \paragraph{Colophon or copyright notice}
+% \begin{macrocode}
+\newcommand{\colophon}[3][]{%
+ \thispagestyle{empty}
+ \null
+ \vfill
+ \def\next{#2}
+ \ifx\next\@empty\else
+ \noindent Copyright \copyright{} \the\year~#2\\[1ex]
+ Tutti i diritti riservati
+ \fi
+ \vfill
+ {\small\noindent Questo lavoro \`e stato composto con \LaTeX{}%
+ \def\next{#1}
+ \ifx\next\@empty\else su #1
+ \fi usando la classe \textsf{suftesi} di
+ Ivan Valbusa\index{Valbusa, Ivan}. #3\par}
+ \cleardoublepage}
+\newcommand{\bookcolophon}[2]{%
+ \thispagestyle{empty}
+ \null
+ \vfill
+ \noindent #1
+ \vfill
+ {\small\noindent #2\par}
+ \cleardoublepage}
+\newcommand{\artcolophon}[1]{%
+\thispagestyle{empty}
+ \null
+ \vfill
+ {\small\noindent #1\par}}
+\newcommand{\finalcolophon}[1]{%
+\thispagestyle{empty}
+ \null\vspace*{\stretch{1}}
+ \begin{center}
+ \begin{minipage}{.5\textwidth}
+ \centering\small #1
+ \end{minipage}
+ \end{center}
+ \vspace*{\stretch{6}}}
+% \end{macrocode}
+% \paragraph{The \cmd{FSPL} colophon}
+% This command is defined only for the \opt{style=FSPL*} options.
+% \begin{macrocode}
+\ifsuftesi@FSPL
+\newcommand{\FSPLcolophon}[1][\the\year]{%
+\begingroup
+\thispagestyle{empty}
+\null\vspace{\stretch{1}}
+\noindent \hskip-.5em\cc #1 \@author%
+\vskip1ex
+
+\small\noindent This work is licensed under the Creative Commons
+Attribution-NonCommercial-NoDerivs 3.0 Unported License.
+To view a copy of this license,
+visit http://creativecom mons.org/licenses/by-nc-nd/3.0/.
+
+\endgroup
+
+\begingroup
+\footnotesize
+
+\null\vspace{\stretch{1}}
+
+\noindent Typeset with \LaTeX{} in collaboration with the Joint Project
+\emph{Formal Style for PhD Theses with \LaTeX} (University of Verona,
+Italy) using the \textsf{suftesi} class by Ivan Valbusa. The text face
+is Palatino, designed by Hermann Zapf. The sans serif font is Iwona by
+Janusz M.~Nowacki.
+
+\endgroup
+
+\clearpage}
+\else
+\def\FSPLcolophon{%
+ \ClassError{suftesi}
+ {\noexpand\FSPLcolophon is defined\MessageBreak
+ only for the FSPL styles}
+ {\noexpand\FSPLcolophon is defined\MessageBreak
+ only for the FSPL styles}}
+\fi
% \end{macrocode}
% \subsection{Backward compatibility}
% Two environments to manually typeset the bibliography and the list of shorthands.
@@ -6114,6 +6038,27 @@ Janusz M.~Nowacki.
\let\makelabel\itlabel}}
{\endlist}
% \end{macrocode}
+% A command to print an unnumbered introduction at the beginning of the chapter.
+% The \cmd{chapterintroname} defaults to ``Introduzione'' because the class was
+% initially designed primarily for Italian-speaking users.
+% \begin{macrocode}
+\ifsuftesi@article
+\def\chapterintro{%
+\ClassError{suftesi}
+ {Command \noexpand\chapterintro is undefined\MessageBreak
+ using 'structure=article'}
+ {Command \noexpand\chapterintro is undefined\MessageBreak
+ using 'structure=article'}}
+\else
+\def\chapterintro{\@ifstar{%
+ \@tempswafalse\@chapterintro}{\@tempswatrue\@chapterintro}}
+\def\@chapterintro{\phantomsection
+ \if@tempswa\section*{\SUF@fchapterintroname}\fi
+ \addcontentsline{toc}{section}{\SUF@fchapterintroname}}
+\newcommand{\chapterintroname}[1]{\def\SUF@fchapterintroname{#1}}
+\chapterintroname{Introduzione}
+\fi
+% \end{macrocode}
% \subsection{Final settings}
% \begin{macrocode}
\ifsuftesi@article
@@ -6160,8 +6105,6 @@ Janusz M.~Nowacki.
% \begin{macrocode}
\unless\ifPDFTeX% if xetex or luatex
\let\@afterindenttrue\@afterindentfalse
- \else
- \relax
\fi
% \end{macrocode}
% Now we switch off extra space after punctuation, in accordance with the habits
@@ -6244,48 +6187,12 @@ Janusz M.~Nowacki.
und der Typographie},
Year = {1975}}
-@online{Lehman:2010,
- Author = {Philipp Lehman},
- Note = {Versione 0.9a},
- Title = {The \textsf{biblatex} package},
- Url = {http://mirrors.ctan.org/macros/latex/contrib/biblatex/doc/biblatex.pdf},
- Year = {2010}}
-
@online{Miede:2011,
Author = {André Miede},
Title = {A Classic Thesis style},
Url = {http://mirrors.ctan.org/macros/latex/contrib/classicthesis/ClassicThesis.pdf},
Date = {2011}}
-@book{Pantieri:2011,
- Author = {Lorenzo Pantieri and Tommaso Gordini},
- Booktitle = {L'arte di scrivere con \LaTeX},
- Date = {2012},
- Edition = {new edition},
- Foreword = {Enrico Gregorio},
- Hyphenation = {italian},
- Subtitle = {Un'introduzione a \LaTeXe},
- Title = {L'arte di scrivere con \LaTeX},
- Url = {http://www.lorenzopantieri.net/LaTeX_files/ArteLaTeX.pdf},
- Annote = {Questa guida è diventata il punto di riferimento degli utenti
- italiani di \LaTeX\ ed è apprezzata per la chiarezza espositiva e la
- completezza dei contenuti}}
-
-@article{Pantieri:2009,
- Author = {Lorenzo Pantieri},
- Title = {L'arte di gestire la bibliografia con \pack{biblatex}},
- Url = {http://www.lorenzopantieri.net/LaTeX_files/Bibliografia.pdf},
- Year = {2009}}
-
-@article{Mori:2008,
- Author = {Lapo F. Mori},
- Journal = {ArsTeXnica},
- Month = {10},
- Pages = {37-51},
- Title = {Gestire la bibliografia con {\LaTeX}},
- Volume = {6},
- Year = {2008}}
-
@article{valbusa:20122,
Author = {Ivan Valbusa},
Date = {2012},
@@ -6361,7 +6268,7 @@ Janusz M.~Nowacki.
author = {Pignalberi, Gianluca},
url = {http://www.ctan.org/pkg/cclicenses},
urldate = {2020-05-24},
- date = {2005/05/20},
+ date = {2005-05-20},
version = {v0.4}
}
@@ -6371,7 +6278,7 @@ Janusz M.~Nowacki.
author = {Sharpe, Michael},
url = {http://www.ctan.org/pkg/cochineal},
urldate = {2020-05-24},
- date = {2016-2020},
+ date = {2020},
version = {1.061}
}
@@ -6401,7 +6308,7 @@ Janusz M.~Nowacki.
author = {Wette, Karl},
url = {http://www.ctan.org/pkg/emptypage},
urldate = {2020-05-24},
- date = {2009-2010},
+ date = {2010},
version = {1.2}
}
@@ -6501,7 +6408,7 @@ Janusz M.~Nowacki.
author = {B. Jackowski and J.M. Nowacki},
url = {http://www.ctan.org/pkg/lmodern},
urldate = {2020-05-24},
- date = {2003-2009},
+ date = {2009},
version = {2.004}
}
@@ -6636,15 +6543,24 @@ Janusz M.~Nowacki.
version = {v2.3}
}
-@manual{afterpage,
- title = {The \textsf{afterpage} package},
- subtitle = { Execute command after the next page break},
- author = {David Carlisle},
- url = {http://www.ctan.org/pkg/bookcover},
- urldate = {2020-06-29},
- date = {2014-10-28},
- version = {v1.08}
+@manual{zref,
+ title = {The \sty{zref} package},
+ author = {Heiko Oberdiek},
+ url = {http://www.ctan.org/pkg/zref},
+ urldate = {2021-05-23},
+ date = {2020-07-03},
+ version = {v2.32}
}
+
+@manual{epigraph,
+ title = {The \sty{epigraph} package},
+ author = {Peter R. Wilson and Will Robertson},
+ url = {http://www.ctan.org/pkg/epigraph},
+ urldate = {2021-05-23},
+ date = {2020-01-02},
+ version = {v1.5e}
+}
+
%</bib>
% \fi
% \Finale
diff --git a/macros/latex/contrib/suftesi/suftesi.pdf b/macros/latex/contrib/suftesi/suftesi.pdf
index e68f47ca08..2e8c75f472 100644
--- a/macros/latex/contrib/suftesi/suftesi.pdf
+++ b/macros/latex/contrib/suftesi/suftesi.pdf
Binary files differ
diff --git a/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl b/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
index e2bf5424a6..7a04340811 100644
--- a/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
+++ b/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
@@ -17,7 +17,6 @@ $mirrors = {
'https://mirror.bjtu.edu.cn/CTAN/' => 1,
'https://mirrors.aliyun.com/CTAN/' => 1,
'https://mirrors.bfsu.edu.cn/CTAN/' => 1,
- 'https://mirrors.cqu.edu.cn/CTAN/' => 1,
'https://mirrors.dgut.edu.cn/CTAN/' => 1,
'https://mirrors.hit.edu.cn/CTAN/' => 1,
'https://mirrors.nju.edu.cn/CTAN/' => 1,
@@ -55,9 +54,6 @@ $mirrors = {
'https://mirror.navercorp.com/CTAN/' => 1,
'https://mirror.yongbok.net/ctan/' => 1,
},
- 'Philippines' => {
- 'https://mirror.pregi.net/tex-archive/' => 1,
- },
'Singapore' => {
'https://download.nus.edu.sg/mirror/ctan/' => 1,
},
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb b/systems/texlive/tlnet/tlpkg/texlive.tlpdb
index e231dc12f5..e0f94785f7 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb
@@ -26,11 +26,11 @@ depend container_split_src_files/1
depend frozen/0
depend minrelease/2016
depend release/2021
-depend revision/59324
+depend revision/59335
name 00texlive.image
category TLCore
-revision 59310
+revision 59335
shortdesc TeX Live files only in the source repository
longdesc The files here are not copied by the installer and containers
longdesc are not built for them; they exist only in the source
@@ -4392,7 +4392,7 @@ depend setting_available_architectures:aarch64-linux amd64-freebsd amd64-netbsd
name 00texlive.installer
category TLCore
-revision 59312
+revision 59326
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
@@ -102637,7 +102637,7 @@ catalogue-version 1.0
name econ-bst
category Package
-revision 54191
+revision 59327
shortdesc BibTeX style for economics papers
relocated 1
longdesc This is a BibTeX style file for papers in economics. It
@@ -102645,11 +102645,11 @@ longdesc provides the following features: author-year type citation
longdesc reference style used in economics papers highly customizable
longdesc use of "certified random order" as proposed by Ray Robson
longdesc (2018)
-containersize 19448
-containerchecksum d3b6f06f66c1c6ad618a277c1db2021624d61f32271eebe899de9a6ffa10ff0dd2ecb22da64c1acc1122093a535a3af20b00fc7aa8831a1b0bc18e9032716e58
-doccontainersize 833168
-doccontainerchecksum 13887967396b2058f7120ff3e0144f275b6e642e0da4eb69f51ad064351e02fc0dd362308fe5131120ceba7e6cbe9b4079adda0407fe76179a52e3ce1660fcfe
-docfiles size=383
+containersize 20052
+containerchecksum 8791b0d0949d46d9badca09629c9afa5159b9a0a88a050ad8de0d7777addbe6a97f133cda4d3b29ee512cdad282cfe282fb8c3bfa7f981970e72d1f0ac1a6972
+doccontainersize 1234272
+doccontainerchecksum bed7c93ec480e8dda2f98e4790910b5199f893cf2c9ea6013044f2a6d1259ae6847cbb0f07c819db8cc55583931c9004ff5d3030beb7a38c7f8c3098f3ad8b9f
+docfiles size=650
RELOC/doc/bibtex/econ-bst/CHANGES.md
RELOC/doc/bibtex/econ-bst/README.md details="Readme"
RELOC/doc/bibtex/econ-bst/customization/README.md details="Readme"
@@ -102680,7 +102680,7 @@ docfiles size=383
RELOC/doc/bibtex/econ-bst/econ-example.bib
RELOC/doc/bibtex/econ-bst/econ-example.pdf details="Example of use"
RELOC/doc/bibtex/econ-bst/econ-example.tex
-runfiles size=253
+runfiles size=256
RELOC/bibtex/bst/econ-bst/econ-a.bst
RELOC/bibtex/bst/econ-bst/econ-abbr.bst
RELOC/bibtex/bst/econ-bst/econ-aea.bst
@@ -102694,10 +102694,11 @@ runfiles size=253
RELOC/bibtex/bst/econ-bst/econ.bst
catalogue-also economic
catalogue-contact-home https://github.com/ShiroTakeda/econ-bst
+catalogue-contact-repository https://github.com/ShiroTakeda/econ-bst
catalogue-ctan /biblio/bibtex/contrib/econ-bst
catalogue-license lppl1.3
catalogue-topics bibtex-sty
-catalogue-version 2.8
+catalogue-version 3.1
name econlipsum
category Package
@@ -137369,19 +137370,22 @@ catalogue-version 1.1.1
name huawei
category Package
-revision 59180
+revision 59328
shortdesc Template for Huawei documents
relocated 1
longdesc This unofficial package provides a class for creating documents
longdesc for people working with Huawei Technologies Co., Ltd..
-containersize 5860
-containerchecksum da26025f1d8bd717be2f1956646f4b5be2a4756f5a35248a10d2b5ba96e27521b41c4b1b9cbd25969dbc69a14419a583f8a03df3d9af37e42285a501b486877a
-doccontainersize 367124
-doccontainerchecksum 4b422aec65412c5fcf61810d9771f2cba544415e43f8b7b0c16beef53f74ce265dc80cd0fff053f70c669e7ab41e0b127c5568be383ed0e2e161f8963e54abdd
-docfiles size=92
+containersize 5912
+containerchecksum e18fac137874805a74ce1dcbc81b316a5320247b2b340b485c616fcad5193cdea967a51aad8ec38c4ea4bb88bd9dfa7bbf79ac626368a0ab7b0eb5a9571db81f
+doccontainersize 623196
+doccontainerchecksum 34165c833b43c6cc6a2225e55055ecfbd7aaf3011dfd01311ec7b9d80d46f67ee40c7bf686fbffe755b770b398e1299f204ea5fa8fe4119d5f35fe13acd32f27
+docfiles size=156
RELOC/doc/latex/huawei/README.md details="Readme"
RELOC/doc/latex/huawei/huawei.pdf details="Package documentation"
RELOC/doc/latex/huawei/huawei.tex
+ RELOC/doc/latex/huawei/images/huawei-cover.pdf
+ RELOC/doc/latex/huawei/samples/huawei-cfp.tex
+ RELOC/doc/latex/huawei/samples/huawei-charter.tex
runfiles size=5
RELOC/tex/latex/huawei/huawei.cls
catalogue-contact-bugs http://github.com/yegor256/huawei.cls/issues
@@ -137389,7 +137393,7 @@ catalogue-contact-repository http://github.com/yegor256/huawei.cls
catalogue-ctan /macros/latex/contrib/huawei
catalogue-license mit
catalogue-topics class misc-paper
-catalogue-version 0.2.0
+catalogue-version 0.3.0
name hulipsum
category Package
@@ -183424,7 +183428,7 @@ catalogue-version 0.2.0
name ltximg
category Package
-revision 59309
+revision 59335
shortdesc Extract LaTeX environments into separate image files
longdesc ltximg is a Perl script that automates the process of
longdesc extracting and converting environments provided by TikZ,
@@ -183434,14 +183438,15 @@ longdesc generates a file with only extracted environments and another
longdesc with all extracted environments converted to \includegraphics.
depend ltximg.ARCH
containersize 26344
-containerchecksum cd72810a146e44d8c56306d1b1f16f89429702f4d740985e16116d1ed14d1d998561bd7e16338c3cd52ccfabca28adb35f93282333b8f175b36d7cb112bb672d
-doccontainersize 245504
-doccontainerchecksum 3c5a1fcd05148b2835f0a7ef82e4cf85c61ec041451ad7c1b5238c413a6cd32948cfb9636372e51cca2c8de7e42e08109e624bf0e731464881fd75cc7ac84784
-docfiles size=113
+containerchecksum 0c91f46da529823a96ef441ec88d6d3c077a8bd5997bc291f55012e0d227cc24f00081f846ae127a364cba26498a74f2769d401e6d5fe0057afdb2a76a875f4a
+doccontainersize 275072
+doccontainerchecksum 05f9639a0224c779276a3b7f19450c93e255c70680fd54292e1ad41b3c89aa15dc187d58a73475ed9a8f7279faa0f3a0ec15042e75a52c70d78416ec46255b44
+docfiles size=122
+ texmf-dist/doc/man/man1/ltximg.1
+ texmf-dist/doc/man/man1/ltximg.man1.pdf details="Manual page (PDF)"
texmf-dist/doc/support/ltximg/README.md details="Readme"
texmf-dist/doc/support/ltximg/ltximg-doc.pdf details="Package documentation"
texmf-dist/doc/support/ltximg/ltximg-doc.tex
- texmf-dist/doc/support/ltximg/ltximg.1
texmf-dist/doc/support/ltximg/ltximg.man1.pdf details="Manual page (PDF)"
runfiles size=33
texmf-dist/scripts/ltximg/ltximg.pl
@@ -186224,7 +186229,7 @@ catalogue-version 0.1n
name lwarp
category Package
-revision 58837
+revision 59329
shortdesc Converts LaTeX to HTML
longdesc This package converts LaTeX to HTML by using LaTeX to process
longdesc the user's document and generate HTML tags. External utility
@@ -186244,20 +186249,20 @@ longdesc utilities, and Perl. Detailed installation instructions are
longdesc included for each of the major operating systems and TeX
longdesc distributions. A quick-start tutorial is provided.
depend lwarp.ARCH
-containersize 204312
-containerchecksum c56c2d5a4665ecdc95510de3408026d4566e9cffe9089b91d3ae117d723ef7d788d94b44dc9a84c7b2c39e8c09692d6a5e9a01c9ac6a0cb3f71f3247798458c4
-doccontainersize 3057740
-doccontainerchecksum 976f21f5595e4673405c27d7c6b9161691692135905c3ef07982f89917660cf04d33337e11e5906517fdc4735bb8f33c8fb455ae527ebc673c49a9d3652e83f2
-docfiles size=780
+containersize 205344
+containerchecksum 987a6fcd9e62583d7bdded92c01bbc8167b04ee6dcb4477df3c0824a046f0cde9ef852de628e6bd38c6637149a6da25b1ecc0749aa5df011bb28d52bbbd430bf
+doccontainersize 3074924
+doccontainerchecksum d7ab9461e5693677f9da02d50f44deb186434038bb52567dc8404c18cb1a0ae94c856eac9ebf2d17aa654ffaae0157e2f9246983bfaf2f859030ede8ba009e92
+docfiles size=784
texmf-dist/doc/latex/lwarp/README.txt details="Readme"
texmf-dist/doc/latex/lwarp/lwarp.pdf details="Package documentation"
texmf-dist/doc/latex/lwarp/lwarp_tutorial.txt details="Quick-start tutorial"
-srccontainersize 439180
-srccontainerchecksum db21fa84855166d966f1c1efebe0f5ffd6c2af3afc1d07fb523f6891f851c619ebaaa090e3de7b6e964e073c0553596fdbb637df7247c1d48f7489daefaea9d3
-srcfiles size=671
+srccontainersize 441860
+srccontainerchecksum 292fa297397a798f1f2b5bf7469dc9f9721c41f4845bc4dcbdbd38857981ecbcda244c7c6be00266ac8bef550d5a80c7712ab550b17b88ad06847e013b2cd379
+srcfiles size=676
texmf-dist/source/latex/lwarp/lwarp.dtx
texmf-dist/source/latex/lwarp/lwarp.ins
-runfiles size=779
+runfiles size=786
texmf-dist/scripts/lwarp/lwarpmk.lua
texmf-dist/tex/latex/lwarp/lwarp-2in1.sty
texmf-dist/tex/latex/lwarp/lwarp-2up.sty
@@ -186333,6 +186338,7 @@ runfiles size=779
texmf-dist/tex/latex/lwarp/lwarp-caption3.sty
texmf-dist/tex/latex/lwarp/lwarp-cases.sty
texmf-dist/tex/latex/lwarp/lwarp-ccicons.sty
+ texmf-dist/tex/latex/lwarp/lwarp-centerlastline.sty
texmf-dist/tex/latex/lwarp/lwarp-centernot.sty
texmf-dist/tex/latex/lwarp/lwarp-changebar.sty
texmf-dist/tex/latex/lwarp/lwarp-changelayout.sty
@@ -186372,6 +186378,7 @@ runfiles size=779
texmf-dist/tex/latex/lwarp/lwarp-dblfnote.sty
texmf-dist/tex/latex/lwarp/lwarp-dcolumn.sty
texmf-dist/tex/latex/lwarp/lwarp-decimal.sty
+ texmf-dist/tex/latex/lwarp/lwarp-decorule.sty
texmf-dist/tex/latex/lwarp/lwarp-diagbox.sty
texmf-dist/tex/latex/lwarp/lwarp-dingbat.sty
texmf-dist/tex/latex/lwarp/lwarp-dotlessi.sty
@@ -186412,6 +186419,7 @@ runfiles size=779
texmf-dist/tex/latex/lwarp/lwarp-extramarks.sty
texmf-dist/tex/latex/lwarp/lwarp-fancybox.sty
texmf-dist/tex/latex/lwarp/lwarp-fancyhdr.sty
+ texmf-dist/tex/latex/lwarp/lwarp-fancypar.sty
texmf-dist/tex/latex/lwarp/lwarp-fancyref.sty
texmf-dist/tex/latex/lwarp/lwarp-fancytabs.sty
texmf-dist/tex/latex/lwarp/lwarp-fancyvrb.sty
@@ -186452,6 +186460,7 @@ runfiles size=779
texmf-dist/tex/latex/lwarp/lwarp-fouridx.sty
texmf-dist/tex/latex/lwarp/lwarp-fourier.sty
texmf-dist/tex/latex/lwarp/lwarp-framed.sty
+ texmf-dist/tex/latex/lwarp/lwarp-froufrou.sty
texmf-dist/tex/latex/lwarp/lwarp-ftcap.sty
texmf-dist/tex/latex/lwarp/lwarp-ftnright.sty
texmf-dist/tex/latex/lwarp/lwarp-fullminipage.sty
@@ -186615,6 +186624,7 @@ runfiles size=779
texmf-dist/tex/latex/lwarp/lwarp-parskip.sty
texmf-dist/tex/latex/lwarp/lwarp-patch-komascript.sty
texmf-dist/tex/latex/lwarp/lwarp-patch-memoir.sty
+ texmf-dist/tex/latex/lwarp/lwarp-pbalance.sty
texmf-dist/tex/latex/lwarp/lwarp-pbox.sty
texmf-dist/tex/latex/lwarp/lwarp-pdfcol.sty
texmf-dist/tex/latex/lwarp/lwarp-pdfcolfoot.sty
@@ -186704,6 +186714,7 @@ runfiles size=779
texmf-dist/tex/latex/lwarp/lwarp-sidecap.sty
texmf-dist/tex/latex/lwarp/lwarp-sidenotes.sty
texmf-dist/tex/latex/lwarp/lwarp-simplebnf.sty
+ texmf-dist/tex/latex/lwarp/lwarp-siunitx-v2.sty
texmf-dist/tex/latex/lwarp/lwarp-siunitx.sty
texmf-dist/tex/latex/lwarp/lwarp-skmath.sty
texmf-dist/tex/latex/lwarp/lwarp-slantsc.sty
@@ -186838,7 +186849,7 @@ catalogue-contact-home http://bdtechconcepts.com/
catalogue-ctan /macros/latex/contrib/lwarp
catalogue-license lppl1.3
catalogue-topics cvt-html
-catalogue-version 0.896
+catalogue-version 0.897
name lwarp.aarch64-linux
category Package
@@ -214567,7 +214578,7 @@ catalogue-version 1.1
name ninecolors
category Package
-revision 59119
+revision 59330
shortdesc Select colors with proper WCAG color contrast
relocated 1
longdesc This package carefully selects and defines 9 colors for 13 hues
@@ -214577,10 +214588,10 @@ longdesc color white is of level 10. By simply choosing two colors in
longdesc the above list, which differ in level by at least 5, as
longdesc foreground and background colors, you will get proper WCAG
longdesc Color Contrast.
-containersize 2120
-containerchecksum 82de4ba149cf2b4da2db1c780b2ec3ab2d86173d363cd261475ba31143209d966072823a86f2e5d3aff4bac11a554376cc9981aadfc94acd20393336a26e419f
-doccontainersize 32516
-doccontainerchecksum 22f697b4426141b0209b20d1e2455a0988387391932dead0fd015ab27dfa76e18385f93b3bc6b01ae6da6f0884c9576cc6c27510659674bc56d8baf562935190
+containersize 2124
+containerchecksum 276b119a025ed809dd17a1f72ff19c341247e5efdcd06d4723b8e489139223cd937453d52231e9bb4a9facb43bbb19135f34030f502d9bf63ab57f3d44b915ff
+doccontainersize 32452
+doccontainerchecksum b22ac4ee6e32f33b93a2776bf43fb7a1415b5e681de83307e3f793eb516742fed3eec180b98992bce5e2fbe9552074c70109fd5217d6ab10f0abe22064df52b5
docfiles size=11
RELOC/doc/latex/ninecolors/README details="Readme"
RELOC/doc/latex/ninecolors/ninecolors.pdf details="Package documentation"
@@ -214592,7 +214603,7 @@ catalogue-contact-repository https://github.com/lvjr/ninecolors
catalogue-ctan /macros/latex/contrib/ninecolors
catalogue-license lppl1.3
catalogue-topics colour expl3
-catalogue-version 2021B
+catalogue-version 2021C
name njurepo
category Package
@@ -236734,7 +236745,7 @@ catalogue-version 5.0
name pbalance
category Package
-revision 59106
+revision 59331
shortdesc Balance last page in two-column mode
relocated 1
longdesc This package balances the columns on the last page of a
@@ -236742,16 +236753,16 @@ longdesc two-column document. If the page is "simple" (no footnotes,
longdesc floats, or marginpars), is uses the balance package; otherwise,
longdesc it uses \enlargethispage to make the left column shorter,
longdesc balancing the columns.
-containersize 5900
-containerchecksum d581197f756e58499058618fa63f735c955612d5bea3e80d0853611f26187deae9e046f0de8c2823c445c3f8b30bc14f3f8649b613fcdc43825ceecbfbac2220
-doccontainersize 244384
-doccontainerchecksum 0db997d5d9ca1e08a76e84418c4e822400edba8b0b1294969eaa57d3d628dd0aa093ef67adddc6be3444ca57e6101da87568777682a885b5f99c5ac8e83624e4
+containersize 5892
+containerchecksum daaf515149e083628cbb8b855d90d0cb0e6499b8338294550db1220b867c9881463c61a2cc1d6fe1eccb3cf2a7e0fae57b865791e4195ee7543f63104c63ddec
+doccontainersize 244488
+doccontainerchecksum e6a80cc1f71bc8c272db0a5c2a158cf5abd67e61f76e6412aae6d3854b5b030837a063e18291f843cf9d3d91479da8f4a7f74ebe3b539d783f823cdf448cc9b6
docfiles size=62
RELOC/doc/latex/pbalance/LICENSE
RELOC/doc/latex/pbalance/README.md details="Readme"
RELOC/doc/latex/pbalance/pbalance.pdf details="Package documentation"
-srccontainersize 11864
-srccontainerchecksum 3f14551ea9d27a970220adf8ce88d27628d3d4b1e91d3358691af53fb69576aea36a5bfea98a636ddebb4d74fc05c64da9734d93d78bad48e9e8aa64d4c39df0
+srccontainersize 11876
+srccontainerchecksum 384b17dfd1ac15589b83a5b6f95f5494fbb76a54b19d09eddcb73b5250795c70b19e76c29616402b5ecf4c649b9a1e5a3edbb50d1bc8175815eecc70ca27616f
srcfiles size=11
RELOC/source/latex/pbalance/pbalance.dtx
RELOC/source/latex/pbalance/pbalance.ins
@@ -236763,7 +236774,7 @@ catalogue-contact-home https://gitlab.com/lago/pbalance
catalogue-ctan /macros/latex/contrib/pbalance
catalogue-license lppl1.3c
catalogue-topics multicol
-catalogue-version 1.1.0
+catalogue-version 1.1.1
name pbibtex-base
category Package
@@ -273934,7 +273945,7 @@ catalogue-version 1.0
name siunitx
category Package
-revision 59308
+revision 59332
shortdesc A comprehensive (SI) units package
relocated 1
longdesc Typesetting values with units requires care to ensure that the
@@ -273959,18 +273970,18 @@ longdesc The package relies on LaTeX 3 support from the l3kernel and
longdesc l3packages bundles.
depend l3kernel
depend l3packages
-containersize 60480
-containerchecksum ece31f91adbd9e4b5cf619bd07bf8ba966e8bac1a7df44bac0d3f8900e733bbcc4906123e5f37741c93f0ce44f8e9af9f1672b6d12e38e467754b0549f7ada53
-doccontainersize 1959620
-doccontainerchecksum 3e123d615c185cce591a04ae0cb8da7e95c3c97d34ee577b90ef8ced0bd80db4f312320f81952e052d3f2d154a38d7c71bd43754c26fcf1867e859cb8733f605
-docfiles size=512
+containersize 60580
+containerchecksum c67a10840fc29c3d1495c63cd63434719fc82407c434c355aeb95924c1dce6c6869372fd8fb71b81f9884f12bb0c4e6ce23ffb431b018faebf366d6afe9eeeab
+doccontainersize 1953004
+doccontainerchecksum 8435c0720a664285310fddb1641acdb0df9dbfa1109f30057cd91a465630587ce03d4c7e403789dd0094513fd8d2514116ab3bbeed1a51d1974ff537b530ea0f
+docfiles size=511
RELOC/doc/latex/siunitx/CHANGELOG.md
RELOC/doc/latex/siunitx/README.md details="Readme"
RELOC/doc/latex/siunitx/siunitx-code.pdf details="Code documentation"
RELOC/doc/latex/siunitx/siunitx.pdf details="User manual"
-srccontainersize 102228
-srccontainerchecksum 80337911303e40576978d8f7702de1b1df78efc86f6e53747a95ec5d2febcf5a96805668258361242f2c12e62f13ff8234cc2bfd206cc68f11d3c807c335bfb7
-srcfiles size=156
+srccontainersize 102256
+srccontainerchecksum b4066c31e165f935c02ae4ecd8427f5fa5a4f6f351c8e128b3a2f05472ea2a7d0b53406fad74921186f4ffb1611f8bfbc70f4996210d05059d797ae769dc15f3
+srcfiles size=157
RELOC/source/latex/siunitx/siunitx-abbreviation.dtx
RELOC/source/latex/siunitx/siunitx-angle.dtx
RELOC/source/latex/siunitx/siunitx-binary.dtx
@@ -273989,7 +274000,7 @@ srcfiles size=156
RELOC/source/latex/siunitx/siunitx.dtx
RELOC/source/latex/siunitx/siunitx.ins
RELOC/source/latex/siunitx/siunitx.tex
-runfiles size=141
+runfiles size=142
RELOC/tex/latex/siunitx/siunitx-abbreviations.cfg
RELOC/tex/latex/siunitx/siunitx-binary.cfg
RELOC/tex/latex/siunitx/siunitx-v2.sty
@@ -274001,7 +274012,7 @@ catalogue-contact-repository https://github.com/josephwright/siunitx
catalogue-ctan /macros/latex/contrib/siunitx
catalogue-license lppl1.3c
catalogue-topics units scientific-docs expl3
-catalogue-version 3.0.4
+catalogue-version 3.0.5
name skak
category Package
@@ -280713,7 +280724,7 @@ catalogue-version 1.0
name sr-vorl
category Package
-revision 39529
+revision 59333
shortdesc Class for Springer books
relocated 1
longdesc This package provides a LaTeX class and templates for books to
@@ -280722,28 +280733,28 @@ longdesc Research, Springer Spektrum Research, Springer VS Research, or
longdesc Springer VS Forschung. It may be used to produce monographs in
longdesc different formats and "several-authors-books" fitting the
longdesc conditions of the aforementioned publishers.
-containersize 3720
-containerchecksum 135186b501bcf2a9b338ff13e330401ae3ca39db4225f639549cc929991d2177804b44ddbaec805ec1cd56982b140cec4625e7564fad7f4de89d2c2e06ad60d8
-doccontainersize 447828
-doccontainerchecksum a65dc0b7a12b5435d753aeeaca7643747c94463835cf1706e042710272cc0eef66d4f5f827c99034f9126bcbbf7e41293196f9ee29ed3f9961b9af27e2879747
-docfiles size=115
+containersize 4280
+containerchecksum 8a9b0833bc518b12019d2d474a70760e3b44766751485215c746b8a7c3b9ee1f9e92a5cee09c5f961fe97387855627c6a385b7484564556e0901c08c922410dd
+doccontainersize 452688
+doccontainerchecksum 774c91361a95510a356fb7fbb70f753954d30d1ac309c1cf09727a2c9ea647b65f046d3eded8e631b512190f5705eab020abe8b7923ee9d6230c6c9fd782dea5
+docfiles size=116
RELOC/doc/latex/sr-vorl/README details="Readme"
RELOC/doc/latex/sr-vorl/backmatter_sr-vorl.tex
RELOC/doc/latex/sr-vorl/frontmatter_sr-vorl.tex
RELOC/doc/latex/sr-vorl/hauptdatei_sr-vorl.tex
RELOC/doc/latex/sr-vorl/mainmatter_sr-vorl.tex
RELOC/doc/latex/sr-vorl/sr-vorl.pdf details="Package documentation"
-srccontainersize 17404
-srccontainerchecksum f41d126426035fa0d1cf6564d9eb4966618a1c8f805bca3097a5f7e72c62a12c9d8e39b6830f9b1e356940b67bd99803e869d849949854a1a17da4c7ba971195
-srcfiles size=17
+srccontainersize 18872
+srccontainerchecksum fafacdaf874ec094aea5451962c3c79584da5fdc1e0aec34b9965b9c8531d19538d362b68ff1d07073aaa3c24483214168b942b6b4e0391384c69c690620d9a7
+srcfiles size=20
RELOC/source/latex/sr-vorl/sr-vorl.dtx
RELOC/source/latex/sr-vorl/sr-vorl.ins
-runfiles size=3
+runfiles size=4
RELOC/tex/latex/sr-vorl/sr-vorl.cls
catalogue-ctan /macros/latex/contrib/springer/sr-vorl
-catalogue-license lppl1.3
-catalogue-topics book-pub class
-catalogue-version 1.1
+catalogue-license lppl1.3c
+catalogue-topics book-pub class doc-templ
+catalogue-version 1.2
name srbook-mem
category Package
@@ -284592,29 +284603,29 @@ catalogue-version 1.0a
name suftesi
category Package
-revision 59280
+revision 59334
shortdesc A document class for typesetting theses, books and articles
relocated 1
longdesc The class can be used to typeset any kind of book (originally
longdesc designed for use in the humanities).
-containersize 14868
-containerchecksum 5b60e402942ca61ef4a07053ea625afb1c3149dd5625d55d5d93811a233e93b7534afb569e1bc317c4e1ea65a7fc527a8304aaea162de16eaf605000612b8df9
-doccontainersize 1036036
-doccontainerchecksum 8af03341ebf5e6c0009ca40c728e1006fd1f909f5b1f851c9eea767d6ea7b13071fc6899ce65c3ac4cf13aa0719052e271290751b3e20555ae9a249f4a8b8a8b
-docfiles size=374
+containersize 14828
+containerchecksum bfe0b60fc975597b73ffb1bc5d28463381c5692213b37428c4163eb80a13966d4052214ea237e3989da1085b978cde38b712ecc4cc70e6ede3931d1264f48afb
+doccontainersize 1031732
+doccontainerchecksum 6158000f99b0c6a586300c77c5db882d7a9c68dec4aff8008d27f595e04552f84a18181b5f040b8ac60b33d4defef77ba6740c3386afe8f2b61e5a65368eea1f
+docfiles size=373
RELOC/doc/latex/suftesi/README details="Readme"
RELOC/doc/latex/suftesi/suftesi.pdf details="Package documentation" language="en"
RELOC/doc/latex/suftesi/templates.zip
-srccontainersize 43284
-srccontainerchecksum 138048d45359197e4321ee8147acd62d03afb5af17844eb0404adbbfdc7609667938f649d0219edcc3b588e0aafcb3a52d9311015106d91e565392ad420f89e3
+srccontainersize 42744
+srccontainerchecksum c02f91b0887ab7b48f1332574ef5074322d697ed7c8eeeef584ee3867845a528ad7c123115dd2f119af7741dc4c5c50418c4a73b6824f22add8aac92dceeb6d2
srcfiles size=57
RELOC/source/latex/suftesi/suftesi.dtx
-runfiles size=26
+runfiles size=25
RELOC/tex/latex/suftesi/suftesi.cls
catalogue-ctan /macros/latex/contrib/suftesi
catalogue-license lppl1.3
-catalogue-topics book-pub class dissertation
-catalogue-version 3.1.0
+catalogue-topics class book-pub dissertation
+catalogue-version 3.1.1
name sugconf
category Package
@@ -299623,7 +299634,7 @@ docfiles size=376
name texlive-scripts
category TLCore
-revision 59312
+revision 59326
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.
@@ -299631,10 +299642,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 107992
-containerchecksum 26fcec75e3b7bc6b29581cd9b2881987323f8936f67d53f89554293377fddff3673f4e1378498a0e146d9fda45ca931c2124c53b613f238cebd252a763a02ae1
+containersize 107976
+containerchecksum 75eedf9b38bcc420dbff29d251739792d58084bd850c1298bdc21b2820e2ea70f5b1494663d56488efa6da40e02769181acebae484967518b7e564a3bb269510
doccontainersize 397408
-doccontainerchecksum d48ddadeefa4b198a3a430e51e62b2e534727e302b7f7202d35fa30159d7f27de42d2bfc0be164e80b2076542a476fb63cc2dbf926c7cc8812b5944c962cc24d
+doccontainerchecksum 0412935a09ef110f98466a436a79ad9986b971893de2d692a1439e9baa763494e6a400c135c30ce665e5c2e17534f80574cd369bc26985e75338bfea6d8135d6
docfiles size=490
doc.html
texmf-dist/doc/man/man1/fmtutil-sys.1
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
index 82a6401443..5e8a864da1 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
@@ -1 +1 @@
-b333dc1a0e7ed3869b930c0002b28ec2 texlive.tlpdb
+c25a64e2d6e062dab0112a707e170e59 texlive.tlpdb
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
index b336011acd..526d1d74b0 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
@@ -1 +1 @@
-e4d0f9507a61786fb36218ce94664660187559e4308967073cbfd1539ceb0094aebcef6d94790df89d98b101eb244f98d6949b1814574549b9b43f0bd7fc34d4 texlive.tlpdb
+c5395db023ab5021245c6db5c63682b8ab965b1f81ecc7e222bb91a002e8ec572d64fd289084eaacb434549c33cd105a3ccd36d14438577bf570d69f9f59d3df texlive.tlpdb
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
index b7559764f3..823825f5b7 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-----
-iQEcBAEBCgAGBQJgqur5AAoJEEzhh34ZQ4xw7E8IAKtnjw89JIxUWa4izY9+7NX8
-bAvSHJAHMl4GrTluxT3Sg555i/nRwwOpf76LESXqKj9KpVgqTMCda/OUfP+BSnf+
-0IaOumL4ZsfpnbBdK4EkUV7dEVvL7dwgq18vzesY5xEPVZY6VebePHTUbpHmRq5o
-Vg7XcRUNny37JwkzfrqR5ix3YHcxvSKXJOYy8ZkYTRcPRIb50YRU2tcikVaLbZUq
-vwxgAkbvEn++IGsE921kW8UyFHD5PC0SwH1G9VOov3R/lzvdTmMzXtPVzW5lJWDB
-JdN6nDnpHispL0cnvWm9E1GNhA9MVossMIQDOVjP3vk+/qi4ecNhpMmZSbOK7ho=
-=rAsV
+iQEcBAEBCgAGBQJgrDxOAAoJEEzhh34ZQ4xwhIwH/jt8uh22zdZaltI8P8Tpg/v4
+U08VTpdKvxbXoT957WXoc25JX2gKKAIG7Nc8kXLJRN6vU3e63ul9QJL8nRg+775f
+G8ZaGuSLjMbkd45csP0DF5P84JksGDIoEByzklDvjYbzL1h0mQndp5Flrc+UFmax
+z9dNcqIuYniBT+5NxLFmL02HRqGYcnzHk1Lq9tAlzZUKhXONmDbfH/LAO0CLgJZ2
+iTugEAXfBhSoYoFrJ3DAS0OFTxZe7SvStCGyKPZO0YruaiLRb33Uz/4KxT5vxm/D
+ZyUTPu1BL2g9msMSsemY57OjXcOHsEjQp2d91HQv0mhfVMdFFnGoI0FghL2q6Bk=
+=vJNr
-----END PGP SIGNATURE-----
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
index bde0711f23..4b47f4103c 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
Binary files differ
diff --git a/systems/win32/miktex/setup/deb/dists/bionic/InRelease b/systems/win32/miktex/setup/deb/dists/bionic/InRelease
index ea051f8955..eb3ed4c765 100644
--- a/systems/win32/miktex/setup/deb/dists/bionic/InRelease
+++ b/systems/win32/miktex/setup/deb/dists/bionic/InRelease
@@ -5,36 +5,36 @@ Origin: . bionic
Label: . bionic
Suite: bionic
Codename: bionic
-Date: Thu, 25 Mar 2021 15:33:16 UTC
+Date: Mon, 24 May 2021 18:58:40 UTC
Architectures: amd64
Components: universe
Description: Generated by aptly
MD5Sum:
+ 9526e46e6d1eb1bfd86a375860025b3e 9286 universe/binary-amd64/Packages
+ c05451836b6df186ea801e0c9eddb85a 1490 universe/binary-amd64/Packages.gz
+ 57ed173a3e381ba12cf4c4d778f58260 1778 universe/binary-amd64/Packages.bz2
+ f3f838e2c02900c5f9c53494c7cfc9dc 1510 universe/Contents-amd64.gz
36dc8434c02eb018d9e4e8e159504a01 89 universe/binary-amd64/Release
- 97bccc5e0ea0b01968f5a77233e9fe8d 13252 universe/binary-amd64/Packages
- bd79e7a3da8109ff861dde81e2682487 1849 universe/binary-amd64/Packages.gz
- 96558a5f5f0159c7c1bdba3c3da9a478 2237 universe/binary-amd64/Packages.bz2
- 93bd858100823f302b49fbff84345038 1868 universe/Contents-amd64.gz
SHA1:
+ a321bd550ba13ef092332a032ab436ebf6640e90 9286 universe/binary-amd64/Packages
+ c0dbd194d27c09dc774588a3742b0a003fcf9ffe 1490 universe/binary-amd64/Packages.gz
+ c099c0b811b0543116587b6f9a10fc0ee54cf95f 1778 universe/binary-amd64/Packages.bz2
+ 7880333f9024874a72000f81e0cfccf43765d9e6 1510 universe/Contents-amd64.gz
bb2235b2a24a57ac4d7a8c6e4e3b8048f8273323 89 universe/binary-amd64/Release
- 222b6afba8fd3bd253b66d4e82c5b3e9510b4582 13252 universe/binary-amd64/Packages
- 53cb13ee1aa3eca5c323ba6a05bf4501249eaad8 1849 universe/binary-amd64/Packages.gz
- ba827e42b6c5d0a10d1ddd18a9bcc3a20e050879 2237 universe/binary-amd64/Packages.bz2
- 387d894085181b1fcd78ee39f2b3c642d962c63e 1868 universe/Contents-amd64.gz
SHA256:
+ ab47d347584173f82f1f0fb87eea2b8362ca5f3fcbbf0eb0fcd8ddcf3786e81b 9286 universe/binary-amd64/Packages
+ 3878e32e6f2dd61475d776a35ed6fdce54273ca05a663876f8632da01fee12a0 1490 universe/binary-amd64/Packages.gz
+ 7a66206bf0354e989176ea5ed81b7423da79bd16ac8c106fb05efe6f6cb31b2f 1778 universe/binary-amd64/Packages.bz2
+ a9c4fe06f32b300f89373167dbe987917d6f848dd8537892da71ef8f3ee97818 1510 universe/Contents-amd64.gz
3585e1e45afb8a3cb3c7a593ec7dd8e34029c4ee18a044c369775fde5bba20dd 89 universe/binary-amd64/Release
- 89ad9ab4b9e36ffd988e3fc6f687df4e9191cfe500ea484e92b92a0c7d64c7ef 13252 universe/binary-amd64/Packages
- a64c17c45839c6dde839171ac49ba51b63c4bf0ac57d9b80512e12b4793893e1 1849 universe/binary-amd64/Packages.gz
- 1c6953aa1e525e73965940cc05d9fbd77f3a57ff456e4fab3863d1f14d35897e 2237 universe/binary-amd64/Packages.bz2
- 874eb508922da01626ea6d14d89462dfcad384d3c2647f87a3a41fddfa4a8c8b 1868 universe/Contents-amd64.gz
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
-iQEcBAEBCAAGBQJgXK08AAoJECd6cpP1nkiJe3gIAJN4VnHp6r9M4dKNAk6pOE4Y
-Muq+j0mH/E+B5WdTOTNFjwqMqeiJKOF1k5Zb5XFUp+rKdxHcZB6bdwkdA/DTt1RN
-7c5FuU44IM/Ho6hJX0zWQZgGrIRtZ8AcSQYxsAk1iJk0HwADsuJT4bQAD8lBIiUx
-LUIzBvTu0d7vudy+BE+BqgTWBpUamnHsc1xmpdQKAN3vrZO1NAg2zv5HaAps8qG1
-MEMMNYgvDeddXEiCYdN1aCcxvsceaUIYdtRmY11DjNoE2rBG+qeQhSUGzUINrKQ2
-gc+8P93uPPFoi64Y/W8xOLQcPD4mnwWXvpSL85iSPqMGsIPoDt+QhgzTztVwqiI=
-=IP3J
+iQEcBAEBCAAGBQJgq/dgAAoJECd6cpP1nkiJHPUH/2HESEsX+vXnKZJNZJkmbQBk
+DFgeZK0FFJCfmOMhnB0N0ecfjn/GkQ2x2ms30Jh0o1TQl80DLCqqv9DJdP3p4Ay7
+qmXhpeYgbJs5+xcX3nnShXpie31BECaKVFkHUo3S+bMTfPtiyFYZqONXruzUe/Um
+vMZTKkKMDsWftyg3hgWeS8OheB3WLpslloptA77v6z5eKUHjY0vEOpZWBgB0RHc6
+Vt1BSOl0V3c+ychGbovnjFVgT72Xy2FhM1f7FkpK/ZxSIJwoTv0JMOUmkgPqVtNF
++RavvTaPHzQqHSIpbWumC4rFJSoXEHZSMC8bMPzf3+sID80Yh9ILSVr6rRev4V4=
+=xQhq
-----END PGP SIGNATURE-----
diff --git a/systems/win32/miktex/setup/deb/dists/bionic/Release b/systems/win32/miktex/setup/deb/dists/bionic/Release
index cb96ed4b4d..ec4bd9f257 100644
--- a/systems/win32/miktex/setup/deb/dists/bionic/Release
+++ b/systems/win32/miktex/setup/deb/dists/bionic/Release
@@ -2,25 +2,25 @@ Origin: . bionic
Label: . bionic
Suite: bionic
Codename: bionic
-Date: Thu, 25 Mar 2021 15:33:16 UTC
+Date: Mon, 24 May 2021 18:58:40 UTC
Architectures: amd64
Components: universe
Description: Generated by aptly
MD5Sum:
+ 9526e46e6d1eb1bfd86a375860025b3e 9286 universe/binary-amd64/Packages
+ c05451836b6df186ea801e0c9eddb85a 1490 universe/binary-amd64/Packages.gz
+ 57ed173a3e381ba12cf4c4d778f58260 1778 universe/binary-amd64/Packages.bz2
+ f3f838e2c02900c5f9c53494c7cfc9dc 1510 universe/Contents-amd64.gz
36dc8434c02eb018d9e4e8e159504a01 89 universe/binary-amd64/Release
- 97bccc5e0ea0b01968f5a77233e9fe8d 13252 universe/binary-amd64/Packages
- bd79e7a3da8109ff861dde81e2682487 1849 universe/binary-amd64/Packages.gz
- 96558a5f5f0159c7c1bdba3c3da9a478 2237 universe/binary-amd64/Packages.bz2
- 93bd858100823f302b49fbff84345038 1868 universe/Contents-amd64.gz
SHA1:
+ a321bd550ba13ef092332a032ab436ebf6640e90 9286 universe/binary-amd64/Packages
+ c0dbd194d27c09dc774588a3742b0a003fcf9ffe 1490 universe/binary-amd64/Packages.gz
+ c099c0b811b0543116587b6f9a10fc0ee54cf95f 1778 universe/binary-amd64/Packages.bz2
+ 7880333f9024874a72000f81e0cfccf43765d9e6 1510 universe/Contents-amd64.gz
bb2235b2a24a57ac4d7a8c6e4e3b8048f8273323 89 universe/binary-amd64/Release
- 222b6afba8fd3bd253b66d4e82c5b3e9510b4582 13252 universe/binary-amd64/Packages
- 53cb13ee1aa3eca5c323ba6a05bf4501249eaad8 1849 universe/binary-amd64/Packages.gz
- ba827e42b6c5d0a10d1ddd18a9bcc3a20e050879 2237 universe/binary-amd64/Packages.bz2
- 387d894085181b1fcd78ee39f2b3c642d962c63e 1868 universe/Contents-amd64.gz
SHA256:
+ ab47d347584173f82f1f0fb87eea2b8362ca5f3fcbbf0eb0fcd8ddcf3786e81b 9286 universe/binary-amd64/Packages
+ 3878e32e6f2dd61475d776a35ed6fdce54273ca05a663876f8632da01fee12a0 1490 universe/binary-amd64/Packages.gz
+ 7a66206bf0354e989176ea5ed81b7423da79bd16ac8c106fb05efe6f6cb31b2f 1778 universe/binary-amd64/Packages.bz2
+ a9c4fe06f32b300f89373167dbe987917d6f848dd8537892da71ef8f3ee97818 1510 universe/Contents-amd64.gz
3585e1e45afb8a3cb3c7a593ec7dd8e34029c4ee18a044c369775fde5bba20dd 89 universe/binary-amd64/Release
- 89ad9ab4b9e36ffd988e3fc6f687df4e9191cfe500ea484e92b92a0c7d64c7ef 13252 universe/binary-amd64/Packages
- a64c17c45839c6dde839171ac49ba51b63c4bf0ac57d9b80512e12b4793893e1 1849 universe/binary-amd64/Packages.gz
- 1c6953aa1e525e73965940cc05d9fbd77f3a57ff456e4fab3863d1f14d35897e 2237 universe/binary-amd64/Packages.bz2
- 874eb508922da01626ea6d14d89462dfcad384d3c2647f87a3a41fddfa4a8c8b 1868 universe/Contents-amd64.gz
diff --git a/systems/win32/miktex/setup/deb/dists/bionic/Release.gpg b/systems/win32/miktex/setup/deb/dists/bionic/Release.gpg
index 89b9ef9ab1..c605251e41 100644
--- a/systems/win32/miktex/setup/deb/dists/bionic/Release.gpg
+++ b/systems/win32/miktex/setup/deb/dists/bionic/Release.gpg
@@ -1,11 +1,11 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
-iQEcBAABCAAGBQJgXK08AAoJECd6cpP1nkiJx6QH/1vVY4B/lVjnS1C+U746aYma
-U9VSyj/A3pokhju/MqqL/z91wcI0fbI+9cR0lFE1qIWrX4o1YBoLNv6jyHNmboaW
-kROp5WNmu90UcmB9tFKUxOi+qlf3khAfEte+N+b3rMHQU0xC1i3TQxZmjNnhqMRG
-gxsy6B1ralWeLogb2g7zKeElqQtKDLpnVRh7GBKUPEAt8VgXxjmMw5oOVs6+wga0
-dVanc6JC6cq9YqAXVriHW+HMYzNoX0kHf4vk6tezcFmzncBW/ee0kkr/fCOFT4G4
-KIZmdKM1O+L9/i8bUHe88hmJl1v55Cz7M6FfpQFsjN8RuvkJf4Xup5oZO72vrCI=
-=GAFG
+iQEcBAABCAAGBQJgq/dgAAoJECd6cpP1nkiJyBQIAKnqMaolmA4awonXOKgATYd6
+UtewRylH2Uau1/WAz8XmQgFkKZ766yh7xoKim0U1W6n1UEEDUIcdiy/Ht89Q2CbK
+9P/qbK2HwMIa3lC4/PQOEaMLEQM5wRbReNFgTImCOiqinbuYI9ohnyA9Sc1QP1nq
+17cJpualTcTiGn3X+T5UoGcWCmbh6ecgJdwkSgZSyq4nCFgEL3QuB83XaxmhSY7n
+5ux6AMj9jtoAnUAF1XuCLADedgL0UamcqeJIXpBP6AO1Azaw1Lo6P0KwN8tBtizn
+/0qHTCUlX3iRrDNy/A8rv6cKgmxFmhn4vw3xudB1onwZHr6Qn8Rkg7XGqSVqABE=
+=lCRP
-----END PGP SIGNATURE-----
diff --git a/systems/win32/miktex/setup/deb/dists/bionic/universe/Contents-amd64.gz b/systems/win32/miktex/setup/deb/dists/bionic/universe/Contents-amd64.gz
index ffacc19145..4876176474 100644
--- a/systems/win32/miktex/setup/deb/dists/bionic/universe/Contents-amd64.gz
+++ b/systems/win32/miktex/setup/deb/dists/bionic/universe/Contents-amd64.gz
Binary files differ
diff --git a/systems/win32/miktex/setup/deb/dists/bionic/universe/binary-amd64/Packages b/systems/win32/miktex/setup/deb/dists/bionic/universe/binary-amd64/Packages
index 41421e993f..bffcd0c865 100644
--- a/systems/win32/miktex/setup/deb/dists/bionic/universe/binary-amd64/Packages
+++ b/systems/win32/miktex/setup/deb/dists/bionic/universe/binary-amd64/Packages
@@ -110,51 +110,3 @@ SHA256: 320f7730f1a2d0448229229a08f4cbddbb3b0ddd4698bc71add79526610dde3b
Description: MiKTeX: a scalable TeX distribution
Homepage: https://miktex.org
-Package: miktex
-Priority: optional
-Section: tex
-Installed-Size: 94562
-Maintainer: Christian Schenk <cs@miktex.org>
-Architecture: amd64
-Version: 2.9.7445-bionic1
-Depends: debconf (>= 0.2.17), fontconfig, libbz2-1.0, libc6 (>= 2.15), libcairo2 (>= 1.12.0), libcurl4 (>= 7.16.2), libexpat1 (>= 2.0.1), libfontconfig1 (>= 2.12), libfreetype6 (>= 2.3.9), libfribidi0 (>= 0.19.2), libgcc1 (>= 1:4.0), libgd3 (>= 2.1.0~alpha~), libgraphite2-3 (>= 1.2.2), libhunspell-1.6-0, libicu60 (>= 60.1-1~), libjpeg8 (>= 8c), liblog4cxx10v5 (>= 0.10.0), liblzma5 (>= 5.1.1alpha+20120614), libmpfr6 (>= 3.1.3), libmspack0 (>= 0.4), libpng16-16 (>= 1.6.2-1), libpopt0 (>= 1.14), libqt5concurrent5 (>= 5.6.0~rc), libqt5core5a (>= 5.9.0~beta), libqt5dbus5 (>= 5.0.2), libqt5gui5 (>= 5.8.0), libqt5script5 (>= 5.6.0~beta), libqt5scripttools5 (>= 5.6.0~beta), libqt5widgets5 (>= 5.3.0), libqt5xml5 (>= 5.0.2), libssl1.1 (>= 1.1.0), libstdc++6 (>= 7), liburiparser1 (>= 0.6.0), libzzip-0-13 (>= 0.13.56), zlib1g (>= 1:1.2.0)
-Filename: pool/universe/m/miktex/miktex_2.9.7445-bionic1_amd64.deb
-Size: 29745762
-MD5sum: 2f4de3c0fcf47686d26ce4317995c8c6
-SHA1: 5c9279f9d5fbfd61a2300c857cb294e71e26d18e
-SHA256: 2f1582f831defd995961d439d054e41684f7eeed18d319880a53985238e75dba
-Description: MiKTeX: a scalable TeX distribution
-Homepage: https://miktex.org
-
-Package: miktex
-Priority: optional
-Section: tex
-Installed-Size: 94510
-Maintainer: Christian Schenk <cs@miktex.org>
-Architecture: amd64
-Version: 2.9.7400-bionic1
-Depends: debconf (>= 0.2.17), fontconfig, libbz2-1.0, libc6 (>= 2.15), libcairo2 (>= 1.12.0), libcurl4 (>= 7.16.2), libexpat1 (>= 2.0.1), libfontconfig1 (>= 2.12), libfreetype6 (>= 2.3.9), libfribidi0 (>= 0.19.2), libgcc1 (>= 1:4.0), libgd3 (>= 2.1.0~alpha~), libgraphite2-3 (>= 1.2.2), libhunspell-1.6-0, libicu60 (>= 60.1-1~), libjpeg8 (>= 8c), liblog4cxx10v5 (>= 0.10.0), liblzma5 (>= 5.1.1alpha+20120614), libmpfr6 (>= 3.1.3), libmspack0 (>= 0.4), libpng16-16 (>= 1.6.2-1), libpopt0 (>= 1.14), libqt5concurrent5 (>= 5.6.0~rc), libqt5core5a (>= 5.9.0~beta), libqt5dbus5 (>= 5.0.2), libqt5gui5 (>= 5.8.0), libqt5script5 (>= 5.6.0~beta), libqt5scripttools5 (>= 5.6.0~beta), libqt5widgets5 (>= 5.3.0), libqt5xml5 (>= 5.0.2), libssl1.1 (>= 1.1.0), libstdc++6 (>= 7), liburiparser1 (>= 0.6.0), libzzip-0-13 (>= 0.13.56), zlib1g (>= 1:1.2.0)
-Filename: pool/universe/m/miktex/miktex_2.9.7400-bionic1_amd64.deb
-Size: 29935332
-MD5sum: a60e4c5e0ac88788093ab6519fe3300a
-SHA1: 80dd40ee007e1ae764a499d918d4f8239bb35936
-SHA256: 8778960d78598d952a890f43b10c40f59578b6454bddee98c780c5a6f536fd27
-Description: MiKTeX: a scalable TeX distribution
-Homepage: https://miktex.org
-
-Package: miktex
-Priority: optional
-Section: tex
-Installed-Size: 93884
-Maintainer: Christian Schenk <cs@miktex.org>
-Architecture: amd64
-Version: 2.9.7350-bionic1
-Depends: debconf (>= 0.2.17), fontconfig, libbz2-1.0, libc6 (>= 2.15), libcairo2 (>= 1.12.0), libcurl4 (>= 7.16.2), libexpat1 (>= 2.0.1), libfontconfig1 (>= 2.12), libfreetype6 (>= 2.3.9), libfribidi0 (>= 0.19.2), libgcc1 (>= 1:4.0), libgd3 (>= 2.1.0~alpha~), libgraphite2-3 (>= 1.2.2), libhunspell-1.6-0, libicu60 (>= 60.1-1~), libjpeg8 (>= 8c), liblog4cxx10v5 (>= 0.10.0), liblzma5 (>= 5.1.1alpha+20120614), libmpfr6 (>= 3.1.3), libmspack0 (>= 0.4), libpng16-16 (>= 1.6.2-1), libpopt0 (>= 1.14), libqt5concurrent5 (>= 5.6.0~rc), libqt5core5a (>= 5.9.0~beta), libqt5dbus5 (>= 5.0.2), libqt5gui5 (>= 5.8.0), libqt5script5 (>= 5.6.0~beta), libqt5scripttools5 (>= 5.6.0~beta), libqt5widgets5 (>= 5.3.0), libqt5xml5 (>= 5.0.2), libssl1.1 (>= 1.1.0), libstdc++6 (>= 7), liburiparser1 (>= 0.6.0), libzzip-0-13 (>= 0.13.56), zlib1g (>= 1:1.2.0)
-Filename: pool/universe/m/miktex/miktex_2.9.7350-bionic1_amd64.deb
-Size: 29810262
-MD5sum: fd152d399f0b079780154821dd510da4
-SHA1: eee9a508b4f0e532cc9f7fc836462cf4db24d4dc
-SHA256: 1b4ac20c146448db8fa352a7b2e8c50c25924add65a54247605c502ccca15b6a
-Description: MiKTeX: a scalable TeX distribution
-Homepage: https://miktex.org
-
diff --git a/systems/win32/miktex/setup/deb/dists/bionic/universe/binary-amd64/Packages.bz2 b/systems/win32/miktex/setup/deb/dists/bionic/universe/binary-amd64/Packages.bz2
index 2977b9fb90..790918ecac 100644
--- a/systems/win32/miktex/setup/deb/dists/bionic/universe/binary-amd64/Packages.bz2
+++ b/systems/win32/miktex/setup/deb/dists/bionic/universe/binary-amd64/Packages.bz2
Binary files differ
diff --git a/systems/win32/miktex/setup/deb/dists/bionic/universe/binary-amd64/Packages.gz b/systems/win32/miktex/setup/deb/dists/bionic/universe/binary-amd64/Packages.gz
index 2644374515..1d544d72fc 100644
--- a/systems/win32/miktex/setup/deb/dists/bionic/universe/binary-amd64/Packages.gz
+++ b/systems/win32/miktex/setup/deb/dists/bionic/universe/binary-amd64/Packages.gz
Binary files differ
diff --git a/systems/win32/miktex/setup/deb/dists/buster/InRelease b/systems/win32/miktex/setup/deb/dists/buster/InRelease
index f37a7378e9..ba3e77592c 100644
--- a/systems/win32/miktex/setup/deb/dists/buster/InRelease
+++ b/systems/win32/miktex/setup/deb/dists/buster/InRelease
@@ -5,36 +5,36 @@ Origin: . buster
Label: . buster
Suite: buster
Codename: buster
-Date: Thu, 25 Mar 2021 15:33:35 UTC
+Date: Mon, 24 May 2021 18:58:57 UTC
Architectures: amd64
Components: universe
Description: Generated by aptly
MD5Sum:
- 54bf1a1d8415ca603b639192bfab229a 13904 universe/binary-amd64/Packages
- 8a92b9942be43344423a1f63390e239f 1891 universe/binary-amd64/Packages.gz
- 92ee76b9b97e666fab05f23d48e4260d 2304 universe/binary-amd64/Packages.bz2
- 93bd858100823f302b49fbff84345038 1868 universe/Contents-amd64.gz
c4377b12f319790307affd5ca801a56b 89 universe/binary-amd64/Release
+ 8e4c05dd18f2504fd67b82915b5f0b88 9752 universe/binary-amd64/Packages
+ 1a01b09f29ccea74e9253a3104c89b27 1539 universe/binary-amd64/Packages.gz
+ f931b999e993117ebd3e7d413956f763 1820 universe/binary-amd64/Packages.bz2
+ f3f838e2c02900c5f9c53494c7cfc9dc 1510 universe/Contents-amd64.gz
SHA1:
- 14c2183b70e3002283b647230d09782a989daf77 13904 universe/binary-amd64/Packages
- 8866354d1fd892a3a47a7456a271839d115414e0 1891 universe/binary-amd64/Packages.gz
- 0d8a251947f22e04695b6b4fbd4cb67d9f427f04 2304 universe/binary-amd64/Packages.bz2
- 387d894085181b1fcd78ee39f2b3c642d962c63e 1868 universe/Contents-amd64.gz
1c381f8d6c958888bf1796f5914f8ca22630bdd7 89 universe/binary-amd64/Release
+ e92500c21ddfe187df1df2c3e19a2be67a494af0 9752 universe/binary-amd64/Packages
+ 3ea4bc7c15b294a45d4edb3a40e5e81c02bf2b3d 1539 universe/binary-amd64/Packages.gz
+ 1e16e7c977f01244927c94df0a7f9fece34d0b35 1820 universe/binary-amd64/Packages.bz2
+ 7880333f9024874a72000f81e0cfccf43765d9e6 1510 universe/Contents-amd64.gz
SHA256:
- eb0340636a913db938aeed753e46f5c34434b5aed0ba2790c476bcedbfdbb1d2 13904 universe/binary-amd64/Packages
- 8c7f28b8da18693ccabc1898f133c597e07ffe8c6c6207814ec65dcd27c10592 1891 universe/binary-amd64/Packages.gz
- a9b9605dd68577839c5e491b55363895d2ab16a21dd5e9398c22caf701685c84 2304 universe/binary-amd64/Packages.bz2
- 874eb508922da01626ea6d14d89462dfcad384d3c2647f87a3a41fddfa4a8c8b 1868 universe/Contents-amd64.gz
56ac9d32078ebaa439db98b340d4761cb718c796f92090530c01b377a3c9d40b 89 universe/binary-amd64/Release
+ e241f02dcd606a765ef72aab819ac859dfcf5e10d956910afe058e892a5cc239 9752 universe/binary-amd64/Packages
+ b10047512e97c1ddfdd166a44fcc5e495782b91bca3a2aa3ba3805abcbd76c8c 1539 universe/binary-amd64/Packages.gz
+ fd1c5830b3aa7c263e861e612d8bfbbe6e3d6e7ac37ac327eb60a7d2c3bee6ef 1820 universe/binary-amd64/Packages.bz2
+ a9c4fe06f32b300f89373167dbe987917d6f848dd8537892da71ef8f3ee97818 1510 universe/Contents-amd64.gz
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
-iQEcBAEBCAAGBQJgXK1PAAoJECd6cpP1nkiJeTIH/jS6e4hNP2Jo3MQzH0F8Gwhf
-R2Tr0UaLzZ1CkFwQEybkTSg31Ys3UmnUxj/guaow5wZdeF6fVMD9RKAKML+jXZr1
-dsTSFUl+/6xVPzHfyBnQuuGlhfHzba322mCw5Bu7q9wPPqg3clIFgdGb2yXMm6X3
-HhSTQEIIJcr0fImbLt2gbuQa81QSambufhtJ/ntKZlB71HMD5hvr5oq19Gt9pJ9D
-q2+PAnf45WWr2qhJ5lCgpKWcQ4s9u/8oPu4UtcLxjWB2Nq9B4P3R6PoAfkt9yLKB
-W7vb+lINpT6EfwN6QCkercwh5k8nU0d71xp4c8JbEph+D2T0c6PZ/vwZ03R5b0E=
-=Ewq+
+iQEcBAEBCAAGBQJgq/dxAAoJECd6cpP1nkiJlMEH/3nFRQ2+DHF45ea+I3JJ/6fc
+a0JCSA1fHNi34zc7W7momF6IXCl1Wu0+fBxT8L3l69jdNkjQf79EYcYQlZ5PCrDB
+D+/g3Zwlz0m4CctRpOo2G5bSUwNFvQR9dGx2aoWFb2wTNryhjwINT27EgzBgMrSs
+3PE5Jj0vpQaO1MAZy/nD9UJy+kPWuOUOeNp7i7DsYyV+SfdQ9fwqFvhTmPCzmqXR
+yCQmVV8WbYvLFmkxus8NMBN7Mc6x5SZXx3x9n0VHwEhEL+eym63bmgxqIaVo5q/8
+7vnw5WNSsJdDhU9ddvZOJhpqKEGmp4yt7ER5+1pT5T9J0Czuhci2u7ZtqaJnRKE=
+=/bHg
-----END PGP SIGNATURE-----
diff --git a/systems/win32/miktex/setup/deb/dists/buster/Release b/systems/win32/miktex/setup/deb/dists/buster/Release
index 50ed7c5191..6b9be26b71 100644
--- a/systems/win32/miktex/setup/deb/dists/buster/Release
+++ b/systems/win32/miktex/setup/deb/dists/buster/Release
@@ -2,25 +2,25 @@ Origin: . buster
Label: . buster
Suite: buster
Codename: buster
-Date: Thu, 25 Mar 2021 15:33:35 UTC
+Date: Mon, 24 May 2021 18:58:57 UTC
Architectures: amd64
Components: universe
Description: Generated by aptly
MD5Sum:
- 54bf1a1d8415ca603b639192bfab229a 13904 universe/binary-amd64/Packages
- 8a92b9942be43344423a1f63390e239f 1891 universe/binary-amd64/Packages.gz
- 92ee76b9b97e666fab05f23d48e4260d 2304 universe/binary-amd64/Packages.bz2
- 93bd858100823f302b49fbff84345038 1868 universe/Contents-amd64.gz
c4377b12f319790307affd5ca801a56b 89 universe/binary-amd64/Release
+ 8e4c05dd18f2504fd67b82915b5f0b88 9752 universe/binary-amd64/Packages
+ 1a01b09f29ccea74e9253a3104c89b27 1539 universe/binary-amd64/Packages.gz
+ f931b999e993117ebd3e7d413956f763 1820 universe/binary-amd64/Packages.bz2
+ f3f838e2c02900c5f9c53494c7cfc9dc 1510 universe/Contents-amd64.gz
SHA1:
- 14c2183b70e3002283b647230d09782a989daf77 13904 universe/binary-amd64/Packages
- 8866354d1fd892a3a47a7456a271839d115414e0 1891 universe/binary-amd64/Packages.gz
- 0d8a251947f22e04695b6b4fbd4cb67d9f427f04 2304 universe/binary-amd64/Packages.bz2
- 387d894085181b1fcd78ee39f2b3c642d962c63e 1868 universe/Contents-amd64.gz
1c381f8d6c958888bf1796f5914f8ca22630bdd7 89 universe/binary-amd64/Release
+ e92500c21ddfe187df1df2c3e19a2be67a494af0 9752 universe/binary-amd64/Packages
+ 3ea4bc7c15b294a45d4edb3a40e5e81c02bf2b3d 1539 universe/binary-amd64/Packages.gz
+ 1e16e7c977f01244927c94df0a7f9fece34d0b35 1820 universe/binary-amd64/Packages.bz2
+ 7880333f9024874a72000f81e0cfccf43765d9e6 1510 universe/Contents-amd64.gz
SHA256:
- eb0340636a913db938aeed753e46f5c34434b5aed0ba2790c476bcedbfdbb1d2 13904 universe/binary-amd64/Packages
- 8c7f28b8da18693ccabc1898f133c597e07ffe8c6c6207814ec65dcd27c10592 1891 universe/binary-amd64/Packages.gz
- a9b9605dd68577839c5e491b55363895d2ab16a21dd5e9398c22caf701685c84 2304 universe/binary-amd64/Packages.bz2
- 874eb508922da01626ea6d14d89462dfcad384d3c2647f87a3a41fddfa4a8c8b 1868 universe/Contents-amd64.gz
56ac9d32078ebaa439db98b340d4761cb718c796f92090530c01b377a3c9d40b 89 universe/binary-amd64/Release
+ e241f02dcd606a765ef72aab819ac859dfcf5e10d956910afe058e892a5cc239 9752 universe/binary-amd64/Packages
+ b10047512e97c1ddfdd166a44fcc5e495782b91bca3a2aa3ba3805abcbd76c8c 1539 universe/binary-amd64/Packages.gz
+ fd1c5830b3aa7c263e861e612d8bfbbe6e3d6e7ac37ac327eb60a7d2c3bee6ef 1820 universe/binary-amd64/Packages.bz2
+ a9c4fe06f32b300f89373167dbe987917d6f848dd8537892da71ef8f3ee97818 1510 universe/Contents-amd64.gz
diff --git a/systems/win32/miktex/setup/deb/dists/buster/Release.gpg b/systems/win32/miktex/setup/deb/dists/buster/Release.gpg
index f8e442ce2e..b8e556de46 100644
--- a/systems/win32/miktex/setup/deb/dists/buster/Release.gpg
+++ b/systems/win32/miktex/setup/deb/dists/buster/Release.gpg
@@ -1,11 +1,11 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
-iQEcBAABCAAGBQJgXK1PAAoJECd6cpP1nkiJZskH/3u5+dvitu4cZChbDiUMBZM/
-ZB3mZJotaGysTTSTFpzqWpGAksgHSFR8FjEC320bRx0K1eS3oVlmdDC5mMTHnfF2
-TxfVdCoM6o+0cZeN9B0o1uddJQOuyWJrfr7ri/2Hj/wofyyRCKN7vhnekZKalX+y
-1khmr9k2lfTTUk5mqVm9wSgWzHatrAglUrkXjUe+p71z2CEFSll/0lYglpv7F0YZ
-6JgywCW9vwkapNjMOmrkN+IJ7ZrQj0oVngIcHalp7iZxnReI5zme/OmVLO2pIaf5
-AB3V28uUYV0dB9xVF8r/kj44YHFMvb6jPM9Yt/TQTDEJC3AZQCdlH5W/vY5dNNs=
-=/u0l
+iQEcBAABCAAGBQJgq/dxAAoJECd6cpP1nkiJby4H/jPx4eHZMNM6cI2LqoiFfCT+
+PAKGCk2n2Dm8wNy4+FzEsVTJB/VmSGSHuU+q5tJrems2i7KPs6aycJc1Mzg73AqK
+v3qmgVDEiN7Tba5gEECUihNQ+5ImYHrpg90lTxiNDL5AAugZau1PQLRftY2997hx
+UC4Bim4DHngdfNZW206j9BvAJo+Cs71MqmqpAF5aiAlrcDVk9gzWXbG8/6W02fZ6
+CVh9Cx2Tuabt8UjS69aKXKtpH9CQ9TvqCxcp2F1ZZNkE2VLBUHYrdpRa3Mkitew2
+8A+i8jCZcHnmLTMCVK+yIOfj/0GivarEG6HNkDkfQmCBciLKD6tIhPy5uDErxGQ=
+=GnWg
-----END PGP SIGNATURE-----
diff --git a/systems/win32/miktex/setup/deb/dists/buster/universe/Contents-amd64.gz b/systems/win32/miktex/setup/deb/dists/buster/universe/Contents-amd64.gz
index ffacc19145..4876176474 100644
--- a/systems/win32/miktex/setup/deb/dists/buster/universe/Contents-amd64.gz
+++ b/systems/win32/miktex/setup/deb/dists/buster/universe/Contents-amd64.gz
Binary files differ
diff --git a/systems/win32/miktex/setup/deb/dists/buster/universe/binary-amd64/Packages b/systems/win32/miktex/setup/deb/dists/buster/universe/binary-amd64/Packages
index 0f5c9de581..c973b93a4d 100644
--- a/systems/win32/miktex/setup/deb/dists/buster/universe/binary-amd64/Packages
+++ b/systems/win32/miktex/setup/deb/dists/buster/universe/binary-amd64/Packages
@@ -110,51 +110,3 @@ SHA256: 67387855d52a13566fbb27b6c92616a37b73b9345dc9827005d69eab3c182d06
Description: MiKTeX: a scalable TeX distribution
Homepage: https://miktex.org
-Package: miktex
-Priority: optional
-Section: tex
-Installed-Size: 94801
-Maintainer: Christian Schenk <cs@miktex.org>
-Architecture: amd64
-Version: 2.9.7445-buster1
-Depends: debconf (>= 0.2.17), fontconfig, libbz2-1.0, libc6 (>= 2.28), libcairo2 (>= 1.12.0), libcurl4 (>= 7.16.2), libexpat1 (>= 2.0.1), libfontconfig1 (>= 2.12.6), libfreetype6 (>= 2.3.9), libfribidi0 (>= 0.19.2), libgcc1 (>= 1:4.0), libgd3 (>= 2.1.0~alpha~), libgmp10, libgraphite2-3 (>= 1.2.2), libhunspell-1.7-0, libicu63 (>= 63.1-1~), libjpeg62-turbo (>= 1.3.1), liblog4cxx10v5, liblzma5 (>= 5.1.1alpha+20120614), libmpfr6 (>= 3.1.3), libmspack0 (>= 0.4), libpixman-1-0, libpng16-16 (>= 1.6.2-1), libpopt0 (>= 1.14), libqt5concurrent5 (>= 5.6.0~rc), libqt5core5a (>= 5.11.0~rc1), libqt5dbus5 (>= 5.0.2), libqt5gui5 (>= 5.8.0), libqt5printsupport5 (>= 5.0.2), libqt5script5 (>= 5.6.0~beta), libqt5scripttools5 (>= 5.6.0~beta), libqt5widgets5 (>= 5.11.0~rc1), libqt5xml5 (>= 5.0.2), libssl1.1 (>= 1.1.0), libstdc++6 (>= 7), liburiparser1 (>= 0.6.0), libzzip-0-13 (>= 0.13.56), zlib1g (>= 1:1.2.0)
-Filename: pool/universe/m/miktex/miktex_2.9.7445-buster1_amd64.deb
-Size: 29192670
-MD5sum: a04f018927a53a760740571f8841373c
-SHA1: f55bbc2b959c3be4f04796c373d5106c5debceb2
-SHA256: 88a3df6d4bdff9d743c6d3bb7d242f4e41097be07c656f4ee9e4a4be31adfa14
-Description: MiKTeX: a scalable TeX distribution
-Homepage: https://miktex.org
-
-Package: miktex
-Priority: optional
-Section: tex
-Installed-Size: 94772
-Maintainer: Christian Schenk <cs@miktex.org>
-Architecture: amd64
-Version: 2.9.7400-buster1
-Depends: debconf (>= 0.2.17), fontconfig, libbz2-1.0, libc6 (>= 2.28), libcairo2 (>= 1.12.0), libcurl4 (>= 7.16.2), libexpat1 (>= 2.0.1), libfontconfig1 (>= 2.12.6), libfreetype6 (>= 2.3.9), libfribidi0 (>= 0.19.2), libgcc1 (>= 1:4.0), libgd3 (>= 2.1.0~alpha~), libgmp10, libgraphite2-3 (>= 1.2.2), libhunspell-1.7-0, libicu63 (>= 63.1-1~), libjpeg62-turbo (>= 1.3.1), liblog4cxx10v5, liblzma5 (>= 5.1.1alpha+20120614), libmpfr6 (>= 3.1.3), libmspack0 (>= 0.4), libpixman-1-0, libpng16-16 (>= 1.6.2-1), libpopt0 (>= 1.14), libqt5concurrent5 (>= 5.6.0~rc), libqt5core5a (>= 5.11.0~rc1), libqt5dbus5 (>= 5.0.2), libqt5gui5 (>= 5.8.0), libqt5printsupport5 (>= 5.0.2), libqt5script5 (>= 5.6.0~beta), libqt5scripttools5 (>= 5.6.0~beta), libqt5widgets5 (>= 5.11.0~rc1), libqt5xml5 (>= 5.0.2), libssl1.1 (>= 1.1.0), libstdc++6 (>= 7), liburiparser1 (>= 0.6.0), libzzip-0-13 (>= 0.13.56), zlib1g (>= 1:1.2.0)
-Filename: pool/universe/m/miktex/miktex_2.9.7400-buster1_amd64.deb
-Size: 29369466
-MD5sum: 5767ca0137f6ab13f3227ce464d09b4b
-SHA1: b06b6f61fb37afde8c3b4c724b7bc12faed5d184
-SHA256: fcb56509f924ce88ada1efe7e82cfea9612f2b9930211f418189ac7ba3d02e2f
-Description: MiKTeX: a scalable TeX distribution
-Homepage: https://miktex.org
-
-Package: miktex
-Priority: optional
-Section: tex
-Installed-Size: 94041
-Maintainer: Christian Schenk <cs@miktex.org>
-Architecture: amd64
-Version: 2.9.7350-buster1
-Depends: debconf (>= 0.2.17), fontconfig, libbz2-1.0, libc6 (>= 2.28), libcairo2 (>= 1.12.0), libcurl4 (>= 7.16.2), libexpat1 (>= 2.0.1), libfontconfig1 (>= 2.12.6), libfreetype6 (>= 2.3.9), libfribidi0 (>= 0.19.2), libgcc1 (>= 1:4.0), libgd3 (>= 2.1.0~alpha~), libgmp10, libgraphite2-3 (>= 1.2.2), libhunspell-1.7-0, libicu63 (>= 63.1-1~), libjpeg62-turbo (>= 1.3.1), liblog4cxx10v5, liblzma5 (>= 5.1.1alpha+20120614), libmpfr6 (>= 3.1.3), libmspack0 (>= 0.4), libpixman-1-0, libpng16-16 (>= 1.6.2-1), libpopt0 (>= 1.14), libqt5concurrent5 (>= 5.6.0~rc), libqt5core5a (>= 5.11.0~rc1), libqt5dbus5 (>= 5.0.2), libqt5gui5 (>= 5.8.0), libqt5printsupport5 (>= 5.0.2), libqt5script5 (>= 5.6.0~beta), libqt5scripttools5 (>= 5.6.0~beta), libqt5widgets5 (>= 5.11.0~rc1), libqt5xml5 (>= 5.0.2), libssl1.1 (>= 1.1.0), libstdc++6 (>= 7), liburiparser1 (>= 0.6.0), libzzip-0-13 (>= 0.13.56), zlib1g (>= 1:1.2.0)
-Filename: pool/universe/m/miktex/miktex_2.9.7350-buster1_amd64.deb
-Size: 29213170
-MD5sum: 98c6ef2f00147559b89162bd7811c567
-SHA1: db7877368d27ee4fb71b915f3bba67751481a669
-SHA256: b7f0556a7849b6260086a88ab85bd07ccc08eee3a5303b7c71a5a83abb99e0ad
-Description: MiKTeX: a scalable TeX distribution
-Homepage: https://miktex.org
-
diff --git a/systems/win32/miktex/setup/deb/dists/buster/universe/binary-amd64/Packages.bz2 b/systems/win32/miktex/setup/deb/dists/buster/universe/binary-amd64/Packages.bz2
index 33db5dcb22..fefc3dc150 100644
--- a/systems/win32/miktex/setup/deb/dists/buster/universe/binary-amd64/Packages.bz2
+++ b/systems/win32/miktex/setup/deb/dists/buster/universe/binary-amd64/Packages.bz2
Binary files differ
diff --git a/systems/win32/miktex/setup/deb/dists/buster/universe/binary-amd64/Packages.gz b/systems/win32/miktex/setup/deb/dists/buster/universe/binary-amd64/Packages.gz
index 0bb04e67b9..6ac07dba93 100644
--- a/systems/win32/miktex/setup/deb/dists/buster/universe/binary-amd64/Packages.gz
+++ b/systems/win32/miktex/setup/deb/dists/buster/universe/binary-amd64/Packages.gz
Binary files differ
diff --git a/systems/win32/miktex/setup/deb/dists/focal/InRelease b/systems/win32/miktex/setup/deb/dists/focal/InRelease
index 474a398c48..74d7b4ba56 100644
--- a/systems/win32/miktex/setup/deb/dists/focal/InRelease
+++ b/systems/win32/miktex/setup/deb/dists/focal/InRelease
@@ -5,36 +5,36 @@ Origin: . focal
Label: . focal
Suite: focal
Codename: focal
-Date: Thu, 25 Mar 2021 15:33:22 UTC
+Date: Mon, 24 May 2021 19:00:21 UTC
Architectures: amd64
Components: universe
Description: Generated by aptly
MD5Sum:
- 267a300d1644897683cb142c09198574 1757 universe/binary-amd64/Packages.gz
- 612d76518122fadc03ee6f3b3006c023 2107 universe/binary-amd64/Packages.bz2
- 1180cb4bd28d9ed6b20e4fa8ee3e28c7 1764 universe/Contents-amd64.gz
+ 51f381e9c7ae53e2271e72d9b784f73d 10957 universe/binary-amd64/Packages
+ 3bf9cdc735582b91e83af04f640052a6 1633 universe/binary-amd64/Packages.gz
+ 7a331eb24584c9a640ecde7d5906d029 2003 universe/binary-amd64/Packages.bz2
+ f3f838e2c02900c5f9c53494c7cfc9dc 1510 universe/Contents-amd64.gz
09b400a6dee090b2b112c0ee33f5afc5 86 universe/binary-amd64/Release
- b14bbe6134fd735e50bc472160ebfdd6 12516 universe/binary-amd64/Packages
SHA1:
- 48b80c7965bc29a3e4c726f3fc97d3a8dd3285c9 1757 universe/binary-amd64/Packages.gz
- 83ac924d3fefb8621168e9de9661c547796c8cde 2107 universe/binary-amd64/Packages.bz2
- d32ee84c261e99376cbbcfce37419b9423b5dca1 1764 universe/Contents-amd64.gz
+ 403f3769e942f03748a55daf767e5be2a58a5816 10957 universe/binary-amd64/Packages
+ db13174fd9c02d246b94e1e479f88a2da8fbfc9c 1633 universe/binary-amd64/Packages.gz
+ 11e1fea666f7a0ca0ab971ebb1e346dcd9f57a38 2003 universe/binary-amd64/Packages.bz2
+ 7880333f9024874a72000f81e0cfccf43765d9e6 1510 universe/Contents-amd64.gz
c942f34f42baa19293a2f2287f3a0b88aee6a9dd 86 universe/binary-amd64/Release
- b033acd2c5083121ae50c191eb2de29537129d46 12516 universe/binary-amd64/Packages
SHA256:
- 92cfd6d0e531396f00be5a395014f0b2ae67635f1ae6d1e271b925a4be7b0f78 1757 universe/binary-amd64/Packages.gz
- cd22eb3b35da8ba447d1c60c9cd2f0ccdeb048786ae117274c3aa92602ac84b3 2107 universe/binary-amd64/Packages.bz2
- c89f789676e103ab3cd6aae01ed44b58c061964d536c2a6af93afa9135a1c9a7 1764 universe/Contents-amd64.gz
+ e83ae2da6087f7a4a702e506d2c00d9a434d6e4ec7bc466a992c834a3201e820 10957 universe/binary-amd64/Packages
+ a40dd7d3530398edf098e8d7347ba24943853e65ef2786331062d5a0eac78524 1633 universe/binary-amd64/Packages.gz
+ 1bb1c17e15cfba0454a2dbb7169e036f9d42bce05c9c234c961764675ae4c385 2003 universe/binary-amd64/Packages.bz2
+ a9c4fe06f32b300f89373167dbe987917d6f848dd8537892da71ef8f3ee97818 1510 universe/Contents-amd64.gz
e2014a195f0b591b178bdf4c80c703b7562b069e881c17e128c39ecaa88949c3 86 universe/binary-amd64/Release
- c25503083ffa7eec5b51e4139dc5b250aac19356883c386e02e346e253c1a0e9 12516 universe/binary-amd64/Packages
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
-iQEcBAEBCAAGBQJgXK1CAAoJECd6cpP1nkiJAkMIAKNbNfEd7+a3jBa9fcjWcjZd
-US3GEE7kKpezd+X/KVCr6Pm4YLosC8bFZfx17miivTFkavdoJ5dOPFxGDLkexDTn
-haHkW2g4sW1gINRwZqoNTw/ZzcgqS8K3Z0hEOoI70ps1x/CZqvXG5H+JYH5AQWtz
-94D+I+t5dScV60UrhPSDJh8QdGb/2HL5Sd+9QtLZ3zS1t/uTZsQIvbn4Oey4Fxsa
-V6me/ywCwUVORXaUZIe8OPXVcCvq38W6wB4AQuruxONbER0tyMqnaNrloeofJHzy
-MBcHotudFzvn4UZbL4R3kjpPKmqfFM1WP0BfkH9Tf6YlbVjYTijQAFmp5kgYZuo=
-=QYd/
+iQEcBAEBCAAGBQJgq/fFAAoJECd6cpP1nkiJHAEH/2jg6IqBF5/8tdULP7CZHWjk
+Sau5VFCJdX2uL4SPqvAbSbdm/QmnpP5t7XPXXtQOdE/Q4yBJ5fJb1xnfRKjT7xKH
+rt358DUvB8KEWI793vf+zYUwOTLalgeadKT8UF2Y4daihM+dz/70cbwWDYPcLX3+
+HpO0DhKICGml0sdaTOJ0TJ1IZqmRfQ3e776UOXZUFLbis3mp48xKFioirMBlnfnt
+3148PBCmBsa5bP3lQs6nqlX+Gms4KaAsR8OLpt7z77COYp+a2FBO5SY/Jww4Y70T
+3DZtc+31uhrnCs3n7BI8lKOk63um6GrTAkbZVkhVQXqzbUNeqpJC/v4CfXWW1NE=
+=KoBM
-----END PGP SIGNATURE-----
diff --git a/systems/win32/miktex/setup/deb/dists/focal/Release b/systems/win32/miktex/setup/deb/dists/focal/Release
index e814128db0..70fcf3c240 100644
--- a/systems/win32/miktex/setup/deb/dists/focal/Release
+++ b/systems/win32/miktex/setup/deb/dists/focal/Release
@@ -2,25 +2,25 @@ Origin: . focal
Label: . focal
Suite: focal
Codename: focal
-Date: Thu, 25 Mar 2021 15:33:22 UTC
+Date: Mon, 24 May 2021 19:00:21 UTC
Architectures: amd64
Components: universe
Description: Generated by aptly
MD5Sum:
- 267a300d1644897683cb142c09198574 1757 universe/binary-amd64/Packages.gz
- 612d76518122fadc03ee6f3b3006c023 2107 universe/binary-amd64/Packages.bz2
- 1180cb4bd28d9ed6b20e4fa8ee3e28c7 1764 universe/Contents-amd64.gz
+ 51f381e9c7ae53e2271e72d9b784f73d 10957 universe/binary-amd64/Packages
+ 3bf9cdc735582b91e83af04f640052a6 1633 universe/binary-amd64/Packages.gz
+ 7a331eb24584c9a640ecde7d5906d029 2003 universe/binary-amd64/Packages.bz2
+ f3f838e2c02900c5f9c53494c7cfc9dc 1510 universe/Contents-amd64.gz
09b400a6dee090b2b112c0ee33f5afc5 86 universe/binary-amd64/Release
- b14bbe6134fd735e50bc472160ebfdd6 12516 universe/binary-amd64/Packages
SHA1:
- 48b80c7965bc29a3e4c726f3fc97d3a8dd3285c9 1757 universe/binary-amd64/Packages.gz
- 83ac924d3fefb8621168e9de9661c547796c8cde 2107 universe/binary-amd64/Packages.bz2
- d32ee84c261e99376cbbcfce37419b9423b5dca1 1764 universe/Contents-amd64.gz
+ 403f3769e942f03748a55daf767e5be2a58a5816 10957 universe/binary-amd64/Packages
+ db13174fd9c02d246b94e1e479f88a2da8fbfc9c 1633 universe/binary-amd64/Packages.gz
+ 11e1fea666f7a0ca0ab971ebb1e346dcd9f57a38 2003 universe/binary-amd64/Packages.bz2
+ 7880333f9024874a72000f81e0cfccf43765d9e6 1510 universe/Contents-amd64.gz
c942f34f42baa19293a2f2287f3a0b88aee6a9dd 86 universe/binary-amd64/Release
- b033acd2c5083121ae50c191eb2de29537129d46 12516 universe/binary-amd64/Packages
SHA256:
- 92cfd6d0e531396f00be5a395014f0b2ae67635f1ae6d1e271b925a4be7b0f78 1757 universe/binary-amd64/Packages.gz
- cd22eb3b35da8ba447d1c60c9cd2f0ccdeb048786ae117274c3aa92602ac84b3 2107 universe/binary-amd64/Packages.bz2
- c89f789676e103ab3cd6aae01ed44b58c061964d536c2a6af93afa9135a1c9a7 1764 universe/Contents-amd64.gz
+ e83ae2da6087f7a4a702e506d2c00d9a434d6e4ec7bc466a992c834a3201e820 10957 universe/binary-amd64/Packages
+ a40dd7d3530398edf098e8d7347ba24943853e65ef2786331062d5a0eac78524 1633 universe/binary-amd64/Packages.gz
+ 1bb1c17e15cfba0454a2dbb7169e036f9d42bce05c9c234c961764675ae4c385 2003 universe/binary-amd64/Packages.bz2
+ a9c4fe06f32b300f89373167dbe987917d6f848dd8537892da71ef8f3ee97818 1510 universe/Contents-amd64.gz
e2014a195f0b591b178bdf4c80c703b7562b069e881c17e128c39ecaa88949c3 86 universe/binary-amd64/Release
- c25503083ffa7eec5b51e4139dc5b250aac19356883c386e02e346e253c1a0e9 12516 universe/binary-amd64/Packages
diff --git a/systems/win32/miktex/setup/deb/dists/focal/Release.gpg b/systems/win32/miktex/setup/deb/dists/focal/Release.gpg
index af3f73e3bf..13823f0633 100644
--- a/systems/win32/miktex/setup/deb/dists/focal/Release.gpg
+++ b/systems/win32/miktex/setup/deb/dists/focal/Release.gpg
@@ -1,11 +1,11 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
-iQEcBAABCAAGBQJgXK1CAAoJECd6cpP1nkiJUREH/3nkGuNIksYsN1EyQmZwQ7rG
-bCBHG0gO7RgIHuWNYo0SAFqRaVA/AA37eAo906A99TwKUOrheHaQdubshbYMQnLV
-8kdsSOLQQgz/CVzxO332wvio1MI7nEwH02qRc0LjpDE5I3WeTZOS+29rHnmrS6sM
-IczLd61xHvSoqW0QZQLtnN6WahpNTbNNKML2Zd3NHIy/m21cFdFuJsRGFvU1G/Do
-/A5X9p6KY07BccSJ/CUwX3YcQE7YiyxQpSH6+JvmDBcHeKEQVKN3g+v19p2PXWWs
-VVZSvXWd1N0VooWtTqKIfUBvLRrEKG+chhY0iJ2vqYTAMpHwFmjNk7y+6RqJniY=
-=BaNU
+iQEcBAABCAAGBQJgq/fFAAoJECd6cpP1nkiJsaMH/0fk4n+wJN9XE0iGNnPiPtL1
+ittM9xavjvr3n/d/2dD8pNFBrhp+khGt1vgypGq+REWH0A5P492OqTq2KvyxQqB1
+r6D9Z0lI7afIIgKqX2tPfZM2g5TPnSIZPey0exjvM4xRVyHlldeJremU9OfbpyH3
+wAou0ZchT/K6oB5zN6bzInV2Gk6FYhHZ5h3iG+r4B4mTrkJE/jzUbDzyrz+giUsr
+lQv7ktEZDEwrwNhpsd9mE8Rl3+ORUjggn4ZgASnHjGPS/aTyjxUf0OnUs+B+JvPe
+zrSdAHnhmsUFUdV8gi2O1VDFiSIJlLA915iQfBOPLzEpaXhD0OJbB70+2HNq3zI=
+=XFWU
-----END PGP SIGNATURE-----
diff --git a/systems/win32/miktex/setup/deb/dists/focal/universe/Contents-amd64.gz b/systems/win32/miktex/setup/deb/dists/focal/universe/Contents-amd64.gz
index 3a3b767149..4876176474 100644
--- a/systems/win32/miktex/setup/deb/dists/focal/universe/Contents-amd64.gz
+++ b/systems/win32/miktex/setup/deb/dists/focal/universe/Contents-amd64.gz
Binary files differ
diff --git a/systems/win32/miktex/setup/deb/dists/focal/universe/binary-amd64/Packages b/systems/win32/miktex/setup/deb/dists/focal/universe/binary-amd64/Packages
index d1e47b60b3..ca307d8d98 100644
--- a/systems/win32/miktex/setup/deb/dists/focal/universe/binary-amd64/Packages
+++ b/systems/win32/miktex/setup/deb/dists/focal/universe/binary-amd64/Packages
@@ -152,25 +152,3 @@ Description: MiKTeX: a scalable TeX distribution
.
Homepage: https://miktex.org
-Package: miktex
-Priority: optional
-Section: tex
-Installed-Size: 97861
-Maintainer: Christian Schenk <cs@miktex.org>
-Architecture: amd64
-Version: 2.9.7445-focal1
-Depends: debconf (>= 0.2.17), fontconfig, libbz2-1.0, libc6 (>= 2.29), libcairo2 (>= 1.12.0), libcurl4 (>= 7.16.2), libexpat1 (>= 2.0.1), libfontconfig1 (>= 2.12.6), libfreetype6 (>= 2.3.9), libfribidi0 (>= 0.19.2), libgcc-s1 (>= 4.0), libgd3 (>= 2.1.0~alpha~), libgraphite2-3 (>= 1.2.2), libhunspell-1.7-0, libicu66 (>= 66.1-1~), libjpeg8 (>= 8c), liblog4cxx10v5 (>= 0.10.0), liblzma5 (>= 5.1.1alpha+20120614), libmpfr6 (>= 3.1.3), libmspack0 (>= 0.4), libpng16-16 (>= 1.6.2-1), libpopt0 (>= 1.14), libqt5concurrent5 (>= 5.6.0~rc), libqt5core5a (>= 5.12.2), libqt5dbus5 (>= 5.0.2), libqt5gui5 (>= 5.8.0) | libqt5gui5-gles (>= 5.8.0), libqt5script5 (>= 5.6.0~beta), libqt5scripttools5 (>= 5.6.0~beta), libqt5widgets5 (>= 5.12.2), libqt5xml5 (>= 5.0.2), libssl1.1 (>= 1.1.0), libstdc++6 (>= 9), liburiparser1 (>= 0.6.0), libzzip-0-13 (>= 0.13.56), zlib1g (>= 1:1.2.0)
-Filename: pool/universe/m/miktex/miktex_2.9.7445-focal1_amd64.deb
-Size: 30014570
-MD5sum: 793af6f5a87b871a140e05c81e6d5d88
-SHA1: 448139dabdec4b6a9b0fbdcdc1d5231df7c47743
-SHA256: 26cf03c3a33c0c78e6f5bc10bbb80cea4f0dd4fae8b1233bcae2ba932f2d9c2b
-Description: MiKTeX: a scalable TeX distribution
- MiKTeX is a scalable TeX distribution. The bare installation is &quot;just
- enough TeX&quot; to get you going.
- .
- For more information about the MiKTeX project, visit the project page:
- https://miktex.org
- .
-Homepage: https://miktex.org
-
diff --git a/systems/win32/miktex/setup/deb/dists/focal/universe/binary-amd64/Packages.bz2 b/systems/win32/miktex/setup/deb/dists/focal/universe/binary-amd64/Packages.bz2
index f84bfa04dc..da91cc98c3 100644
--- a/systems/win32/miktex/setup/deb/dists/focal/universe/binary-amd64/Packages.bz2
+++ b/systems/win32/miktex/setup/deb/dists/focal/universe/binary-amd64/Packages.bz2
Binary files differ
diff --git a/systems/win32/miktex/setup/deb/dists/focal/universe/binary-amd64/Packages.gz b/systems/win32/miktex/setup/deb/dists/focal/universe/binary-amd64/Packages.gz
index fea67e41b5..5089e18ab2 100644
--- a/systems/win32/miktex/setup/deb/dists/focal/universe/binary-amd64/Packages.gz
+++ b/systems/win32/miktex/setup/deb/dists/focal/universe/binary-amd64/Packages.gz
Binary files differ
diff --git a/systems/win32/miktex/setup/deb/dists/stretch/InRelease b/systems/win32/miktex/setup/deb/dists/stretch/InRelease
index 5ea29b09c4..19bf36d0d9 100644
--- a/systems/win32/miktex/setup/deb/dists/stretch/InRelease
+++ b/systems/win32/miktex/setup/deb/dists/stretch/InRelease
@@ -5,36 +5,36 @@ Origin: . stretch
Label: . stretch
Suite: stretch
Codename: stretch
-Date: Thu, 25 Mar 2021 15:33:29 UTC
+Date: Mon, 24 May 2021 18:59:18 UTC
Architectures: amd64
Components: universe
Description: Generated by aptly
MD5Sum:
- 93bd858100823f302b49fbff84345038 1868 universe/Contents-amd64.gz
+ f3f838e2c02900c5f9c53494c7cfc9dc 1510 universe/Contents-amd64.gz
7e51c033bd0c15d4b99563b11dfc3269 92 universe/binary-amd64/Release
- d59c1abe1aa00ad32b644014652dcf37 13797 universe/binary-amd64/Packages
- 0ece3041519bb7fbcfdafd368b910773 1885 universe/binary-amd64/Packages.gz
- 4b54386659fa0f432bb1d60ab75689ef 2303 universe/binary-amd64/Packages.bz2
+ 9003ddb53d134234d6eece02b8c6e14c 9675 universe/binary-amd64/Packages
+ 3d84babde6d3d3de7a7be7c04ce5963d 1532 universe/binary-amd64/Packages.gz
+ 238962b3869f3f541bdb8bee30b07e41 1803 universe/binary-amd64/Packages.bz2
SHA1:
- 387d894085181b1fcd78ee39f2b3c642d962c63e 1868 universe/Contents-amd64.gz
+ 7880333f9024874a72000f81e0cfccf43765d9e6 1510 universe/Contents-amd64.gz
a8cdfffd31ad7c80bc0211b261d920f4f54a4c9a 92 universe/binary-amd64/Release
- 9f3d67cedf74a07f4baa9cc4307c2c462e489f61 13797 universe/binary-amd64/Packages
- c84d0e1bd67a25d3ecd9bf22e8cbe1e86df985da 1885 universe/binary-amd64/Packages.gz
- 3760bcbaf33ddfdac08f309bab3a74ee21b5bc4d 2303 universe/binary-amd64/Packages.bz2
+ b7f17e6371907bbdf7081b472ac4a148ddb62130 9675 universe/binary-amd64/Packages
+ 3a565947a1c19ef31d9683f2debfa0086a832cd0 1532 universe/binary-amd64/Packages.gz
+ 75d88b170e488b1a9124d6c87919cc8800e4a918 1803 universe/binary-amd64/Packages.bz2
SHA256:
- 874eb508922da01626ea6d14d89462dfcad384d3c2647f87a3a41fddfa4a8c8b 1868 universe/Contents-amd64.gz
+ a9c4fe06f32b300f89373167dbe987917d6f848dd8537892da71ef8f3ee97818 1510 universe/Contents-amd64.gz
dd6afd4ed6f17bf2169743f34465b0594ee95b13ad8cfec78f5753c0d4f59da1 92 universe/binary-amd64/Release
- 719111ec8f34fab547dc833a11a4bc5c034bd3d4ea4ba99a9ce33140fe65208b 13797 universe/binary-amd64/Packages
- edd5e0cd8816c574dc92d397fc52c7adae10647c5a785bf8f0d90010518a061c 1885 universe/binary-amd64/Packages.gz
- 757274674c78c07a407bb9cd2a334964c4e2e60cb545fe3203a27ae508a73793 2303 universe/binary-amd64/Packages.bz2
+ ada0f66a66ff45db3a22997a89b6c1e6f1c44e6bd7e1f70c934c00b5379e08db 9675 universe/binary-amd64/Packages
+ 78d8f7aff31dbf96b47928db2bb5c860f2cce67ebafae5915ad45a6d3ae6c3dd 1532 universe/binary-amd64/Packages.gz
+ 958977fec43ea88aa97fb19e569f95042e05d219c38b06e902c656348a23b1d3 1803 universe/binary-amd64/Packages.bz2
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
-iQEcBAEBCAAGBQJgXK1JAAoJECd6cpP1nkiJldEH/1mkeUyltb8oihv+wEOQ2M2S
-dpCUV7R7MuWPpXA39jHesseYzKfGjgRhDXbVmRW7hr0u8285JiGiKHfypvH3KyV5
-G7MxC/nTrWjtPqvHIggUXFHb2F9IFP+1znKok8ZOi9znPJocIpVL1rwSehvpmIBW
-SIOPiFQAi3b9XHDbCw1ZgbUJavE5BGFK0L2kcTRjIJQbm7zPPG5JYMJh6g10m6To
-vNmZcHI34BM05eTh3yociNwcccaANSjVy5uQi/pS6Lpc4YN7P2RNplcvNvnKMV9N
-eZg7YwtefPpiSNmpBxBy4qtCo6oWoJeN7FZkyFoEJoLBBevo/3BEiDKiGaidX7A=
-=tonE
+iQEcBAEBCAAGBQJgq/eGAAoJECd6cpP1nkiJ9AUH/jbO9J7CP5YlHsZQSuiEkBNJ
+XYZAxyzLsTwZwITswkG9e/yUugu8h+TitlgcHMOQMSJf5gle+QPmThxS1dXjq3rd
+TOwTJ87SXwYWyFtU9DC/K7p0/ou5rB1XUFA4KU1ywoU1DthuPJNYn8blvICGFmp+
+VRZN/cawrCCbqlsAwSbJw573BngAH1nnDaDu8Oa1GuumHzJIG5gFkl5btoE2g8J4
+oUgSFW5UD3E86RqcDuhm7q+kpq7z/JQhagIkdJ3eGQr54j1b+ghOp+LLW7XfFV7k
+umi7JBYxXJd8q1amQa81rPyfJyzEE5ruxfG9hepArw0Z8wmv5hWpUuL0RfIejx4=
+=jjsH
-----END PGP SIGNATURE-----
diff --git a/systems/win32/miktex/setup/deb/dists/stretch/Release b/systems/win32/miktex/setup/deb/dists/stretch/Release
index 92bb1c4a47..4639212b2c 100644
--- a/systems/win32/miktex/setup/deb/dists/stretch/Release
+++ b/systems/win32/miktex/setup/deb/dists/stretch/Release
@@ -2,25 +2,25 @@ Origin: . stretch
Label: . stretch
Suite: stretch
Codename: stretch
-Date: Thu, 25 Mar 2021 15:33:29 UTC
+Date: Mon, 24 May 2021 18:59:18 UTC
Architectures: amd64
Components: universe
Description: Generated by aptly
MD5Sum:
- 93bd858100823f302b49fbff84345038 1868 universe/Contents-amd64.gz
+ f3f838e2c02900c5f9c53494c7cfc9dc 1510 universe/Contents-amd64.gz
7e51c033bd0c15d4b99563b11dfc3269 92 universe/binary-amd64/Release
- d59c1abe1aa00ad32b644014652dcf37 13797 universe/binary-amd64/Packages
- 0ece3041519bb7fbcfdafd368b910773 1885 universe/binary-amd64/Packages.gz
- 4b54386659fa0f432bb1d60ab75689ef 2303 universe/binary-amd64/Packages.bz2
+ 9003ddb53d134234d6eece02b8c6e14c 9675 universe/binary-amd64/Packages
+ 3d84babde6d3d3de7a7be7c04ce5963d 1532 universe/binary-amd64/Packages.gz
+ 238962b3869f3f541bdb8bee30b07e41 1803 universe/binary-amd64/Packages.bz2
SHA1:
- 387d894085181b1fcd78ee39f2b3c642d962c63e 1868 universe/Contents-amd64.gz
+ 7880333f9024874a72000f81e0cfccf43765d9e6 1510 universe/Contents-amd64.gz
a8cdfffd31ad7c80bc0211b261d920f4f54a4c9a 92 universe/binary-amd64/Release
- 9f3d67cedf74a07f4baa9cc4307c2c462e489f61 13797 universe/binary-amd64/Packages
- c84d0e1bd67a25d3ecd9bf22e8cbe1e86df985da 1885 universe/binary-amd64/Packages.gz
- 3760bcbaf33ddfdac08f309bab3a74ee21b5bc4d 2303 universe/binary-amd64/Packages.bz2
+ b7f17e6371907bbdf7081b472ac4a148ddb62130 9675 universe/binary-amd64/Packages
+ 3a565947a1c19ef31d9683f2debfa0086a832cd0 1532 universe/binary-amd64/Packages.gz
+ 75d88b170e488b1a9124d6c87919cc8800e4a918 1803 universe/binary-amd64/Packages.bz2
SHA256:
- 874eb508922da01626ea6d14d89462dfcad384d3c2647f87a3a41fddfa4a8c8b 1868 universe/Contents-amd64.gz
+ a9c4fe06f32b300f89373167dbe987917d6f848dd8537892da71ef8f3ee97818 1510 universe/Contents-amd64.gz
dd6afd4ed6f17bf2169743f34465b0594ee95b13ad8cfec78f5753c0d4f59da1 92 universe/binary-amd64/Release
- 719111ec8f34fab547dc833a11a4bc5c034bd3d4ea4ba99a9ce33140fe65208b 13797 universe/binary-amd64/Packages
- edd5e0cd8816c574dc92d397fc52c7adae10647c5a785bf8f0d90010518a061c 1885 universe/binary-amd64/Packages.gz
- 757274674c78c07a407bb9cd2a334964c4e2e60cb545fe3203a27ae508a73793 2303 universe/binary-amd64/Packages.bz2
+ ada0f66a66ff45db3a22997a89b6c1e6f1c44e6bd7e1f70c934c00b5379e08db 9675 universe/binary-amd64/Packages
+ 78d8f7aff31dbf96b47928db2bb5c860f2cce67ebafae5915ad45a6d3ae6c3dd 1532 universe/binary-amd64/Packages.gz
+ 958977fec43ea88aa97fb19e569f95042e05d219c38b06e902c656348a23b1d3 1803 universe/binary-amd64/Packages.bz2
diff --git a/systems/win32/miktex/setup/deb/dists/stretch/Release.gpg b/systems/win32/miktex/setup/deb/dists/stretch/Release.gpg
index 5359967a50..78f578424f 100644
--- a/systems/win32/miktex/setup/deb/dists/stretch/Release.gpg
+++ b/systems/win32/miktex/setup/deb/dists/stretch/Release.gpg
@@ -1,11 +1,11 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
-iQEcBAABCAAGBQJgXK1JAAoJECd6cpP1nkiJgzoIAJPcMGkBZPoYGXm/04b+wKIe
-pvO07lo503AqRxw1VFpOHM1EcSt5EIrHCX40rjEYILAAtszoJfWJt963kjWm1C00
-LIQe5XkghfxsTudZv60xxK80c+o4iUgz3wDgWP/QnJ+9xWEBlihwel+lnF9UjfdU
-D2pC2+W5uLsmI5M/7p4/Wz7rk4iCqSIl6a3QwUgwNKV72Q1GkUdYeINEc9R850fF
-Xv8Os+G+F6tBtWngg+h9pu16TjenILRU/7khMWq4aEQMnaSHcQHIPD9hmRZnzPaz
-Jk61RCo7r9vYpiCMZF1TmSk9Pp8/zQV/2lh/RwRg+cEj0jH6UPOgUoea+6hC+kQ=
-=cTqO
+iQEcBAABCAAGBQJgq/eGAAoJECd6cpP1nkiJLYUH/jnT/eLFxDaers/imkbcEe+s
+f/hfsp/s/ib+qkKUDc+luEH+GluN6djNiN+LjFVsTw8wrsIIwnDDhin4ciiZU1n/
+qqIbVrbq8533Nrn5yghzD2CQF/I8fFGFYGi9u7SLzdUsO+lWMHM5d5FKSlfclJhE
+jYMwE/zOqj2YFLS8E43Ht9293GnESGQbQq4fECRgVoY3BiMnGkXlep3f8ta9OrPz
+5UHJ0pHL0VrcJH0TnwtG4ThQrgo/n0hNkc/es5lcgjTPyfIB9oWqed13fDCCHer+
+Tid7OD41bayFidODyxvY8L1FKbcmG0RJsBlgX/uFNLfhkZz1e9VtvN89slzDiuI=
+=pPVF
-----END PGP SIGNATURE-----
diff --git a/systems/win32/miktex/setup/deb/dists/stretch/universe/Contents-amd64.gz b/systems/win32/miktex/setup/deb/dists/stretch/universe/Contents-amd64.gz
index ffacc19145..4876176474 100644
--- a/systems/win32/miktex/setup/deb/dists/stretch/universe/Contents-amd64.gz
+++ b/systems/win32/miktex/setup/deb/dists/stretch/universe/Contents-amd64.gz
Binary files differ
diff --git a/systems/win32/miktex/setup/deb/dists/stretch/universe/binary-amd64/Packages b/systems/win32/miktex/setup/deb/dists/stretch/universe/binary-amd64/Packages
index 3b496742ce..dfb83f50c6 100644
--- a/systems/win32/miktex/setup/deb/dists/stretch/universe/binary-amd64/Packages
+++ b/systems/win32/miktex/setup/deb/dists/stretch/universe/binary-amd64/Packages
@@ -110,51 +110,3 @@ SHA256: ccdff59615ca9b2d965e7a89aff6c5ae554687d47780f41ab1a315b2f11b1c3c
Description: MiKTeX: a scalable TeX distribution
Homepage: https://miktex.org
-Package: miktex
-Priority: optional
-Section: tex
-Installed-Size: 93712
-Maintainer: Christian Schenk <cs@miktex.org>
-Architecture: amd64
-Version: 2.9.7445-stretch1
-Depends: debconf (>= 0.2.17), fontconfig, libbz2-1.0, libc6 (>= 2.14), libcairo2 (>= 1.12.0), libcurl3 (>= 7.16.2), libexpat1 (>= 2.0.1), libfontconfig1 (>= 2.11), libfreetype6 (>= 2.3.9), libfribidi0 (>= 0.19.2), libgcc1 (>= 1:4.0), libgd3 (>= 2.1.0~alpha~), libgmp10, libgraphite2-3 (>= 1.2.2), libhunspell-1.4-0, libicu57 (>= 57.1-1~), libjpeg62-turbo (>= 1.3.1), liblog4cxx10v5, liblzma5 (>= 5.1.1alpha+20120614), libmpfr4 (>= 3.1.3), libmspack0 (>= 0.4), libpixman-1-0, libpng16-16 (>= 1.6.2-1), libpopt0 (>= 1.14), libqt5concurrent5 (>= 5.6.0~rc), libqt5core5a (>= 5.7.0), libqt5dbus5 (>= 5.0.2), libqt5gui5 (>= 5.7.0), libqt5printsupport5 (>= 5.0.2), libqt5script5 (>= 5.6.0~beta), libqt5scripttools5 (>= 5.6.0~beta), libqt5widgets5 (>= 5.3.0), libqt5xml5 (>= 5.0.2), libssl1.1 (>= 1.1.0), libstdc++6 (>= 6), liburiparser1 (>= 0.6.0), libzzip-0-13 (>= 0.13.56), zlib1g (>= 1:1.2.0)
-Filename: pool/universe/m/miktex/miktex_2.9.7445-stretch1_amd64.deb
-Size: 29293442
-MD5sum: 37d46ea1c7a435b981e7de3fa181380a
-SHA1: a746187c29c091f2b55eb5ab1371851a2b981d48
-SHA256: aa85aa68bf83cb007ab58ead80a532f6f9b1906cae4d2019c7f552fe8c6069d2
-Description: MiKTeX: a scalable TeX distribution
-Homepage: https://miktex.org
-
-Package: miktex
-Priority: optional
-Section: tex
-Installed-Size: 93529
-Maintainer: Christian Schenk <cs@miktex.org>
-Architecture: amd64
-Version: 2.9.7400-stretch1
-Depends: debconf (>= 0.2.17), fontconfig, libbz2-1.0, libc6 (>= 2.14), libcairo2 (>= 1.12.0), libcurl3 (>= 7.16.2), libexpat1 (>= 2.0.1), libfontconfig1 (>= 2.11), libfreetype6 (>= 2.3.9), libfribidi0 (>= 0.19.2), libgcc1 (>= 1:4.0), libgd3 (>= 2.1.0~alpha~), libgmp10, libgraphite2-3 (>= 1.2.2), libhunspell-1.4-0, libicu57 (>= 57.1-1~), libjpeg62-turbo (>= 1.3.1), liblog4cxx10v5, liblzma5 (>= 5.1.1alpha+20120614), libmpfr4 (>= 3.1.3), libmspack0 (>= 0.4), libpixman-1-0, libpng16-16 (>= 1.6.2-1), libpopt0 (>= 1.14), libqt5concurrent5 (>= 5.6.0~rc), libqt5core5a (>= 5.7.0), libqt5dbus5 (>= 5.0.2), libqt5gui5 (>= 5.7.0), libqt5printsupport5 (>= 5.0.2), libqt5script5 (>= 5.6.0~beta), libqt5scripttools5 (>= 5.6.0~beta), libqt5widgets5 (>= 5.3.0), libqt5xml5 (>= 5.0.2), libssl1.1 (>= 1.1.0), libstdc++6 (>= 6), liburiparser1 (>= 0.6.0), libzzip-0-13 (>= 0.13.56), zlib1g (>= 1:1.2.0)
-Filename: pool/universe/m/miktex/miktex_2.9.7400-stretch1_amd64.deb
-Size: 29464796
-MD5sum: 6c7e4f961b9b85a694df9ab2efe4139b
-SHA1: 3777c56d67c5bd28fb30439d52c2c2f2e1577730
-SHA256: e52659fd202c2f11f1d47faef5e57ff7db8aca30f8dd091df3eb973f063f0e72
-Description: MiKTeX: a scalable TeX distribution
-Homepage: https://miktex.org
-
-Package: miktex
-Priority: optional
-Section: tex
-Installed-Size: 92844
-Maintainer: Christian Schenk <cs@miktex.org>
-Architecture: amd64
-Version: 2.9.7350-stretch1
-Depends: debconf (>= 0.2.17), fontconfig, libbz2-1.0, libc6 (>= 2.14), libcairo2 (>= 1.12.0), libcurl3 (>= 7.16.2), libexpat1 (>= 2.0.1), libfontconfig1 (>= 2.11), libfreetype6 (>= 2.3.9), libfribidi0 (>= 0.19.2), libgcc1 (>= 1:4.0), libgd3 (>= 2.1.0~alpha~), libgmp10, libgraphite2-3 (>= 1.2.2), libhunspell-1.4-0, libicu57 (>= 57.1-1~), libjpeg62-turbo (>= 1.3.1), liblog4cxx10v5, liblzma5 (>= 5.1.1alpha+20120614), libmpfr4 (>= 3.1.3), libmspack0 (>= 0.4), libpixman-1-0, libpng16-16 (>= 1.6.2-1), libpopt0 (>= 1.14), libqt5concurrent5 (>= 5.6.0~rc), libqt5core5a (>= 5.7.0), libqt5dbus5 (>= 5.0.2), libqt5gui5 (>= 5.7.0), libqt5printsupport5 (>= 5.0.2), libqt5script5 (>= 5.6.0~beta), libqt5scripttools5 (>= 5.6.0~beta), libqt5widgets5 (>= 5.3.0), libqt5xml5 (>= 5.0.2), libssl1.1 (>= 1.1.0), libstdc++6 (>= 6), liburiparser1 (>= 0.6.0), libzzip-0-13 (>= 0.13.56), zlib1g (>= 1:1.2.0)
-Filename: pool/universe/m/miktex/miktex_2.9.7350-stretch1_amd64.deb
-Size: 29324886
-MD5sum: a2990ea714a0d45e151676665ec57261
-SHA1: 66ea59728660f84a949e30373d3a8a8f38da6941
-SHA256: c85705217fc8bcbdd8c376a481ef8663dc528c1dc51e7879e9aab876ab553c39
-Description: MiKTeX: a scalable TeX distribution
-Homepage: https://miktex.org
-
diff --git a/systems/win32/miktex/setup/deb/dists/stretch/universe/binary-amd64/Packages.bz2 b/systems/win32/miktex/setup/deb/dists/stretch/universe/binary-amd64/Packages.bz2
index e6c7a6f194..bf4d398e06 100644
--- a/systems/win32/miktex/setup/deb/dists/stretch/universe/binary-amd64/Packages.bz2
+++ b/systems/win32/miktex/setup/deb/dists/stretch/universe/binary-amd64/Packages.bz2
Binary files differ
diff --git a/systems/win32/miktex/setup/deb/dists/stretch/universe/binary-amd64/Packages.gz b/systems/win32/miktex/setup/deb/dists/stretch/universe/binary-amd64/Packages.gz
index 6998116cd3..5e91d49903 100644
--- a/systems/win32/miktex/setup/deb/dists/stretch/universe/binary-amd64/Packages.gz
+++ b/systems/win32/miktex/setup/deb/dists/stretch/universe/binary-amd64/Packages.gz
Binary files differ
diff --git a/systems/win32/miktex/setup/deb/dists/xenial/InRelease b/systems/win32/miktex/setup/deb/dists/xenial/InRelease
index 507d3dc427..6dcd17b4bb 100644
--- a/systems/win32/miktex/setup/deb/dists/xenial/InRelease
+++ b/systems/win32/miktex/setup/deb/dists/xenial/InRelease
@@ -5,36 +5,36 @@ Origin: . xenial
Label: . xenial
Suite: xenial
Codename: xenial
-Date: Thu, 25 Mar 2021 15:33:10 UTC
+Date: Mon, 24 May 2021 18:56:28 UTC
Architectures: amd64
Components: universe
Description: Generated by aptly
MD5Sum:
- 93bd858100823f302b49fbff84345038 1868 universe/Contents-amd64.gz
+ 2dd2aff3fecb091d0ba1808f3b83cce4 9482 universe/binary-amd64/Packages
+ 80d9971441e5f29a76e5af51dadb7ec4 1490 universe/binary-amd64/Packages.gz
+ 4323d4a89416a8fcc13d89b90c39390e 1794 universe/binary-amd64/Packages.bz2
+ f3f838e2c02900c5f9c53494c7cfc9dc 1510 universe/Contents-amd64.gz
c5cc3b01a49348b8c39a68453ca43705 89 universe/binary-amd64/Release
- a534b04824b312da8c9381ac02255a19 13535 universe/binary-amd64/Packages
- 5cef7827c0c2777f1502778aca0db51f 1845 universe/binary-amd64/Packages.gz
- 9fad5dacb7ef85f24f6fe6c2ccf7f861 2256 universe/binary-amd64/Packages.bz2
SHA1:
- 387d894085181b1fcd78ee39f2b3c642d962c63e 1868 universe/Contents-amd64.gz
+ 9c4bf829618bf574f98e9d32202cfac50d96a160 9482 universe/binary-amd64/Packages
+ 8a74f7dc2d2c6b9d85100a34bb3516004ebbe379 1490 universe/binary-amd64/Packages.gz
+ 7caa56fecfae37999f2c8eb6a16beb9f530d02ef 1794 universe/binary-amd64/Packages.bz2
+ 7880333f9024874a72000f81e0cfccf43765d9e6 1510 universe/Contents-amd64.gz
c9cecc9c57c7765960c0bc498c3b8b8e40622551 89 universe/binary-amd64/Release
- 55f9e7664e81ff7c2126601f472dff47d2d859cd 13535 universe/binary-amd64/Packages
- 05420cfe0c06c680efc3918638538d09c8b35ba3 1845 universe/binary-amd64/Packages.gz
- 968f6a03f98b5fe526525d2a012038b1840e1e47 2256 universe/binary-amd64/Packages.bz2
SHA256:
- 874eb508922da01626ea6d14d89462dfcad384d3c2647f87a3a41fddfa4a8c8b 1868 universe/Contents-amd64.gz
+ c8c65a754eaf51ac3f9c0c308e612d1e4c42bc63d2cc8fd1969a142e4345829d 9482 universe/binary-amd64/Packages
+ 9a22d53f1542bc94bcec383bbbadf4fe7ecb23dfeb429302687c2aa8c19a9096 1490 universe/binary-amd64/Packages.gz
+ dbe75ebb480212d44e11fac06aab9c2ca91e68b9b11d96d5a6d1582a655a3649 1794 universe/binary-amd64/Packages.bz2
+ a9c4fe06f32b300f89373167dbe987917d6f848dd8537892da71ef8f3ee97818 1510 universe/Contents-amd64.gz
e6d5690da31248d80075b81f7d7f340280ae0550c70619be1d7151e83d4f1dd9 89 universe/binary-amd64/Release
- 1deb2f22c3edce50e37acaf497dc6e4d8f4db6d13d89b724d113722a01bd1cee 13535 universe/binary-amd64/Packages
- 866cfb8f892ddf13cee3cd911d2ef36a59e785436959e564d851d0a4cb7dbdc0 1845 universe/binary-amd64/Packages.gz
- cc4161fb4cd2f8e891804f19261c2dbdd7fb4503e8767b5eac09fe4ac4d5a2f1 2256 universe/binary-amd64/Packages.bz2
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
-iQEcBAEBCAAGBQJgXK02AAoJECd6cpP1nkiJpEkIAIrp/5fTwzKJ8IsQDsKFQYOc
-UQthoVdN7fVdL1+IvHwURv8/oBOw+uc73h0Sy61Nu5/assYcoICw0wuZwUr/CNIL
-1QHlSMrQXpQ8PEd0rFqgcrAYKFW6SXLLsGvO+yZ0Ld5q0ekkVYbP635Q68ujv7FZ
-3pXFx5vivG/SaeqpDXSl1KJyu8WkIhyf4D5ry0ZN7BmLyZ9qXwjQXEJ34AugufZj
-4LQrypB51ooUAz8a7K05ZJ85eyFlV6jEctRwNEustClMH4UoPjgnFmttRsrE90yH
-wzXl+nufnr/uuTn1FAojnjSqup+vr5shIBZMLoRi1d/9ovh4bCoI5WPrXg+Lfps=
-=Sclo
+iQEcBAEBCAAGBQJgq/bcAAoJECd6cpP1nkiJnnAIAKiayXjR1t+bJvPUlBQfLshs
+OkoGmtzrYJxSsIav3+IUUoyMxH3xHcqS3y/Enejrxi+SR3wEjoIhVwjS+i9/8eZ+
+ASKUq7aQl95Lf8sSdSdbXYqZDnVfOLRSyAzZ0pjfAjdqD0ecujB8+n7a7XVhhaBi
+IGJNbtvKCgYmbJLPs6Pioo0ewn28eZJjThbjckvoWmPKQekz6r4wt3KliCZv1b+N
+uyGANt/RT4MdTyCuc7CH26r19YVO4Pus2ZLMzNphIpGQTbsXvoySRia52uMRG0bP
+Yl/TNv4jHh/ypjaXAD0/VSye+8b3NrcFtHkyig2u9Gn1VClNJ/eB66bEg99282s=
+=lT/r
-----END PGP SIGNATURE-----
diff --git a/systems/win32/miktex/setup/deb/dists/xenial/Release b/systems/win32/miktex/setup/deb/dists/xenial/Release
index b6a348cb68..f1ad03573c 100644
--- a/systems/win32/miktex/setup/deb/dists/xenial/Release
+++ b/systems/win32/miktex/setup/deb/dists/xenial/Release
@@ -2,25 +2,25 @@ Origin: . xenial
Label: . xenial
Suite: xenial
Codename: xenial
-Date: Thu, 25 Mar 2021 15:33:10 UTC
+Date: Mon, 24 May 2021 18:56:28 UTC
Architectures: amd64
Components: universe
Description: Generated by aptly
MD5Sum:
- 93bd858100823f302b49fbff84345038 1868 universe/Contents-amd64.gz
+ 2dd2aff3fecb091d0ba1808f3b83cce4 9482 universe/binary-amd64/Packages
+ 80d9971441e5f29a76e5af51dadb7ec4 1490 universe/binary-amd64/Packages.gz
+ 4323d4a89416a8fcc13d89b90c39390e 1794 universe/binary-amd64/Packages.bz2
+ f3f838e2c02900c5f9c53494c7cfc9dc 1510 universe/Contents-amd64.gz
c5cc3b01a49348b8c39a68453ca43705 89 universe/binary-amd64/Release
- a534b04824b312da8c9381ac02255a19 13535 universe/binary-amd64/Packages
- 5cef7827c0c2777f1502778aca0db51f 1845 universe/binary-amd64/Packages.gz
- 9fad5dacb7ef85f24f6fe6c2ccf7f861 2256 universe/binary-amd64/Packages.bz2
SHA1:
- 387d894085181b1fcd78ee39f2b3c642d962c63e 1868 universe/Contents-amd64.gz
+ 9c4bf829618bf574f98e9d32202cfac50d96a160 9482 universe/binary-amd64/Packages
+ 8a74f7dc2d2c6b9d85100a34bb3516004ebbe379 1490 universe/binary-amd64/Packages.gz
+ 7caa56fecfae37999f2c8eb6a16beb9f530d02ef 1794 universe/binary-amd64/Packages.bz2
+ 7880333f9024874a72000f81e0cfccf43765d9e6 1510 universe/Contents-amd64.gz
c9cecc9c57c7765960c0bc498c3b8b8e40622551 89 universe/binary-amd64/Release
- 55f9e7664e81ff7c2126601f472dff47d2d859cd 13535 universe/binary-amd64/Packages
- 05420cfe0c06c680efc3918638538d09c8b35ba3 1845 universe/binary-amd64/Packages.gz
- 968f6a03f98b5fe526525d2a012038b1840e1e47 2256 universe/binary-amd64/Packages.bz2
SHA256:
- 874eb508922da01626ea6d14d89462dfcad384d3c2647f87a3a41fddfa4a8c8b 1868 universe/Contents-amd64.gz
+ c8c65a754eaf51ac3f9c0c308e612d1e4c42bc63d2cc8fd1969a142e4345829d 9482 universe/binary-amd64/Packages
+ 9a22d53f1542bc94bcec383bbbadf4fe7ecb23dfeb429302687c2aa8c19a9096 1490 universe/binary-amd64/Packages.gz
+ dbe75ebb480212d44e11fac06aab9c2ca91e68b9b11d96d5a6d1582a655a3649 1794 universe/binary-amd64/Packages.bz2
+ a9c4fe06f32b300f89373167dbe987917d6f848dd8537892da71ef8f3ee97818 1510 universe/Contents-amd64.gz
e6d5690da31248d80075b81f7d7f340280ae0550c70619be1d7151e83d4f1dd9 89 universe/binary-amd64/Release
- 1deb2f22c3edce50e37acaf497dc6e4d8f4db6d13d89b724d113722a01bd1cee 13535 universe/binary-amd64/Packages
- 866cfb8f892ddf13cee3cd911d2ef36a59e785436959e564d851d0a4cb7dbdc0 1845 universe/binary-amd64/Packages.gz
- cc4161fb4cd2f8e891804f19261c2dbdd7fb4503e8767b5eac09fe4ac4d5a2f1 2256 universe/binary-amd64/Packages.bz2
diff --git a/systems/win32/miktex/setup/deb/dists/xenial/Release.gpg b/systems/win32/miktex/setup/deb/dists/xenial/Release.gpg
index 3ffa87b2b5..6f2470e1d4 100644
--- a/systems/win32/miktex/setup/deb/dists/xenial/Release.gpg
+++ b/systems/win32/miktex/setup/deb/dists/xenial/Release.gpg
@@ -1,11 +1,11 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
-iQEcBAABCAAGBQJgXK02AAoJECd6cpP1nkiJtG8H/i6M+ChW8179DPuhyUq3b87Z
-uq2sdB8TbCmoC2+u9Bm6IFb9Yxl+amJGOvowCd2uA0HinZJyLfIpj1kEo+ND79k5
-1tP0/91k2b79UV6DZkPTNkEqdqVSrNWjGpCGCe1FCG/0jLhfh4ELExH1JtcAV55n
-8nPXSRbOEUDMWKDAqktUR6/aJM6a9r5FmVnaRfkaoz79nZ7Ld9s0gAfFLl2So8M7
-B7NRTn2OYHQlzwq6JD8UDT87nCHv5Efx0YGpZ9J/JxEjvL73EXJFNANE/rw1SUsK
-B7gIYByuYT7OySbYMox6RGEygJnUtBpwYfJ64G16HMBd63h5XZQFolhchqoMp9A=
-=ZIUa
+iQEcBAABCAAGBQJgq/bcAAoJECd6cpP1nkiJsukH/1UcYS4YsFflu67kg873mMMc
+YpsafjFm8TxJgCIer5FI7kGTkEmfYJ/RGMNzr44RiYTWgPcwqkckxzK/z1PrxSvl
+IAg7/UnSjRZXQpQppbfH9LP1QCu7uF560KMIsjZbnSeIzIHycGjNDc1P1faG3hEe
+pyxTvHkYbwWGeLIaU+uI7AY9yDD92Zc/bsbr0kK0DabcYuLoe5pMm8OXLUnUWoWd
+TKeZga0wbpN5j1m8hVRg5Yuv991pbme4oouEyZUXa6zZl3UhvCTsRyZc5WPZ96EN
+QJVZQ2INPEVjrII+62Zb+JLj09U7D/2pTUYw7OlPu8fb79Sf0vaFrXOvNiVlCWE=
+=NHta
-----END PGP SIGNATURE-----
diff --git a/systems/win32/miktex/setup/deb/dists/xenial/universe/Contents-amd64.gz b/systems/win32/miktex/setup/deb/dists/xenial/universe/Contents-amd64.gz
index ffacc19145..4876176474 100644
--- a/systems/win32/miktex/setup/deb/dists/xenial/universe/Contents-amd64.gz
+++ b/systems/win32/miktex/setup/deb/dists/xenial/universe/Contents-amd64.gz
Binary files differ
diff --git a/systems/win32/miktex/setup/deb/dists/xenial/universe/binary-amd64/Packages b/systems/win32/miktex/setup/deb/dists/xenial/universe/binary-amd64/Packages
index e72b0623a2..c70d87979a 100644
--- a/systems/win32/miktex/setup/deb/dists/xenial/universe/binary-amd64/Packages
+++ b/systems/win32/miktex/setup/deb/dists/xenial/universe/binary-amd64/Packages
@@ -110,51 +110,3 @@ SHA256: c86b6ae79ee3495ccbb907c3f51b450d8d11b8aaa7d80f13346e641539cdbdc9
Description: MiKTeX: a scalable TeX distribution
Homepage: https://miktex.org
-Package: miktex
-Priority: optional
-Section: tex
-Installed-Size: 91690
-Maintainer: Christian Schenk <cs@miktex.org>
-Architecture: amd64
-Version: 2.9.7445-xenial1
-Depends: debconf (>= 0.2.17), fontconfig, libbz2-1.0, libc6 (>= 2.15), libcairo2 (>= 1.12.0), libcurl3 (>= 7.16.2), libexpat1 (>= 2.0.1), libfontconfig1 (>= 2.11.94), libfreetype6 (>= 2.3.9), libfribidi0 (>= 0.19.2), libgcc1 (>= 1:4.0), libgd3 (>= 2.1.0~alpha~), libgraphite2-3 (>= 1.2.2), libhunspell-1.3-0 (>= 1.3.3), libicu55 (>= 55.1-1~), libjpeg8 (>= 8c), liblog4cxx10v5 (>= 0.10.0), liblzma5 (>= 5.1.1alpha+20120614), libmpfr4 (>= 3.1.3), libmspack0 (>= 0.4), libpng12-0 (>= 1.2.13-4), libpopt0 (>= 1.14), libqt5concurrent5 (>= 5.0.2), libqt5core5a (>= 5.5.1), libqt5dbus5 (>= 5.0.2), libqt5gui5 (>= 5.3.0) | libqt5gui5-gles (>= 5.3.0), libqt5script5 (>= 5.0.2), libqt5scripttools5 (>= 5.0.2), libqt5widgets5 (>= 5.3.0), libqt5xml5 (>= 5.0.2), libssl1.0.0 (>= 1.0.0), libstdc++6 (>= 5.2), liburiparser1 (>= 0.6.0), libzzip-0-13 (>= 0.13.56), zlib1g (>= 1:1.2.0)
-Filename: pool/universe/m/miktex/miktex_2.9.7445-xenial1_amd64.deb
-Size: 28722842
-MD5sum: 325f1d970797dfcdede9cefdc63d2ec0
-SHA1: d48878f7e274c4b4c6de540ca85409e56e142655
-SHA256: b496760015b9c8ebcf29cb54e1a1a7be05e7f45ffc8fe2514a3979398164900c
-Description: MiKTeX: a scalable TeX distribution
-Homepage: https://miktex.org
-
-Package: miktex
-Priority: optional
-Section: tex
-Installed-Size: 91550
-Maintainer: Christian Schenk <cs@miktex.org>
-Architecture: amd64
-Version: 2.9.7400-xenial1
-Depends: debconf (>= 0.2.17), fontconfig, libbz2-1.0, libc6 (>= 2.15), libcairo2 (>= 1.12.0), libcurl3 (>= 7.16.2), libexpat1 (>= 2.0.1), libfontconfig1 (>= 2.11.94), libfreetype6 (>= 2.3.9), libfribidi0 (>= 0.19.2), libgcc1 (>= 1:4.0), libgd3 (>= 2.1.0~alpha~), libgraphite2-3 (>= 1.2.2), libhunspell-1.3-0 (>= 1.3.3), libicu55 (>= 55.1-1~), libjpeg8 (>= 8c), liblog4cxx10v5 (>= 0.10.0), liblzma5 (>= 5.1.1alpha+20120614), libmpfr4 (>= 3.1.3), libmspack0 (>= 0.4), libpng12-0 (>= 1.2.13-4), libpopt0 (>= 1.14), libqt5concurrent5 (>= 5.0.2), libqt5core5a (>= 5.5.1), libqt5dbus5 (>= 5.0.2), libqt5gui5 (>= 5.3.0) | libqt5gui5-gles (>= 5.3.0), libqt5script5 (>= 5.0.2), libqt5scripttools5 (>= 5.0.2), libqt5widgets5 (>= 5.3.0), libqt5xml5 (>= 5.0.2), libssl1.0.0 (>= 1.0.0), libstdc++6 (>= 5.2), liburiparser1 (>= 0.6.0), libzzip-0-13 (>= 0.13.56), zlib1g (>= 1:1.2.0)
-Filename: pool/universe/m/miktex/miktex_2.9.7400-xenial1_amd64.deb
-Size: 28898388
-MD5sum: 23315a48cb25b2225136a92f6600073b
-SHA1: b924506508d7e50cfc1ce6935fcf46b1a14d7830
-SHA256: a60b2e9f969878dd38f373f2f672ece73765c67fb54aad0fb0f20bf80ddbeffd
-Description: MiKTeX: a scalable TeX distribution
-Homepage: https://miktex.org
-
-Package: miktex
-Priority: optional
-Section: tex
-Installed-Size: 90867
-Maintainer: Christian Schenk <cs@miktex.org>
-Architecture: amd64
-Version: 2.9.7350-xenial1
-Depends: debconf (>= 0.2.17), fontconfig, libbz2-1.0, libc6 (>= 2.15), libcairo2 (>= 1.12.0), libcurl3 (>= 7.16.2), libexpat1 (>= 2.0.1), libfontconfig1 (>= 2.11.94), libfreetype6 (>= 2.3.9), libfribidi0 (>= 0.19.2), libgcc1 (>= 1:4.0), libgd3 (>= 2.1.0~alpha~), libgraphite2-3 (>= 1.2.2), libhunspell-1.3-0 (>= 1.3.3), libicu55 (>= 55.1-1~), libjpeg8 (>= 8c), liblog4cxx10v5 (>= 0.10.0), liblzma5 (>= 5.1.1alpha+20120614), libmpfr4 (>= 3.1.3), libmspack0 (>= 0.4), libpng12-0 (>= 1.2.13-4), libpopt0 (>= 1.14), libqt5concurrent5 (>= 5.0.2), libqt5core5a (>= 5.5.1), libqt5dbus5 (>= 5.0.2), libqt5gui5 (>= 5.3.0) | libqt5gui5-gles (>= 5.3.0), libqt5script5 (>= 5.0.2), libqt5scripttools5 (>= 5.0.2), libqt5widgets5 (>= 5.3.0), libqt5xml5 (>= 5.0.2), libssl1.0.0 (>= 1.0.0), libstdc++6 (>= 5.2), liburiparser1 (>= 0.6.0), libzzip-0-13 (>= 0.13.56), zlib1g (>= 1:1.2.0)
-Filename: pool/universe/m/miktex/miktex_2.9.7350-xenial1_amd64.deb
-Size: 28764416
-MD5sum: 1dda250d655963c8ac3de1710b4c6453
-SHA1: a3c4c53c347ea755d879532c37ceec93558166a3
-SHA256: 6fde6e96add2f41cde2a2801e0eab5ce3e807870bddef6e718b8f45511795166
-Description: MiKTeX: a scalable TeX distribution
-Homepage: https://miktex.org
-
diff --git a/systems/win32/miktex/setup/deb/dists/xenial/universe/binary-amd64/Packages.bz2 b/systems/win32/miktex/setup/deb/dists/xenial/universe/binary-amd64/Packages.bz2
index bd1ba849c5..ea6c1b7939 100644
--- a/systems/win32/miktex/setup/deb/dists/xenial/universe/binary-amd64/Packages.bz2
+++ b/systems/win32/miktex/setup/deb/dists/xenial/universe/binary-amd64/Packages.bz2
Binary files differ
diff --git a/systems/win32/miktex/setup/deb/dists/xenial/universe/binary-amd64/Packages.gz b/systems/win32/miktex/setup/deb/dists/xenial/universe/binary-amd64/Packages.gz
index 3963281515..e4a5b4ff41 100644
--- a/systems/win32/miktex/setup/deb/dists/xenial/universe/binary-amd64/Packages.gz
+++ b/systems/win32/miktex/setup/deb/dists/xenial/universe/binary-amd64/Packages.gz
Binary files differ
diff --git a/systems/win32/miktex/tm/packages/next/files.csv.lzma b/systems/win32/miktex/tm/packages/next/files.csv.lzma
index 2140a96e70..384463be94 100644
--- a/systems/win32/miktex/tm/packages/next/files.csv.lzma
+++ b/systems/win32/miktex/tm/packages/next/files.csv.lzma
Binary files differ
diff --git a/systems/win32/miktex/tm/packages/next/pr.ini b/systems/win32/miktex/tm/packages/next/pr.ini
index 8dca9c2e13..75397f3299 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=1621800888
+date=1621887291
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=cef95bde2a96c9810573d27a4aea17d8
+lstdigest=26b37b75d0b224961dd5d1465e916c9d
numpkg=4101
relstate=next
-version=7813
+version=7814
;;;;This configuration file is signed by a MiKTeX maintainer. The signature follows.
;;;;-----BEGIN MIKTEX SIGNATURE-----
-;;;; signature/miktex: azwuNrJbJVY7qU0nKfiHdwUl1vE7SpmRmGU0EDtz+aDsbjSsoGHEMrGxaqG+1mgc3wf+Oo6Lzg1jZ04DGdcItab4KwO4dMjc38tptZwwxUp+zS9Px/ujqaFZ60cpZf7UC9KHBCHMt6+Fber0cCgbwN4atHQKmP9IgsgNFDeyv59ORnEY5/imxA6KdhmRQ6tHJZNFaJmpZCAarWC2e9D91FNSQXX5QUuap6P/AZWi78VO03/3MwAt4TKW0Rcfq6Mk+V7IORGHzHsDk9kr2HzGGKZkB0q69rd8WG/K9ZKoW9yjftf+ZOga4ALkFgWDiwe9IWt4DxRdxLG05Rz1K1tFFg==
+;;;; signature/miktex: DXRrOdvN68H/KJJ7Y9hW2O05Xs1unu6EXyWt2A/MQJznwi8jGsnnDimjQV5HF70dnP2O18v7zPXq8x5pceZ8JpufeLt6+r12RBGD26zM3fS5xdWlFmom5mEOcnFnwMP1lV6XBU/XOW9F98uTGw2bboVz4pkobF2vqzUsKbhaUTyMzasiDDR/klOHID/Ud+TSRNpuUvKueXy7HNDDCikGJnE2rlq0JSqrzPCydDbsVRMAmLuGEXrfOWrYYYOiSwB5mRSBYJgHHCdCkLar6sV9/xuiVfuaucRmObYdg69cus6MRtK9HrZd8l7d+PEGgdI4lpJEtrNJZEm24Czam4I4gg==
;;;;-----END MIKTEX SIGNATURE-----
diff --git a/systems/win32/miktex/tm/packages/pr.ini b/systems/win32/miktex/tm/packages/pr.ini
index f025181d40..2c9d080ff7 100644
--- a/systems/win32/miktex/tm/packages/pr.ini
+++ b/systems/win32/miktex/tm/packages/pr.ini
@@ -1,13 +1,13 @@
[repository]
-date=1621800709
+date=1621887102
lastupd=alterqcm apa7 bxjscls covington easybook hvfloat hvqrurl pgfmath-xfp pm-isomath powerdot projlib siunitx tuda-ci acrotex babel biblatex-gost bnumexpr changes circuitikz codehigh
-lstdigest=1f77dc9d84af9f11da8b0a0bfc66b534
+lstdigest=b18a6d030017db4da188ae3535c3b04a
numpkg=4101
relstate=stable
-version=7813
+version=7814
;;;;This configuration file is signed by a MiKTeX maintainer. The signature follows.
;;;;-----BEGIN MIKTEX SIGNATURE-----
-;;;; signature/miktex: KBbvWmUgj7H5bGzri8j7CRpRNiCNz1WFMYi1mKJcxHXS8QwzszmlQ0UwtUzWgAXRbTjYXndOKrkjWG830DQyY6UbnhIiIUL1hRPBwJMm62kRO0iAfTBYFioTXtKJJHMAxoIaDI1izIGes9l8IVs0CkxBe4kRYoF3bAftKHMBWajCE9GY2kNCoCorjRC94LLAUyQ9FQTTUUXIFUt1F07VXgJxsRMaUTZERbtPU4aBnx2kzU65fGGTdip2iQ9JyJ3IIFaDHXaX0IOwnFJFhZvYqsSSf9/Cd2MzQXOGAs+gdBPohCie6HINVg/3FbnYzPMi3MKOPSlgwXspgSvEm5lhQg==
+;;;; signature/miktex: wrTA4+f4dJXfE/X5ixLs7BWZdusTN2PMFl9afLqAmGRakmhY8vX4paBy7R0ME7oDvrWjna01vYhpNwSQ00Ckt0hDY5U9tx7r9eYj4HtBqlYcLTDhhAzysLo0iykDC8ZtN2cWtA2+IpykLCZZwmSxeK1xf49NobCTdYS+fPt2SJCH3FPj8xGDyACiUib9jrtiVbw3P71pos4Fbfiq8Bplr/yLzUSRHPRGa492jbN/AG8/gV91af35KB/+lxwmrQD247ftmcT9memmI8DEh7girIwglY0l1zgX4V2DYtoNwfkRt0Z3WiTjf7SuK65nSH3ybpA1sfzV4WV9m+dtpjQs4Q==
;;;;-----END MIKTEX SIGNATURE-----
diff --git a/timestamp b/timestamp
index 697fad7a93..fde1d94a2e 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:
-2021-05-24-02-02
+2021-05-25-02-02