summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2022-04-11 03:03:56 +0000
committerNorbert Preining <norbert@preining.info>2022-04-11 03:03:56 +0000
commita04c4e735928bbfb74963fc19ea3fe8b0e1b7031 (patch)
tree97798c45d48067a9ddd9bfaa365a89e0cd8ab340
parent8f8daae66ef4a8423b62e87b96cd24e19e4c1b6a (diff)
CTAN sync 202204110303
-rw-r--r--FILES.byname475
-rw-r--r--FILES.byname.gzbin2417413 -> 2417451 bytes
-rw-r--r--FILES.last07days496
-rw-r--r--graphics/pgf/contrib/tikz-ladder/README.txt12
-rw-r--r--graphics/pgf/contrib/tikz-ladder/doc/tikz-ladder-doc.pdfbin360083 -> 438265 bytes
-rw-r--r--graphics/pgf/contrib/tikz-ladder/doc/tikz-ladder-doc.tex805
-rw-r--r--graphics/pgf/contrib/tikz-ladder/tex/tikzlibrarycircuits.plc.ladder.code.tex47
-rw-r--r--macros/unicodetex/latex/polyglossia/README.md2
-rw-r--r--macros/unicodetex/latex/polyglossia/polyglossia.dtx17
-rw-r--r--macros/unicodetex/latex/polyglossia/polyglossia.pdfbin351588 -> 351644 bytes
-rw-r--r--macros/xetex/latex/xduts/README.md17
-rw-r--r--macros/xetex/latex/xduts/xduts.dtx1319
-rw-r--r--macros/xetex/latex/xduts/xduts.ins6
-rw-r--r--macros/xetex/latex/xduts/xduts.pdfbin306881 -> 316944 bytes
-rw-r--r--systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl4
-rw-r--r--systems/texlive/tlnet/tlpkg/texlive.tlpdb89
-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.xzbin2366892 -> 2366916 bytes
-rw-r--r--systems/win32/TLW64/00README.TLW6410
-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
24 files changed, 1882 insertions, 1453 deletions
diff --git a/FILES.byname b/FILES.byname
index 57c8ba3406..25c49af50b 100644
--- a/FILES.byname
+++ b/FILES.byname
@@ -5228,7 +5228,7 @@
1990/10/02 | 5440 | dviware/vutex/vaxvms.hlp
1990/10/02 | 812 | dviware/vutex/vaxvms.ins
1990/10/02 | 127576 | dviware/vutex/vutex.web
-2022/04/09 | 265053 | FILES.last07days
+2022/04/10 | 266574 | FILES.last07days
2021/07/24 | 1139410 | fonts/aboensis/Aboensis.glyphs
2021/07/24 | 18907382 | fonts/aboensis/aboensis.pdf
2021/07/24 | 137860 | fonts/aboensis/Aboensis-Regular.otf
@@ -156303,11 +156303,11 @@
2022/02/16 | 2247 | graphics/pgf/contrib/tikz-karnaugh/README.txt
2022/02/16 | 38710 | graphics/pgf/contrib/tikz-karnaugh/tex/tikzlibrarykarnaugh.code.tex
2022/02/16 | 370094 | graphics/pgf/contrib/tikz-karnaugh.zip
-2018/02/06 | 360083 | graphics/pgf/contrib/tikz-ladder/doc/tikz-ladder-doc.pdf
-2018/02/06 | 45483 | graphics/pgf/contrib/tikz-ladder/doc/tikz-ladder-doc.tex
-2018/02/06 | 1628 | graphics/pgf/contrib/tikz-ladder/README.txt
-2018/02/06 | 21477 | graphics/pgf/contrib/tikz-ladder/tex/tikzlibrarycircuits.plc.ladder.code.tex
-2018/02/06 | 257021 | graphics/pgf/contrib/tikz-ladder.zip
+2022/04/09 | 438265 | graphics/pgf/contrib/tikz-ladder/doc/tikz-ladder-doc.pdf
+2022/04/07 | 64406 | graphics/pgf/contrib/tikz-ladder/doc/tikz-ladder-doc.tex
+2022/04/09 | 1925 | graphics/pgf/contrib/tikz-ladder/README.txt
+2022/04/02 | 22190 | graphics/pgf/contrib/tikz-ladder/tex/tikzlibrarycircuits.plc.ladder.code.tex
+2022/04/10 | 314993 | graphics/pgf/contrib/tikz-ladder.zip
2020/05/25 | 1395 | graphics/pgf/contrib/tikz-lake-fig/README.md
2020/05/25 | 61521 | graphics/pgf/contrib/tikz-lake-fig/tikz-lake-fig-doc.pdf
2020/05/25 | 4801 | graphics/pgf/contrib/tikz-lake-fig/tikz-lake-fig-doc.tex
@@ -186156,7 +186156,7 @@
2013/07/02 | 153964 | install/macros/plain/contrib/plstmary.tds.zip
2008/05/18 | 22279 | install/macros/plain/plnfss.tds.zip
2022/01/15 | 1403657 | install/macros/unicodetex/latex/fontspec.tds.zip
-2022/04/09 | 1133282 | install/macros/unicodetex/latex/polyglossia.tds.zip
+2022/04/10 | 1132306 | install/macros/unicodetex/latex/polyglossia.tds.zip
2016/02/13 | 111305 | install/macros/unicodetex/latex/realscripts.tds.zip
2021/02/09 | 4924350 | install/macros/unicodetex/latex/texnegar.tds.zip
2020/01/31 | 1873940 | install/macros/unicodetex/latex/unicode-math.tds.zip
@@ -236426,7 +236426,7 @@
2022/01/10 | 22769 | macros/texinfo/latest/htmlxref.cnf
2022/04/08 | 58497 | macros/texinfo/latest/texi2dvi
2021/07/03 | 1163 | macros/texinfo/latest/texi2pdf
-2022/04/05 | 373709 | macros/texinfo/latest/texinfo.tex
+2022/04/09 | 373782 | macros/texinfo/latest/texinfo.tex
2021/02/09 | 67 | macros/texinfo/texinfo/ABOUT-NLS
2021/07/03 | 46407 | macros/texinfo/texinfo/aclocal.m4
2019/12/01 | 2201 | macros/texinfo/texinfo/AUTHORS
@@ -242183,10 +242183,10 @@
2022/04/04 | 2323852 | macros/unicodetex/latex/nwafuthesis/nwafuthesis.pdf
2022/04/04 | 1542 | macros/unicodetex/latex/nwafuthesis/README.md
2022/04/04 | 3418139 | macros/unicodetex/latex/nwafuthesis.zip
-2022/04/09 | 966076 | macros/unicodetex/latex/polyglossia/polyglossia.dtx
-2022/04/09 | 351588 | macros/unicodetex/latex/polyglossia/polyglossia.pdf
-2022/04/09 | 1942 | macros/unicodetex/latex/polyglossia/README.md
-2022/04/09 | 562047 | macros/unicodetex/latex/polyglossia.zip
+2022/04/10 | 966240 | macros/unicodetex/latex/polyglossia/polyglossia.dtx
+2022/04/10 | 351644 | macros/unicodetex/latex/polyglossia/polyglossia.pdf
+2022/04/10 | 1943 | macros/unicodetex/latex/polyglossia/README.md
+2022/04/10 | 562122 | macros/unicodetex/latex/polyglossia.zip
2021/02/02 | 89634 | macros/unicodetex/latex/quran-bn/doc/quran-bn-doc.pdf
2021/02/02 | 6514 | macros/unicodetex/latex/quran-bn/doc/quran-bn-doc.tex
2021/02/02 | 47781 | macros/unicodetex/latex/quran-bn/doc/quran-bn-test.pdf
@@ -243044,13 +243044,13 @@
2011/05/07 | 5176 | macros/xetex/latex/unisugar/unisugar.sty
2011/05/07 | 25480 | macros/xetex/latex/unisugar/unisugar.tex
2011/05/08 | 495308 | macros/xetex/latex/unisugar.zip
-2022/04/09 | 797 | macros/xetex/latex/xduts/README.md
-2022/04/09 | 77988 | macros/xetex/latex/xduts/xduts.dtx
-2022/04/09 | 953 | macros/xetex/latex/xduts/xduts.ins
-2022/04/09 | 306881 | macros/xetex/latex/xduts/xduts.pdf
-2022/04/09 | 463660 | macros/xetex/latex/xduts/xidian-logo.pdf
-2022/04/09 | 416455 | macros/xetex/latex/xduts/xidian-text.pdf
-2022/04/09 | 1198108 | macros/xetex/latex/xduts.zip
+2022/04/10 | 1650 | macros/xetex/latex/xduts/README.md
+2022/04/10 | 82392 | macros/xetex/latex/xduts/xduts.dtx
+2022/04/10 | 1021 | macros/xetex/latex/xduts/xduts.ins
+2022/04/10 | 316944 | macros/xetex/latex/xduts/xduts.pdf
+2022/04/10 | 463660 | macros/xetex/latex/xduts/xidian-logo.pdf
+2022/04/10 | 416455 | macros/xetex/latex/xduts/xidian-text.pdf
+2022/04/10 | 1209901 | macros/xetex/latex/xduts.zip
2017/08/03 | 11999 | macros/xetex/latex/xechangebar/cbtest1.tex
2017/08/03 | 338 | macros/xetex/latex/xechangebar/README
2017/08/03 | 35213 | macros/xetex/latex/xechangebar/xechangebar.sty
@@ -278847,7 +278847,7 @@
2022/04/06 | 1516 | systems/texlive/tlnet/archive/collection-pictures.r62930.tar.xz
2021/07/06 | 956 | systems/texlive/tlnet/archive/collection-plaingeneric.r59850.tar.xz
2021/12/17 | 812 | systems/texlive/tlnet/archive/collection-pstricks.r61329.tar.xz
-2022/04/06 | 1612 | systems/texlive/tlnet/archive/collection-publishers.r62917.tar.xz
+2022/04/10 | 1616 | systems/texlive/tlnet/archive/collection-publishers.r62987.tar.xz
2020/03/04 | 340 | systems/texlive/tlnet/archive/collection-texworks.r54074.tar.xz
2020/03/04 | 388 | systems/texlive/tlnet/archive/collection-wintools.r54074.tar.xz
2022/02/28 | 648 | systems/texlive/tlnet/archive/collection-xetex.r62240.tar.xz
@@ -280339,12 +280339,12 @@
2019/02/28 | 1845796 | systems/texlive/tlnet/archive/eledmac.doc.r45418.tar.xz
2019/02/28 | 39444 | systems/texlive/tlnet/archive/eledmac.r45418.tar.xz
2019/02/28 | 164628 | systems/texlive/tlnet/archive/eledmac.source.r45418.tar.xz
-2021/05/03 | 1913340 | systems/texlive/tlnet/archive/elegantbook.doc.r59053.tar.xz
-2021/05/03 | 9892 | systems/texlive/tlnet/archive/elegantbook.r59053.tar.xz
-2020/04/16 | 1210344 | systems/texlive/tlnet/archive/elegantnote.doc.r54758.tar.xz
-2020/04/16 | 4652 | systems/texlive/tlnet/archive/elegantnote.r54758.tar.xz
-2020/04/16 | 876036 | systems/texlive/tlnet/archive/elegantpaper.doc.r54758.tar.xz
-2020/04/16 | 3948 | systems/texlive/tlnet/archive/elegantpaper.r54758.tar.xz
+2022/04/10 | 1307000 | systems/texlive/tlnet/archive/elegantbook.doc.r62989.tar.xz
+2022/04/10 | 10776 | systems/texlive/tlnet/archive/elegantbook.r62989.tar.xz
+2022/04/10 | 883488 | systems/texlive/tlnet/archive/elegantnote.doc.r62989.tar.xz
+2022/04/10 | 4880 | systems/texlive/tlnet/archive/elegantnote.r62989.tar.xz
+2022/04/10 | 558440 | systems/texlive/tlnet/archive/elegantpaper.doc.r62989.tar.xz
+2022/04/10 | 4104 | systems/texlive/tlnet/archive/elegantpaper.r62989.tar.xz
2022/01/30 | 413276 | systems/texlive/tlnet/archive/elements.doc.r61792.tar.xz
2022/01/30 | 8868 | systems/texlive/tlnet/archive/elements.r61792.tar.xz
2019/02/28 | 418676 | systems/texlive/tlnet/archive/ellipse.doc.r39025.tar.xz
@@ -285904,9 +285904,9 @@
2021/08/26 | 30572 | systems/texlive/tlnet/archive/polski.source.r60322.tar.xz
2019/02/28 | 1392136 | systems/texlive/tlnet/archive/poltawski.doc.r20075.tar.xz
2019/02/28 | 6817756 | systems/texlive/tlnet/archive/poltawski.r20075.tar.xz
-2022/04/06 | 649796 | systems/texlive/tlnet/archive/polyglossia.doc.r62940.tar.xz
-2022/04/06 | 118592 | systems/texlive/tlnet/archive/polyglossia.r62940.tar.xz
-2022/04/06 | 156628 | systems/texlive/tlnet/archive/polyglossia.source.r62940.tar.xz
+2022/04/10 | 654272 | systems/texlive/tlnet/archive/polyglossia.doc.r62988.tar.xz
+2022/04/10 | 119060 | systems/texlive/tlnet/archive/polyglossia.r62988.tar.xz
+2022/04/10 | 157312 | systems/texlive/tlnet/archive/polyglossia.source.r62988.tar.xz
2019/02/28 | 400020 | systems/texlive/tlnet/archive/polynom.doc.r44832.tar.xz
2019/02/28 | 134132 | systems/texlive/tlnet/archive/polynomial.doc.r15878.tar.xz
2019/02/28 | 2404 | systems/texlive/tlnet/archive/polynomial.r15878.tar.xz
@@ -288065,7 +288065,7 @@
2020/05/17 | 592 | systems/texlive/tlnet/archive/texlive-scripts.amd64-freebsd.r55172.tar.xz
2020/05/17 | 588 | systems/texlive/tlnet/archive/texlive-scripts.amd64-netbsd.r55172.tar.xz
2020/05/17 | 592 | systems/texlive/tlnet/archive/texlive-scripts.armhf-linux.r55172.tar.xz
-2022/04/09 | 406060 | systems/texlive/tlnet/archive/texlive-scripts.doc.r62979.tar.xz
+2022/04/10 | 406060 | systems/texlive/tlnet/archive/texlive-scripts.doc.r62984.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
@@ -288089,7 +288089,7 @@
2020/05/17 | 588 | systems/texlive/tlnet/archive/texlive-scripts.i386-linux.r55172.tar.xz
2020/05/17 | 592 | systems/texlive/tlnet/archive/texlive-scripts.i386-netbsd.r55172.tar.xz
2020/05/17 | 588 | systems/texlive/tlnet/archive/texlive-scripts.i386-solaris.r55172.tar.xz
-2022/04/09 | 109808 | systems/texlive/tlnet/archive/texlive-scripts.r62979.tar.xz
+2022/04/10 | 109800 | systems/texlive/tlnet/archive/texlive-scripts.r62984.tar.xz
2021/02/25 | 572 | systems/texlive/tlnet/archive/texlive-scripts.universal-darwin.r57908.tar.xz
2022/02/27 | 36292 | systems/texlive/tlnet/archive/texlive-scripts.win32.r62199.tar.xz
2020/05/17 | 588 | systems/texlive/tlnet/archive/texlive-scripts.x86_64-cygwin.r55172.tar.xz
@@ -289477,6 +289477,9 @@
2019/02/28 | 693300 | systems/texlive/tlnet/archive/xduthesis.doc.r39694.tar.xz
2019/02/28 | 113404 | systems/texlive/tlnet/archive/xduthesis.r39694.tar.xz
2019/02/28 | 15976 | systems/texlive/tlnet/archive/xduthesis.source.r39694.tar.xz
+2022/04/10 | 806808 | systems/texlive/tlnet/archive/xduts.doc.r62987.tar.xz
+2022/04/10 | 6560 | systems/texlive/tlnet/archive/xduts.r62987.tar.xz
+2022/04/10 | 16032 | systems/texlive/tlnet/archive/xduts.source.r62987.tar.xz
2022/03/01 | 527308 | systems/texlive/tlnet/archive/xdvi.aarch64-linux.r62280.tar.xz
2022/02/27 | 566196 | systems/texlive/tlnet/archive/xdvi.amd64-freebsd.r62206.tar.xz
2022/02/27 | 488448 | systems/texlive/tlnet/archive/xdvi.amd64-netbsd.r62220.tar.xz
@@ -289893,16 +289896,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
2022/03/16 | 108660 | systems/texlive/tlnet/install-tl
-2022/04/09 | 5797343 | systems/texlive/tlnet/install-tl-unx.tar.gz
-2022/04/09 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
-2022/04/09 | 455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
+2022/04/10 | 5797165 | systems/texlive/tlnet/install-tl-unx.tar.gz
+2022/04/10 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
+2022/04/10 | 455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
2021/04/11 | 4945 | systems/texlive/tlnet/install-tl-windows.bat
-2022/04/09 | 20459953 | systems/texlive/tlnet/install-tl-windows.exe
-2022/04/09 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
-2022/04/09 | 455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
-2022/04/09 | 25481230 | systems/texlive/tlnet/install-tl.zip
-2022/04/09 | 145 | systems/texlive/tlnet/install-tl.zip.sha512
-2022/04/09 | 455 | systems/texlive/tlnet/install-tl.zip.sha512.asc
+2022/04/10 | 20461937 | systems/texlive/tlnet/install-tl-windows.exe
+2022/04/10 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
+2022/04/10 | 455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
+2022/04/10 | 25481233 | systems/texlive/tlnet/install-tl.zip
+2022/04/10 | 145 | systems/texlive/tlnet/install-tl.zip.sha512
+2022/04/10 | 455 | systems/texlive/tlnet/install-tl.zip.sha512.asc
2022/04/03 | 1229 | systems/texlive/tlnet/README.md
2022/04/03 | 0 | systems/texlive/tlnet/TEXLIVE_2022
2022/02/28 | 7791 | systems/texlive/tlnet/tlpkg/gpg/pubring.gpg
@@ -289912,7 +289915,7 @@
2022/02/28 | 1280 | systems/texlive/tlnet/tlpkg/gpg/trustdb.gpg
2022/01/12 | 49482 | systems/texlive/tlnet/tlpkg/installer/config.guess
2010/11/11 | 11651 | systems/texlive/tlnet/tlpkg/installer/COPYING.MinGW-runtime.txt
-2022/04/08 | 7212 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
+2022/04/09 | 7219 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
2022/04/05 | 211170 | 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
@@ -289954,12 +289957,12 @@
2021/05/16 | 20371 | systems/texlive/tlnet/tlpkg/TeXLive/TLCrypto.pm
2021/12/21 | 5429 | systems/texlive/tlnet/tlpkg/TeXLive/TLDownload.pm
2021/12/21 | 27582 | systems/texlive/tlnet/tlpkg/TeXLive/TLPaper.pm
-2022/04/09 | 17258328 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
-2022/04/09 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
+2022/04/10 | 17259820 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
+2022/04/10 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
2021/12/21 | 86654 | systems/texlive/tlnet/tlpkg/TeXLive/TLPDB.pm
-2022/04/09 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
-2022/04/09 | 455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
-2022/04/09 | 2365564 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
+2022/04/10 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
+2022/04/10 | 455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
+2022/04/10 | 2366892 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
2021/12/21 | 58848 | systems/texlive/tlnet/tlpkg/TeXLive/TLPOBJ.pm
2021/12/21 | 42112 | systems/texlive/tlnet/tlpkg/TeXLive/TLPSRC.pm
2021/12/21 | 16130 | systems/texlive/tlnet/tlpkg/TeXLive/TLTREE.pm
@@ -295141,7 +295144,7 @@
2020/10/03 | 318630 | systems/win32/miktex/tm/packages/filehook.tar.lzma
2012/12/04 | 924573 | systems/win32/miktex/tm/packages/fileinfo.tar.lzma
2011/09/21 | 281409 | systems/win32/miktex/tm/packages/filemod.tar.lzma
-2022/04/09 | 644704 | systems/win32/miktex/tm/packages/files.csv.lzma
+2022/04/10 | 644704 | 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
@@ -296724,9 +296727,9 @@
2018/01/12 | 157226 | systems/win32/miktex/tm/packages/miktex-zip-bin-x64.tar.lzma
2022/03/12 | 39680 | systems/win32/miktex/tm/packages/miktex-zlib-bin-2.9.tar.lzma
2022/03/29 | 43240 | systems/win32/miktex/tm/packages/miktex-zlib-bin-x64-2.9.tar.lzma
-2022/04/09 | 274283 | systems/win32/miktex/tm/packages/miktex-zzdb1-2.9.tar.lzma
-2022/04/09 | 1439880 | systems/win32/miktex/tm/packages/miktex-zzdb2-2.9.tar.lzma
-2022/04/09 | 1329408 | systems/win32/miktex/tm/packages/miktex-zzdb3-2.9.tar.lzma
+2022/04/10 | 274272 | systems/win32/miktex/tm/packages/miktex-zzdb1-2.9.tar.lzma
+2022/04/10 | 1440347 | systems/win32/miktex/tm/packages/miktex-zzdb2-2.9.tar.lzma
+2022/04/10 | 1329582 | systems/win32/miktex/tm/packages/miktex-zzdb3-2.9.tar.lzma
2022/03/12 | 13516 | systems/win32/miktex/tm/packages/miktex-zzip-bin-2.9.tar.lzma
2022/03/29 | 14391 | 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
@@ -296950,191 +296953,191 @@
2018/04/09 | 400132 | systems/win32/miktex/tm/packages/newunicodechar.tar.lzma
2011/09/19 | 101312 | systems/win32/miktex/tm/packages/newvbtm.tar.lzma
2021/03/17 | 232249 | systems/win32/miktex/tm/packages/newverbs.tar.lzma
-2022/04/09 | 644630 | systems/win32/miktex/tm/packages/next/files.csv.lzma
-2022/04/09 | 51558 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-2.9.tar.lzma
-2022/04/09 | 57329 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-x64-2.9.tar.lzma
-2022/04/09 | 1021846 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-2.9.tar.lzma
-2022/04/09 | 1156464 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-x64-2.9.tar.lzma
-2022/04/09 | 28797 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-2.9.tar.lzma
-2022/04/09 | 31520 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-x64-2.9.tar.lzma
-2022/04/09 | 30147 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-2.9.tar.lzma
-2022/04/09 | 35242 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-x64-2.9.tar.lzma
-2022/04/09 | 56618 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-2.9.tar.lzma
-2022/04/09 | 65055 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-x64-2.9.tar.lzma
-2022/04/09 | 86759 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-2.9.tar.lzma
-2022/04/09 | 95286 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-x64-2.9.tar.lzma
-2022/04/09 | 68873 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-2.9.tar.lzma
-2022/04/09 | 77069 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-x64-2.9.tar.lzma
-2022/04/09 | 27249 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-2.9.tar.lzma
-2022/04/09 | 31343 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-x64-2.9.tar.lzma
-2022/04/09 | 332414 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-2.9.tar.lzma
-2022/04/09 | 394370 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-x64-2.9.tar.lzma
-2022/04/09 | 32955 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-2.9.tar.lzma
-2022/04/09 | 37081 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-x64-2.9.tar.lzma
-2022/04/09 | 51486 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-2.9.tar.lzma
-2022/04/09 | 57270 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-x64-2.9.tar.lzma
-2022/04/09 | 244964 | systems/win32/miktex/tm/packages/next/miktex-console-bin-2.9.tar.lzma
-2022/04/09 | 270299 | systems/win32/miktex/tm/packages/next/miktex-console-bin-x64-2.9.tar.lzma
-2022/04/09 | 179879 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-2.9.tar.lzma
-2022/04/09 | 196117 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-x64-2.9.tar.lzma
-2022/04/09 | 92918 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-2.9.tar.lzma
-2022/04/09 | 103093 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-x64-2.9.tar.lzma
-2022/04/09 | 21313 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-2.9.tar.lzma
-2022/04/09 | 24121 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-x64-2.9.tar.lzma
-2022/04/09 | 481497 | systems/win32/miktex/tm/packages/next/miktex-doc.tar.lzma
-2022/04/09 | 46067 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-2.9.tar.lzma
-2022/04/09 | 52093 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-x64-2.9.tar.lzma
-2022/04/09 | 285714 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-2.9.tar.lzma
-2022/04/09 | 326661 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-x64-2.9.tar.lzma
-2022/04/09 | 41306 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-2.9.tar.lzma
-2022/04/09 | 45823 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-x64-2.9.tar.lzma
-2022/04/09 | 120618 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-2.9.tar.lzma
-2022/04/09 | 135375 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-x64-2.9.tar.lzma
-2022/04/09 | 1302487 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-2.9.tar.lzma
-2022/04/09 | 1454761 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-x64-2.9.tar.lzma
-2022/04/09 | 99817 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-2.9.tar.lzma
-2022/04/09 | 113052 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-x64-2.9.tar.lzma
-2022/04/09 | 43646 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-2.9.tar.lzma
-2022/04/09 | 48824 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-x64-2.9.tar.lzma
-2022/04/09 | 25105 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-2.9.tar.lzma
-2022/04/09 | 28569 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-x64-2.9.tar.lzma
-2022/04/09 | 56993 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-2.9.tar.lzma
-2022/04/09 | 63311 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-x64-2.9.tar.lzma
-2022/04/09 | 135950 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-2.9.tar.lzma
-2022/04/09 | 155497 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-x64-2.9.tar.lzma
-2022/04/09 | 73478 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-2.9.tar.lzma
-2022/04/09 | 78976 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-x64-2.9.tar.lzma
-2022/04/09 | 72015 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-2.9.tar.lzma
-2022/04/09 | 81461 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-x64-2.9.tar.lzma
-2022/04/09 | 259256 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-2.9.tar.lzma
-2022/04/09 | 296040 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-x64-2.9.tar.lzma
-2022/04/09 | 22146 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-2.9.tar.lzma
-2022/04/09 | 25059 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-x64-2.9.tar.lzma
-2022/04/09 | 97200 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-2.9.tar.lzma
-2022/04/09 | 112587 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-x64-2.9.tar.lzma
-2022/04/09 | 64543 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-2.9.tar.lzma
-2022/04/09 | 73147 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-x64-2.9.tar.lzma
-2022/04/09 | 96633 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-2.9.tar.lzma
-2022/04/09 | 115656 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-x64-2.9.tar.lzma
-2022/04/09 | 38426 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-2.9.tar.lzma
-2022/04/09 | 43824 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-x64-2.9.tar.lzma
-2022/04/09 | 484370 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-2.9.tar.lzma
-2022/04/09 | 565930 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-x64-2.9.tar.lzma
-2022/04/09 | 203838 | systems/win32/miktex/tm/packages/next/miktex-hitex-bin.tar.lzma
-2022/04/09 | 247334 | systems/win32/miktex/tm/packages/next/miktex-hitex-bin-x64.tar.lzma
-2022/04/09 | 152031 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-2.9.tar.lzma
-2022/04/09 | 168821 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-x64-2.9.tar.lzma
-2022/04/09 | 95433 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-2.9.tar.lzma
-2022/04/09 | 109479 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-x64-2.9.tar.lzma
-2022/04/09 | 16502 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-2.9.tar.lzma
-2022/04/09 | 18368 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-x64-2.9.tar.lzma
-2022/04/09 | 28422 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-2.9.tar.lzma
-2022/04/09 | 30542 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-x64-2.9.tar.lzma
-2022/04/09 | 631278 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-2.9.tar.lzma
-2022/04/09 | 681941 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-x64-2.9.tar.lzma
-2022/04/09 | 532455 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-2.9.tar.lzma
-2022/04/09 | 598230 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-x64-2.9.tar.lzma
-2022/04/09 | 477846 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-2.9.tar.lzma
-2022/04/09 | 528017 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-x64-2.9.tar.lzma
-2022/04/09 | 93959 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-2.9.tar.lzma
-2022/04/09 | 103337 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-x64-2.9.tar.lzma
-2022/04/09 | 1752147 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-2.9.tar.lzma
-2022/04/09 | 1982083 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-x64-2.9.tar.lzma
-2022/04/09 | 68009 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-2.9.tar.lzma
-2022/04/09 | 74068 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-x64-2.9.tar.lzma
-2022/04/09 | 27591 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-2.9.tar.lzma
-2022/04/09 | 32134 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-x64-2.9.tar.lzma
-2022/04/09 | 7753 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-2.9.tar.lzma
-2022/04/09 | 8784 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-x64-2.9.tar.lzma
-2022/04/09 | 190505 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-2.9.tar.lzma
-2022/04/09 | 208808 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-x64-2.9.tar.lzma
-2022/04/09 | 251129 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-2.9.tar.lzma
-2022/04/09 | 286412 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-x64-2.9.tar.lzma
-2022/04/09 | 99257 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-2.9.tar.lzma
-2022/04/09 | 104556 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-x64-2.9.tar.lzma
-2022/04/09 | 126536 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-2.9.tar.lzma
-2022/04/09 | 139102 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-x64-2.9.tar.lzma
-2022/04/09 | 288201 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-2.9.tar.lzma
-2022/04/09 | 325269 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-x64-2.9.tar.lzma
-2022/04/09 | 199831 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-2.9.tar.lzma
-2022/04/09 | 181515 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-x64-2.9.tar.lzma
-2022/04/09 | 49770 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-2.9.tar.lzma
-2022/04/09 | 55567 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-x64-2.9.tar.lzma
-2022/04/09 | 31414 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-2.9.tar.lzma
-2022/04/09 | 35168 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-x64-2.9.tar.lzma
-2022/04/09 | 38560 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-2.9.tar.lzma
-2022/04/09 | 43917 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-x64-2.9.tar.lzma
-2022/04/09 | 43361 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-2.9.tar.lzma
-2022/04/09 | 47923 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-x64-2.9.tar.lzma
-2022/04/09 | 45742 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-2.9.tar.lzma
-2022/04/09 | 52327 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-x64-2.9.tar.lzma
-2022/04/09 | 197035 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-2.9.tar.lzma
-2022/04/09 | 213277 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-x64-2.9.tar.lzma
-2022/04/09 | 36049 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin.tar.lzma
-2022/04/09 | 41181 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin-x64.tar.lzma
-2022/04/09 | 755743 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-2.9.tar.lzma
-2022/04/09 | 824370 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-x64-2.9.tar.lzma
-2022/04/09 | 200396 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-2.9.tar.lzma
-2022/04/09 | 202835 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-x64-2.9.tar.lzma
-2022/04/09 | 210274 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-2.9.tar.lzma
-2022/04/09 | 245095 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-x64-2.9.tar.lzma
-2022/04/09 | 79024 | systems/win32/miktex/tm/packages/next/miktex-png-bin-2.9.tar.lzma
-2022/04/09 | 88150 | systems/win32/miktex/tm/packages/next/miktex-png-bin-x64-2.9.tar.lzma
-2022/04/09 | 1181125 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-2.9.tar.lzma
-2022/04/09 | 1322740 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-x64-2.9.tar.lzma
-2022/04/09 | 20184 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-2.9.tar.lzma
-2022/04/09 | 23945 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-x64-2.9.tar.lzma
-2022/04/09 | 31588 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-2.9.tar.lzma
-2022/04/09 | 37375 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-x64-2.9.tar.lzma
-2022/04/09 | 64710 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-2.9.tar.lzma
-2022/04/09 | 72886 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-x64-2.9.tar.lzma
-2022/04/09 | 50800 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-2.9.tar.lzma
-2022/04/09 | 58664 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-x64-2.9.tar.lzma
-2022/04/09 | 693066 | systems/win32/miktex/tm/packages/next/miktex-ptex-bin.tar.lzma
-2022/04/09 | 758955 | systems/win32/miktex/tm/packages/next/miktex-ptex-bin-x64.tar.lzma
-2022/04/09 | 1357072 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-2.9.tar.lzma
-2022/04/09 | 1501239 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-x64-2.9.tar.lzma
-2022/04/09 | 42818 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-2.9.tar.lzma
-2022/04/09 | 52479 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-x64-2.9.tar.lzma
-2022/04/09 | 57618 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin.tar.lzma
-2022/04/09 | 63740 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-x64.tar.lzma
-2022/04/09 | 25550 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-2.9.tar.lzma
-2022/04/09 | 27637 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-x64-2.9.tar.lzma
-2022/04/09 | 16560 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-2.9.tar.lzma
-2022/04/09 | 18492 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-x64-2.9.tar.lzma
-2022/04/09 | 64487 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-2.9.tar.lzma
-2022/04/09 | 71008 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-x64-2.9.tar.lzma
-2022/04/09 | 156964 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-2.9.tar.lzma
-2022/04/09 | 173007 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-x64-2.9.tar.lzma
-2022/04/09 | 58665 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-2.9.tar.lzma
-2022/04/09 | 67253 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-x64-2.9.tar.lzma
-2022/04/09 | 100486 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-2.9.tar.lzma
-2022/04/09 | 107706 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-x64-2.9.tar.lzma
-2022/04/09 | 2694876 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-2.9.tar.lzma
-2022/04/09 | 2820688 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-x64-2.9.tar.lzma
-2022/04/09 | 55286 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-2.9.tar.lzma
-2022/04/09 | 62382 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-x64-2.9.tar.lzma
-2022/04/09 | 37117 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin.tar.lzma
-2022/04/09 | 41204 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin-x64.tar.lzma
-2022/04/09 | 28689 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-2.9.tar.lzma
-2022/04/09 | 34051 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-x64-2.9.tar.lzma
-2022/04/09 | 67705 | systems/win32/miktex/tm/packages/next/miktex-web-bin-2.9.tar.lzma
-2022/04/09 | 73529 | systems/win32/miktex/tm/packages/next/miktex-web-bin-x64-2.9.tar.lzma
-2022/04/09 | 316242 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-2.9.tar.lzma
-2022/04/09 | 351697 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-x64-2.9.tar.lzma
-2022/04/09 | 55757 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin.tar.lzma
-2022/04/09 | 57526 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin-x64.tar.lzma
-2022/04/09 | 591568 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-2.9.tar.lzma
-2022/04/09 | 629430 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-x64-2.9.tar.lzma
-2022/04/09 | 39727 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-2.9.tar.lzma
-2022/04/09 | 43226 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-x64-2.9.tar.lzma
-2022/04/09 | 274294 | systems/win32/miktex/tm/packages/next/miktex-zzdb1-2.9.tar.lzma
-2022/04/09 | 1440209 | systems/win32/miktex/tm/packages/next/miktex-zzdb2-2.9.tar.lzma
-2022/04/09 | 1329031 | systems/win32/miktex/tm/packages/next/miktex-zzdb3-2.9.tar.lzma
-2022/04/09 | 13514 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-2.9.tar.lzma
-2022/04/09 | 14411 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-x64-2.9.tar.lzma
+2022/04/10 | 644630 | systems/win32/miktex/tm/packages/next/files.csv.lzma
+2022/04/10 | 51558 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-2.9.tar.lzma
+2022/04/10 | 57330 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-x64-2.9.tar.lzma
+2022/04/10 | 1021847 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-2.9.tar.lzma
+2022/04/10 | 1156463 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-x64-2.9.tar.lzma
+2022/04/10 | 28797 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-2.9.tar.lzma
+2022/04/10 | 31520 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-x64-2.9.tar.lzma
+2022/04/10 | 30146 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-2.9.tar.lzma
+2022/04/10 | 35241 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-x64-2.9.tar.lzma
+2022/04/10 | 56618 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-2.9.tar.lzma
+2022/04/10 | 65056 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-x64-2.9.tar.lzma
+2022/04/10 | 86759 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-2.9.tar.lzma
+2022/04/10 | 95286 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-x64-2.9.tar.lzma
+2022/04/10 | 68872 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-2.9.tar.lzma
+2022/04/10 | 77067 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-x64-2.9.tar.lzma
+2022/04/10 | 27248 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-2.9.tar.lzma
+2022/04/10 | 31343 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-x64-2.9.tar.lzma
+2022/04/10 | 332413 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-2.9.tar.lzma
+2022/04/10 | 394369 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-x64-2.9.tar.lzma
+2022/04/10 | 32956 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-2.9.tar.lzma
+2022/04/10 | 37081 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-x64-2.9.tar.lzma
+2022/04/10 | 51486 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-2.9.tar.lzma
+2022/04/10 | 57271 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-x64-2.9.tar.lzma
+2022/04/10 | 244961 | systems/win32/miktex/tm/packages/next/miktex-console-bin-2.9.tar.lzma
+2022/04/10 | 270299 | systems/win32/miktex/tm/packages/next/miktex-console-bin-x64-2.9.tar.lzma
+2022/04/10 | 179877 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-2.9.tar.lzma
+2022/04/10 | 196117 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-x64-2.9.tar.lzma
+2022/04/10 | 92916 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-2.9.tar.lzma
+2022/04/10 | 103092 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-x64-2.9.tar.lzma
+2022/04/10 | 21314 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-2.9.tar.lzma
+2022/04/10 | 24120 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-x64-2.9.tar.lzma
+2022/04/10 | 481497 | systems/win32/miktex/tm/packages/next/miktex-doc.tar.lzma
+2022/04/10 | 46066 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-2.9.tar.lzma
+2022/04/10 | 52092 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-x64-2.9.tar.lzma
+2022/04/10 | 285715 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-2.9.tar.lzma
+2022/04/10 | 326660 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-x64-2.9.tar.lzma
+2022/04/10 | 41305 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-2.9.tar.lzma
+2022/04/10 | 45823 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-x64-2.9.tar.lzma
+2022/04/10 | 120617 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-2.9.tar.lzma
+2022/04/10 | 135377 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-x64-2.9.tar.lzma
+2022/04/10 | 1302485 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-2.9.tar.lzma
+2022/04/10 | 1454763 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-x64-2.9.tar.lzma
+2022/04/10 | 99816 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-2.9.tar.lzma
+2022/04/10 | 113052 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-x64-2.9.tar.lzma
+2022/04/10 | 43644 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-2.9.tar.lzma
+2022/04/10 | 48825 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-x64-2.9.tar.lzma
+2022/04/10 | 25106 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-2.9.tar.lzma
+2022/04/10 | 28569 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-x64-2.9.tar.lzma
+2022/04/10 | 56993 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-2.9.tar.lzma
+2022/04/10 | 63310 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-x64-2.9.tar.lzma
+2022/04/10 | 135949 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-2.9.tar.lzma
+2022/04/10 | 155496 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-x64-2.9.tar.lzma
+2022/04/10 | 73476 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-2.9.tar.lzma
+2022/04/10 | 78975 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-x64-2.9.tar.lzma
+2022/04/10 | 72014 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-2.9.tar.lzma
+2022/04/10 | 81462 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-x64-2.9.tar.lzma
+2022/04/10 | 259257 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-2.9.tar.lzma
+2022/04/10 | 296039 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-x64-2.9.tar.lzma
+2022/04/10 | 22147 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-2.9.tar.lzma
+2022/04/10 | 25059 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-x64-2.9.tar.lzma
+2022/04/10 | 97200 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-2.9.tar.lzma
+2022/04/10 | 112590 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-x64-2.9.tar.lzma
+2022/04/10 | 64542 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-2.9.tar.lzma
+2022/04/10 | 73148 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-x64-2.9.tar.lzma
+2022/04/10 | 96632 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-2.9.tar.lzma
+2022/04/10 | 115657 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-x64-2.9.tar.lzma
+2022/04/10 | 38425 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-2.9.tar.lzma
+2022/04/10 | 43825 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-x64-2.9.tar.lzma
+2022/04/10 | 484371 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-2.9.tar.lzma
+2022/04/10 | 565928 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-x64-2.9.tar.lzma
+2022/04/10 | 203837 | systems/win32/miktex/tm/packages/next/miktex-hitex-bin.tar.lzma
+2022/04/10 | 247333 | systems/win32/miktex/tm/packages/next/miktex-hitex-bin-x64.tar.lzma
+2022/04/10 | 152031 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-2.9.tar.lzma
+2022/04/10 | 168821 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-x64-2.9.tar.lzma
+2022/04/10 | 95433 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-2.9.tar.lzma
+2022/04/10 | 109480 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-x64-2.9.tar.lzma
+2022/04/10 | 16503 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-2.9.tar.lzma
+2022/04/10 | 18367 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-x64-2.9.tar.lzma
+2022/04/10 | 28423 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-2.9.tar.lzma
+2022/04/10 | 30542 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-x64-2.9.tar.lzma
+2022/04/10 | 631280 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-2.9.tar.lzma
+2022/04/10 | 681941 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-x64-2.9.tar.lzma
+2022/04/10 | 532455 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-2.9.tar.lzma
+2022/04/10 | 598230 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-x64-2.9.tar.lzma
+2022/04/10 | 477846 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-2.9.tar.lzma
+2022/04/10 | 528012 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-x64-2.9.tar.lzma
+2022/04/10 | 93959 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-2.9.tar.lzma
+2022/04/10 | 103336 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-x64-2.9.tar.lzma
+2022/04/10 | 1752146 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-2.9.tar.lzma
+2022/04/10 | 1982085 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-x64-2.9.tar.lzma
+2022/04/10 | 68009 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-2.9.tar.lzma
+2022/04/10 | 74070 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-x64-2.9.tar.lzma
+2022/04/10 | 27591 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-2.9.tar.lzma
+2022/04/10 | 32134 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-x64-2.9.tar.lzma
+2022/04/10 | 7753 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-2.9.tar.lzma
+2022/04/10 | 8784 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-x64-2.9.tar.lzma
+2022/04/10 | 190505 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-2.9.tar.lzma
+2022/04/10 | 208808 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-x64-2.9.tar.lzma
+2022/04/10 | 251125 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-2.9.tar.lzma
+2022/04/10 | 286412 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-x64-2.9.tar.lzma
+2022/04/10 | 99258 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-2.9.tar.lzma
+2022/04/10 | 104556 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-x64-2.9.tar.lzma
+2022/04/10 | 126532 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-2.9.tar.lzma
+2022/04/10 | 139102 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-x64-2.9.tar.lzma
+2022/04/10 | 288200 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-2.9.tar.lzma
+2022/04/10 | 325269 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-x64-2.9.tar.lzma
+2022/04/10 | 199832 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-2.9.tar.lzma
+2022/04/10 | 181515 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-x64-2.9.tar.lzma
+2022/04/10 | 49768 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-2.9.tar.lzma
+2022/04/10 | 55568 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-x64-2.9.tar.lzma
+2022/04/10 | 31413 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-2.9.tar.lzma
+2022/04/10 | 35168 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-x64-2.9.tar.lzma
+2022/04/10 | 38560 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-2.9.tar.lzma
+2022/04/10 | 43916 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-x64-2.9.tar.lzma
+2022/04/10 | 43362 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-2.9.tar.lzma
+2022/04/10 | 47922 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-x64-2.9.tar.lzma
+2022/04/10 | 45742 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-2.9.tar.lzma
+2022/04/10 | 52327 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-x64-2.9.tar.lzma
+2022/04/10 | 197036 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-2.9.tar.lzma
+2022/04/10 | 213280 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-x64-2.9.tar.lzma
+2022/04/10 | 36049 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin.tar.lzma
+2022/04/10 | 41182 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin-x64.tar.lzma
+2022/04/10 | 755742 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-2.9.tar.lzma
+2022/04/10 | 824371 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-x64-2.9.tar.lzma
+2022/04/10 | 200398 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-2.9.tar.lzma
+2022/04/10 | 202836 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-x64-2.9.tar.lzma
+2022/04/10 | 210275 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-2.9.tar.lzma
+2022/04/10 | 245097 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-x64-2.9.tar.lzma
+2022/04/10 | 79025 | systems/win32/miktex/tm/packages/next/miktex-png-bin-2.9.tar.lzma
+2022/04/10 | 88152 | systems/win32/miktex/tm/packages/next/miktex-png-bin-x64-2.9.tar.lzma
+2022/04/10 | 1181127 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-2.9.tar.lzma
+2022/04/10 | 1322742 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-x64-2.9.tar.lzma
+2022/04/10 | 20184 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-2.9.tar.lzma
+2022/04/10 | 23944 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-x64-2.9.tar.lzma
+2022/04/10 | 31588 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-2.9.tar.lzma
+2022/04/10 | 37375 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-x64-2.9.tar.lzma
+2022/04/10 | 64710 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-2.9.tar.lzma
+2022/04/10 | 72886 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-x64-2.9.tar.lzma
+2022/04/10 | 50800 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-2.9.tar.lzma
+2022/04/10 | 58664 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-x64-2.9.tar.lzma
+2022/04/10 | 693067 | systems/win32/miktex/tm/packages/next/miktex-ptex-bin.tar.lzma
+2022/04/10 | 758952 | systems/win32/miktex/tm/packages/next/miktex-ptex-bin-x64.tar.lzma
+2022/04/10 | 1357072 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-2.9.tar.lzma
+2022/04/10 | 1501236 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-x64-2.9.tar.lzma
+2022/04/10 | 42817 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-2.9.tar.lzma
+2022/04/10 | 52479 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-x64-2.9.tar.lzma
+2022/04/10 | 57616 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin.tar.lzma
+2022/04/10 | 63739 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-x64.tar.lzma
+2022/04/10 | 25551 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-2.9.tar.lzma
+2022/04/10 | 27635 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-x64-2.9.tar.lzma
+2022/04/10 | 16558 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-2.9.tar.lzma
+2022/04/10 | 18491 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-x64-2.9.tar.lzma
+2022/04/10 | 64487 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-2.9.tar.lzma
+2022/04/10 | 71006 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-x64-2.9.tar.lzma
+2022/04/10 | 156963 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-2.9.tar.lzma
+2022/04/10 | 173006 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-x64-2.9.tar.lzma
+2022/04/10 | 58665 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-2.9.tar.lzma
+2022/04/10 | 67253 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-x64-2.9.tar.lzma
+2022/04/10 | 100487 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-2.9.tar.lzma
+2022/04/10 | 107705 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-x64-2.9.tar.lzma
+2022/04/10 | 2694875 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-2.9.tar.lzma
+2022/04/10 | 2820687 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-x64-2.9.tar.lzma
+2022/04/10 | 55285 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-2.9.tar.lzma
+2022/04/10 | 62380 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-x64-2.9.tar.lzma
+2022/04/10 | 37117 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin.tar.lzma
+2022/04/10 | 41204 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin-x64.tar.lzma
+2022/04/10 | 28690 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-2.9.tar.lzma
+2022/04/10 | 34052 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-x64-2.9.tar.lzma
+2022/04/10 | 67706 | systems/win32/miktex/tm/packages/next/miktex-web-bin-2.9.tar.lzma
+2022/04/10 | 73530 | systems/win32/miktex/tm/packages/next/miktex-web-bin-x64-2.9.tar.lzma
+2022/04/10 | 316241 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-2.9.tar.lzma
+2022/04/10 | 351696 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-x64-2.9.tar.lzma
+2022/04/10 | 55755 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin.tar.lzma
+2022/04/10 | 57526 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin-x64.tar.lzma
+2022/04/10 | 591569 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-2.9.tar.lzma
+2022/04/10 | 629430 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-x64-2.9.tar.lzma
+2022/04/10 | 39728 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-2.9.tar.lzma
+2022/04/10 | 43226 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-x64-2.9.tar.lzma
+2022/04/10 | 274308 | systems/win32/miktex/tm/packages/next/miktex-zzdb1-2.9.tar.lzma
+2022/04/10 | 1440312 | systems/win32/miktex/tm/packages/next/miktex-zzdb2-2.9.tar.lzma
+2022/04/10 | 1328758 | systems/win32/miktex/tm/packages/next/miktex-zzdb3-2.9.tar.lzma
+2022/04/10 | 13513 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-2.9.tar.lzma
+2022/04/10 | 14411 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-x64-2.9.tar.lzma
2019/03/12 | 1412 | systems/win32/miktex/tm/packages/nextpage.tar.lzma
-2022/04/09 | 1153 | systems/win32/miktex/tm/packages/next/pr.ini
+2022/04/10 | 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
@@ -297600,7 +297603,7 @@
2022/02/22 | 6917 | systems/win32/miktex/tm/packages/preview.tar.lzma
2019/06/20 | 375963 | systems/win32/miktex/tm/packages/prftree.tar.lzma
2021/04/23 | 274028 | systems/win32/miktex/tm/packages/principia.tar.lzma
-2022/04/09 | 1006 | systems/win32/miktex/tm/packages/pr.ini
+2022/04/10 | 1006 | 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
@@ -299422,7 +299425,7 @@
2004/06/04 | 404 | tds/tds.sed
2004/06/23 | 65418 | tds/tds.tex
2019/05/29 | 304264 | tds.zip
-2022/04/10 | 186 | timestamp
+2022/04/11 | 186 | timestamp
2002/08/26 | 61898 | usergrps/dante/antrag.pdf
2002/08/26 | 118217 | usergrps/dante/antrag.ps
2021/11/11 | 917 | usergrps/dante/dtk/doc/beispiel.bib
diff --git a/FILES.byname.gz b/FILES.byname.gz
index b7c46268a5..018e93d469 100644
--- a/FILES.byname.gz
+++ b/FILES.byname.gz
Binary files differ
diff --git a/FILES.last07days b/FILES.last07days
index 973e67bf44..2a3ad969bd 100644
--- a/FILES.last07days
+++ b/FILES.last07days
@@ -1,257 +1,274 @@
-2022/04/09 | 99817 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-2.9.tar.lzma
-2022/04/09 | 99257 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-2.9.tar.lzma
-2022/04/09 | 97200 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-2.9.tar.lzma
-2022/04/09 | 96633 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-2.9.tar.lzma
-2022/04/09 | 966076 | macros/unicodetex/latex/polyglossia/polyglossia.dtx
-2022/04/09 | 95433 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-2.9.tar.lzma
-2022/04/09 | 953 | macros/xetex/latex/xduts/xduts.ins
-2022/04/09 | 95286 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-x64-2.9.tar.lzma
-2022/04/09 | 93959 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-2.9.tar.lzma
-2022/04/09 | 92918 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-2.9.tar.lzma
+2022/04/10 | 99816 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-2.9.tar.lzma
+2022/04/10 | 99258 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-2.9.tar.lzma
+2022/04/10 | 97200 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-2.9.tar.lzma
+2022/04/10 | 96632 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-2.9.tar.lzma
+2022/04/10 | 966240 | macros/unicodetex/latex/polyglossia/polyglossia.dtx
+2022/04/10 | 95433 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-2.9.tar.lzma
+2022/04/10 | 95286 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-x64-2.9.tar.lzma
+2022/04/10 | 93959 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-2.9.tar.lzma
+2022/04/10 | 92916 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-2.9.tar.lzma
+2022/04/10 | 883488 | systems/texlive/tlnet/archive/elegantnote.doc.r62989.tar.xz
+2022/04/10 | 88152 | systems/win32/miktex/tm/packages/next/miktex-png-bin-x64-2.9.tar.lzma
+2022/04/10 | 8784 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-x64-2.9.tar.lzma
+2022/04/10 | 86759 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-2.9.tar.lzma
+2022/04/10 | 824371 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-x64-2.9.tar.lzma
+2022/04/10 | 82392 | macros/xetex/latex/xduts/xduts.dtx
+2022/04/10 | 81462 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-x64-2.9.tar.lzma
+2022/04/10 | 806808 | systems/texlive/tlnet/archive/xduts.doc.r62987.tar.xz
+2022/04/10 | 79025 | systems/win32/miktex/tm/packages/next/miktex-png-bin-2.9.tar.lzma
+2022/04/10 | 78975 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-x64-2.9.tar.lzma
+2022/04/10 | 7753 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-2.9.tar.lzma
+2022/04/10 | 77067 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-x64-2.9.tar.lzma
+2022/04/10 | 758952 | systems/win32/miktex/tm/packages/next/miktex-ptex-bin-x64.tar.lzma
+2022/04/10 | 755742 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-2.9.tar.lzma
+2022/04/10 | 74070 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-x64-2.9.tar.lzma
+2022/04/10 | 73530 | systems/win32/miktex/tm/packages/next/miktex-web-bin-x64-2.9.tar.lzma
+2022/04/10 | 73476 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-2.9.tar.lzma
+2022/04/10 | 73148 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-x64-2.9.tar.lzma
+2022/04/10 | 72886 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-x64-2.9.tar.lzma
+2022/04/10 | 72014 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-2.9.tar.lzma
+2022/04/10 | 71006 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-x64-2.9.tar.lzma
+2022/04/10 | 693067 | systems/win32/miktex/tm/packages/next/miktex-ptex-bin.tar.lzma
+2022/04/10 | 68872 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-2.9.tar.lzma
+2022/04/10 | 681941 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-x64-2.9.tar.lzma
+2022/04/10 | 68009 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-2.9.tar.lzma
+2022/04/10 | 67706 | systems/win32/miktex/tm/packages/next/miktex-web-bin-2.9.tar.lzma
+2022/04/10 | 67253 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-x64-2.9.tar.lzma
+2022/04/10 | 6560 | systems/texlive/tlnet/archive/xduts.r62987.tar.xz
+2022/04/10 | 654272 | systems/texlive/tlnet/archive/polyglossia.doc.r62988.tar.xz
+2022/04/10 | 65056 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-x64-2.9.tar.lzma
+2022/04/10 | 64710 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-2.9.tar.lzma
+2022/04/10 | 64542 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-2.9.tar.lzma
+2022/04/10 | 64487 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-2.9.tar.lzma
+2022/04/10 | 644704 | systems/win32/miktex/tm/packages/files.csv.lzma
+2022/04/10 | 644630 | systems/win32/miktex/tm/packages/next/files.csv.lzma
+2022/04/10 | 63739 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-x64.tar.lzma
+2022/04/10 | 63310 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-x64-2.9.tar.lzma
+2022/04/10 | 631280 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-2.9.tar.lzma
+2022/04/10 | 629430 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-x64-2.9.tar.lzma
+2022/04/10 | 62380 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-x64-2.9.tar.lzma
+2022/04/10 | 598230 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-x64-2.9.tar.lzma
+2022/04/10 | 591569 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-2.9.tar.lzma
+2022/04/10 | 58665 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-2.9.tar.lzma
+2022/04/10 | 58664 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-x64-2.9.tar.lzma
+2022/04/10 | 5797165 | systems/texlive/tlnet/install-tl-unx.tar.gz
+2022/04/10 | 57616 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin.tar.lzma
+2022/04/10 | 57526 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin-x64.tar.lzma
+2022/04/10 | 57330 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-x64-2.9.tar.lzma
+2022/04/10 | 57271 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-x64-2.9.tar.lzma
+2022/04/10 | 56993 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-2.9.tar.lzma
+2022/04/10 | 56618 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-2.9.tar.lzma
+2022/04/10 | 565928 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-x64-2.9.tar.lzma
+2022/04/10 | 562122 | macros/unicodetex/latex/polyglossia.zip
+2022/04/10 | 558440 | systems/texlive/tlnet/archive/elegantpaper.doc.r62989.tar.xz
+2022/04/10 | 55755 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin.tar.lzma
+2022/04/10 | 55568 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-x64-2.9.tar.lzma
+2022/04/10 | 55285 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-2.9.tar.lzma
+2022/04/10 | 532455 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-2.9.tar.lzma
+2022/04/10 | 528012 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-x64-2.9.tar.lzma
+2022/04/10 | 52479 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-x64-2.9.tar.lzma
+2022/04/10 | 52327 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-x64-2.9.tar.lzma
+2022/04/10 | 52092 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-x64-2.9.tar.lzma
+2022/04/10 | 51558 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-2.9.tar.lzma
+2022/04/10 | 51486 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-2.9.tar.lzma
+2022/04/10 | 50800 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-2.9.tar.lzma
+2022/04/10 | 49768 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-2.9.tar.lzma
+2022/04/10 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
+2022/04/10 | 48825 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-x64-2.9.tar.lzma
+2022/04/10 | 4880 | systems/texlive/tlnet/archive/elegantnote.r62989.tar.xz
+2022/04/10 | 484371 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-2.9.tar.lzma
+2022/04/10 | 481497 | systems/win32/miktex/tm/packages/next/miktex-doc.tar.lzma
+2022/04/10 | 47922 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-x64-2.9.tar.lzma
+2022/04/10 | 477846 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-2.9.tar.lzma
+2022/04/10 | 463660 | macros/xetex/latex/xduts/xidian-logo.pdf
+2022/04/10 | 46066 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-2.9.tar.lzma
+2022/04/10 | 45823 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-x64-2.9.tar.lzma
+2022/04/10 | 45742 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-2.9.tar.lzma
+2022/04/10 | 455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
+2022/04/10 | 455 | systems/texlive/tlnet/install-tl.zip.sha512.asc
+2022/04/10 | 455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
+2022/04/10 | 455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
+2022/04/10 | 43916 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-x64-2.9.tar.lzma
+2022/04/10 | 43825 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-x64-2.9.tar.lzma
+2022/04/10 | 43644 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-2.9.tar.lzma
+2022/04/10 | 43362 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-2.9.tar.lzma
+2022/04/10 | 43226 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-x64-2.9.tar.lzma
+2022/04/10 | 42817 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-2.9.tar.lzma
+2022/04/10 | 416455 | macros/xetex/latex/xduts/xidian-text.pdf
+2022/04/10 | 41305 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-2.9.tar.lzma
+2022/04/10 | 41204 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin-x64.tar.lzma
+2022/04/10 | 41182 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin-x64.tar.lzma
+2022/04/10 | 4104 | systems/texlive/tlnet/archive/elegantpaper.r62989.tar.xz
+2022/04/10 | 406060 | systems/texlive/tlnet/archive/texlive-scripts.doc.r62984.tar.xz
+2022/04/10 | 39728 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-2.9.tar.lzma
+2022/04/10 | 394369 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-x64-2.9.tar.lzma
+2022/04/10 | 38560 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-2.9.tar.lzma
+2022/04/10 | 38425 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-2.9.tar.lzma
+2022/04/10 | 37375 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-x64-2.9.tar.lzma
+2022/04/10 | 37117 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin.tar.lzma
+2022/04/10 | 37081 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-x64-2.9.tar.lzma
+2022/04/10 | 36049 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin.tar.lzma
+2022/04/10 | 35241 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-x64-2.9.tar.lzma
+2022/04/10 | 351696 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-x64-2.9.tar.lzma
+2022/04/10 | 35168 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-x64-2.9.tar.lzma
+2022/04/10 | 351644 | macros/unicodetex/latex/polyglossia/polyglossia.pdf
+2022/04/10 | 34052 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-x64-2.9.tar.lzma
+2022/04/10 | 332413 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-2.9.tar.lzma
+2022/04/10 | 32956 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-2.9.tar.lzma
+2022/04/10 | 326660 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-x64-2.9.tar.lzma
+2022/04/10 | 325269 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-x64-2.9.tar.lzma
+2022/04/10 | 32134 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-x64-2.9.tar.lzma
+2022/04/10 | 316944 | macros/xetex/latex/xduts/xduts.pdf
+2022/04/10 | 316241 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-2.9.tar.lzma
+2022/04/10 | 31588 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-2.9.tar.lzma
+2022/04/10 | 31520 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-x64-2.9.tar.lzma
+2022/04/10 | 314993 | graphics/pgf/contrib/tikz-ladder.zip
+2022/04/10 | 31413 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-2.9.tar.lzma
+2022/04/10 | 31343 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-x64-2.9.tar.lzma
+2022/04/10 | 30542 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-x64-2.9.tar.lzma
+2022/04/10 | 30146 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-2.9.tar.lzma
+2022/04/10 | 296039 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-x64-2.9.tar.lzma
+2022/04/10 | 288200 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-2.9.tar.lzma
+2022/04/10 | 28797 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-2.9.tar.lzma
+2022/04/10 | 28690 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-2.9.tar.lzma
+2022/04/10 | 286412 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-x64-2.9.tar.lzma
+2022/04/10 | 285715 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-2.9.tar.lzma
+2022/04/10 | 28569 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-x64-2.9.tar.lzma
+2022/04/10 | 28423 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-2.9.tar.lzma
+2022/04/10 | 2820687 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-x64-2.9.tar.lzma
+2022/04/10 | 27635 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-x64-2.9.tar.lzma
+2022/04/10 | 27591 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-2.9.tar.lzma
+2022/04/10 | 274308 | systems/win32/miktex/tm/packages/next/miktex-zzdb1-2.9.tar.lzma
+2022/04/10 | 274272 | systems/win32/miktex/tm/packages/miktex-zzdb1-2.9.tar.lzma
+2022/04/10 | 27248 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-2.9.tar.lzma
+2022/04/10 | 270299 | systems/win32/miktex/tm/packages/next/miktex-console-bin-x64-2.9.tar.lzma
+2022/04/10 | 2694875 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-2.9.tar.lzma
+2022/04/10 | 259257 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-2.9.tar.lzma
+2022/04/10 | 25551 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-2.9.tar.lzma
+2022/04/10 | 25481233 | systems/texlive/tlnet/install-tl.zip
+2022/04/10 | 251125 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-2.9.tar.lzma
+2022/04/10 | 25106 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-2.9.tar.lzma
+2022/04/10 | 25059 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-x64-2.9.tar.lzma
+2022/04/10 | 247333 | systems/win32/miktex/tm/packages/next/miktex-hitex-bin-x64.tar.lzma
+2022/04/10 | 245097 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-x64-2.9.tar.lzma
+2022/04/10 | 244961 | systems/win32/miktex/tm/packages/next/miktex-console-bin-2.9.tar.lzma
+2022/04/10 | 24120 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-x64-2.9.tar.lzma
+2022/04/10 | 23944 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-x64-2.9.tar.lzma
+2022/04/10 | 2366892 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
+2022/04/10 | 22147 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-2.9.tar.lzma
+2022/04/10 | 213280 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-x64-2.9.tar.lzma
+2022/04/10 | 21314 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-2.9.tar.lzma
+2022/04/10 | 210275 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-2.9.tar.lzma
+2022/04/10 | 208808 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-x64-2.9.tar.lzma
+2022/04/10 | 20461937 | systems/texlive/tlnet/install-tl-windows.exe
+2022/04/10 | 203837 | systems/win32/miktex/tm/packages/next/miktex-hitex-bin.tar.lzma
+2022/04/10 | 202836 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-x64-2.9.tar.lzma
+2022/04/10 | 20184 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-2.9.tar.lzma
+2022/04/10 | 200398 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-2.9.tar.lzma
+2022/04/10 | 199832 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-2.9.tar.lzma
+2022/04/10 | 1982085 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-x64-2.9.tar.lzma
+2022/04/10 | 197036 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-2.9.tar.lzma
+2022/04/10 | 196117 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-x64-2.9.tar.lzma
+2022/04/10 | 1943 | macros/unicodetex/latex/polyglossia/README.md
+2022/04/10 | 190505 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-2.9.tar.lzma
+2022/04/10 | 18491 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-x64-2.9.tar.lzma
+2022/04/10 | 18367 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-x64-2.9.tar.lzma
+2022/04/10 | 181515 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-x64-2.9.tar.lzma
+2022/04/10 | 179877 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-2.9.tar.lzma
+2022/04/10 | 1752146 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-2.9.tar.lzma
+2022/04/10 | 173006 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-x64-2.9.tar.lzma
+2022/04/10 | 17259820 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
+2022/04/10 | 168821 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-x64-2.9.tar.lzma
+2022/04/10 | 16558 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-2.9.tar.lzma
+2022/04/10 | 1650 | macros/xetex/latex/xduts/README.md
+2022/04/10 | 16503 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-2.9.tar.lzma
+2022/04/10 | 1616 | systems/texlive/tlnet/archive/collection-publishers.r62987.tar.xz
+2022/04/10 | 16032 | systems/texlive/tlnet/archive/xduts.source.r62987.tar.xz
+2022/04/10 | 157312 | systems/texlive/tlnet/archive/polyglossia.source.r62988.tar.xz
+2022/04/10 | 156963 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-2.9.tar.lzma
+2022/04/10 | 155496 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-x64-2.9.tar.lzma
+2022/04/10 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
+2022/04/10 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
+2022/04/10 | 152031 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-2.9.tar.lzma
+2022/04/10 | 1501236 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-x64-2.9.tar.lzma
+2022/04/10 | 145 | systems/texlive/tlnet/install-tl.zip.sha512
+2022/04/10 | 1454763 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-x64-2.9.tar.lzma
+2022/04/10 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
+2022/04/10 | 14411 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-x64-2.9.tar.lzma
+2022/04/10 | 1440347 | systems/win32/miktex/tm/packages/miktex-zzdb2-2.9.tar.lzma
+2022/04/10 | 1440312 | systems/win32/miktex/tm/packages/next/miktex-zzdb2-2.9.tar.lzma
+2022/04/10 | 139102 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-x64-2.9.tar.lzma
+2022/04/10 | 135949 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-2.9.tar.lzma
+2022/04/10 | 1357072 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-2.9.tar.lzma
+2022/04/10 | 135377 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-x64-2.9.tar.lzma
+2022/04/10 | 13513 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-2.9.tar.lzma
+2022/04/10 | 1329582 | systems/win32/miktex/tm/packages/miktex-zzdb3-2.9.tar.lzma
+2022/04/10 | 1328758 | systems/win32/miktex/tm/packages/next/miktex-zzdb3-2.9.tar.lzma
+2022/04/10 | 1322742 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-x64-2.9.tar.lzma
+2022/04/10 | 1307000 | systems/texlive/tlnet/archive/elegantbook.doc.r62989.tar.xz
+2022/04/10 | 1302485 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-2.9.tar.lzma
+2022/04/10 | 126532 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-2.9.tar.lzma
+2022/04/10 | 1209901 | macros/xetex/latex/xduts.zip
+2022/04/10 | 120617 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-2.9.tar.lzma
+2022/04/10 | 119060 | systems/texlive/tlnet/archive/polyglossia.r62988.tar.xz
+2022/04/10 | 1181127 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-2.9.tar.lzma
+2022/04/10 | 115657 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-x64-2.9.tar.lzma
+2022/04/10 | 1156463 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-x64-2.9.tar.lzma
+2022/04/10 | 1153 | systems/win32/miktex/tm/packages/next/pr.ini
+2022/04/10 | 1132306 | install/macros/unicodetex/latex/polyglossia.tds.zip
+2022/04/10 | 113052 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-x64-2.9.tar.lzma
+2022/04/10 | 112590 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-x64-2.9.tar.lzma
+2022/04/10 | 109800 | systems/texlive/tlnet/archive/texlive-scripts.r62984.tar.xz
+2022/04/10 | 109480 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-x64-2.9.tar.lzma
+2022/04/10 | 10776 | systems/texlive/tlnet/archive/elegantbook.r62989.tar.xz
+2022/04/10 | 107705 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-x64-2.9.tar.lzma
+2022/04/10 | 104556 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-x64-2.9.tar.lzma
+2022/04/10 | 103336 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-x64-2.9.tar.lzma
+2022/04/10 | 103092 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-x64-2.9.tar.lzma
+2022/04/10 | 1021 | macros/xetex/latex/xduts/xduts.ins
+2022/04/10 | 1021847 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-2.9.tar.lzma
+2022/04/10 | 1006 | systems/win32/miktex/tm/packages/pr.ini
+2022/04/10 | 100487 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-2.9.tar.lzma
2022/04/09 | 913321 | macros/latex/contrib/elegantnote.zip
-2022/04/09 | 88150 | systems/win32/miktex/tm/packages/next/miktex-png-bin-x64-2.9.tar.lzma
-2022/04/09 | 8784 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-x64-2.9.tar.lzma
-2022/04/09 | 86759 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-2.9.tar.lzma
-2022/04/09 | 824370 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-x64-2.9.tar.lzma
-2022/04/09 | 81461 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-x64-2.9.tar.lzma
-2022/04/09 | 797 | macros/xetex/latex/xduts/README.md
-2022/04/09 | 79024 | systems/win32/miktex/tm/packages/next/miktex-png-bin-2.9.tar.lzma
-2022/04/09 | 78976 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-x64-2.9.tar.lzma
2022/04/09 | 7856 | macros/latex/contrib/elegantpaper/elegantpaper-en.tex
-2022/04/09 | 77988 | macros/xetex/latex/xduts/xduts.dtx
-2022/04/09 | 7753 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-2.9.tar.lzma
-2022/04/09 | 77069 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-x64-2.9.tar.lzma
-2022/04/09 | 758955 | systems/win32/miktex/tm/packages/next/miktex-ptex-bin-x64.tar.lzma
2022/04/09 | 756261 | macros/latex/contrib/elegantbook/elegantbook-en.pdf
-2022/04/09 | 755743 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-2.9.tar.lzma
-2022/04/09 | 74068 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-x64-2.9.tar.lzma
-2022/04/09 | 73529 | systems/win32/miktex/tm/packages/next/miktex-web-bin-x64-2.9.tar.lzma
-2022/04/09 | 73478 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-2.9.tar.lzma
-2022/04/09 | 73147 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-x64-2.9.tar.lzma
-2022/04/09 | 72886 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-x64-2.9.tar.lzma
-2022/04/09 | 72015 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-2.9.tar.lzma
-2022/04/09 | 71008 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-x64-2.9.tar.lzma
-2022/04/09 | 693066 | systems/win32/miktex/tm/packages/next/miktex-ptex-bin.tar.lzma
-2022/04/09 | 68873 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-2.9.tar.lzma
-2022/04/09 | 681941 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-x64-2.9.tar.lzma
-2022/04/09 | 68009 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-2.9.tar.lzma
-2022/04/09 | 67705 | systems/win32/miktex/tm/packages/next/miktex-web-bin-2.9.tar.lzma
-2022/04/09 | 67253 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-x64-2.9.tar.lzma
-2022/04/09 | 65055 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-x64-2.9.tar.lzma
-2022/04/09 | 64710 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-2.9.tar.lzma
-2022/04/09 | 64543 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-2.9.tar.lzma
-2022/04/09 | 64487 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-2.9.tar.lzma
-2022/04/09 | 644704 | systems/win32/miktex/tm/packages/files.csv.lzma
-2022/04/09 | 644630 | systems/win32/miktex/tm/packages/next/files.csv.lzma
-2022/04/09 | 63740 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-x64.tar.lzma
-2022/04/09 | 63311 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-x64-2.9.tar.lzma
-2022/04/09 | 631278 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-2.9.tar.lzma
-2022/04/09 | 629430 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-x64-2.9.tar.lzma
-2022/04/09 | 62382 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-x64-2.9.tar.lzma
-2022/04/09 | 598230 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-x64-2.9.tar.lzma
-2022/04/09 | 591568 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-2.9.tar.lzma
-2022/04/09 | 58665 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-2.9.tar.lzma
-2022/04/09 | 58664 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-x64-2.9.tar.lzma
-2022/04/09 | 5797343 | systems/texlive/tlnet/install-tl-unx.tar.gz
-2022/04/09 | 57618 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin.tar.lzma
-2022/04/09 | 57526 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin-x64.tar.lzma
-2022/04/09 | 57329 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-x64-2.9.tar.lzma
-2022/04/09 | 57270 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-x64-2.9.tar.lzma
-2022/04/09 | 56993 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-2.9.tar.lzma
-2022/04/09 | 56618 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-2.9.tar.lzma
-2022/04/09 | 565930 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-x64-2.9.tar.lzma
+2022/04/09 | 7219 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
2022/04/09 | 562127 | macros/latex/contrib/elegantpaper.zip
-2022/04/09 | 562047 | macros/unicodetex/latex/polyglossia.zip
-2022/04/09 | 55757 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin.tar.lzma
-2022/04/09 | 55567 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-x64-2.9.tar.lzma
-2022/04/09 | 55286 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-2.9.tar.lzma
-2022/04/09 | 532455 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-2.9.tar.lzma
-2022/04/09 | 528017 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-x64-2.9.tar.lzma
2022/04/09 | 52703 | macros/latex/contrib/elegantbook/elegantbook-cn.tex
-2022/04/09 | 52479 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-x64-2.9.tar.lzma
-2022/04/09 | 52327 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-x64-2.9.tar.lzma
-2022/04/09 | 52093 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-x64-2.9.tar.lzma
-2022/04/09 | 51558 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-2.9.tar.lzma
-2022/04/09 | 51486 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-2.9.tar.lzma
-2022/04/09 | 50800 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-2.9.tar.lzma
-2022/04/09 | 49770 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-2.9.tar.lzma
-2022/04/09 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
-2022/04/09 | 48824 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-x64-2.9.tar.lzma
-2022/04/09 | 484370 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-2.9.tar.lzma
-2022/04/09 | 481497 | systems/win32/miktex/tm/packages/next/miktex-doc.tar.lzma
-2022/04/09 | 47923 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-x64-2.9.tar.lzma
-2022/04/09 | 477846 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-2.9.tar.lzma
-2022/04/09 | 463660 | macros/xetex/latex/xduts/xidian-logo.pdf
-2022/04/09 | 46067 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-2.9.tar.lzma
-2022/04/09 | 45823 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-x64-2.9.tar.lzma
-2022/04/09 | 45742 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-2.9.tar.lzma
-2022/04/09 | 455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
-2022/04/09 | 455 | systems/texlive/tlnet/install-tl.zip.sha512.asc
-2022/04/09 | 455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
-2022/04/09 | 455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
2022/04/09 | 45351 | macros/latex/contrib/elegantbook/elegantbook.cls
-2022/04/09 | 43917 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-x64-2.9.tar.lzma
-2022/04/09 | 43824 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-x64-2.9.tar.lzma
-2022/04/09 | 43646 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-2.9.tar.lzma
-2022/04/09 | 43361 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-2.9.tar.lzma
-2022/04/09 | 43226 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-x64-2.9.tar.lzma
-2022/04/09 | 42818 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-2.9.tar.lzma
-2022/04/09 | 416455 | macros/xetex/latex/xduts/xidian-text.pdf
-2022/04/09 | 41306 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-2.9.tar.lzma
-2022/04/09 | 41204 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin-x64.tar.lzma
-2022/04/09 | 41181 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin-x64.tar.lzma
-2022/04/09 | 406060 | systems/texlive/tlnet/archive/texlive-scripts.doc.r62979.tar.xz
+2022/04/09 | 438265 | graphics/pgf/contrib/tikz-ladder/doc/tikz-ladder-doc.pdf
2022/04/09 | 4016 | systems/texlive/tlnet/archive/ifptex.r62982.tar.xz
-2022/04/09 | 39727 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-2.9.tar.lzma
-2022/04/09 | 394370 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-x64-2.9.tar.lzma
-2022/04/09 | 38560 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-2.9.tar.lzma
-2022/04/09 | 38426 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-2.9.tar.lzma
-2022/04/09 | 37375 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-x64-2.9.tar.lzma
-2022/04/09 | 37117 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin.tar.lzma
-2022/04/09 | 37081 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-x64-2.9.tar.lzma
+2022/04/09 | 373782 | macros/texinfo/latest/texinfo.tex
2022/04/09 | 3640 | systems/texlive/tlnet/archive/ifptex.doc.r62982.tar.xz
-2022/04/09 | 36049 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin.tar.lzma
2022/04/09 | 35896 | macros/latex/contrib/elegantbook/elegantbook-en.tex
-2022/04/09 | 35242 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-x64-2.9.tar.lzma
-2022/04/09 | 351697 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-x64-2.9.tar.lzma
-2022/04/09 | 35168 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-x64-2.9.tar.lzma
-2022/04/09 | 351588 | macros/unicodetex/latex/polyglossia/polyglossia.pdf
2022/04/09 | 3420 | systems/texlive/tlnet/archive/liftarm.r62981.tar.xz
-2022/04/09 | 34051 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-x64-2.9.tar.lzma
2022/04/09 | 340396 | systems/texlive/tlnet/archive/bithesis.doc.r62980.tar.xz
2022/04/09 | 334457 | macros/latex/contrib/elegantnote/elegantnote-cn.pdf
-2022/04/09 | 332414 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-2.9.tar.lzma
2022/04/09 | 3315 | macros/unicodetex/latex/njuthesis/njuthesis.ins
-2022/04/09 | 32955 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-2.9.tar.lzma
2022/04/09 | 327565 | macros/latex/contrib/elegantnote/elegantnote-en.pdf
-2022/04/09 | 326661 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-x64-2.9.tar.lzma
-2022/04/09 | 325269 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-x64-2.9.tar.lzma
-2022/04/09 | 32134 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-x64-2.9.tar.lzma
-2022/04/09 | 316242 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-2.9.tar.lzma
-2022/04/09 | 31588 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-2.9.tar.lzma
-2022/04/09 | 31520 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-x64-2.9.tar.lzma
-2022/04/09 | 31414 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-2.9.tar.lzma
-2022/04/09 | 31343 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-x64-2.9.tar.lzma
-2022/04/09 | 306881 | macros/xetex/latex/xduts/xduts.pdf
-2022/04/09 | 30542 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-x64-2.9.tar.lzma
-2022/04/09 | 30147 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-2.9.tar.lzma
-2022/04/09 | 296040 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-x64-2.9.tar.lzma
-2022/04/09 | 288201 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-2.9.tar.lzma
-2022/04/09 | 28797 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-2.9.tar.lzma
-2022/04/09 | 28689 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-2.9.tar.lzma
-2022/04/09 | 286412 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-x64-2.9.tar.lzma
-2022/04/09 | 285714 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-2.9.tar.lzma
-2022/04/09 | 28569 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-x64-2.9.tar.lzma
-2022/04/09 | 28422 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-2.9.tar.lzma
-2022/04/09 | 2820688 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-x64-2.9.tar.lzma
-2022/04/09 | 27637 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-x64-2.9.tar.lzma
-2022/04/09 | 27591 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-2.9.tar.lzma
-2022/04/09 | 274294 | systems/win32/miktex/tm/packages/next/miktex-zzdb1-2.9.tar.lzma
-2022/04/09 | 274283 | systems/win32/miktex/tm/packages/miktex-zzdb1-2.9.tar.lzma
-2022/04/09 | 27249 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-2.9.tar.lzma
-2022/04/09 | 270299 | systems/win32/miktex/tm/packages/next/miktex-console-bin-x64-2.9.tar.lzma
-2022/04/09 | 2694876 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-2.9.tar.lzma
-2022/04/09 | 259256 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-2.9.tar.lzma
-2022/04/09 | 25550 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-2.9.tar.lzma
-2022/04/09 | 25481230 | systems/texlive/tlnet/install-tl.zip
-2022/04/09 | 251129 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-2.9.tar.lzma
-2022/04/09 | 25105 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-2.9.tar.lzma
-2022/04/09 | 25059 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-x64-2.9.tar.lzma
-2022/04/09 | 247334 | systems/win32/miktex/tm/packages/next/miktex-hitex-bin-x64.tar.lzma
-2022/04/09 | 245095 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-x64-2.9.tar.lzma
-2022/04/09 | 244964 | systems/win32/miktex/tm/packages/next/miktex-console-bin-2.9.tar.lzma
-2022/04/09 | 24121 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-x64-2.9.tar.lzma
2022/04/09 | 240096 | macros/latex/contrib/elegantpaper/elegantpaper-cn.pdf
-2022/04/09 | 23945 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-x64-2.9.tar.lzma
-2022/04/09 | 2365564 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
2022/04/09 | 2362957 | macros/latex/contrib/elegantbook.zip
2022/04/09 | 229100 | macros/latex/contrib/elegantpaper/elegantpaper-en.pdf
2022/04/09 | 224838 | macros/unicodetex/latex/njuthesis/njuthesis.dtx
-2022/04/09 | 22146 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-2.9.tar.lzma
-2022/04/09 | 213277 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-x64-2.9.tar.lzma
-2022/04/09 | 21313 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-2.9.tar.lzma
-2022/04/09 | 210274 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-2.9.tar.lzma
-2022/04/09 | 208808 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-x64-2.9.tar.lzma
-2022/04/09 | 20459953 | systems/texlive/tlnet/install-tl-windows.exe
-2022/04/09 | 203838 | systems/win32/miktex/tm/packages/next/miktex-hitex-bin.tar.lzma
-2022/04/09 | 202835 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-x64-2.9.tar.lzma
-2022/04/09 | 20184 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-2.9.tar.lzma
-2022/04/09 | 200396 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-2.9.tar.lzma
-2022/04/09 | 199831 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-2.9.tar.lzma
-2022/04/09 | 1982083 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-x64-2.9.tar.lzma
-2022/04/09 | 197035 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-2.9.tar.lzma
-2022/04/09 | 196117 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-x64-2.9.tar.lzma
-2022/04/09 | 1942 | macros/unicodetex/latex/polyglossia/README.md
+2022/04/09 | 1925 | graphics/pgf/contrib/tikz-ladder/README.txt
2022/04/09 | 19105 | macros/unicodetex/latex/njuthesis/LICENSE
-2022/04/09 | 190505 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-2.9.tar.lzma
2022/04/09 | 1861856 | systems/texlive/tlnet/archive/liftarm.doc.r62981.tar.xz
-2022/04/09 | 18492 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-x64-2.9.tar.lzma
-2022/04/09 | 18368 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-x64-2.9.tar.lzma
2022/04/09 | 1833 | macros/latex/contrib/elegantpaper/reference.bib
-2022/04/09 | 181515 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-x64-2.9.tar.lzma
-2022/04/09 | 179879 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-2.9.tar.lzma
-2022/04/09 | 1752147 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-2.9.tar.lzma
-2022/04/09 | 173007 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-x64-2.9.tar.lzma
-2022/04/09 | 17258328 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
-2022/04/09 | 168821 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-x64-2.9.tar.lzma
2022/04/09 | 16876 | systems/texlive/tlnet/archive/bithesis.source.r62980.tar.xz
-2022/04/09 | 16560 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-2.9.tar.lzma
-2022/04/09 | 16502 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-2.9.tar.lzma
-2022/04/09 | 156964 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-2.9.tar.lzma
-2022/04/09 | 155497 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-x64-2.9.tar.lzma
-2022/04/09 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
-2022/04/09 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
-2022/04/09 | 152031 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-2.9.tar.lzma
-2022/04/09 | 1501239 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-x64-2.9.tar.lzma
2022/04/09 | 14782 | macros/latex/contrib/elegantnote/elegantnote.cls
-2022/04/09 | 145 | systems/texlive/tlnet/install-tl.zip.sha512
-2022/04/09 | 1454761 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-x64-2.9.tar.lzma
-2022/04/09 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
-2022/04/09 | 14411 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-x64-2.9.tar.lzma
-2022/04/09 | 1440209 | systems/win32/miktex/tm/packages/next/miktex-zzdb2-2.9.tar.lzma
-2022/04/09 | 1439880 | systems/win32/miktex/tm/packages/miktex-zzdb2-2.9.tar.lzma
2022/04/09 | 14219 | macros/latex/contrib/elegantnote/elegantnote-cn.tex
-2022/04/09 | 139102 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-x64-2.9.tar.lzma
-2022/04/09 | 135950 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-2.9.tar.lzma
-2022/04/09 | 1357072 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-2.9.tar.lzma
-2022/04/09 | 135375 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-x64-2.9.tar.lzma
-2022/04/09 | 13514 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-2.9.tar.lzma
-2022/04/09 | 1329408 | systems/win32/miktex/tm/packages/miktex-zzdb3-2.9.tar.lzma
-2022/04/09 | 1329031 | systems/win32/miktex/tm/packages/next/miktex-zzdb3-2.9.tar.lzma
-2022/04/09 | 1322740 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-x64-2.9.tar.lzma
-2022/04/09 | 1302487 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-2.9.tar.lzma
2022/04/09 | 1278660 | macros/unicodetex/latex/njuthesis.zip
-2022/04/09 | 126536 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-2.9.tar.lzma
2022/04/09 | 1221585 | macros/unicodetex/latex/njuthesis/njuthesis.pdf
-2022/04/09 | 120618 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-2.9.tar.lzma
-2022/04/09 | 1198108 | macros/xetex/latex/xduts.zip
2022/04/09 | 11958 | macros/latex/contrib/elegantpaper/elegantpaper-cn.tex
-2022/04/09 | 1181125 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-2.9.tar.lzma
-2022/04/09 | 115656 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-x64-2.9.tar.lzma
-2022/04/09 | 1156464 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-x64-2.9.tar.lzma
-2022/04/09 | 1153 | systems/win32/miktex/tm/packages/next/pr.ini
-2022/04/09 | 1133282 | install/macros/unicodetex/latex/polyglossia.tds.zip
-2022/04/09 | 113052 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-x64-2.9.tar.lzma
-2022/04/09 | 112587 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-x64-2.9.tar.lzma
-2022/04/09 | 109808 | systems/texlive/tlnet/archive/texlive-scripts.r62979.tar.xz
-2022/04/09 | 109479 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-x64-2.9.tar.lzma
2022/04/09 | 10787 | macros/latex/contrib/elegantpaper/elegantpaper.cls
-2022/04/09 | 107706 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-x64-2.9.tar.lzma
2022/04/09 | 10628 | systems/texlive/tlnet/archive/bithesis.r62980.tar.xz
2022/04/09 | 1062407 | macros/latex/contrib/elegantbook/elegantbook-cn.pdf
2022/04/09 | 1057 | macros/unicodetex/latex/njuthesis/README.md
-2022/04/09 | 104556 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-x64-2.9.tar.lzma
2022/04/09 | 10335 | macros/latex/contrib/elegantnote/elegantnote-en.tex
-2022/04/09 | 103337 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-x64-2.9.tar.lzma
-2022/04/09 | 103093 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-x64-2.9.tar.lzma
-2022/04/09 | 1021846 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-2.9.tar.lzma
-2022/04/09 | 1006 | systems/win32/miktex/tm/packages/pr.ini
-2022/04/09 | 100486 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-2.9.tar.lzma
2022/04/08 | 96600 | systems/texlive/tlnet/archive/aboensis.r62977.tar.xz
2022/04/08 | 8841 | macros/generic/ifptex.zip
2022/04/08 | 868 | systems/texlive/tlnet/archive/pst-diffraction.source.r62977.tar.xz
2022/04/08 | 83476 | systems/texlive/tlnet/archive/simpleoptics.doc.r62977.tar.xz
-2022/04/08 | 7212 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
2022/04/08 | 668676 | systems/texlive/tlnet/archive/zref.doc.r62977.tar.xz
2022/04/08 | 6656 | systems/texlive/tlnet/archive/ut-thesis.source.r62977.tar.xz
2022/04/08 | 6568 | systems/texlive/tlnet/archive/uwa-letterhead.source.r62977.tar.xz
@@ -348,6 +365,7 @@
2022/04/07 | 706755 | macros/latex/contrib/zref.zip
2022/04/07 | 699064 | macros/latex/contrib/zref/zref.pdf
2022/04/07 | 686960 | systems/texlive/tlnet/archive/tikz-trackschematic.doc.r62966.tar.xz
+2022/04/07 | 64406 | graphics/pgf/contrib/tikz-ladder/doc/tikz-ladder-doc.tex
2022/04/07 | 6366 | usergrps/usergrps/index.html
2022/04/07 | 581 | macros/latex/contrib/zref/README.md
2022/04/07 | 45532388 | systems/texlive/tlnet/archive/knuth-pdf.doc.r62969.tar.xz
@@ -790,7 +808,6 @@
2022/04/06 | 650 | graphics/asymptote/prcfile.h
2022/04/06 | 6503 | graphics/asymptote/tests/types/constructor.asy
2022/04/06 | 64 | graphics/asymptote/cudareflect/tinyexr/test/fuzzer/issue-62-tinyexr_memcpy_heap-buffer-overflow
-2022/04/06 | 649796 | systems/texlive/tlnet/archive/polyglossia.doc.r62940.tar.xz
2022/04/06 | 648 | graphics/asymptote/LspCpp/third_party/uri/src/CMakeFiles/CMakeDirectoryInformation.cmake
2022/04/06 | 648 | graphics/asymptote/LspCpp/third_party/uri/CMakeFiles/CMakeDirectoryInformation.cmake
2022/04/06 | 648 | graphics/asymptote/base/shaders/sum1.glsl
@@ -2235,7 +2252,6 @@
2022/04/06 | 16188 | graphics/asymptote/cudareflect/tinyexr/examples/exrview/ThirdPartyLibs/nativefiledialog/screens/open_win8.png
2022/04/06 | 1617 | graphics/asymptote/LspCpp/include/LibLsp/lsp/textDocument/hover.h
2022/04/06 | 1615 | graphics/asymptote/LspCpp/include/LibLsp/lsp/textDocument/colorPresentation.h
-2022/04/06 | 1612 | systems/texlive/tlnet/archive/collection-publishers.r62917.tar.xz
2022/04/06 | 1612 | graphics/asymptote/asy-list.pl
2022/04/06 | 1611 | graphics/asymptote/v3dheadertypes.py
2022/04/06 | 1610 | graphics/asymptote/LspCpp/third_party/rapidjson/example/sortkeys/sortkeys.cpp
@@ -2268,7 +2284,6 @@
2022/04/06 | 1578 | graphics/asymptote/build-scripts/cc-format.el
2022/04/06 | 1567 | graphics/asymptote/LspCpp/include/LibLsp/lsp/client/registerCapability.h
2022/04/06 | 1566 | graphics/asymptote/examples/near_earth.asy
-2022/04/06 | 156628 | systems/texlive/tlnet/archive/polyglossia.source.r62940.tar.xz
2022/04/06 | 15645 | graphics/asymptote/install-sh
2022/04/06 | 15617 | graphics/asymptote/cudareflect/tinyexr/test_tinyexr.cc
2022/04/06 | 15601 | graphics/asymptote/base/ode.asy
@@ -2506,7 +2521,6 @@
2022/04/06 | 1186601 | graphics/asymptote/GL/glew.h
2022/04/06 | 1185 | graphics/asymptote/LspCpp/include/LibLsp/lsp/SimpleTimer.h
2022/04/06 | 1185 | graphics/asymptote/examples/functionshading.asy
-2022/04/06 | 118592 | systems/texlive/tlnet/archive/polyglossia.r62940.tar.xz
2022/04/06 | 1183 | graphics/asymptote/LspCpp/include/LibLsp/JsonRpc/TcpServer.h
2022/04/06 | 1183 | graphics/asymptote/GUI/xasyArgs.py
2022/04/06 | 1183225 | graphics/asymptote/gc-8.2.0.tar.gz
@@ -2778,7 +2792,6 @@
2022/04/05 | 379312 | fonts/erewhon-math/Erewhon-Math.otf
2022/04/05 | 378172 | info/ptex-manual/eptexdoc.pdf
2022/04/05 | 37806 | systems/win32/miktex/tm/packages/zref__source.tar.lzma
-2022/04/05 | 373709 | macros/texinfo/latest/texinfo.tex
2022/04/05 | 37058 | systems/win32/miktex/tm/packages/kotex-oblivoir__source.tar.lzma
2022/04/05 | 36861 | indexing/hsindex.zip
2022/04/05 | 367374 | systems/win32/miktex/tm/packages/scontents__doc.tar.lzma
@@ -3096,40 +3109,3 @@
2022/04/04 | 10347 | support/latexindent/LatexIndent/Command.pm
2022/04/04 | 101825 | macros/latex/contrib/colorist/colorist-doc.pdf
2022/04/04 | 10106 | macros/latex/contrib/siunitx/siunitx-abbreviation.dtx
-2022/04/03 | 894 | macros/latex/contrib/commonunicode/doc/commonunicode.tex
-2022/04/03 | 862 | info/dtk-bibliography/dtk-bibliography.tex
-2022/04/03 | 74997 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/README.md
-2022/04/03 | 663 | info/dtk-bibliography/README.md
-2022/04/03 | 576959 | macros/latex/contrib/commonunicode/doc/commonunicode.pdf
-2022/04/03 | 5430 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/makeall.py
-2022/04/03 | 54098 | macros/latex/contrib/commonunicode/latex/commonunicode.sty
-2022/04/03 | 537763 | fonts/utilities/ps2pk/configure.texk
-2022/04/03 | 533226 | indexing/makeindexk/configure.texk
-2022/04/03 | 531267 | dviware/dvidvi/configure.texk
-2022/04/03 | 530440 | info/dtk-bibliography/dtk-bibliography.bib
-2022/04/03 | 520 | info/dtk-bibliography/dtk-authoryear.dbx
-2022/04/03 | 487928 | macros/latex/contrib/babel-contrib/italian.zip
-2022/04/03 | 4834 | info/dtk-bibliography/dtk-logos.sty
-2022/04/03 | 439403 | info/dtk-bibliography.zip
-2022/04/03 | 385642 | macros/latex/contrib/scontents/scontents.pdf
-2022/04/03 | 383421 | info/dtk-bibliography/dtk-bibliography.pdf
-2022/04/03 | 281 | macros/latex/contrib/commonunicode/README.md
-2022/04/03 | 2342 | macros/latex/contrib/scontents/README.md
-2022/04/03 | 2223 | macros/latex/contrib/scontents/scontents.ins
-2022/04/03 | 210996 | graphics/pgf/contrib/simplenodes.zip
-2022/04/03 | 189 | systems/mac/mactex/README
-2022/04/03 | 1869 | info/dtk-bibliography/dtk-authoryear.bbx
-2022/04/03 | 1756700 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015.zip
-2022/04/03 | 169287 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015.bbx
-2022/04/03 | 167824 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015ay.bbx
-2022/04/03 | 1660029 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/biblatex-gb7714-2015.pdf
-2022/04/03 | 1627 | macros/latex/contrib/babel-contrib/italian/README.txt
-2022/04/03 | 141432 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015mx.bbx
-2022/04/03 | 135079 | macros/latex/contrib/scontents/scontents.dtx
-2022/04/03 | 12524 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-NWAFU.bbx
-2022/04/03 | 1229 | systems/texlive/tlnet/README.md
-2022/04/03 | 120969 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-2015ms.bbx
-2022/04/03 | 1180 | systems/texlive/Images/README.md
-2022/04/03 | 1073 | macros/latex/contrib/commonunicode/LICENSE
-2022/04/03 | 10511 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/gb7714-SEU.bbx
-2022/04/03 | 0 | systems/texlive/tlnet/TEXLIVE_2022
diff --git a/graphics/pgf/contrib/tikz-ladder/README.txt b/graphics/pgf/contrib/tikz-ladder/README.txt
index c91ee1802a..278fcfa27f 100644
--- a/graphics/pgf/contrib/tikz-ladder/README.txt
+++ b/graphics/pgf/contrib/tikz-ladder/README.txt
@@ -9,7 +9,8 @@ version. The latest version of this license is in:
later is part of all distributions of LaTeX version 1999/12/01
or later.
- Version 1.1 2018-02-06
+ Version 1.3 2022-04-10
+
------------------------------------------------------------
@@ -31,4 +32,11 @@ lack support for blocks. The tikz-ladder, on the contrary,
supports all features described in IEC-61131-3, namely,
blocks (for functions and function blocks), contacts and coils.
------------------------------------------------------------- \ No newline at end of file
+------------------------------------------------------------
+
+If you are interest in generating the documentation departing
+from tikz-ladder-doc.tex you are going to need pgfmanual-en-macros
+available at
+https://mirrors.ctan.org/graphics/pgf/contrib/sa-tikz/doc/macros/pgfmanual-en-macros.tex
+
+------------------------------------------------------------
diff --git a/graphics/pgf/contrib/tikz-ladder/doc/tikz-ladder-doc.pdf b/graphics/pgf/contrib/tikz-ladder/doc/tikz-ladder-doc.pdf
index 139ee83b06..b4705cf021 100644
--- a/graphics/pgf/contrib/tikz-ladder/doc/tikz-ladder-doc.pdf
+++ b/graphics/pgf/contrib/tikz-ladder/doc/tikz-ladder-doc.pdf
Binary files differ
diff --git a/graphics/pgf/contrib/tikz-ladder/doc/tikz-ladder-doc.tex b/graphics/pgf/contrib/tikz-ladder/doc/tikz-ladder-doc.tex
index 7cc809da1b..fa52becd87 100644
--- a/graphics/pgf/contrib/tikz-ladder/doc/tikz-ladder-doc.tex
+++ b/graphics/pgf/contrib/tikz-ladder/doc/tikz-ladder-doc.tex
@@ -1,6 +1,6 @@
%% This is file `tikz-ladder-doc.tex'
-%% Version: 1.1
-%% Version date: 2018-02-06
+%% Version: 1.3
+%% Version date: 2022-04-10
%%
%% Copyright (C) 2018 by Luis Paulo Laus, laus@utfpr.edu.br
%%
@@ -26,15 +26,24 @@
\usepackage[version=latest]{pgf}
\usepackage{calc,listings,tikz}
+% if you need an index.
+\usepackage{makeidx}
+
+% for cross-references:
\usepackage{hyperref}
-\hypersetup{%
- colorlinks=false, % use true to enable colors below:
- linkcolor=blue,%red,
- filecolor=blue,%magenta,
- urlcolor=blue,%cyan,
- citecolor=blue,
- pdfborder=0 0 0,
-}
+ \hypersetup{%
+ colorlinks=true, % use true to enable colors below:
+ linkcolor=blue,%red,
+ filecolor=blue,%magenta,
+ pagecolor=blue,%red,
+ urlcolor=blue,%cyan,
+ citecolor=blue,
+ pdfborder=0 0 0, % PDF link-darstellung, falls colorlinks=false. 0 0 0: nix. 0 0 1: default.
+ pdfsubject={Typesetting Ladder Diagrams with LaTeX and TikZ},
+ pdfauthor={Luis Paulo Laus},
+ pdftitle={Typesetting Ladder Diagrams with with LaTeX and TikZ},
+ pdfkeywords={Ladder Diagrams,PCL,IEC 61131,LaTeX,TikZ},
+ }
% We need lots of libraries...
\usetikzlibrary{backgrounds}
@@ -45,13 +54,15 @@
\usepackage[a4paper,left=2.25cm,right=2.25cm,top=2.5cm,bottom=2.5cm,nohead]{geometry}
\usepackage{amsmath,amssymb}
\usepackage{xxcolor}
-%% \usepackage{pifont}
+%%\usepackage{pifont}
%\usepackage{tgpagella} % no ligatures (test)
\usepackage{makeidx}
\usepackage{enumitem}
\usepackage[T1]{fontenc}
\input{pgfmanual-en-macros} % Borrowed from TikZ/PGF
+%% ctan:/graphics/pgf/contrib/tikz-dependency/pgfmanual-en-macros.tex
+%% https://mirrors.ctan.org/graphics/pgf/contrib/sa-tikz/doc/macros/pgfmanual-en-macros.tex
\makeindex
@@ -92,29 +103,23 @@
%
% This file really starts here, all the above is for pgfmanual
% compatibility
-% \usetikzlibrary{circuits.plc.ladder}
+%%%\usetikzlibrary{circuits.plc.ladder}
\input ../tex/tikzlibrarycircuits.plc.ladder.code
-% some new lenghts
-\newlength{\ladderskip}
-\setlength{\ladderskip}{5\tikzcircuitssizeunit} % 5\tikzcircuitssizeunit = 35pt
-\newlength{\ladderrungsep}
-\setlength{\ladderrungsep}{.2\ladderskip}
-\def\ladderrungend#1{\pgftransformyshift{-#1\ladderskip-\ladderrungsep}}
\begin{document}
\title{Typesetting Ladder Diagrams with \LaTeX{} and \tikzname{}}
\author{Luis Paulo Laus\\e-mail: \texttt{laus@utfpr.edu.br}}
-\date{Version: 1.1, Version date: 2018-02-06}
+\date{Version: 1.3, Version date: 2022-04-10}
\maketitle
\section{Abstract}
-Ladder diagram (LD) is a graphical programming language that has evolved from electrical wiring diagrams for relay control systems used with programmable controllers (PLC\footnote{Formerly known as programable logic controllers.}) as described in the international standard IEC-61\,131-3. A LD program enables the programmable controller to test and modify data by means of standardized graphic symbols. These symbols are laid out in networks in a manner similar to a ``rung'' of a relay ladder logic diagram. This library provides \tikzname\ symbols to draw high quality ladder diagrams. All standard and some non-standard symbols are possible, including all kids of contacts, coils and blocks. I decided to write this package, despite of the fact that there is available another package named |ladder| that also uses \tikzname\ to typeset ladder diagrams, because that package seems\footnote{Sorry, but the documentation is in French and I limited myself to look at the figures.} to lack support for blocks. The |tikz-ladder|, on the contrary, supports all features described in IEC-61\,131-3, namely, blocks (for functions and function blocks), contacts and coils.
+Ladder diagram (LD) is a graphical programming language that has evolved from electrical wiring diagrams for relay control systems used with programmable controllers (PLC\footnote{Formerly known as programable logic controllers.}) as described in the international standard IEC-61\,131-3 \cite{61131}. An LD program enables the programmable controller to test and modify data using standard graphic symbols. These symbols are laid out in networks in a manner similar to a ``rung'' of a relay ladder logic diagram. This library provides \tikzname\ symbols to draw high-quality ladder diagrams. All standard and some non-standard symbols are possible, including all kinds of contacts, coils and blocks. I decided to write this package, although it is available another package named |ladder| that also uses \tikzname\ to typeset ladder diagrams because that package seems\footnote{Sorry, but the documentation is in French and I limited myself to looking at the figures.} to lack support for blocks. The |tikz-ladder|, on the contrary, supports all features described in IEC-61\,131-3 \cite{61131}, namely, blocks (for functions, function blocks, etc.), contacts and coils.
\section{Ladder Diagram}
-According to IEC-61\,131-3, the usage of letters, semigraphic or graphic for the representation of graphical elements is implementer specific and not a normative requirement. This poses a problem for creating a package for typesetting ladder diagrams in agreement to a standard that should be used by everyone: you can do whatever you want. Thus, this package provides \tikzname\ symbols for typesetting ladder diagram as close as possible to the standard, but not to close since a program in the standard would look like:
+According to IEC-61\,131-3 \cite[sic, p.~211]{61131}, the usage of letters, semi-graphic or graphic for the representation of graphical elements is implementer specific and not a normative requirement. This poses a problem for creating a package for typesetting ladder diagrams in agreement with a standard that should be used by everyone: you can do whatever you want. Thus, this package provides \tikzname\ symbols for typesetting ladder diagram as close as possible to the standard, but not too close since a program in the standard would look like:
\begin{center}
\begin{minipage}{5cm}
\begin{verbatim}
@@ -126,10 +131,10 @@ According to IEC-61\,131-3, the usage of letters, semigraphic or graphic for the
\end{verbatim}
\end{minipage}
\end{center}
-and it is probably not what you want. With this package, you can produce something like\footnote{This slightly awkward example was extracted from~[IEC-61\,131-3/2013, p. 218]; and explained by: ``In the rung shown above, the value of the Boolean output $a$ is always |TRUE|, while the value of outputs $c$, $d$ and $e$ upon completion of an evaluation of the rung is equal to the value of the input $b$.''. In 2013 version there is typo: the $a$ is missing. The 2003 version is correct.}:
+and it is probably not what you want. With |tikz-ladder|, you can produce something like\footnote{This slightly awkward example was extracted from reference~\cite[p.~218]{61131}; and explained by: ``In the rung shown above, the value of the Boolean output $a$ is always |TRUE|, while the value of outputs $c$, $d$ and $e$ upon completion of an evaluation of the rung is equal to the value of input $b$.''. In the 2013 version, there is a typo: the $a$ is missing. The 2003 version is correct.}:
\begin{center}
-\begin{tikzpicture} [circuit plc ladder,thick,x=\ladderskip,y=\ladderskip]
+\begin{tikzpicture} [circuit plc ladder,thick]
\draw(0,0)
to [coil={info={$a$}}] ++(1,0)
to [contact NO={info={$b$}}] ++(1,0) coordinate(node1)
@@ -137,29 +142,435 @@ and it is probably not what you want. With this package, you can produce somethi
to [coil={info={$d$}}] ++(1,0) coordinate(laddertopright);
\draw(node1) -- ++(0,-1)
to [coil={info={$e$}}] ++(2,0);
-% power rails
- \draw let \p1=(laddertopright) in
- (0,\y1+0.7\ladderskip) -- (0,-\ladderskip-\ladderrungsep)
- (\x1,\y1+0.7\ladderskip) -- (\x1,-\ladderskip-\ladderrungsep);
+\ladderrungend{2}
+\ladderpowerrails
\end{tikzpicture}
\end{center}
+The next section provides a formal introduction to the package and it is not meant to be complete. Section~\ref{guidance} gives some design guidance which is arguably the most important part of this document. The remaining contains more technical material and examples. The last sections address some specific issues and contain some final remarks, acknowledgements and references.
+
\section{Ladder Diagram Library}
\begin{pgflibrary}{circuits.plc.ladder}
-This library provides graphics for ladder diagram related to programable controllers (PLC) and according to the international standard IEC-61\,131-3. The library was written to extend the standard \tikzname-library |circuit|. The reader is urged to read the Section~``Circuit Libraries'' of \tikzname\ manual.
-This library defines the following key:
+This library provides graphics for ladder diagrams related to programable controllers (PLC) and according to the international standard IEC-61\,131-3 \cite{61131}. The library was written to extend the standard \tikzname-library |circuit|. The reader is urged to read Section~``Circuit Libraries'' of reference \cite{Tantau}.
+This library defines many symbols and the following keys, macros and lengths:
\begin{key}{/tikz/circuit plc ladder}
-This style calls |circuit plc ladder| and installs ladder diagram graphics for symbols like contacts, coils and blocks.
+This style calls |circuit plc ladder| and installs ladder diagram graphics for symbols like contacts, coils and blocks. Users are urged to read Section~\ref{guidance} for discussed examples and strategies for typesetting ladder diagrams.
+\end{key}
+
+\begin{command}{{\ladderskip}}
+A \LaTeX\ length is automatically set by |circuit plc ladder| to the vertical length unit, |y|. It can be used to prescribe widths and heights, especially regarding |blocks|. This length will be accurate even if the vertical length unit is redefined, for instance, via an option like |y=1cm|.
+\end{command}
+
+\begin{command}{{\ladderrungend}\marg{number}}
+This macro skips a \meta{number} of |\ladderskip| and resets the vertical coordinate so the next rung will start at |(0,0)|. It is meant to be used as an \emph{end of rung mark}. The \meta{number} does not need to be the number of rows in the current rung. Some arbitrary space can be used.
+\end{command}
+
+\begin{command}{{\ladderpowerrails}}
+This macro draws one or two power rails. It trusts |\ladderrungend| to draw the lines with the correct length. For two power rails, left and right, it also depends on the definition of point |laddertopright| at the end of the first row of the top rung.
+\end{command}
+
+\begin{key}{/tikz/ladderrungsep=\meta{number} (initially 0.2)}
+This key sets the extra space left at the end of every rung given in |\ladderskip| length unit.
+\begin{codeexample}[width=4.2cm]
+\begin{tikzpicture}[circuit plc ladder,thick,ladderrungsep=0.8]
+ \draw(0,0)
+ to [contact NO={info={$A$},name=ca}] ++(1,0)
+ to [coil={info={$Q$}}] ++(1,0) coordinate(laddertopright);
+ \fill[red!20] (laddertopright |- ca.south) rectangle +(-2,-1em);
+ \draw(0,-1)
+ to [contact NO={info={$B$},name=cb}] ++(1,0) -- +(0,1);
+ \fill[red!20] (laddertopright |- cb.south)
+ rectangle +(-2,-1em) coordinate (pb);
+ \fill[blue!20] (pb) rectangle ++(2,-0.8);
+\ladderrungend{2}
+ \draw(0,0)
+ to [contact NO={info={$C$},name=cc}] ++(1,0)
+ to [coil={info={$R$}}] ++(1,0);
+ \fill[red!20] (laddertopright |- cc.south)
+ rectangle +(-2,-1em) coordinate (pc);
+ \fill[blue!20] (pc) rectangle ++(2,-0.8);
+\ladderrungend{1}
+ \draw(0,0)
+ to [contact NO={info={$D$}}] ++(1,0)
+ to [coil={info={$S$}}] ++(1,0);
+\ladderrungend{1}
+\ladderpowerrails
+\end{tikzpicture}
+\end{codeexample}
+In this example, the commands |fill| draw ping rectangles to illustrate the free vertical space of about 1\,|em| between one row and the next inside the same rung and blue rectangles to illustrate the extra space between consecutive rungs inserted by |ladderrungsep=0.8|. If |ladderrungsep| is set to zero, the distance between rungs will the same as the distance between rows inside a rung, namely 1\,|\ladderskip|. As a consequence, the tip of the letters $C$, $R$, $D$ and $S$ would go inside the ping rectangles just like the tip of the letter $B$.
\end{key}
-In the next sections a description of the library features is provided.
+\noindent{}The next section brings examples and strategies for typesetting ladder diagrams. The detailed description of the library features is left for the subsequent sections.
\end{pgflibrary}
+\section{Design Guidance\label{guidance}}
+This section brings some recommendations that reflect the way I produce ladder diagrams. It may or may not work for you. Feel free to e-mail me if you have better ideas. One concept behind Section~``Circuit Libraries'' of reference \cite{Tantau} is that networks are drawn slightly different from other graphics in \tikzname. In essence, we draw a line and place several symbols on this line. Therefore, although it is possible to draw a symbol from the |tikz-ladder| library using the command |\node|, in general, it is much easier to use a combination of commands |\draw| and |to|. The |tikz-ladder| has been written to work this way.
+
+The first thing to consider is that, as the manual says \cite{Tantau}, ``\tikzname\ \emph{ist kein Zeichenprogramm}'' which translates to ``\tikzname\ \emph{is not a drawing program}''. You shall start with a draft of your diagram and then codify it using \tikzname. Generally, a handmade pencil sketch on grid paper will do. In this draft, you shall use node names for future reference. So, an example draft would look like this:
+
+\begin{center}
+\begin{tikzpicture}[circuit plc ladder,very thick,ladderrungsep=0,x=1cm,y=1cm]
+ \draw[blue,very thin,step=\ladderskip] (-1,2) grid (7,-8);
+ \draw(0,0) coordinate(N0)
+ to [contact NO={info={$E$}}] ++(1,0) --++(2,0)
+ to [block={info=$T1$,inputs={EN,IN,PT},
+ outputs={ENO,Q,ET},symbol={TON},name=T1,
+ minimum width=2\ladderskip,
+ input sep=\ladderskip,output sep=\ladderskip}]
+ ++(3,0) coordinate(laddertopright);
+ \draw(0,-1)
+ to [contact NO={info={$I$}}] ++(1,0)
+ to [contact NC={info={$Q$}}] ++(1,0) coordinate(N1)
+ -- (T1.input 2)
+ (T1.output 2) -- (6,-1) coordinate(N7); % grid coordinate
+ \draw(0,-2)
+ to [contact NC={info={$I$}}] ++(1,0)
+ to [contact NO={info={$Q$}}] ++(1,0) -- (N1);
+ \draw (T1.input 3) -- +(-0.2,0) node[left]{T\#2s}
+ (T1.output 3) -- +(0.2,0);
+\ladderrungend{3}
+ \draw(0,0)
+ to [contact NO={info={$T1.Q$}}] ++(1,0)
+ to [contact NC={info={$Q$}}] ++(1,0) coordinate(N2)
+ -- ++(3,0) coordinate(N3)
+ to [coil={info={$Q$}}] ++(1,0);
+ \draw(0,-1)
+ to [contact NC={info={$T1.Q$}}] ++(1,0)
+ to [contact NO={info={$Q$}}] ++(1,0) -- (N2)
+ (N3) -- ++(0,-1)
+ to [coil={info={$K$}}] ++(1,0);
+\ladderrungend{2}
+ \draw(0,0)
+ to [contact NO={info={$a$}}] ++(1,0) coordinate(N4)
+ to [contact NO={info={$c$}}] ++(1,0)
+ -- ++(1,0) coordinate(N5)
+ -- ++(2,0)
+ to [coil={info={$f$}}] ++(1,0);
+ \draw(N4) -- ++(0,-1)
+ to [contact NO={info={$d$}}] ++(1,0) coordinate(N6)
+ to [contact NO={info={$e$}}] ++(1,0) -- (N5);
+ \draw(0,-2)
+ to [contact NO={info={$b$}}] ++(1,0) -| (N6);
+\ladderrungend{3}
+\ladderpowerrails
+ \foreach \x in {1,...,6}
+ \node[label={[label distance=-4pt,above, red,font=\footnotesize]N\x},
+ circle,inner sep=2pt,draw=red] at (N\x) {};
+ \node[label={[label distance=-4pt,above left, red,font=\footnotesize](0,0)},
+ circle,inner sep=2pt,draw=red] at (N0) {};
+ \node[label={[label distance=-4pt,above right, red,font=\footnotesize](6,-1)},
+ circle,inner sep=2pt,draw=red] at (N7) {};
+ \node[label={[label distance=-4pt,above right, red,font=\footnotesize]laddertopright},
+ circle,inner sep=2pt,draw=red] at (laddertopright) {};
+\end{tikzpicture}
+\end{center}
+
+\noindent{}The diagram is constituted of horizontal wires or lines, where the components (contacts, coils and blocks) are inserted forming a row of elements, and vertical wires that joint with the horizontal ones. Nodes (coordinates) are placed at wire junctions and other meaningful points. Note that, in the example above, some nodes are indicated by name while others by their coordinates (see the red circles). Using the name instead of coordinates makes the diagram easier to modify, but the node position is needed. In most cases, the node position arises naturally from the construction of the diagram, but sometimes it is unknown and coordinates or cumbersome operations on coordinates have to be used instead. As a rule of thumb, \emph{named nodes should be placed using the command |coordinate| at every junction in which one wire goes down then right}, like |N3| and |N4|. Most of the time, for wires that go down then left like |N1|, |N2|, |N5| and |N6|, the connection can be made using relative coordinates like in \verb!-- ++(0,1)! or \verb!-- +(0,1)! since those connections will be made when the next row, the row below, is coded. A situation when it is worth using named nodes, even if wires below the current row come exclusively from the left, is when there is more than one connection like this:
+
+\begin{center}
+\begin{tikzpicture}[circuit plc ladder,very thick,ladderrungsep=0,x=1cm,y=1cm]
+ \draw[blue,very thin,step=\ladderskip] (-1,1) grid (5,-4); % grid
+ \draw(0,0)
+ to [contact NO={info={$a$}}] ++(1,0)
+ to [contact NO={info={$b$}}] ++(1,0)
+ to [contact NC={info={$c$}}] ++(1,0) coordinate(laddercoil)
+ to [coil={info={$Q$}}] ++(1,0) coordinate(laddertopright);
+ \draw(0,-1)
+ to [contact NO={info={$d$}}] ++(1,0)
+ to [contact NO={info={$e$}}] ++(1,0) -- +(1,0) coordinate(NoC1);
+ \draw(0,-2)
+ to [contact NC={info={$f$}}] ++(1,0)
+ to [contact NO={info={$g$}}] ++(1,0) -- +(1,0) coordinate(NoC2);
+ \draw(0,-3)
+ to [contact NO={info={$h$}}] ++(1,0) coordinate(N0);
+ \draw[purple, ultra thick] (N0) -| (laddercoil);
+\ladderrungend{4}
+\ladderpowerrails
+ \node[label={[label distance=0pt,rotate=90,right,red,font=\footnotesize]laddercoil},
+ circle,inner sep=2pt,draw=red] at (laddercoil) {};
+ \node[label={[label distance=-4pt,above right,red,font=\footnotesize]NoC1},
+ circle,inner sep=2pt,draw=red] at (NoC1) {};
+ \node[label={[label distance=-4pt,above right,red,font=\footnotesize]NoC2},
+ circle,inner sep=2pt,draw=red] at (NoC2) {};
+\end{tikzpicture}
+\end{center}
+
+\noindent{}Here, node |laddercoil| is connected to contact $e$, $g$ and $h$. In \tikzname, only the last connection is made: contact $h$ is connected to node |laddercoil|; horizontal fillers, |-- +(1,0)|, are placed after contacts $e$ and $g$ and the second and third rows end in those fillers; nodes |NoC1| and |NoC2| are not used and can be suppressed.
+
+The second thing to consider is that |tikz-ladder| uses the |\tikzcircuitssizeunit| to keep all figures proportional. Therefore, when you consider any length related to symbol size, it is a good idea to specify that length using |\tikzcircuitssizeunit| as the length unit\footnote{The default value of \textbackslash\verb|tikzcircuitssizeunit| is 7\,pt or approximately 2.46\,mm and it can be set by the \verb|circuit symbol unit| key among several other keys.}. Even better, used the new length |\ladderskip|.
+
+From version~1.3 on, |tikz-ladder| automatically sets |x| and |y| length units to 5\,|\tikzcircuitssizeunit| or approximately 12.35\,mm. It also sets a new length |\ladderskip| to |y| even if |y| is manually modified, for instance, via writing |y=7\tikzcircuitssizeunit| in the options list. The intention is to use |\ladderskip| as the vertical length unit to specify any length that depends on the diagram size. In particular, |\ladderskip| is used internally as the vertical distance between rows inside a rung and to draw power rails. Users can use |\ladderskip| to set |input sep| and |output set|, for instance. Compare:
+
+\begin{codeexample}[width=4cm]
+\begin{tikzpicture}[circuit plc ladder,thick]
+ \draw(0,0)
+ to [block={info=$T1$,inputs={EN,IN,PT},
+ outputs={ENO,Q,ET},symbol={TON},
+ name=T1,minimum width=2\ladderskip,
+ input sep=\ladderskip,output sep=\ladderskip}]
+ ++(3,0) coordinate(laddertopright);
+\ladderrungend{3}
+\ladderpowerrails
+\end{tikzpicture}
+\end{codeexample}
+
+\noindent{}with
+
+\begin{codeexample}[width=4cm]
+\begin{tikzpicture}[circuit plc ladder,thick,y=7\tikzcircuitssizeunit]
+ \draw(0,0)
+ to [block={info=$T1$,inputs={EN,IN,PT},
+ outputs={ENO,Q,ET},symbol={TON},
+ name=T1,minimum width=2\ladderskip,
+ input sep=\ladderskip,output sep=\ladderskip}]
+ ++(3,0) coordinate(laddertopright);
+\ladderrungend{3}
+\ladderpowerrails
+\end{tikzpicture}
+\end{codeexample}
+
+\noindent{}The width of the diagram remained the same because the horizontal length unit, |x|, was not changed, but |\ladderskip| was modified by |y=7\tikzcircuitssizeunit| affecting the block width and height: the width because |minimum width| depends on |\ladderskip|; the height because of |output sep| and |output sep|. Also, the power rails' length was affected (see below for more on power rails).
+
+Keeping track of a few rows in a rung is easy, but manually placing everything in the diagram is not, particularlly, if this diagram contains many rungs. So, a strategy was devised: draw one rung at a time and move the datum (reset the origin) at the end of every rung. This is done by a new macro |\ladderrungend| which resets the vertical reference to a vertical position $n$ rows below the current position (plus some inter-rung space) where $n$ is passed as a macro parameter. Note that |\ladderrungend| relies on |\ladderskip|. It also serves to \emph{mark} the rung end in the code (\tikzname\ ``program'') that generates the diagram making it more readable. The extra optional space between consecutive rungs is set as a fraction of |\ladderskip| by key |ladderrungsep|. One important advantage of this strategy is that this makes it possible to change the rung position by simply cutting and pasting it around because every node starts at |(0,0)|. No further adjustments nor editing are required.
+
+Returning to the example at the beginning of this section, we start coding at position |(0,0)| and use command |to| to place the symbols rung by rung, row by row:
+
+\begin{codeexample}[width=7.7cm]
+\begin{tikzpicture}[circuit plc ladder,thick]
+ \draw(0,0)
+ to [contact NO={info={$E$}}] ++(1,0) --++(2,0)
+ to [block={info=$T1$,inputs={EN,IN,PT},
+ outputs={ENO,Q,ET},symbol={TON},name=T1,
+ minimum width=2\ladderskip,
+ input sep=\ladderskip,output sep=\ladderskip}]
+ ++(3,0) coordinate(laddertopright);
+ \draw(0,-1)
+ to [contact NO={info={$I$}}] ++(1,0)
+ to [contact NC={info={$Q$}}] ++(1,0) coordinate(N1)
+ -- (T1.input 2)
+ (T1.output 2) -- (6,-1); % grid coordinate
+ \draw(0,-2)
+ to [contact NC={info={$I$}}] ++(1,0)
+ to [contact NO={info={$Q$}}] ++(1,0) -- (N1);
+ \draw (T1.input 3) -- +(-0.2,0) node[left]{T\#2s}
+ (T1.output 3) -- +(0.2,0);
+\ladderrungend{3}
+ \draw(0,0)
+ to [contact NO={info={$T1.Q$}}] ++(1,0)
+ to [contact NC={info={$Q$}}] ++(1,0) coordinate(N2)
+ -- ++(3,0) coordinate(N3)
+ to [coil={info={$Q$}}] ++(1,0);
+ \draw(0,-1)
+ to [contact NC={info={$T1.Q$}}] ++(1,0)
+ to [contact NO={info={$Q$}}] ++(1,0) -- (N2)
+ (N3) -- ++(0,-1)
+ to [coil={info={$K$}}] ++(1,0);
+\ladderrungend{2}
+ \draw(0,0)
+ to [contact NO={info={$a$}}] ++(1,0) coordinate(N4)
+ to [contact NO={info={$c$}}] ++(1,0)
+ -- ++(1,0) coordinate(N5)
+ -- ++(2,0)
+ to [coil={info={$f$}}] ++(1,0);
+ \draw(N4) -- ++(0,-1)
+ to [contact NO={info={$d$}}] ++(1,0) coordinate(N6)
+ to [contact NO={info={$e$}}] ++(1,0) -- (N5);
+ \draw(0,-2)
+ to [contact NO={info={$b$}}] ++(1,0) -| (N6);
+\ladderrungend{3}
+\ladderpowerrails
+\end{tikzpicture}
+\end{codeexample}
+
+\noindent{}First, a normally open contact $E$ is placed in the path by command |to|. This command interrupts the path, draws a node with the symbol corresponding to its options (a normally open contact in this case) and returns to the path drawing a line between the coordinate before it and the symbol and a second line between the symbol and the coordinate after the command |to|. So, each command |to| is written between two coordinates. It is very convenient to use relative coordinates to prescribe the second coordinate such that the $x$ value will be the space reserved for the symbol. Thus, |++(1,0)| will give one length unit for the symbol (see the grid in the example draft). Next, a filler of two units is placed with command |-- ++(2,0)|. Then, a block for a timer is placed leaving three-length units. The |minimum width|, |input sep| and |output sep| are all specified in terms of |\ladderskip|. The first row of the first rung ends with the command |coordinate(laddertopright)| which will be used by macro |\ladderpowerrails| to draw, quite obviously, the power rails.
+
+The first rung continues at point |(0,-1)|, followed by contacts $I$ and $Q$, both placed into a gap of one length unit each. Node |N1| is declared just after contact $Q$. Next, a line is drawn to the timer block second input, |-- (T1.input 2)|. The line connecting the second output to the right power rail is drawn using the absolute coordinate, |(6,-1)|. This point can also be specified using \verb!(T1.output 2 -| laddertopright)! which is more flexible and less prone to mistakes, see Section Coordinates at Intersections of reference \cite{Tantau}. This circumstance, connecting an output to an unspecified point, is uncommon but can happen. Normally, only the first block output is connected and it is done by the command |to| which inserts the block.
+
+Continuing at point |(0,-2)|, two contacts, $I$ and $Q$, are placed into a gap of one length unit each and this row is connected to the row above by command |-- (N1)| or just |-- +(0,1)| because we know for sure this contact will be connected with the line right above it. Here, a single |+| is used since local coordinates do not need to be updated.
+
+Finally, the preset time is written outside the block and little lines are drawn for the preset time and elapsed time -- terminals for PT and ET. The first rung ends with macro |\ladderrungend{3}| and the next rung will start at |(0,0)|, just like the first one.
+
+The second rung starts with two contacts, node |N2|, a filler |-- ++(3,0)|, another node |N3| and a coil $Q$. Node |N3| is placed to mark the start point of the descending line connected to coil $K$. In the next row, starting at |(0,-1)|, two contacts are inserted and the line is connected with the row above by command |-- (N2)| and, just like the first rung, it can be replaced by |-- +(0,1)|. The path restarts at node |N3| moving down and coil $K$ is inserted. The second rung ends with |\ladderrungend{2}|.
+
+The third and last rung starts at |(0,0)|. Node |N4| is placed between contacts $a$ and $c$. This node is used to place contact $d$. Node |N5| is placed between two fillers where a connection from contact $e$ arrives. A single filler of three length unit can be used after contact $c$ if node |N5| is suppressed because the connection is made after placing contact $e$ by a command like |--+(0,1)|. Node |N6| is placed between contacts $d$ and $e$ to make it easy to connect the left side of contact $b$. This connection could be done by |-- ++(1,0) --+(0,1)| or \verb!-|++(1,1)! but if the previous row is modified it would also have to be changed accordingly. The use of named nodes avoids this need.
+
+The third rung ends with |\ladderrungend{3}| and the macro |\ladderpowerrails| is used to draw the power rails on both sides of the diagram. This macro relies on node |laddertopright| placed in the very first row and the use of macro |\ladderrungend| to draw the power rails at the correct length.
+
+Every rung starts with |\draw(0,0)| to mark the first position. The next row of the same rung will start with |\draw(0,-1)| and so forth.
+
+All contacts and coils are placed by something like, e.g., \verb|to [contact NC={info={$I$}}] ++(1,0)|. The |to| command places the element between the current position and the next position which is one length unit at the right of the current position. Blocks are bigger and need more space, so after a block use |++(2,0)| or even a higher value.
+
+It is possible to pass a value different from the number of rows into a rung to macro |\ladderrungend|. This can be necessary, for instance, if the rung contains a big block. If, however, the user is not happy with the default separation between all rungs, the key |ladderrungsep| can be used to set a more suitable value.
+
+While typesetting a complex ladder diagram, it might be useful to draw a grid at least until you are satisfied with the produced diagram. Care should be taken, however, because macro |\ladderrungend| leaves extra space between successive rungs which would lead to grid misalignment. This can be avoided by temporarily setting |ladderrungsep| to zero or another integer. For instance, start your diagram with:
+
+\begin{codeexample}[code only]
+\begin{tikzpicture}[circuit plc ladder,thick,ladderrungsep=0]
+ \draw[blue,very thin,step=\ladderskip] (0,0) grid (5,-7);
+\end{codeexample}
+
+\noindent{}After completion, |ladderrungsep| can be returned to its original setting or any other suitable value and the grid can be erased or commented out.
+
+Another hint that can help is to make named nodes visible. Assuming all nodes start with |N| followed by a sequential number, the following code can be placed at the end of the picture to display (draw) the first four nodes:
+
+\begin{codeexample}[code only]
+ \foreach \x in {1,...,4}
+ \node[label={[label distance=-4pt,above, red,font=\tiny]N\x},
+ circle,inner sep=1pt,draw=red,thin] at (N\x) {};
+\end{codeexample}
+
+The right power rail is optional and many people are refraining from using it. Thus, the line on the right side of some symbols should not be drawn. To prevent \tikzname\ from drawing a line leaving the right side of the symbol, place this symbol at the end of the gap by typing |at end| or |pos=1| in the options list; like
+
+\begin{codeexample}[width=4.3cm,leave comments]
+\tikz[circuit plc ladder,thick]
+ \draw(0,0) to[contact NO={info={$a$}}] ++(1,0)
+ to[contact NO={info={$b$}}] ++(1,0)
+ to [coil={info={$c$},pos=1}] ++(1,0);
+\end{codeexample}
+
+\noindent{}The total gap for the coil can be reduced since the right side is not used anymore and this will make the space evenly distributed:
+
+\begin{codeexample}[width=4.3cm,leave comments]
+\tikz[circuit plc ladder,thick]
+ \draw(0,0) to[contact NO={info={$a$}}] ++(1,0)
+ to[contact NO={info={$b$}}] ++(1,0)
+ to [coil={info={$c$},pos=1}] ++(0.5,0);
+\end{codeexample}
+
+\noindent{}Moreover, if no |laddertopright| is set, |\ladderpowerrails| will draw only the left power rail. Returning once more to the example at the beginning of this section:
+\begin{codeexample}[width=7.7cm]
+\begin{tikzpicture}[circuit plc ladder,thick]
+ \draw(0,0)
+ to [contact NO={info={$E$}}] ++(1,0) --++(2,0)
+ to [block={info=$T1$,inputs={EN,IN,PT},
+ outputs={ENO,Q,ET},symbol={TON},name=T1,
+ minimum width=2\ladderskip,pos=1,
+ input sep=\ladderskip,output sep=\ladderskip}]
+ ++(1.5,0);
+ \draw(0,-1)
+ to [contact NO={info={$I$}}] ++(1,0)
+ to [contact NC={info={$Q$}}] ++(1,0) coordinate(N1)
+ -- (T1.input 2);
+ \draw(0,-2)
+ to [contact NC={info={$I$}}] ++(1,0)
+ to [contact NO={info={$Q$}}] ++(1,0) -- (N1);
+ \draw (T1.input 3) -- +(-0.2,0) node[left]{T\#2s}
+ (T1.output 1) -- +(0.2,0)
+ (T1.output 2) -- +(0.2,0)
+ (T1.output 3) -- +(0.2,0);
+\ladderrungend{3}
+ \draw(0,0)
+ to [contact NO={info={$T1.Q$}}] ++(1,0)
+ to [contact NC={info={$Q$}}] ++(1,0) coordinate(N2)
+ -- ++(3,0) coordinate(N3)
+ to [coil={info={$Q$},pos=1}] ++(0.5,0);
+ \draw(0,-1)
+ to [contact NC={info={$T1.Q$}}] ++(1,0)
+ to [contact NO={info={$Q$}}] ++(1,0) -- (N2)
+ (N3) -- ++(0,-1)
+ to [coil={info={$K$},pos=1}] ++(0.5,0);
+\ladderrungend{2}
+ \draw(0,0)
+ to [contact NO={info={$a$}}] ++(1,0) coordinate(N4)
+ to [contact NO={info={$c$}}] ++(1,0)
+ -- ++(1,0) coordinate(N5)
+ -- ++(2,0)
+ to [coil={info={$f$},pos=1}] ++(0.5,0);
+ \draw(N4) -- ++(0,-1)
+ to [contact NO={info={$d$}}] ++(1,0) coordinate(N6)
+ to [contact NO={info={$e$}}] ++(1,0) -- (N5);
+ \draw(0,-2)
+ to [contact NO={info={$b$}}] ++(1,0) -| (N6);
+\ladderrungend{3}
+\ladderpowerrails
+\end{tikzpicture}
+\end{codeexample}
+
+\noindent{}Note that the space meant for all symbols that would be connected to the right power rail, namely the timer $T1$ and coils $Q$, $K$ and $f$, is divided by two.
+
+You may need to change the diagram size. There are a few options: place it into |\resizebox|; use the key |scale|; set |x| and |y| length unit; and change the |\tikzcircuitssizeunit| through the key |circuit symbol unit|. Placing into a |\resizebox| changes everything and it is the preferable option for presentations. The key |scale| only changes the space between symbols, but the font size, line width and symbol sizes are all kept the same. Changing the |\tikzcircuitssizeunit| or setting set |x| and |y| length unit keeps the font size and line width, but changes the size of the symbol and, if you were careful, the distance between symbols.
+
+For example, to shrink the diagram to 70\% of its normal size, place these commands before your |\begin{tikzpicture}|. Note that you will have to undo this after the diagram.
+
+\begin{codeexample}[code only]
+\tikzset{circuit symbol unit=4.9pt}
+\scriptsize
+\end{codeexample}
+
+\noindent{}Incidentally, |\scriptsize| means 70\% of the current font size. The result should be:
+
+\begin{center}
+\tikzset{circuit symbol unit=4.9pt}
+\scriptsize
+\begin{tikzpicture} [circuit plc ladder,thick,execute at end picture=%
+{
+\begin{pgfonlayer}{background}
+\path[fill=graphicbackground]
+($(current bounding box.south west) + (-0.2,-0.2)$) rectangle
+($(current bounding box.north east) + (0.2,0.2)$);
+\end{pgfonlayer}
+}]
+ \draw(0,0)
+ to [contact NO={info={$E$}}] ++(1,0) --++(2,0)
+ to [block={info=$T1$,inputs={EN,IN,PT},
+ outputs={ENO,Q,ET},symbol={TON},
+ name=T1,minimum width=2\ladderskip,
+ input sep=\ladderskip,output sep=\ladderskip}]
+ ++(3,0) coordinate(laddertopright);
+ \draw(0,-1)
+ to [contact NO={info={$I$}}] ++(1,0)
+ to [contact NC={info={$Q$}}] ++(1,0)
+ -- (T1.input 2)
+ (T1.output 2) -- (6,-1); % grid coordinate
+ \draw(0,-2)
+ to [contact NC={info={$I$}}] ++(1,0)
+ to [contact NO={info={$Q$}}] ++(1,0) -- +(0,1);
+ \draw (T1.input 3) -- +(-0.2,0) node[left]{T\#2s}
+ (T1.output 3) -- +(0.2,0);
+\ladderrungend{3}
+ \draw(0,0)
+ to [contact NO={info={$T1.Q$}}] ++(1,0)
+ to [contact NC={info={$Q$}}] ++(1,0)
+ -- ++(3,0) coordinate(N1)
+ to [coil={info={$Q$}}] ++(1,0);
+ \draw(0,-1)
+ to [contact NC={info={$T1.Q$}}] ++(1,0)
+ to [contact NO={info={$Q$}}] ++(1,0) -- +(0,1)
+ (N1) -- ++(0,-1)
+ to [coil={info={$K$}}] ++(1,0);
+\ladderrungend{2}
+ \draw(0,0)
+ to [contact NO={info={$a$}}] ++(1,0) coordinate(N2)
+ to [contact NO={info={$c$}}] ++(1,0) -- ++(3,0)
+ to [coil={info={$f$}}] ++(1,0);
+ \draw(N2) -- ++(0,-1)
+ to [contact NO={info={$d$}}] ++(1,0) coordinate(N3)
+ to [contact NO={info={$e$}}] ++(1,0) -- ++(0,1);
+ \draw(0,-2)
+ to [contact NO={info={$b$}}] ++(1,0) -| (N3);
+\ladderrungend{3}
+\ladderpowerrails
+\end{tikzpicture}
+\end{center}
+\normalsize
+
+\tikzset{circuit symbol unit=7pt}
+
+This may not be the best way to perform big adjustments, but it can help in some occasions where a small adjustment is needed. Also, if you do it frequently, consider writing a macro to encapsulate the feature.
+
+The next sections give details on the symbols supported by |tikz-ladder| divided in three main categories:
+\begin{description}[align=right,leftmargin=22mm,labelwidth=20mm,labelsep=2mm]
+\item[contacts] all kinds of standard contacts;
+\item[coils] all kinds of standard coils are supported and the curvature of a coil is customizable;
+\item[blocks] all kinds of standard blocks are supported and examples of timers, counter, bistable functions blocks, edge detection functions blocks and call representation are given.
+\end{description}
+
+
\section{Contacts}
-A contact is an element which imparts a state to the horizontal link on its right side which is equal to the Boolean |AND| of the state of the horizontal link at its left side with an appropriate function of an associated Boolean input, output, or memory variable. A contact does not modify the value of the associated Boolean variable.
+A contact is an element which imparts a state to the horizontal link on its right side which is equal to the Boolean |AND| of the state of the horizontal link at its left side with an appropriate function of an associated Boolean input, output or memory variable. A contact does not modify the value of the associated Boolean variable \cite[sic, p.~216]{61131}.
\begin{codeexample}[]
\begin{tikzpicture}[circuit plc ladder]
@@ -170,40 +581,40 @@ A contact is an element which imparts a state to the horizontal link on its righ
\end{tikzpicture}
\end{codeexample}
-All kinds of standardized contacts can be represented: normally open contact (NO); normally closed contact (NC); positive transition-sensing contact (P); negative transition-sensing contact (N); compare contacts both typed and overloaded (for typesetting purposes it makes no difference.) In the following examples, the Boolean variable associated with the contact is indicated by ``***''.
+All kinds of standard contacts can be represented: normally open contact (NO); normally closed contact (NC); positive transition-sensing contact (P); negative transition-sensing contact (N); compare contacts both typed and overloaded (for typesetting purposes it makes no difference.) In the following examples, the Boolean variable associated with the contact is indicated by ``***''.
Normally open contact (NO):
-\begin{codeexample}[width=2.3cm]
+\begin{codeexample}[width=2.7cm]
\tikz[circuit plc ladder,thick]
\draw(0,0) to [contact NO={info={***}}] ++(2,0);
\end{codeexample}
Normally closed contact (NC):
-\begin{codeexample}[width=2.3cm]
+\begin{codeexample}[width=2.7cm]
\tikz[circuit plc ladder,thick]
\draw(0,0) to [contact NC={info={***}}] ++(2,0);
\end{codeexample}
-Variation of normally closed contact (NC):
-\begin{codeexample}[width=2.3cm]
+Variation of the normally closed contact (NC):
+\begin{codeexample}[width=2.7cm]
\tikz[circuit plc ladder,thick]
\draw(0,0) to [var contact NC={info={***}}] ++(2,0);
\end{codeexample}
Positive transition-sensing contact (P):
-\begin{codeexample}[width=2.3cm]
+\begin{codeexample}[width=2.7cm]
\tikz[circuit plc ladder,thick]
\draw(0,0) to [contact P={info={***}}] ++(2,0);
\end{codeexample}
Negative transition-sensing contact (N):
-\begin{codeexample}[width=2.3cm]
+\begin{codeexample}[width=2.7cm]
\tikz[circuit plc ladder,thick]
\draw(0,0) to [contact N={info={***}}] ++(2,0);
\end{codeexample}
Compare contact (typed):
-\begin{codeexample}[width=2.3cm]
+\begin{codeexample}[width=2.7cm]
\tikz[circuit plc ladder,thick]
\draw(0,0) to [contact NO={
info={\scriptsize intvalue1},
@@ -212,7 +623,7 @@ Compare contact (typed):
\end{codeexample}
Compare contact (overloaded):
-\begin{codeexample}[width=2.3cm]
+\begin{codeexample}[width=2.7cm]
\tikz[circuit plc ladder,thick]
\draw(0,0) to [contact NO={
info={\scriptsize value1},
@@ -224,7 +635,7 @@ There are two possibilities for normally closed contact. It is not recommended t
\subsection{Keys for contacts}
-The most common key used with contacts is |info| which sets the variable name associated with the contacts. One may also need |info'| and |name|; both standard keys. In addition to the keys described in Section~''Circuit Libraries'' of ``The TikZ and PGF Packages -- Manual for version 3.0.1a'', contacts accept:
+The most common key used with contacts is |info| which sets the variable name associated with the contacts. One may also need |info'| and |name|; both standard keys. In addition to the keys described in Section~''Circuit Libraries'' of reference \cite{Tantau}, contacts accept:
\begin{key}{/tikz/symbol=\meta{name}}
This key sets the information, usually a single letter or comparison symbol, that will appear between the vertical lines. Usable for drawing compare contacts.
\end{key}
@@ -232,7 +643,7 @@ This key sets the information, usually a single letter or comparison symbol, tha
\section{Coils}
-A coil copies the state of the link on its left to the link on its right without modification, and stores an appropriate function of the state or transition of the left link into the associated Boolean variable.
+A coil copies the state of the link on its left to the link on its right without modification and stores an appropriate function of the state or transition of the left link into the associated Boolean variable \cite[sic, p.~218]{61131}.
\begin{codeexample}[]
\begin{tikzpicture}[circuit plc ladder]
@@ -252,14 +663,14 @@ A coil copies the state of the link on its left to the link on its right without
\end{codeexample}
The |coil ladder curvature| controls how round the coils look like. The default value is 0.2 as indicated above; 0.5 makes a round coil like\footnote{It can be used to draw relay coils according to NEMA -- National Electrical Manufacturers Association.}:
-\begin{codeexample}[width=2.3cm]
+\begin{codeexample}[width=2.7cm]
\tikz[circuit plc ladder,thick]
\draw(0,0) to [coil R={info={Motor},
coil ladder curvature=0.5,
minimum size=2.4\tikzcircuitssizeunit}] ++(2,0);
\end{codeexample}
-Note that it is also necessary to set the |minimum size| because coils have a proportion of $2.4\times2$. If you do this frequently, you can set the style for the coils like:
+Note that it is also necessary to set the |minimum size| or |minimum height| because coils have a proportion of $2.4\times2$. If you do this frequently, you can set the style for the coils like:
\begin{codeexample}[code only]
every coil R/.style={coil ladder curvature=0.5,minimum size=2.4\tikzcircuitssizeunit}
@@ -267,46 +678,46 @@ every coil R/.style={coil ladder curvature=0.5,minimum size=2.4\tikzcircuitssize
Values above 0.5, although possible, lead to estrange figures.
-All kind of standardized coils are supported: coil (normal); negated coil (normally activated, NA); set (latch) coil; reset (unlatch) coil; positive transition-sensing coil; and negative transition-sensing coil. In the following examples, the Boolean variable associated with the coil is indicated by ``***''.
+All kinds of standard coils are supported: coil (normal); negated coil (normally activated, NA); set (latch) coil; reset (unlatch) coil; positive transition-sensing coil; and negative transition-sensing coil. In the following examples, the Boolean variable associated with the coil is indicated by ``***''.
Coil (normally deactivated):
-\begin{codeexample}[width=2.3cm]
+\begin{codeexample}[width=2.7cm]
\tikz[circuit plc ladder,thick]
\draw(0,0) to [coil={info={***}}] ++(2,0);
\end{codeexample}
Negated coil (normally activated, NA):
-\begin{codeexample}[width=2.3cm]
+\begin{codeexample}[width=2.7cm]
\tikz[circuit plc ladder,thick]
\draw(0,0) to [coil NA={info={***}}] ++(2,0);
\end{codeexample}
-Variation of negated coil (normally activated, NA):
-\begin{codeexample}[width=2.3cm]
+Variation of the negated coil (normally activated, NA):
+\begin{codeexample}[width=2.7cm]
\tikz[circuit plc ladder,thick]
\draw(0,0) to [var coil NA={info={***}}] ++(2,0);
\end{codeexample}
Set (latch) coil:
-\begin{codeexample}[width=2.3cm]
+\begin{codeexample}[width=2.7cm]
\tikz[circuit plc ladder,thick]
\draw(0,0) to [coil S={info={***}}] ++(2,0);
\end{codeexample}
Reset (unlatch) coil:
-\begin{codeexample}[width=2.3cm]
+\begin{codeexample}[width=2.7cm]
\tikz[circuit plc ladder,thick]
\draw(0,0) to [coil R={info={***}}] ++(2,0);
\end{codeexample}
Positive transition-sensing coil:
-\begin{codeexample}[width=2.3cm]
+\begin{codeexample}[width=2.7cm]
\tikz[circuit plc ladder,thick]
\draw(0,0) to [coil={info={***},symbol=P}] ++(2,0);
\end{codeexample}
Negative transition-sensing coil:
-\begin{codeexample}[width=2.3cm]
+\begin{codeexample}[width=2.7cm]
\tikz[circuit plc ladder,thick]
\draw(0,0) to [coil={info={***},symbol=N}] ++(2,0);
\end{codeexample}
@@ -315,34 +726,34 @@ Note that positive and negative transition-sensing coils are not supported direc
There are two possibilities for negated coil (NA). It is not recommended to mix them in the same document unless to explain their equivalence.
-It is possible, though not recommend because it disagrees with IEC-61\,131-3, to use non-standard coils, e.g., some people uses L (for latch) and U (for unlatch) instead of, S and U, respectively. This is achieved by setting the |symbol| of a |coil| like:
+It is possible, though not recommended because it disagrees with IEC-61\,131-3 \cite{61131}, to use non-standard coils, e.g., some people use L (for latch) and U (for unlatch) instead of, S and R, respectively. This is achieved by setting the |symbol| of a |coil| like:
-\begin{codeexample}[width=2.3cm]
+\begin{codeexample}[width=2.7cm]
\tikz[circuit plc ladder,thick]
\draw(0,0) to [coil={info={***},symbol=L}] ++(2,0);
\end{codeexample}
-\noindent{}The same trick used for positive and negative transition-sensing coils.
+\noindent{}The same trick has been used for positive and negative transition-sensing coils.
\subsection{Keys for coils}
-The most common key used with coils is |info| which sets the variable name associated with the coil. One may also need |info'|, |name| and |minimum size|; all standard keys. In addition to the keys described in Section~``Circuit Libraries'' of ``The TikZ and PGF Packages -- Manual for version 3.0.1a'', coils accept:
+The most common key used with coils is |info| which sets the variable name associated with the coil. One may also need |info'|, |name| and |minimum size|; all standard keys. In addition to the keys described in Section~``Circuit Libraries'' of reference \cite{Tantau}, coils accept:
\begin{key}{/tikz/symbol=\meta{name}}
-This key sets the information, usually a single letter, that will appear between the parenthesis. Usable for non-standard or rarely used coils lake positive and negative transition-sensing coils.
-\begin{codeexample}[width=2.3cm]
+This key sets the information, usually a single letter, that will appear between the parenthesis. Usable for non-standard or rarely used coils like positive and negative transition-sensing coils.
+\begin{codeexample}[width=2.7cm]
\tikz[circuit plc ladder,thick]
\draw(0,0) to [coil={info={***},symbol=L}] ++(2,0);
\end{codeexample}
\end{key}
\begin{key}{/tikz/coil ladder curvature=\meta{curvature index} (initially 0.2)}
-This key sets the curvature index, a number between 0.001 and 0.5 (in practice, though higher values are permitted) that defined how much the parentheses will be bent. It is the fraction of the total coil width occupied by one parenthesis. Usable for drawing electric coils in NEMA standard. In this case, |minimum size| will have to adjusted in order to correct the coil aspect ratio.
-\begin{codeexample}[width=2.3cm,leave comments]
+This key sets the curvature index, a number between 0.001 and 0.5 (in practice, though higher values are permitted) that defined how much the parentheses will be bent. It is the fraction of the total coil width occupied by one parenthesis. Usable for drawing electric coils in NEMA standard. In this case, the |minimum size| will have to be adjusted to correct the coil aspect ratio.
+\begin{codeexample}[width=2.7cm,leave comments]
\tikz[circuit plc ladder,thick]
\draw(0,0) to [coil={info={\%Q0.0},
coil ladder curvature=0.1}] ++(2,0);
\end{codeexample}
-\begin{codeexample}[width=2.3cm,leave comments]
+\begin{codeexample}[width=2.7cm,leave comments]
\tikz[circuit plc ladder,thick]
\draw(0,0) to [coil={info={\%Q0.0},
coil ladder curvature=0.3}] ++(2,0);
@@ -352,9 +763,9 @@ This key sets the curvature index, a number between 0.001 and 0.5 (in practice,
\section{Blocks}
-Blocks are used to represent all other features besides contacts and coils, namely functions and function blocks, mainly: timers, counters, communication, string treatment, arithmetic and logical operations. Blocks can have many inputs and outputs. The first input and output shall be aligned with the rung line. This is done automatically and explains why the |center| anchor is not on the centre of the rectangle. For the exact rectangle centre use the |block center| anchor.
+Blocks are used to represent all other features besides contacts and coils, namely functions, methods and function blocks -- call representation. The main functions and function blocks are: timers, counters, communication, string treatment, arithmetic and logical operations. Blocks can have many inputs and outputs. The first input and output shall be aligned with the rung line. This is done automatically and explains why the |center| anchor is not in the centre of the rectangle. For the exact rectangle centre, use the |block center| anchor.
-Next, a block for a counter is represented with the anchors, you can see the input |>A| causes a clock input indication and the symbol |>| itself is gobbled. The input and output names are not accordingly to the standard IEC-61\,131-3.
+Next, a block for a counter is represented with the anchors, you can see the input |>A| causes a clock input indication and the symbol |>| itself is gobbled. The input and output names are not accordingly to the standard IEC-61\,131-3 \cite{61131}.
\begin{codeexample}[]
\Huge
@@ -371,30 +782,30 @@ Next, a block for a counter is represented with the anchors, you can see the inp
\end{tikzpicture}
\end{codeexample}
-In the following subsections the standard names are employed accordingly to IEC-61\,131-3.
+In the following subsections, the standard names are employed accordingly to IEC-61\,131-3 \cite{61131}.
\subsection{Keys for blocks}
-The three most common keys used with blocks are |symbol| which sets the block type, |name| which sets a \tikzname\ label to be used in future references, particularly to access the inputs and outputs, and |info| which sets the variable name associated with the POU (program organization unit) represented by the block. One may also need |info'| and |minimum width|; all standard keys. In addition to the keys described in Section~``Circuit Libraries'' of ``The TikZ and PGF Packages -- Manual for version 3.0.1a'', blocks accept:
+The three most common keys used with blocks are |symbol| which sets the block type, |name| which sets a \tikzname\ label to be used in future references, particularly to access the inputs and outputs, and |info| which sets the variable name associated with the POU (program organization unit) represented by the block. One may also need the standard keys |info'| and |minimum width|. In addition to the keys described in Section~``Circuit Libraries'' of reference \cite{Tantau}, blocks accept:
\begin{key}{/tikz/symbol=\meta{name}}
This key sets the information that appears inside the block rectangle, on the top. It specifies the POU type represented by the block.
\end{key}
\begin{key}{/tikz/symbol color=\meta{colour}}
-This key sets the colour used for all texts inside the block: symbol, inputs and outputs. In a |beamer| presentation it can be override for a particular input/output by forcing the text colour like this: |{\textcolor{blue}{Q}}|. For other document classes, you need to use a box:
-\begin{codeexample}[width=4.4cm]
+This key sets the colour used for all texts inside the block: symbol, inputs and outputs. In a |beamer| presentation it can be overridden for a particular input/output by forcing the text colour like this: \verb|{\textcolor{blue}{Q}}|. For other document classes, you need to use a box:
+\begin{codeexample}[width=5.3cm]
\newsavebox{\myeqbox} % only once, preferable in the document preamble
\savebox{\myeqbox}{\textcolor{blue}{Q}}
\tikz[circuit plc ladder,thick] \draw[orange](0,0) to [block={violet,
info={[blue]$CT1$},inputs={>CU,R,PV}, outputs={\usebox{\myeqbox},CV},
- symbol=CTU\_SINT, symbol color=red, minimum width=2.4cm}] ++(4,0);
+ symbol={CTU\_SINT}, symbol color=red, minimum width=2.4cm}] ++(4,0);
\end{codeexample}
\end{key}
-\begin{key}{/tikz/clksize=\meta{width} (initially 0.8\\|tikzcircuitssizeunit|)}
+\begin{key}{/tikz/clksize=\meta{width} (initially 0.8\char`\\|tikzcircuitssizeunit|)}
This key sets the size for the clock input indicator (|>|).
-\begin{codeexample}[]
+\begin{codeexample}[width=5.3cm]
\tikz[circuit plc ladder,thick] \draw(0,0) to [block={
info=$CT1$,inputs={>$CU$,R,PV}, outputs={Q,CV},
symbol=CTU\_SINT, clksize=0.4cm,
@@ -402,38 +813,39 @@ This key sets the size for the clock input indicator (|>|).
\end{codeexample}
\end{key}
-\begin{key}{/tikz/input sep=\meta{width} (initially 1.6\\|tikzcircuitssizeunit|)}
+\begin{key}{/tikz/input sep=\meta{width} (initially 1.6\char`\\|tikzcircuitssizeunit|)}
This key sets the vertical distance between two consecutive inputs.
\begin{codeexample}[width=5.3cm]
-\begin{tikzpicture}[circuit plc ladder,thick]
+\begin{tikzpicture}[circuit plc ladder,thick,x=1cm,y=1cm]
\draw(0,0) to [contact NO={info={$I1$}}] ++(1,0)
to [block={info=$TM1$,symbol=TON,
inputs={EN,IN,PT},outputs={ENO,Q,ET},
name=TM1,minimum width=1.6cm,
input sep=1cm,output sep=1cm}] ++(3,0)
- to [coil={info={$M$}}] ++(1,0);
+ to [coil={info={$M$},pos=1}] ++(0.5,0);
\draw(0,-1) to [contact NO={info={$I2$}}] ++(1,0) -- (TM1.input 2)
- (TM1.output 2) -- (4,-1) to [coil={info={$R$}}] ++(1,0)
- (TM1.input 3) -- +(-3mm,0)node[left]{T\#3s} (0,1) -- +(0,-3.5);
+ (TM1.output 2) -- (4,-1) to [coil={info={$R$},pos=1}] ++(0.5,0)
+ (TM1.input 3) -- +(-0.3,0)node[left]{T\#3s} (0,1) -- +(0,-3.5);
\end{tikzpicture}
\end{codeexample}
+\noindent{}Note that, in this example, |x|, |y|, |input sep| and |output sep| are all set to 1\,cm. Usually, this is not a good idea and a multiple of |\tikzcircuitssizeunit| should be used instead. Even better, |\ladderskip| should be used in |input sep| and |output sep| because this length is automatically set to |y|. See Section~\ref{guidance} for details.
\end{key}
-\begin{key}{/tikz/output sep=\meta{width} (initially 1.6\\|tikzcircuitssizeunit|)}
+\begin{key}{/tikz/output sep=\meta{width} (initially 1.6\char`\\|tikzcircuitssizeunit|)}
This key sets the vertical distance between two consecutive outputs (see example above).
\end{key}
\begin{key}{/tikz/input=\meta{inputs} (initially |{IN}|)}
-This key sets the input names that appear inside the block. It is a comma separated list of inputs. Clock inputs are indicated by the first character being |>|. Coordinates for future external connection are automatically generated in the form \emph{name}.|input|~$n$, where $n$ is the input number starting in 1. An empty input can be generated by |{~}|. The minimal number of inputs is one, an empty list of inputs generates an error.
+This key sets the input names that appear inside the block. It is a comma-separated list of inputs. Clock inputs are indicated by the first character being |>|. Coordinates for future external connections are automatically generated in the form \emph{name}.|input|~$n$, where $n$ is the input number starting in 1. An empty input can be generated by |~| or |{}|. The minimal number of inputs is one, an empty list of inputs generates an error.
\end{key}
\begin{key}{/tikz/output=\meta{outputs} (initially |{Q}|)}
-This key sets the output names that appear inside the block. It is a comma separated list of outputs. Coordinates for future external connection are automatically generated in the form \emph{name}.|output|~$n$, where $n$ is the output number starting in 1. An empty output can be generated by |{}|. The minimal number of outputs is one, an empty list of outputs generates an error.
+This key sets the output names that appear inside the block. It is a comma-separated list of outputs. Coordinates for future external connections are automatically generated in the form \emph{name}.|output|~$n$, where $n$ is the output number starting in 1. An empty output can be generated by |~| or |{}|. The minimal number of outputs is one, an empty list of outputs generates an error.
\end{key}
\subsection{Timers}
-The standard IEC-61\,131-3 specifies three timers as follows:
+The standard IEC-61\,131-3 \cite[p.~114]{61131} specifies three timers as follows:
\noindent{}On-delay:
\begin{codeexample}[width=6cm,pre={\begin{tikzpicture}[circuit plc ladder,thick]},post=\end{tikzpicture}]
@@ -466,9 +878,9 @@ The standard IEC-61\,131-3 specifies three timers as follows:
\end{codeexample}
\subsection{Counters}
-The clock input is indicated by the character |>| which need to be the very first one in the input description of a clock input. You can use any number of clock inputs and they can appear in any order. For instance, the inputs of an up-down counter with enable input shall be declare as |inputs={EN,>CU,>CD,R,LD,PV}|.
+The clock input is indicated by the character |>| which needs to be the very first one in the input description of a clock input. You can use any number of clock inputs and they can appear in any order. For instance, the inputs of an up-down counter with enable input shall be declared as \verb|inputs={EN,>CU,>CD,R,LD,PV}|.
-The standard IEC-61\,131-3 specifies three counters. In the following examples, the symbol ``*'' indicates the numerical type of the counter (like |INT|, |DINT|, etc.).
+The standard IEC-61\,131-3 \cite[p.~113]{61131} specifies three counters. In the following examples, the symbol ``*'' indicates the numerical type of the counter (like |INT|, |DINT|, etc.).
\noindent{}Up-Counter:
\begin{codeexample}[width=6cm,pre={\begin{tikzpicture}[circuit plc ladder,thick]},post=\end{tikzpicture}]
@@ -535,7 +947,7 @@ Bistable function block (set dominant): |RS(S1,R, Q1)|
(sr1.output 1) -- +(5mm,0) node[right]{BOOL};
\end{codeexample}
-\noindent{}Bistable function block (reset dominant) with long input names\footnote{Here we have a clear inconsistency between the text description that presents the input |RESET1| and graphical representation where it is |R1|. It is probably just a typo, but the form presented in~[IEC-61\,131-3/2013, p. 112] was kept unchanged.}: |RS(SET,RESET1, Q1)|
+\noindent{}Bistable function block (reset dominant) with long input names\footnote{Here we have a clear inconsistency between the text description that presents the input |RESET1| and graphical representation where it is |R1|. It is probably just a typo, but the form presented in~\cite[p.~112]{61131} was kept unchanged.}: |RS(SET,RESET1, Q1)|
\begin{codeexample}[width=6cm,pre={\begin{tikzpicture}[circuit plc ladder,thick]},post=\end{tikzpicture}]
\node[block,inputs={SET,R1},outputs={Q1},
symbol=SR,minimum width=18mm] (sr1) {};
@@ -566,10 +978,10 @@ Rising edge detector: |R_TRIG(CLK, Q)|
\subsection{Call representation}
-A call is used to execute a function, a function block instance, or a method of a function block or class. They are represented by blocks.
+A call is used to execute a function, a function block instance or a method of a function block or class \cite[sic, p.~60]{61131}. They are represented by blocks.
-The proper map for in-out variables (|VAR_IN_OUT|) needs special care. This map is represented by a line internal to the block connecting the left and right side of the in-out variable. The problem is that |tikz-ladder| only creates anchors at the left side of the inputs and right side of outputs. We need the opposite. This situation can be overcome in either two ways: using |calc| library to add and subtract a suitable distance to/from the standard anchors; creating two coordinates related to the input and output anchors but dislocated a suitable amount towards the interior of the block. Using |calc| library, one examples is:
-\begin{codeexample}[width=6cm,pre={\begin{tikzpicture}[circuit plc ladder,thick]},post=\end{tikzpicture}]
+The proper map for in-out variables (|VAR_IN_OUT|) needs special care. This map is represented by a line internal to the block connecting the left and right sides of the in-out variable. The problem is that |tikz-ladder| only creates anchors external to the block, meaning, at the left side of the inputs and the right side of outputs. We need the opposite. This situation can be overcome in three ways: using the |calc| library to add and subtract a suitable distance to/from the standard anchors; using |xshif| to displace the standard anchors; creating two coordinates related to the input and output anchors but dislocating a suitable amount towards the interior of the block. Using |calc| library, one example is:
+\begin{codeexample}[width=5.3cm,pre={\begin{tikzpicture}[circuit plc ladder,thick,x=1cm,y=1cm]},post=\end{tikzpicture}]
\draw(0,0)
to [contact NO={info={cond}}] ++(1,0)
to [block={inputs={EN,A,C},outputs={ENO,B,C},
@@ -577,162 +989,30 @@ The proper map for in-out variables (|VAR_IN_OUT|) needs special care. This map
minimum width=1.6cm,
input sep=1.2em, output sep=1.2em}] ++(3,0)
to [coil={info={X}}] +(1,0);
- \draw (mf1.input 2) -- +(-0.3cm,0) node[left]{v1}
- (mf1.input 3) -- +(-0.3cm,0) node[left]{v3}
- (mf1.output 2) -- +(0.3cm,0) node[right]{v2}
- (mf1.output 3) -- +(0.3cm,0)
+ \draw (mf1.input 2) -- +(-0.2,0) node[left]{v1}
+ (mf1.input 3) -- +(-0.2,0) node[left]{v3}
+ (mf1.output 2) -- +(0.2,0) node[right]{v2}
+ (mf1.output 3) -- +(0.2,0)
($(mf1.input 3) + (1em,0)$) -- ($(mf1.output 3) - (1em,0)$);
\end{codeexample}
-If you prefer to use the |\coordinate| command, place:
+\noindent{}The same effect can be obtained replacing the last code line by \verb|([xshift=1em]mf1.input 3) -- ([xshift| \verb|=-1em]mf1.output 3);|, but this time, the anchors are displaced by the command |xshift|. If, however, you prefer to use the |\coordinate| command, place:
\begin{codeexample}[code only]
\coordinate[xshift=1em] (p1) at (mf1.input 3);
\coordinate[xshift=-1em] (p2) at (mf1.output 3);
\end{codeexample}
\noindent{}between the two |\draw| commands and replace de last code line by \verb|(p1) -- (p2);|.
-
-\section{Design Guidance\label{guidance}}
-This section brings some recommendations that reflect the way I produce ladder diagrams. It may or may not work for you. Feel free to e-mail me if you have better ideas.
-
-The first thing to consider is that, as the manual says, ``\tikzname\ \emph{ist kein Zeichenprogramm}'' which translates to ``\tikzname\ \emph{is not a drawing program}''. You shall start with a draft of you diagram and then codify it using \tikzname. Generally, a handmade pencil sketch will do. In this draft, you shall use node names for future reference.
-
-The second thing to consider is that |tikz-ladder| uses the |\tikzcircuitssizeunit| to keep all figures proportional. Therefore, when you consider any dimension related to symbol size it is good idea to set that dimension in respect to |\tikzcircuitssizeunit|, i.e., using |\tikzcircuitssizeunit| as the length unit\footnote{Therefore, all the examples in the previous sections should be reviewed.}. The default value of |\tikzcircuitssizeunit| is 7\,pt or approximately 2.46\,mm and it can be set by the |circuit symbol unit| key among several other keys. Even better, you can establish your own length unit and set $x$ and $y$ to that length unit. In this way you will be working on a grid; if it is too big or too small you will have to change a single declaration. The |\tikzcircuitssizeunit| is too small for that purpose, so I use and recommend |5\tikzcircuitssizeunit| instead. Moreover, I like to leave a small space between rungs, so a second new length can be used to keep this amount. Again, you can adjust it globally. Thus, just after loading the |tikz-ladder| library I use to declare:
-\begin{codeexample}[code only]
-\newlength{\ladderskip}
-\setlength{\ladderskip}{5\tikzcircuitssizeunit} % 5\tikzcircuitssizeunit = 35pt
-\newlength{\ladderrungsep}
-\setlength{\ladderrungsep}{.2\ladderskip}
-\def\ladderrungend#1{\pgftransformyshift{-#1\ladderskip-\ladderrungsep}}
-\end{codeexample}
-\noindent{}where:
-\begin{description}[align=right,leftmargin=3.2cm,labelwidth=3cm,labelsep=2mm]
-\item[|ladderskip|] is the length that controls all distances in the diagram;
-\item[|ladderrungsep|] is the additional separation between two successive rungs; and
-\item[|ladderrungend|] is a macro that marks the end of a rung. Actually, it leaves a space and set the new vertical datum. The parameter of this macros is the number of rows the ending rung has plus some extra space if you like it.
-\end{description}
-
-To keeps track of a few rows in a rung is easy, but to place manually everything in the diagram is not. So, I devised a strategy: draw one rung at a time and move the datum (reset the origin) at the end of every rung, thus I can start fresh another rung. This is done by macro |\ladderrungend| which resets the vertical reference to a vertical position $n$ rows below the current position (plus some inter rung space). The macro also serves to \emph{mark} rung end in the code (\tikzname\ ``program'') that generates the diagram making it more readable.
-
-The options passed to the \tikzname\ environment in the next example are \verb|[circuit plc ladder,thick,| \verb|x=\ladderskip, y=\ladderskip]| meaning it is a ladder diagram and $x$ and $y$ length unit are both set to |1\ladderskip|.
-
-\begin{codeexample}[]
-\begin{tikzpicture} [circuit plc ladder,thick,x=\ladderskip,y=\ladderskip]
- \draw(0,0)
- to [contact NO={info={E}}] ++(1,0) --++(1,0)
- to [block={inputs={IN,PT},outputs={Q,ET},symbol=TOF,name=tp1,
- minimum width=1.2\ladderskip,
- input sep=0.3\ladderskip, output sep=0.3\ladderskip}] ++(2,0)
- to [coil={info={T}}] +(1,0) coordinate(laddertopright);
- \draw (tp1.output 2) -- +(0.3\ladderskip,0)
- (tp1.input 2) -- +(-0.3\ladderskip,0) node[left]{T\#3s};
-\ladderrungend{1.2}
- \draw(0,0)
- to [contact NO={info={I}}] ++(1,0)
- to [contact NC={info={M}}] ++(1,0) coordinate(laddercoil) -- ++(2,0)
- to [coil={info={Q}}] ++(1,0);
- \draw(0,-1)
- to [contact NC={info={I}}] ++(1,0)
- to [contact NO={info={Q}}] ++(1,0) -- (laddercoil);
-\ladderrungend{2}
- \draw(0,0)
- to [contact NO={info={I}}] ++(1,0)
- to [contact NO={info={M}}] ++(1,0) coordinate(laddercoil) -- ++(2,0)
- to [coil={info={M}}] ++(1,0);
- \draw(0,-1)
- to [contact NC={info={I}}] ++(1,0)
- to [contact NO={info={Q}}] ++(1,0) -- (laddercoil);
-\ladderrungend{2}
-% power rails
- \draw let \p1=(laddertopright) in
- (0,\y1+0.7\ladderskip) -- (0,\ladderskip)
- (\x1,\y1+0.7\ladderskip) -- (\x1,\ladderskip);
-\end{tikzpicture}
-\end{codeexample}
-
-In the example, the first row has a timer, so an extra space is needed and for this 1.2 is given to |\ladderrungend|. Note that the |\draw (tp1.output 2)|\ldots\ is not the start of a new row (the first rung has only one row); it is used solely to place the timer terminals for PT and ET.
-
-Every rung starts with |\draw(0,0)| to mark the first position. The next row of the same rung will start with |\draw(0,-1)| and so forth.
-
-All contacts and coils are placed by something like, e.g., \verb|to [contact NC={info={$I$}}] ++(1,0)|. The |to| command places the element between the current position and the next position which is one length unit at the right of the current position. Blocks are bigger and need more space, so after a block use |++(2,0)|.
-When a row is connected to a row above it, it is wise to mark the connection point on the row above using, e.g., |coordinate(laddercoil)|. Thus, the current row can be connected by |-- (laddercoil)| or \verb!-| (laddercoil)!. If there are several rows, connect only the last one.
-
-You also may need some fillers like |-- ++(2,0)| because the row (or rung) is shorter than the others or because you want to leave some space before a block.
-
-The last thing to do is to draw the power rails. For this, the end of the first row of the first rung was marked with |coordinate(laddertopright)|. In the example, both left and right power rails were drawn. To draw only the left one (mandatory\footnote{Actually, the standard reads ``The right power rail may be explicit or implied''.}), remove the \verb|(\x1,\y1+0.7\ladderskip) -- (\x1,\ladderskip)|.
-
-You may need to change the diagram size. There are a few options: place it into |\resizebox|; use the key |scale|; and change the |\tikzcircuitssizeunit| through the key |circuit symbol unit|. Placing into a |\resizebox| changes everything and it is the preferable option for presentations. The key |scale| only changes the space between symbols, but the font size, line width and symbol sizes are all kept the same. Changing the |\tikzcircuitssizeunit| keeps the font size and line width, but changes the symbols size and, if you were careful, the distance between symbols.
-
-To shrink the diagram to half its normal size, place these commands before your |\begin{tikzpicture}|. Note that you will have to undo this after the diagram.
-
-\begin{codeexample}[code only]
-\tikzset{circuit symbol unit=3.5pt}
-\setlength{\ladderskip}{5\tikzcircuitssizeunit} % 5\tikzcircuitssizeunit = 35pt
-\setlength{\ladderrungsep}{.2\ladderskip}
-\tiny
-\end{codeexample}
-
-Both |\ladderskip| and |\ladderrungsep| were redefined, also the font size was changed. Incidentally, |\tiny| means 50\% of the current size. The result should be:
-\begin{center}
-\tikzset{circuit symbol unit=3.5pt}
-\setlength{\ladderskip}{5\tikzcircuitssizeunit} % 5\tikzcircuitssizeunit = 35pt
-\setlength{\ladderrungsep}{.2\ladderskip}
-\tiny
-\begin{tikzpicture} [circuit plc ladder,thick,x=\ladderskip,y=\ladderskip,execute at end picture=%
-{
-\begin{pgfonlayer}{background}
-\path[fill=graphicbackground]
-($(current bounding box.south west) + (-0.2,-0.2)$) rectangle
-($(current bounding box.north east) + (0.2,0.2)$);
-\end{pgfonlayer}
-}]
- \draw(0,0)
- to [contact NO={info={E}}] ++(1,0) --++(1,0)
- to [block={inputs={IN,PT},outputs={Q,ET},symbol=TOF,name=tp1,
- minimum width=1.2\ladderskip,
- input sep=0.3\ladderskip, output sep=0.3\ladderskip}] ++(2,0)
- to [coil={info={T}}] +(1,0) coordinate(laddertopright);
- \draw (tp1.output 2) -- +(0.3\ladderskip,0)
- (tp1.input 2) -- +(-0.3\ladderskip,0) node[left]{T\#3s};
-\ladderrungend{1.2}
- \draw(0,0)
- to [contact NO={info={I}}] ++(1,0)
- to [contact NC={info={M}}] ++(1,0) coordinate(laddercoil) -- ++(2,0)
- to [coil={info={Q}}] ++(1,0);
- \draw(0,-1)
- to [contact NC={info={I}}] ++(1,0)
- to [contact NO={info={Q}}] ++(1,0) -- (laddercoil);
-\ladderrungend{2}
- \draw(0,0)
- to [contact NO={info={I}}] ++(1,0)
- to [contact NO={info={M}}] ++(1,0) coordinate(laddercoil) -- ++(2,0)
- to [coil={info={M}}] ++(1,0);
- \draw(0,-1)
- to [contact NC={info={I}}] ++(1,0)
- to [contact NO={info={Q}}] ++(1,0) -- (laddercoil);
-\ladderrungend{2}
-% power rails
- \draw let \p1=(laddertopright) in
- (0,\y1+0.7\ladderskip) -- (0,\ladderskip)
- (\x1,\y1+0.7\ladderskip) -- (\x1,\ladderskip);
-\end{tikzpicture}
-\end{center}
-\normalsize
-
-\tikzset{circuit symbol unit=7pt}
-\setlength{\ladderskip}{5\tikzcircuitssizeunit} % 5\tikzcircuitssizeunit = 35pt
-\setlength{\ladderrungsep}{.2\ladderskip}
-
-This may not be the best way to perform big adjustments, but it can help in some occasions where a small adjust is needed. Also, if you do it frequently, consider to write a macro to encapsulate the feature.
+A lot of things can go wrong here. If, for instance, the |VAR_IN_OUT| label is modified or the |inner sep| is changed, you might need to modify the amount of space left for the labels on both sides.
\subsection{Directly represented variables (\%)}
-Direct representation of a single-element variable shall be provided by a special symbol formed by the concatenation of:
+Direct representation of a single-element variable shall be provided by a special symbol formed by the concatenation of \cite[sic, p.~54]{61131}:
\begin{itemize}
-\item a percent sign ``\%'' and
+\item a per cent sign ``\%'' and
\item location prefixes I, Q or M and
-\item a size prefix X (or none), B, W, D, or L and
+\item a size prefix X (or none), B, W, D or L and
\item one or more (hierarchical addressing) unsigned integers that shall be separated by periods ``.''.
\end{itemize}
EXAMPLES:
@@ -742,24 +1022,22 @@ EXAMPLES:
\item \%QL20
\end{itemize}
-The character \% must be preceded by a backslash ``|\%|''. It also possible to place an illustrative text along with the |info|, usually above it. In the following example, the user-friendly variable names are placed in blue above each directly represented variable. The label distance is set globally to |-4pt| to save space. Even so it is necessary that the second row be drawn |1.2\ladderskip| below the first one.
+The character \% must be preceded by a backslash ``|\%|''. It is also possible to place an illustrative text along with the |info|, usually above it. The user-friendly variable names are placed in blue above each directly represented variable in the following example. The label distance is set globally to |-3pt| to save space. Even so, the distance between rows has to be increased to make room for the labels. So, |y| is set to 6\,|\tikzcircuitssizeunit| or 20\% above its default value.
\begin{codeexample}[leave comments]
\begin{tikzpicture} [circuit plc ladder,thick,
- x=\ladderskip,y=\ladderskip,label distance=-4pt]
+ label distance=-3pt,y=6\tikzcircuitssizeunit]
\draw(0,0)
to [contact NO={info={[label={[blue]$b_1$}]\%I0.1}}] ++(1,0)
coordinate(laddercoil)
to [contact NC={info={[label={[blue]$b_0$}]\%I0.0}}] ++(1,0)
to [coil={info={[label={[blue]$K_1$}]\%Q0.0}}] ++(1,0)
coordinate(laddertopright);
- \draw(0,-1.2)
+ \draw(0,-1)
to [contact NO={info={[label={[blue]$K_1$}]\%Q0.0}}] ++(1,0)
-- (laddercoil);
-\ladderrungend{2.2}
- \draw let \p1=(laddertopright) in
- (0,\y1+0.7\ladderskip) -- (0,\ladderskip)
- (\x1,\y1+0.7\ladderskip) -- (\x1,\ladderskip);
+\ladderrungend{2}
+\ladderpowerrails
\end{tikzpicture}
\end{codeexample}
@@ -767,8 +1045,9 @@ The character \% must be preceded by a backslash ``|\%|''. It also possible to p
\section{NEMA}
It is possible to typeset NEMA -- National Electrical Manufacturers Association -- standard diagrams using this package. The main difference is that coils are represented by \tikz[circuit plc ladder,thick,baseline]\draw(0,0) to [coil={coil ladder curvature=0.5, minimum size=2.4\tikzcircuitssizeunit}] ++(1,0);
-instead of \tikz[circuit plc ladder,thick,baseline]\draw(0,0) to [coil] ++(1,0);
+instead of \tikz[circuit plc ladder,thick,baseline]\draw(0,0) to [coil] ++(1,0);%
.
+
You can replace all coil symbols for circles globally placing the following keys in the document preamble:
\begin{codeexample}[code only]
@@ -781,7 +1060,7 @@ You can replace all coil symbols for circles globally placing the following keys
}
\end{codeexample}
-Than you produce:
+That would produce:
\tikzset{
coil NA/.style={coil={#1,symbol={$/$}}},
every coil/.style={minimum size=2.4\tikzcircuitssizeunit,coil ladder curvature=0.5},
@@ -790,31 +1069,8 @@ Than you produce:
every coil NA/.style={minimum size=2.4\tikzcircuitssizeunit,coil ladder curvature=0.5}
}
-\begin{codeexample}[width=6cm]
-\begin{tikzpicture} [circuit plc ladder,thick,
- x=\ladderskip,y=\ladderskip]
- \draw(0,0)
- to [contact NO={info={$a$}}] ++(1,0)
- to [contact NO={info={$c$}}] ++(1,0) -- ++(1,0)
- to [coil={info={$Q$}}] ++(1,0)
- coordinate(laddertopright);
- \draw(1,0) -- ++(0,-1)
- to [contact NO={info={$d$}}] ++(1,0)
- to [contact NO={info={$e$}}] ++(1,0) -- ++(0,1);
- \draw(0,-2)
- to [contact NO={info={$b$}}] ++(1,0) -| ++(1,1);
-\ladderrungend{3}
-% power rails
- \draw let \p1=(laddertopright) in
- (0,\y1+0.7\ladderskip) -- (0,\ladderskip)
- (\x1,\y1+0.7\ladderskip) -- (\x1,\ladderskip);
-\end{tikzpicture}
-\end{codeexample}
-
-To test all coils:
-\begin{codeexample}[width=6cm]
-\begin{tikzpicture} [circuit plc ladder,thick,
- x=\ladderskip,y=\ladderskip]
+\begin{codeexample}[width=5.2cm]
+\begin{tikzpicture} [circuit plc ladder,thick]
\draw(0,0)
to [coil={info={$a$}}] ++(1,0)
to [coil S={info={$b$}}] ++(1,0)
@@ -823,7 +1079,7 @@ To test all coils:
\end{tikzpicture}
\end{codeexample}
-If, however, you have lots of diagrams you better of redefining the coil graphic which is likely the most used one (not to say the only one). It is because the algorithm used to draw coils uses arcs, which are less efficient than circles. Thus, place this key in you document preamble:
+If, however, you have lots of diagrams you better of redefining at least the |coil graphic| which is likely the most used one (not to say the only one). It is because the algorithm used to draw coils uses arcs, which are less efficient than circles. Thus, place this key in your document preamble:
\begin{codeexample}[code only]
\tikzset{
@@ -840,17 +1096,30 @@ If, however, you have lots of diagrams you better of redefining the coil graphic
\section{Known Issues}
-The |center| anchor of block symbol is not in the centre and it is disturbing, to say the least. This is due \tikzname\ positioning algorithm and it is unlike to change. The way the library was written also annoys me: it seems that the official libraries are written in two separated files: one for \tikzname\ stuff and another for \pgfname, but I don't know how to separate it, thus we have a single file (at least for now).
+The |center| anchor of the block symbol is not in the centre and it is disturbing, to say the least. This is due \tikzname\ positioning algorithm, which is unlike to change.
+
+The way the library was written is not exactly like the standard \tikzname\ libraries. It seems that the official libraries are written in two distinct files: one for \tikzname\ stuff and another for \pgfname, but I don't know how to separate it, thus we have a single file (at least for now).
\section{Final Remarks}
-This package has been tested and used for more than three years, so I do believe it is mature by now and I decided to share it. On the other hand, I was the only person who used it\footnote{Not entirely true, two people asked me for the package, but I never heard from them again.}, therefore idiosyncrasies were not detected.
+This package has been tested and used for more than three years, so I do believe it is mature by now and I decided to share it. On the other hand, I was the only person who used it\footnote{Not entirely true, a total of three people asked me about the package.}, therefore idiosyncrasies were not detected.
+
+Any comments, suggestions and feedback are welcomed. I will do my best to answer as soon as possible. My contact e-mail is on the first page.
+
+It should be great if someone with experience in writing \tikzname\ libraries could have a look at the code and point out errors or improvements to be made.
+
+Typesetting ladder diagrams may be boring and time-consuming. One thing you can try is \verb|JQM| - Java Quine McCluskey for minimization of Boolean functions available on \url{https://sourceforge.net/projects/jqm-java-quine-mccluskey/}. It can generate the solution and create the corresponding ladder diagram based on a given truth table. Unfortunately, it does not place blocks.
+
+
+\section{Acknowledgement}
-Any comments, suggestions, and feedbacks are welcomed. I will do my best to answer as soon as possible. My contact e-mail is in the first page.
+I would like to thank Martin Fabian with the Chalmers University of Technology for the strong encouragement to rewrite Section~\ref{guidance} and provide more examples.
-It should be great if someone with experience in writing \tikzname\ libraries could have a look in the code and point out error or improvements to be made.
-Typesetting ladder diagrams may be boring and time consuming. One thing you can try is \verb|JQM - Java Quine McCluskey| for minimization of Boolean functions available on \url{https://sourceforge.net/projects/jqm-java-quine-mccluskey/}. It can generate the solution and create the corresponding ladder diagram based on a given truth table. Unfortunately, it does not place blocks, so the example in Section~\ref{guidance} was generated with it, but the rung with the timer had to be done manually and also some fillers had to be added manually.
+\begin{thebibliography}{1}
+\bibitem{61131}\textbf{International Electrotechnical Commission}. \textit{IEC 61\,131-3:2013 -- Programmable controllers - Part~3: Programming languages}. Geneva, 2013.
+\bibitem{Tantau}\textbf{Tantau}, Till. \textit{The TikZ and PGF Packages} : Manual for version 3.1.9a-34-ga0d9cada, \url{https://github.com/pgf-tikz/pgf}, 2021.
+\end{thebibliography}
\end{document} \ No newline at end of file
diff --git a/graphics/pgf/contrib/tikz-ladder/tex/tikzlibrarycircuits.plc.ladder.code.tex b/graphics/pgf/contrib/tikz-ladder/tex/tikzlibrarycircuits.plc.ladder.code.tex
index b4b9c965ac..86ce172402 100644
--- a/graphics/pgf/contrib/tikz-ladder/tex/tikzlibrarycircuits.plc.ladder.code.tex
+++ b/graphics/pgf/contrib/tikz-ladder/tex/tikzlibrarycircuits.plc.ladder.code.tex
@@ -1,6 +1,6 @@
%% This is file `tikzlibrarycircuits.plc.ladder.code.tex'
-%% Version: 1.1
-%% Version date: 2018-02-06
+%% Version: 1.3
+%% Version date: 2022-04-10
%%
%%
%% Copyright (C) 2018 by Luis Paulo Laus, laus@utfpr.edu.br
@@ -26,14 +26,30 @@
%% 1.0: 10 January 2018: Original Version
%% 1.1: 06 February 2018: Macro file renamed to proper TikZ library file name.
%% Parent library changed from `circuit.ee' to `circuits'.
-%% Bug fixes: added \pgfusepathqstroke where is was missing,
+%% Bug fixes: added \pgfusepathqstroke where it was missing,
%% block anchors reworked.
+%% 1.2: 05 December 2020: Bugfix: corrected block height when the symbol is empty ({}).
+%% 1.3: 10 April 2022: new macro for typesetting power rails, fix the annoying bug that prints
+%% `Missing character....'
\usetikzlibrary{circuits}
%
-% Setting up an ladder
+% Length and macros
+%
+\makeatletter
+\newlength{\ladderskip}
+\def\ladderrungsep@{0.2}
+\def\ladderrungend#1{\pgftransformyshift{-#1\ladderskip-\ladderrungsep@\ladderskip}}% mark the end of a rung, #1 is the number of rows
+\def\ladderpowerrails{{% draws power rails
+ \draw let \p1=(laddertopright) in%
+ (0,\y1+0.7\ladderskip) -- (0,0.8\ladderskip)%
+ (\x1,\y1+0.7\ladderskip) -- (\x1,0.8\ladderskip);}}
+
+%
+% Setting up a ladder
%
\tikzset{
+ ladderrungsep/.store in=\ladderrungsep@,
circuit plc ladder/.style={
circuit,
inputs/.style={block ladder inputs={##1}},
@@ -43,12 +59,13 @@
clksize/.style={block ladder clksize={##1}},
symbol/.style={ladder symbol={##1}},
symbol color/.style={ladder symbol color={##1}},
+ x=5\tikzcircuitssizeunit,
+ y=5\tikzcircuitssizeunit,
+ execute at begin picture={\ladderskip=\pgf@yy\coordinate (laddertopright) at (0,0);}, % sets \ladderskip and defines a point for power rails
every circuit plc ladder/.try
}
}
-\makeatletter
-
\newif\ifpgfnormallyclosednegated%
\pgfkeys{
/pgf/crossed ladder/.is if=pgfnormallyclosednegated,%
@@ -122,33 +139,35 @@
\advance\pgf@y.5\dp\pgfnodeparttextbox
%
- % Adjust the height for the number of inputs and for the width and height of the ladder block symbol.
+ % Adjust the height for the number of inputs and the width and height of the ladder block symbol.
%
\c@pgf@counta\pgf@lib@sh@ladder@numinputs
\pgfmathsetlength\pgf@yb{\pgfkeysvalueof{/pgf/block ladder input sep}}
\edef\inputsep{\the\pgf@yb}
\addtosavedmacro\inputsep
- \pgf@ya\pgf@yb
\advance\c@pgf@counta-1\relax
\multiply\pgf@yb\c@pgf@counta
\c@pgf@counta\pgf@lib@sh@ladder@numoutputs
\pgfmathsetlength\pgf@yc{\pgfkeysvalueof{/pgf/block ladder output sep}}
\edef\outputsep{\the\pgf@yc}
\addtosavedmacro\outputsep
- \pgf@ya\pgf@yc
\advance\c@pgf@counta-1\relax
\multiply\pgf@yc\c@pgf@counta
\ifdim\pgf@yb<\pgf@yc% the highest between inputs and outputs
\pgf@yb\pgf@yc
\fi
% now the symbol width and height
- \setbox\pgf@hbox\hbox{{$\mathrm{\pgfkeysvalueof{/pgf/ladder symbol}}$}}% add braces as color-aftergroup-fix TT (error when contains \_)
-% \setbox\pgf@hbox\hbox{{$\ensuremath{\mathrm{\pgfkeysvalueof{/pgf/ladder symbol}}$}}}% add braces as color-aftergroup-fix TT
-% \setbox\pgf@hbox\hbox{{$\mathrm{TESTE}$}}% add braces as color-aftergroup-fix TT
+ \begingroup% keep font setting local
+ \pgfutil@selectfont% restore font
+ \global\setbox\pgf@hbox\hbox{{\pgfkeysvalueof{/pgf/ladder symbol}}}% add braces as color-aftergroup-fix TT
+ \endgroup%
% \typeout{Test \the\wd\pgf@hbox \the\ht\pgf@hbox \the\dp\pgf@hbox}
\pgf@xc.5\wd\pgf@hbox
\pgf@yc\ht\pgf@hbox
\advance\pgf@yc\dp\pgf@hbox
+ \ifdim\pgf@yc=0pt
+ \advance\pgf@yb4pt
+ \fi
\advance\pgf@yc1pt
\advance\pgf@yb0.5\pgf@yc
\advance\pgf@yc2pt
@@ -156,7 +175,6 @@
\addtosavedmacro\symbolypos
\advance\pgf@yc0.5\pgf@yc
\advance\pgf@yc\pgf@yb
- \advance\pgf@yc0pt
\pgf@yc.5\pgf@yc
\ifdim\pgf@x<\pgf@xc
\pgf@x\pgf@xc
@@ -330,7 +348,7 @@
\else%
\expandafter\color\expandafter{\pgf@lib@sh@temp}%
\fi%
- {\pgfkeysvalueof{/pgf/ladder symbol}}%
+ \pgfkeysvalueof{/pgf/ladder symbol}%
}%
% Draw inputs.
%
@@ -531,6 +549,7 @@
\pgftext{\pgfkeysvalueof{/pgf/ladder symbol}}
}
}
+
\makeatother
\tikzset{
diff --git a/macros/unicodetex/latex/polyglossia/README.md b/macros/unicodetex/latex/polyglossia/README.md
index 6a84e136c4..dbf1c5189d 100644
--- a/macros/unicodetex/latex/polyglossia/README.md
+++ b/macros/unicodetex/latex/polyglossia/README.md
@@ -1,4 +1,4 @@
-# THE POLYGLOSSIA PACKAGE v1.55
+# THE POLYGLOSSIA PACKAGE v1.55a
## Multilingual typesetting with XeLaTeX and LuaLaTeX
This package provides an alternative to Babel for users of XeLaTeX and LuaLaTeX.
diff --git a/macros/unicodetex/latex/polyglossia/polyglossia.dtx b/macros/unicodetex/latex/polyglossia/polyglossia.dtx
index d9660ad697..5c72d9843f 100644
--- a/macros/unicodetex/latex/polyglossia/polyglossia.dtx
+++ b/macros/unicodetex/latex/polyglossia/polyglossia.dtx
@@ -8,7 +8,7 @@
\iffalse
%</internal>
%<*README>
-# THE POLYGLOSSIA PACKAGE v1.55
+# THE POLYGLOSSIA PACKAGE v1.55a
## Multilingual typesetting with XeLaTeX and LuaLaTeX
This package provides an alternative to Babel for users of XeLaTeX and LuaLaTeX.
@@ -2807,6 +2807,13 @@ to track the issues and follow progress.
% \section{Revision history}
%
% \bgroup\footnotesize
+% \subsection*{1.55a (10-04-2022)}
+%
+% \subsubsection*{Bug fixes}
+% \begin{itemize}
+% \item Fix \cmd\foreignlanguage\ command (\TXI{538}).
+% \end{itemize}
+%
% \subsection*{1.55 (09-04-2022)}
%
% \subsubsection*{New features}
@@ -3686,7 +3693,7 @@ to track the issues and follow progress.
% \subsection{polyglossia.sty}
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{polyglossia}[2022/04/09 v1.55
+\ProvidesPackage{polyglossia}[2022/04/10 v1.55a
Modern multilingual typesetting with XeLaTeX and LuaLaTeX]
\RequirePackage{etoolbox}
\RequirePackage{makecmds}
@@ -5531,7 +5538,7 @@ to track the issues and follow progress.
% #1 option
% #2 alias
% #3 base lang
-% #3 text
+% #4 text
\cs_new:Nn \__xpg_foreignlanguage:nnnn
{
\tl_if_blank:nT {#3}
@@ -5539,11 +5546,11 @@ to track the issues and follow progress.
\msg_show:nnn { polyglossia } { languagenotloaded } {#2}
}
\group_begin:
- \xpg@otherlanguage[\xpg_alias_add_to_option_i:nn{#2}{#1}]{#4}%
+ \xpg@otherlanguage[\xpg_alias_add_to_option_i:nn{#2}{#1}]{#3}%
\polyglossia@lang@settextdirection:nn{#3}{#4}%
\group_end:
}
-\cs_generate_variant:Nn \__xpg_foreignlanguage:nnn {een}
+\cs_generate_variant:Nn \__xpg_foreignlanguage:nnnn {eeen}
% otherlanguage* is the environment equivalent of \foreignlanguage
diff --git a/macros/unicodetex/latex/polyglossia/polyglossia.pdf b/macros/unicodetex/latex/polyglossia/polyglossia.pdf
index eba0c23698..320e4aa224 100644
--- a/macros/unicodetex/latex/polyglossia/polyglossia.pdf
+++ b/macros/unicodetex/latex/polyglossia/polyglossia.pdf
Binary files differ
diff --git a/macros/xetex/latex/xduts/README.md b/macros/xetex/latex/xduts/README.md
index 120464e3bf..2915333371 100644
--- a/macros/xetex/latex/xduts/README.md
+++ b/macros/xetex/latex/xduts/README.md
@@ -1,16 +1,19 @@
# XDUTS
-XDUTS(Xidian University TeX Suite)是面向西安电子科技大学本科生/研究生的LaTeX3模板套装,支持XeLaTeX,支持TeX Live、MacTeX、MiKTeX,支持Windows、macOS、GNU/Linux、Overleaf和TeXPage。旨在帮助西安电子科技大学本科生/研究生撰写开题报告/学位论文,目前有:
+[![](https://img.shields.io/ctan/v/xduts)](https://www.ctan.org/pkg/xduts) [![](https://img.shields.io/github/license/note286/xduts)](https://github.com/note286/xduts/blob/main/LICENSE) [![](https://img.shields.io/github/stars/note286/xduts)](https://github.com/note286/xduts) [![](https://img.shields.io/github/issues/note286/xduts)](https://github.com/note286/xduts/issues?q=is%3Aopen+is%3Aissue) [![](https://img.shields.io/github/issues-closed/note286/xduts)](https://github.com/note286/xduts/issues?q=is%3Aissue+is%3Aclosed) [![](https://img.shields.io/github/commit-activity/m/note286/xduts)](https://github.com/note286/xduts/commits/main) [![](https://img.shields.io/github/v/tag/note286/xduts)](https://github.com/note286/xduts/tags)
-- xduugthesis,本科毕业设计论文
+XDUTS(Xidian University TeX Suite)是面向西安电子科技大学本科生/研究生的LaTeX3文档类和宏包套装,支持XeLaTeX,支持TeX Live、MacTeX、MiKTeX,支持Windows、macOS、GNU/Linux、Overleaf和TeXPage。旨在帮助西安电子科技大学本科生/研究生撰写开题报告/学位论文及其他文档,目前有:
+
+- xduugthesis,本科毕业设计论文文档类
+- xdufont,中/英/数学字体配置宏包
即将支持:
-- xduugtp,本科生开题报告
-- xdupgthesis,研究生学位论文
-- xdupgtp,研究生开题报告
+- xduugtp,本科生开题报告文档类
+- xdupgthesis,研究生学位论文文档类
+- xdupgtp,研究生开题报告文档类
-# 获取
+## 获取
```shell
xetex xduts.ins
@@ -21,6 +24,6 @@ xelatex xduts.dtx
xelatex xduts.dtx
```
-# 许可
+## 许可
This material is subject to [the LaTeX Project Public License 1.3c](https://ctan.org/license/lppl1.3).
diff --git a/macros/xetex/latex/xduts/xduts.dtx b/macros/xetex/latex/xduts/xduts.dtx
index 81d798f991..691a2a6e20 100644
--- a/macros/xetex/latex/xduts/xduts.dtx
+++ b/macros/xetex/latex/xduts/xduts.dtx
@@ -1,14 +1,18 @@
% \iffalse
%<*driver>
\ProvidesFile{xduts.dtx}
-[2022/04/09 v0.5.2.1 Xidian University TeX Suite]
+[2022/04/10 v0.6.0.0 Xidian University TeX Suite]
%</driver>
-%<class>\NeedsTeXFormat{LaTeX2e}
-%<class>\RequirePackage{expl3}
+%<class|sty>\NeedsTeXFormat{LaTeX2e}
+%<class|sty>\RequirePackage{expl3}
%<xduugthesis>\ProvidesExplClass{xduugthesis}
-%<xduugthesis> {2022/04/09}{0.5.2.1}{Xidian University Undergraduate Thesis class}
+%<xdufont>\ProvidesExplPackage{xdufont}
+%<class|sty> {2022/04/10}{0.6.0.0}
+%<xdufont> {Xidian University Font package}
+%<xduugthesis> {Xidian University Undergraduate Thesis class}
%<*driver>
\documentclass{ctxdoc}
+\changes{v0.6.0.0}{2022/04/10}{新增xdufont宏包}
\changes{v0.5.2.1}{2022/04/09}{修改项目名称}
\changes{v0.4.2.1}{2022/04/05}{调整文档目录缩进}
\usepackage{tocloft}
@@ -64,6 +68,8 @@
\newcommand{\valuex}[1]{\xspace\texttt{#1}\xspace}
% 命令
\newcommand{\cmdx}[1]{\xspace\texttt{#1}\xspace}
+% 引用
+\newcommand{\secrefx}[1]{第\xspace\ref{#1}\xspace 节}
% 链接
\newcommand{\footurl}[1]{\footnote{\url{#1}}}
\newcommand{\ctanurl}[1]{\href{https://mirrors.ustc.edu.cn/CTAN/#1}{\ttfamily CTAN://#1}}
@@ -77,6 +83,10 @@
\newcommand{\biber}{\xspace\hologo{biber}\xspace\xspace}
% arguments list
\setlist[arguments]{label=\texttt{\#\arabic*}\,:}
+% 浮动体默认设置
+\makeatletter
+\renewcommand{\fps@table}{htbp}
+\makeatother
% listings
\definecolor{xdu-ai-orange}{cmyk}{0,0.75,1,0}
\definecolor{xdu-blue}{cmyk}{0.80,0.50,0,0}
@@ -93,7 +103,7 @@
frame = l,
framerule = 1 pt,
framesep = 0 pt,
- xleftmargin = 2 em,
+ xleftmargin = 0 em,
xrightmargin = 3 em,
escapeinside = {(*}{*)},
breaklines = true,
@@ -133,7 +143,7 @@
\end{document}
%</driver>
% \fi
-% \CheckSum{822}
+% \CheckSum{823}
% \CharacterTable
% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
@@ -156,21 +166,22 @@
% \maketitle
% \thispagestyle{empty}
% \begin{abstract}
-% \xduts{}是面向西安电子科技大学本科生/研究生的\LaTeXiii{}模板套装,
+% \xduts{}是面向西安电子科技大学本科生/研究生的\LaTeXiii{}文档类和宏包套装,
% 支持\XeLaTeX{},
% 支持\texlive{}、\mactex{}、\miktex{},
% 支持Windows、macOS、GNU/Linux、Overleaf和TeXPage。
% \end{abstract}
-% \renewcommand\abstractname{免责声明}
+% \renewcommand{\abstractname}{免责声明}
% \begin{abstract}
-% \noindent
+% 在使用\xduts{}时,默认您同意以下内容:
% \begin{enumerate}
-% \item 本模板的发布遵守
+% \item \xduts{}作者不对使用\xduts{}产生的格式审查问题负责。
+% \item \xduts{}的发布遵守
% \LaTeX{} Project Public License\footurl{https://www.latex-project.org/lppl.txt},
% 使用前请认真阅读协议内容。
-% \item 任何个人或组织以本模板为基础进行修改、扩展而生成的新的专用模板,
+% \item 任何个人或组织以\xduts{}为基础进行修改、扩展而生成的新的\LaTeX{}文档类/宏包,
% 请严格遵守\LaTeX{} Project Public License,
-% 由于违犯协议而引起的任何纠纷争端均与本模板作者无关。
+% 由于违犯协议而引起的任何纠纷争端均与\xduts{}作者无关。
% \end{enumerate}
% \end{abstract}
% \clearpage
@@ -178,41 +189,55 @@
% \clearpage
% \section{介绍}
% \xduts{} (Xidian University \TeX{} Suite)
-% 是为了帮助西安电子科技大学本科生/研究生撰写开题报告/学位论文而编写的\LaTeX{}模板套装,目前有:
+% 是为了帮助西安电子科技大学本科生/研究生撰写开题报告/学位论文及其他文档
+% 而编写的\LaTeX{}文档类和宏包套装,目前有:
% \begin{itemize}
% \item \clsx{xduugthesis},本科毕业设计论文。
+% \item \pkgx{xdufont},中/英/数学字体配置宏包。
+% \end{itemize}
+% 即将支持:
+% \begin{itemize}
+% \item \clsx{xduugtp},本科毕业设计论文开题报告表。
+% \item \clsx{xdupgthesis},研究生学位论文。
+% \item \clsx{xdupgtp},研究生学位论文开题报告表。
% \end{itemize}
% \par
-% 本文档将尽量完整的介绍模板的使用方法,
+% 本文档将尽量完整的介绍\xduts{}的使用方法,
% 如有不清楚之处,或者想提出改进建议,
% 可以在GitHub Issues\footurl{https://github.com/note286/xduts/issues/}
-% 参与讨论或提问。另外,不接受任何Pull Requests。
-% \par
-% 请在最新版\LaTeX{}环境中使用最新版\xduts{},
-% 《一份(不太)简短的\LaTeXe{}介绍》\footctan{info/lshort/chinese/lshort-zh-cn.pdf}
-% 中提及的内容本文档将不再提及。
-% \section{贡献者}
-% \xduts{}的开发过程中,维护者为
-% \href{https://github.com/note286/}{\ttfamily @note286}。
-% 同时,也要感谢所有在GitHub和睿思上提出问题的同学、老师们。
-% \xduts{}的持续发展,离不开你们的帮助与支持。
-% \section{致谢}
-% 在学习文学编程的过程中,
-% 《在\LaTeX{}中进行文学编程》\footurl{https://liam.page/2015/01/23/literate-programming-in-latex/}
-% 和《Good things come in little packages: An introduction to writing .ins and .dtx files》\footurl{https://www.tug.org/TUGboat/tb29-2/tb92pakin.pdf}
-% 提供了很大帮助。
-% 在文档的编写过程中,参考了
-% \filex{ctex.dtx}\footctan{language/chinese/ctex/ctex.dtx}、
-% \filex{fduthesis.dtx}\footctan{macros/latex/contrib/fduthesis/fduthesis.dtx}、
-% \filex{njuthesis.dtx}\footctan{macros/unicodetex/latex/njuthesis/njuthesis.dtx}、
-% \filex{thuthesis.dtx}\footctan{macros/latex/contrib/thuthesis/thuthesis.dtx}。
+% 参与讨论或提问。另外,\textbf{不接受任何Pull Requests}。
% \StopEventually{}
% \section{使用说明}
-% \subsection{基本用法}
-% \changes{v0.5.1.2}{2022/04/07}{增加编译说明}
-% \LaTeX{}本身是命令行程序,通过不同的命令调用所需的编译引擎,编辑器提供的快捷按钮实际只是做了包装。\xduts{}仅支持\XeLaTeX{},参考文献默认使用\biber{},也可以切换为\bibtex{},如何编译\LaTeX{}请学习《一份(不太)简短的\LaTeXe{}介绍》中相关内容。
-% \subsubsection{xduugthesis}
-% \paragraph{标准结构}
+% \label{使用说明}
+% 《一份(不太)简短的\LaTeXe{}介绍》\footctan{info/lshort/chinese/lshort-zh-cn.pdf}
+% 中提及的内容本文档将不再提及。
+% \xduts{}中的所有文档类和宏包仅内置了实现功能所必要的宏包,
+% 对于常用的宏包如\pkgx{subfig}、\pkgx{algpseudocodex}、
+% \pkgx{amsmath}、\pkgx{amsthm}和\pkgx{siunitx}等均未内置,
+% 用户视需求自行加载。
+% 请在最新版\LaTeX{}环境中使用最新版\xduts{},
+% 认真阅读相应文档类/宏包使用说明章节即可使用\xduts{}。
+% \par
+% 相应格式规范均已实现,用户仅需要撰写文章内容即可,请勿随意添加格式修改命令。
+% \subsection{xdufont}
+% \pkgx{xdufont}宏包基于\pkgx{xeCJK},相较于\pkgx{ctex}宏包的主要优势为默认支持宋体粗体、斜体,内置多种字体配置,可任意搭配中/英/数学字体,更加符合校内各种文档的撰写要求。
+% \par
+% \secrefx{编译}介绍了如何编译,\secrefx{参数设置}介绍了如何自定义配置,具体的配置选项见\secrefx{字体选项}。\pkgx{xdufont}可以搭配任意文档类进行使用,例如:
+% \begin{latexexample}[moretexcs={\xdusetup},emph={[1]document}]
+% \documentclass{article}
+% \usepackage{xdufont}
+% \xdusetup{}
+% \begin{document}
+% 宋体\textbf{加粗}\textsl{加斜}
+% \textsf{黑体}\textbf{\textsf{加粗}}\textsl{\textsf{加斜}}
+% \end{document}
+% \end{latexexample}
+% \par
+% 学会以上用法后即可立即使用\pkgx{xdufont}宏包了。
+% \subsection{xduugthesis}
+% \pkgx{xduugthesis}基于\clsx{ctexbook}文档类,
+% 提供多种字体配置,部分样式可自定义,信息录入便捷。
+% \par
% 典型的\clsx{xduugthesis}主文件结构应该如下所示:
% \begin{latexexample}[moretexcs={\xdusetup,\frontmatter,\mainmatter,\chapter,\backmatter},emph={[1]document}]
% \documentclass{xduugthesis}
@@ -225,25 +250,63 @@
% \backmatter
% \end{document}
% \end{latexexample}
-% \paragraph{命令与环境}
-% \subparagraph{附录环境}
-% 附录位于参考文献后,即在\tnx{backmatter}后。
-% \begin{latexexample}[emph={[1]appendixes}]
-% \begin{appendixes}
-% \chapter{这是一个附录}
-% \chapter{这是另一个附录}
-% \end{appendixes}
+% \par
+% \secrefx{编译}介绍了如何编译,\secrefx{参数设置}介绍了如何自定义配置。
+% 其中,字体选项见\secrefx{字体选项},
+% 部分英文字体切换见\secrefx{英文字体},
+% 论文语言切换见\secrefx{语言配置},
+% 参考文献配置见\secrefx{参考文献配置},
+% 图片配置见\secrefx{图片配置},
+% 章节配置见\secrefx{章节配置}。
+% 如需附录,请使用附录环境,具体见\secrefx{附录环境}。
+% 仅支持如下信息录入,具体每个选项的含义见\secrefx{信息录入},如没有部分选项,则删除该行即可。
+% \begin{latexexample}[moretexcs={\xdusetup},emph={[2]info}]
+% \xdusetup {
+% info = {
+% title = {第一行标题\\第二行标题},
+% department = {电子工程学院},
+% major = {电子信息工程},
+% author = {张三},
+% supervisor = {李四},
+% supervisor-department = {王五},
+% supervisor-enterprise = {赵六},
+% supervisor-school = {刘七},
+% class-id = {123456},
+% student-id = {12345678910},
+% abstract = {abstract-zh.tex},
+% abstract* = {abstract-en.tex},
+% keywords = {我,就是,充数的,关键词},
+% keywords* = {Dummy,Keywords,Here,it is},
+% acknowledgements = {acknowledgements.tex}
+% }
+% }
% \end{latexexample}
+% \par
+% 学会以上用法后即可立即使用\clsx{xduugthesis}文档类了。
+% \section{功能说明}
+% 请根据\secrefx{使用说明}中相应文档类/宏包的说明来选择性地阅读本节内容。
+% \subsection{编译}
+% \label{编译}
+% \changes{v0.5.1.2}{2022/04/07}{增加编译说明}
+% \LaTeX{}本身是命令行程序,通过不同的命令调用所需的编译引擎,编辑器提供的快捷按钮实际只是做了包装。\xduts{}仅支持\XeLaTeX{},参考文献默认使用\biber{},也可以切换为\bibtex{}。
% \subsection{参数设置}
+% \label{参数设置}
+% \changes{v0.5.1.1}{2022/04/06}{增加xdusetup配置文档}
% \begin{function}[added=2022-03-07]{\xdusetup}
% \begin{syntax}
% \tnx{xdusetup}=\argx{键值列表}
% \end{syntax}
-% 本模板提供了一系列选项,可自行配置。载入文档类之后,以下所有选项均可通过统一的命令\tnx{xdusetup}来设置。下文中尖括号内列出了若干个允许的选项,其中加粗的为默认选项。
-% \changes{v0.5.1.1}{2022/04/06}{增加xdusetup配置文档}
-% \csx{xdusetup}的参数是一组由(英文)逗号隔开的选项列表,列表中的选项通常是\kvoptx{\metax{key}}{\metax{value}}的形式。
-% \csx{xdusetup}采用\LaTeXiii{}风格的键值设置,支持不同类型以及多种层次的选项设定。键值列表中,“|=|”左右的空格不影响设置;但需注意,参数列表中不可以出现空行。
-% 一些选项包含子选项,如\optx{style}和\optx{info}等,它们可以按如下两种等价方式来设定:
+% \xduts{}提供了一系列选项,可自行配置。
+% 载入文档类/宏包之后,以下所有选项均可通过统一的命令\tnx{xdusetup}来设置。
+% \csx{xdusetup}的参数是一组由(英文)逗号隔开的选项列表,
+% 下文中尖括号内列出了若干个允许的选项,其中加粗的为默认选项。
+% 列表中的选项通常是\kvoptx{\metax{key}}{\metax{value}}的形式。
+% \csx{xdusetup}采用\LaTeXiii{}风格的键值设置,
+% 支持不同类型以及多种层次的选项设定。
+% 键值列表中,“|=|”左右的空格不影响设置;
+% 但需注意,参数列表中不可以出现空行。
+% 一些选项包含子选项,如\optx{style}和\optx{info}等,
+% 它们可以按如下两种等价方式来设定:
% \begin{latexexample}[morekeywords={\xdusetup},emph={[1]style,cjk-font,latin-font,info,title,author,department}]
% \xdusetup{
% style = {cjk-font = adobe, latin-font = tacn},
@@ -265,9 +328,8 @@
% }
% \end{latexexample}
% \end{function}
-% \subsubsection{通用}
-% \paragraph{字体配置}
-% 设置字体配置后或不手动配置而使用默认值,请确保相应字体文件已安装。
+% \subsection{字体选项}
+% \label{字体选项}
% \begin{function}[added=2022-03-06]{style/cjk-font}
% \begin{syntax}
% \optx{style/cjk-font}=\metax{adobe|fandol|founder|sinotype|(win)|none}
@@ -413,6 +475,8 @@
% \end{syntax}
% 设置字体文件路径,即\metax{路径}目录内存储全部所需中文、英文和数学字体文件,仅在\optx{font-type}等于|file|时有效,默认值为\valuex{fonts}。
% \end{function}
+% \subsection{英文字体}
+% \label{英文字体}
% \begin{function}[added=2022-04-01]{style/en-cjk-font}
% \begin{syntax}
% \optx{style/en-cjk-font}=\metax{true|(false)}
@@ -423,7 +487,8 @@
% \item[true] 英文使用相对应字体族的中文字体。
% \item[false] 英文使用相对应字体族的英文字体。
% \end{optdesc}
-% \paragraph{语言配置}
+% \subsection{语言配置}
+% \label{语言配置}
% \begin{function}[added=2022-03-29]{style/language}
% \begin{syntax}
% \optx{style/language}=\metax{(zh)|en}
@@ -434,7 +499,8 @@
% \item[zh] 中文。
% \item[en] 英文。
% \end{optdesc}
-% \paragraph{参考文献配置}
+% \subsection{参考文献配置}
+% \label{参考文献配置}
% \begin{function}[added=2022-04-02,updated=2022-04-03]{style/bib-backend}
% \begin{syntax}
% \optx{style/bib-backend}=\metax{bibtex|(biblatex)}
@@ -451,14 +517,16 @@
% \end{syntax}
% 设置参考文献\filex{.bib}文件,多个文件之间需要使用英文半角逗号隔开。
% \end{function}
-% \paragraph{图片配置}
+% \subsection{图片配置}
+% \label{图片配置}
% \begin{function}[added=2022-04-03]{style/fig-label-sep}
% \begin{syntax}
% \optx{style/fig-label-sep}=\argx{间距}
% \end{syntax}
% 设置图片标签与后面标题之间的间距,默认值为\valuex{0.75em}。
% \end{function}
-% \paragraph{章节配置}
+% \subsection{章节配置}
+% \label{章节配置}
% \begin{function}[added=2022-04-05]{style/before-skip}
% \begin{syntax}
% \optx{style/before-skip}=\argx{间距列表}
@@ -471,8 +539,19 @@
% \end{syntax}
% 设置章节标题后的垂直间距,默认值为\valuex{\{18pt, 12pt, 6pt, 6pt, 6pt, 6pt\}},分别对应\tnx{chapter}、\tnx{section}、\tnx{subsection}、\tnx{subsubsection}、\tnx{paragraph}和\tnx{subparagraph}。
% \end{function}
-% \subsubsection{xduugthesis}
-% \paragraph{信息配置}
+% \subsection{附录环境}
+% \label{附录环境}
+% \begin{function}[added=2022-04-04]{appendixes}
+% 附录位于参考文献后,即在\tnx{backmatter}后。
+% \begin{latexexample}[emph={[1]appendixes}]
+% \begin{appendixes}
+% \chapter{这是一个附录}
+% \chapter{这是另一个附录}
+% \end{appendixes}
+% \end{latexexample}
+% \end{function}
+% \subsection{信息录入}
+% \label{信息录入}
% \begin{function}[added=2022-04-01]{info/title}
% \begin{syntax}
% \optx{info/title}=\argx{论文标题}
@@ -538,7 +617,7 @@
% \optx{info/abstract}=\argx{中文摘要文件路径}
% \optx{info/abstract*}=\argx{英文摘要文件路径}
% \end{syntax}
-% 设置摘要文件路径。
+% 设置摘要文件路径,相应文件内仅撰写摘要内容,无需任何环境。
% \end{function}
% \begin{function}[added=2022-04-02]{info/keywords,info/keywords*}
% \begin{syntax}
@@ -551,44 +630,90 @@
% \begin{syntax}
% \optx{info/acknowledgements}=\argx{致谢文件路径}
% \end{syntax}
-% 设置致谢文件路径。
+% 设置致谢文件路径,相应文件内仅撰写致谢内容,无需任何环境。
% \end{function}
-% \paragraph{输入示范}
-% 可以参考如下范例输入个人信息。注意不能有空行。
-% \begin{latexexample}[moretexcs={\xdusetup},emph={[2]info}]
-% \xdusetup {
-% info = {
-% title = {第一行标题\\第二行标题},
-% department = {电子工程学院},
-% major = {电子信息工程},
-% author = {张三},
-% supervisor = {李四},
-% supervisor-department = {王五},
-% class-id = {123456},
-% student-id = {12345678910},
-% abstract = {abstract-zh.tex},
-% abstract* = {abstract-en.tex},
-% keywords = {我,就是,充数的,关键词},
-% keywords* = {Dummy,Keywords,Here,it is},
-% acknowledgements = {acknowledgements.tex}
-% }
-% }
-% \end{latexexample}
+% \section{贡献者}
+% \xduts{}的开发过程中,维护者为
+% \href{https://github.com/note286/}{\ttfamily @note286}。
+% 同时,也要感谢所有在GitHub和睿思上提出问题的同学、老师们。
+% \xduts{}的持续发展,离不开你们的帮助与支持。
+% \section{致谢}
+% 在学习文学编程的过程中,
+% 《在\LaTeX{}中进行文学编程》\footurl{https://liam.page/2015/01/23/literate-programming-in-latex/}
+% 和《Good things come in little packages: An introduction to writing .ins and .dtx files》\footurl{https://www.tug.org/TUGboat/tb29-2/tb92pakin.pdf}
+% 提供了很大帮助。
+% 在文档的编写过程中,参考了
+% \filex{ctex.dtx}\footctan{language/chinese/ctex/ctex.dtx}、
+% \filex{fduthesis.dtx}\footctan{macros/latex/contrib/fduthesis/fduthesis.dtx}、
+% \filex{njuthesis.dtx}\footctan{macros/unicodetex/latex/njuthesis/njuthesis.dtx}
+% 和\filex{thuthesis.dtx}\footctan{macros/latex/contrib/thuthesis/thuthesis.dtx}。
% \clearpage
% \section{代码实现}
% \changes{v0.1.0.0}{2022/04/03}{基本完成本科毕业设计论文模板}
% \setlength\parindent{0pt}
-% \subsection{通用}
% \begin{macrocode}
%<@@=xdu>
% \end{macrocode}
+% \subsection{文档类和宏包}
% \begin{macrocode}
-%<*class>
+%<*class|sty>
% \end{macrocode}
% \begin{macrocode}
\RequirePackage { xparse, l3keys2e }
% \end{macrocode}
-% \subsubsection{键值选项定义}
+% \begin{macro}{\PassOptionsToPackage}
+% 忽略字体警告。
+% \begin{macrocode}
+\PassOptionsToPackage { quiet } { xeCJK }
+% \end{macrocode}
+% \end{macro}
+% \begin{macrocode}
+%</class|sty>
+%<*class>
+% \end{macrocode}
+% \begin{macro}{\PassOptionsToClass,\LoadClass}
+% 加载\clsx{ctexbook}文档类。
+% \changes{v0.3.2.0}{2022/04/04}{修正行间距为1.5倍}
+% \begin{macrocode}
+\PassOptionsToClass
+ {
+ zihao=-4,
+ sub4section,
+ linespread = 1.5,
+ fontset = none
+ }
+ { ctexbook }
+\LoadClass { ctexbook }
+% \end{macrocode}
+% \end{macro}
+% 设置纸张尺寸为A4。
+% \begin{macrocode}
+\RequirePackage { geometry }
+\geometry { paper = a4paper }
+% \end{macrocode}
+% \begin{macrocode}
+%</class>
+%<*xduugthesis>
+% \end{macrocode}
+% \begin{macrocode}
+\RequirePackage { fancyhdr }
+\RequirePackage { xeCJKfntef }
+\RequirePackage { graphicx }
+% \end{macrocode}
+% \begin{macrocode}
+%</xduugthesis>
+%<*xdufont>
+% \end{macrocode}
+% \begin{macrocode}
+\RequirePackage { xeCJK }
+% \end{macrocode}
+% \begin{macrocode}
+%</xdufont>
+% \end{macrocode}
+% \subsection{字体配置}
+% \begin{macrocode}
+%<*class|xdufont>
+% \end{macrocode}
% \begin{variable}
% {
% \l_@@_cjk_font_tl,
@@ -598,14 +723,7 @@
% \l_@@_math_font_tl,
% \l_@@_unicode_math_tl,
% \l_@@_font_type_tl,
-% \l_@@_font_path_tl,
-% \l_@@_en_cjk_font_bool,
-% \l_@@_lang_tl,
-% \l_@@_bib_tool_tl,
-% \l_@@_bib_file_clist,
-% \l_@@_fig_label_sep_tl,
-% \l_@@_before_skip_clist,
-% \l_@@_after_skip_clist
+% \l_@@_font_path_tl
% }
% 中文字体配置名称。
% \begin{macrocode}
@@ -639,31 +757,6 @@
% \begin{macrocode}
\tl_new:N \l_@@_font_path_tl
% \end{macrocode}
-% 英文是否使用中文字体。
-% \begin{macrocode}
-\bool_new:N \l_@@_en_cjk_font_bool
-% \end{macrocode}
-% 语言。
-% \begin{macrocode}
-\tl_new:N \l_@@_lang_tl
-% \end{macrocode}
-% 参考文献支持方式。
-% \begin{macrocode}
-\tl_new:N \l_@@_bib_tool_tl
-% \end{macrocode}
-% 参考文献文件。
-% \begin{macrocode}
-\clist_new:N \l_@@_bib_file_clist
-% \end{macrocode}
-% 图片标签与后面标题之间的间距。
-% \begin{macrocode}
-\tl_new:N \l_@@_fig_label_sep_tl
-% \end{macrocode}
-% 设置章节标题前后的垂直间距。
-% \begin{macrocode}
-\clist_new:N \l_@@_before_skip_clist
-\clist_new:N \l_@@_after_skip_clist
-% \end{macrocode}
% \end{variable}
% \begin{macro}{\keys_define:nn}
% 定义样式键值。
@@ -707,198 +800,7 @@
% \end{macrocode}
% 字体文件路径配置。
% \begin{macrocode}
- font-path .tl_set:N = \l_@@_font_path_tl,
-% \end{macrocode}
-% 英文是否使用中文字体。
-% \begin{macrocode}
- en-cjk-font .bool_set:N = \l_@@_en_cjk_font_bool,
-% \end{macrocode}
-% 论文语言配置。
-% \begin{macrocode}
- language .choices:nn = { zh, en }
- { \tl_set_eq:NN \l_@@_lang_tl \l_keys_choice_tl },
-% \end{macrocode}
-% 参考文献支持方式配置。
-% \begin{macrocode}
- bib-backend .choices:nn = { bibtex, biblatex }
- { \tl_set_eq:NN \l_@@_bib_tool_tl \l_keys_choice_tl },
-% \end{macrocode}
-% 参考文献文件。
-% \begin{macrocode}
- bib-resource .clist_set:N = \l_@@_bib_file_clist,
-% \end{macrocode}
-% 图片标签与后面标题之间的间距。
-% \begin{macrocode}
- fig-label-sep .tl_set:N = \l_@@_fig_label_sep_tl,
-% \end{macrocode}
-% 设置章节标题前的垂直间距。
-% \begin{macrocode}
- before-skip .clist_set:N = \l_@@_before_skip_clist,
-% \end{macrocode}
-% 设置章节标题后的垂直间距。
-% \begin{macrocode}
- after-skip .clist_set:N = \l_@@_after_skip_clist
- }
-% \end{macrocode}
-% \end{macro}
-% \begin{variable}
-% {
-% \l_@@_title_str,
-% \l_@@_title_i_str,
-% \l_@@_title_ii_str,
-% \l_@@_dept_str,
-% \l_@@_major_str,
-% \l_@@_author_str,
-% \l_@@_supv_str,
-% \l_@@_supv_dept_str,
-% \l_@@_supv_ent_str,
-% \l_@@_supv_sch_str,
-% \l_@@_class_id_str,
-% \l_@@_student_id_str,
-% \l_@@_abstract_zh_tl,
-% \l_@@_abstract_en_tl,
-% \l_@@_keywords_zh_clist,
-% \l_@@_keywords_en_clist,
-% \l_@@_ack_tl
-% }
-% 论文标题。
-% \begin{macrocode}
-\str_new:N \l_@@_title_str
-\str_new:N \l_@@_title_i_str
-\str_new:N \l_@@_title_ii_str
-% \end{macrocode}
-% 院系名称。
-% \begin{macrocode}
-\str_new:N \l_@@_dept_str
-% \end{macrocode}
-% 专业名称。
-% \begin{macrocode}
-\str_new:N \l_@@_major_str
-% \end{macrocode}
-% 作者姓名。
-% \begin{macrocode}
-\str_new:N \l_@@_author_str
-% \end{macrocode}
-% 导师姓名。
-% \begin{macrocode}
-\str_new:N \l_@@_supv_str
-% \end{macrocode}
-% 院内导师姓名。
-% \begin{macrocode}
-\str_new:N \l_@@_supv_dept_str
-% \end{macrocode}
-% 校外导师姓名。
-% \begin{macrocode}
-\str_new:N \l_@@_supv_ent_str
-% \end{macrocode}
-% 校内导师姓名。
-% \begin{macrocode}
-\str_new:N \l_@@_supv_sch_str
-% \end{macrocode}
-% 作者班级号。
-% \begin{macrocode}
-\str_new:N \l_@@_class_id_str
-% \end{macrocode}
-% 作者学号。
-% \begin{macrocode}
-\str_new:N \l_@@_student_id_str
-% \end{macrocode}
-% 中文摘要。
-% \begin{macrocode}
-\tl_new:N \l_@@_abstract_zh_tl
-% \end{macrocode}
-% 英文摘要。
-% \begin{macrocode}
-\tl_new:N \l_@@_abstract_en_tl
-% \end{macrocode}
-% 中文关键词。
-% \begin{macrocode}
-\clist_new:N \l_@@_keywords_zh_clist
-% \end{macrocode}
-% 英文关键词。
-% \begin{macrocode}
-\clist_new:N \l_@@_keywords_en_clist
-% \end{macrocode}
-% 致谢。
-% \begin{macrocode}
-\tl_new:N \l_@@_ack_tl
-% \end{macrocode}
-% \end{variable}
-% \begin{macro}{\keys_define:nn}
-% 定义信息键值。
-% \begin{macrocode}
-\keys_define:nn { xdu / info }
- {
-% \end{macrocode}
-% 论文标题。
-% \begin{macrocode}
- title .tl_set:N = \l_@@_title_str,
-% \end{macrocode}
-% 院系名称。
-% \begin{macrocode}
- department .tl_set:N = \l_@@_dept_str,
-% \end{macrocode}
-% 专业名称。
-% \begin{macrocode}
- major .tl_set:N = \l_@@_major_str,
-% \end{macrocode}
-% 作者姓名。
-% \begin{macrocode}
- author .tl_set:N = \l_@@_author_str,
-% \end{macrocode}
-% 导师姓名。
-% \begin{macrocode}
- supervisor .tl_set:N = \l_@@_supv_str,
-% \end{macrocode}
-% 院内导师姓名。
-% \begin{macrocode}
- supervisor-department .tl_set:N = \l_@@_supv_dept_str,
-% \end{macrocode}
-% 校外导师姓名。
-% \begin{macrocode}
- supervisor-enterprise .tl_set:N = \l_@@_supv_ent_str,
-% \end{macrocode}
-% 校内导师姓名。
-% \begin{macrocode}
- supervisor-school .tl_set:N = \l_@@_supv_sch_str,
-% \end{macrocode}
-% 作者班级号。
-% \begin{macrocode}
- class-id .tl_set:N = \l_@@_class_id_str,
-% \end{macrocode}
-% 作者学号。
-% \begin{macrocode}
- student-id .tl_set:N = \l_@@_student_id_str,
-% \end{macrocode}
-% 中文摘要。
-% \begin{macrocode}
- abstract .tl_set:N = \l_@@_abstract_zh_tl,
-% \end{macrocode}
-% 英文摘要。
-% \begin{macrocode}
- abstract* .tl_set:N = \l_@@_abstract_en_tl,
-% \end{macrocode}
-% 中文关键词。
-% \begin{macrocode}
- keywords .clist_set:N = \l_@@_keywords_zh_clist,
-% \end{macrocode}
-% 英文关键词。
-% \begin{macrocode}
- keywords* .clist_set:N = \l_@@_keywords_en_clist,
-% \end{macrocode}
-% 致谢。
-% \begin{macrocode}
- acknowledgements .tl_set:N = \l_@@_ack_tl
- }
-% \end{macrocode}
-% \end{macro}
-% \begin{macro}{\keys_define:nn}
-% 定义元(meta)键值对。
-% \begin{macrocode}
-\keys_define:nn { xdu }
- {
- style .meta:nn = { xdu / style } { #1 },
- info .meta:nn = { xdu / info } { #1 }
+ font-path .tl_set:N = \l_@@_font_path_tl
}
% \end{macrocode}
% \end{macro}
@@ -914,76 +816,7 @@
style / math-font = cm,
style / unicode-math = { },
style / font-type = font,
- style / font-path = fonts,
- style / en-cjk-font = false,
- style / language = zh,
- style / bib-backend = biblatex,
- style / bib-resource = { },
- style / fig-label-sep = { 0.75em },
- style / before-skip = { 24pt, 18pt, 12pt, 12pt, 12pt, 12pt },
- style / after-skip = { 18pt, 12pt, 6pt, 6pt, 6pt, 6pt },
- info / title = { },
- info / department = { },
- info / major = { },
- info / author = { },
- info / supervisor = { },
- info / supervisor-department = { },
- info / supervisor-enterprise = { },
- info / supervisor-school = { },
- info / class-id = { },
- info / student-id = { },
- info / abstract = { },
- info / abstract* = { },
- info / keywords = { },
- info / keywords* = { },
- info / acknowledgements = { }
- }
-% \end{macrocode}
-% \end{macro}
-% \begin{macro}{\xdusetup}
-% 用户设置接口。
-% \begin{macrocode}
-\NewDocumentCommand \xdusetup { m }
- { \keys_set:nn { xdu } { #1 } }
-% \end{macrocode}
-% \end{macro}
-% \begin{macro}{\ProcessKeysOptions}
-% 处理选项。
-% \begin{macrocode}
-\ProcessKeysOptions { xdu }
-% \end{macrocode}
-% \end{macro}
-% \subsubsection{配置字体}
-% 忽略字体警告。
-% \begin{macrocode}
-\str_if_eq:NNTF { \l_@@_cjk_font_tl } { fandol }
- { \PassOptionsToPackage { quiet } { fontspec } }
- { }
-\PassOptionsToPackage { quiet } { xeCJK }
-% \end{macrocode}
-% \begin{macro}{\PassOptionsToClass,\LoadClass}
-% 加载\clsx{ctexbook}文档类。
-% \changes{v0.3.2.0}{2022/04/04}{修正行间距为1.5倍}
-% \begin{macrocode}
-\PassOptionsToClass
- {
- zihao=-4,
- sub4section,
-%<xduugthesis> linespread = 1.5,
- fontset = none
- }
- { ctexbook }
-\LoadClass { ctexbook }
-% \end{macrocode}
-% \end{macro}
-% \begin{macro}{\@@_font_path:}
-% 当选择使用字体文件配置字体时,设置字体文件路径。
-% \begin{macrocode}
-\cs_new:Npn \@@_font_path:
- {
- \str_if_eq:NNTF { \l_@@_font_type_tl } { font }
- { }
- { Path = \l_@@_font_path_tl / , }
+ style / font-path = fonts
}
% \end{macrocode}
% \end{macro}
@@ -996,7 +829,7 @@
% \end{arguments}
% \begin{macrocode}
\cs_new:Npn \@@_if_platform_macos:FT #1#2
- { \ctex_if_platform_macos:TF { #2 } { #1 } }
+ { \file_if_exist:nTF { /System/Library/Fonts/Menlo.ttc } { #2 } { #1 } }
% \end{macrocode}
% \end{macro}
% \begin{macro}{\@@_texmf_font:nn}
@@ -1011,18 +844,33 @@
{ \@@_if_platform_macos:FT { #1 } { #2 } }
% \end{macrocode}
% \end{macro}
-% \begin{macro}{\@@_rm_family:,\@@_sf_family:,\@@_tt_family:}
-% 切换字体族时,英文根据配置选择是否使用中文字体。
+% \begin{macro}{\@@_select_font:nn}
+% 自动选择字体文件名称或字体名称。
+% \begin{arguments}
+% \item 字体名称。
+% \item 字体文件名称。
+% \end{arguments}
% \begin{macrocode}
-\cs_new:Npn \@@_rm_family:
- { \bool_if:NTF \l_@@_en_cjk_font_bool { \CJKfamily+ { rm } } { \rmfamily } }
-\cs_new:Npn \@@_sf_family:
- { \bool_if:NTF \l_@@_en_cjk_font_bool { \CJKfamily+ { sf } } { \sffamily } }
-\cs_new:Npn \@@_tt_family:
- { \bool_if:NTF \l_@@_en_cjk_font_bool { \CJKfamily+ { tt } } { \ttfamily } }
+\cs_new:Npn \@@_select_font:nn #1#2
+ {
+ \str_if_eq:NNTF { \l_@@_font_type_tl } { font }
+ { #1 }
+ { #2 }
+ }
% \end{macrocode}
% \end{macro}
-% \paragraph{中文字体}
+% \begin{macro}{\@@_font_path:}
+% 当选择使用字体文件配置字体时,设置字体文件路径。
+% \begin{macrocode}
+\cs_new:Npn \@@_font_path:
+ {
+ \str_if_eq:NNTF { \l_@@_font_type_tl } { font }
+ { }
+ { Path = \l_@@_font_path_tl / , }
+ }
+% \end{macrocode}
+% \end{macro}
+% \subsubsection{中文字体}
% \begin{macro}{\@@_cfg_cjk_font_sub_b:}
% 中文粗体。
% \begin{macrocode}
@@ -1184,21 +1032,6 @@
}
% \end{macrocode}
% \end{macro}
-% \begin{macro}{\@@_select_font:nn}
-% 自动选择字体文件名称或字体名称。
-% \begin{arguments}
-% \item 字体名称。
-% \item 字体文件名称。
-% \end{arguments}
-% \begin{macrocode}
-\cs_new:Npn \@@_select_font:nn #1#2
- {
- \str_if_eq:NNTF { \l_@@_font_type_tl } { font }
- { #1 }
- { #2 }
- }
-% \end{macrocode}
-% \end{macro}
% \begin{macro}{\@@_set_cjk_main_font:nn,\@@_set_cjk_main_font:nnn}
% 配置中文罗马族字体。
% \begin{arguments}
@@ -1329,7 +1162,7 @@
\cs_new:Npn \@@_load_cjk_font_none: { }
% \end{macrocode}
% \end{macro}
-% \paragraph{英文字体}
+% \subsubsection{英文字体}
% \begin{macro}{\@@_set_latin_font:nnn}
% 配置英文字体。
% \begin{macrocode}
@@ -1444,7 +1277,7 @@
\cs_new:Npn \@@_load_latin_font_none: { }
% \end{macrocode}
% \end{macro}
-% \paragraph{数学字体}
+% \subsubsection{数学字体}
% \begin{macro}{\@@_load_unicode_math_pkg:}
% 加载\pkgx{unicode-math}宏包。
% \begin{macrocode}
@@ -1480,10 +1313,10 @@
\cs_new:Npn \@@_define_math_font:nn #1#2
{
\cs_new:cpn { @@_load_math_font_ #1 : }
- {
- \@@_load_unicode_math_pkg:
- \setmathfont { #2 }
- }
+ {
+ \@@_load_unicode_math_pkg:
+ \setmathfont { #2 }
+ }
}
\clist_map_inline:nn
{
@@ -1534,7 +1367,7 @@
\cs_new:Npn \@@_load_math_font_none: { }
% \end{macrocode}
% \end{macro}
-% \paragraph{加载字体}
+% \subsubsection{加载字体}
% \begin{macro}{\@@_load_font:}
% 加载中文字体、英文字体和数学字体。
% \begin{macrocode}
@@ -1550,14 +1383,310 @@
\ctex_at_end_preamble:n { \@@_load_font: }
% \end{macrocode}
% \end{macro}
-% \subsubsection{内部函数}
-% \begin{macro}{\@@_begin_document:n}
-% 钩子。
% \begin{macrocode}
-\cs_new_protected:Npn \@@_begin_document:n #1
- { \ctex_gadd_ltxhook:nn { env/document/begin } { #1 } }
+%</class|xdufont>
+%<*xduugthesis>
+% \end{macrocode}
+% \subsection{信息录入}
+% \begin{variable}
+% {
+% \l_@@_title_str,
+% \l_@@_title_i_str,
+% \l_@@_title_ii_str,
+% \l_@@_dept_str,
+% \l_@@_major_str,
+% \l_@@_author_str,
+% \l_@@_supv_str,
+% \l_@@_supv_dept_str,
+% \l_@@_supv_ent_str,
+% \l_@@_supv_sch_str,
+% \l_@@_class_id_str,
+% \l_@@_student_id_str,
+% \l_@@_abstract_zh_tl,
+% \l_@@_abstract_en_tl,
+% \l_@@_keywords_zh_clist,
+% \l_@@_keywords_en_clist,
+% \l_@@_ack_tl
+% }
+% 论文标题。
+% \begin{macrocode}
+\str_new:N \l_@@_title_str
+\str_new:N \l_@@_title_i_str
+\str_new:N \l_@@_title_ii_str
+% \end{macrocode}
+% 院系名称。
+% \begin{macrocode}
+\str_new:N \l_@@_dept_str
+% \end{macrocode}
+% 专业名称。
+% \begin{macrocode}
+\str_new:N \l_@@_major_str
+% \end{macrocode}
+% 作者姓名。
+% \begin{macrocode}
+\str_new:N \l_@@_author_str
+% \end{macrocode}
+% 导师姓名。
+% \begin{macrocode}
+\str_new:N \l_@@_supv_str
+% \end{macrocode}
+% 院内导师姓名。
+% \begin{macrocode}
+\str_new:N \l_@@_supv_dept_str
+% \end{macrocode}
+% 校外导师姓名。
+% \begin{macrocode}
+\str_new:N \l_@@_supv_ent_str
+% \end{macrocode}
+% 校内导师姓名。
+% \begin{macrocode}
+\str_new:N \l_@@_supv_sch_str
+% \end{macrocode}
+% 作者班级号。
+% \begin{macrocode}
+\str_new:N \l_@@_class_id_str
+% \end{macrocode}
+% 作者学号。
+% \begin{macrocode}
+\str_new:N \l_@@_student_id_str
+% \end{macrocode}
+% 中文摘要。
+% \begin{macrocode}
+\tl_new:N \l_@@_abstract_zh_tl
+% \end{macrocode}
+% 英文摘要。
+% \begin{macrocode}
+\tl_new:N \l_@@_abstract_en_tl
+% \end{macrocode}
+% 中文关键词。
+% \begin{macrocode}
+\clist_new:N \l_@@_keywords_zh_clist
+% \end{macrocode}
+% 英文关键词。
+% \begin{macrocode}
+\clist_new:N \l_@@_keywords_en_clist
+% \end{macrocode}
+% 致谢。
+% \begin{macrocode}
+\tl_new:N \l_@@_ack_tl
+% \end{macrocode}
+% \end{variable}
+% \begin{macro}{\keys_define:nn}
+% 定义信息键值。
+% \begin{macrocode}
+\keys_define:nn { xdu / info }
+ {
+% \end{macrocode}
+% 论文标题。
+% \begin{macrocode}
+ title .tl_set:N = \l_@@_title_str,
+% \end{macrocode}
+% 院系名称。
+% \begin{macrocode}
+ department .tl_set:N = \l_@@_dept_str,
+% \end{macrocode}
+% 专业名称。
+% \begin{macrocode}
+ major .tl_set:N = \l_@@_major_str,
+% \end{macrocode}
+% 作者姓名。
+% \begin{macrocode}
+ author .tl_set:N = \l_@@_author_str,
+% \end{macrocode}
+% 导师姓名。
+% \begin{macrocode}
+ supervisor .tl_set:N = \l_@@_supv_str,
+% \end{macrocode}
+% 院内导师姓名。
+% \begin{macrocode}
+ supervisor-department .tl_set:N = \l_@@_supv_dept_str,
+% \end{macrocode}
+% 校外导师姓名。
+% \begin{macrocode}
+ supervisor-enterprise .tl_set:N = \l_@@_supv_ent_str,
+% \end{macrocode}
+% 校内导师姓名。
+% \begin{macrocode}
+ supervisor-school .tl_set:N = \l_@@_supv_sch_str,
+% \end{macrocode}
+% 作者班级号。
+% \begin{macrocode}
+ class-id .tl_set:N = \l_@@_class_id_str,
+% \end{macrocode}
+% 作者学号。
+% \begin{macrocode}
+ student-id .tl_set:N = \l_@@_student_id_str,
+% \end{macrocode}
+% 中文摘要。
+% \begin{macrocode}
+ abstract .tl_set:N = \l_@@_abstract_zh_tl,
+% \end{macrocode}
+% 英文摘要。
+% \begin{macrocode}
+ abstract* .tl_set:N = \l_@@_abstract_en_tl,
+% \end{macrocode}
+% 中文关键词。
+% \begin{macrocode}
+ keywords .clist_set:N = \l_@@_keywords_zh_clist,
+% \end{macrocode}
+% 英文关键词。
+% \begin{macrocode}
+ keywords* .clist_set:N = \l_@@_keywords_en_clist,
+% \end{macrocode}
+% 致谢。
+% \begin{macrocode}
+ acknowledgements .tl_set:N = \l_@@_ack_tl
+ }
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\keys_set:nn}
+% 初始设置。
+% \begin{macrocode}
+\keys_set:nn { xdu }
+ {
+ info / title = { },
+ info / department = { },
+ info / major = { },
+ info / author = { },
+ info / supervisor = { },
+ info / supervisor-department = { },
+ info / supervisor-enterprise = { },
+ info / supervisor-school = { },
+ info / class-id = { },
+ info / student-id = { },
+ info / abstract = { },
+ info / abstract* = { },
+ info / keywords = { },
+ info / keywords* = { },
+ info / acknowledgements = { }
+ }
+% \end{macrocode}
+% \end{macro}
+% \subsection{样式配置}
+% \begin{variable}
+% {
+% \l_@@_en_cjk_font_bool,
+% \l_@@_lang_tl,
+% \l_@@_bib_tool_tl,
+% \l_@@_bib_file_clist,
+% \l_@@_fig_label_sep_tl,
+% \l_@@_before_skip_clist,
+% \l_@@_after_skip_clist
+% }
+% 英文是否使用中文字体。
+% \begin{macrocode}
+\bool_new:N \l_@@_en_cjk_font_bool
+% \end{macrocode}
+% 语言。
+% \begin{macrocode}
+\tl_new:N \l_@@_lang_tl
+% \end{macrocode}
+% 参考文献支持方式。
+% \begin{macrocode}
+\tl_new:N \l_@@_bib_tool_tl
+% \end{macrocode}
+% 参考文献文件。
+% \begin{macrocode}
+\clist_new:N \l_@@_bib_file_clist
+% \end{macrocode}
+% 图片标签与后面标题之间的间距。
+% \begin{macrocode}
+\tl_new:N \l_@@_fig_label_sep_tl
+% \end{macrocode}
+% 设置章节标题前后的垂直间距。
+% \begin{macrocode}
+\clist_new:N \l_@@_before_skip_clist
+\clist_new:N \l_@@_after_skip_clist
+% \end{macrocode}
+% \end{variable}
+% \begin{macro}{\keys_define:nn}
+% 定义样式键值。
+% \begin{macrocode}
+\keys_define:nn { xdu / style }
+ {
+% \end{macrocode}
+% 英文是否使用中文字体。
+% \begin{macrocode}
+ en-cjk-font .bool_set:N = \l_@@_en_cjk_font_bool,
+% \end{macrocode}
+% 论文语言配置。
+% \begin{macrocode}
+ language .choices:nn = { zh, en }
+ { \tl_set_eq:NN \l_@@_lang_tl \l_keys_choice_tl },
+% \end{macrocode}
+% 参考文献支持方式配置。
+% \begin{macrocode}
+ bib-backend .choices:nn = { bibtex, biblatex }
+ { \tl_set_eq:NN \l_@@_bib_tool_tl \l_keys_choice_tl },
+% \end{macrocode}
+% 参考文献文件。
+% \begin{macrocode}
+ bib-resource .clist_set:N = \l_@@_bib_file_clist,
+% \end{macrocode}
+% 图片标签与后面标题之间的间距。
+% \begin{macrocode}
+ fig-label-sep .tl_set:N = \l_@@_fig_label_sep_tl,
+% \end{macrocode}
+% 设置章节标题前的垂直间距。
+% \begin{macrocode}
+ before-skip .clist_set:N = \l_@@_before_skip_clist,
+% \end{macrocode}
+% 设置章节标题后的垂直间距。
+% \begin{macrocode}
+ after-skip .clist_set:N = \l_@@_after_skip_clist
+ }
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\keys_set:nn}
+% 初始设置。
+% \begin{macrocode}
+\keys_set:nn { xdu }
+ {
+ style / en-cjk-font = false,
+ style / language = zh,
+ style / bib-backend = biblatex,
+ style / bib-resource = { },
+ style / fig-label-sep = { 0.75em },
+ style / before-skip = { 24pt, 18pt, 12pt, 12pt, 12pt, 12pt },
+ style / after-skip = { 18pt, 12pt, 6pt, 6pt, 6pt, 6pt }
+ }
+% \end{macrocode}
+% \end{macro}
+% \begin{macrocode}
+%</xduugthesis>
+% \end{macrocode}
+% \begin{macrocode}
+%<*class|xdufont>
+% \end{macrocode}
+% \subsection{键值选项}
+% \begin{macro}{\xdusetup}
+% 用户设置接口。
+% \begin{macrocode}
+\NewDocumentCommand \xdusetup { m }
+ { \keys_set:nn { xdu } { #1 } }
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\keys_define:nn}
+% 定义元(meta)键值对。
+% \begin{macrocode}
+\keys_define:nn { xdu }
+ {
+ style .meta:nn = { xdu / style } { #1 },
+ info .meta:nn = { xdu / info } { #1 }
+ }
% \end{macrocode}
% \end{macro}
+% \begin{macro}{\ProcessKeysOptions}
+% 处理选项。
+% \begin{macrocode}
+\ProcessKeysOptions { xdu / style }
+% \end{macrocode}
+% \end{macro}
+% \begin{macrocode}
+%</class|xdufont>
+%<*xduugthesis>
+% \end{macrocode}
+% \subsection{内部函数}
% \begin{macro}{\@@_lang_switch:nn}
% 根据论文语言自动选择中文对应内容或英文对应内容。
% \begin{arguments}
@@ -1573,6 +1702,17 @@
}
% \end{macrocode}
% \end{macro}
+% \begin{macro}{\@@_rm_family:,\@@_sf_family:,\@@_tt_family:}
+% 切换字体族时,英文根据配置选择是否使用中文字体。
+% \begin{macrocode}
+\cs_new:Npn \@@_rm_family:
+ { \bool_if:NTF \l_@@_en_cjk_font_bool { \CJKfamily+ { rm } } { \rmfamily } }
+\cs_new:Npn \@@_sf_family:
+ { \bool_if:NTF \l_@@_en_cjk_font_bool { \CJKfamily+ { sf } } { \sffamily } }
+\cs_new:Npn \@@_tt_family:
+ { \bool_if:NTF \l_@@_en_cjk_font_bool { \CJKfamily+ { tt } } { \ttfamily } }
+% \end{macrocode}
+% \end{macro}
% \begin{variable}{\l_@@_pure_title_str}
% 移除标题中换行符。
% \begin{macrocode}
@@ -1659,166 +1799,6 @@
}
% \end{macrocode}
% \end{macro}
-% \subsubsection{目录}
-% \begin{variable}
-% {
-% \cftchapleader,
-% \cftbeforechapskip,
-% \cftbeforesecskip,
-% \cftbeforesubsecskip,
-% \cftbeforesubsubsecskip,
-% \cftbeforeparaskip,
-% \cftbeforesubparaskip,
-% \cftchapfont,
-% \cftchappagefont,
-% \cftsecfont,
-% \cftsubsecfont,
-% \cftsubsubsecfont,
-% \cftparafont,
-% \cftsubparafont,
-% \cftsecpagefont,
-% \cftsubsecpagefont,
-% \cftsubsubsecpagefont,
-% \cftparapagefont,
-% \cftsubparapagefont
-% }
-% 设置目录样式。
-% \changes{v0.4.1.0}{2022/04/05}{设置目录样式}
-% \begin{macrocode}
-\RequirePackage [ titles ] { tocloft }
-\renewcommand { \cftchapleader } { \bfseries \cftdotfill { \cftdotsep } }
-\clist_map_inline:nn
- {
- \cftbeforechapskip,
- \cftbeforesecskip,
- \cftbeforesubsecskip,
- \cftbeforesubsubsecskip,
- \cftbeforeparaskip,
- \cftbeforesubparaskip
- }
- { \dim_set:Nn { #1 } { 5pt } }
- \clist_map_inline:nn
- {
- \cftchapfont,
- \cftchappagefont
- }
- { \renewcommand { #1 } { \@@_rm_family: \zihao { -4 } \bfseries } }
-\clist_map_inline:nn
- {
- \cftsecfont,
- \cftsubsecfont,
- \cftsubsubsecfont,
- \cftparafont,
- \cftsubparafont,
- \cftsecpagefont,
- \cftsubsecpagefont,
- \cftsubsubsecpagefont,
- \cftparapagefont,
- \cftsubparapagefont
- }
- { \renewcommand { #1 } { \@@_rm_family: \zihao { -4 } } }
-% \end{macrocode}
-% \end{variable}
-% \subsubsection{图片}
-% \begin{macro}{\DeclareCaptionLabelSeparator,\DeclareCaptionFont,\captionsetup}
-% \changes{v0.1.2.0}{2022/04/03}{设置图片标签与后面标题之间的间距}
-% \changes{v0.1.3.0}{2022/04/03}{设置图片标签与标题字体字号}
-% 设置图片标签与后面标题之间的间距。
-% \begin{macrocode}
-\RequirePackage { caption }
-\DeclareCaptionLabelSeparator { customskip } { \hskip \l_@@_fig_label_sep_tl }
-\DeclareCaptionFont { customfont } { \@@_rm_family: \zihao { 5 } }
-\captionsetup
- {
- labelsep = customskip,
- font = customfont
- }
-% \end{macrocode}
-% \end{macro}
-% \begin{macro}{\PassOptionsToPackage,\captionsetup}
-% \changes{v0.4.2.0}{2022/04/05}{设置子图标签与标题字体字号}
-% 设置子图标签与标题字体字号,支持\pkgx{subfig}和\pkgx{subcaption}宏包。
-% \begin{macrocode}
-\PassOptionsToPackage { font = small } { subfig }
-\captionsetup [ sub ] { font = customfont }
-% \end{macrocode}
-% \end{macro}
-% \subsubsection{超链接和PDF元数据}
-% \begin{macro}{\hyperref}
-% 配置超链接和PDF元数据。
-% \changes{v0.5.0.0}{2022/04/05}{添加PDF主题元数据}
-% \begin{macrocode}
-\RequirePackage{hyperref}
-\hypersetup
- {
- bookmarksnumbered,
- hidelinks
- }
-\ctex_at_end_preamble:n
- {
- \hypersetup
- {
- pdftitle = \l_@@_pure_title_str,
-%<xduugthesis> pdfsubject = {西安电子科技大学本科毕业设计论文},
- pdfauthor = \l_@@_author_str
- }
- }
-% \end{macrocode}
-% \end{macro}
-% \subsubsection{参考文献}
-% \begin{macro}{\addbibresource}
-% 参考文献。
-% \begin{macrocode}
-\@@_begin_document:n
- {
- \tl_if_eq:NnTF \l_@@_bib_tool_tl { bibtex }
- {
- \RequirePackage [ sort&compress,square,super,comma,numbers ] { natbib }
- \RequirePackage { gbt7714 }
- \bibliographystyle { gbt7714-numerical }
- }
- {
- \RequirePackage [ style = gb7714-2015 ] { biblatex }
- \clist_map_inline:Nn \l_@@_bib_file_clist { \addbibresource { #1 } }
- }
- }
-% \end{macrocode}
-% \end{macro}
-% \subsubsection{附录}
-% \begin{macro}{appendixes}
-% 附录环境。
-% \changes{v0.3.0.0}{2022/04/04}{新增附录环境}
-% \changes{v0.3.1.0}{2022/04/04}{修正附录中图表编号样式}
-% \begin{macrocode}
-\RequirePackage { environ }
-\NewEnviron { appendixes }
- {
- \appendix
- \renewcommand { \thefigure } { \thechapter \arabic { figure } }
- \renewcommand { \thetable } { \thechapter \arabic { table } }
- \BODY
- }
-% \end{macrocode}
-% \end{macro}
-% \subsubsection{通用宏包}
-% 设置纸张尺寸为A4。
-% \begin{macrocode}
-\RequirePackage { geometry }
-\geometry { paper = a4paper }
-% \end{macrocode}
-% \begin{macrocode}
-\RequirePackage { fancyhdr }
-\RequirePackage { xeCJKfntef }
-\RequirePackage { graphicx }
-% \end{macrocode}
-% \begin{macrocode}
-%</class>
-% \end{macrocode}
-% \subsection{xduugthesis.cls}
-% \begin{macrocode}
-%<*xduugthesis>
-% \end{macrocode}
-% \subsubsection{内部函数}
% \begin{macro}{\@@_typeout_keywords:nNn}
% 排版关键词。
% \begin{arguments}
@@ -1845,8 +1825,8 @@
}
% \end{macrocode}
% \end{macro}
-% \subsubsection{页面设置}
-% \paragraph{页面尺寸}
+% \subsection{页面设置}
+% \subsubsection{页面尺寸}
% \begin{macro}{\geometry,\newgeometry,\savegeometry}
% 正文页面:上3厘米、下2厘米、内侧3厘米、外侧2厘米;装订线1厘米;页眉2厘米;页脚1厘米。
% \begin{macrocode}
@@ -1874,7 +1854,7 @@
\savegeometry { cover }
% \end{macrocode}
% \end{macro}
-% \paragraph{页眉页脚}
+% \subsubsection{页眉页脚}
% \begin{macro}{\chaptermark}
% 设置奇数页页眉为章标题。
% \begin{macrocode}
@@ -1907,16 +1887,16 @@
}
% \end{macrocode}
% \end{macro}
-% \subsubsection{标题设置}
+% \subsection{标题设置}
% 中文章标题黑体,三号,居中排列。节标题宋体,四号,居中排列。英文一级标题字体为Times New Roman,四号,正体,左对齐,以大写罗马数字(I、II 等)标出序号。其余各级标题的字体均为Times New Roman,小四号,正体。二级及以下级别的标题依次缩进4个英文字符,以1.1,1.2,1.1.1,1.1.2形式标出序号。
-% \paragraph{章节层次}
+% \subsubsection{章节层次}
% \begin{macro}{\ctexset}
% 设置章节层次为subparagraph。
% \begin{macrocode}
\ctexset { secnumdepth=5 }
% \end{macrocode}
% \end{macro}
-% \paragraph{章节名字}
+% \subsubsection{章节名字}
% \begin{macro}{\ctexset}
% 设置章节的名字。
% \begin{macrocode}
@@ -1935,7 +1915,7 @@
}
% \end{macrocode}
% \end{macro}
-% \paragraph{章节编号}
+% \subsubsection{章节编号}
% \begin{macro}{\ctexset}
% 设置章节编号的数字输出格式。
% \begin{macrocode}
@@ -1955,7 +1935,7 @@
}
% \end{macrocode}
% \end{macro}
-% \paragraph{章节和标题}
+% \subsubsection{章节和标题}
% \begin{macro}{\@@_zh_title:nnn}
% 设置中文章节名字和随后的标题内容格式。
% \begin{arguments}
@@ -2043,7 +2023,162 @@
}
% \end{macrocode}
% \end{macro}
-% \paragraph{封面}
+% \subsection{目录}
+% \begin{variable}
+% {
+% \cftchapleader,
+% \cftbeforechapskip,
+% \cftbeforesecskip,
+% \cftbeforesubsecskip,
+% \cftbeforesubsubsecskip,
+% \cftbeforeparaskip,
+% \cftbeforesubparaskip,
+% \cftchapfont,
+% \cftchappagefont,
+% \cftsecfont,
+% \cftsubsecfont,
+% \cftsubsubsecfont,
+% \cftparafont,
+% \cftsubparafont,
+% \cftsecpagefont,
+% \cftsubsecpagefont,
+% \cftsubsubsecpagefont,
+% \cftparapagefont,
+% \cftsubparapagefont
+% }
+% 设置目录样式。
+% \changes{v0.4.1.0}{2022/04/05}{设置目录样式}
+% \begin{macrocode}
+\RequirePackage [ titles ] { tocloft }
+\renewcommand { \cftchapleader } { \bfseries \cftdotfill { \cftdotsep } }
+\clist_map_inline:nn
+ {
+ \cftbeforechapskip,
+ \cftbeforesecskip,
+ \cftbeforesubsecskip,
+ \cftbeforesubsubsecskip,
+ \cftbeforeparaskip,
+ \cftbeforesubparaskip
+ }
+ { \dim_set:Nn { #1 } { 5pt } }
+ \clist_map_inline:nn
+ {
+ \cftchapfont,
+ \cftchappagefont
+ }
+ { \renewcommand { #1 } { \@@_rm_family: \zihao { -4 } \bfseries } }
+\clist_map_inline:nn
+ {
+ \cftsecfont,
+ \cftsubsecfont,
+ \cftsubsubsecfont,
+ \cftparafont,
+ \cftsubparafont,
+ \cftsecpagefont,
+ \cftsubsecpagefont,
+ \cftsubsubsecpagefont,
+ \cftparapagefont,
+ \cftsubparapagefont
+ }
+ { \renewcommand { #1 } { \@@_rm_family: \zihao { -4 } } }
+% \end{macrocode}
+% \end{variable}
+% \subsection{公式}
+% \begin{macro}{\theequation}
+% 重定义公式编号样式。
+% \begin{macrocode}
+\renewcommand { \theequation } { \thechapter - \arabic { equation } }
+% \end{macrocode}
+% \end{macro}
+% \subsection{图片}
+% \begin{macro}{\DeclareCaptionLabelSeparator,\DeclareCaptionFont,\captionsetup}
+% \changes{v0.1.2.0}{2022/04/03}{设置图片标签与后面标题之间的间距}
+% \changes{v0.1.3.0}{2022/04/03}{设置图片标签与标题字体字号}
+% 设置图片标签与后面标题之间的间距。
+% \begin{macrocode}
+\RequirePackage { caption }
+\DeclareCaptionLabelSeparator { customskip } { \hskip \l_@@_fig_label_sep_tl }
+\DeclareCaptionFont { customfont } { \@@_rm_family: \zihao { 5 } }
+\captionsetup
+ {
+ labelsep = customskip,
+ font = customfont
+ }
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\PassOptionsToPackage,\captionsetup}
+% \changes{v0.4.2.0}{2022/04/05}{设置子图标签与标题字体字号}
+% 设置子图标签与标题字体字号,支持\pkgx{subfig}和\pkgx{subcaption}宏包。
+% \begin{macrocode}
+\PassOptionsToPackage { font = small } { subfig }
+\captionsetup [ sub ] { font = customfont }
+% \end{macrocode}
+% \end{macro}
+% \subsection{超链接和PDF元数据}
+% \begin{macro}{\hyperref}
+% 配置超链接和PDF元数据。
+% \changes{v0.5.0.0}{2022/04/05}{添加PDF主题元数据}
+% \begin{macrocode}
+\RequirePackage{hyperref}
+\hypersetup
+ {
+ bookmarksnumbered,
+ hidelinks
+ }
+\ctex_at_end_preamble:n
+ {
+ \hypersetup
+ {
+ pdftitle = \l_@@_pure_title_str,
+%<xduugthesis> pdfsubject = {西安电子科技大学本科毕业设计论文},
+ pdfauthor = \l_@@_author_str
+ }
+ }
+% \end{macrocode}
+% \end{macro}
+% \subsection{参考文献}
+% \begin{macro}{\@@_begin_document:n}
+% 钩子。
+% \begin{macrocode}
+\cs_new_protected:Npn \@@_begin_document:n #1
+ { \ctex_gadd_ltxhook:nn { env/document/begin } { #1 } }
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\addbibresource}
+% 参考文献。
+% \begin{macrocode}
+\@@_begin_document:n
+ {
+ \tl_if_eq:NnTF \l_@@_bib_tool_tl { bibtex }
+ {
+ \RequirePackage [ sort&compress,square,super,comma,numbers ] { natbib }
+ \RequirePackage { gbt7714 }
+ \bibliographystyle { gbt7714-numerical }
+ }
+ {
+ \RequirePackage [ style = gb7714-2015 ] { biblatex }
+ \clist_map_inline:Nn \l_@@_bib_file_clist { \addbibresource { #1 } }
+ }
+ }
+% \end{macrocode}
+% \end{macro}
+% \subsection{附录}
+% \begin{macro}{appendixes}
+% 附录环境。
+% \changes{v0.3.0.0}{2022/04/04}{新增附录环境}
+% \changes{v0.3.1.0}{2022/04/04}{修正附录中图表编号样式}
+% \begin{macrocode}
+\RequirePackage { environ }
+\NewEnviron { appendixes }
+ {
+ \appendix
+ \renewcommand { \thefigure } { \thechapter \arabic { figure } }
+ \renewcommand { \thetable } { \thechapter \arabic { table } }
+ \BODY
+ }
+% \end{macrocode}
+% \end{macro}
+% \subsection{封面}
% \begin{macro}{\@@_cover_i:nn}
% 绘制班级和学号。
% \begin{arguments}
@@ -2287,14 +2422,8 @@
}
% \end{macrocode}
% \end{macro}
+% \subsection{正文}
% \begin{macro}{\mainmatter}
-% \paragraph{正文}
-% \begin{macro}{\theequation}
-% 重定义公式编号样式。
-% \begin{macrocode}
-\renewcommand { \theequation } { \thechapter - \arabic { equation } }
-% \end{macrocode}
-% \end{macro}
% 排版正文部分。
% \begin{macrocode}
\renewcommand{\mainmatter}
diff --git a/macros/xetex/latex/xduts/xduts.ins b/macros/xetex/latex/xduts/xduts.ins
index f47fc5e39c..e5bbb7fdd8 100644
--- a/macros/xetex/latex/xduts/xduts.ins
+++ b/macros/xetex/latex/xduts/xduts.ins
@@ -23,7 +23,11 @@
\postamble
\endpostamble
\keepsilent
-\generate{\file{xduugthesis.cls}{\from{\jobname.dtx}{class,xduugthesis}}}
+\generate
+ {
+ \file{xduugthesis.cls}{\from{\jobname.dtx}{class,xduugthesis}}
+ \file{xdufont.sty}{\from{\jobname.dtx}{sty,xdufont}}
+ }
\nopreamble
\nopostamble
\endbatchfile
diff --git a/macros/xetex/latex/xduts/xduts.pdf b/macros/xetex/latex/xduts/xduts.pdf
index e59fc17ef2..6145412d94 100644
--- a/macros/xetex/latex/xduts/xduts.pdf
+++ b/macros/xetex/latex/xduts/xduts.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 b9d0d7863f..b1c04d02f9 100644
--- a/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
+++ b/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
@@ -13,8 +13,8 @@ $mirrors = {
'https://mirror.bjtu.edu.cn/CTAN/' => 1,
'https://mirrors.aliyun.com/CTAN/' => 1,
'https://mirrors.bfsu.edu.cn/CTAN/' => 1,
- 'https://mirrors.cloud.tencent.com/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,
'https://mirrors.sjtug.sjtu.edu.cn/ctan/' => 1,
@@ -36,6 +36,7 @@ $mirrors = {
'http://ctan.yazd.ac.ir/' => 1,
'https://ctan.asis.ai/' => 1,
'https://ctan.um.ac.ir/' => 1,
+ 'https://mirror.bardia.tech/ctan/' => 1,
},
'Japan' => {
'http://ring.airnet.ne.jp/archives/text/CTAN/' => 1,
@@ -45,7 +46,6 @@ $mirrors = {
},
'Korea' => {
'http://ftp.ktug.org/tex-archive/' => 1,
- 'https://cran.asia/tex/' => 1,
'https://ftp.harukasan.org/CTAN/' => 1,
'https://ftp.kaist.ac.kr/pub/tex-archive/' => 1,
'https://mirror.kakao.com/CTAN/' => 1,
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb b/systems/texlive/tlnet/tlpkg/texlive.tlpdb
index 9fb96e5fe4..8cee7207e3 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb
@@ -26,7 +26,7 @@ depend container_split_src_files/1
depend frozen/0
depend minrelease/2016
depend release/2022
-depend revision/62989
+depend revision/62995
name 00texlive.image
category TLCore
@@ -4557,7 +4557,7 @@ depend setting_available_architectures:aarch64-linux amd64-freebsd amd64-netbsd
name 00texlive.installer
category TLCore
-revision 62984
+revision 62991
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
@@ -220173,26 +220173,26 @@ catalogue-version 0.0.1
name njuthesis
category Package
-revision 62939
+revision 62995
shortdesc LaTeX thesis template for Nanjing University
relocated 1
longdesc The njuthesis class is intended for typesetting Nanjing
longdesc University dissertations with LaTeX, providing support for
longdesc bachelor, master, and doctoral thesis.
-containersize 13208
-containerchecksum 1616405ff2d48a476765d45155d7488b1a0409ba8b26360df38e44e6c90e1d92ff5fb1a921ce6dab7d4b66e1e8d36c854ffc5f221cf1ca68630622e4cb9d059c
-doccontainersize 1158452
-doccontainerchecksum a569ebee4c04b6d00f9445828e6ab12c0fb9165652d408c0fbcebb9962b28f65dc1cfa5a912e79b9bd595b6c30fce856d1ed7bb3231b4ed800ac04e98cf17bad
-docfiles size=289
+containersize 14588
+containerchecksum 102a8147c1dfb50bdf5b12f2b84c20a6332adbbf3d3f72a8defe68e8fd05d884ca684656ab0867618767e27bdba01bbf6931468bb9918330a32ede0429c48c5c
+doccontainersize 1218472
+doccontainerchecksum 39971ca3da4b88abcccdbc4bc8b090b6c44b65125d96e0a180640c6559de6b5ed527d26aee4892e2ffd356f36637977fc3a9a7e9cf75643b91725d8a268b1210
+docfiles size=305
RELOC/doc/latex/njuthesis/LICENSE
RELOC/doc/latex/njuthesis/README.md details="Readme"
RELOC/doc/latex/njuthesis/njuthesis.pdf details="Package documentation" language="zh"
-srccontainersize 49180
-srccontainerchecksum 345f632cf9ff46132d34e78323765451da2b400a33c93a1a48fdac399cfd5662a340943848674288ec9231ee74d435e892f3cdfdcad6650f4e7ded6f0e0d7572
-srcfiles size=52
+srccontainersize 52028
+srccontainerchecksum 915f9b37f81ad325197aaf841c00b715a270804fd4a95965e04e26da82e64d71a7d4a90ac73bb91fbd83a56e487ed5d3cfc37a934fa75c8354e38498fdd9c058
+srcfiles size=56
RELOC/source/latex/njuthesis/njuthesis.dtx
RELOC/source/latex/njuthesis/njuthesis.ins
-runfiles size=18
+runfiles size=20
RELOC/tex/latex/njuthesis/njuthesis-graduate.def
RELOC/tex/latex/njuthesis/njuthesis-undergraduate.def
RELOC/tex/latex/njuthesis/njuthesis.cls
@@ -220204,7 +220204,7 @@ catalogue-contact-support https://github.com/nju-lug/NJUThesis/discussions
catalogue-ctan /macros/unicodetex/latex/njuthesis
catalogue-license lppl1.3c
catalogue-topics dissertation proposal latex3 chinese
-catalogue-version 0.16.1
+catalogue-version 0.17.0
name njuvisual
category Package
@@ -248301,7 +248301,7 @@ catalogue-version 1.101
name polyglossia
category Package
-revision 62988
+revision 62993
shortdesc An alternative to babel for XeLaTeX and LuaLaTeX
relocated 1
longdesc This package provides a complete Babel replacement for users of
@@ -248314,9 +248314,9 @@ depend iftex
depend makecmds
depend xkeyval
containersize 119060
-containerchecksum 53017732fbb155696073d359c22927769c6ef7723839197f10a4b537df83b943918eb13af5b5acd05a11e4118ba99fedba8747ad9a4913b423a10bce7de678a2
-doccontainersize 654272
-doccontainerchecksum 136a9c8db27f899a3276e53dd43d8a44ecf79261fb6f42486017534d037a323b125375e418470e80978938d6f56013f60c14bf719155482b7668315a8fed5ae8
+containerchecksum 30088d042cdf50675c90a04a74fee0a2421eeea25b7a11365f5c3cec503789d5b17468c782a008628157a8312257f4ddaf2c2ce19e9cd6de2ebfc09d90f00320
+doccontainersize 653264
+doccontainerchecksum f158c042a822f238061ea173dceb6cea4e03529909417f9d73160e2d363a7b31c3b813321140e816470a6ef632bdab5e4e85fc130843625e48a023b45d647192
docfiles size=209
RELOC/doc/latex/polyglossia/README.md details="Readme"
RELOC/doc/latex/polyglossia/example-arabic.pdf
@@ -248331,8 +248331,8 @@ docfiles size=209
RELOC/doc/latex/polyglossia/polyglossia.tex
RELOC/doc/latex/polyglossia/test-welsh.pdf
RELOC/doc/latex/polyglossia/test-welsh.tex
-srccontainersize 157312
-srccontainerchecksum 25d696fbf7702dff338a05b96c6f21a4ab0f177303fbad3aeb7d90412d395498093489c61fd5d4d162af093b66e59ca5842c8f8e801c3eadb40fff16a08f6dba
+srccontainersize 157296
+srccontainerchecksum 2a8a15256ee4f1a930f6d3403427819ef0dd9d241876826b5af4980aba18eb923c6ac93c657339b352b3a5df4bbf7f1b4e39a4e3abb1aa61bd8b639561905bea
srcfiles size=236
RELOC/source/latex/polyglossia/polyglossia.dtx
runfiles size=373
@@ -248606,7 +248606,7 @@ catalogue-contact-repository https://github.com/reutenauer/polyglossia
catalogue-ctan /macros/unicodetex/latex/polyglossia
catalogue-license mit lppl1.3 cc0
catalogue-topics multilingual use-xetex use-luatex
-catalogue-version 1.55
+catalogue-version 1.55a
name polynom
category Package
@@ -301206,7 +301206,7 @@ docfiles size=376
name texlive-scripts
category TLCore
-revision 62984
+revision 62991
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.
@@ -301214,10 +301214,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 109800
-containerchecksum f340fbc14bf8347a52a25093b26c1acb4b87a1551469296b94e8a6db7648e234bc84d4012699bdd54204cba2249f13a4740725f2d14a3366016ac1a3185a3142
-doccontainersize 406060
-doccontainerchecksum 9e8399d6a4f789821ebe5ef4fb081826f61264fb181f5581e03281c5eab827c017fdf9a259a52b1dbe10e5b57b442766e2304739fcd7496e67950222091d68a7
+containersize 109792
+containerchecksum 27bc973369404fef86cf1b47eb2a3e2749166b23878c2d9ada683b9b12f968d5c8d8bbc12a45746d636f24dea81488524da514e7298872fdaca40fabbb4ed972
+doccontainersize 406044
+doccontainerchecksum 367b35adecdc07ce0bb8d96943b281371d0f30fbe70d612099471784c7f98df1fb735d48ea279fa66fe6078c96fdadf795094f3f380d51097df07e9cf26a2e97
docfiles size=504
doc.html
texmf-dist/doc/man/man1/fmtutil-sys.1
@@ -307247,7 +307247,7 @@ catalogue-version 1.5
name tikz-ladder
category Package
-revision 46555
+revision 62992
shortdesc Draw ladder diagrams using TikZ
relocated 1
longdesc The tikz-ladder package contains a collection of symbols for
@@ -307257,11 +307257,11 @@ longdesc (for representing functions and function blocks) besides
longdesc contacts and coils. It extends the circuit library of TikZ and
longdesc allows you to draw a ladder diagram in the same way as you
longdesc would draw any other circuit.
-containersize 4544
-containerchecksum b01bd48b4e8dbf5e3549bd24949b81b3731b32d715dcf3d3141e2e2eca5a98c1f5e5369c10cfdc62791280aa3349cb5409f582d71701ff03dced0688cad1847c
-doccontainersize 236908
-doccontainerchecksum 9133c29850f486ea62be8ef9b61bf67907e88c9557fbac132ad04501616efee97725fc58585fce64c59707b4828a4953d926860af7c99fde9e3e73a479b28d0c
-docfiles size=101
+containersize 4880
+containerchecksum c18340557f53f0617831e7e6dc904840e6f1e04938684a21f2897297c8a70b95cacabe4a00e66d632026d8ce7728334eadaf02cf5bfe4ffc0e746f3ceec36fb1
+doccontainersize 292640
+doccontainerchecksum d77c8771b36df84e61cfada1f56300b10908727a164788b3c0665f14a26db5b03a3ea7f4a0fabf5ecc820e90a27a73c0ff0a7985e37e755852ac401b7143e7c9
+docfiles size=124
RELOC/doc/latex/tikz-ladder/README.txt details="Readme"
RELOC/doc/latex/tikz-ladder/tikz-ladder-doc.pdf details="Package documentation"
RELOC/doc/latex/tikz-ladder/tikz-ladder-doc.tex
@@ -307271,7 +307271,7 @@ catalogue-also ladder
catalogue-ctan /graphics/pgf/contrib/tikz-ladder
catalogue-license lppl1
catalogue-topics pgf-tikz diagram diagram-circ engineering
-catalogue-version 1.1
+catalogue-version 1.3
name tikz-lake-fig
category Package
@@ -337796,8 +337796,8 @@ catalogue-version 1.00
name xduts
category Package
-revision 62987
-shortdesc Xidian University TeX Suite
+revision 62994
+shortdesc Clear all obstacles for Xidian University students to use LaTeX typesetting
relocated 1
longdesc XDUTS is designed to help Xidian University students use LaTeX
longdesc typesetting efficiently. XDUTS contains a font configuration
@@ -337805,21 +337805,22 @@ longdesc package that meets the school's requirements and can be applied
longdesc to any document class. In addition, there are thesis and thesis
longdesc proposal templates for both undergraduate and postgraduate that
longdesc meet the school's requirements.
-containersize 6560
-containerchecksum 1cd86d3cbf9245d4f410d0cfd281a26743e976804db1de99453461e8c267a06ddb98ff750b8f69b3ab0c7ae68e62441abca41b23e836ec9db556b3759ef0b955
-doccontainersize 806808
-doccontainerchecksum aab06fd30ac3298131650fba65fc212b6b61800913355c02c367a5840455dee0cf567b5cd9aac58c18bac917558f34b72aa6a4c2d7533fe569f269ac07c0acb1
-docfiles size=292
+containersize 6704
+containerchecksum a13df744d9a14121c4249ca7ddc4c5fe7fc14cc1ad3dcb98f711b65625d245f165bc8b303d63aecbfdde22e835df5e727dedffc6aed47c8267a87a70f4a2274b
+doccontainersize 818484
+doccontainerchecksum 4e6f79052986d21cb33d9d41a4690c419f5fddfb2ea24bb117d5c5e841bfca1d8ef883130037c802c9547e17cdcb63387cdebb8a837a927d4d3103499d3bc441
+docfiles size=295
RELOC/doc/xelatex/xduts/README.md details="Readme"
RELOC/doc/xelatex/xduts/xduts.pdf details="Package documentation" language="zh"
RELOC/doc/xelatex/xduts/xidian-logo.pdf
RELOC/doc/xelatex/xduts/xidian-text.pdf
-srccontainersize 16032
-srccontainerchecksum 9b7e2757895d825b6a641cf01ec4dde2c7d872adb20601be7efcdee1d252c72a424ea7b55162ee02a4383c4f2b02f7c53562d14abd8cb657ccc2c64fcdef4a57
-srcfiles size=21
+srccontainersize 16928
+srccontainerchecksum 4b6e2362a4244665a4549f4b19e91565199998cb4bc75aba2ec4106983ab72dbecec629affe07c018b512dc6b6eb2088aaead43acb72c139e06ad372724bcc18
+srcfiles size=22
RELOC/source/xelatex/xduts/xduts.dtx
RELOC/source/xelatex/xduts/xduts.ins
-runfiles size=8
+runfiles size=12
+ RELOC/tex/xelatex/xduts/xdufont.sty
RELOC/tex/xelatex/xduts/xduugthesis.cls
catalogue-also xduthesis
catalogue-contact-bugs https://github.com/note286/xduts/issues
@@ -337827,7 +337828,7 @@ catalogue-contact-repository https://github.com/note286/xduts
catalogue-ctan /macros/xetex/latex/xduts
catalogue-license lppl1.3c
catalogue-topics dissertation proposal
-catalogue-version 0.5.2.1
+catalogue-version 0.6.0.0
name xdvi
category TLCore
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
index 7bfc5eb233..83171b7daf 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
@@ -1 +1 @@
-a18678fa2024594c9df4169940eee3f1 texlive.tlpdb
+1656245c232e48c6269c0851c381cf2e texlive.tlpdb
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
index 01d60e1b3d..2a6faa4e4a 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
@@ -1 +1 @@
-00307be2a989e705132e161ba86e0bca4f039abed16d2f27cfdbe6fff489f8909b11dde579422df6600b12ba5b0399a3129b8c6bcf519ac30325da4c84678218 texlive.tlpdb
+6d48e9290201a1ccdd8eb9284f60e698af3e5bb463c5a187a0c9543a922099200dd3e716743dc46a90d66f4104c59b233baa98e05f413dc8993fa11d97b4558f texlive.tlpdb
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
index 8cc5077662..aa9b1cc60f 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-----
-iQEcBAEBCgAGBQJiUhxmAAoJEEzhh34ZQ4xwdlAIAJOpnocTKxkxYFxMNloVT903
-sif/1Vys/XohLXHtnPujtqbJc5boPT8s/7qPGTfb+ZkZlbLaPrZbDWD1HeU8vTbb
-2qrt3cNdLxs4BAwL2ESHsSIijWHkppctlU7JLkdKveiAJePxi567HIWVyaIBctjr
-/qIhVfmCwJzqdcFNiyArRUNAO5cniOmmvO5YYTK7HAgDSTSmPui3WTa0pganEUp6
-ck+8/1R/KwvqivjA1cjWfwhPbhZIUSrL7osMlzwlzR+Ww3pz5gtzeXsY2NlaRWhJ
-1AlgS8lnZ/NUBq8C16yA6MQ5mGcuDa3ubM1+9LSDlh6XJweUHVYa6RmZ5zmtL2o=
-=xigZ
+iQEcBAEBCgAGBQJiU24AAAoJEEzhh34ZQ4xw1CUH/Aw0FcPiVwVqHzErQs7/ue+1
+QedICwb5vNYnMNfC/7sF2YH0Xlp8KjzT4kioFfALyfjFEXtI5ThQN4yvv0uogX5H
+mHu7g3u3eboj91S4CiZWNwi9qSlPXoN0MpowAX8wL2KwnGTFEmvHxSWFXjwMHrOI
+mu+ipBEdiugu71z8MSNZX/Wfp+2/zWWCXY3DXr8BR8LPghP2XaFt7ST0yWxjYET7
+pPvmoEWqkpSRvkekM41sHAk0rsVERViaAHxnpaqM+I2p8YYyJTLt19l96Yom8HjL
+PdW38ipKHesPrh4oBLkSbHl8n8J06R4fjIlkN8cntlAIjcPneKuFyIkgU71+ies=
+=ePpb
-----END PGP SIGNATURE-----
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
index b5797978bf..6c13744584 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/TLW64/00README.TLW64 b/systems/win32/TLW64/00README.TLW64
index be1781e129..9d2a6900c9 100644
--- a/systems/win32/TLW64/00README.TLW64
+++ b/systems/win32/TLW64/00README.TLW64
@@ -58,5 +58,15 @@ directory $INSTALLDIR is shown by a command:
synchronized with that of 32bit binaries. It is expected that
common format files can be usable for 32bit/64bit binaries.
+ Recently in TeX Live 2021 and 2022, it is reported that luatex
+ family requires different format files and luaotfload data
+ in 64bit binaries compared with those in 32bit binaries. Thus
+ The following commands may be necessary:
+ fmtutil-sys --byengine luahbtex
+ fmtutil-sys --byengine luatex
+ fmtutil-sys --byengine luajithbtex
+ fmtutil-sys --byengine luajittex
+ luaotfload-tool -f -u -vvv
+
--
Akira Kakuto
diff --git a/systems/win32/miktex/tm/packages/next/pr.ini b/systems/win32/miktex/tm/packages/next/pr.ini
index 362be355cc..b21e08cd0c 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=1649535441
+date=1649621820
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=afd59c90482740ffe474888f7b7fc415
+lstdigest=8c922ae2bec435fa455965c0fe892400
numpkg=5528
relstate=next
-version=8134
+version=8135
;;;;This configuration file is signed by a MiKTeX maintainer. The signature follows.
;;;;-----BEGIN MIKTEX SIGNATURE-----
-;;;; signature/miktex: LlxXbUJa2GML9Eadv8xlFGWEjQk4xe0JuVQ/1g/dx+zbXN7k7c7Aqm/CyDNr28KNTXA4c6+0IYbojQrhtkz/QVr5yp83SuhAzSvsoX4zeNSi7EZXhy6VVYZJxosZ7N3KC7MLq5/qzYyIi2bQ7ADxpE+b92xVyX3ep6k8l9puJ2OkwhWqcEWorkIbjQqRaRnrXe/B+b2FAuFeuQnO1tveWY3y5NLJ0uTKDdykcSg7mqKWadH1LncMcxSAYiqug15VHZ+WwatAoJzZG1uBORXeTJid5nW3jypIc0zHvP03NRBw2eamUBmxK6tdUgbr4r+v98DEAniTpwg6jfPk0G+G8Q==
+;;;; signature/miktex: YdnO8LCCgJSqFqcbO19bRp49cb6fUmmmw3vawrvn18SHEMmUcLNitm11m5jBfaW+bUGv3e4iguJdzNJtgfgjD8hes8htK+Xg/PkfuHfLQMln9ZSFScPpiHhe4xIhnUxRxZW7drA6db16Q8IlZSpC/C8AIbxNV9pcPNHDjvaSGt21FrYMos8Z+vmImypfyTmmeJK78MQ9OJImwrvoKVYXfKM34OiS4JS0+gss5uArq5DdczgsfiNQqMf1Lm/MoKKAKFlAgWr27TsiQpNozv+ApZfeEj0yNWHcDQg1XQeRt84jnhsdLtq/CkZ66tIsS2NqkvnWP3tCBG4nrMtDl6Zr0A==
;;;;-----END MIKTEX SIGNATURE-----
diff --git a/systems/win32/miktex/tm/packages/pr.ini b/systems/win32/miktex/tm/packages/pr.ini
index 81974c3ed4..21c51788bc 100644
--- a/systems/win32/miktex/tm/packages/pr.ini
+++ b/systems/win32/miktex/tm/packages/pr.ini
@@ -1,13 +1,13 @@
[repository]
-date=1649535079
+date=1649621471
lastupd=acro acro__doc acro__source annotate-equations annotate-equations__doc annotate-equations__source babel-italian babel-italian__doc babel-italian__source beaulivre beaulivre__doc beaulivre__source biblatex-gb7714-2015 biblatex-gb7714-2015__doc biblatex-gb7714-2015__source colorist colorist__doc colorist__source commonunicode commonunicode__doc
-lstdigest=178bf5d5b04991f2cb8164dc167bbc0c
+lstdigest=c10d82ee6b14ab06a8eacc1c9cb34f1f
numpkg=5528
relstate=stable
-version=8134
+version=8135
;;;;This configuration file is signed by a MiKTeX maintainer. The signature follows.
;;;;-----BEGIN MIKTEX SIGNATURE-----
-;;;; signature/miktex: hPxahnfg6aHiv7hda0Ddp67cviInNxewqnaKyk/qX0pQMdvMssXMVbIZcR7xg57f2j6+PR+YY76Tj+G26BBzCects12LVtoCIACZnWWTX5grOGu5vZLmfZSdxcgcnjMjjyEKLOxYvru/95PvZLbMz61C1nWXYBIZSCjfV93MCBlGdyBrju9e5k+NzsvRO60OK5OpmDU8akboSs/kmq8h/z6IizIXjl6AjwAE/Qpuyu8VOWa3lrRCogDt8e7EI0SztipYVWFuAP7/FCzq48RlTnMNweXwm3zlIlyZRmoPb0MtfhhtdH5v0YUYbkwZrUovFSyvacUuF5f1BluzBOtA5Q==
+;;;; signature/miktex: vHtc2ymknZXEGkhDMoD2Ai3SUzyyUbXlV9ylC5pc+VS1k4hL0sfxenCCQWEkhnaoFF1mUvzXOEIeC2BiOsfMFLnCB51gYkHYVfXdYVtp2L5UZH87nkk40CdcjZxGKPDcYDOnx1kcS0dCXekuKV3ymziz+sFJ9lcqphMPSggGl5sYwhkhlv/6+gcnJj1hf2uPy3PWSC3o0mILcDXT9e9zwkn1AHttplKeKo6F4n4CtUlrQF70Tqk0vnPCQDWKGBF1Skcl87ups1JINCnZt8GNrZooIUjVyrA+FesfPcfjVmWwqBzesaOnZtHJeyvLmWSeuTERd42vEuqmnZQVo42f/g==
;;;;-----END MIKTEX SIGNATURE-----
diff --git a/timestamp b/timestamp
index aabd7bad05..f5de906a5c 100644
--- a/timestamp
+++ b/timestamp
@@ -2,4 +2,4 @@
# The source CTAN of this site's material:
dante.ctan.org
# The year-month-day-hour-minute of this site's material:
-2022-04-10-02-02
+2022-04-11-02-02