summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2022-05-09 03:01:47 +0000
committerNorbert Preining <norbert@preining.info>2022-05-09 03:01:47 +0000
commitfe29944c3d5256062708e9b1ae62dc378f9d9993 (patch)
tree2ff3c511d0cb27649150f24bcafec31af12d8faa
parentce1c001f7db86ff8f09c1203b965ed9f44531d7a (diff)
CTAN sync 202205090301
-rw-r--r--FILES.byname763
-rw-r--r--FILES.byname.gzbin2419340 -> 2419079 bytes
-rw-r--r--FILES.last07days645
-rw-r--r--graphics/mcf2graph/CHANGELOG7
-rw-r--r--graphics/mcf2graph/README26
-rw-r--r--graphics/mcf2graph/mcf2graph.mp336
-rw-r--r--graphics/mcf2graph/mcf_exa_code.pdfbin79140 -> 78730 bytes
-rw-r--r--graphics/mcf2graph/mcf_exa_code.tex6
-rw-r--r--graphics/mcf2graph/mcf_exa_soc.mp6
-rw-r--r--graphics/mcf2graph/mcf_example.pdfbin431296 -> 434560 bytes
-rw-r--r--graphics/mcf2graph/mcf_example.tex4
-rw-r--r--graphics/mcf2graph/mcf_library.mcf29
-rw-r--r--graphics/mcf2graph/mcf_man_soc.mp6
-rw-r--r--graphics/mcf2graph/mcf_manual.pdfbin289251 -> 289201 bytes
-rw-r--r--graphics/mcf2graph/mcf_manual.tex54
-rw-r--r--graphics/mcf2graph/mcf_mplib_exa.pdfbin196130 -> 195721 bytes
-rw-r--r--graphics/mcf2graph/mcf_mplib_exa.tex4
-rw-r--r--graphics/pgf/contrib/circuitikz/doc/changelog.tex21
-rw-r--r--graphics/pgf/contrib/circuitikz/doc/circuitikz-context.pdfbin17645 -> 17645 bytes
-rw-r--r--graphics/pgf/contrib/circuitikz/doc/circuitikzmanual.pdfbin1520552 -> 1544857 bytes
-rw-r--r--graphics/pgf/contrib/circuitikz/doc/circuitikzmanual.tex146
-rw-r--r--graphics/pgf/contrib/circuitikz/tex/circuitikz.sty4
-rw-r--r--graphics/pgf/contrib/circuitikz/tex/pgfcircbipoles.tex154
-rw-r--r--graphics/pgf/contrib/circuitikz/tex/pgfcirctripoles.tex315
-rw-r--r--graphics/pgf/contrib/circuitikz/tex/t-circuitikz.tex4
-rw-r--r--macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/demo/trigon_demo.pdfbin416694 -> 416463 bytes
-rw-r--r--macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/docs/trigontheme.pdfbin367005 -> 364442 bytes
-rw-r--r--macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/source/beamercolorthemetrigon.dtx2
-rw-r--r--macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/source/beamerfontthemetrigon.dtx2
-rw-r--r--macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/source/beamerinnerthemetrigon.dtx7
-rw-r--r--macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/source/beamerouterthemetrigon.dtx2
-rw-r--r--macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/source/beamerthemetrigon.dtx2
-rw-r--r--macros/latex/contrib/changebar/CATALOG6
-rw-r--r--macros/latex/contrib/changebar/README4
-rw-r--r--macros/latex/contrib/changebar/cbtest1-ltx.pdfbin31002 -> 0 bytes
-rw-r--r--macros/latex/contrib/changebar/cbtest1-pdf.pdfbin97927 -> 0 bytes
-rw-r--r--macros/latex/contrib/changebar/cbtest1.tex322
-rw-r--r--macros/latex/contrib/changebar/cbtest1good.pdfbin61872 -> 0 bytes
-rw-r--r--macros/latex/contrib/changebar/cbtest1wrong.pdfbin45449 -> 0 bytes
-rw-r--r--macros/latex/contrib/changebar/cbtest2-ltx.pdfbin30930 -> 0 bytes
-rw-r--r--macros/latex/contrib/changebar/cbtest2-pdf.pdfbin97839 -> 0 bytes
-rw-r--r--macros/latex/contrib/changebar/cbtest2.tex322
-rw-r--r--macros/latex/contrib/changebar/changebar.bug5
-rw-r--r--macros/latex/contrib/changebar/changebar.dtx15
-rw-r--r--macros/latex/contrib/changebar/changebar.ins2
-rw-r--r--macros/latex/contrib/changebar/changebar.pdfbin373858 -> 380646 bytes
-rw-r--r--macros/latex/contrib/changebar/chbar.1117
-rwxr-xr-xmacros/latex/contrib/changebar/chbar.sh240
-rw-r--r--macros/latex/contrib/hvextern/Changes2
-rw-r--r--macros/latex/contrib/hvextern/doc/hvdoctools.sty7
-rw-r--r--macros/latex/contrib/hvextern/doc/hvextern.pdfbin1195275 -> 1202031 bytes
-rw-r--r--macros/latex/contrib/hvextern/doc/hvextern.tex122
-rw-r--r--macros/latex/contrib/hvextern/latex/hvextern.sty94
-rw-r--r--macros/latex/contrib/hvlogos/Changes1
-rw-r--r--macros/latex/contrib/hvlogos/doc/hvlogos-doc.pdfbin86119 -> 86942 bytes
-rw-r--r--macros/latex/contrib/hvlogos/doc/hvlogos-doc.tex2
-rw-r--r--macros/latex/contrib/hvlogos/latex/hvlogos.sty146
-rw-r--r--macros/latex/contrib/nicematrix/nicematrix-french.pdfbin501742 -> 504733 bytes
-rw-r--r--macros/latex/contrib/nicematrix/nicematrix-french.tex230
-rw-r--r--macros/latex/contrib/nicematrix/nicematrix.dtx253
-rw-r--r--macros/latex/contrib/nicematrix/nicematrix.pdfbin1511486 -> 1512102 bytes
-rw-r--r--macros/latex/contrib/simplebnf/simplebnf-doc.pdfbin133699 -> 152698 bytes
-rw-r--r--macros/latex/contrib/simplebnf/simplebnf-doc.tex64
-rw-r--r--macros/latex/contrib/simplebnf/simplebnf.sty126
-rw-r--r--macros/xetex/latex/xduts/README.md4
-rw-r--r--macros/xetex/latex/xduts/xdulogo.pdf (renamed from macros/xetex/latex/xduts/xidian-logo.pdf)bin463660 -> 881135 bytes
-rw-r--r--macros/xetex/latex/xduts/xduts.dtx620
-rw-r--r--macros/xetex/latex/xduts/xduts.ins2
-rw-r--r--macros/xetex/latex/xduts/xduts.pdfbin395564 -> 429543 bytes
-rw-r--r--macros/xetex/latex/xduts/xidian-text.pdfbin416455 -> 0 bytes
-rw-r--r--support/luafindfont/CHANGELOG3
-rw-r--r--support/luafindfont/doc/luafindfont-doc.pdfbin81978 -> 86485 bytes
-rw-r--r--support/luafindfont/doc/luafindfont-doc.tex16
-rw-r--r--support/luafindfont/man/luafindfont.12
-rwxr-xr-xsupport/luafindfont/scripts/luafindfont.lua99
-rw-r--r--systems/texlive/tlnet/tlpkg/texlive.tlpdb144
-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.xzbin2370060 -> 2368680 bytes
-rw-r--r--systems/win32/miktex/tm/packages/next/pr.ini8
-rw-r--r--systems/win32/miktex/tm/packages/pr.ini8
-rw-r--r--timestamp2
83 files changed, 2892 insertions, 2659 deletions
diff --git a/FILES.byname b/FILES.byname
index 8f282c81ca..254e49a594 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/05/07 | 69720 | FILES.last07days
+2022/05/08 | 67029 | 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
@@ -152128,21 +152128,21 @@
2011/05/31 | 231925 | graphics/mathspic/perl/sourcecode113.html
2011/05/31 | 183530 | graphics/mathspic/perl/sourcecode113.nw
2011/05/31 | 2864043 | graphics/mathspic/perl/sourcecode113.pdf
-2022/03/26 | 17937 | graphics/mcf2graph/CHANGELOG
-2022/03/27 | 101141 | graphics/mcf2graph/mcf2graph.mp
-2022/03/27 | 79140 | graphics/mcf2graph/mcf_exa_code.pdf
-2022/03/27 | 3830 | graphics/mcf2graph/mcf_exa_code.tex
-2022/03/27 | 431296 | graphics/mcf2graph/mcf_example.pdf
-2022/03/26 | 2984 | graphics/mcf2graph/mcf_example.tex
-2022/03/26 | 2194 | graphics/mcf2graph/mcf_exa_soc.mp
-2022/03/27 | 100595 | graphics/mcf2graph/mcf_library.mcf
-2022/03/26 | 43352 | graphics/mcf2graph/mcf_man_soc.mp
-2022/03/27 | 289251 | graphics/mcf2graph/mcf_manual.pdf
-2022/03/27 | 57497 | graphics/mcf2graph/mcf_manual.tex
-2022/03/27 | 196130 | graphics/mcf2graph/mcf_mplib_exa.pdf
-2022/03/26 | 14575 | graphics/mcf2graph/mcf_mplib_exa.tex
-2022/03/26 | 3660 | graphics/mcf2graph/README
-2022/03/27 | 1046144 | graphics/mcf2graph.zip
+2022/05/07 | 18042 | graphics/mcf2graph/CHANGELOG
+2022/05/08 | 101016 | graphics/mcf2graph/mcf2graph.mp
+2022/05/08 | 78730 | graphics/mcf2graph/mcf_exa_code.pdf
+2022/05/08 | 3812 | graphics/mcf2graph/mcf_exa_code.tex
+2022/05/08 | 434560 | graphics/mcf2graph/mcf_example.pdf
+2022/05/07 | 2984 | graphics/mcf2graph/mcf_example.tex
+2022/05/07 | 2194 | graphics/mcf2graph/mcf_exa_soc.mp
+2022/05/08 | 101374 | graphics/mcf2graph/mcf_library.mcf
+2022/05/08 | 43352 | graphics/mcf2graph/mcf_man_soc.mp
+2022/05/08 | 289201 | graphics/mcf2graph/mcf_manual.pdf
+2022/05/08 | 57619 | graphics/mcf2graph/mcf_manual.tex
+2022/05/08 | 195721 | graphics/mcf2graph/mcf_mplib_exa.pdf
+2022/05/08 | 14575 | graphics/mcf2graph/mcf_mplib_exa.tex
+2022/05/08 | 3649 | graphics/mcf2graph/README
+2022/05/08 | 1048322 | graphics/mcf2graph.zip
2004/07/13 | 8567 | graphics/metaplot/axes.mp
2004/06/28 | 1122 | graphics/metaplot/examples/cap1.cc
2004/06/28 | 2178 | graphics/metaplot/examples/cap1.mp
@@ -155259,60 +155259,60 @@
2019/04/14 | 24014 | graphics/pgf/contrib/chordbox/chordbox.tex
2019/04/14 | 1125 | graphics/pgf/contrib/chordbox/README.md
2019/04/15 | 567774 | graphics/pgf/contrib/chordbox.zip
-2022/04/26 | 43255 | graphics/pgf/contrib/circuitikz/doc/changelog.tex
-2022/04/26 | 17645 | graphics/pgf/contrib/circuitikz/doc/circuitikz-context.pdf
-2022/04/26 | 938 | graphics/pgf/contrib/circuitikz/doc/circuitikz-context.tex
-2022/04/26 | 1520552 | graphics/pgf/contrib/circuitikz/doc/circuitikzmanual.pdf
-2022/04/26 | 478836 | graphics/pgf/contrib/circuitikz/doc/circuitikzmanual.tex
-2022/04/26 | 418 | graphics/pgf/contrib/circuitikz/doc/compatibility.tex
-2022/04/26 | 8431 | graphics/pgf/contrib/circuitikz/doc/ctikzmanutils.sty
-2022/04/26 | 3802 | graphics/pgf/contrib/circuitikz/README.md
-2022/04/26 | 364117 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.4-body.tex
-2022/04/26 | 728 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.4.sty
-2022/04/26 | 393884 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.6-body.tex
-2022/04/26 | 635 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.6.sty
-2022/04/26 | 403567 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.7-body.tex
-2022/04/26 | 635 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.7.sty
-2022/04/26 | 422295 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.8.3-body.tex
-2022/04/26 | 641 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.8.3.sty
-2022/04/26 | 690729 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.9.3-body.tex
-2022/04/26 | 632 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.9.3.sty
-2022/04/26 | 758991 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.9.6-body.tex
-2022/04/26 | 633 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.9.6.sty
-2022/04/26 | 841340 | graphics/pgf/contrib/circuitikz/tex/circuitikz-1.0-body.tex
-2022/04/26 | 626 | graphics/pgf/contrib/circuitikz/tex/circuitikz-1.0.sty
-2022/04/26 | 937130 | graphics/pgf/contrib/circuitikz/tex/circuitikz-1.1.2-body.tex
-2022/04/26 | 632 | graphics/pgf/contrib/circuitikz/tex/circuitikz-1.1.2.sty
-2022/04/26 | 1021798 | graphics/pgf/contrib/circuitikz/tex/circuitikz-1.2.7-body.tex
-2022/04/26 | 632 | graphics/pgf/contrib/circuitikz/tex/circuitikz-1.2.7.sty
-2022/04/26 | 1081680 | graphics/pgf/contrib/circuitikz/tex/circuitikz-1.4.6-body.tex
-2022/04/26 | 631 | graphics/pgf/contrib/circuitikz/tex/circuitikz-1.4.6.sty
-2022/04/26 | 13737 | graphics/pgf/contrib/circuitikz/tex/circuitikz.sty
-2022/04/26 | 280 | graphics/pgf/contrib/circuitikz/tex/ctikzstyle-example.tex
-2022/04/26 | 3150 | graphics/pgf/contrib/circuitikz/tex/ctikzstyle-legacy.tex
-2022/04/26 | 2188 | graphics/pgf/contrib/circuitikz/tex/ctikzstyle-romano.tex
-2022/04/26 | 254065 | graphics/pgf/contrib/circuitikz/tex/pgfcircbipoles.tex
-2022/04/26 | 9538 | graphics/pgf/contrib/circuitikz/tex/pgfcirccurrent.tex
-2022/04/26 | 40468 | graphics/pgf/contrib/circuitikz/tex/pgfcirc.defines.tex
-2022/04/26 | 9804 | graphics/pgf/contrib/circuitikz/tex/pgfcircflow.tex
-2022/04/26 | 15442 | graphics/pgf/contrib/circuitikz/tex/pgfcirclabel.tex
-2022/04/26 | 56233 | graphics/pgf/contrib/circuitikz/tex/pgfcircmonopoles.tex
-2022/04/26 | 112203 | graphics/pgf/contrib/circuitikz/tex/pgfcircmultipoles.tex
-2022/04/26 | 16722 | graphics/pgf/contrib/circuitikz/tex/pgfcircpath.tex
-2022/04/26 | 107976 | graphics/pgf/contrib/circuitikz/tex/pgfcircquadpoles.tex
-2022/04/26 | 33313 | graphics/pgf/contrib/circuitikz/tex/pgfcircshapes.tex
-2022/04/26 | 364777 | graphics/pgf/contrib/circuitikz/tex/pgfcirctripoles.tex
-2022/04/26 | 14587 | graphics/pgf/contrib/circuitikz/tex/pgfcircutils.tex
-2022/04/26 | 35438 | graphics/pgf/contrib/circuitikz/tex/pgfcircvoltage.tex
-2022/04/26 | 416850 | graphics/pgf/contrib/circuitikz/tex/t-circuitikz-0.8.3.tex
-2022/04/26 | 683433 | graphics/pgf/contrib/circuitikz/tex/t-circuitikz-0.9.3.tex
-2022/04/26 | 751663 | graphics/pgf/contrib/circuitikz/tex/t-circuitikz-0.9.6.tex
-2022/04/26 | 834142 | graphics/pgf/contrib/circuitikz/tex/t-circuitikz-1.0.tex
-2022/04/26 | 929934 | graphics/pgf/contrib/circuitikz/tex/t-circuitikz-1.1.2.tex
-2022/04/26 | 1014383 | graphics/pgf/contrib/circuitikz/tex/t-circuitikz-1.2.7.tex
-2022/04/26 | 1073051 | graphics/pgf/contrib/circuitikz/tex/t-circuitikz-1.4.6.tex
-2022/04/26 | 3590 | graphics/pgf/contrib/circuitikz/tex/t-circuitikz.tex
-2022/04/26 | 3097407 | graphics/pgf/contrib/circuitikz.zip
+2022/05/08 | 43863 | graphics/pgf/contrib/circuitikz/doc/changelog.tex
+2022/05/08 | 17645 | graphics/pgf/contrib/circuitikz/doc/circuitikz-context.pdf
+2022/05/08 | 938 | graphics/pgf/contrib/circuitikz/doc/circuitikz-context.tex
+2022/05/08 | 1544857 | graphics/pgf/contrib/circuitikz/doc/circuitikzmanual.pdf
+2022/05/08 | 487972 | graphics/pgf/contrib/circuitikz/doc/circuitikzmanual.tex
+2022/05/08 | 418 | graphics/pgf/contrib/circuitikz/doc/compatibility.tex
+2022/05/08 | 8431 | graphics/pgf/contrib/circuitikz/doc/ctikzmanutils.sty
+2022/05/08 | 3802 | graphics/pgf/contrib/circuitikz/README.md
+2022/05/08 | 364117 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.4-body.tex
+2022/05/08 | 728 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.4.sty
+2022/05/08 | 393884 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.6-body.tex
+2022/05/08 | 635 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.6.sty
+2022/05/08 | 403567 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.7-body.tex
+2022/05/08 | 635 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.7.sty
+2022/05/08 | 422295 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.8.3-body.tex
+2022/05/08 | 641 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.8.3.sty
+2022/05/08 | 690729 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.9.3-body.tex
+2022/05/08 | 632 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.9.3.sty
+2022/05/08 | 758991 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.9.6-body.tex
+2022/05/08 | 633 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.9.6.sty
+2022/05/08 | 841340 | graphics/pgf/contrib/circuitikz/tex/circuitikz-1.0-body.tex
+2022/05/08 | 626 | graphics/pgf/contrib/circuitikz/tex/circuitikz-1.0.sty
+2022/05/08 | 937130 | graphics/pgf/contrib/circuitikz/tex/circuitikz-1.1.2-body.tex
+2022/05/08 | 632 | graphics/pgf/contrib/circuitikz/tex/circuitikz-1.1.2.sty
+2022/05/08 | 1021798 | graphics/pgf/contrib/circuitikz/tex/circuitikz-1.2.7-body.tex
+2022/05/08 | 632 | graphics/pgf/contrib/circuitikz/tex/circuitikz-1.2.7.sty
+2022/05/08 | 1081680 | graphics/pgf/contrib/circuitikz/tex/circuitikz-1.4.6-body.tex
+2022/05/08 | 631 | graphics/pgf/contrib/circuitikz/tex/circuitikz-1.4.6.sty
+2022/05/08 | 13737 | graphics/pgf/contrib/circuitikz/tex/circuitikz.sty
+2022/05/08 | 280 | graphics/pgf/contrib/circuitikz/tex/ctikzstyle-example.tex
+2022/05/08 | 3150 | graphics/pgf/contrib/circuitikz/tex/ctikzstyle-legacy.tex
+2022/05/08 | 2188 | graphics/pgf/contrib/circuitikz/tex/ctikzstyle-romano.tex
+2022/05/08 | 259934 | graphics/pgf/contrib/circuitikz/tex/pgfcircbipoles.tex
+2022/05/08 | 9538 | graphics/pgf/contrib/circuitikz/tex/pgfcirccurrent.tex
+2022/05/08 | 40468 | graphics/pgf/contrib/circuitikz/tex/pgfcirc.defines.tex
+2022/05/08 | 9804 | graphics/pgf/contrib/circuitikz/tex/pgfcircflow.tex
+2022/05/08 | 15442 | graphics/pgf/contrib/circuitikz/tex/pgfcirclabel.tex
+2022/05/08 | 56233 | graphics/pgf/contrib/circuitikz/tex/pgfcircmonopoles.tex
+2022/05/08 | 112203 | graphics/pgf/contrib/circuitikz/tex/pgfcircmultipoles.tex
+2022/05/08 | 16722 | graphics/pgf/contrib/circuitikz/tex/pgfcircpath.tex
+2022/05/08 | 107976 | graphics/pgf/contrib/circuitikz/tex/pgfcircquadpoles.tex
+2022/05/08 | 33313 | graphics/pgf/contrib/circuitikz/tex/pgfcircshapes.tex
+2022/05/08 | 374435 | graphics/pgf/contrib/circuitikz/tex/pgfcirctripoles.tex
+2022/05/08 | 14587 | graphics/pgf/contrib/circuitikz/tex/pgfcircutils.tex
+2022/05/08 | 35438 | graphics/pgf/contrib/circuitikz/tex/pgfcircvoltage.tex
+2022/05/08 | 416850 | graphics/pgf/contrib/circuitikz/tex/t-circuitikz-0.8.3.tex
+2022/05/08 | 683433 | graphics/pgf/contrib/circuitikz/tex/t-circuitikz-0.9.3.tex
+2022/05/08 | 751663 | graphics/pgf/contrib/circuitikz/tex/t-circuitikz-0.9.6.tex
+2022/05/08 | 834142 | graphics/pgf/contrib/circuitikz/tex/t-circuitikz-1.0.tex
+2022/05/08 | 929934 | graphics/pgf/contrib/circuitikz/tex/t-circuitikz-1.1.2.tex
+2022/05/08 | 1014383 | graphics/pgf/contrib/circuitikz/tex/t-circuitikz-1.2.7.tex
+2022/05/08 | 1073051 | graphics/pgf/contrib/circuitikz/tex/t-circuitikz-1.4.6.tex
+2022/05/08 | 3590 | graphics/pgf/contrib/circuitikz/tex/t-circuitikz.tex
+2022/05/08 | 3126415 | graphics/pgf/contrib/circuitikz.zip
2019/07/12 | 14811 | graphics/pgf/contrib/codeanatomy/codeanatomy.dtx
2019/07/12 | 1475 | graphics/pgf/contrib/codeanatomy/codeanatomy.ins
2019/07/12 | 123921 | graphics/pgf/contrib/codeanatomy/codeanatomy.lstlisting.pdf
@@ -185769,7 +185769,7 @@
2021/05/15 | 12827514 | install/graphics/pgf/base/pgf.tds.zip
2013/02/23 | 92056 | install/graphics/pgf/contrib/battleship.tds.zip
2016/02/19 | 701759 | install/graphics/pgf/contrib/celtic.tds.zip
-2022/04/26 | 3116318 | install/graphics/pgf/contrib/circuitikz.tds.zip
+2022/05/08 | 3145432 | install/graphics/pgf/contrib/circuitikz.tds.zip
2020/06/12 | 573255 | install/graphics/pgf/contrib/commutative-diagrams.tds.zip
2017/06/01 | 1005947 | install/graphics/pgf/contrib/hobby.tds.zip
2014/06/15 | 843875 | install/graphics/pgf/contrib/logicpuzzle.tds.zip
@@ -204619,21 +204619,21 @@
2017/07/17 | 182207 | macros/latex/contrib/beamer-contrib/themes/beamerthemetamu.zip
2021/11/18 | 8780 | macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/demo/frames.tex
2021/01/28 | 251052 | macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/demo/library.jpg
-2022/03/19 | 416694 | macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/demo/trigon_demo.pdf
+2022/05/08 | 416463 | macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/demo/trigon_demo.pdf
2022/03/15 | 1642 | macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/demo/trigon_demo.tex
2022/03/14 | 4611 | macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/demo/trigon_full.pdf
2022/03/14 | 3705 | macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/demo/trigon_small.pdf
2022/03/10 | 17110 | macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/docs/trigontheme.dtx
-2022/03/19 | 367005 | macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/docs/trigontheme.pdf
+2022/05/08 | 364442 | macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/docs/trigontheme.pdf
2021/11/10 | 3871 | macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/Makefile
2022/03/11 | 6374 | macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/README.md
-2022/03/19 | 6650 | macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/source/beamercolorthemetrigon.dtx
-2022/03/19 | 10317 | macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/source/beamerfontthemetrigon.dtx
-2022/03/19 | 22855 | macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/source/beamerinnerthemetrigon.dtx
-2022/03/19 | 4767 | macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/source/beamerouterthemetrigon.dtx
-2022/03/19 | 4074 | macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/source/beamerthemetrigon.dtx
+2022/05/08 | 6650 | macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/source/beamercolorthemetrigon.dtx
+2022/05/08 | 10317 | macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/source/beamerfontthemetrigon.dtx
+2022/05/08 | 23151 | macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/source/beamerinnerthemetrigon.dtx
+2022/05/08 | 4767 | macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/source/beamerouterthemetrigon.dtx
+2022/05/08 | 4074 | macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/source/beamerthemetrigon.dtx
2021/11/10 | 3130 | macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/source/beamerthemetrigon.ins
-2022/03/19 | 956381 | macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon.zip
+2022/05/08 | 953808 | macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon.zip
2015/12/23 | 12722 | macros/latex/contrib/beamer-contrib/themes/beamer-verona/beamerthemeVerona.sty
2015/12/23 | 403993 | macros/latex/contrib/beamer-contrib/themes/beamer-verona/beamer-verona-default.pdf
2015/12/23 | 2890 | macros/latex/contrib/beamer-contrib/themes/beamer-verona/beamer-verona-default.tex
@@ -207610,24 +207610,14 @@
2015/04/06 | 894 | macros/latex/contrib/cfr-initials/Typocaps.sty
2015/04/06 | 884 | macros/latex/contrib/cfr-initials/Zallman.sty
2015/04/06 | 698989 | macros/latex/contrib/cfr-initials.zip
-2018/03/11 | 372 | macros/latex/contrib/changebar/CATALOG
-2005/05/23 | 61872 | macros/latex/contrib/changebar/cbtest1good.pdf
-2018/02/04 | 31002 | macros/latex/contrib/changebar/cbtest1-ltx.pdf
-2018/02/04 | 97927 | macros/latex/contrib/changebar/cbtest1-pdf.pdf
-2005/09/19 | 11979 | macros/latex/contrib/changebar/cbtest1.tex
-2005/05/23 | 45449 | macros/latex/contrib/changebar/cbtest1wrong.pdf
-2018/02/04 | 30930 | macros/latex/contrib/changebar/cbtest2-ltx.pdf
-2018/02/04 | 97839 | macros/latex/contrib/changebar/cbtest2-pdf.pdf
-2005/09/19 | 11980 | macros/latex/contrib/changebar/cbtest2.tex
-2018/03/11 | 11067 | macros/latex/contrib/changebar/changebar.bug
-2018/03/11 | 121269 | macros/latex/contrib/changebar/changebar.dtx
-2018/02/04 | 2611 | macros/latex/contrib/changebar/changebar.ins
-2018/03/11 | 373858 | macros/latex/contrib/changebar/changebar.pdf
-1998/02/25 | 1675 | macros/latex/contrib/changebar/chbar.1
-1998/02/25 | 5614 | macros/latex/contrib/changebar/chbar.sh
-2018/02/04 | 1063 | macros/latex/contrib/changebar/MANIFEST
-2018/03/11 | 879 | macros/latex/contrib/changebar/README
-2018/03/11 | 762374 | macros/latex/contrib/changebar.zip
+2022/05/06 | 339 | macros/latex/contrib/changebar/CATALOG
+2022/05/06 | 11191 | macros/latex/contrib/changebar/changebar.bug
+2022/05/07 | 121419 | macros/latex/contrib/changebar/changebar.dtx
+2022/05/06 | 2611 | macros/latex/contrib/changebar/changebar.ins
+2022/05/07 | 380646 | macros/latex/contrib/changebar/changebar.pdf
+2020/02/18 | 1063 | macros/latex/contrib/changebar/MANIFEST
+2022/05/06 | 880 | macros/latex/contrib/changebar/README
+2022/05/08 | 405071 | macros/latex/contrib/changebar.zip
2009/10/07 | 62531 | macros/latex/contrib/changelayout/changelayout-guide.pdf
2009/08/04 | 6726 | macros/latex/contrib/changelayout/changelayout-guide.tex
2009/10/15 | 17005 | macros/latex/contrib/changelayout/changelayout.sty
@@ -215404,13 +215394,13 @@
2021/06/01 | 2164 | macros/latex/contrib/hvarabic/latex/hvarabic.sty
2020/06/08 | 548 | macros/latex/contrib/hvarabic/README.md
2021/06/01 | 153159 | macros/latex/contrib/hvarabic.zip
-2022/05/05 | 319 | macros/latex/contrib/hvextern/Changes
-2022/05/05 | 3752 | macros/latex/contrib/hvextern/doc/hvdoctools.sty
-2022/05/05 | 1195275 | macros/latex/contrib/hvextern/doc/hvextern.pdf
-2022/05/05 | 42709 | macros/latex/contrib/hvextern/doc/hvextern.tex
-2022/05/05 | 18292 | macros/latex/contrib/hvextern/latex/hvextern.sty
-2022/04/27 | 690 | macros/latex/contrib/hvextern/README
-2022/05/05 | 1149638 | macros/latex/contrib/hvextern.zip
+2022/05/08 | 398 | macros/latex/contrib/hvextern/Changes
+2022/05/08 | 3999 | macros/latex/contrib/hvextern/doc/hvdoctools.sty
+2022/05/08 | 1202031 | macros/latex/contrib/hvextern/doc/hvextern.pdf
+2022/05/08 | 43373 | macros/latex/contrib/hvextern/doc/hvextern.tex
+2022/05/08 | 21313 | macros/latex/contrib/hvextern/latex/hvextern.sty
+2022/05/08 | 690 | macros/latex/contrib/hvextern/README
+2022/05/08 | 1156523 | macros/latex/contrib/hvextern.zip
2022/05/01 | 4066 | macros/latex/contrib/hvfloat/Changes
2021/06/26 | 80294 | macros/latex/contrib/hvfloat/doc/examples/after1s1c.pdf
2021/05/17 | 2374 | macros/latex/contrib/hvfloat/doc/examples/after1s1c.tex
@@ -215544,12 +215534,12 @@
2017/12/12 | 3708 | macros/latex/contrib/hvindex/latex/hvindex.sty
2017/12/12 | 724 | macros/latex/contrib/hvindex/README
2017/12/12 | 77756 | macros/latex/contrib/hvindex.zip
-2022/04/25 | 523 | macros/latex/contrib/hvlogos/Changes
-2022/04/25 | 86119 | macros/latex/contrib/hvlogos/doc/hvlogos-doc.pdf
-2022/04/25 | 5357 | macros/latex/contrib/hvlogos/doc/hvlogos-doc.tex
-2022/04/25 | 6783 | macros/latex/contrib/hvlogos/latex/hvlogos.sty
+2022/05/06 | 585 | macros/latex/contrib/hvlogos/Changes
+2022/05/08 | 86942 | macros/latex/contrib/hvlogos/doc/hvlogos-doc.pdf
+2022/05/06 | 5369 | macros/latex/contrib/hvlogos/doc/hvlogos-doc.tex
+2022/05/08 | 7570 | macros/latex/contrib/hvlogos/latex/hvlogos.sty
2021/07/30 | 244 | macros/latex/contrib/hvlogos/README
-2022/04/25 | 88559 | macros/latex/contrib/hvlogos.zip
+2022/05/08 | 89492 | macros/latex/contrib/hvlogos.zip
2022/03/03 | 37 | macros/latex/contrib/hvpygmentex/Changes
2022/03/03 | 21465 | macros/latex/contrib/hvpygmentex/doc/hvpygmentex.pdf
2022/03/03 | 1820 | macros/latex/contrib/hvpygmentex/doc/hvpygmentex.tex
@@ -220343,13 +220333,13 @@
1996/03/22 | 18862 | macros/latex/contrib/niceframe/umrandb.mf
2015/01/17 | 1370 | macros/latex/contrib/niceframe/umrand.mf
2015/01/17 | 287910 | macros/latex/contrib/niceframe.zip
-2022/03/11 | 709623 | macros/latex/contrib/nicematrix/nicematrix.dtx
-2022/03/11 | 501742 | macros/latex/contrib/nicematrix/nicematrix-french.pdf
-2022/03/11 | 191618 | macros/latex/contrib/nicematrix/nicematrix-french.tex
+2022/05/08 | 709978 | macros/latex/contrib/nicematrix/nicematrix.dtx
+2022/05/08 | 504733 | macros/latex/contrib/nicematrix/nicematrix-french.pdf
+2022/05/06 | 191590 | macros/latex/contrib/nicematrix/nicematrix-french.tex
2022/01/22 | 1423 | macros/latex/contrib/nicematrix/nicematrix.ins
-2022/03/11 | 1511486 | macros/latex/contrib/nicematrix/nicematrix.pdf
+2022/05/08 | 1512102 | macros/latex/contrib/nicematrix/nicematrix.pdf
2021/11/10 | 1023 | macros/latex/contrib/nicematrix/README.md
-2022/03/11 | 2137470 | macros/latex/contrib/nicematrix.zip
+2022/05/08 | 2140685 | macros/latex/contrib/nicematrix.zip
2015/11/21 | 217 | macros/latex/contrib/nicetext/ANNOUNCE.txt
2012/03/18 | 254582 | macros/latex/contrib/nicetext/demo/arseneau.pdf
2011/09/14 | 10 | macros/latex/contrib/nicetext/demo/iso.txt
@@ -225586,12 +225576,12 @@
2022/02/02 | 219530 | macros/latex/contrib/sillypage/sillypage.pdf
2022/02/02 | 18636 | macros/latex/contrib/sillypage/sillywalk-map.pdf
2022/02/02 | 317326 | macros/latex/contrib/sillypage.zip
-2020/10/24 | 1100 | macros/latex/contrib/simplebnf/LICENSE
-2020/10/24 | 510 | macros/latex/contrib/simplebnf/README.md
-2020/10/25 | 133699 | macros/latex/contrib/simplebnf/simplebnf-doc.pdf
-2020/10/25 | 2218 | macros/latex/contrib/simplebnf/simplebnf-doc.tex
-2020/10/25 | 4564 | macros/latex/contrib/simplebnf/simplebnf.sty
-2020/10/25 | 136900 | macros/latex/contrib/simplebnf.zip
+2022/05/08 | 1100 | macros/latex/contrib/simplebnf/LICENSE
+2022/05/08 | 510 | macros/latex/contrib/simplebnf/README.md
+2022/05/08 | 152698 | macros/latex/contrib/simplebnf/simplebnf-doc.pdf
+2022/05/08 | 3626 | macros/latex/contrib/simplebnf/simplebnf-doc.tex
+2022/05/08 | 6898 | macros/latex/contrib/simplebnf/simplebnf.sty
+2022/05/08 | 152593 | macros/latex/contrib/simplebnf.zip
2013/02/28 | 223740 | macros/latex/contrib/simplecd/examples.pdf
2012/12/20 | 1574 | macros/latex/contrib/simplecd/examples.tex
2013/02/28 | 3060 | macros/latex/contrib/simplecd/README
@@ -243145,13 +243135,12 @@
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/05/03 | 2884 | macros/xetex/latex/xduts/README.md
-2022/05/03 | 115279 | macros/xetex/latex/xduts/xduts.dtx
-2022/05/03 | 1135 | macros/xetex/latex/xduts/xduts.ins
-2022/05/03 | 395564 | macros/xetex/latex/xduts/xduts.pdf
-2022/05/03 | 463660 | macros/xetex/latex/xduts/xidian-logo.pdf
-2022/05/03 | 416455 | macros/xetex/latex/xduts/xidian-text.pdf
-2022/05/03 | 1293698 | macros/xetex/latex/xduts.zip
+2022/05/08 | 2967 | macros/xetex/latex/xduts/README.md
+2022/05/08 | 881135 | macros/xetex/latex/xduts/xdulogo.pdf
+2022/05/08 | 132194 | macros/xetex/latex/xduts/xduts.dtx
+2022/05/08 | 1111 | macros/xetex/latex/xduts/xduts.ins
+2022/05/08 | 429543 | macros/xetex/latex/xduts/xduts.pdf
+2022/05/08 | 1328050 | 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
@@ -270343,13 +270332,13 @@
2021/05/22 | 283291 | support/ltximg.zip
1996/11/22 | 25535 | support/ltxinput/ltxinput.zip
1996/11/10 | 971 | support/ltxinput/readme.txt
-2022/05/05 | 831 | support/luafindfont/CHANGELOG
-2022/05/05 | 81978 | support/luafindfont/doc/luafindfont-doc.pdf
-2022/05/05 | 10062 | support/luafindfont/doc/luafindfont-doc.tex
-2022/05/05 | 5248 | support/luafindfont/man/luafindfont.1
+2022/05/07 | 893 | support/luafindfont/CHANGELOG
+2022/05/08 | 86485 | support/luafindfont/doc/luafindfont-doc.pdf
+2022/05/08 | 10126 | support/luafindfont/doc/luafindfont-doc.tex
+2022/05/08 | 5248 | support/luafindfont/man/luafindfont.1
2022/05/01 | 932 | support/luafindfont/README.md
-2022/05/05 | 17126 | support/luafindfont/scripts/luafindfont.lua
-2022/05/05 | 92302 | support/luafindfont.zip
+2022/05/07 | 17427 | support/luafindfont/scripts/luafindfont.lua
+2022/05/08 | 96812 | support/luafindfont.zip
2010/03/15 | 4720 | support/lualibs/lua-alt-getopt/lua-alt-getopt-0.7.0.tar.gz
2009/01/11 | 1463 | support/lualibs/lua-alt-getopt/README
2021/11/10 | 479 | support/lualibs/lua-uca/CHANGELOG.md
@@ -277082,14 +277071,14 @@
2019/02/28 | 340 | systems/texlive/tlnet/archive/arara.amd64-freebsd.r29036.tar.xz
2019/02/28 | 340 | systems/texlive/tlnet/archive/arara.amd64-netbsd.r30191.tar.xz
2019/02/28 | 336 | systems/texlive/tlnet/archive/arara.armhf-linux.r30015.tar.xz
-2022/05/04 | 5048032 | systems/texlive/tlnet/archive/arara.doc.r63220.tar.xz
+2022/05/08 | 5048780 | systems/texlive/tlnet/archive/arara.doc.r63255.tar.xz
2019/02/28 | 336 | systems/texlive/tlnet/archive/arara.i386-cygwin.r29036.tar.xz
2019/02/28 | 340 | systems/texlive/tlnet/archive/arara.i386-freebsd.r29036.tar.xz
2019/02/28 | 340 | systems/texlive/tlnet/archive/arara.i386-linux.r29036.tar.xz
2019/02/28 | 340 | systems/texlive/tlnet/archive/arara.i386-netbsd.r30191.tar.xz
2019/02/28 | 336 | systems/texlive/tlnet/archive/arara.i386-solaris.r29036.tar.xz
-2022/05/04 | 11779516 | systems/texlive/tlnet/archive/arara.r63220.tar.xz
-2022/05/04 | 115420 | systems/texlive/tlnet/archive/arara.source.r63220.tar.xz
+2022/05/08 | 11777572 | systems/texlive/tlnet/archive/arara.r63255.tar.xz
+2022/05/08 | 115416 | systems/texlive/tlnet/archive/arara.source.r63255.tar.xz
2021/02/25 | 340 | systems/texlive/tlnet/archive/arara.universal-darwin.r57908.tar.xz
2019/02/28 | 680 | systems/texlive/tlnet/archive/arara.win32.r29181.tar.xz
2019/02/28 | 340 | systems/texlive/tlnet/archive/arara.x86_64-cygwin.r33557.tar.xz
@@ -277679,9 +277668,9 @@
2022/04/26 | 666064 | systems/texlive/tlnet/archive/beaulivre.doc.r63133.tar.xz
2022/04/26 | 4388 | systems/texlive/tlnet/archive/beaulivre.r63133.tar.xz
2022/03/05 | 889508 | systems/texlive/tlnet/archive/beebe.r62423.tar.xz
-2022/05/07 | 785272 | systems/texlive/tlnet/archive/begingreek.doc.r63240.tar.xz
-2022/05/07 | 1796 | systems/texlive/tlnet/archive/begingreek.r63240.tar.xz
-2022/05/07 | 7780 | systems/texlive/tlnet/archive/begingreek.source.r63240.tar.xz
+2022/05/08 | 785552 | systems/texlive/tlnet/archive/begingreek.doc.r63255.tar.xz
+2022/05/08 | 1808 | systems/texlive/tlnet/archive/begingreek.r63255.tar.xz
+2022/05/08 | 7856 | systems/texlive/tlnet/archive/begingreek.source.r63255.tar.xz
2019/02/28 | 40204 | systems/texlive/tlnet/archive/begriff.doc.r15878.tar.xz
2019/02/28 | 2468 | systems/texlive/tlnet/archive/begriff.r15878.tar.xz
2020/08/28 | 666912 | systems/texlive/tlnet/archive/beilstein.doc.r56193.tar.xz
@@ -277907,8 +277896,8 @@
2021/12/30 | 6024 | systems/texlive/tlnet/archive/biblatex-spbasic.r61439.tar.xz
2019/02/28 | 70196 | systems/texlive/tlnet/archive/biblatex-subseries.doc.r43330.tar.xz
2019/02/28 | 1384 | systems/texlive/tlnet/archive/biblatex-subseries.r43330.tar.xz
-2022/04/24 | 513436 | systems/texlive/tlnet/archive/biblatex-swiss-legal.doc.r63116.tar.xz
-2022/04/24 | 18148 | systems/texlive/tlnet/archive/biblatex-swiss-legal.r63116.tar.xz
+2022/05/08 | 513436 | systems/texlive/tlnet/archive/biblatex-swiss-legal.doc.r63255.tar.xz
+2022/05/08 | 18148 | systems/texlive/tlnet/archive/biblatex-swiss-legal.r63255.tar.xz
2021/03/07 | 469432 | systems/texlive/tlnet/archive/biblatex-trad.doc.r58169.tar.xz
2021/03/07 | 4192 | systems/texlive/tlnet/archive/biblatex-trad.r58169.tar.xz
2019/02/28 | 70876 | systems/texlive/tlnet/archive/biblatex-true-citepages-omit.doc.r44653.tar.xz
@@ -278580,8 +278569,8 @@
2019/02/28 | 261280 | systems/texlive/tlnet/archive/childdoc.doc.r49543.tar.xz
2019/02/28 | 1320 | systems/texlive/tlnet/archive/childdoc.r49543.tar.xz
2019/02/28 | 11000 | systems/texlive/tlnet/archive/childdoc.source.r49543.tar.xz
-2022/05/05 | 7687096 | systems/texlive/tlnet/archive/chinesechess.doc.r63224.tar.xz
-2022/05/05 | 11552 | systems/texlive/tlnet/archive/chinesechess.r63224.tar.xz
+2022/05/08 | 7712044 | systems/texlive/tlnet/archive/chinesechess.doc.r63255.tar.xz
+2022/05/08 | 12532 | systems/texlive/tlnet/archive/chinesechess.r63255.tar.xz
2021/02/16 | 116496 | systems/texlive/tlnet/archive/chinese-jfm.doc.r57758.tar.xz
2021/02/16 | 2492 | systems/texlive/tlnet/archive/chinese-jfm.r57758.tar.xz
2020/03/24 | 599484 | systems/texlive/tlnet/archive/chivo.doc.r54512.tar.xz
@@ -278648,8 +278637,8 @@
2020/03/24 | 39128 | systems/texlive/tlnet/archive/cinzel.doc.r54512.tar.xz
2020/03/24 | 533316 | systems/texlive/tlnet/archive/cinzel.r54512.tar.xz
2022/04/08 | 207696 | systems/texlive/tlnet/archive/circ.doc.r62977.tar.xz
-2021/06/17 | 429072 | systems/texlive/tlnet/archive/circledsteps.doc.r59608.tar.xz
-2021/06/17 | 1916 | systems/texlive/tlnet/archive/circledsteps.r59608.tar.xz
+2022/05/08 | 429072 | systems/texlive/tlnet/archive/circledsteps.doc.r63255.tar.xz
+2022/05/08 | 1924 | systems/texlive/tlnet/archive/circledsteps.r63255.tar.xz
2022/04/29 | 215708 | systems/texlive/tlnet/archive/circledtext.doc.r63166.tar.xz
2022/04/29 | 6048 | systems/texlive/tlnet/archive/circledtext.r63166.tar.xz
2022/04/08 | 23672 | systems/texlive/tlnet/archive/circ.r62977.tar.xz
@@ -279912,8 +279901,8 @@
2019/02/28 | 4668 | systems/texlive/tlnet/archive/dottex.source.r15878.tar.xz
2019/02/28 | 94088 | systems/texlive/tlnet/archive/doublestroke.doc.r15878.tar.xz
2019/02/28 | 67024 | systems/texlive/tlnet/archive/doublestroke.r15878.tar.xz
-2020/09/23 | 60420 | systems/texlive/tlnet/archive/doulossil.doc.r56407.tar.xz
-2020/09/23 | 404856 | systems/texlive/tlnet/archive/doulossil.r56407.tar.xz
+2022/05/08 | 60428 | systems/texlive/tlnet/archive/doulossil.doc.r63255.tar.xz
+2022/05/08 | 404852 | systems/texlive/tlnet/archive/doulossil.r63255.tar.xz
2019/02/28 | 1179736 | systems/texlive/tlnet/archive/dowith.doc.r38860.tar.xz
2019/02/28 | 6600 | systems/texlive/tlnet/archive/dowith.r38860.tar.xz
2019/02/28 | 21140 | systems/texlive/tlnet/archive/dowith.source.r38860.tar.xz
@@ -280408,8 +280397,8 @@
2021/11/22 | 816680 | systems/texlive/tlnet/archive/ekdosis.doc.r61113.tar.xz
2021/11/22 | 21688 | systems/texlive/tlnet/archive/ekdosis.r61113.tar.xz
2021/11/22 | 97384 | systems/texlive/tlnet/archive/ekdosis.source.r61113.tar.xz
-2020/08/08 | 53172 | systems/texlive/tlnet/archive/ektype-tanka.doc.r56070.tar.xz
-2020/08/08 | 1898108 | systems/texlive/tlnet/archive/ektype-tanka.r56070.tar.xz
+2022/05/08 | 53176 | systems/texlive/tlnet/archive/ektype-tanka.doc.r63255.tar.xz
+2022/05/08 | 1898104 | systems/texlive/tlnet/archive/ektype-tanka.r63255.tar.xz
2019/02/28 | 288804 | systems/texlive/tlnet/archive/elbioimp.doc.r21758.tar.xz
2019/02/28 | 2096 | systems/texlive/tlnet/archive/elbioimp.r21758.tar.xz
2019/02/28 | 5716 | systems/texlive/tlnet/archive/elbioimp.source.r21758.tar.xz
@@ -282091,8 +282080,8 @@
2019/02/28 | 24892 | systems/texlive/tlnet/archive/hustthesis.source.r42547.tar.xz
2021/06/02 | 150588 | systems/texlive/tlnet/archive/hvarabic.doc.r59423.tar.xz
2021/06/02 | 1468 | systems/texlive/tlnet/archive/hvarabic.r59423.tar.xz
-2022/05/01 | 890192 | systems/texlive/tlnet/archive/hvextern.doc.r63187.tar.xz
-2022/05/01 | 4824 | systems/texlive/tlnet/archive/hvextern.r63187.tar.xz
+2022/05/08 | 890192 | systems/texlive/tlnet/archive/hvextern.doc.r63255.tar.xz
+2022/05/08 | 4824 | systems/texlive/tlnet/archive/hvextern.r63255.tar.xz
2022/05/02 | 8725268 | systems/texlive/tlnet/archive/hvfloat.doc.r63201.tar.xz
2022/05/02 | 11776 | systems/texlive/tlnet/archive/hvfloat.r63201.tar.xz
2019/02/28 | 76336 | systems/texlive/tlnet/archive/hvindex.doc.r46051.tar.xz
@@ -282683,7 +282672,7 @@
2019/02/28 | 3972 | systems/texlive/tlnet/archive/koma-moderncvclassic.r25025.tar.xz
2019/02/28 | 563260 | systems/texlive/tlnet/archive/koma-script-examples.doc.r47523.tar.xz
2019/02/28 | 540 | systems/texlive/tlnet/archive/koma-script-examples.r47523.tar.xz
-2022/03/21 | 12961800 | systems/texlive/tlnet/archive/koma-script.r62874.tar.xz
+2022/05/08 | 12993848 | systems/texlive/tlnet/archive/koma-script.r63255.tar.xz
2019/02/28 | 37524 | systems/texlive/tlnet/archive/koma-script-sfs.doc.r26137.tar.xz
2019/02/28 | 3400 | systems/texlive/tlnet/archive/koma-script-sfs.r26137.tar.xz
2022/04/12 | 539232 | systems/texlive/tlnet/archive/kotex-oblivoir.doc.r63005.tar.xz
@@ -284344,9 +284333,9 @@
2022/02/27 | 129320 | systems/texlive/tlnet/archive/mfware.x86_64-linuxmusl.r62210.tar.xz
2022/03/05 | 121048 | systems/texlive/tlnet/archive/mfware.x86_64-linux.r62389.tar.xz
2022/02/27 | 145076 | systems/texlive/tlnet/archive/mfware.x86_64-solaris.r62206.tar.xz
-2022/05/03 | 6572 | systems/texlive/tlnet/archive/mgltex.doc.r63213.tar.xz
-2022/05/03 | 6340 | systems/texlive/tlnet/archive/mgltex.r63213.tar.xz
-2022/05/03 | 31244 | systems/texlive/tlnet/archive/mgltex.source.r63213.tar.xz
+2022/05/08 | 6576 | systems/texlive/tlnet/archive/mgltex.doc.r63255.tar.xz
+2022/05/08 | 6348 | systems/texlive/tlnet/archive/mgltex.r63255.tar.xz
+2022/05/08 | 31244 | systems/texlive/tlnet/archive/mgltex.source.r63255.tar.xz
2022/01/01 | 426852 | systems/texlive/tlnet/archive/mhchem.doc.r61456.tar.xz
2022/01/01 | 187492 | systems/texlive/tlnet/archive/mhchem.r61456.tar.xz
2022/03/10 | 119276 | systems/texlive/tlnet/archive/mhequ.doc.r62561.tar.xz
@@ -285225,8 +285214,8 @@
2021/05/24 | 2392 | systems/texlive/tlnet/archive/ot-tableau.r59318.tar.xz
2019/02/28 | 60352 | systems/texlive/tlnet/archive/oubraces.doc.r21833.tar.xz
2019/02/28 | 1660 | systems/texlive/tlnet/archive/oubraces.r21833.tar.xz
-2022/04/24 | 322092 | systems/texlive/tlnet/archive/oup-authoring-template.doc.r63116.tar.xz
-2022/04/24 | 17492 | systems/texlive/tlnet/archive/oup-authoring-template.r63116.tar.xz
+2022/05/08 | 322096 | systems/texlive/tlnet/archive/oup-authoring-template.doc.r63255.tar.xz
+2022/05/08 | 17492 | systems/texlive/tlnet/archive/oup-authoring-template.r63255.tar.xz
2020/03/13 | 1596 | systems/texlive/tlnet/archive/outerhbox.r54254.tar.xz
2019/02/28 | 234580 | systems/texlive/tlnet/archive/outline.doc.r18360.tar.xz
2019/02/28 | 1528 | systems/texlive/tlnet/archive/outline.r18360.tar.xz
@@ -286078,8 +286067,8 @@
2022/03/14 | 116696 | systems/texlive/tlnet/archive/profcollege.r62686.tar.xz
2022/04/27 | 134096 | systems/texlive/tlnet/archive/proflabo.doc.r63147.tar.xz
2022/04/27 | 2748 | systems/texlive/tlnet/archive/proflabo.r63147.tar.xz
-2022/05/03 | 540220 | systems/texlive/tlnet/archive/proflycee.doc.r63209.tar.xz
-2022/05/03 | 8288 | systems/texlive/tlnet/archive/proflycee.r63209.tar.xz
+2022/05/08 | 563360 | systems/texlive/tlnet/archive/proflycee.doc.r63255.tar.xz
+2022/05/08 | 9220 | systems/texlive/tlnet/archive/proflycee.r63255.tar.xz
2019/02/28 | 49880 | systems/texlive/tlnet/archive/program.doc.r44214.tar.xz
2019/02/28 | 11780 | systems/texlive/tlnet/archive/program.r44214.tar.xz
2019/02/28 | 86236 | systems/texlive/tlnet/archive/progressbar.doc.r33822.tar.xz
@@ -286925,8 +286914,8 @@
2019/02/28 | 3888 | systems/texlive/tlnet/archive/rulercompass.r32392.tar.xz
2019/02/28 | 6072 | systems/texlive/tlnet/archive/rulercompass.source.r32392.tar.xz
2020/03/13 | 6620 | systems/texlive/tlnet/archive/ruler.r54251.tar.xz
-2021/04/19 | 174012 | systems/texlive/tlnet/archive/runcode.doc.r58908.tar.xz
-2021/04/19 | 3568 | systems/texlive/tlnet/archive/runcode.r58908.tar.xz
+2022/05/08 | 185004 | systems/texlive/tlnet/archive/runcode.doc.r63255.tar.xz
+2022/05/08 | 3968 | systems/texlive/tlnet/archive/runcode.r63255.tar.xz
2019/02/28 | 3584 | systems/texlive/tlnet/archive/r_und_s.doc.r15878.tar.xz
2019/02/28 | 15440 | systems/texlive/tlnet/archive/r_und_s.r15878.tar.xz
2019/02/28 | 297660 | systems/texlive/tlnet/archive/russ.doc.r25209.tar.xz
@@ -286965,8 +286954,8 @@
2019/02/28 | 3356 | systems/texlive/tlnet/archive/sansmath.r17997.tar.xz
2022/01/09 | 318172 | systems/texlive/tlnet/archive/sapthesis.doc.r61542.tar.xz
2022/01/09 | 30272 | systems/texlive/tlnet/archive/sapthesis.r61542.tar.xz
-2019/02/28 | 211572 | systems/texlive/tlnet/archive/sasnrdisplay.doc.r45963.tar.xz
-2019/02/28 | 7312 | systems/texlive/tlnet/archive/sasnrdisplay.r45963.tar.xz
+2022/05/08 | 211572 | systems/texlive/tlnet/archive/sasnrdisplay.doc.r63255.tar.xz
+2022/05/08 | 7296 | systems/texlive/tlnet/archive/sasnrdisplay.r63255.tar.xz
2019/02/28 | 891020 | systems/texlive/tlnet/archive/sa-tikz.doc.r32815.tar.xz
2019/02/28 | 5480 | systems/texlive/tlnet/archive/sa-tikz.r32815.tar.xz
2019/02/28 | 543096 | systems/texlive/tlnet/archive/sauerj.doc.r15878.tar.xz
@@ -287694,9 +287683,9 @@
2019/02/28 | 3936 | systems/texlive/tlnet/archive/svrsymbols.source.r50019.tar.xz
2019/02/28 | 492 | systems/texlive/tlnet/archive/swebib.doc.r15878.tar.xz
2019/02/28 | 6892 | systems/texlive/tlnet/archive/swebib.r15878.tar.xz
-2022/01/05 | 1586788 | systems/texlive/tlnet/archive/swfigure.doc.r61493.tar.xz
-2022/01/05 | 4144 | systems/texlive/tlnet/archive/swfigure.r61493.tar.xz
-2022/01/05 | 21188 | systems/texlive/tlnet/archive/swfigure.source.r61493.tar.xz
+2022/05/08 | 2926592 | systems/texlive/tlnet/archive/swfigure.doc.r63255.tar.xz
+2022/05/08 | 4148 | systems/texlive/tlnet/archive/swfigure.r63255.tar.xz
+2022/05/08 | 21240 | systems/texlive/tlnet/archive/swfigure.source.r63255.tar.xz
2019/02/28 | 51084 | systems/texlive/tlnet/archive/swimgraf.doc.r25446.tar.xz
2019/02/28 | 11364 | systems/texlive/tlnet/archive/swimgraf.r25446.tar.xz
2020/03/13 | 1512 | systems/texlive/tlnet/archive/swrule.r54267.tar.xz
@@ -288163,7 +288152,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/05/07 | 406204 | systems/texlive/tlnet/archive/texlive-scripts.doc.r63236.tar.xz
+2022/05/08 | 406432 | systems/texlive/tlnet/archive/texlive-scripts.doc.r63244.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
@@ -288187,7 +288176,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/05/07 | 109736 | systems/texlive/tlnet/archive/texlive-scripts.r63236.tar.xz
+2022/05/08 | 109732 | systems/texlive/tlnet/archive/texlive-scripts.r63244.tar.xz
2021/02/25 | 572 | systems/texlive/tlnet/archive/texlive-scripts.universal-darwin.r57908.tar.xz
2022/04/19 | 36296 | systems/texlive/tlnet/archive/texlive-scripts.win32.r63068.tar.xz
2020/05/17 | 588 | systems/texlive/tlnet/archive/texlive-scripts.x86_64-cygwin.r55172.tar.xz
@@ -289254,21 +289243,21 @@
2022/04/19 | 1889696 | systems/texlive/tlnet/archive/utfsym.r63076.tar.xz
2019/02/28 | 2820 | systems/texlive/tlnet/archive/utopia.doc.r15878.tar.xz
2019/02/28 | 205556 | systems/texlive/tlnet/archive/utopia.r15878.tar.xz
-2022/04/24 | 138168 | systems/texlive/tlnet/archive/ut-thesis.doc.r63116.tar.xz
-2022/04/24 | 2616 | systems/texlive/tlnet/archive/ut-thesis.r63116.tar.xz
-2022/04/24 | 6656 | systems/texlive/tlnet/archive/ut-thesis.source.r63116.tar.xz
+2022/05/08 | 138168 | systems/texlive/tlnet/archive/ut-thesis.doc.r63255.tar.xz
+2022/05/08 | 2616 | systems/texlive/tlnet/archive/ut-thesis.r63255.tar.xz
+2022/05/08 | 6656 | systems/texlive/tlnet/archive/ut-thesis.source.r63255.tar.xz
2021/09/07 | 127872 | systems/texlive/tlnet/archive/uwa-colours.doc.r60443.tar.xz
2021/09/07 | 1228 | systems/texlive/tlnet/archive/uwa-colours.r60443.tar.xz
2021/09/07 | 3016 | systems/texlive/tlnet/archive/uwa-colours.source.r60443.tar.xz
-2022/04/24 | 57656 | systems/texlive/tlnet/archive/uwa-letterhead.doc.r63116.tar.xz
-2022/04/24 | 3348 | systems/texlive/tlnet/archive/uwa-letterhead.r63116.tar.xz
-2022/04/24 | 6568 | systems/texlive/tlnet/archive/uwa-letterhead.source.r63116.tar.xz
-2022/04/24 | 52740 | systems/texlive/tlnet/archive/uwa-pcf.doc.r63116.tar.xz
-2022/04/24 | 2924 | systems/texlive/tlnet/archive/uwa-pcf.r63116.tar.xz
-2022/04/24 | 6060 | systems/texlive/tlnet/archive/uwa-pcf.source.r63116.tar.xz
-2022/04/24 | 50500 | systems/texlive/tlnet/archive/uwa-pif.doc.r63116.tar.xz
-2022/04/24 | 2588 | systems/texlive/tlnet/archive/uwa-pif.r63116.tar.xz
-2022/04/24 | 5692 | systems/texlive/tlnet/archive/uwa-pif.source.r63116.tar.xz
+2022/05/08 | 57656 | systems/texlive/tlnet/archive/uwa-letterhead.doc.r63255.tar.xz
+2022/05/08 | 3348 | systems/texlive/tlnet/archive/uwa-letterhead.r63255.tar.xz
+2022/05/08 | 6568 | systems/texlive/tlnet/archive/uwa-letterhead.source.r63255.tar.xz
+2022/05/08 | 52740 | systems/texlive/tlnet/archive/uwa-pcf.doc.r63255.tar.xz
+2022/05/08 | 2924 | systems/texlive/tlnet/archive/uwa-pcf.r63255.tar.xz
+2022/05/08 | 6060 | systems/texlive/tlnet/archive/uwa-pcf.source.r63255.tar.xz
+2022/05/08 | 50500 | systems/texlive/tlnet/archive/uwa-pif.doc.r63255.tar.xz
+2022/05/08 | 2592 | systems/texlive/tlnet/archive/uwa-pif.r63255.tar.xz
+2022/05/08 | 5696 | systems/texlive/tlnet/archive/uwa-pif.source.r63255.tar.xz
2019/02/28 | 11764 | systems/texlive/tlnet/archive/uwmslide.doc.r27354.tar.xz
2019/02/28 | 3916 | systems/texlive/tlnet/archive/uwmslide.r27354.tar.xz
2019/02/28 | 137544 | systems/texlive/tlnet/archive/uwthesis.doc.r15878.tar.xz
@@ -289936,8 +289925,8 @@
2019/02/28 | 340 | systems/texlive/tlnet/archive/yplan.x86_64-linuxmusl.r46840.tar.xz
2019/02/28 | 336 | systems/texlive/tlnet/archive/yplan.x86_64-linux.r34398.tar.xz
2019/02/28 | 336 | systems/texlive/tlnet/archive/yplan.x86_64-solaris.r34398.tar.xz
-2022/02/06 | 823616 | systems/texlive/tlnet/archive/yquant.doc.r61897.tar.xz
-2022/02/06 | 56396 | systems/texlive/tlnet/archive/yquant.r61897.tar.xz
+2022/05/08 | 825320 | systems/texlive/tlnet/archive/yquant.doc.r63255.tar.xz
+2022/05/08 | 56756 | systems/texlive/tlnet/archive/yquant.r63255.tar.xz
2021/06/14 | 378896 | systems/texlive/tlnet/archive/ytableau.doc.r59580.tar.xz
2021/06/14 | 3068 | systems/texlive/tlnet/archive/ytableau.r59580.tar.xz
2021/06/14 | 16032 | systems/texlive/tlnet/archive/ytableau.source.r59580.tar.xz
@@ -290000,16 +289989,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/04/18 | 108451 | systems/texlive/tlnet/install-tl
-2022/05/07 | 5800342 | systems/texlive/tlnet/install-tl-unx.tar.gz
-2022/05/07 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
-2022/05/07 | 455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
+2022/05/08 | 5799817 | systems/texlive/tlnet/install-tl-unx.tar.gz
+2022/05/08 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
+2022/05/08 | 455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
2021/04/11 | 4945 | systems/texlive/tlnet/install-tl-windows.bat
-2022/05/07 | 20464440 | systems/texlive/tlnet/install-tl-windows.exe
-2022/05/07 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
-2022/05/07 | 455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
-2022/05/07 | 25483849 | systems/texlive/tlnet/install-tl.zip
-2022/05/07 | 145 | systems/texlive/tlnet/install-tl.zip.sha512
-2022/05/07 | 455 | systems/texlive/tlnet/install-tl.zip.sha512.asc
+2022/05/08 | 20463964 | systems/texlive/tlnet/install-tl-windows.exe
+2022/05/08 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
+2022/05/08 | 455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
+2022/05/08 | 25483842 | systems/texlive/tlnet/install-tl.zip
+2022/05/08 | 145 | systems/texlive/tlnet/install-tl.zip.sha512
+2022/05/08 | 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
@@ -290019,7 +290008,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/05/06 | 7365 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
+2022/05/07 | 7317 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
2022/04/27 | 215352 | 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
@@ -290061,12 +290050,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/05/07 | 17277729 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
-2022/05/07 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
+2022/05/08 | 17277991 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
+2022/05/08 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
2022/04/18 | 86658 | systems/texlive/tlnet/tlpkg/TeXLive/TLPDB.pm
-2022/05/07 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
-2022/05/07 | 455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
-2022/05/07 | 2370636 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
+2022/05/08 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
+2022/05/08 | 455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
+2022/05/08 | 2370060 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
2021/12/21 | 58848 | systems/texlive/tlnet/tlpkg/TeXLive/TLPOBJ.pm
2022/04/18 | 42116 | systems/texlive/tlnet/tlpkg/TeXLive/TLPSRC.pm
2021/12/21 | 16130 | systems/texlive/tlnet/tlpkg/TeXLive/TLTREE.pm
@@ -295264,7 +295253,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/05/07 | 645787 | systems/win32/miktex/tm/packages/files.csv.lzma
+2022/05/08 | 645787 | 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
@@ -296861,9 +296850,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/05/07 | 276674 | systems/win32/miktex/tm/packages/miktex-zzdb1-2.9.tar.lzma
-2022/05/07 | 1444896 | systems/win32/miktex/tm/packages/miktex-zzdb2-2.9.tar.lzma
-2022/05/07 | 1332862 | systems/win32/miktex/tm/packages/miktex-zzdb3-2.9.tar.lzma
+2022/05/08 | 276716 | systems/win32/miktex/tm/packages/miktex-zzdb1-2.9.tar.lzma
+2022/05/08 | 1445225 | systems/win32/miktex/tm/packages/miktex-zzdb2-2.9.tar.lzma
+2022/05/08 | 1333482 | 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
@@ -297087,191 +297076,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/05/07 | 646005 | systems/win32/miktex/tm/packages/next/files.csv.lzma
-2022/05/07 | 51558 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-2.9.tar.lzma
-2022/05/07 | 57330 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-x64-2.9.tar.lzma
-2022/05/07 | 1021848 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-2.9.tar.lzma
-2022/05/07 | 1156464 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-x64-2.9.tar.lzma
-2022/05/07 | 28795 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-2.9.tar.lzma
-2022/05/07 | 31521 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-x64-2.9.tar.lzma
-2022/05/07 | 30147 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-2.9.tar.lzma
-2022/05/07 | 35242 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-x64-2.9.tar.lzma
-2022/05/07 | 56619 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-2.9.tar.lzma
-2022/05/07 | 65055 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-x64-2.9.tar.lzma
-2022/05/07 | 86760 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-2.9.tar.lzma
-2022/05/07 | 95286 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-x64-2.9.tar.lzma
-2022/05/07 | 68872 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-2.9.tar.lzma
-2022/05/07 | 77067 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-x64-2.9.tar.lzma
-2022/05/07 | 27249 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-2.9.tar.lzma
-2022/05/07 | 31344 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-x64-2.9.tar.lzma
-2022/05/07 | 332416 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-2.9.tar.lzma
-2022/05/07 | 394370 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-x64-2.9.tar.lzma
-2022/05/07 | 32956 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-2.9.tar.lzma
-2022/05/07 | 37081 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-x64-2.9.tar.lzma
-2022/05/07 | 51485 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-2.9.tar.lzma
-2022/05/07 | 57272 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-x64-2.9.tar.lzma
-2022/05/07 | 244962 | systems/win32/miktex/tm/packages/next/miktex-console-bin-2.9.tar.lzma
-2022/05/07 | 270300 | systems/win32/miktex/tm/packages/next/miktex-console-bin-x64-2.9.tar.lzma
-2022/05/07 | 179878 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-2.9.tar.lzma
-2022/05/07 | 196117 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-x64-2.9.tar.lzma
-2022/05/07 | 92918 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-2.9.tar.lzma
-2022/05/07 | 103094 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-x64-2.9.tar.lzma
-2022/05/07 | 21314 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-2.9.tar.lzma
-2022/05/07 | 24121 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-x64-2.9.tar.lzma
-2022/05/07 | 481498 | systems/win32/miktex/tm/packages/next/miktex-doc.tar.lzma
-2022/05/07 | 46068 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-2.9.tar.lzma
-2022/05/07 | 52094 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-x64-2.9.tar.lzma
-2022/05/07 | 285716 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-2.9.tar.lzma
-2022/05/07 | 326662 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-x64-2.9.tar.lzma
-2022/05/07 | 41306 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-2.9.tar.lzma
-2022/05/07 | 45825 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-x64-2.9.tar.lzma
-2022/05/07 | 120617 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-2.9.tar.lzma
-2022/05/07 | 135378 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-x64-2.9.tar.lzma
-2022/05/07 | 1302486 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-2.9.tar.lzma
-2022/05/07 | 1454763 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-x64-2.9.tar.lzma
-2022/05/07 | 99819 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-2.9.tar.lzma
-2022/05/07 | 113052 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-x64-2.9.tar.lzma
-2022/05/07 | 43645 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-2.9.tar.lzma
-2022/05/07 | 48825 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-x64-2.9.tar.lzma
-2022/05/07 | 25107 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-2.9.tar.lzma
-2022/05/07 | 28569 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-x64-2.9.tar.lzma
-2022/05/07 | 56993 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-2.9.tar.lzma
-2022/05/07 | 63310 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-x64-2.9.tar.lzma
-2022/05/07 | 135949 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-2.9.tar.lzma
-2022/05/07 | 155499 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-x64-2.9.tar.lzma
-2022/05/07 | 73478 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-2.9.tar.lzma
-2022/05/07 | 78975 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-x64-2.9.tar.lzma
-2022/05/07 | 72014 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-2.9.tar.lzma
-2022/05/07 | 81462 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-x64-2.9.tar.lzma
-2022/05/07 | 259257 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-2.9.tar.lzma
-2022/05/07 | 296039 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-x64-2.9.tar.lzma
-2022/05/07 | 22147 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-2.9.tar.lzma
-2022/05/07 | 25060 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-x64-2.9.tar.lzma
-2022/05/07 | 97201 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-2.9.tar.lzma
-2022/05/07 | 112590 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-x64-2.9.tar.lzma
-2022/05/07 | 64544 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-2.9.tar.lzma
-2022/05/07 | 73149 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-x64-2.9.tar.lzma
-2022/05/07 | 96633 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-2.9.tar.lzma
-2022/05/07 | 115657 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-x64-2.9.tar.lzma
-2022/05/07 | 38428 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-2.9.tar.lzma
-2022/05/07 | 43825 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-x64-2.9.tar.lzma
-2022/05/07 | 484370 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-2.9.tar.lzma
-2022/05/07 | 565928 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-x64-2.9.tar.lzma
-2022/05/07 | 203839 | systems/win32/miktex/tm/packages/next/miktex-hitex-bin.tar.lzma
-2022/05/07 | 247333 | systems/win32/miktex/tm/packages/next/miktex-hitex-bin-x64.tar.lzma
-2022/05/07 | 152032 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-2.9.tar.lzma
-2022/05/07 | 168819 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-x64-2.9.tar.lzma
-2022/05/07 | 95432 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-2.9.tar.lzma
-2022/05/07 | 109479 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-x64-2.9.tar.lzma
-2022/05/07 | 16504 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-2.9.tar.lzma
-2022/05/07 | 18369 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-x64-2.9.tar.lzma
-2022/05/07 | 28422 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-2.9.tar.lzma
-2022/05/07 | 30542 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-x64-2.9.tar.lzma
-2022/05/07 | 631281 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-2.9.tar.lzma
-2022/05/07 | 681940 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-x64-2.9.tar.lzma
-2022/05/07 | 532456 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-2.9.tar.lzma
-2022/05/07 | 598230 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-x64-2.9.tar.lzma
-2022/05/07 | 477849 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-2.9.tar.lzma
-2022/05/07 | 528018 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-x64-2.9.tar.lzma
-2022/05/07 | 93961 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-2.9.tar.lzma
-2022/05/07 | 103339 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-x64-2.9.tar.lzma
-2022/05/07 | 1752146 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-2.9.tar.lzma
-2022/05/07 | 1982083 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-x64-2.9.tar.lzma
-2022/05/07 | 68010 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-2.9.tar.lzma
-2022/05/07 | 74069 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-x64-2.9.tar.lzma
-2022/05/07 | 27591 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-2.9.tar.lzma
-2022/05/07 | 32133 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-x64-2.9.tar.lzma
-2022/05/07 | 7754 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-2.9.tar.lzma
-2022/05/07 | 8784 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-x64-2.9.tar.lzma
-2022/05/07 | 190506 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-2.9.tar.lzma
-2022/05/07 | 208809 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-x64-2.9.tar.lzma
-2022/05/07 | 251129 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-2.9.tar.lzma
-2022/05/07 | 286412 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-x64-2.9.tar.lzma
-2022/05/07 | 99258 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-2.9.tar.lzma
-2022/05/07 | 104557 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-x64-2.9.tar.lzma
-2022/05/07 | 126535 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-2.9.tar.lzma
-2022/05/07 | 139102 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-x64-2.9.tar.lzma
-2022/05/07 | 288202 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-2.9.tar.lzma
-2022/05/07 | 325269 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-x64-2.9.tar.lzma
-2022/05/07 | 199832 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-2.9.tar.lzma
-2022/05/07 | 181516 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-x64-2.9.tar.lzma
-2022/05/07 | 49771 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-2.9.tar.lzma
-2022/05/07 | 55567 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-x64-2.9.tar.lzma
-2022/05/07 | 31414 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-2.9.tar.lzma
-2022/05/07 | 35169 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-x64-2.9.tar.lzma
-2022/05/07 | 38561 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-2.9.tar.lzma
-2022/05/07 | 43916 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-x64-2.9.tar.lzma
-2022/05/07 | 43361 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-2.9.tar.lzma
-2022/05/07 | 47922 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-x64-2.9.tar.lzma
-2022/05/07 | 45743 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-2.9.tar.lzma
-2022/05/07 | 52327 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-x64-2.9.tar.lzma
-2022/05/07 | 197035 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-2.9.tar.lzma
-2022/05/07 | 213280 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-x64-2.9.tar.lzma
-2022/05/07 | 36047 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin.tar.lzma
-2022/05/07 | 41182 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin-x64.tar.lzma
-2022/05/07 | 755745 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-2.9.tar.lzma
-2022/05/07 | 824371 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-x64-2.9.tar.lzma
-2022/05/07 | 200396 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-2.9.tar.lzma
-2022/05/07 | 202837 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-x64-2.9.tar.lzma
-2022/05/07 | 210276 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-2.9.tar.lzma
-2022/05/07 | 245096 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-x64-2.9.tar.lzma
-2022/05/07 | 79025 | systems/win32/miktex/tm/packages/next/miktex-png-bin-2.9.tar.lzma
-2022/05/07 | 88152 | systems/win32/miktex/tm/packages/next/miktex-png-bin-x64-2.9.tar.lzma
-2022/05/07 | 1181128 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-2.9.tar.lzma
-2022/05/07 | 1322741 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-x64-2.9.tar.lzma
-2022/05/07 | 20183 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-2.9.tar.lzma
-2022/05/07 | 23945 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-x64-2.9.tar.lzma
-2022/05/07 | 31590 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-2.9.tar.lzma
-2022/05/07 | 37375 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-x64-2.9.tar.lzma
-2022/05/07 | 64710 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-2.9.tar.lzma
-2022/05/07 | 72886 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-x64-2.9.tar.lzma
-2022/05/07 | 50799 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-2.9.tar.lzma
-2022/05/07 | 58664 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-x64-2.9.tar.lzma
-2022/05/07 | 693066 | systems/win32/miktex/tm/packages/next/miktex-ptex-bin.tar.lzma
-2022/05/07 | 758954 | systems/win32/miktex/tm/packages/next/miktex-ptex-bin-x64.tar.lzma
-2022/05/07 | 1357073 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-2.9.tar.lzma
-2022/05/07 | 1501237 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-x64-2.9.tar.lzma
-2022/05/07 | 42818 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-2.9.tar.lzma
-2022/05/07 | 52479 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-x64-2.9.tar.lzma
-2022/05/07 | 57618 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin.tar.lzma
-2022/05/07 | 63740 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-x64.tar.lzma
-2022/05/07 | 25553 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-2.9.tar.lzma
-2022/05/07 | 27636 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-x64-2.9.tar.lzma
-2022/05/07 | 16560 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-2.9.tar.lzma
-2022/05/07 | 18492 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-x64-2.9.tar.lzma
-2022/05/07 | 64488 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-2.9.tar.lzma
-2022/05/07 | 71007 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-x64-2.9.tar.lzma
-2022/05/07 | 156964 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-2.9.tar.lzma
-2022/05/07 | 173010 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-x64-2.9.tar.lzma
-2022/05/07 | 58667 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-2.9.tar.lzma
-2022/05/07 | 67253 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-x64-2.9.tar.lzma
-2022/05/07 | 100487 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-2.9.tar.lzma
-2022/05/07 | 107708 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-x64-2.9.tar.lzma
-2022/05/07 | 2694877 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-2.9.tar.lzma
-2022/05/07 | 2820687 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-x64-2.9.tar.lzma
-2022/05/07 | 55285 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-2.9.tar.lzma
-2022/05/07 | 62383 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-x64-2.9.tar.lzma
-2022/05/07 | 37116 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin.tar.lzma
-2022/05/07 | 41203 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin-x64.tar.lzma
-2022/05/07 | 28690 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-2.9.tar.lzma
-2022/05/07 | 34053 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-x64-2.9.tar.lzma
-2022/05/07 | 67706 | systems/win32/miktex/tm/packages/next/miktex-web-bin-2.9.tar.lzma
-2022/05/07 | 73531 | systems/win32/miktex/tm/packages/next/miktex-web-bin-x64-2.9.tar.lzma
-2022/05/07 | 316244 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-2.9.tar.lzma
-2022/05/07 | 351697 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-x64-2.9.tar.lzma
-2022/05/07 | 55757 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin.tar.lzma
-2022/05/07 | 57525 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin-x64.tar.lzma
-2022/05/07 | 591569 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-2.9.tar.lzma
-2022/05/07 | 629432 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-x64-2.9.tar.lzma
-2022/05/07 | 39728 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-2.9.tar.lzma
-2022/05/07 | 43226 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-x64-2.9.tar.lzma
-2022/05/07 | 276743 | systems/win32/miktex/tm/packages/next/miktex-zzdb1-2.9.tar.lzma
-2022/05/07 | 1445638 | systems/win32/miktex/tm/packages/next/miktex-zzdb2-2.9.tar.lzma
-2022/05/07 | 1333564 | systems/win32/miktex/tm/packages/next/miktex-zzdb3-2.9.tar.lzma
-2022/05/07 | 13514 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-2.9.tar.lzma
-2022/05/07 | 14412 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-x64-2.9.tar.lzma
+2022/05/08 | 646005 | systems/win32/miktex/tm/packages/next/files.csv.lzma
+2022/05/08 | 51559 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-2.9.tar.lzma
+2022/05/08 | 57331 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-x64-2.9.tar.lzma
+2022/05/08 | 1021847 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-2.9.tar.lzma
+2022/05/08 | 1156464 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-x64-2.9.tar.lzma
+2022/05/08 | 28797 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-2.9.tar.lzma
+2022/05/08 | 31522 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-x64-2.9.tar.lzma
+2022/05/08 | 30147 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-2.9.tar.lzma
+2022/05/08 | 35242 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-x64-2.9.tar.lzma
+2022/05/08 | 56617 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-2.9.tar.lzma
+2022/05/08 | 65054 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-x64-2.9.tar.lzma
+2022/05/08 | 86759 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-2.9.tar.lzma
+2022/05/08 | 95285 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-x64-2.9.tar.lzma
+2022/05/08 | 68873 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-2.9.tar.lzma
+2022/05/08 | 77068 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-x64-2.9.tar.lzma
+2022/05/08 | 27248 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-2.9.tar.lzma
+2022/05/08 | 31343 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-x64-2.9.tar.lzma
+2022/05/08 | 332413 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-2.9.tar.lzma
+2022/05/08 | 394370 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-x64-2.9.tar.lzma
+2022/05/08 | 32955 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-2.9.tar.lzma
+2022/05/08 | 37080 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-x64-2.9.tar.lzma
+2022/05/08 | 51483 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-2.9.tar.lzma
+2022/05/08 | 57271 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-x64-2.9.tar.lzma
+2022/05/08 | 244961 | systems/win32/miktex/tm/packages/next/miktex-console-bin-2.9.tar.lzma
+2022/05/08 | 270300 | systems/win32/miktex/tm/packages/next/miktex-console-bin-x64-2.9.tar.lzma
+2022/05/08 | 179878 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-2.9.tar.lzma
+2022/05/08 | 196116 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-x64-2.9.tar.lzma
+2022/05/08 | 92920 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-2.9.tar.lzma
+2022/05/08 | 103091 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-x64-2.9.tar.lzma
+2022/05/08 | 21315 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-2.9.tar.lzma
+2022/05/08 | 24121 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-x64-2.9.tar.lzma
+2022/05/08 | 481498 | systems/win32/miktex/tm/packages/next/miktex-doc.tar.lzma
+2022/05/08 | 46066 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-2.9.tar.lzma
+2022/05/08 | 52094 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-x64-2.9.tar.lzma
+2022/05/08 | 285714 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-2.9.tar.lzma
+2022/05/08 | 326659 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-x64-2.9.tar.lzma
+2022/05/08 | 41305 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-2.9.tar.lzma
+2022/05/08 | 45823 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-x64-2.9.tar.lzma
+2022/05/08 | 120615 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-2.9.tar.lzma
+2022/05/08 | 135378 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-x64-2.9.tar.lzma
+2022/05/08 | 1302482 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-2.9.tar.lzma
+2022/05/08 | 1454763 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-x64-2.9.tar.lzma
+2022/05/08 | 99817 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-2.9.tar.lzma
+2022/05/08 | 113051 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-x64-2.9.tar.lzma
+2022/05/08 | 43645 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-2.9.tar.lzma
+2022/05/08 | 48825 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-x64-2.9.tar.lzma
+2022/05/08 | 25106 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-2.9.tar.lzma
+2022/05/08 | 28569 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-x64-2.9.tar.lzma
+2022/05/08 | 56992 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-2.9.tar.lzma
+2022/05/08 | 63310 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-x64-2.9.tar.lzma
+2022/05/08 | 135948 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-2.9.tar.lzma
+2022/05/08 | 155498 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-x64-2.9.tar.lzma
+2022/05/08 | 73478 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-2.9.tar.lzma
+2022/05/08 | 78975 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-x64-2.9.tar.lzma
+2022/05/08 | 72014 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-2.9.tar.lzma
+2022/05/08 | 81461 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-x64-2.9.tar.lzma
+2022/05/08 | 259256 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-2.9.tar.lzma
+2022/05/08 | 296037 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-x64-2.9.tar.lzma
+2022/05/08 | 22147 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-2.9.tar.lzma
+2022/05/08 | 25059 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-x64-2.9.tar.lzma
+2022/05/08 | 97200 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-2.9.tar.lzma
+2022/05/08 | 112589 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-x64-2.9.tar.lzma
+2022/05/08 | 64542 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-2.9.tar.lzma
+2022/05/08 | 73147 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-x64-2.9.tar.lzma
+2022/05/08 | 96633 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-2.9.tar.lzma
+2022/05/08 | 115656 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-x64-2.9.tar.lzma
+2022/05/08 | 38426 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-2.9.tar.lzma
+2022/05/08 | 43825 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-x64-2.9.tar.lzma
+2022/05/08 | 484369 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-2.9.tar.lzma
+2022/05/08 | 565929 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-x64-2.9.tar.lzma
+2022/05/08 | 203837 | systems/win32/miktex/tm/packages/next/miktex-hitex-bin.tar.lzma
+2022/05/08 | 247333 | systems/win32/miktex/tm/packages/next/miktex-hitex-bin-x64.tar.lzma
+2022/05/08 | 152028 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-2.9.tar.lzma
+2022/05/08 | 168819 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-x64-2.9.tar.lzma
+2022/05/08 | 95433 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-2.9.tar.lzma
+2022/05/08 | 109478 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-x64-2.9.tar.lzma
+2022/05/08 | 16502 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-2.9.tar.lzma
+2022/05/08 | 18367 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-x64-2.9.tar.lzma
+2022/05/08 | 28422 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-2.9.tar.lzma
+2022/05/08 | 30542 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-x64-2.9.tar.lzma
+2022/05/08 | 631278 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-2.9.tar.lzma
+2022/05/08 | 681940 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-x64-2.9.tar.lzma
+2022/05/08 | 532454 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-2.9.tar.lzma
+2022/05/08 | 598231 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-x64-2.9.tar.lzma
+2022/05/08 | 477849 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-2.9.tar.lzma
+2022/05/08 | 528016 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-x64-2.9.tar.lzma
+2022/05/08 | 93959 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-2.9.tar.lzma
+2022/05/08 | 103337 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-x64-2.9.tar.lzma
+2022/05/08 | 1752146 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-2.9.tar.lzma
+2022/05/08 | 1982084 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-x64-2.9.tar.lzma
+2022/05/08 | 68010 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-2.9.tar.lzma
+2022/05/08 | 74068 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-x64-2.9.tar.lzma
+2022/05/08 | 27591 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-2.9.tar.lzma
+2022/05/08 | 32134 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-x64-2.9.tar.lzma
+2022/05/08 | 7753 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-2.9.tar.lzma
+2022/05/08 | 8783 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-x64-2.9.tar.lzma
+2022/05/08 | 190505 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-2.9.tar.lzma
+2022/05/08 | 208808 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-x64-2.9.tar.lzma
+2022/05/08 | 251126 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-2.9.tar.lzma
+2022/05/08 | 286412 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-x64-2.9.tar.lzma
+2022/05/08 | 99256 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-2.9.tar.lzma
+2022/05/08 | 104554 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-x64-2.9.tar.lzma
+2022/05/08 | 126533 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-2.9.tar.lzma
+2022/05/08 | 139101 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-x64-2.9.tar.lzma
+2022/05/08 | 288199 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-2.9.tar.lzma
+2022/05/08 | 325269 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-x64-2.9.tar.lzma
+2022/05/08 | 199832 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-2.9.tar.lzma
+2022/05/08 | 181515 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-x64-2.9.tar.lzma
+2022/05/08 | 49771 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-2.9.tar.lzma
+2022/05/08 | 55567 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-x64-2.9.tar.lzma
+2022/05/08 | 31412 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-2.9.tar.lzma
+2022/05/08 | 35169 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-x64-2.9.tar.lzma
+2022/05/08 | 38561 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-2.9.tar.lzma
+2022/05/08 | 43916 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-x64-2.9.tar.lzma
+2022/05/08 | 43361 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-2.9.tar.lzma
+2022/05/08 | 47923 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-x64-2.9.tar.lzma
+2022/05/08 | 45743 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-2.9.tar.lzma
+2022/05/08 | 52326 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-x64-2.9.tar.lzma
+2022/05/08 | 197035 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-2.9.tar.lzma
+2022/05/08 | 213279 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-x64-2.9.tar.lzma
+2022/05/08 | 36048 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin.tar.lzma
+2022/05/08 | 41183 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin-x64.tar.lzma
+2022/05/08 | 755743 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-2.9.tar.lzma
+2022/05/08 | 824370 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-x64-2.9.tar.lzma
+2022/05/08 | 200396 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-2.9.tar.lzma
+2022/05/08 | 202835 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-x64-2.9.tar.lzma
+2022/05/08 | 210278 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-2.9.tar.lzma
+2022/05/08 | 245095 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-x64-2.9.tar.lzma
+2022/05/08 | 79025 | systems/win32/miktex/tm/packages/next/miktex-png-bin-2.9.tar.lzma
+2022/05/08 | 88152 | systems/win32/miktex/tm/packages/next/miktex-png-bin-x64-2.9.tar.lzma
+2022/05/08 | 1181126 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-2.9.tar.lzma
+2022/05/08 | 1322743 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-x64-2.9.tar.lzma
+2022/05/08 | 20184 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-2.9.tar.lzma
+2022/05/08 | 23944 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-x64-2.9.tar.lzma
+2022/05/08 | 31589 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-2.9.tar.lzma
+2022/05/08 | 37374 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-x64-2.9.tar.lzma
+2022/05/08 | 64709 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-2.9.tar.lzma
+2022/05/08 | 72884 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-x64-2.9.tar.lzma
+2022/05/08 | 50800 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-2.9.tar.lzma
+2022/05/08 | 58663 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-x64-2.9.tar.lzma
+2022/05/08 | 693062 | systems/win32/miktex/tm/packages/next/miktex-ptex-bin.tar.lzma
+2022/05/08 | 758955 | systems/win32/miktex/tm/packages/next/miktex-ptex-bin-x64.tar.lzma
+2022/05/08 | 1357072 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-2.9.tar.lzma
+2022/05/08 | 1501237 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-x64-2.9.tar.lzma
+2022/05/08 | 42817 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-2.9.tar.lzma
+2022/05/08 | 52480 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-x64-2.9.tar.lzma
+2022/05/08 | 57618 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin.tar.lzma
+2022/05/08 | 63740 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-x64.tar.lzma
+2022/05/08 | 25551 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-2.9.tar.lzma
+2022/05/08 | 27636 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-x64-2.9.tar.lzma
+2022/05/08 | 16560 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-2.9.tar.lzma
+2022/05/08 | 18492 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-x64-2.9.tar.lzma
+2022/05/08 | 64490 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-2.9.tar.lzma
+2022/05/08 | 71007 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-x64-2.9.tar.lzma
+2022/05/08 | 156964 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-2.9.tar.lzma
+2022/05/08 | 173007 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-x64-2.9.tar.lzma
+2022/05/08 | 58665 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-2.9.tar.lzma
+2022/05/08 | 67253 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-x64-2.9.tar.lzma
+2022/05/08 | 100485 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-2.9.tar.lzma
+2022/05/08 | 107704 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-x64-2.9.tar.lzma
+2022/05/08 | 2694876 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-2.9.tar.lzma
+2022/05/08 | 2820687 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-x64-2.9.tar.lzma
+2022/05/08 | 55285 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-2.9.tar.lzma
+2022/05/08 | 62380 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-x64-2.9.tar.lzma
+2022/05/08 | 37116 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin.tar.lzma
+2022/05/08 | 41203 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin-x64.tar.lzma
+2022/05/08 | 28690 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-2.9.tar.lzma
+2022/05/08 | 34052 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-x64-2.9.tar.lzma
+2022/05/08 | 67704 | systems/win32/miktex/tm/packages/next/miktex-web-bin-2.9.tar.lzma
+2022/05/08 | 73528 | systems/win32/miktex/tm/packages/next/miktex-web-bin-x64-2.9.tar.lzma
+2022/05/08 | 316242 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-2.9.tar.lzma
+2022/05/08 | 351696 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-x64-2.9.tar.lzma
+2022/05/08 | 55755 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin.tar.lzma
+2022/05/08 | 57527 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin-x64.tar.lzma
+2022/05/08 | 591570 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-2.9.tar.lzma
+2022/05/08 | 629430 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-x64-2.9.tar.lzma
+2022/05/08 | 39728 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-2.9.tar.lzma
+2022/05/08 | 43226 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-x64-2.9.tar.lzma
+2022/05/08 | 276769 | systems/win32/miktex/tm/packages/next/miktex-zzdb1-2.9.tar.lzma
+2022/05/08 | 1444532 | systems/win32/miktex/tm/packages/next/miktex-zzdb2-2.9.tar.lzma
+2022/05/08 | 1333235 | systems/win32/miktex/tm/packages/next/miktex-zzdb3-2.9.tar.lzma
+2022/05/08 | 13513 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-2.9.tar.lzma
+2022/05/08 | 14410 | 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/05/07 | 1153 | systems/win32/miktex/tm/packages/next/pr.ini
+2022/05/08 | 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
@@ -297740,7 +297729,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/05/07 | 929 | systems/win32/miktex/tm/packages/pr.ini
+2022/05/08 | 929 | 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
@@ -299583,7 +299572,7 @@
2004/06/04 | 404 | tds/tds.sed
2004/06/23 | 65418 | tds/tds.tex
2019/05/29 | 304264 | tds.zip
-2022/05/08 | 186 | timestamp
+2022/05/09 | 186 | timestamp
2002/08/26 | 61898 | usergrps/dante/antrag.pdf
2002/08/26 | 118217 | usergrps/dante/antrag.ps
2022/02/28 | 917 | usergrps/dante/dtk/doc/beispiel.bib
diff --git a/FILES.byname.gz b/FILES.byname.gz
index 6b40b2582f..c6b1137277 100644
--- a/FILES.byname.gz
+++ b/FILES.byname.gz
Binary files differ
diff --git a/FILES.last07days b/FILES.last07days
index c95e2f35e7..3bc0733841 100644
--- a/FILES.last07days
+++ b/FILES.last07days
@@ -1,258 +1,421 @@
-2022/05/07 | 99819 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-2.9.tar.lzma
-2022/05/07 | 99258 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-2.9.tar.lzma
-2022/05/07 | 97201 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-2.9.tar.lzma
-2022/05/07 | 96633 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-2.9.tar.lzma
-2022/05/07 | 95432 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-2.9.tar.lzma
-2022/05/07 | 95286 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-x64-2.9.tar.lzma
-2022/05/07 | 93961 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-2.9.tar.lzma
+2022/05/08 | 99817 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-2.9.tar.lzma
+2022/05/08 | 99256 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-2.9.tar.lzma
+2022/05/08 | 9804 | graphics/pgf/contrib/circuitikz/tex/pgfcircflow.tex
+2022/05/08 | 97200 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-2.9.tar.lzma
+2022/05/08 | 96812 | support/luafindfont.zip
+2022/05/08 | 96633 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-2.9.tar.lzma
+2022/05/08 | 95433 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-2.9.tar.lzma
+2022/05/08 | 9538 | graphics/pgf/contrib/circuitikz/tex/pgfcirccurrent.tex
+2022/05/08 | 953808 | macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon.zip
+2022/05/08 | 95285 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-x64-2.9.tar.lzma
+2022/05/08 | 93959 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-2.9.tar.lzma
+2022/05/08 | 938 | graphics/pgf/contrib/circuitikz/doc/circuitikz-context.tex
+2022/05/08 | 937130 | graphics/pgf/contrib/circuitikz/tex/circuitikz-1.1.2-body.tex
+2022/05/08 | 929 | systems/win32/miktex/tm/packages/pr.ini
+2022/05/08 | 929934 | graphics/pgf/contrib/circuitikz/tex/t-circuitikz-1.1.2.tex
+2022/05/08 | 92920 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-2.9.tar.lzma
+2022/05/08 | 9220 | systems/texlive/tlnet/archive/proflycee.r63255.tar.xz
+2022/05/08 | 89492 | macros/latex/contrib/hvlogos.zip
+2022/05/08 | 890192 | systems/texlive/tlnet/archive/hvextern.doc.r63255.tar.xz
+2022/05/08 | 88152 | systems/win32/miktex/tm/packages/next/miktex-png-bin-x64-2.9.tar.lzma
+2022/05/08 | 881135 | macros/xetex/latex/xduts/xdulogo.pdf
+2022/05/08 | 8783 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-x64-2.9.tar.lzma
+2022/05/08 | 86942 | macros/latex/contrib/hvlogos/doc/hvlogos-doc.pdf
+2022/05/08 | 86759 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-2.9.tar.lzma
+2022/05/08 | 86485 | support/luafindfont/doc/luafindfont-doc.pdf
+2022/05/08 | 8431 | graphics/pgf/contrib/circuitikz/doc/ctikzmanutils.sty
+2022/05/08 | 841340 | graphics/pgf/contrib/circuitikz/tex/circuitikz-1.0-body.tex
+2022/05/08 | 834142 | graphics/pgf/contrib/circuitikz/tex/t-circuitikz-1.0.tex
+2022/05/08 | 825320 | systems/texlive/tlnet/archive/yquant.doc.r63255.tar.xz
+2022/05/08 | 824370 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-x64-2.9.tar.lzma
+2022/05/08 | 81461 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-x64-2.9.tar.lzma
+2022/05/08 | 79025 | systems/win32/miktex/tm/packages/next/miktex-png-bin-2.9.tar.lzma
+2022/05/08 | 78975 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-x64-2.9.tar.lzma
+2022/05/08 | 78730 | graphics/mcf2graph/mcf_exa_code.pdf
+2022/05/08 | 7856 | systems/texlive/tlnet/archive/begingreek.source.r63255.tar.xz
+2022/05/08 | 785552 | systems/texlive/tlnet/archive/begingreek.doc.r63255.tar.xz
+2022/05/08 | 7753 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-2.9.tar.lzma
+2022/05/08 | 7712044 | systems/texlive/tlnet/archive/chinesechess.doc.r63255.tar.xz
+2022/05/08 | 77068 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-x64-2.9.tar.lzma
+2022/05/08 | 758991 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.9.6-body.tex
+2022/05/08 | 758955 | systems/win32/miktex/tm/packages/next/miktex-ptex-bin-x64.tar.lzma
+2022/05/08 | 7570 | macros/latex/contrib/hvlogos/latex/hvlogos.sty
+2022/05/08 | 755743 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-2.9.tar.lzma
+2022/05/08 | 751663 | graphics/pgf/contrib/circuitikz/tex/t-circuitikz-0.9.6.tex
+2022/05/08 | 74068 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-x64-2.9.tar.lzma
+2022/05/08 | 73528 | systems/win32/miktex/tm/packages/next/miktex-web-bin-x64-2.9.tar.lzma
+2022/05/08 | 73478 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-2.9.tar.lzma
+2022/05/08 | 73147 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-x64-2.9.tar.lzma
+2022/05/08 | 7296 | systems/texlive/tlnet/archive/sasnrdisplay.r63255.tar.xz
+2022/05/08 | 728 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.4.sty
+2022/05/08 | 72884 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-x64-2.9.tar.lzma
+2022/05/08 | 72014 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-2.9.tar.lzma
+2022/05/08 | 71007 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-x64-2.9.tar.lzma
+2022/05/08 | 709978 | macros/latex/contrib/nicematrix/nicematrix.dtx
+2022/05/08 | 693062 | systems/win32/miktex/tm/packages/next/miktex-ptex-bin.tar.lzma
+2022/05/08 | 690 | macros/latex/contrib/hvextern/README
+2022/05/08 | 690729 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.9.3-body.tex
+2022/05/08 | 6898 | macros/latex/contrib/simplebnf/simplebnf.sty
+2022/05/08 | 68873 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-2.9.tar.lzma
+2022/05/08 | 683433 | graphics/pgf/contrib/circuitikz/tex/t-circuitikz-0.9.3.tex
+2022/05/08 | 681940 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-x64-2.9.tar.lzma
+2022/05/08 | 68010 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-2.9.tar.lzma
+2022/05/08 | 67704 | systems/win32/miktex/tm/packages/next/miktex-web-bin-2.9.tar.lzma
+2022/05/08 | 67253 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-x64-2.9.tar.lzma
+2022/05/08 | 6656 | systems/texlive/tlnet/archive/ut-thesis.source.r63255.tar.xz
+2022/05/08 | 6650 | macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/source/beamercolorthemetrigon.dtx
+2022/05/08 | 6576 | systems/texlive/tlnet/archive/mgltex.doc.r63255.tar.xz
+2022/05/08 | 6568 | systems/texlive/tlnet/archive/uwa-letterhead.source.r63255.tar.xz
+2022/05/08 | 65054 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-x64-2.9.tar.lzma
+2022/05/08 | 64709 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-2.9.tar.lzma
+2022/05/08 | 646005 | systems/win32/miktex/tm/packages/next/files.csv.lzma
+2022/05/08 | 645787 | systems/win32/miktex/tm/packages/files.csv.lzma
+2022/05/08 | 64542 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-2.9.tar.lzma
+2022/05/08 | 64490 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-2.9.tar.lzma
+2022/05/08 | 641 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.8.3.sty
+2022/05/08 | 63740 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-x64.tar.lzma
+2022/05/08 | 635 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.7.sty
+2022/05/08 | 635 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.6.sty
+2022/05/08 | 6348 | systems/texlive/tlnet/archive/mgltex.r63255.tar.xz
+2022/05/08 | 633 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.9.6.sty
+2022/05/08 | 63310 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-x64-2.9.tar.lzma
+2022/05/08 | 632 | graphics/pgf/contrib/circuitikz/tex/circuitikz-1.2.7.sty
+2022/05/08 | 632 | graphics/pgf/contrib/circuitikz/tex/circuitikz-1.1.2.sty
+2022/05/08 | 632 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.9.3.sty
+2022/05/08 | 631 | graphics/pgf/contrib/circuitikz/tex/circuitikz-1.4.6.sty
+2022/05/08 | 631278 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-2.9.tar.lzma
+2022/05/08 | 629430 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-x64-2.9.tar.lzma
+2022/05/08 | 626 | graphics/pgf/contrib/circuitikz/tex/circuitikz-1.0.sty
+2022/05/08 | 62380 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-x64-2.9.tar.lzma
+2022/05/08 | 6060 | systems/texlive/tlnet/archive/uwa-pcf.source.r63255.tar.xz
+2022/05/08 | 60428 | systems/texlive/tlnet/archive/doulossil.doc.r63255.tar.xz
+2022/05/08 | 598231 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-x64-2.9.tar.lzma
+2022/05/08 | 591570 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-2.9.tar.lzma
+2022/05/08 | 58665 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-2.9.tar.lzma
+2022/05/08 | 58663 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-x64-2.9.tar.lzma
+2022/05/08 | 5799817 | systems/texlive/tlnet/install-tl-unx.tar.gz
+2022/05/08 | 57656 | systems/texlive/tlnet/archive/uwa-letterhead.doc.r63255.tar.xz
+2022/05/08 | 57619 | graphics/mcf2graph/mcf_manual.tex
+2022/05/08 | 57618 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin.tar.lzma
+2022/05/08 | 57527 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin-x64.tar.lzma
+2022/05/08 | 57331 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-x64-2.9.tar.lzma
+2022/05/08 | 57271 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-x64-2.9.tar.lzma
+2022/05/08 | 56992 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-2.9.tar.lzma
+2022/05/08 | 5696 | systems/texlive/tlnet/archive/uwa-pif.source.r63255.tar.xz
+2022/05/08 | 56756 | systems/texlive/tlnet/archive/yquant.r63255.tar.xz
+2022/05/08 | 56617 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-2.9.tar.lzma
+2022/05/08 | 565929 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-x64-2.9.tar.lzma
+2022/05/08 | 563360 | systems/texlive/tlnet/archive/proflycee.doc.r63255.tar.xz
+2022/05/08 | 56233 | graphics/pgf/contrib/circuitikz/tex/pgfcircmonopoles.tex
+2022/05/08 | 55755 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin.tar.lzma
+2022/05/08 | 55567 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-x64-2.9.tar.lzma
+2022/05/08 | 55285 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-2.9.tar.lzma
+2022/05/08 | 532454 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-2.9.tar.lzma
+2022/05/08 | 53176 | systems/texlive/tlnet/archive/ektype-tanka.doc.r63255.tar.xz
+2022/05/08 | 528016 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-x64-2.9.tar.lzma
+2022/05/08 | 52740 | systems/texlive/tlnet/archive/uwa-pcf.doc.r63255.tar.xz
+2022/05/08 | 5248 | support/luafindfont/man/luafindfont.1
+2022/05/08 | 52480 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-x64-2.9.tar.lzma
+2022/05/08 | 52326 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-x64-2.9.tar.lzma
+2022/05/08 | 52094 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-x64-2.9.tar.lzma
+2022/05/08 | 51559 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-2.9.tar.lzma
+2022/05/08 | 51483 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-2.9.tar.lzma
+2022/05/08 | 513436 | systems/texlive/tlnet/archive/biblatex-swiss-legal.doc.r63255.tar.xz
+2022/05/08 | 510 | macros/latex/contrib/simplebnf/README.md
+2022/05/08 | 50800 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-2.9.tar.lzma
+2022/05/08 | 50500 | systems/texlive/tlnet/archive/uwa-pif.doc.r63255.tar.xz
+2022/05/08 | 5048780 | systems/texlive/tlnet/archive/arara.doc.r63255.tar.xz
+2022/05/08 | 504733 | macros/latex/contrib/nicematrix/nicematrix-french.pdf
+2022/05/08 | 49771 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-2.9.tar.lzma
+2022/05/08 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
+2022/05/08 | 48825 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-x64-2.9.tar.lzma
+2022/05/08 | 487972 | graphics/pgf/contrib/circuitikz/doc/circuitikzmanual.tex
+2022/05/08 | 484369 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-2.9.tar.lzma
+2022/05/08 | 4824 | systems/texlive/tlnet/archive/hvextern.r63255.tar.xz
+2022/05/08 | 481498 | systems/win32/miktex/tm/packages/next/miktex-doc.tar.lzma
+2022/05/08 | 47923 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-x64-2.9.tar.lzma
+2022/05/08 | 477849 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-2.9.tar.lzma
+2022/05/08 | 4767 | macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/source/beamerouterthemetrigon.dtx
+2022/05/08 | 46066 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-2.9.tar.lzma
+2022/05/08 | 45823 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-x64-2.9.tar.lzma
+2022/05/08 | 45743 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-2.9.tar.lzma
+2022/05/08 | 455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
+2022/05/08 | 455 | systems/texlive/tlnet/install-tl.zip.sha512.asc
+2022/05/08 | 455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
+2022/05/08 | 455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
+2022/05/08 | 43916 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-x64-2.9.tar.lzma
+2022/05/08 | 43863 | graphics/pgf/contrib/circuitikz/doc/changelog.tex
+2022/05/08 | 43825 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-x64-2.9.tar.lzma
+2022/05/08 | 43645 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-2.9.tar.lzma
+2022/05/08 | 434560 | graphics/mcf2graph/mcf_example.pdf
+2022/05/08 | 43373 | macros/latex/contrib/hvextern/doc/hvextern.tex
+2022/05/08 | 43361 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-2.9.tar.lzma
+2022/05/08 | 43352 | graphics/mcf2graph/mcf_man_soc.mp
+2022/05/08 | 43226 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-x64-2.9.tar.lzma
+2022/05/08 | 429543 | macros/xetex/latex/xduts/xduts.pdf
+2022/05/08 | 429072 | systems/texlive/tlnet/archive/circledsteps.doc.r63255.tar.xz
+2022/05/08 | 42817 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-2.9.tar.lzma
+2022/05/08 | 422295 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.8.3-body.tex
+2022/05/08 | 418 | graphics/pgf/contrib/circuitikz/doc/compatibility.tex
+2022/05/08 | 416850 | graphics/pgf/contrib/circuitikz/tex/t-circuitikz-0.8.3.tex
+2022/05/08 | 416463 | macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/demo/trigon_demo.pdf
+2022/05/08 | 4148 | systems/texlive/tlnet/archive/swfigure.r63255.tar.xz
+2022/05/08 | 41305 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-2.9.tar.lzma
+2022/05/08 | 41203 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin-x64.tar.lzma
+2022/05/08 | 41183 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin-x64.tar.lzma
+2022/05/08 | 4074 | macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/source/beamerthemetrigon.dtx
+2022/05/08 | 406432 | systems/texlive/tlnet/archive/texlive-scripts.doc.r63244.tar.xz
+2022/05/08 | 405071 | macros/latex/contrib/changebar.zip
+2022/05/08 | 404852 | systems/texlive/tlnet/archive/doulossil.r63255.tar.xz
+2022/05/08 | 40468 | graphics/pgf/contrib/circuitikz/tex/pgfcirc.defines.tex
+2022/05/08 | 403567 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.7-body.tex
+2022/05/08 | 3999 | macros/latex/contrib/hvextern/doc/hvdoctools.sty
+2022/05/08 | 398 | macros/latex/contrib/hvextern/Changes
+2022/05/08 | 39728 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-2.9.tar.lzma
+2022/05/08 | 3968 | systems/texlive/tlnet/archive/runcode.r63255.tar.xz
+2022/05/08 | 394370 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-x64-2.9.tar.lzma
+2022/05/08 | 393884 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.6-body.tex
+2022/05/08 | 38561 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-2.9.tar.lzma
+2022/05/08 | 38426 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-2.9.tar.lzma
+2022/05/08 | 3812 | graphics/mcf2graph/mcf_exa_code.tex
+2022/05/08 | 3802 | graphics/pgf/contrib/circuitikz/README.md
+2022/05/08 | 374435 | graphics/pgf/contrib/circuitikz/tex/pgfcirctripoles.tex
+2022/05/08 | 37374 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-x64-2.9.tar.lzma
+2022/05/08 | 37116 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin.tar.lzma
+2022/05/08 | 37080 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-x64-2.9.tar.lzma
+2022/05/08 | 3649 | graphics/mcf2graph/README
+2022/05/08 | 364442 | macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/docs/trigontheme.pdf
+2022/05/08 | 364117 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.4-body.tex
+2022/05/08 | 3626 | macros/latex/contrib/simplebnf/simplebnf-doc.tex
+2022/05/08 | 36048 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin.tar.lzma
+2022/05/08 | 3590 | graphics/pgf/contrib/circuitikz/tex/t-circuitikz.tex
+2022/05/08 | 35438 | graphics/pgf/contrib/circuitikz/tex/pgfcircvoltage.tex
+2022/05/08 | 35242 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-x64-2.9.tar.lzma
+2022/05/08 | 35169 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-x64-2.9.tar.lzma
+2022/05/08 | 351696 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-x64-2.9.tar.lzma
+2022/05/08 | 34052 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-x64-2.9.tar.lzma
+2022/05/08 | 3348 | systems/texlive/tlnet/archive/uwa-letterhead.r63255.tar.xz
+2022/05/08 | 33313 | graphics/pgf/contrib/circuitikz/tex/pgfcircshapes.tex
+2022/05/08 | 332413 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-2.9.tar.lzma
+2022/05/08 | 32955 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-2.9.tar.lzma
+2022/05/08 | 326659 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-x64-2.9.tar.lzma
+2022/05/08 | 325269 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-x64-2.9.tar.lzma
+2022/05/08 | 322096 | systems/texlive/tlnet/archive/oup-authoring-template.doc.r63255.tar.xz
+2022/05/08 | 32134 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-x64-2.9.tar.lzma
+2022/05/08 | 316242 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-2.9.tar.lzma
+2022/05/08 | 31589 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-2.9.tar.lzma
+2022/05/08 | 31522 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-x64-2.9.tar.lzma
+2022/05/08 | 3150 | graphics/pgf/contrib/circuitikz/tex/ctikzstyle-legacy.tex
+2022/05/08 | 3145432 | install/graphics/pgf/contrib/circuitikz.tds.zip
+2022/05/08 | 31412 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-2.9.tar.lzma
+2022/05/08 | 31343 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-x64-2.9.tar.lzma
+2022/05/08 | 3126415 | graphics/pgf/contrib/circuitikz.zip
+2022/05/08 | 31244 | systems/texlive/tlnet/archive/mgltex.source.r63255.tar.xz
+2022/05/08 | 30542 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-x64-2.9.tar.lzma
+2022/05/08 | 30147 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-2.9.tar.lzma
+2022/05/08 | 2967 | macros/xetex/latex/xduts/README.md
+2022/05/08 | 296037 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-x64-2.9.tar.lzma
+2022/05/08 | 2926592 | systems/texlive/tlnet/archive/swfigure.doc.r63255.tar.xz
+2022/05/08 | 2924 | systems/texlive/tlnet/archive/uwa-pcf.r63255.tar.xz
+2022/05/08 | 289201 | graphics/mcf2graph/mcf_manual.pdf
+2022/05/08 | 288199 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-2.9.tar.lzma
+2022/05/08 | 28797 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-2.9.tar.lzma
+2022/05/08 | 28690 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-2.9.tar.lzma
+2022/05/08 | 286412 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-x64-2.9.tar.lzma
+2022/05/08 | 285714 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-2.9.tar.lzma
+2022/05/08 | 28569 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-x64-2.9.tar.lzma
+2022/05/08 | 28422 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-2.9.tar.lzma
+2022/05/08 | 2820687 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-x64-2.9.tar.lzma
+2022/05/08 | 280 | graphics/pgf/contrib/circuitikz/tex/ctikzstyle-example.tex
+2022/05/08 | 276769 | systems/win32/miktex/tm/packages/next/miktex-zzdb1-2.9.tar.lzma
+2022/05/08 | 276716 | systems/win32/miktex/tm/packages/miktex-zzdb1-2.9.tar.lzma
+2022/05/08 | 27636 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-x64-2.9.tar.lzma
+2022/05/08 | 27591 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-2.9.tar.lzma
+2022/05/08 | 27248 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-2.9.tar.lzma
+2022/05/08 | 270300 | systems/win32/miktex/tm/packages/next/miktex-console-bin-x64-2.9.tar.lzma
+2022/05/08 | 2694876 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-2.9.tar.lzma
+2022/05/08 | 2616 | systems/texlive/tlnet/archive/ut-thesis.r63255.tar.xz
+2022/05/08 | 259934 | graphics/pgf/contrib/circuitikz/tex/pgfcircbipoles.tex
+2022/05/08 | 2592 | systems/texlive/tlnet/archive/uwa-pif.r63255.tar.xz
+2022/05/08 | 259256 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-2.9.tar.lzma
+2022/05/08 | 25551 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-2.9.tar.lzma
+2022/05/08 | 25483842 | systems/texlive/tlnet/install-tl.zip
+2022/05/08 | 251126 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-2.9.tar.lzma
+2022/05/08 | 25106 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-2.9.tar.lzma
+2022/05/08 | 25059 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-x64-2.9.tar.lzma
+2022/05/08 | 247333 | systems/win32/miktex/tm/packages/next/miktex-hitex-bin-x64.tar.lzma
+2022/05/08 | 245095 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-x64-2.9.tar.lzma
+2022/05/08 | 244961 | systems/win32/miktex/tm/packages/next/miktex-console-bin-2.9.tar.lzma
+2022/05/08 | 24121 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-x64-2.9.tar.lzma
+2022/05/08 | 23944 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-x64-2.9.tar.lzma
+2022/05/08 | 2370060 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
+2022/05/08 | 23151 | macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/source/beamerinnerthemetrigon.dtx
+2022/05/08 | 22147 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-2.9.tar.lzma
+2022/05/08 | 2188 | graphics/pgf/contrib/circuitikz/tex/ctikzstyle-romano.tex
+2022/05/08 | 2140685 | macros/latex/contrib/nicematrix.zip
+2022/05/08 | 213279 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-x64-2.9.tar.lzma
+2022/05/08 | 21315 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-2.9.tar.lzma
+2022/05/08 | 21313 | macros/latex/contrib/hvextern/latex/hvextern.sty
+2022/05/08 | 21240 | systems/texlive/tlnet/archive/swfigure.source.r63255.tar.xz
+2022/05/08 | 211572 | systems/texlive/tlnet/archive/sasnrdisplay.doc.r63255.tar.xz
+2022/05/08 | 210278 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-2.9.tar.lzma
+2022/05/08 | 208808 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-x64-2.9.tar.lzma
+2022/05/08 | 20463964 | systems/texlive/tlnet/install-tl-windows.exe
+2022/05/08 | 203837 | systems/win32/miktex/tm/packages/next/miktex-hitex-bin.tar.lzma
+2022/05/08 | 202835 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-x64-2.9.tar.lzma
+2022/05/08 | 20184 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-2.9.tar.lzma
+2022/05/08 | 200396 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-2.9.tar.lzma
+2022/05/08 | 199832 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-2.9.tar.lzma
+2022/05/08 | 1982084 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-x64-2.9.tar.lzma
+2022/05/08 | 197035 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-2.9.tar.lzma
+2022/05/08 | 196116 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-x64-2.9.tar.lzma
+2022/05/08 | 195721 | graphics/mcf2graph/mcf_mplib_exa.pdf
+2022/05/08 | 1924 | systems/texlive/tlnet/archive/circledsteps.r63255.tar.xz
+2022/05/08 | 190505 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-2.9.tar.lzma
+2022/05/08 | 1898104 | systems/texlive/tlnet/archive/ektype-tanka.r63255.tar.xz
+2022/05/08 | 185004 | systems/texlive/tlnet/archive/runcode.doc.r63255.tar.xz
+2022/05/08 | 18492 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-x64-2.9.tar.lzma
+2022/05/08 | 18367 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-x64-2.9.tar.lzma
+2022/05/08 | 181515 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-x64-2.9.tar.lzma
+2022/05/08 | 18148 | systems/texlive/tlnet/archive/biblatex-swiss-legal.r63255.tar.xz
+2022/05/08 | 1808 | systems/texlive/tlnet/archive/begingreek.r63255.tar.xz
+2022/05/08 | 179878 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-2.9.tar.lzma
+2022/05/08 | 17645 | graphics/pgf/contrib/circuitikz/doc/circuitikz-context.pdf
+2022/05/08 | 1752146 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-2.9.tar.lzma
+2022/05/08 | 17492 | systems/texlive/tlnet/archive/oup-authoring-template.r63255.tar.xz
+2022/05/08 | 173007 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-x64-2.9.tar.lzma
+2022/05/08 | 17277991 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
+2022/05/08 | 168819 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-x64-2.9.tar.lzma
+2022/05/08 | 16722 | graphics/pgf/contrib/circuitikz/tex/pgfcircpath.tex
+2022/05/08 | 16560 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-2.9.tar.lzma
+2022/05/08 | 16502 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-2.9.tar.lzma
+2022/05/08 | 156964 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-2.9.tar.lzma
+2022/05/08 | 155498 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-x64-2.9.tar.lzma
+2022/05/08 | 1544857 | graphics/pgf/contrib/circuitikz/doc/circuitikzmanual.pdf
+2022/05/08 | 15442 | graphics/pgf/contrib/circuitikz/tex/pgfcirclabel.tex
+2022/05/08 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
+2022/05/08 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
+2022/05/08 | 152698 | macros/latex/contrib/simplebnf/simplebnf-doc.pdf
+2022/05/08 | 152593 | macros/latex/contrib/simplebnf.zip
+2022/05/08 | 152028 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-2.9.tar.lzma
+2022/05/08 | 1512102 | macros/latex/contrib/nicematrix/nicematrix.pdf
+2022/05/08 | 1501237 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-x64-2.9.tar.lzma
+2022/05/08 | 145 | systems/texlive/tlnet/install-tl.zip.sha512
+2022/05/08 | 14587 | graphics/pgf/contrib/circuitikz/tex/pgfcircutils.tex
+2022/05/08 | 14575 | graphics/mcf2graph/mcf_mplib_exa.tex
+2022/05/08 | 1454763 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-x64-2.9.tar.lzma
+2022/05/08 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
+2022/05/08 | 1445225 | systems/win32/miktex/tm/packages/miktex-zzdb2-2.9.tar.lzma
+2022/05/08 | 1444532 | systems/win32/miktex/tm/packages/next/miktex-zzdb2-2.9.tar.lzma
+2022/05/08 | 14410 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-x64-2.9.tar.lzma
+2022/05/08 | 139101 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-x64-2.9.tar.lzma
+2022/05/08 | 138168 | systems/texlive/tlnet/archive/ut-thesis.doc.r63255.tar.xz
+2022/05/08 | 13737 | graphics/pgf/contrib/circuitikz/tex/circuitikz.sty
+2022/05/08 | 135948 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-2.9.tar.lzma
+2022/05/08 | 1357072 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-2.9.tar.lzma
+2022/05/08 | 135378 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-x64-2.9.tar.lzma
+2022/05/08 | 13513 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-2.9.tar.lzma
+2022/05/08 | 1333482 | systems/win32/miktex/tm/packages/miktex-zzdb3-2.9.tar.lzma
+2022/05/08 | 1333235 | systems/win32/miktex/tm/packages/next/miktex-zzdb3-2.9.tar.lzma
+2022/05/08 | 1328050 | macros/xetex/latex/xduts.zip
+2022/05/08 | 1322743 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-x64-2.9.tar.lzma
+2022/05/08 | 132194 | macros/xetex/latex/xduts/xduts.dtx
+2022/05/08 | 1302482 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-2.9.tar.lzma
+2022/05/08 | 12993848 | systems/texlive/tlnet/archive/koma-script.r63255.tar.xz
+2022/05/08 | 126533 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-2.9.tar.lzma
+2022/05/08 | 12532 | systems/texlive/tlnet/archive/chinesechess.r63255.tar.xz
+2022/05/08 | 120615 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-2.9.tar.lzma
+2022/05/08 | 1202031 | macros/latex/contrib/hvextern/doc/hvextern.pdf
+2022/05/08 | 1181126 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-2.9.tar.lzma
+2022/05/08 | 11777572 | systems/texlive/tlnet/archive/arara.r63255.tar.xz
+2022/05/08 | 115656 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-x64-2.9.tar.lzma
+2022/05/08 | 1156523 | macros/latex/contrib/hvextern.zip
+2022/05/08 | 1156464 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-x64-2.9.tar.lzma
+2022/05/08 | 115416 | systems/texlive/tlnet/archive/arara.source.r63255.tar.xz
+2022/05/08 | 1153 | systems/win32/miktex/tm/packages/next/pr.ini
+2022/05/08 | 113051 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-x64-2.9.tar.lzma
+2022/05/08 | 112589 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-x64-2.9.tar.lzma
+2022/05/08 | 112203 | graphics/pgf/contrib/circuitikz/tex/pgfcircmultipoles.tex
+2022/05/08 | 1111 | macros/xetex/latex/xduts/xduts.ins
+2022/05/08 | 1100 | macros/latex/contrib/simplebnf/LICENSE
+2022/05/08 | 109732 | systems/texlive/tlnet/archive/texlive-scripts.r63244.tar.xz
+2022/05/08 | 109478 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-x64-2.9.tar.lzma
+2022/05/08 | 1081680 | graphics/pgf/contrib/circuitikz/tex/circuitikz-1.4.6-body.tex
+2022/05/08 | 107976 | graphics/pgf/contrib/circuitikz/tex/pgfcircquadpoles.tex
+2022/05/08 | 107704 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-x64-2.9.tar.lzma
+2022/05/08 | 1073051 | graphics/pgf/contrib/circuitikz/tex/t-circuitikz-1.4.6.tex
+2022/05/08 | 1048322 | graphics/mcf2graph.zip
+2022/05/08 | 104554 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-x64-2.9.tar.lzma
+2022/05/08 | 103337 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-x64-2.9.tar.lzma
+2022/05/08 | 10317 | macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/source/beamerfontthemetrigon.dtx
+2022/05/08 | 103091 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-x64-2.9.tar.lzma
+2022/05/08 | 1021847 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-2.9.tar.lzma
+2022/05/08 | 1021798 | graphics/pgf/contrib/circuitikz/tex/circuitikz-1.2.7-body.tex
+2022/05/08 | 1014383 | graphics/pgf/contrib/circuitikz/tex/t-circuitikz-1.2.7.tex
+2022/05/08 | 101374 | graphics/mcf2graph/mcf_library.mcf
+2022/05/08 | 10126 | support/luafindfont/doc/luafindfont-doc.tex
+2022/05/08 | 101016 | graphics/mcf2graph/mcf2graph.mp
+2022/05/08 | 100485 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-2.9.tar.lzma
2022/05/07 | 938743 | graphics/pgf/contrib/yquant.zip
-2022/05/07 | 929 | systems/win32/miktex/tm/packages/pr.ini
-2022/05/07 | 92918 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-2.9.tar.lzma
-2022/05/07 | 88152 | systems/win32/miktex/tm/packages/next/miktex-png-bin-x64-2.9.tar.lzma
-2022/05/07 | 8784 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-x64-2.9.tar.lzma
-2022/05/07 | 86760 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-2.9.tar.lzma
+2022/05/07 | 893 | support/luafindfont/CHANGELOG
2022/05/07 | 84172 | systems/texlive/tlnet/archive/prociagssymp.doc.r63242.tar.xz
-2022/05/07 | 824371 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-x64-2.9.tar.lzma
-2022/05/07 | 81462 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-x64-2.9.tar.lzma
2022/05/07 | 791968 | macros/latex/contrib/begingreek.zip
-2022/05/07 | 79025 | systems/win32/miktex/tm/packages/next/miktex-png-bin-2.9.tar.lzma
-2022/05/07 | 78975 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-x64-2.9.tar.lzma
2022/05/07 | 7890075 | macros/latex/contrib/koma-script.zip
-2022/05/07 | 785272 | systems/texlive/tlnet/archive/begingreek.doc.r63240.tar.xz
2022/05/07 | 7804 | systems/texlive/tlnet/archive/mathsemantics.r63241.tar.xz
-2022/05/07 | 7780 | systems/texlive/tlnet/archive/begingreek.source.r63240.tar.xz
-2022/05/07 | 7754 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-2.9.tar.lzma
-2022/05/07 | 77067 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-x64-2.9.tar.lzma
-2022/05/07 | 758954 | systems/win32/miktex/tm/packages/next/miktex-ptex-bin-x64.tar.lzma
-2022/05/07 | 755745 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-2.9.tar.lzma
2022/05/07 | 75000 | macros/latex/contrib/proflycee/doc/ProfLycee-doc.tex
-2022/05/07 | 74069 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-x64-2.9.tar.lzma
-2022/05/07 | 73531 | systems/win32/miktex/tm/packages/next/miktex-web-bin-x64-2.9.tar.lzma
-2022/05/07 | 73478 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-2.9.tar.lzma
-2022/05/07 | 73149 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-x64-2.9.tar.lzma
-2022/05/07 | 72886 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-x64-2.9.tar.lzma
-2022/05/07 | 72014 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-2.9.tar.lzma
-2022/05/07 | 71007 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-x64-2.9.tar.lzma
-2022/05/07 | 693066 | systems/win32/miktex/tm/packages/next/miktex-ptex-bin.tar.lzma
-2022/05/07 | 68872 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-2.9.tar.lzma
-2022/05/07 | 681940 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-x64-2.9.tar.lzma
-2022/05/07 | 68010 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-2.9.tar.lzma
-2022/05/07 | 67706 | systems/win32/miktex/tm/packages/next/miktex-web-bin-2.9.tar.lzma
-2022/05/07 | 67253 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-x64-2.9.tar.lzma
-2022/05/07 | 65055 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-x64-2.9.tar.lzma
-2022/05/07 | 64710 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-2.9.tar.lzma
-2022/05/07 | 646005 | systems/win32/miktex/tm/packages/next/files.csv.lzma
-2022/05/07 | 645787 | systems/win32/miktex/tm/packages/files.csv.lzma
-2022/05/07 | 64544 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-2.9.tar.lzma
-2022/05/07 | 64488 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-2.9.tar.lzma
+2022/05/07 | 7317 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
2022/05/07 | 642040 | systems/texlive/tlnet/archive/mathsemantics.doc.r63241.tar.xz
-2022/05/07 | 63740 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-x64.tar.lzma
-2022/05/07 | 63310 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-x64-2.9.tar.lzma
-2022/05/07 | 631281 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-2.9.tar.lzma
-2022/05/07 | 629432 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-x64-2.9.tar.lzma
-2022/05/07 | 62383 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-x64-2.9.tar.lzma
-2022/05/07 | 598230 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-x64-2.9.tar.lzma
-2022/05/07 | 591569 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-2.9.tar.lzma
-2022/05/07 | 58667 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-2.9.tar.lzma
-2022/05/07 | 58664 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-x64-2.9.tar.lzma
-2022/05/07 | 5800342 | systems/texlive/tlnet/install-tl-unx.tar.gz
-2022/05/07 | 57618 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin.tar.lzma
-2022/05/07 | 57525 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin-x64.tar.lzma
-2022/05/07 | 57330 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-x64-2.9.tar.lzma
-2022/05/07 | 57272 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-x64-2.9.tar.lzma
2022/05/07 | 571962 | macros/latex/contrib/proflycee.zip
-2022/05/07 | 56993 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-2.9.tar.lzma
-2022/05/07 | 56619 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-2.9.tar.lzma
-2022/05/07 | 565928 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-x64-2.9.tar.lzma
-2022/05/07 | 55757 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin.tar.lzma
-2022/05/07 | 55567 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-x64-2.9.tar.lzma
2022/05/07 | 554769 | macros/latex/contrib/proflycee/doc/ProfLycee-doc.pdf
-2022/05/07 | 55285 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-2.9.tar.lzma
-2022/05/07 | 532456 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-2.9.tar.lzma
-2022/05/07 | 528018 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-x64-2.9.tar.lzma
-2022/05/07 | 52479 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-x64-2.9.tar.lzma
-2022/05/07 | 52327 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-x64-2.9.tar.lzma
-2022/05/07 | 52094 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-x64-2.9.tar.lzma
-2022/05/07 | 51558 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-2.9.tar.lzma
-2022/05/07 | 51485 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-2.9.tar.lzma
-2022/05/07 | 50799 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-2.9.tar.lzma
-2022/05/07 | 49771 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-2.9.tar.lzma
-2022/05/07 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
-2022/05/07 | 48825 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-x64-2.9.tar.lzma
-2022/05/07 | 484370 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-2.9.tar.lzma
-2022/05/07 | 481498 | systems/win32/miktex/tm/packages/next/miktex-doc.tar.lzma
-2022/05/07 | 47922 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-x64-2.9.tar.lzma
-2022/05/07 | 477849 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-2.9.tar.lzma
-2022/05/07 | 46068 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-2.9.tar.lzma
-2022/05/07 | 45825 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-x64-2.9.tar.lzma
-2022/05/07 | 45743 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-2.9.tar.lzma
-2022/05/07 | 455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
-2022/05/07 | 455 | systems/texlive/tlnet/install-tl.zip.sha512.asc
-2022/05/07 | 455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
-2022/05/07 | 455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
-2022/05/07 | 43916 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-x64-2.9.tar.lzma
-2022/05/07 | 43825 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-x64-2.9.tar.lzma
-2022/05/07 | 43645 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-2.9.tar.lzma
-2022/05/07 | 43361 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-2.9.tar.lzma
-2022/05/07 | 43226 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-x64-2.9.tar.lzma
-2022/05/07 | 42818 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-2.9.tar.lzma
-2022/05/07 | 41306 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-2.9.tar.lzma
-2022/05/07 | 41203 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin-x64.tar.lzma
-2022/05/07 | 41182 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin-x64.tar.lzma
-2022/05/07 | 406204 | systems/texlive/tlnet/archive/texlive-scripts.doc.r63236.tar.xz
-2022/05/07 | 39728 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-2.9.tar.lzma
-2022/05/07 | 394370 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-x64-2.9.tar.lzma
-2022/05/07 | 38561 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-2.9.tar.lzma
-2022/05/07 | 38428 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-2.9.tar.lzma
-2022/05/07 | 37375 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-x64-2.9.tar.lzma
-2022/05/07 | 37116 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin.tar.lzma
-2022/05/07 | 37081 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-x64-2.9.tar.lzma
+2022/05/07 | 380646 | macros/latex/contrib/changebar/changebar.pdf
2022/05/07 | 3640762 | macros/latex/contrib/swfigure.zip
2022/05/07 | 36331 | macros/latex/contrib/proflycee/tex/ProfLycee.sty
-2022/05/07 | 36047 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin.tar.lzma
-2022/05/07 | 35242 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-x64-2.9.tar.lzma
-2022/05/07 | 35169 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-x64-2.9.tar.lzma
-2022/05/07 | 351697 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-x64-2.9.tar.lzma
-2022/05/07 | 34053 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-x64-2.9.tar.lzma
-2022/05/07 | 332416 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-2.9.tar.lzma
-2022/05/07 | 32956 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-2.9.tar.lzma
-2022/05/07 | 326662 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-x64-2.9.tar.lzma
-2022/05/07 | 325269 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-x64-2.9.tar.lzma
-2022/05/07 | 32133 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-x64-2.9.tar.lzma
-2022/05/07 | 316244 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-2.9.tar.lzma
-2022/05/07 | 31590 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-2.9.tar.lzma
-2022/05/07 | 31521 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-x64-2.9.tar.lzma
-2022/05/07 | 31414 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-2.9.tar.lzma
-2022/05/07 | 31344 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-x64-2.9.tar.lzma
2022/05/07 | 311390 | graphics/pgf/contrib/yquant/doc/yquant-doc.tex
-2022/05/07 | 30542 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-x64-2.9.tar.lzma
-2022/05/07 | 30147 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-2.9.tar.lzma
-2022/05/07 | 296039 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-x64-2.9.tar.lzma
-2022/05/07 | 288202 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-2.9.tar.lzma
-2022/05/07 | 28795 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-2.9.tar.lzma
-2022/05/07 | 28690 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-2.9.tar.lzma
-2022/05/07 | 286412 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-x64-2.9.tar.lzma
-2022/05/07 | 285716 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-2.9.tar.lzma
-2022/05/07 | 28569 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-x64-2.9.tar.lzma
-2022/05/07 | 28422 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-2.9.tar.lzma
-2022/05/07 | 2820687 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-x64-2.9.tar.lzma
-2022/05/07 | 276743 | systems/win32/miktex/tm/packages/next/miktex-zzdb1-2.9.tar.lzma
-2022/05/07 | 276674 | systems/win32/miktex/tm/packages/miktex-zzdb1-2.9.tar.lzma
-2022/05/07 | 27636 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-x64-2.9.tar.lzma
-2022/05/07 | 27591 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-2.9.tar.lzma
-2022/05/07 | 27249 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-2.9.tar.lzma
-2022/05/07 | 270300 | systems/win32/miktex/tm/packages/next/miktex-console-bin-x64-2.9.tar.lzma
-2022/05/07 | 2694877 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-2.9.tar.lzma
-2022/05/07 | 259257 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-2.9.tar.lzma
-2022/05/07 | 25553 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-2.9.tar.lzma
-2022/05/07 | 25483849 | systems/texlive/tlnet/install-tl.zip
+2022/05/07 | 2984 | graphics/mcf2graph/mcf_example.tex
2022/05/07 | 2532 | systems/texlive/tlnet/archive/prociagssymp.r63242.tar.xz
-2022/05/07 | 251129 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-2.9.tar.lzma
-2022/05/07 | 25107 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-2.9.tar.lzma
-2022/05/07 | 25060 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-x64-2.9.tar.lzma
-2022/05/07 | 247333 | systems/win32/miktex/tm/packages/next/miktex-hitex-bin-x64.tar.lzma
-2022/05/07 | 245096 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-x64-2.9.tar.lzma
-2022/05/07 | 244962 | systems/win32/miktex/tm/packages/next/miktex-console-bin-2.9.tar.lzma
-2022/05/07 | 24121 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-x64-2.9.tar.lzma
-2022/05/07 | 23945 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-x64-2.9.tar.lzma
-2022/05/07 | 2370636 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
-2022/05/07 | 22147 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-2.9.tar.lzma
+2022/05/07 | 2194 | graphics/mcf2graph/mcf_exa_soc.mp
2022/05/07 | 2176 | graphics/pgf/contrib/yquant/tex/yquant.sty
-2022/05/07 | 213280 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-x64-2.9.tar.lzma
-2022/05/07 | 21314 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-2.9.tar.lzma
-2022/05/07 | 210276 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-2.9.tar.lzma
-2022/05/07 | 208809 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-x64-2.9.tar.lzma
-2022/05/07 | 20464440 | systems/texlive/tlnet/install-tl-windows.exe
-2022/05/07 | 203839 | systems/win32/miktex/tm/packages/next/miktex-hitex-bin.tar.lzma
-2022/05/07 | 202837 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-x64-2.9.tar.lzma
-2022/05/07 | 20183 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-2.9.tar.lzma
-2022/05/07 | 200396 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-2.9.tar.lzma
-2022/05/07 | 199832 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-2.9.tar.lzma
-2022/05/07 | 1982083 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-x64-2.9.tar.lzma
-2022/05/07 | 197035 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-2.9.tar.lzma
-2022/05/07 | 196117 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-x64-2.9.tar.lzma
-2022/05/07 | 190506 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-2.9.tar.lzma
2022/05/07 | 187531 | macros/latex/contrib/runcode.zip
-2022/05/07 | 18492 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-x64-2.9.tar.lzma
-2022/05/07 | 18369 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-x64-2.9.tar.lzma
-2022/05/07 | 181516 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-x64-2.9.tar.lzma
-2022/05/07 | 179878 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-2.9.tar.lzma
-2022/05/07 | 1796 | systems/texlive/tlnet/archive/begingreek.r63240.tar.xz
-2022/05/07 | 1752146 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-2.9.tar.lzma
-2022/05/07 | 173010 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-x64-2.9.tar.lzma
-2022/05/07 | 17277729 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
-2022/05/07 | 168819 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-x64-2.9.tar.lzma
-2022/05/07 | 16560 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-2.9.tar.lzma
-2022/05/07 | 16504 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-2.9.tar.lzma
+2022/05/07 | 18042 | graphics/mcf2graph/CHANGELOG
+2022/05/07 | 17427 | support/luafindfont/scripts/luafindfont.lua
2022/05/07 | 1592 | systems/texlive/tlnet/archive/collection-mathscience.r63241.tar.xz
-2022/05/07 | 156964 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-2.9.tar.lzma
-2022/05/07 | 155499 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-x64-2.9.tar.lzma
-2022/05/07 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
-2022/05/07 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
-2022/05/07 | 152032 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-2.9.tar.lzma
-2022/05/07 | 1501237 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-x64-2.9.tar.lzma
2022/05/07 | 14762 | graphics/pgf/contrib/yquant/tex/yquant-langhelper.tex
2022/05/07 | 14679012 | install/macros/latex/contrib/koma-script.tds.zip
-2022/05/07 | 145 | systems/texlive/tlnet/install-tl.zip.sha512
-2022/05/07 | 1454763 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-x64-2.9.tar.lzma
-2022/05/07 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
-2022/05/07 | 1445638 | systems/win32/miktex/tm/packages/next/miktex-zzdb2-2.9.tar.lzma
-2022/05/07 | 1444896 | systems/win32/miktex/tm/packages/miktex-zzdb2-2.9.tar.lzma
-2022/05/07 | 14412 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-x64-2.9.tar.lzma
-2022/05/07 | 139102 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-x64-2.9.tar.lzma
-2022/05/07 | 135949 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-2.9.tar.lzma
-2022/05/07 | 1357073 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-2.9.tar.lzma
-2022/05/07 | 135378 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-x64-2.9.tar.lzma
-2022/05/07 | 13514 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-2.9.tar.lzma
-2022/05/07 | 1333564 | systems/win32/miktex/tm/packages/next/miktex-zzdb3-2.9.tar.lzma
-2022/05/07 | 1332862 | systems/win32/miktex/tm/packages/miktex-zzdb3-2.9.tar.lzma
-2022/05/07 | 1322741 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-x64-2.9.tar.lzma
-2022/05/07 | 1302486 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-2.9.tar.lzma
-2022/05/07 | 126535 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-2.9.tar.lzma
-2022/05/07 | 120617 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-2.9.tar.lzma
-2022/05/07 | 1181128 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-2.9.tar.lzma
-2022/05/07 | 115657 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-x64-2.9.tar.lzma
-2022/05/07 | 1156464 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-x64-2.9.tar.lzma
-2022/05/07 | 1153 | systems/win32/miktex/tm/packages/next/pr.ini
-2022/05/07 | 113052 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-x64-2.9.tar.lzma
-2022/05/07 | 112590 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-x64-2.9.tar.lzma
-2022/05/07 | 109736 | systems/texlive/tlnet/archive/texlive-scripts.r63236.tar.xz
-2022/05/07 | 109479 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-x64-2.9.tar.lzma
-2022/05/07 | 107708 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-x64-2.9.tar.lzma
-2022/05/07 | 104557 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-x64-2.9.tar.lzma
-2022/05/07 | 103339 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-x64-2.9.tar.lzma
-2022/05/07 | 103094 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-x64-2.9.tar.lzma
-2022/05/07 | 1021848 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-2.9.tar.lzma
+2022/05/07 | 121419 | macros/latex/contrib/changebar/changebar.dtx
2022/05/07 | 1017482 | graphics/pgf/contrib/yquant/doc/yquant-doc.pdf
-2022/05/07 | 100487 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-2.9.tar.lzma
2022/05/06 | 952500 | systems/texlive/tlnet/archive/tex4ht.r63234.tar.xz
2022/05/06 | 9402 | macros/latex/contrib/mathsemantics/mathsemantics-manifolds.sty
+2022/05/06 | 880 | macros/latex/contrib/changebar/README
2022/05/06 | 86110 | macros/latex/contrib/prociagssymp.zip
2022/05/06 | 81222 | macros/latex/contrib/chinesechess/chinesechess.sty
2022/05/06 | 799776 | macros/latex/contrib/begingreek/begingreek.pdf
2022/05/06 | 7783147 | macros/latex/contrib/chinesechess.zip
2022/05/06 | 740338 | macros/latex/contrib/chinesechess/bg01.png
-2022/05/06 | 7365 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
2022/05/06 | 6528 | systems/texlive/tlnet/archive/bxtexlogo.r63231.tar.xz
2022/05/06 | 652512 | macros/latex/contrib/mathsemantics.zip
2022/05/06 | 633797 | macros/latex/contrib/mathsemantics/mathsemantics-documentation.pdf
2022/05/06 | 589636 | systems/texlive/tlnet/archive/l3kernel.source.r63232.tar.xz
+2022/05/06 | 585 | macros/latex/contrib/hvlogos/Changes
2022/05/06 | 5600 | macros/latex/contrib/chinesechess/README.md
+2022/05/06 | 5369 | macros/latex/contrib/hvlogos/doc/hvlogos-doc.tex
2022/05/06 | 529644 | systems/texlive/tlnet/archive/bxtexlogo.doc.r63231.tar.xz
2022/05/06 | 5256 | systems/texlive/tlnet/archive/luafindfont.r63233.tar.xz
2022/05/06 | 487 | macros/latex/contrib/mathsemantics/mathsemantics.sty
2022/05/06 | 4851 | macros/latex/contrib/mathsemantics/mathsemantics-semantic.sty
2022/05/06 | 45332 | macros/latex/contrib/mathsemantics/mathsemantics-documentation.tex
2022/05/06 | 4096186 | macros/latex/contrib/chinesechess/chinesechess.pdf
+2022/05/06 | 339 | macros/latex/contrib/changebar/CATALOG
2022/05/06 | 333 | macros/latex/contrib/mathsemantics/mathsemantics-commons.sty
2022/05/06 | 2978426 | macros/latex/contrib/chinesechess/bg02.png
2022/05/06 | 26881 | macros/latex/contrib/chinesechess/chinesechess.tex
+2022/05/06 | 2611 | macros/latex/contrib/changebar/changebar.ins
2022/05/06 | 2524 | macros/latex/contrib/mathsemantics/mathsemantics-names.sty
2022/05/06 | 251 | macros/latex/contrib/chinesechess/build.sh
2022/05/06 | 235192 | systems/texlive/tlnet/archive/erewhon-math.r63230.tar.xz
2022/05/06 | 21652 | macros/latex/contrib/begingreek/begingreek.dtx
2022/05/06 | 1978964 | systems/texlive/tlnet/archive/erewhon-math.doc.r63230.tar.xz
2022/05/06 | 1958 | macros/latex/contrib/mathsemantics/mathsemantics-abbreviations.sty
+2022/05/06 | 191590 | macros/latex/contrib/nicematrix/nicematrix-french.tex
2022/05/06 | 1797 | macros/latex/contrib/begingreek/README.txt
2022/05/06 | 171640 | systems/texlive/tlnet/archive/l3kernel.r63232.tar.xz
2022/05/06 | 15651 | macros/latex/contrib/mathsemantics/mathsemantics-syntax.sty
@@ -261,10 +424,10 @@
2022/05/06 | 1262040 | systems/texlive/tlnet/archive/tex4ht.source.r63234.tar.xz
2022/05/06 | 1239 | macros/latex/contrib/runcode/README
2022/05/06 | 11608988 | systems/texlive/tlnet/archive/l3kernel.doc.r63232.tar.xz
+2022/05/06 | 11191 | macros/latex/contrib/changebar/changebar.bug
2022/05/06 | 106320 | systems/texlive/tlnet/archive/luafindfont.doc.r63233.tar.xz
2022/05/05 | 984 | support/arara/scripts/rules/arara-rule-make.yaml
2022/05/05 | 950 | support/arara/scripts/rules/arara-rule-gnuplot.yaml
-2022/05/05 | 92302 | support/luafindfont.zip
2022/05/05 | 915 | support/arara/scripts/rules/arara-rule-move.yaml
2022/05/05 | 910 | support/arara/scripts/rules/arara-rule-xindex.yaml
2022/05/05 | 903 | macros/latex/contrib/prociagssymp/README.txt
@@ -272,9 +435,7 @@
2022/05/05 | 8444 | fonts/erewhon-math/fourier-otf.sty
2022/05/05 | 841 | support/arara/scripts/rules/arara-rule-tikzmake.yaml
2022/05/05 | 838 | support/arara/scripts/rules/arara-rule-biber.yaml
-2022/05/05 | 831 | support/luafindfont/CHANGELOG
2022/05/05 | 830 | support/arara/scripts/rules/arara-rule-nomencl.yaml
-2022/05/05 | 81978 | support/luafindfont/doc/luafindfont-doc.pdf
2022/05/05 | 812 | support/arara/scripts/rules/arara-rule-songidx.yaml
2022/05/05 | 810 | support/arara/scripts/rules/arara-rule-dvipdfmx.yaml
2022/05/05 | 80898 | macros/latex/contrib/prociagssymp/TestprocIAGssymp.pdf
@@ -282,7 +443,6 @@
2022/05/05 | 806 | support/arara/scripts/rules/arara-rule-dvipdfm.yaml
2022/05/05 | 797 | support/arara/scripts/rules/arara-rule-dvips.yaml
2022/05/05 | 788 | support/arara/scripts/rules/arara-rule-copy.yaml
-2022/05/05 | 7687096 | systems/texlive/tlnet/archive/chinesechess.doc.r63224.tar.xz
2022/05/05 | 7101 | support/arara/doc/htmlmanualtopdf.sh
2022/05/05 | 680 | support/arara/scripts/rules/arara-rule-sketch.yaml
2022/05/05 | 650 | support/arara/scripts/rules/arara-rule-spix.yaml
@@ -306,7 +466,6 @@
2022/05/05 | 552 | systems/texlive/tlnet/archive/collection-games.r63224.tar.xz
2022/05/05 | 546 | support/arara/scripts/rules/arara-rule-qpdf.yaml
2022/05/05 | 534541 | macros/latex/contrib/bxtexlogo.zip
-2022/05/05 | 5248 | support/luafindfont/man/luafindfont.1
2022/05/05 | 524840 | support/arara/doc/resources/firasans-italic.otf
2022/05/05 | 52445 | support/arara/doc/resources/arara-logo-with-text-bottom.svg
2022/05/05 | 522236 | support/arara/doc/resources/firasans-lightitalic.otf
@@ -314,18 +473,15 @@
2022/05/05 | 507828 | support/arara/doc/resources/firasans-regular.otf
2022/05/05 | 505308 | support/arara/doc/resources/firasans-light.otf
2022/05/05 | 4722 | support/arara/README.md
-2022/05/05 | 42709 | macros/latex/contrib/hvextern/doc/hvextern.tex
2022/05/05 | 4253 | support/arara/scripts/rules/arara-rule-context.yaml
2022/05/05 | 4076 | systems/texlive/tlnet/archive/luamathalign.r63226.tar.xz
2022/05/05 | 4074 | support/arara/scripts/rules/arara-rule-datatooltk.yaml
2022/05/05 | 393088 | systems/texlive/tlnet/archive/luamathalign.doc.r63226.tar.xz
2022/05/05 | 3843 | support/arara/doc/resources/gitlab-icon.svg
2022/05/05 | 381672 | fonts/erewhon-math/Erewhon-Math.otf
-2022/05/05 | 3752 | macros/latex/contrib/hvextern/doc/hvdoctools.sty
2022/05/05 | 3589 | macros/latex/contrib/mathsemantics/mathsemantics-documentation-local.sty
2022/05/05 | 3251 | support/arara/scripts/rules/arara-rule-pdfcrop.yaml
2022/05/05 | 320 | support/arara/scripts/rules/arara-rule-halt.yaml
-2022/05/05 | 319 | macros/latex/contrib/hvextern/Changes
2022/05/05 | 3069 | macros/latex/contrib/mathsemantics/Contributing.md
2022/05/05 | 2990 | support/arara/scripts/rules/arara-rule-indent.yaml
2022/05/05 | 285336 | support/arara/doc/resources/CascadiaMono-Regular.otf
@@ -348,13 +504,11 @@
2022/05/05 | 1883 | support/arara/scripts/rules/arara-rule-latexmk.yaml
2022/05/05 | 1847333 | fonts/erewhon-math/unimath-erewhon.pdf
2022/05/05 | 1836 | support/arara/scripts/rules/arara-rule-detex.yaml
-2022/05/05 | 18292 | macros/latex/contrib/hvextern/latex/hvextern.sty
2022/05/05 | 182829 | fonts/erewhon-math/Erewhon-Math.pdf
2022/05/05 | 17980696 | support/arara.zip
2022/05/05 | 17933996 | install/support/arara.tds.zip
2022/05/05 | 1722 | support/arara/doc/arara.1
2022/05/05 | 1721 | support/arara/scripts/rules/arara-rule-pythontex.yaml
-2022/05/05 | 17126 | support/luafindfont/scripts/luafindfont.lua
2022/05/05 | 1708 | support/arara/scripts/rules/arara-rule-texcount.yaml
2022/05/05 | 16976 | systems/texlive/tlnet/archive/pkuthss.r63225.tar.xz
2022/05/05 | 16947 | fonts/erewhon-math/unimath-erewhon.ltx
@@ -388,12 +542,9 @@
2022/05/05 | 1271 | support/arara/scripts/rules/arara-rule-csplain.yaml
2022/05/05 | 1267 | support/arara/scripts/rules/arara-rule-pdftex.yaml
2022/05/05 | 1267 | support/arara/scripts/rules/arara-rule-luatex.yaml
-2022/05/05 | 1195275 | macros/latex/contrib/hvextern/doc/hvextern.pdf
2022/05/05 | 1193210 | support/arara/doc/arara-manual.pdf
2022/05/05 | 1165 | support/arara/scripts/rules/arara-rule-uptex.yaml
2022/05/05 | 1161 | support/arara/scripts/rules/arara-rule-ptex.yaml
-2022/05/05 | 11552 | systems/texlive/tlnet/archive/chinesechess.r63224.tar.xz
-2022/05/05 | 1149638 | macros/latex/contrib/hvextern.zip
2022/05/05 | 1119483 | support/TeX4ht/source/tex4ht-4ht.tex
2022/05/05 | 1109 | support/arara/scripts/rules/arara-rule-xdvipdfmx.yaml
2022/05/05 | 1105 | support/arara/scripts/rules/arara-rule-animate.yaml
@@ -401,7 +552,6 @@
2022/05/05 | 1086 | macros/latex/contrib/mathsemantics/LICENSE
2022/05/05 | 1061 | support/arara/scripts/rules/arara-rule-etex.yaml
2022/05/05 | 1049 | support/arara/scripts/rules/arara-rule-tex.yaml
-2022/05/05 | 10062 | support/luafindfont/doc/luafindfont-doc.tex
2022/05/04 | 9999 | macros/latex/contrib/l3kernel/l3news10.tex
2022/05/04 | 9826 | systems/win32/miktex/tm/packages/functional.tar.lzma
2022/05/04 | 9771 | systems/win32/miktex/tm/packages/minimalist.tar.lzma
@@ -502,7 +652,6 @@
2022/05/04 | 51059 | macros/latex/contrib/l3kernel/l3fp-extended.dtx
2022/05/04 | 5066 | systems/win32/miktex/tm/packages/hvextern.tar.lzma
2022/05/04 | 5062 | systems/win32/miktex/tm/packages/unisc__source.tar.lzma
-2022/05/04 | 5048032 | systems/texlive/tlnet/archive/arara.doc.r63220.tar.xz
2022/05/04 | 5044144 | systems/win32/miktex/tm/packages/arara__doc.tar.lzma
2022/05/04 | 4977 | macros/latex/contrib/l3kernel/l3news07.tex
2022/05/04 | 4937 | macros/latex/contrib/l3kernel/l3news01.tex
@@ -671,14 +820,12 @@
2022/05/04 | 11974 | systems/win32/miktex/tm/packages/hvfloat.tar.lzma
2022/05/04 | 11884 | macros/latex/contrib/l3kernel/l3styleguide.tex
2022/05/04 | 11781 | macros/latex/contrib/l3kernel/l3fparray.dtx
-2022/05/04 | 11779516 | systems/texlive/tlnet/archive/arara.r63220.tar.xz
2022/05/04 | 11752432 | systems/win32/miktex/tm/packages/arara.tar.lzma
2022/05/04 | 1170 | macros/latex/contrib/pkuthss/doc/readme/chap/pkuthss-encl1.tex
2022/05/04 | 116556 | systems/win32/miktex/tm/packages/siunitx__source.tar.lzma
2022/05/04 | 116396 | systems/texlive/tlnet/archive/siunitx.source.r63218.tar.xz
2022/05/04 | 115 | macros/latex/contrib/pkuthss/doc/example/ctexopts.cfg
2022/05/04 | 115920 | systems/win32/miktex/tm/packages/arara__source.tar.lzma
-2022/05/04 | 115420 | systems/texlive/tlnet/archive/arara.source.r63220.tar.xz
2022/05/04 | 114588 | macros/latex/contrib/l3kernel/l3news04.pdf
2022/05/04 | 1144549 | systems/win32/miktex/tm/packages/tuda-ci__doc.tar.lzma
2022/05/04 | 1143 | macros/latex/contrib/pkuthss/doc/readme/chap/pkuthss-concl.tex
@@ -703,22 +850,15 @@
2022/05/03 | 9759 | macros/latex/contrib/siunitx/siunitx-symbol.dtx
2022/05/03 | 8798 | macros/latex/contrib/siunitx/siunitx-command.dtx
2022/05/03 | 866312 | systems/texlive/tlnet/archive/fontawesome5.r63207.tar.xz
-2022/05/03 | 8288 | systems/texlive/tlnet/archive/proflycee.r63209.tar.xz
2022/05/03 | 746624 | systems/texlive/tlnet/archive/fontawesome5.doc.r63207.tar.xz
2022/05/03 | 67518 | macros/latex/contrib/siunitx/CHANGELOG.md
2022/05/03 | 663039 | macros/latex/contrib/siunitx/siunitx.pdf
-2022/05/03 | 6572 | systems/texlive/tlnet/archive/mgltex.doc.r63213.tar.xz
2022/05/03 | 6524 | macros/latex/contrib/bxtexlogo/README.md
-2022/05/03 | 6340 | systems/texlive/tlnet/archive/mgltex.r63213.tar.xz
2022/05/03 | 617928 | macros/latex/contrib/siunitx/siunitx-code.pdf
2022/05/03 | 5481 | macros/latex/contrib/siunitx/siunitx-locale.dtx
-2022/05/03 | 540220 | systems/texlive/tlnet/archive/proflycee.doc.r63209.tar.xz
2022/05/03 | 537334 | macros/latex/contrib/bxtexlogo/bxtexlogo-sample.pdf
2022/05/03 | 50881 | macros/latex/contrib/siunitx/siunitx-table.dtx
2022/05/03 | 4748 | macros/latex/contrib/siunitx/siunitx-abbreviations.cfg
-2022/05/03 | 463660 | macros/xetex/latex/xduts/xidian-logo.pdf
-2022/05/03 | 416455 | macros/xetex/latex/xduts/xidian-text.pdf
-2022/05/03 | 395564 | macros/xetex/latex/xduts/xduts.pdf
2022/05/03 | 37954 | macros/latex/contrib/siunitx/siunitx-complex.dtx
2022/05/03 | 3764 | macros/latex/contrib/bxtexlogo/bxtexlogo-sample.tex
2022/05/03 | 3687 | macros/latex/contrib/siunitx/siunitx.ins
@@ -726,8 +866,6 @@
2022/05/03 | 33799 | macros/latex/contrib/siunitx/siunitx-compound.dtx
2022/05/03 | 32341 | macros/latex/contrib/siunitx/siunitx-emulation.dtx
2022/05/03 | 31738 | macros/latex/contrib/siunitx/siunitx-version-1.cfg
-2022/05/03 | 31244 | systems/texlive/tlnet/archive/mgltex.source.r63213.tar.xz
-2022/05/03 | 2884 | macros/xetex/latex/xduts/README.md
2022/05/03 | 2883 | macros/latex/contrib/siunitx/siunitx-binary.dtx
2022/05/03 | 273398 | macros/latex/contrib/siunitx/siunitx-v2.sty
2022/05/03 | 2620 | macros/latex/contrib/siunitx/siunitx-code.tex
@@ -742,9 +880,6 @@
2022/05/03 | 1510118 | install/macros/latex/contrib/siunitx.tds.zip
2022/05/03 | 1466151 | macros/latex/contrib/siunitx.zip
2022/05/03 | 145363 | macros/latex/contrib/siunitx/siunitx-number.dtx
-2022/05/03 | 1293698 | macros/xetex/latex/xduts.zip
-2022/05/03 | 115279 | macros/xetex/latex/xduts/xduts.dtx
-2022/05/03 | 1135 | macros/xetex/latex/xduts/xduts.ins
2022/05/03 | 1091 | macros/latex/contrib/bxtexlogo/LICENSE
2022/05/03 | 10812 | macros/latex/contrib/siunitx/siunitx-abbreviation.dtx
2022/05/03 | 10639 | macros/latex/contrib/runcode/runcode.tex
@@ -804,37 +939,3 @@
2022/05/02 | 1080 | fonts/fontawesome5/tfm/fa5free3regular.tfm
2022/05/02 | 107808 | fonts/fontawesome5/tex/fontawesome5-mapping.def
2022/05/02 | 1075 | fonts/fontawesome5/tex/tufontawesomefree.fd
-2022/05/01 | 932 | support/luafindfont/README.md
-2022/05/01 | 890192 | systems/texlive/tlnet/archive/hvextern.doc.r63187.tar.xz
-2022/05/01 | 860 | systems/texlive/tlnet/archive/collection-langenglish.r63184.tar.xz
-2022/05/01 | 844824 | systems/texlive/tlnet/archive/babel.doc.r63189.tar.xz
-2022/05/01 | 802025 | info/install-latex-guide-zh-cn.zip
-2022/05/01 | 761151 | info/install-latex-guide-zh-cn/install-latex-guide-zh-cn.pdf
-2022/05/01 | 7400 | systems/texlive/tlnet/archive/bxpdfver.r63185.tar.xz
-2022/05/01 | 699432 | systems/texlive/tlnet/archive/babel.source.r63189.tar.xz
-2022/05/01 | 69796 | macros/latex/contrib/hvfloat/latex/hvfloat.sty
-2022/05/01 | 6556 | systems/texlive/tlnet/archive/thermodynamics.r63188.tar.xz
-2022/05/01 | 5780 | systems/texlive/tlnet/archive/elteikthesis.r63186.tar.xz
-2022/05/01 | 5039170 | macros/latex/contrib/hvfloat/doc/hvfloat.pdf
-2022/05/01 | 4912 | systems/texlive/tlnet/archive/bxpdfver.doc.r63185.tar.xz
-2022/05/01 | 4824 | systems/texlive/tlnet/archive/hvextern.r63187.tar.xz
-2022/05/01 | 4338 | support/lacheck/ChangeLog
-2022/05/01 | 4066 | macros/latex/contrib/hvfloat/Changes
-2022/05/01 | 368 | systems/texlive/tlnet/archive/components.r63184.tar.xz
-2022/05/01 | 3315 | macros/unicodetex/latex/njuthesis/njuthesis.ins
-2022/05/01 | 3178 | support/lacheck/test-def.tex
-2022/05/01 | 28184 | support/lacheck/lacheck.l
-2022/05/01 | 28040 | systems/texlive/tlnet/archive/thermodynamics.source.r63188.tar.xz
-2022/05/01 | 238248 | macros/unicodetex/latex/njuthesis/njuthesis.dtx
-2022/05/01 | 202180 | systems/texlive/tlnet/archive/thermodynamics.doc.r63188.tar.xz
-2022/05/01 | 19105 | macros/unicodetex/latex/njuthesis/LICENSE
-2022/05/01 | 184320 | systems/texlive/tlnet/archive/babel.r63189.tar.xz
-2022/05/01 | 172489 | support/lacheck/lacheck.c
-2022/05/01 | 14343080 | macros/latex/contrib/hvfloat.zip
-2022/05/01 | 13399 | support/TeX4ht/source/tex4ht-options.tex
-2022/05/01 | 1321579 | macros/unicodetex/latex/njuthesis.zip
-2022/05/01 | 1261937 | macros/unicodetex/latex/njuthesis/njuthesis.pdf
-2022/05/01 | 120636 | macros/latex/contrib/hvfloat/doc/hvfloat.tex
-2022/05/01 | 1107648 | systems/texlive/tlnet/archive/elteikthesis.doc.r63186.tar.xz
-2022/05/01 | 11036 | systems/texlive/tlnet/archive/components.doc.r63184.tar.xz
-2022/05/01 | 1057 | macros/unicodetex/latex/njuthesis/README.md
diff --git a/graphics/mcf2graph/CHANGELOG b/graphics/mcf2graph/CHANGELOG
index aefa94b116..00015d74f5 100644
--- a/graphics/mcf2graph/CHANGELOG
+++ b/graphics/mcf2graph/CHANGELOG
@@ -1,6 +1,11 @@
*******************************************************************************
- Changelog of mcf2graph software package by Akira Yamaji 2022-03-27
+ Changelog of mcf2graph software package by Akira Yamaji 2022-05-08
*******************************************************************************
+[ver. 4.84 / 2022-05-08]
+ -fix bug in atom drawing
+ -improve report output
+ -update mcf_library.mcf
+
[ver. 4.83 / 2022-03-27]
-fix bug in bond check
-change fuction name
diff --git a/graphics/mcf2graph/README b/graphics/mcf2graph/README
index 61465c30aa..d14681dc17 100644
--- a/graphics/mcf2graph/README
+++ b/graphics/mcf2graph/README
@@ -1,7 +1,7 @@
********************************************************************************
mcf2graph : Convert Molecular Coding Format to graphics with MetaPost
Author : Akira Yamaji
- version : 4.83 2022-03-27
+ version : 4.84 2022-05-08
E-mail : mcf2graph@gmail.com
Located at : http://www.ctan.org/pkg/mcf2graph
********************************************************************************
@@ -34,21 +34,21 @@
3. How to use mcf2graph with MetaPost
Minimum requirement to use mcf2graph : mpost.exe,mpost.dll,mpost.mp,plain.mp
- ( 1) >mpost FILENAME => output eps(.mps) file
- ( 2) >mpost -s ahangle=1 FILENAME => output png file (600dpi)
- ( 3) >mpost -s ahangle=11 FILENAME => output png file (1200dpi)
- ( 4) >mpost -s ahangle=2 FILENAME => output svg file
- ( 5) >mpost -s ahangle=3 FILENAME => output eps(.eps) file
- ( 6) >mpost -s ahlength=1 FILENAME => output information-aux file(for tex)
- ( 7) >mpost -s ahlength=2 FILENAME => output information-aux file
+ ( 1) >mpost filename => output eps(.mps) file
+ ( 2) >mpost -s ahangle=1 filename => output png file (600dpi)
+ ( 3) >mpost -s ahangle=11 filename => output png file (1200dpi)
+ ( 4) >mpost -s ahangle=2 filename => output svg file
+ ( 5) >mpost -s ahangle=3 filename => output eps(.eps) file
+ ( 6) >mpost -s ahlength=1 filename => output information-aux file(for tex)
+ ( 7) >mpost -s ahlength=2 filename => output information-aux file
(for spread sheet)
- ( 8) >mpost -s ahlength=3 FILENAME => output library-aux file
- ( 9) >mpost -s ahlength=5 FILENAME => output mol file(V2000)
- (10) >mpost -s ahlength=6 FILENAME => output mol file(V3000)
- (11) >mpost -s ahlength=7 FILENAME => output report file
+ ( 8) >mpost -s ahlength=3 filename => output library-aux file
+ ( 9) >mpost -s ahlength=5 filename => output mol file(V2000)
+ (10) >mpost -s ahlength=6 filename => output mol file(V3000)
+ (11) >mpost -s ahlength=7 filename => output report file
4. License
- mcf2graph ver 4.83 Copyright (c) 2013-2022 Akira Yamaji
+ mcf2graph ver 4.84 Copyright (c) 2013-2022 Akira Yamaji
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
diff --git a/graphics/mcf2graph/mcf2graph.mp b/graphics/mcf2graph/mcf2graph.mp
index 10c14d4cec..75ae74cf07 100644
--- a/graphics/mcf2graph/mcf2graph.mp
+++ b/graphics/mcf2graph/mcf2graph.mp
@@ -1,5 +1,5 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% mcf2graph ver 4.83 Copyright (c) 2013-2022 Akira Yamaji
+% mcf2graph ver 4.84 Copyright (c) 2013-2022 Akira Yamaji
%
% Permission is hereby granted, free of charge, to any person obtaining a copy of this software
% and associated documentation files (the "Software"), to deal in the Software without restriction,
@@ -33,7 +33,7 @@
% Set output MOL file (V3000) : mpost -s ahlength=6 FILENAME
% Set output report : mpost -s ahlength=7 FILENAME
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-message "* This is mcf2graph ver 4.83 2022.03.27";
+message "* This is mcf2graph ver 4.84 2022.05.08";
tracingstats:=1; prologues:=3; warningcheck:=0;
%-------------------------------------------------------------------------------------------------
numeric save_num[],parts_com[][],parts_par[][],parts_cnt[],tbl_atom[],tbl_group[][],tbl_atom_wt[],
@@ -157,23 +157,19 @@ def parameter_list=
lonepairspace,offset_atom,offset_wedge,max_blength,offset_hash_gap,offset_bond_gap,
thickness_frame,offset_thickness,numbering_start,numbering_end,defaultsize,defaultscale,
labeloffset,mangle,blength,fsize,fmargin,msize,mposition,defaultfont,atomfont,dottedline_gap,
- Me,Et,CH3,NH,NH2,NO,NO2,OH,CHO,COOH,CN,SH,!CH3,!NH2,!NO2,!OH,!CHO,!COOH,!CN,!SH
-enddef;
+ Me,Et,CH3,NH,NH2,NO,NO2,OH,CHO,COOH,CN,SH,!CH3,!NH2,!NO2,!OH,!CHO,!COOH,!CN,!SH enddef;
%--------------------------------------------------------------------------------------------------
def init_par(text t)=
nA:=nB:=nC:=0;
for list=t: if numeric list: save_num[incr nA]:=list;
ef pair list: save_pair[incr nB]:=list;
- ef string list: save_str[incr nC]:=list; fi
- endfor
-enddef;
+ ef string list: save_str[incr nC]:=list; fi endfor enddef;
%--------------------------------------------------------------------------------------------------
def store_par(text t)=
nA:=nB:=nC:=0;
for list=t: if numeric list: if save_num[incr nA]<>list: save_num[nA]:=list; fi
ef pair list: if save_pair[incr nB]<>list: save_pair[nB]:=list; fi
- ef string list: if save_str[incr nC]<>list: save_str[nC]:=list; fi fi
- endfor
+ ef string list: if save_str[incr nC]<>list: save_str[nC]:=list; fi fi endfor
enddef;
%--------------------------------------------------------------------------------------------------
def restore_par(text t)=
@@ -191,12 +187,12 @@ def beginfigm(text s)=
hideH,lineB,sB,eB,angB,angA,lenB,angX,numS,sumA,bond_num,wdM,htM,chargeA,addA,add_rot,
file_input,file_output,cal_FM,cal_MW,cal_MI,inf_Cat,inf_NO,inf_EN,inf_JN,inf_FM,inf_CAS,
inf_USE,inf_EXA,inf_EXB,inf_MW,mol_pic,sC,sI,sS,sT,sV,color_list,unit_cnt,f_end,semic_cnt,
- f_match,var_n,tag_a,var_a,at_semic,at_comma;
+ f_match,var_n,tag_a,var_a,at_char,arg_s;
numeric mc_indent[],hideH[],lineB[],sB[],eB[],angB[],angA[],lenB[],angX[],strA[],sumA[],
- bond_num[],wdM[],htM[],chargeA[],addA[],add_rot[],at_semic[],at_comma[];
+ bond_num[],wdM[],htM[],chargeA[],addA[],add_rot[],at_char[];
pair posA[],posM[][];
- string info_s[],mc[],tag_a[],var_a[],mc,filter_s,file_input,file_output,cal_FM,cal_MW,cal_MI,
- inf_Cat,inf_NO,inf_EN,inf_JN,inf_FM,inf_CAS,inf_USE,inf_EXA,inf_EXB,inf_MW,
+ string info_s[],mc[],tag_a[],var_a[],arg_s[],mc,filter_s,file_input,file_output,cal_FM,cal_MW,
+ cal_MI,inf_Cat,inf_NO,inf_EN,inf_JN,inf_FM,inf_CAS,inf_USE,inf_EXA,inf_EXB,inf_MW,
sC,sI,sS,sT,sV;
picture mol_pic[];
color color_list[];
@@ -209,7 +205,7 @@ def beginfigm(text s)=
mc:=temps:=cal_MW:=cal_MI:=cal_FM:=filter_s:=""; file_input:=default_library;
%------------------------------------------------------------------------------------------------
parts_num:=parts_usr_start; parts_int:=parts_int_start;
- fig_num:=fig_num+1; f_ext:=cntM:=mc_row:=info_cnt:=f_EOF:=0;
+ fig_num:=fig_num+1; f_ext:=cntM:=mc_row:=info_cnt:=f_EOF:=at_char[0]:=0;
%------------------------------------------------------------------------------------------------
for list=s:
at_colon:=scan_char(":",list,0,1);
@@ -254,7 +250,7 @@ def endfigm=
fi
%----------------------------------------------------------------------------------------
if scan_bit(sw_frame,Outside): draw_frame((0,0),fig_wd,fig_ht,thickness_frame);
- else: draw_corner((0,0),fig_wd,fig_ht,0.05);
+ else: draw_corner((0,0),fig_wd,fig_ht,0.01);
fi
if scan_bit(sw_frame,Inside):
draw_frame((margin_lr,margin_tb),fig_wd-2margin_lr,fig_ht-2margin_tb,thickness_frame);
@@ -320,11 +316,9 @@ def pickup_data_unit(expr t,v,f)=
endfor
fi
else:
- semic_cnt:=split_semic(sS); inf_num:=semic_cnt+1;
+ inf_num:=split_char(sS,";")+1;
for i=1 upto inf_num:
- if i<=semic_cnt: sI:=substring(at_semic[i-1],at_semic[i]-1) of sS;
- else: sI:=substring(at_semic[semic_cnt],length(sS)) of sS; fi
- nA:=scan_char(":",sI,0,1);
+ sI:=arg_s[i]; nA:=scan_char(":",sI,0,1);
tag_a[i]:=substring(0,nA-1) of sI; var_a[i]:=substring(nA,length(sI)) of sI;
if t=tag_a[i]: if v=var_a[i]: f_match:=1; fi fi
endfor
@@ -333,14 +327,6 @@ def pickup_data_unit(expr t,v,f)=
endfor
if f=1: closefrom file_input; fi
enddef;
-%--------------------------------------------------------------------------------------------------
-vardef scan_bit(expr n,b)= if b>=1: odd(floor(n/b)) else: odd(floor((frac n)/b)) fi enddef;
-vardef scan_char(expr c,s,d,n)=
- nN:=0;
- if d=0: for i=n upto length(s): if subc(i,s)=c: nN:=i; fi exitif nN>0; endfor
- ef d=1: for i=n upto length(s): if subc(i,s)<>c: nN:=i; fi exitif nN>0; endfor
- ef d=-1: for i=length(s) downto n: if subc(i,s)<>c: nN:=i; fi exitif nN>0; endfor fi nN
-enddef;
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
vardef '(text t)= parts_num:=parts_num+1; read_mcf(parts_num)(t); parts_num enddef;
vardef read_id(text t)= parts_num:=parts_num+1;
@@ -357,11 +343,9 @@ tertiarydef a op_lth b = if known b:: (_tmp_env,b),a else:: _nop,a fi enddef;
tertiarydef a op_bqu b = if known b:: (_tmp_len,b),a else:: _nop,a fi enddef;
def rot_angle primary n = (_rot_ang,n) enddef; def cyc_atom primary n = (_cyc,n) enddef;
def jump_atom_abs primary a =
- if numeric a:: (_jp_atom,$a) ef pair a:: (_jp_atom,$1),<$0,angle(a)~0`length(a),<$0 fi
-enddef;
+ if numeric a:: (_jp_atom,$a) ef pair a:: (_jp_atom,$1),<$0,angle(a)~0`length(a),<$0 fi enddef;
def jump_atom primary a =
- if numeric a:: (_jp_atom,a) ef pair a:: <$0,angle(a)~0`length(a),<$0 fi
-enddef;
+ if numeric a:: (_jp_atom,a) ef pair a:: <$0,angle(a)~0`length(a),<$0 fi enddef;
def chg_length primary n = (_com,_len_s),(_chg_len,n) enddef;
def group_si secondary n = if known n:: (_group_si,n) else:: _nop fi enddef;
def group_dm secondary n = if known n:: (_group_dm,n) else:: _nop fi enddef;
@@ -433,8 +417,7 @@ enddef;
def fuse_ring(expr a,b) =
CP(_jp_bond,a) CP(_rot_ang,180) CP(_get_len,a) CP(_com,_len_s) CP(_chg_len,_ring_len)
for i==1 upto b-2:: CP(_mk_bond,360 DIV b) endfor
- CP(_com,_len_e) if a<=0:: CP(_cyc_eB,a-b+2) else:: CP(_cyc_eB,a) fi
-enddef;
+ CP(_com,_len_e) if a<=0:: CP(_cyc_eB,a-b+2) else:: CP(_cyc_eB,a) fi enddef;
%-------------------------------------------------------------------------------------------------
def fuse_ring_bonds(expr a,b,c) =
CP(_jp_bond,xpart(a)) CP(_rot_ang,180) CP(_com,_len_s)
@@ -452,8 +435,7 @@ def fuse_ring_size(expr a,b,c) =
ef b==7:: CP(_mk_bond,360 DIV 7-(c-8))
for i==1 upto 4:: CP(_mk_bond,360 DIV 7+((c-8) DIV 2.5)) endfor
ef b==8:: CP(_mk_bond,45-(c-8)) for i==1 upto 5:: CP(_mk_bond,45+((c-8) DIV 3)) endfor fi
- CP(_com,_len_e) if a<=0:: CP(_cyc_eB,a-b+2) else:: CP(_cyc_eB,a) fi
-enddef;
+ CP(_com,_len_e) if a<=0:: CP(_cyc_eB,a-b+2) else:: CP(_cyc_eB,a) fi enddef;
%=================================================================================================
vardef change_bond(expr a,b) =
if known b:: parts_int:=parts_int+1; nC:=0;
@@ -465,12 +447,9 @@ vardef change_bond(expr a,b) =
if frac parts_par[a][i]==0:: CA(_set_line,b,parts_par[a][i])
ef b==dl:: CA(_set_line,dr,floor parts_par[a][i])
ef b==dr:: CA(_set_line,dl,floor parts_par[a][i])
- else:: CA(_set_line,b,floor parts_par[a][i])
- fi
- fi
+ else:: CA(_set_line,b,floor parts_par[a][i]) fi fi
endfor
- else:: CP(_set_adr,a) CP(_set_line,b)
- fi
+ else:: CP(_set_adr,a) CP(_set_line,b) fi
elseif (b>=?3)and(b<=?8[15])::
if numeric a::
if a>=parts_int_start::
@@ -507,10 +486,7 @@ vardef change_bond(expr a,b) =
ef b==Ph1:: fuse_ring_bonds((parts_com[a][i],parts_par[a][i]),6,4)
CA(_set_line,dl,-1) CA(_set_line,dl,-3)
ef b==Ph2:: fuse_ring_bonds((parts_com[a][i],parts_par[a][i]),6,4)
- CA(_set_line,dl,-2) CA(_set_line,dl,-4)
- fi
- fi
- endfor
+ CA(_set_line,dl,-2) CA(_set_line,dl,-4) fi fi endfor
else::
if b==Ph1:: fuse_ring(a,6) CA(_set_line,dl,-2) CA(_set_line,dl,-4)
ef b==Ph2:: fuse_ring(a,6) CA(_set_line,dl,-1) CA(_set_line,dl,-3) CA(_set_line,dl,-5)
@@ -527,13 +503,9 @@ vardef change_bond(expr a,b) =
ef b==?6[2]:: fuse_ring_bonds(a,6,2)
ef b==?5[2]:: fuse_ring_bonds(a,5,2)
ef b==Ph1:: fuse_ring_bonds(a,6,4) CA(_set_line,dl,-1) CA(_set_line,dl,-3)
- ef b==Ph2:: fuse_ring_bonds(a,6,4) CA(_set_line,dl,-2) CA(_set_line,dl,-4)
- fi
- fi
- fi
+ ef b==Ph2:: fuse_ring_bonds(a,6,4) CA(_set_line,dl,-2) CA(_set_line,dl,-4) fi fi fi
elseif color b:: color_list[incr cntC]:=b; CA(_set_colorB,cntC,a) fi
- parts_cnt[parts_int]:=nC; parts_int
- fi
+ parts_cnt[parts_int]:=nC; parts_int fi
enddef;
%-------------------------------------------------------------------------------------------------
vardef change_atom(expr a,b)=
@@ -550,8 +522,7 @@ vardef change_atom(expr a,b)=
CP(_tmp_rot,-35) CA(_group_dm,O,a) CP(_com,_group_e)
ef b==SO:: CA(_chg_atom,S,a) CP(_com,_group_s) CA(_group_dm,O,a) CP(_com,_group_e)
ef b==n_:: CP(_com,_group_s) CP(_set_add,a_minus) CP(_chg_add,a) CP(_com,_group_e)
- ef b==p_:: CP(_com,_group_s) CP(_set_add,a_plus) CP(_chg_add,a) CP(_com,_group_e)
- fi
+ ef b==p_:: CP(_com,_group_s) CP(_set_add,a_plus) CP(_chg_add,a) CP(_com,_group_e) fi
ef pair b::
CP(_com,_group_s)
if a>=parts_emb_start::
@@ -566,20 +537,16 @@ vardef change_atom(expr a,b)=
else:: CA(xpart(b),ypart(b),a) fi
CP(_com,_group_e)
ef color b:: color_list[incr cntC]:=b; CA(_set_colorA,cntC,a) fi
- parts_cnt[parts_int]:=nC; parts_int
- fi
+ parts_cnt[parts_int]:=nC; parts_int fi
enddef;
%-------------------------------------------------------------------------------------------------
def com_par(expr c,p)= parts_com[parts_int][incr nC]:=c; parts_par[parts_int][nC]:=p; enddef;
def com_par_adr(expr c,p,a)=
if a>=parts_emb_start::
for i==1 upto parts_cnt[a]::
- if parts_com[a][i]==_numeric:: com_par(_set_adr,parts_par[a][i]) com_par(c,p)
- else:: com_par(parts_com[a][i],parts_par[a][i]) fi
- endfor
- else:: com_par(_set_adr,a) com_par(c,p)
- fi
-enddef;
+ if parts_com[a][i]==_numeric:: com_par(_set_adr,parts_par[a][i]) com_par(c,p)
+ else:: com_par(parts_com[a][i],parts_par[a][i]) fi endfor
+ else:: com_par(_set_adr,a) com_par(c,p) fi enddef;
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
def ext_setup=
pickup pencircle scaled ext_defaultline;
@@ -601,13 +568,11 @@ def add_to_molecule(text t)=
lonepairdiam:=0.3aw; lonepairspace:=.7aw; circlediam:=.6aw; circlepen:=.2;
for i=1 upto cntA:
A[i]:=posA[i]; A[i]ang:=angX[i]; A[i]up:=dir(angX[i]);
- A[i]left:=dir(angX[i]+90); A[i]right:=dir(angX[i]-90); A[i]down:=dir(angX[i]+180);
- endfor
+ A[i]left:=dir(angX[i]+90); A[i]right:=dir(angX[i]-90); A[i]down:=dir(angX[i]+180); endfor
for i=1 upto cntB:
B[i]s:=posA[sB[i]]; B[i]e:=posA[eB[i]]; B[i]m:=0.5[B[i]s,B[i]e]; B[i]:=B[i]s--B[i]e;
B[i]ang:=angB[i]; B[i]up:=dir(angB[i]);
- B[i]down:=dir(angB[i]+180); B[i]left:=dir(angB[i]+90); B[i]right:=dir(angB[i]-90);
- endfor
+ B[i]down:=dir(angB[i]+180); B[i]left:=dir(angB[i]+90); B[i]right:=dir(angB[i]-90); endfor
t addto mol_pic[cntM] also currentpicture; clearit;
endgroup;
enddef;
@@ -624,24 +589,19 @@ def ext_to_fig(text t)=
endgroup;
enddef;
%-------------------------------------------------------------------------------------------------
-vardef circled_plus_add=
- nA:=circlediam; nB:=circlepen;
+vardef circled_plus_add= nA:=circlediam; nB:=circlepen;
image(draw fullcircle scaled nA wpcs nB;
- draw (-.5nA,0)--(.5nA,0) wpcs nB; draw (0,-.5nA)--(0,.5nA) wpcs nB;)
-enddef;
+ draw (-.5nA,0)--(.5nA,0) wpcs nB; draw (0,-.5nA)--(0,.5nA) wpcs nB;) enddef;
%-------------------------------------------------------------------------------------------------
-vardef circled_minus_add=
- nA:=circlediam; nB:=circlepen;
- image(draw fullcircle scaled nA wpcs nB; draw (-.5nA,0)--(.5nA,0) wpcs nB;)
-enddef;
+vardef circled_minus_add= nA:=circlediam; nB:=circlepen;
+ image(draw fullcircle scaled nA wpcs nB; draw (-.5nA,0)--(.5nA,0) wpcs nB;) enddef;
%-------------------------------------------------------------------------------------------------
vardef lone_pair_add expr n=
image(draw (0,0) wpcs lonepairdiam; draw ((0,lonepairspace) rotated n) wpcs lonepairdiam;)
enddef;
%=================================================================================================
def MCat(expr w,h)(text t)=
- save_mposition:=mposition; mposition:=(w,h); MC(t) mposition:=save_mposition;
-enddef;
+ save_mposition:=mposition; mposition:=(w,h); MC(t) mposition:=save_mposition; enddef;
%-------------------------------------------------------------------------------------------------
def MC(text t)=
begingroup
@@ -681,8 +641,7 @@ def MC(text t)=
else: factor:=((fig_ht-2margin_tb)*ypart(msize))/mol_ht; fi
else:
if xpart(msize)>1: factor:=xpart(msize)/mol_wd;
- else: factor:=((fig_wd-2margin_lr)*xpart(msize))/mol_wd; fi
- fi
+ else: factor:=((fig_wd-2margin_lr)*xpart(msize))/mol_wd; fi fi
exitif (factor>=1-eps)and(factor<=1+eps); blen:=blen*factor; proc_size_setup;
endfor
if blen>max_blength: blen:=max_blength; proc_size_setup; proc_skeleton(0); proc_scaling; fi
@@ -692,9 +651,7 @@ def MC(text t)=
if addA[i]<>0:
tempc:=char(addA[i]);
if tempc="+": chargeA[i]:=1; ef tempc="-": chargeA[i]:=-1; else: chargeA[i]:=0; fi
- else: chargeA[i]:=0;
- fi
- endfor
+ else: chargeA[i]:=0; fi endfor
%===============================================================================================
if scan_bit(sw_output,Fig):
%-draw atom-----------------------------------------------------------------------------------
@@ -702,10 +659,7 @@ def MC(text t)=
%-draw add to atom----------------------------------------------------------------------------
if (not scan_bit(sw_numbering,Atom))and(not scan_bit(sw_numbering,Bond)):
for i=1 upto cntA:
- if addA[i]<>0:
- nA:=angX[i]+add_rot[i]; nC:=nA mod 90;
- if strA[i]=0: nB:=.5atom_wd; else: nB:=atom_wd; fi
- draw_char(char(addA[i]),sfrt(posA[i],nB,nA)); fi
+ if addA[i]<>0: draw_char(char(addA[i]),sfrt(posA[i],atom_wd,angX[i]+add_rot[i])); fi
endfor
fi
%-draw bond-----------------------------------------------------------------------------------
@@ -772,9 +726,8 @@ def add_group=
enddef;
%-------------------------------------------------------------------------------------------------
def store_group(expr a,b)=
- group_com[group_num][incr group_cnt[group_num]]:=a;
- group_par[group_num][group_cnt[group_num]]:=b;
-enddef;
+ group_com[group_num][incr group_cnt[group_num]]:=a;
+ group_par[group_num][group_cnt[group_num]]:=b; enddef;
%=================================================================================================
def read_group(expr a)(expr n)=
save_group_cnt:=group_num; save_cntD:=parts_cnt[a];
@@ -785,25 +738,21 @@ def read_group(expr a)(expr n)=
endfor
endfor
proc_bond_atom(a)(save_cntD+1);
- if group_num>save_group_cnt: read_group(a)(save_group_cnt+1); fi
-enddef;
+ if group_num>save_group_cnt: read_group(a)(save_group_cnt+1); fi enddef;
%=================================================================================================
def draw_frame(expr p,x,y,n)=
- draw ((0,0)--(x,0)--(x,y)--(0,y)--cycle) shifted p withpen pensquare scaled n;
-enddef;
+ draw ((0,0)--(x,0)--(x,y)--(0,y)--cycle) shifted p withpen pensquare scaled n; enddef;
%-------------------------------------------------------------------------------------------------
def draw_corner(expr p,x,y,n)=
draw(0,0) shifted p wpcs n; draw(x,0) shifted p wpcs n;
- draw(x,y) shifted p wpcs n; draw(0,y) shifted p wpcs n;
-enddef;
+ draw(x,y) shifted p wpcs n; draw(0,y) shifted p wpcs n; enddef;
%-------------------------------------------------------------------------------------------------
def proc_size_setup=
atom_wd:= blen*ratio_atom_bond+offset_atom;
wedge_wd:= blen*ratio_wedge_bond+offset_wedge;
hash_gap:= blen*ratio_hashgap_bond+offset_hash_gap;
bondgap:= blen*ratio_bondgap_bond+offset_bond_gap;
- bond_pen_wd:= blen*ratio_thickness_bond+offset_thickness;
-enddef;
+ bond_pen_wd:= blen*ratio_thickness_bond+offset_thickness; enddef;
%-------------------------------------------------------------------------------------------------
def proc_scaling=
minX:=minY:=4095; maxX:=maxY:=-4095;
@@ -858,7 +807,7 @@ def proc_bond_atom(expr a)(expr n)=
ef nC=_chg_atom: strA[getA(adrT)]:=parts_par[nP][1];
ef nC=_chg_len: if nP=_ring_len: bondL:=ringL; else: bondL:=nP; fi
ef nC=_get_len: if nP=_tmp_len: if bondL=rate_cr: bondL:=lenT; fi
- ef nP=_ring_len:
+ ef nP=_ring_len:
if lenT<>rate_cr: bondL:=lenT; else: if bondL<0: bondL:=1; fi fi
else: ringL:=lenB[getB(nP)]; fi
ef nC=_tmp_len: lenT:=nP;
@@ -886,12 +835,10 @@ def add_atom(expr n)=
addA[cntA]:=addAT; addAT:=temp_strA:=add_rot[cntA]:=0;
if rotT<>0: add_rot[cntA]:=rotT; rotT:=0; fi
else: f_bra:=0; fi
- if n=0: eB[cntB]:=cntA+1; f_term:=0; else: eB[cntB]:=n; f_term:=1; fi
-enddef;
+ if n=0: eB[cntB]:=cntA+1; f_term:=0; else: eB[cntB]:=n; f_term:=1; fi enddef;
%-------------------------------------------------------------------------------------------------
def check_adrA(expr n)=
- if (n>iif(f_term=0,cntA+1,cntA))or(n<=0): errmessage("cntA=[ "&decimal(n)&" ]"); fi
-enddef;
+ if (n>iif(f_term=0,cntA+1,cntA))or(n<=0): errmessage("cntA=[ "&decimal(n)&" ]"); fi enddef;
def check_adrB(expr n)= if (n>cntB)or(n<=0): errmessage("cntB=[ "&decimal(n)&" ]"); fi enddef;
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
def proc_skeleton(expr n)=
@@ -927,7 +874,7 @@ enddef;
def add_bond(expr n,f)=
if n=_arrange_ang: nA:=arrange_ang(angT mod 360); else: nA:=n; fi
if f_bra=0:
- adrT:=cntA:=cntA+1; posA[cntA]:=posBs; angA[cntA]:=angT;
+ adrT:=incr cntA; posA[cntA]:=posBs; angA[cntA]:=angT;
angX[cntA]:=(angT+nA/2+iif(nA>=0,-90,90)) mod 360;
else: f_bra:=0; fi
cntB:=cntB+1;
@@ -957,16 +904,13 @@ vardef getB(expr n)= if n>=0: markB+n ef n>=-999: cntB+n+1 else: n+4095 fi endde
%-------------------------------------------------------------------------------------------------
def termA=
if f_term=0:
- if f_bra=0:
- strA[incr cntA]:=temp_strA; addA[cntA]:=addAT; add_rot[cntA]:=rotT;
- addAT:=temp_strA:=rotT:=0;
+ if f_bra=0: strA[incr cntA]:=temp_strA; addA[cntA]:=addAT; add_rot[cntA]:=rotT;
+ addAT:=temp_strA:=rotT:=0;
else: f_bra:=0; fi
f_term:=1; fi
enddef;
%-------------------------------------------------------------------------------------------------
-def termB=
- if f_term=0: if f_bra=0: angX[incr cntA]:=angT mod 360; else:f_bra:=0; fi f_term:=1; fi
-enddef;
+def termB= if f_term=0: if f_bra=0: angX[incr cntA]:=angT; else:f_bra:=0; fi f_term:=1; fi enddef;
%-------------------------------------------------------------------------------------------------
vardef glu_atom(expr n)=
if strA[n]<>0: nE:=angT mod 90; nF:=0.5atom_wd; (iif(nE<45,sind nE,cosd nE)*nF)++nF else: 0 fi
@@ -977,17 +921,16 @@ def draw_atom(expr n)=
temps:=str_tbl[strA[n]]; slen:=length(temps); nC:=nS:=0; raise_pos:=(0,0); tpos:=posA[n];
if (angX[n]<=90)or(angX[n]>=270): sdir:=1; else: sdir:=-1; fi
for i=1 upto slen:
- if nC=0:
- tempc:=subc(i,temps);
+ if nC=0: tempc:=subc(i,temps);
if (sdir=-1)and(tempc="{"):
- nD:=i; nC:=0; for j=nD upto slen: nC:=nC+1; exitif subc(j,temps)="}"; endfor fi
- else: nC:=nC-1; tempc:=subc(nD+nC,temps); fi
+ nD:=i; nC:=0; for j=nD upto slen: nC:=nC+1; exitif subc(j+1,temps)="}"; endfor fi
+ else: nC:=nC-1; tempc:=subc(nD+nC,temps); fi
if tempc="_": raise_pos:=iif(raise_pos=(0,0),(0,-.5atom_wd),(0,0));
ef tempc="^": raise_pos:=iif(raise_pos=(0,0),(0, .5atom_wd),(0,0));
ef (tempc<>"{")and(tempc<>"}"):
nS:=nS+1; char_wd:=atom_wd*tbl_char_wd[ASCII(tempc)]; char_ht:=atom_wd;
if nS=1: if (sdir=-1)and(char_wd<atom_wd): tpos:=tpos+((atom_wd-char_wd)/2,0); fi
- else: tpos:=tpos+(.5char_wd*sdir,0); fi
+ else: tpos:=tpos+(.5char_wd*sdir,0); fi
tcol:=colorA[n]; f_col:=0;
if known tcol: if tcol<>0: drawoptions(withcolor color_list[tcol]); f_col:=1; fi fi
if atomfont="draw": draw_char(tempc,tpos+raise_pos); else: label(tempc,tpos+raise_pos); fi
@@ -1078,16 +1021,12 @@ def wz_put(expr a,b,c)=
for i=0 upto lenL/hash_gap:
nA:=hash_gap*i/lenL; nD:=(hash_gap*i+ratio_hash_black*hash_gap)/lenL;
if nD>((lenL-hash_gap)/lenL): nD:=1; fi
- fill nA[b,a]--nA[c,a]--nD[c,a]--nD[b,a]--cycle;
- endfor
-enddef;
+ fill nA[b,a]--nA[c,a]--nD[c,a]--nD[b,a]--cycle; endfor enddef;
%------------------------------------------------------------------------------------------------
def bz_put(expr a,b,c,d)=
- for i=0 upto lenL/hash_gap:
+ for i=0 upto lenL/hash_gap:
nA:=hash_gap*i/lenL; nD:=(hash_gap*i+ratio_hash_black*hash_gap)/lenL;
- fill nA[b,a]--nA[d,c]--nD[d,c]--nD[b,a]--cycle;
- endfor
-enddef;
+ fill nA[b,a]--nA[d,c]--nD[d,c]--nD[b,a]--cycle; endfor enddef;
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
def char_size_set(expr w,h)(expr s)=
for j=1 upto length(s): nN:=ASCII(subc(j,s)); tbl_char_wd[nN]:=w; tbl_char_ht[nN]:=h; endfor
@@ -1148,9 +1087,8 @@ def draw_char(expr s,p)=
ef s="-": dwh Z_m--Z_o;
ef s="+": dwv Z_x--Z_s; dwh Z_m--Z_o;
ef s="A": dwvs(1.14)Z_b--Z_f--Z_e; dw .33[Z_b,Z_f]--.33[Z_e,Z_f];
- ef s="B": dw Z_r--Z_s{right}..(.9fH,.75aH)..{left}Z_y--Z_m--Z_y{right}..
- (.9fH,qH)..{left}Z_x--Z_c;
- dwv Z_b--Z_w;
+ ef s="B": dw Z_r--Z_s{right}..(.9fH,.75aH)..{left}Z_y--Z_m--Z_y{right}..(.9fH,qH)..
+ {left}Z_x--Z_c; dwv Z_b--Z_w;
ef s="D": dw Z_r--Z_s..Z_o..Z_x--Z_c; dwv Z_b--Z_w;
ef s="E": pickup pensquare scaled fP; dw Z_z--Z_c--Z_r--Z_n; dw Z_m--Z_o;
ef s="G": cdw sbp(.06,.97)circ_O; dwh bot Z_y-- bot Z_v;
@@ -1211,8 +1149,7 @@ def warning_bond(expr a)=
warning("A"&decimal(a)&" ( "&fsl(8)(str_tbl[strA[a]])&") has"&fdr(2)(bond_cntA)&" bonds"); fi
enddef;
%-------------------------------------------------------------------------------------------------
-vardef erase_brace(expr s)=
- sS:="";
+vardef erase_brace(expr s)= sS:="";
if (length(s)>=4)and(s<>"COOH"):
for i=1 upto length(s):
sC:=subc(i,s);
@@ -1221,17 +1158,15 @@ vardef erase_brace(expr s)=
else: s fi
enddef;
%-------------------------------------------------------------------------------------------------
-vardef erase_space(expr t)=
- sS:=""; for i=1 upto length(t): sC:=subc(i,t); if sC=" ": sS:=sS&"_"; else: sS:=sS&sC; fi endfor
- sS
+vardef erase_space(expr t)= sS:="";
+ for i=1 upto length(t): sC:=subc(i,t); if sC=" ": sS:=sS&"_"; else: sS:=sS&sC; fi endfor sS
enddef;
%=================================================================================================
def proc_calc(expr n)=
num_MW:=num_MI:=tbl_atom_max:=warning_cnt:=hideH_cnt:=0; nE:=parts_emb_start;
for i=1 upto tbl_atom_end: sumA[i]:=0; endfor
for i=1 upto cntA:
- knownA:=bond_cntA:=0;
- nS:=strA[i];
+ knownA:=bond_cntA:=0; nS:=strA[i];
for j=1 upto cntB:
bond_num[j]:=bond_type(lineB[j]);
if (sB[j]=i)or(eB[j]=i): bond_cntA:=bond_cntA+bond_num[j]; fi
@@ -1266,8 +1201,7 @@ def proc_calc(expr n)=
knownA:=1; fi
exitif knownA=1;
endfor
- if knownA=0: warning(" Unknown Str("&str_tbl[strA[i]]&") is used "&decimal(i)); fi
- endfor
+ if knownA=0: warning(" Unknown Str("&str_tbl[strA[i]]&") is used "&decimal(i)); fi endfor
%-------------------------------------------------------------------------------------
sumA[2]:=sumA[2]+hideH_cnt;
if (tbl_atom_max=1)and(sumA[2]>0): tbl_atom_max:=2; fi
@@ -1312,35 +1246,35 @@ def proc_report_out(expr f)=
message "["&decimal(fig_num)&"]:"&inf_EN;
if f=1: file_output:="temp-report.aux"; else: file_output:=jobname&"-report.txt"; fi
printf "===========================================================================";
- printf " No."&fdr(4)(fig_num)&" / Name = "& inf_EN&" / file = "& file_input;
+ printf " No["&decimal(fig_num)&"],Name<"& inf_EN&">,Category<"&inf_Cat&">,File<"&file_input&">";
if mc_row>=1:
printf "---------------------------------------------------------------------------";
for i=1 upto mc_row: printf (substring(0,mc_indent[i]) of blanks)&mc[i]; endfor
printf "---------------------------------------------------------------------------";
- printf " row="&fdr(3)(mc_row)&" , length="&fdr(4)(length(mc))&
- " , commands="&fdr(3)(cnt_cmm);
- printf " {}=X["&decimal(cnt_chgB)&"],{}:X["&decimal(cnt_chgA)&
- "],'()["&decimal(cnt_inline_def)&"],@["&decimal(cnt_at)&
- "],&["&decimal(cnt_and)&"],<["&decimal(cnt_gtn)&"],=["&decimal(cnt_equ)&
+ printf " Row["&decimal(mc_row)&"],Length["&decimal(length(mc))&"],Commands["&decimal(cnt_cmm)&
+ "],&Code["&decimal(parts_cnt[0])&"],Warning["&decimal(warning_cnt)&"]";
+ printf "---------------------------------------------------------------------------";
+ printf " =["&decimal(cnt_equ)&"]({}=["&decimal(cnt_chgB)&"]), :["&decimal(cnt_cln)&
+ "]({}:["&decimal(cnt_chgA)&"]), '()["&decimal(cnt_inline_def)&"]";
+ printf " @["&decimal(cnt_at)&"],&["&decimal(cnt_and)&"],<["&decimal(cnt_gtn)&
+ "],~["&decimal(cnt_tld)&"],^["&decimal(cnt_hat)&"],`["&decimal(cnt_bqt)&
+ "],>["&decimal(cnt_ltn)&
"],|["&decimal(cnt_bar-cnt_bars)&"],||["&decimal(cnt_bars)&
- "],#["&decimal(cnt_hsh-cnt_hshs)&"],##["&decimal(cnt_hshs)&"]";
- fi
+ "],#["&decimal(cnt_hsh-cnt_hshs)&"],##["&decimal(cnt_hshs)&"]"; fi
printf "---------------------------------------------------------------------------";
- printf " Warnings = "&fdr(3)(warning_cnt)&" / Code= "&decimal(parts_cnt[0]);
- printf " Width * Height = " & fdr(10)(mol_wd)&" * "&fdr(10)(mol_ht);
- printf " Shift width * height = "& fdr(10)(minX)&" * "&fdr(10)(minY);
- printf " Bond length = "&fdr(3)(blen)&" Atom size = "&fdr(3)(atom_wd);
- printf " Atom count="&fdr(3)(cntA)&" Bond count="&fdr(3)(cntB)&
- " Ring count="&fdr(3)(cntB-cntA+1)&" Hide H count="&fdr(3)(hideH_cnt);
+ printf " Width["&decimal(mol_wd)&"],Height["&decimal(mol_ht)&"],"&
+ " Shift x["& decimal(minX)&"],Shift y["&decimal(minY)&"]";
+ printf " Bond length["&decimal(blen)&"],Atom size["&decimal(atom_wd)&"]";
printf "---------------------------------------------------------------------------";
+ printf " Atom["&decimal(cntA)&"],Bond["&decimal(cntB)&
+ "],Ring["&decimal(cntB-cntA+1)&"],Hide H["&decimal(hideH_cnt)&"]";
printf "< NO. ><atom(s) >( x axis , y axis )<bond><hideH><chg>";
for i=1 upto cntA:
printf " A"&fdl(6)(i)&fsl(8)(erase_brace(str_tbl[strA[i]]))&
" ("&fdr(10)(round(xpart(posA[i])/blen))&" , "&
fdr(10)(round(ypart(posA[i])/blen))&" ) "&fdr(4)(Bcnt[i])&
iif(hideH[i]>0,fdr(6)(hideH[i])," ")
- if chargeA[i]<>0: &fdr(4)(chargeA[i]) fi;
- endfor
+ if chargeA[i]<>0: &fdr(4)(chargeA[i]) fi; endfor
printf "---------------------------------------------------------------------------";
printf "< NO. >< bond (sdt)><angle +( +- )><length ( pt )>";
for i=1 upto cntB:
@@ -1348,8 +1282,7 @@ def proc_report_out(expr f)=
nB:=angB[i]; if nB>180: nB:=nB-360; fi
printf " B"&fdl(4)(i)&fdr(3)(sB[i])&" -> "&fdr(3)(eB[i])&
" ("&fdr(3)(bond_num[i])&")"&fdr(8)(round(angB[i]))&
- " ("&fdr(6)(round(nB))&")"&fdr(8)(nC)&" ("&fdr(8)(round(nC*blen))&")";
- endfor
+ " ("&fdr(6)(round(nB))&")"&fdr(8)(nC)&" ("&fdr(8)(round(nC*blen))&")"; endfor
printf "---------------------------------------------------------------------------";
printf "<atom>( atom wt )[ mi wt ] < cnt > < sum wt >[ sum mi wt ]";
for i=1 upto tbl_atom_max:
@@ -1403,32 +1336,29 @@ def proc_mol_out(expr n)=
" "&decimal(sB[i])&" "&decimal(eB[i])
if bond_stereo(lineB[i])<>0: &" CFG="&decimal(bond_config(lineB[i])) fi; fi
endfor
- printf "M V30 END BOND"; printf "M V30 END CTAB"; printf "M END";
- fi
+ printf "M V30 END BOND"; printf "M V30 END CTAB"; printf "M END"; fi
enddef;
%=================================================================================================
def proc_mc_out(expr f)=
message "["&decimal(fig_num)&"]:"&inf_EN;
file_output:="temp-mc.aux";
if mc_length<100:
- nN:=split_comma(mc); nL:=length(mc); nA:=0;
+ nN:=scan_chars(mc,","); nL:=length(mc); nA:=0;
forever:
for i=nN downto 1:
- if at_comma[i]<=nA+mc_length:
- printf substring(nA,at_comma[i]) of mc; nA:=at_comma[i]; exitif true; fi
+ if at_char[i]<=nA+mc_length:
+ printf substring(nA,at_char[i]) of mc; nA:=at_char[i]; exitif true; fi
endfor
if nL-nA<=mc_length: printf substring(nA,nL) of mc; exitif true; fi
endfor
else:
- for i=1 upto mc_row: printf (substring(0,mc_indent[i]) of blanks)&mc[i]; endfor
- fi
+ for i=1 upto mc_row: printf (substring(0,mc_indent[i]) of blanks)&mc[i]; endfor fi
printf EOF;
enddef;
%=================================================================================================
vardef fit_zero(expr n)= if n<=9: "00" ef n<=99: "0" else: "" fi &decimal(n) enddef;
vardef bond_type(expr n)=
- if (n>=dl)and(n<=dm_):2 ef n=tm:3 ef (n=0)or(n=vf)or(n=vb): 0 else: 1 fi
-enddef;
+ if (n>=dl)and(n<=dm_):2 ef n=tm:3 ef (n=0)or(n=vf)or(n=vb): 0 else: 1 fi enddef;
vardef bond_charge(expr n)= if n=2: 1 ef n=1: 3 ef n=-1: 5 ef n=-2: 6 else: 0 fi enddef;
vardef bond_stereo(expr n)=
if (n=wf)or(n=zb)or(n=bd): 1 ef (n=zf)or(n=wb)or(n=dt): 6 ef n=wv: 4 else: 0 fi enddef;
@@ -1439,16 +1369,13 @@ vardef STa(expr s,WT,MI)=
str_cnt:=str_cnt+1; tbl_cnt:=tbl_cnt+1; parts_num:=parts_num+1;
parts_com[parts_num][1]:=_set_atom; parts_par[parts_num][1]:=str_cnt; parts_cnt[parts_num]:=1;
str_tbl[str_cnt]:=tbl_atom_str[tbl_cnt]:=s; tbl_atom[tbl_cnt]:=0;
- tbl_atom_wt[tbl_cnt]:=WT; tbl_atom_mi[tbl_cnt]:=MI;
- parts_num
-enddef;
+ tbl_atom_wt[tbl_cnt]:=WT; tbl_atom_mi[tbl_cnt]:=MI; parts_num enddef;
%-------------------------------------------------------------------------------------------------
vardef STb(expr s)(text t)=
str_cnt:=str_cnt+1; tbl_cnt:=tbl_cnt+1; parts_num:=parts_num+1;
parts_com[parts_num][1]:=_set_atom; parts_par[parts_num][1]:=str_cnt; parts_cnt[parts_num]:=1;
str_tbl[str_cnt]:=tbl_atom_str[tbl_cnt]:=s; tbl_atom[tbl_cnt]:=0;
- for list=t: tbl_group[tbl_cnt][incr tbl_atom[tbl_cnt]]:=list-parts_emb_start; endfor
- parts_num
+ for list=t: tbl_group[tbl_cnt][incr tbl_atom[tbl_cnt]]:=list-parts_emb_start; endfor parts_num
enddef;
%=================================================================================================
parts_int:=parts_emi_start; parts_num:=parts_emb_start;
@@ -1477,9 +1404,9 @@ W:= STa("W", 183.85, 181.948225); Zn:=STa("{Zn}",65.409, 63.929142
tbl_atom_end:=tbl_cnt;
%-------------------------------------------------------------------------------------------------
CH3:=STb("C{H_3_}")(C,H,H,H); CH2:=STb("C{H_3_}")(C,H,H); CN:=STb("CN")(C,N); OH:=STb("OH")(O,H);
-COOH:=STb("COOH")(C,O,O,H); SH:= STb("SH")(S,H); CHO:=STb("CHO")(C,H,O);
+COOH:=STb("COOH")(C,O,O,H); COONa:=STb("COO{Na}")(C,O,O,Na); CHO:=STb("CHO")(C,H,O);
NO:=STb("NO")(N,O); NO2:=STb("N{O_2_}")(N,O,O); NH2:=STb("N{H_2_}")(N,H,H);
-SO2H:=STb("S{O_2_}H")(S,O,O,H); SO3H:=STb("S{O_3_}H")(S,O,O,O,H);
+SH:= STb("SH")(S,H); SO2H:=STb("S{O_2_}H")(S,O,O,H); SO3H:=STb("S{O_3_}H")(S,O,O,O,H);
ONa:=STb("O{Na}")(O,Na); SO3Na:=STb("S{O_3_}{Na}")(S,O,O,O,Na);
%-------------------------------------------------------------------------------------------------
tbl_group_end:=tbl_cnt; parts_atom_end:=parts_num;
@@ -1492,8 +1419,7 @@ for i=5,6,7,8: for j=11 upto 15: ?[i][j]:='(); endfor endfor
%-------------------------------------------------------------------------------------------------
!:=!1:='((_mk_bond,_arrange_ang)); !!:='(!~db); !!!:='(!~tm);
for i==2 upto 20:
- ![i]:='((_com,_len_ss),(_get_len,_tmp_len),! for j==2 upto i::,! endfor ,(_com,_len_ee));
-endfor
+ ![i]:='((_com,_len_ss),(_get_len,_tmp_len),! for j==2 upto i::,! endfor ,(_com,_len_ee)); endfor
Me:='(); Et:='(!); iPr:=?!:='(/_,!); ?!2:='(/_,!2); tBu:=??!:='(/_,/_^60,60);
!?:='(!,/_); !?!:='(!,/_,!); n_:='((_set_add,a_minus)); p_:='((_set_add,a_plus));
zero_wf:='(0~wf); zero_zf:='(0~zf); zero_dm:='(0~dm); zero_wv:='(0~wv);
@@ -1541,8 +1467,7 @@ init_par(parameter_list);
def expand_set=
CH3:=xCH3; NH:=xNH; NH2:=xNH2; NO:=xNO; NO2:=xNO2; OH:=xOH; CHO:=xCHO; COOH:=xCOOH; CN:=xCN;
SH:=xSH; SO2H:=xSO2H; SO3H:=xSO3H; !SH:=!xSH;
- !CH3:=!xCH3; !OH:=!xOH; !NH2:=!xNH2; !CHO:=!xCHO; !COOH:=!xCOOH; !CN:=!xCN; !NO2:=!xNO2;
-enddef;
+ !CH3:=!xCH3; !OH:=!xOH; !NH2:=!xNH2; !CHO:=!xCHO; !COOH:=!xCOOH; !CN:=!xCN; !NO2:=!xNO2; enddef;
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
vardef mc_check(expr s)=
save mc_char,err_cnt,char_cnt,f_depth,cnt_prn_s,cnt_prn_e,cnt_brc_s,cnt_brc_e,cnt_brk_s,
@@ -1556,13 +1481,12 @@ vardef mc_check(expr s)=
%---------------------------------------------------------------------------------------------
if mc_row>=1:
for i=1 upto length(s):
- tempc:=subc(i,s); if tempc<>" ": mc_char[incr char_cnt]:=ASCII(tempc); fi
- endfor
+ tempc:=subc(i,s); if tempc<>" ": mc_char[incr char_cnt]:=ASCII(tempc); fi endfor
mc_char[0]:=mc_char[char_cnt+1]:=mc_char[char_cnt+2]:=a_cmm;
%-- argument missing chkeck --------------------------------------------------------------
cnt_prn_s:=cnt_prn_e:=cnt_brc_s:=cnt_brc_e:=cnt_brk_s:=cnt_brk_e:=cnt_inline_def:=0;
- cnt_at:=cnt_cmm:=cnt_and:=cnt_gtn:=cnt_equ:=cnt_cln:=cnt_bar:=cnt_bars:=0;
- cnt_hsh:=cnt_hshs:=f_depth:=nA:=0;
+ cnt_at:=cnt_cmm:=cnt_and:=cnt_gtn:=cnt_equ:=cnt_cln:=cnt_bar:=cnt_bars:=cnt_tld:=cnt_hat:=0;
+ cnt_bqt:=cnt_ltn:=cnt_hsh:=cnt_hshs:=f_depth:=nA:=0;
forever:
nA:=nA+1; nB:=mc_char[nA-1]; nC:=mc_char[nA]; nD:=mc_char[nA+1];
if nC=a_cmm: if f_depth=0: cmm_adr[incr cnt_cmm]:=nA; fi
@@ -1587,10 +1511,14 @@ vardef mc_check(expr s)=
ef nC=a_and: cnt_and:=cnt_and+1;
if nD= a_cmm: proc_err(7,nA) fi if nB<>a_cmm: proc_err(8,nA) fi % a & x
ef nC=a_gtn: cnt_gtn:=cnt_gtn+1;
- ef nC=a_ltn: if nD= a_cmm: proc_err(7,nA) fi if nB= a_cmm: proc_err(7,nA) fi % x > x
- ef nC=a_tld: if nD= a_cmm: proc_err(7,nA) fi if nB= a_cmm: proc_err(7,nA) fi % x ~ x
- ef nC=a_hat: if nD= a_cmm: proc_err(7,nA) fi if nB= a_cmm: proc_err(7,nA) fi % x ^ x
- ef nC=a_bqt: if nD= a_cmm: proc_err(7,nA) fi if nB= a_cmm: proc_err(7,nA) fi % x ` x
+ ef nC=a_ltn: cnt_ltn:=cnt_ltn+1;
+ if nD= a_cmm: proc_err(7,nA) fi if nB= a_cmm: proc_err(7,nA) fi % x > x
+ ef nC=a_tld: cnt_tld:=cnt_tld+1;
+ if nD= a_cmm: proc_err(7,nA) fi if nB= a_cmm: proc_err(7,nA) fi % x ~ x
+ ef nC=a_hat: cnt_hat:=cnt_hat+1;
+ if nD= a_cmm: proc_err(7,nA) fi if nB= a_cmm: proc_err(7,nA) fi % x ^ x
+ ef nC=a_bqt: cnt_bqt:=cnt_bqt+1;
+ if nD= a_cmm: proc_err(7,nA) fi if nB= a_cmm: proc_err(7,nA) fi % x ` x
ef nC=a_bar: cnt_bar:=cnt_bar+1; % |+||
if nD= a_bar: cnt_bars:=cnt_bars+1; if mc_char[nA+2]=a_bar: nA:=nA+1; % ||
ef mc_char[nA+2]<>a_cmm: proc_err(8,nA) fi % | a
@@ -1611,8 +1539,7 @@ vardef mc_check(expr s)=
if cnt_prn_s>cnt_prn_e: proc_err(1,0) ef cnt_prn_s<cnt_prn_e: proc_err(2,0) fi
if cnt_brc_s>cnt_brc_e: proc_err(3,0) ef cnt_brc_s<cnt_brc_e: proc_err(4,0) fi
if cnt_brk_s>cnt_brk_e: proc_err(5,0) ef cnt_brk_s<cnt_brk_e: proc_err(6,0) fi
- else: proc_err(0,0)
- fi
+ else: proc_err(0,0) fi
%---------------------------------------------------------------------------------------------
for i=1 upto err_cnt:
message "*"&fdr(3)(i)&" "&err_type[err_code[i]]&fdr(4)(err_adr[i])&" '"&err_str[i]&"'";
@@ -1622,16 +1549,15 @@ vardef mc_check(expr s)=
enddef;
%-------------------------------------------------------------------------------------------------
def proc_err(expr e,n)= err_adr[incr err_cnt]:=n; err_code[err_cnt]:=e;
- if e<=6: err_str[err_cnt]:=" "; else: err_str[err_cnt]:=substring(n-3,n+2) of mc; fi
-enddef;
+ if e<=6: err_str[err_cnt]:=" "; else: err_str[err_cnt]:=substring(n-3,n+2) of mc; fi enddef;
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
def mc_query(text s)=
begingroup
save f_mcf,f_line,unit_row,unit_cnt,line_s,row_cnt,semic_cnt,info_cnt,order,min_n,key_cnt,
info_s,sign_at,sign_n,filter_n,filter_tag,filter_var,filter_sign,filter_cnt,filter_p,
- at_semic,at_colon,at_equal,at_less,at_greater,at_n,sort_all,key_s,sort_s;
+ at_char,at_colon,at_equal,at_less,at_greater,at_n,sort_all,key_s,sort_s;
string line_s[][],sort_s[],sort_all[],key_s[],filter_tag[],filter_var[],info_s[];
- numeric row_cnt[],order[],order_tbl[],filter_sign[],filter_p[],at_semic[];
+ numeric row_cnt[],order[],order_tbl[],filter_sign[],filter_p[],at_char[];
unit_row:=f_mcf:=mc_row:=info_cnt:=key_cnt:=filter_cnt:=0; unit_cnt:=1;
file_input:=default_library; file_output:=default_temp_file;
%-----------------------------------------------------------------------------------------------
@@ -1655,8 +1581,7 @@ def mc_query(text s)=
else:
filter_tag[incr filter_cnt]:=sT; filter_sign[filter_cnt]:=sign_n;
if (sign_n>=3)and(is_num(sV)=1): filter_var[filter_cnt]:=fix_num(sV);
- else: filter_var[filter_cnt]:=sV; fi
- fi
+ else: filter_var[filter_cnt]:=sV; fi fi
endfor
%-----------------------------------------------------------------------------------------------
forever:
@@ -1682,28 +1607,19 @@ def mc_query(text s)=
ef filter_sign[j]=3: if not(temps< filter_var[j]): filter_n:=0; fi
ef filter_sign[j]=4: if not(temps> filter_var[j]): filter_n:=0; fi
ef filter_sign[j]=5: if not(temps<=filter_var[j]): filter_n:=0; fi
- ef filter_sign[j]=6: if not(temps>=filter_var[j]): filter_n:=0; fi fi
- fi
- endfor
+ ef filter_sign[j]=6: if not(temps>=filter_var[j]): filter_n:=0; fi fi fi endfor
endfor
for i=1 upto filter_cnt: if filter_p[i]=0: filter_n:=0; fi endfor
sort_all[unit_cnt]:="";
for j=1 upto key_cnt:
if j=key_cnt: sort_all[unit_cnt]:=sort_all[unit_cnt]&sort_s[j];
- else: sort_all[unit_cnt]:=fix_str(15,sort_s[1]); fi
- endfor
+ else: sort_all[unit_cnt]:=fix_str(15,sort_s[1]); fi endfor
info_cnt:=0; if filter_n=1: unit_cnt:=unit_cnt+1; fi
ef subc(1,temps)="+": f_mcf:=1; mc_row:=1;
ef subc(1,temps)<>"%":
if f_mcf=1: mc_row:=mc_row+1;
else:
- semic_cnt:=split_semic(temps);
- for i=1 upto semic_cnt+1:
- info_cnt:=info_cnt+1;
- if i<=semic_cnt: info_s[info_cnt]:=substring(at_semic[i-1],at_semic[i]-1) of temps;
- else: info_s[info_cnt]:=substring(at_semic[semic_cnt],length(temps)) of temps; fi
- endfor
- fi
+ info_cnt:=split_char(temps,";")+1; for i=1 upto info_cnt: info_s[i]:=arg_s[i]; endfor fi
fi
fi
endfor
@@ -1720,33 +1636,37 @@ def mc_query(text s)=
for i=1 upto unit_cnt:
for j=1 upto row_cnt[order_tbl[i]]: printf line_s[order_tbl[i]][j]; endfor
endfor
- else: for i=1 upto unit_cnt: for j=1 upto row_cnt[i]: printf line_s[i][j]; endfor endfor
- fi
+ else: for i=1 upto unit_cnt: for j=1 upto row_cnt[i]: printf line_s[i][j]; endfor endfor fi
closefrom file_input; closefrom file_output;
endgroup;
enddef;
%=============================================================================================
vardef fix_str(expr n,s)=
if length(s)<n: sS:=s&substring(0,n-length(s)) of blanks;
- ef length(s)>n: sS:=substring(0,n) of s; fi sS
-enddef;
+ ef length(s)>n: sS:=substring(0,n) of s; fi sS enddef;
%-------------------------------------------------------------------------------------------------
vardef fix_num(expr s)=
sS:=s; nN:=scan_char(".",sS,0,1);
if nN=0: sS:=fsr(4)(sS); ef nN=1: sS:=" 0"&sS;
- ef nN=2: sS:=" "&sS; ef nN=3: sS:=" "&sS; ef nN=4: sS:=" "&sS; fi sS
-enddef;
+ ef nN=2: sS:=" "&sS; ef nN=3: sS:=" "&sS; ef nN=4: sS:=" "&sS; fi sS enddef;
%-------------------------------------------------------------------------------------------------
vardef is_num(expr s)=
for i=1 upto length(s):
if ((subc(i,s)>="0")and(subc(i,s)<="9"))or(subc(i,s)="."): nN:=1; else: nN:=0; fi endfor nN
enddef;
-%-------------------------------------------------------------------------------------------------
-vardef split_semic(expr s)=
- nN:=at_semic[0]:=0; for i=1 upto length(s): if subc(i,s)=";": at_semic[incr nN]:=i; fi endfor nN
+%--------------------------------------------------------------------------------------------------
+vardef scan_bit(expr n,b)= if b>=1: odd(floor(n/b)) else: odd(floor((frac n)/b)) fi enddef;
+%--------------------------------------------------------------------------------------------------
+vardef scan_char(expr c,s,d,n)=
+ nN:=0; if d=0: for i=n upto length(s): if subc(i,s)=c: nN:=i; fi exitif nN>0; endfor
+ ef d=1: for i=n upto length(s): if subc(i,s)<>c: nN:=i; fi exitif nN>0; endfor
+ ef d=-1: for i=length(s) downto n: if subc(i,s)<>c: nN:=i; fi exitif nN>0; endfor fi nN
enddef;
%-------------------------------------------------------------------------------------------------
-vardef split_comma(expr s)=
- nN:=at_comma[0]:=0; for i=1 upto length(s): if subc(i,s)=",": at_comma[incr nN]:=i; fi endfor nN
-enddef;
+vardef scan_chars(expr s,c)=
+ nN:=0; for i=1 upto length(s): if subc(i,s)=c: at_char[incr nN]:=i; fi endfor nN enddef;
+%-------------------------------------------------------------------------------------------------
+vardef split_char(expr s,c)=
+ nN:=scan_chars(s,c); at_char[nN+1]:=length(s)+1;
+ for i=1 upto nN+1: arg_s[i]:=substring(at_char[i-1],at_char[i]-1) of s; endfor nN enddef;
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/graphics/mcf2graph/mcf_exa_code.pdf b/graphics/mcf2graph/mcf_exa_code.pdf
index 59e94dd93e..51743be2c8 100644
--- a/graphics/mcf2graph/mcf_exa_code.pdf
+++ b/graphics/mcf2graph/mcf_exa_code.pdf
Binary files differ
diff --git a/graphics/mcf2graph/mcf_exa_code.tex b/graphics/mcf2graph/mcf_exa_code.tex
index b7d3807fe6..1be25c7aba 100644
--- a/graphics/mcf2graph/mcf_exa_code.tex
+++ b/graphics/mcf2graph/mcf_exa_code.tex
@@ -1,7 +1,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Print out mcf data list by A.Yamaji 2022.03.27
+% Print out mcf data list by A.Yamaji 2022.05.08
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% ** mcf2graph.mf must be version 4.83
+% ** mcf2graph.mf must be version 4.84
% ** use mcf_library.mcf
% ** typeset by LuaLaTeX(luamplib)
\documentclass{article}
@@ -17,6 +17,7 @@
outputformat:="eps";
sw_output:=Fig+Calc;
fsize:=(35mm,34mm);
+ fmargin:=(1mm,1mm);
max_blength:=4mm;
row_h:=3.8mm;
header_h:=3.8mm;
@@ -110,7 +111,6 @@
VerbatimTeX("\gdef\EOF{"&decimal(f_EOF)&"}");
\end{mplibcode}\vspace{-1.2pt}\\
%------------------------------------------------------------------------
-%%%%%%%\ifnum\fig@num=10 \CONT@false \fi%
\ifx\EOF\one \CONT@false \fi%
\message{[\the\fig@num:\EN]}%
\ifCONT@ \repeat%
diff --git a/graphics/mcf2graph/mcf_exa_soc.mp b/graphics/mcf2graph/mcf_exa_soc.mp
index b4144fd0ce..0c4b39380d 100644
--- a/graphics/mcf2graph/mcf_exa_soc.mp
+++ b/graphics/mcf2graph/mcf_exa_soc.mp
@@ -1,8 +1,8 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Molecular Coding Format by Akira Yamaji 2022.03.27
+% Molecular Coding Format by Akira Yamaji 2022.05.08
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-input mcf2graph; %%% it must be version 4.83
-message "* mcf_exa_soc 2022.03.27";
+input mcf2graph; %%% it must be version 4.84
+message "* mcf_exa_soc 2022.05.08";
message "";
%------------------------------------------------------------------------------
%%%%sw_frame:=Outside;
diff --git a/graphics/mcf2graph/mcf_example.pdf b/graphics/mcf2graph/mcf_example.pdf
index f14cc81259..9afd61cf8e 100644
--- a/graphics/mcf2graph/mcf_example.pdf
+++ b/graphics/mcf2graph/mcf_example.pdf
Binary files differ
diff --git a/graphics/mcf2graph/mcf_example.tex b/graphics/mcf2graph/mcf_example.tex
index c356799a8f..fee9b0ba5d 100644
--- a/graphics/mcf2graph/mcf_example.tex
+++ b/graphics/mcf2graph/mcf_example.tex
@@ -1,7 +1,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Example of MCF Typeset with LuaLaTeX(luamplib) by A.Yamaji 2022.03.27
+% Example of MCF Typeset with LuaLaTeX(luamplib) by A.Yamaji 2022.05.08
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% ** mcf2graph.mf must be version 4.83
+% ** mcf2graph.mf must be version 4.84
% ** use mcf_library.mcf
% ** typeset by LuaLaTeX(luamplib)
\documentclass{article}
diff --git a/graphics/mcf2graph/mcf_library.mcf b/graphics/mcf2graph/mcf_library.mcf
index 2ea49f3b41..b23c8c6611 100644
--- a/graphics/mcf2graph/mcf_library.mcf
+++ b/graphics/mcf2graph/mcf_library.mcf
@@ -1,5 +1,5 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% molecular library file mcf_library.mcf by Akira Yamaji 2022.03.27
+% molecular library file mcf_library.mcf by Akira Yamaji 2022.05.08
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% tag1:var1;tag2:var2;tag3:var3 .....
% first character of line "%" comment out
@@ -9,7 +9,7 @@
% Cat = Category
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%==============================================================================
-% molecular data for mcf_example.tex EXA=1(155)
+% molecular data for mcf_example.tex EXA=1(155) EXA=2(7)
%-=============================================================================
Cat:biological;EN:Adenine;MW:135.13;EXA:1
+
@@ -384,6 +384,14 @@ Cat:biological;EN:Chlorophyll a;MW:893.509;EXA:1
@2,*\^-6,!2,//O,!,O,!2,!!,|,!13,{1,5,9,13}:/_
+------------------------------------------------------------------------------
%==============================================================================
+Cat:biological;EN:Apigenin;MW:270.24;EXA:-
++
+<30,Ph,3=?6,9=dl,10:O,7://O,@9,\,Ph,{2,6,14}:/OH
++------------------------------------------------------------------------------
+Cat:biological;EN:Luteolin;MW:286.24;EXA:-
++
+<30,Ph,3=?6,9=dl,10:O,7://O,@9,\,Ph,{2,6,14,15}:/OH
++------------------------------------------------------------------------------
Cat:biological;EN:Flavone;MW:222.24;EXA:1
+
<30,Ph,3=?6,9=dl,10:O,7://O,9:/Ph,
@@ -701,6 +709,15 @@ Cat:synthetic;EN:Melamine;MW:126.12;EXA:1
<30,Ph,{2,4,6}:N,{1,3,5}:/NH2
+------------------------------------------------------------------------------
%==============================================================================
+Cat:synthetic;EN:Tartrazine;MW:534.3;EXA:1
++
+<30,Ph,1:/SO3Na,@4,\,N,!!,N,!,<-12,?5,{-2,-5}=dl,{-2,-3}:N,-1:/COONa,-4:/OH,
+ @-3,-12,Ph,-3:/SO3Na
++------------------------------------------------------------------------------
+Cat:synthetic;EN:Erythrosine;MW:835.9;EXA:1
++
+<30,Ph,{3,9}=?6,{8,13,16}=dl,10:O,-2://O,{1,5,12,14}:/I,@7,\,Ph,-1:/COOH,6:/OH
++------------------------------------------------------------------------------
Cat:synthetic;EN:Sudan red 1;MW:248.28;EXA:1
+
<30,Ph,1=Ph,4:/OH,@3,\,N,!!,N,!,Ph
@@ -965,7 +982,7 @@ Cat:pesticide;EN:Acrinathrin;MW:541.45;EXA:1
<-30,?3,{2^-35,2'^35}:*/_,
@1,\,!~dl,!,//O,!,O,!,/CF3,!,CF3,@3,\,//O,!,O,!,/CN,!,Ph,-4:/OPh>rl
+------------------------------------------------------------------------------
-Cat:pesticide;EN:Azaconazole;MW:300.139;EXA:1
+Cat:pesticide;EN:Azaconazole;MW:300.139;EXA:-
+
<30,Ph,{4,6}:/Cl,@3,\,!2,?5,{-2,-4}=dl,{-2,-4,-5}:N,@7,?5,{-1,-4}:O
+------------------------------------------------------------------------------
@@ -2019,7 +2036,7 @@ Cat:antibacterial;EN:Sulfatiazole;MW:255.31;EXA:-
+
<30,Ph,1:/NH2,@4,\,SOO,!,NH,!,|,?5,{1,3}=dl,2:N,5:S
+------------------------------------------------------------------------------
-Cat:antibacterial;EN:Chlopidol;MW:192.039;EXA:1
+Cat:antibacterial;EN:Chlopidol;MW:192.039;EXA:-
+
<30,Ph,{1,3}:/_,2:N,{4,6}:/Cl,5:/OH
+------------------------------------------------------------------------------
@@ -2225,7 +2242,7 @@ Cat:biological;EN:Maitotoxin;MW:3425.86;EXA:2
{6,46,50,53,60,67,74}:*/H^-60,
{9,18,85,93,112,139,143,147}:*/_^60`1,{80,88,97,108',115,120,124}:/*_^-60`1,
@$6,\,|,!11,60~dr,-60,60,OH,{2',7,10}:*/OH,{1,3,8'}:*/_,11://_,12:/_,
- @6,\,O,30,SOO,30,ONa,
- @$36,-45~zf,O,30,SOO,30,ONa,
+ @6,\,O,30,SO3Na,
+ @$36,-45~zf,O,30,SO3Na,
@$150,\,|,!7,{1,2}:/*OH,4:*/_,5:/*_,7=dl
+------------------------------------------------------------------------------
diff --git a/graphics/mcf2graph/mcf_man_soc.mp b/graphics/mcf2graph/mcf_man_soc.mp
index 62d042bbf7..f3344cff25 100644
--- a/graphics/mcf2graph/mcf_man_soc.mp
+++ b/graphics/mcf2graph/mcf_man_soc.mp
@@ -1,9 +1,9 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% MCF file for mcf_manual.tex by Akira.Yamaji 2022.03.27
+% MCF file for mcf_manual.tex by Akira.Yamaji 2022.05.08
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-input mcf2graph; %% it must be version 4.83
+input mcf2graph; %% it must be version 4.84
% ** use library file 'mcf_library.mcf'
-message "mcf_man_soc 2022.03.27"; message "";
+message "mcf_man_soc 2022.05.08"; message "";
%------------------------------------------------------------------------
sw_mframe:=0;
sw_expand:=0;
diff --git a/graphics/mcf2graph/mcf_manual.pdf b/graphics/mcf2graph/mcf_manual.pdf
index 605c3a0c24..46fad77072 100644
--- a/graphics/mcf2graph/mcf_manual.pdf
+++ b/graphics/mcf2graph/mcf_manual.pdf
Binary files differ
diff --git a/graphics/mcf2graph/mcf_manual.tex b/graphics/mcf2graph/mcf_manual.tex
index 71ac080b10..e3aac3ed4b 100644
--- a/graphics/mcf2graph/mcf_manual.tex
+++ b/graphics/mcf2graph/mcf_manual.tex
@@ -1,7 +1,9 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Molecular Coding Format manual by Akira Yamaji 2022.03.27
+% Molecular Coding Format manual by Akira Yamaji 2022.05.08
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\documentclass[a4paper]{article}
+%%%\usepackage{graphicx}
+%%%\usepackage{hyperref}
\usepackage[pdftex]{graphicx}
\usepackage[pdftex]{hyperref}
%%%\usepackage[dvipdfmx]{graphicx}
@@ -1817,40 +1819,40 @@ file name = 'temp-mc.aux'
\paragraph{(Output)}
\begin{verbatim}
===========================================================================
- No. 3 / Name = Cytosine
+ No[3],Name<Cytosine>,Category<biological>,File<mcf_library.mcf>
---------------------------------------------------------------------------
- <30,?6,{4,6}=dl,4:N,3://O,2:NH,5:/NH2
+<30,?6,{4,6}=dl,4:N,3://O,2:NH,5:/NH2
+---------------------------------------------------------------------------
+ Row[1],Length[37],Commands[7],&Code[59],Warning[0]
---------------------------------------------------------------------------
- row= 1 / length= 37 / commands= 7
- {}=X = 1 / {}:X = 0 / '() = 0 / @ = 0 / & = 0 / < = 1
+ =[1]({}=[1]), :[4]({}:[0]), '()[0]
+ @[0],&[0],<[1],~[0],^[0],`[0],>[0],|[0],||[0],#[0],##[0]
---------------------------------------------------------------------------
- Warnings = 0 / Code= 60
- Width * Height = 34.68852 * 47.4036
- Shift width * height = 0 * -14.46167
- Bond length = 12.75589 Atom size = 5.38914
- Atom count= 9 Bond count= 9 Ring count= 1 Hide H count= 2
+ Width[30.92432],Height[42.36536], Shift x[0],Shift y[-12.99213]
+ Bond length[11.33856],Atom size[4.8819]
---------------------------------------------------------------------------
+ Atom[9],Bond[9],Ring[1],Hide H[2]
< NO. ><atom(s) >( x axis , y axis )<bond><hideH><chg>
A1 C ( 0 , 0 ) 3 1
- A2 N ( 0.866 , -0.5 ) 3
- A3 C ( 1.732 , 0 ) 4
- A4 N ( 1.732 , 1 ) 3
- A5 C ( 0.866 , 1.5 ) 4
+ A2 N ( 1 , 0 ) 3
+ A3 C ( 2 , 0 ) 4
+ A4 N ( 2 , 1 ) 3
+ A5 C ( 1 , 2 ) 4
A6 C ( 0 , 1 ) 3 1
- A7 O ( 2.508 , -0.448 ) 2
- A8 H ( 0.866 , -0.922 ) 1
- A9 NH2 ( 0.866 , 2.371 ) 1
+ A7 O ( 3 , 0 ) 2
+ A8 H ( 1 , -1 ) 1
+ A9 NH2 ( 1 , 2 ) 1
---------------------------------------------------------------------------
< NO. >< bond (sdt)><angle +( +- )><length ( pt )>
- B1 1 -> 2 ( 1) 330 ( -30) 1 ( 12.76)
- B2 2 -> 3 ( 1) 30 ( 30) 1 ( 12.76)
- B3 3 -> 4 ( 1) 90 ( 90) 1 ( 12.76)
- B4 4 -> 5 ( 2) 150 ( 150) 1 ( 12.76)
- B5 5 -> 6 ( 1) 210 ( -150) 1 ( 12.76)
- B6 6 -> 1 ( 2) 270 ( -90) 1 ( 12.76)
- B7 3 -> 7 ( 2) 330 ( -30) 0.66 ( 8.42)
- B8 2 -> 8 ( 1) 270 ( -90) 0.36 ( 4.59)
- B9 5 -> 9 ( 1) 90 ( 90) 0.66 ( 8.42)
+ B1 1 -> 2 ( 1) 330 ( -30) 1 ( 11)
+ B2 2 -> 3 ( 1) 30 ( 30) 1 ( 11)
+ B3 3 -> 4 ( 1) 90 ( 90) 1 ( 11)
+ B4 4 -> 5 ( 2) 150 ( 150) 1 ( 11)
+ B5 5 -> 6 ( 1) 210 ( -150) 1 ( 11)
+ B6 6 -> 1 ( 2) 270 ( -90) 1 ( 11)
+ B7 3 -> 7 ( 2) 330 ( -30) 0.66 ( 7)
+ B8 2 -> 8 ( 1) 270 ( -90) 0.36 ( 4)
+ B9 5 -> 9 ( 1) 90 ( 90) 0.66 ( 7)
---------------------------------------------------------------------------
<atom>( atom wt )[ mi wt ] < cnt > < sum wt >[ sum mi wt ]
C ( 12.0107)[ 12] * 4 48.04279[ 48]
diff --git a/graphics/mcf2graph/mcf_mplib_exa.pdf b/graphics/mcf2graph/mcf_mplib_exa.pdf
index ed678e74bd..861f6a1596 100644
--- a/graphics/mcf2graph/mcf_mplib_exa.pdf
+++ b/graphics/mcf2graph/mcf_mplib_exa.pdf
Binary files differ
diff --git a/graphics/mcf2graph/mcf_mplib_exa.tex b/graphics/mcf2graph/mcf_mplib_exa.tex
index 666885b91d..1d37cc0492 100644
--- a/graphics/mcf2graph/mcf_mplib_exa.tex
+++ b/graphics/mcf2graph/mcf_mplib_exa.tex
@@ -1,7 +1,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Example of MCF typest with LuaLaTeX(luamplib) by A.Yamaji 2022.03.27
+% Example of MCF typest with LuaLaTeX(luamplib) by A.Yamaji 2022.05.08
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% ** mcf2graph.mp must be version 4.83
+% ** mcf2graph.mp must be version 4.84
% ** use mcf_library.mcf
\documentclass{article}
%------------------------------------------------------------------------------
diff --git a/graphics/pgf/contrib/circuitikz/doc/changelog.tex b/graphics/pgf/contrib/circuitikz/doc/changelog.tex
index 283d1ca4f1..ded454a028 100644
--- a/graphics/pgf/contrib/circuitikz/doc/changelog.tex
+++ b/graphics/pgf/contrib/circuitikz/doc/changelog.tex
@@ -5,6 +5,27 @@ full list of changes.
\begin{itemize}
\item
+ Version 1.5.2 (2022-05-08)
+
+ Adding a couple of new component and a nice feature to transistors and
+ tubes.
+
+ \begin{itemize}
+ \tightlist
+ \item
+ Added TVS diodes (transorb), suggested by
+ \href{https://tex.stackexchange.com/q/642219/38080}{Anisio Rogerio
+ Braga}
+ \item
+ Added proximity switches, suggested by
+ \href{https://github.com/circuitikz/circuitikz/issues/631}{Anisio
+ Rogerio Braga}
+ \item
+ Added partially drawn tube and transistor borders, suggested by
+ \href{https://github.com/circuitikz/circuitikz/issues/602}{Jether
+ Fernandes Reis}
+ \end{itemize}
+\item
Version 1.5.1 (2022-04-26)
Bug fix release.
diff --git a/graphics/pgf/contrib/circuitikz/doc/circuitikz-context.pdf b/graphics/pgf/contrib/circuitikz/doc/circuitikz-context.pdf
index f4602c8d5d..8fac207e51 100644
--- a/graphics/pgf/contrib/circuitikz/doc/circuitikz-context.pdf
+++ b/graphics/pgf/contrib/circuitikz/doc/circuitikz-context.pdf
Binary files differ
diff --git a/graphics/pgf/contrib/circuitikz/doc/circuitikzmanual.pdf b/graphics/pgf/contrib/circuitikz/doc/circuitikzmanual.pdf
index 4d8265968e..b03c2d5f54 100644
--- a/graphics/pgf/contrib/circuitikz/doc/circuitikzmanual.pdf
+++ b/graphics/pgf/contrib/circuitikz/doc/circuitikzmanual.pdf
Binary files differ
diff --git a/graphics/pgf/contrib/circuitikz/doc/circuitikzmanual.tex b/graphics/pgf/contrib/circuitikz/doc/circuitikzmanual.tex
index 04431723a1..74d74b4dcd 100644
--- a/graphics/pgf/contrib/circuitikz/doc/circuitikzmanual.tex
+++ b/graphics/pgf/contrib/circuitikz/doc/circuitikzmanual.tex
@@ -2339,6 +2339,8 @@ The package options \texttt{fulldiode}, \texttt{strokediode}, and \texttt{emptyd
\circuitdescbip*[emptylaserdiode]{empty laser diode}{Empty laser diode\footnotemark}{lasD}
\footnotetext{Added by André Alves in \texttt{v1.4.4}}
\circuitdescbip*[emptyvarcap]{empty varcap}{Empty varcap}{VCo}
+ \circuitdescbip*[emptytvsdiode]{empty TVS diode}{Empty TVS diode, transorb\footnotemark}{tvsDo}
+ \footnotetext{Transobs were suggested by \href{Anisio Braga}{https://tex.stackexchange.com/q/642219/38080}}
\circuitdescbip*[emptybidirectionaldiode]{empty bidirectionaldiode}{Empty bidirectionaldiode}{biDo}
\circuitdescbip[fulldiode] {full diode}{Full diode}{D*}
\circuitdescbip[fullsdiode]{full Schottky diode}{Full Schottky diode}{sD*}
@@ -2349,6 +2351,7 @@ The package options \texttt{fulldiode}, \texttt{strokediode}, and \texttt{emptyd
\circuitdescbip[fulllediode]{full led}{Full led}{leD*}
\circuitdescbip[fulllaserdiode]{full laser diode}{Full laser diode}{lasD*}
\circuitdescbip[fullvarcap]{full varcap}{Full varcap}{VC*}
+ \circuitdescbip[fulltvsdiode]{full TVS diode}{Full TVS diode, transorb}{tvsD*}
\circuitdescbip[fullbidirectionaldiode]{full bidirectionaldiode}{Full bidirectionaldiode}{biD*}
\end{groupdesc}
@@ -3977,6 +3980,8 @@ The position of the circle on collector and emitter by default is the one shown
relative thickness & 1.0 & multiply the class thickness \\
color & default & stroke color: \texttt{default} is the same as the component \\
dash & none & dash pattern: none means unbroken line\footnotemark \\
+ partial borders & none & draw only part of the circle border: none means draw all \\
+ partial border dash & \{\{2pt\}\{2pt\}\} & dash pattern used in partial borders \\
\bottomrule
\end{tabular}
\footnotetext{Follows the syntax of the pattern sequence \texttt{\textbackslash pgfsetdash} --- see \TikZ{} manual for details; phase is always zero. Basically you pass pairs of dash-length -- blank-length dimensions, see the examples.}
@@ -4007,6 +4012,48 @@ Finally, using the class style you can do quite interesting things.
\end{circuitikz}
\end{LTXexample}
+\paragraph{Partially drawn circle borders}
+
+In some circuits, transistor are drawn with partial or dashed border (to convey the meaning of several active components encased in the same physical package, or to signify thermal contact). To achieve this effect, you can use the \texttt{transistor circle/partial border}\footnote{Suggested by \href{https://github.com/circuitikz/circuitikz/issues/602}{Jether Fernandes Reis} for tubes, implemented by Romano in \texttt{v1.5.2}.} key (default \texttt{none}). This key can be set to \texttt{none}, or must be a sequence of \textbf{exactly} 4 numbers, that can have value \texttt{0}, \texttt{1}, or \texttt{2}. Each number define the style of a part of the border to be not drawn, solid or dashed respectively.
+
+The part of the border are numbered from 1 to 4 as shown below:
+\begin{quote}
+\begin{circuitikz}[circuitikz/transistors/fill=cyan!20,
+ circuitikz/transistor circle/partial borders=1212]
+ \draw (0,0) node[npn, tr circle](T){};
+ \draw[red, font=\ttfamily\small\bfseries]
+ ([shift={(.3,-.2)}]T.north east) node{1}
+ ([shift={(.3,.2)}]T.south east) node{2}
+ ([shift={(.2,.2)}]T.south west) node{3}
+ ([shift={(.2,-.2)}]T.north west) node{4}
+ ;
+ \end{circuitikz}
+\end{quote}
+The dashed line pattern can be changed by setting the key \texttt{transistor circle/partial border dash} (default \verb|{{2pt}{2pt}}|). Be careful with the extra set of braces here.
+
+\begin{LTXexample}[varwidth=true]
+\begin{circuitikz}[]
+ \ctikzset{transistors/thickness=4, transistors/fill=cyan!30,
+ transistor circle/relative thickness=0.25,
+ transistor circle/partial borders=2211}
+ \draw (0,0) node[npn, tr circle](Q1){};
+ \ctikzset{transistor circle/dash={{2pt}{2pt}}}
+ \draw (1.5,0) node[npn, tr circle, xscale=-1](Q2){};
+\end{circuitikz}
+\end{LTXexample}
+
+\begin{LTXexample}[varwidth=true]
+\begin{circuitikz}[]
+ \ctikzset{transistors/thickness=4, transistors/fill=cyan!30,
+ transistor circle/relative thickness=0.25,
+ transistor circle/partial borders=0011}
+ \draw (0,0) node[npn, tr circle](Q1){};
+ \ctikzset{transistor circle/dash={{2pt}{2pt}}}
+ \draw (1.5,0) node[npn, tr circle, xscale=-1](Q2){};
+ \draw[dashed] (Q1.circle top) -- (Q2.circle top);
+ \draw[dashed] (Q1.circle bottom) -- (Q2.circle bottom);
+\end{circuitikz}
+\end{LTXexample}
\subsubsection{Transistors anchors}
@@ -4094,6 +4141,12 @@ Additionally, you can access the position for the flyback diodes and possibly sn
\showanchors{pnp}{}(body C in/-45/0.4, body E in/45/0.4, body C out/0/0.4, body E out/0/0.4)
\end{quote}
+Transistor circles also have several anchors on them:
+\begin{quote}
+\showanchors{npn, tr circle}{}(circle center/-135/0.6, circle top/90/0.3, circle left/180/0.2, circle right/0/0.2, circle bottom/-90/0.3, circle C/45/0.2, circle E/-45/0.2)
+\showanchors{pigfete, bodydiode, tr circle}{}(circle center/-135/0.6, circle top/90/0.3, circle left/180/0.2, circle right/0/0.2, circle bottom/-90/0.3, circle C/-45/0.2, circle E/45/0.2)
+\end{quote}
+
The multi-terminal transistors have all the geographical anchors; note though that the \texttt{center} anchor is not the geometrical center of the component, but the logical one (at the same height than the base).
The additional anchors \texttt{vcenter} (vertical geometric center of the collector--emitter zone) and \texttt{gcenter} (graphical center) are provided, as shown in the following picture. They have no bodydiode anchors nor \texttt{inner \emph{up/down}} ones.
@@ -4301,7 +4354,7 @@ Example triode amplifier:
\end{circuitikz}
\end{lstlisting}
-\begin{circuitikz}
+\begin{circuitikz}[scale=0.7, transform shape]
\draw (0,0) node (start) {}
to[sV=$V_i$] ++(0,2+\ctikzvalof{tubes/height})
to[C=$C_i$] ++(2,0) coordinate(Rg)
@@ -4321,6 +4374,72 @@ Example triode amplifier:
\draw (Tri.east) node[right] {12AX7};
\end{circuitikz}
+\subsubsection{Tubes anchors}
+
+Apart from the geographic anchors, which take into account the leads of the components, you have several anchors on the border:
+\begin{quote}
+\geolrcoord{pentode, scale=0.8}
+\geolrcoord{triode, circuitikz/tubes/width=1.4, circuitikz/tubes/height=1, scale=0.8}
+\geolrcoord{triode, circuitikz/tubes/width=1, circuitikz/tubes/height=1, scale=0.8}
+
+\showanchors{pentode, circuitikz/tubes/height=1.8}{}(%
+tube top/90/0.3, tube left/180/0.2, tube right/0/0.2, tube bottom/-90/0.3,
+tube top right/30/0.2, tube top left/150/0.4, tube bottom right/-45/0.4, tube bottom left/-150/0.2,
+tube top center/75/0.5, tube bottom center/-105/0.5)
+\showanchors{pentode,circuitikz/tubes/width=2.6, circuitikz/tubes/tube radius=0.3}{}(%
+tube top/90/0.5, tube left/160/0.5, tube right/0/0.2, tube bottom/-90/0.6,
+tube top right/70/0.4, tube top left/150/0.4, tube bottom right/-45/0.4, tube bottom left/-120/0.4,
+tube right center/30/0.4, tube left center/-120/0.4)
+\end{quote}
+
+\subsubsection{Partially drawn tube borders}\label{sec:partial-tube-borders}
+
+In some circuits, tubes are drawn with partial or dashed border (to convey the meaning of several active components encased in the same physical tube). To achieve this effect, you can use the \texttt{tubes/partial border}\footnote{Suggested by \href{https://github.com/circuitikz/circuitikz/issues/602}{Jether Fernandes Reis}, implemented by Romano in \texttt{v1.5.2}.} key (default \texttt{none}). This key can be set to \texttt{none}, or must be a sequence of \textbf{exactly} 6 numbers, that can have value \texttt{0}, \texttt{1}, or \texttt{2}. Each number define the style of a part of the border to be not drawn, solid or dashed respectively.
+
+The part of the border are numbered from 1 to 6 as shown below:
+\begin{quote}
+\begin{circuitikz}[circuitikz/tubes/fill=cyan!20,
+ circuitikz/tubes/partial borders=121212]
+ \draw (0,0) node[pentode,anchor=control](V){};
+ \draw (4,0) node[pentode,anchor=control,
+ circuitikz/tubes/width=1.4,
+ circuitikz/tubes/height=1](H){};
+ \draw[red, font=\ttfamily\small\bfseries]
+ ([shift={(-.2,-.2)}]V.ne) node{1}
+ ([shift={(.1,0)}]V.e) node{2}
+ ([shift={(-.2,.2)}]V.se) node{3}
+ ([shift={(.2,.2)}]V.sw) node{4}
+ ([shift={(-.1,0)}]V.w) node{5}
+ ([shift={(.2,-.2)}]V.nw) node{6}
+ ([shift={(.2,-.2)}]H.nw) node{1}
+ ([shift={(0,.1)}]H.n) node{2}
+ ([shift={(-.2,-.2)}]H.ne) node{3}
+ ([shift={(-.2,.2)}]H.se) node{4}
+ ([shift={(0,-.1)}]H.s) node{5}
+ ([shift={(.2,.2)}]H.sw) node{6}
+ ;
+ \end{circuitikz}
+\end{quote}
+(notice that the straight parts, if they exist, are numbered \texttt{2} and \texttt{5} in both tubes, vertical or horizontal).
+
+The dashed line pattern can be changed by setting the key \texttt{tubes/partial border dash} (default \verb|{{2pt}{2pt}}|).\footnote{Follows the syntax of the pattern sequence \texttt{\textbackslash pgfsetdash} --- see \TikZ{} manual for details; phase is always zero. Basically you pass pairs of dash-length -- blank-length dimensions, see the examples.} Be careful with the extra set of braces here.
+
+\begin{LTXexample}[varwidth=true, basicstyle=\small\ttfamily]
+\begin{circuitikz}[circuitikz/tubes/fill=cyan!20,
+ circuitikz/tubes/partial borders=012012]
+ \draw (0,0) node[pentode]{};
+ \draw (2,0) node[pentode,
+ circuitikz/tubes/width=1.4,
+ circuitikz/tubes/height=1]{};
+ \draw (1,-2) node[triode,
+ circuitikz/tubes/height=1,
+ circuitikz/tubes/partial border dash=%
+ {{3pt}{1pt}{1pt}{1pt}}]{};
+\end{circuitikz}
+\end{LTXexample}
+
+
+
\subsubsection{Other tubes-like components}
The \texttt{magnetron} and \texttt{dynode} shapes will also scale with \texttt{tubes/scale}.
@@ -5199,6 +5318,31 @@ Finally, the switches are normally drawn using the \texttt{ocirc} shape, but you
\end{circuitikz}
\end{LTXexample}
+\subsubsection{Proximity switches}
+
+\begin{groupdesc}
+ \circuitdesc*{proximeter}{proximeter}{text}(hlines nw/135/0.4, hlines ne/45/0.4, hlines sw/-135/0.4, hlines se/-45/0.4, center/-90/0.4)
+ \circuitdescbip*{inline proximeter}<proximeter>{proximeter switch, inline}{}(left/135/0.4, right/45/0.4)
+\end{groupdesc}
+
+The \texttt{proximeter} shape\footnote{Suggested by \href{https://github.com/circuitikz/circuitikz/issues/631}{Anisio Rogerio Braga}, implemented in \texttt{v1.5.2}; see also \href{https://knowledge.autodesk.com/support/autocad-electrical/learn-explore/caas/CloudHelp/cloudhelp/2019/ENU/AutoCAD-Electrical/files/GUID-1B18023D-241C-4E50-822A-94F873FC258B-htm.html}{here}.} can be used as a dipole with the \texttt{inline proximeter} variant.
+
+It has been assigned to the \texttt{switches} class; you can adjust the (relative) thickness of the inside horizontal lines with the key \texttt{proximeter/hlines thickness} (default \texttt{0.5}) and their vertical position with \texttt{proximeter/hlines position} (default \texttt{0.3}). You can also change the default size of \emph{all} proximeter symbols by changing \texttt{proximeter/width} (only safe at picture level; better set in the preamble if you need to change it. The default value is \texttt{0.3}).
+
+Notice in the following example that, as ever for node-type shape, the text is not included in the bounding box:
+\begin{LTXexample}[varwidth=true, basicstyle=\small\ttfamily]
+\begin{tikzpicture}
+ \tikzset{small up proxi/.style={proximeter, solid,
+ circuitikz/switches/scale=0.707,
+ circuitikz/proximeter/hlines thickness=1,
+ circuitikz/proximeter/hlines position=0.1}}
+ \draw (0,0) to[inline proximeter, l=P1] ++(2,0)
+ to[ccgsw, name=P2] ++(2,0);
+ \draw[dashed] (P2.mid) -- ++(0,0.5)
+ node[small up proxi, above](P2p){Fe}
+ (P2p.north) ++ (0,0.5); % extend bounding box
+\end{tikzpicture}
+\end{LTXexample}
\subsubsection{Rotary switches}
diff --git a/graphics/pgf/contrib/circuitikz/tex/circuitikz.sty b/graphics/pgf/contrib/circuitikz/tex/circuitikz.sty
index 73ef108579..cfd7d63e70 100644
--- a/graphics/pgf/contrib/circuitikz/tex/circuitikz.sty
+++ b/graphics/pgf/contrib/circuitikz/tex/circuitikz.sty
@@ -16,8 +16,8 @@
\providecommand\DeclareRelease[3]{}
\providecommand\DeclareCurrentRelease[2]{}
-\def\pgfcircversion{1.5.1}
-\def\pgfcircversiondate{2022/02/26}
+\def\pgfcircversion{1.5.2}
+\def\pgfcircversiondate{2022/05/08}
\DeclareRelease{0.4}{2012/12/20}{circuitikz-0.4-body.tex}
\DeclareRelease{v0.4}{2012/12/20}{circuitikz-0.4-body.tex}
diff --git a/graphics/pgf/contrib/circuitikz/tex/pgfcircbipoles.tex b/graphics/pgf/contrib/circuitikz/tex/pgfcircbipoles.tex
index 94212962fb..d09e907a8d 100644
--- a/graphics/pgf/contrib/circuitikz/tex/pgfcircbipoles.tex
+++ b/graphics/pgf/contrib/circuitikz/tex/pgfcircbipoles.tex
@@ -3239,6 +3239,9 @@
\ctikzset{bipoles/diode/height/.initial=.50}
\ctikzset{bipoles/diode/width/.initial=.40}
+% for horizontally-double-sided diodes, like tvs diodes (transorb)
+\ctikzset{bipoles/ddiode/width/.initial=.80}% must be 2*diode width
+% for vertically taller diodes
\ctikzset{bipoles/bidirectionaldiode/height/.initial=1.1}
\ctikzset{bipoles/bidirectionaldiode/width/.initial=1}
\ctikzset{bipoles/bidirectionaldiode/diode width left/.initial=.3}
@@ -3803,6 +3806,65 @@
\pgfusepath{draw}
}
+%% Transorbs
+%% Empty zigzag TVS diode (transorb)
+\pgfcircdeclarebipolescaled{diodes}
+{% fix the anchor border
+ \pgfcirc@border@extend@updown{1.3}{1.3}
+}
+{\ctikzvalof{bipoles/diode/height}}
+{emptytvsdiode}
+{\ctikzvalof{bipoles/diode/height}}
+{\ctikzvalof{bipoles/ddiode/width}}
+{
+ \pgf@circ@setlinewidth{bipoles}{\pgfstartlinewidth}
+ \pgfscope
+ \pgfscope
+ \pgftransformxscale{0.5}
+ \pgftransformxshift{\pgf@circ@res@left}
+ \pgf@circ@basicdiodeshape
+ \endpgfscope
+ \pgfscope
+ \pgftransformxscale{-0.5}
+ \pgftransformxshift{\pgf@circ@res@left}
+ \pgf@circ@basicdiodeshape
+ \endpgfscope
+ \pgfpathmoveto{\pgfpoint{0.4\pgf@circ@res@left}{1.3\pgf@circ@res@up}}
+ \pgfpathlineto{\pgfpoint{0pt}{\pgf@circ@res@up}}
+ \pgfpathlineto{\pgfpoint{0pt}{\pgf@circ@res@down}}
+ \pgfpathlineto{\pgfpoint{0.4\pgf@circ@res@right}{1.3\pgf@circ@res@down}}
+ \pgfusepath{draw}
+ \endpgfscope
+}
+%% Black zigzag TVS diode (transorb)
+\pgfcircdeclarebipolescaled{diodes}
+{% fix the anchor border
+ \pgfcirc@border@extend@updown{1.3}{1.3}
+}
+{\ctikzvalof{bipoles/diode/height}}
+{fulltvsdiode}
+{\ctikzvalof{bipoles/diode/height}}
+{\ctikzvalof{bipoles/ddiode/width}}
+{
+ \pgf@circ@setlinewidth{bipoles}{\pgfstartlinewidth}
+ \pgfscope
+ \pgftransformxscale{0.5}
+ \pgftransformxshift{\pgf@circ@res@left}
+ \pgf@circ@fulldiode@triangle@shift
+ \endpgfscope
+ \pgfscope
+ \pgftransformxscale{-0.5}
+ \pgftransformxshift{\pgf@circ@res@left}
+ \pgf@circ@fulldiode@triangle@shift
+ \endpgfscope
+ \pgfpathmoveto{\pgfpoint{0.4\pgf@circ@res@left}{1.3\pgf@circ@res@up}}
+ \pgfpathlineto{\pgfpoint{0pt}{\pgf@circ@res@up}}
+ \pgfpathlineto{\pgfpoint{0pt}{\pgf@circ@res@down}}
+ \pgfpathlineto{\pgfpoint{0.4\pgf@circ@res@right}{1.3\pgf@circ@res@down}}
+ \pgfusepath{draw}
+}
+
+
%% Empty bidirectionaldiode
\pgfcircdeclarebipolescaled{diodes}
{}
@@ -4174,6 +4236,8 @@
\pgfcirc@style@to@style{#1 photodiode}{pD#2}
\pgfcirc@activate@bipole{l}{#1varcap}{#1varcap}{#1 varcap}
\pgfcirc@style@to@style{#1 varcap}{VC#2}
+ \pgfcirc@activate@bipole{l}{#1tvsdiode}{#1tvsdiode}{#1 TVS diode}
+ \pgfcirc@style@to@style{#1 TVS diode}{tvsD#2}
\pgfcirc@activate@bipole{l}{#1bidirectionaldiode}{#1bidirectionaldiode}{#1 bidirectionaldiode}
\pgfcirc@style@to@style{#1 bidirectionaldiode}{biD#2}
\pgfcirc@activate@bipole{l}{#1thyristor}{#1thyristor}{#1 thyristor}
@@ -4210,6 +4274,8 @@
\pgfcirc@style@to@style{#1 photodiode}{pD#2}
\pgfcirc@node@to@style{l}{emptyvarcap}{#1 varcap}{\circuitikzbasekey/bipole/is strokedsymbol=true}
\pgfcirc@style@to@style{#1 varcap}{VC#2}
+ \pgfcirc@node@to@style{l}{emptytvsdiode}{#1 TVS diode}{\circuitikzbasekey/bipole/is strokedsymbol=true}
+ \pgfcirc@style@to@style{#1 TVS diode}{tvsD#2}
\pgfcirc@node@to@style{l}{emptybidirectionaldiode}{#1 bidirectionaldiode}{\circuitikzbasekey/bipole/is strokedsymbol=true}
\pgfcirc@style@to@style{#1 bidirectionaldiode}{biD#2}
\pgfcirc@node@to@style{l}{emptythyristor}{#1 thyristor}{\circuitikzbasekey/bipole/is strokedsymbol=true}
@@ -4242,12 +4308,12 @@
\pgfcirc@style@to@style{led}{leD}
\pgfcirc@style@to@style{\pgfcircdiodestylemacro photodiode}{photodiode}
\pgfcirc@style@to@style{photodiode}{pD}
-
\pgfcirc@style@to@style{\pgfcircdiodestylemacro laser diode}{laser diode}
\pgfcirc@style@to@style{laser diode}{lasD}
-
\pgfcirc@style@to@style{\pgfcircdiodestylemacro varcap}{varcap}
\pgfcirc@style@to@style{varcap}{VC}
+\pgfcirc@style@to@style{\pgfcircdiodestylemacro TVS diode}{TVS diode}
+\pgfcirc@style@to@style{TVS diode}{tvsD}
\pgfcirc@style@to@style{\pgfcircdiodestylemacro bidirectionaldiode}{bidirectionaldiode}
\pgfcirc@style@to@style{bidirectionaldiode}{biD}
\pgfcirc@style@to@style{\pgfcircdiodestylemacro thyristor}{thyristor}
@@ -4966,6 +5032,90 @@
\pgfcirc@activate@bipole{l}{cuteopeningswitch}{cuteopeningswitch}{cute opening switch}
\pgfcirc@style@to@style{cute opening switch}{cogsw}% %>>>
+%% Proximity switch auxiliary shapes%<<<
+%% proximeter shape, for usage with switches
+\ctikzset{proximeter/width/.initial=0.3}
+\ctikzset{proximeter/hlines thickness/.initial=0.5}
+\ctikzset{proximeter/hlines position/.initial=0.3}
+\pgfdeclareshape{proximeter}
+{
+ \savedmacro{\ctikzclass}{\edef\ctikzclass{switches}}
+ \saveddimen{\scaledRlen}{\pgfmathsetlength{\pgf@x}{\ctikzvalof{\ctikzclass/scale}\pgf@circ@Rlen}}
+ \savedmacro{\hlinepos}{\edef\hlinepos{\ctikzvalof{proximeter/hlines position}}}
+ \savedanchor\northeast{%
+ \pgfmathsetlength{\pgf@y}{\ctikzvalof{proximeter/width}*\ctikzvalof{\ctikzclass/scale}*\pgf@circ@Rlen}
+ \pgf@x=\pgf@y
+ }
+ \anchor{center}{\pgfpointorigin}
+ % geo anchors based on north-east
+ \pgfcirc@northeast@symmetric@geoanchors
+ \anchor{text}{%
+ \northeast
+ \pgf@x=\dimexpr -.5\wd\pgfnodeparttextbox\relax
+ \advance\pgf@y by .6\ht\pgfnodeparttextbox\relax
+ }
+ \anchor{hlines ne}{%
+ \northeast
+ \pgf@y=\hlinepos\pgf@y
+ \advance\pgf@x by -\pgf@y
+ }
+ \anchor{hlines nw}{%
+ \northeast
+ \pgf@y=\hlinepos\pgf@y
+ \advance\pgf@x by -\pgf@y\pgf@x=-\pgf@x
+ }
+ \anchor{hlines se}{%
+ \northeast
+ \pgf@y=\hlinepos\pgf@y
+ \advance\pgf@x by -\pgf@y
+ \pgf@y=-\pgf@y
+ }
+ \anchor{hlines sw}{%
+ \northeast
+ \pgf@y=\hlinepos\pgf@y
+ \advance\pgf@x by -\pgf@y\pgf@x=-\pgf@x
+ \pgf@y=-\pgf@y
+ }
+ \anchorborder{
+ % \typeout{IN\space X:\the\pgf@x\space Y:\the\pgf@y}
+ \pgfmathsetmacro{\@@switchx}{ifthenelse(\pgf@x>0,1,-1)}
+ \pgfmathsetmacro{\@@switchy}{ifthenelse(\pgf@y>0,1,-1)}
+ \pgfmathsetlength{\pgf@xa}{abs(\pgf@x)}
+ \pgfmathsetlength{\pgf@ya}{abs(\pgf@y)}
+ \pgfextracty{\pgf@circ@res@up}{\northeast}
+ % \typeout{MID\space X:\the\pgf@xa\space Y:\the\pgf@ya\space L:\the\pgf@circ@res@up}
+ % \typeout{MID\space SX:\@@switchx\space SY:\@@switchy}
+ \pgfpointintersectionoflines
+ {\pgfpointorigin}{\pgfqpoint{\pgf@xa}{\pgf@ya}}
+ {\pgfqpoint{0pt}{\pgf@circ@res@up}}{\pgfqpoint{\pgf@circ@res@up}{0pt}}
+ % \typeout{CROSS \space X:\the\pgf@x\space Y:\the\pgf@y}
+ \pgf@x=\@@switchx\pgf@x
+ \pgf@y=\@@switchy\pgf@y
+ }
+ \pgf@circ@draw@component{
+ \northeast\pgf@circ@res@temp=\pgf@y
+ \pgf@circ@setcolor
+ \pgf@circ@setlinewidth{tripoles}{\pgflinewidth}
+ \pgfpathmoveto{\pgfpoint{-\pgf@circ@res@temp}{0pt}}
+ \pgfpathlineto{\pgfpoint{0pt}{\pgf@circ@res@temp}}
+ \pgfpathlineto{\pgfpoint{\pgf@circ@res@temp}{0pt}}
+ \pgfpathlineto{\pgfpoint{0pt}{-\pgf@circ@res@temp}}
+ \pgfpathclose
+ \pgf@circ@draworfill
+ \pgfsetlinewidth{\ctikzvalof{proximeter/hlines thickness}*\pgflinewidth}
+ \pgfmathsetlength{\pgf@circ@res@up}{\hlinepos*\pgf@circ@res@temp}
+ \pgfmathsetlength{\pgf@circ@res@right}{\pgf@circ@res@temp-\pgf@circ@res@up}
+ \pgfpathmoveto{\pgfpoint{-\pgf@circ@res@right}{\pgf@circ@res@up}}
+ \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@up}}
+ \pgfpathmoveto{\pgfpoint{-\pgf@circ@res@right}{-\pgf@circ@res@up}}
+ \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{-\pgf@circ@res@up}}
+ \pgfusepath{draw}
+ }
+
+}
+\pgfcirc@node@to@path{proximeter}{inline proximeter}{}
+% %>>>
+
%%%%%%%%%%%%%%%%%
%% Instruments
%%%%%%%%%%%%%%%%%
diff --git a/graphics/pgf/contrib/circuitikz/tex/pgfcirctripoles.tex b/graphics/pgf/contrib/circuitikz/tex/pgfcirctripoles.tex
index 711276dd77..596171c5ad 100644
--- a/graphics/pgf/contrib/circuitikz/tex/pgfcirctripoles.tex
+++ b/graphics/pgf/contrib/circuitikz/tex/pgfcirctripoles.tex
@@ -3370,11 +3370,64 @@
\newif\ifpgf@circ@trcircle\pgf@circ@trcirclefalse
\ctikzset{tr circle/.is if=pgf@circ@trcircle}
\tikzset{tr circle/.is if=pgf@circ@trcircle}
+% partial borders styles
+% this can be "none" or 4 numbers saying the style for each part:
+% 0 --- nothing, 1 --- solid, 2 --- dashed
+\ctikzset{transistor circle/partial borders/.initial=none} % Value none for normal borders
+\ctikzset{transistor circle/partial border dash/.initial={{2pt}{2pt}}}
%%>>>
%% definitions of transistor shapes%<<<
%
+% draw partial transistor outline
+%
+\def\pgf@circ@trcircle@split#1#2#3#4\relax{%split the six numbers
+ \edef\@@a{#1}\edef\@@b{#2}\edef\@@c{#3}\edef\@@d{#4}%
+}
+\def\pgf@circ@trcircle@setdash{%
+ \edef\@@dash{\ctikzvalof{transistor circle/partial border dash}}%
+ % \typeout{DASH:\@@dash}%
+ \expandafter\pgfsetdash\expandafter{\@@dash}{0pt}%
+}
+% this is the same as the tubes' one, but let's keep it separated
+\def\pgf@circ@trcircle@draw@style#1{%
+ \ifcase#1
+ \pgfusepath{discard}% case 0, will discard the path
+ \or
+ \pgfsetdash{}{0pt}\pgfusepath{draw}% case 1, solid
+ \or
+ \pgf@circ@trcircle@setdash\pgfusepath{draw}% case 2, dashed
+ \else
+ \pgfutil@packagewarning{circuitikz}{Transistor circle draw style not known!}%
+ \pgfusepath{draw}%
+ \fi
+}
+%
% add a circle to the transistor:
+\def\pgf@circ@trcircle@draw@partial#1{%
+ \expandafter\pgf@circ@trcircle@split#1\relax
+ \typeout{PARTIAL: \@@a:\@@b:\@@c:\@@d}
+ \pgfscope % right side upper arc
+ \pgfpathmoveto{\pgfpoint{\circleleft+\circleradius}{\circleradius}}
+ \pgfpatharc{90}{0}{\circleradius}
+ \pgf@circ@trcircle@draw@style{\@@a}
+ \endpgfscope
+ \pgfscope % right side lower arc
+ \pgfpathmoveto{\pgfpoint{\circleleft+2*\circleradius}{0pt}}
+ \pgfpatharc{0}{-90}{\circleradius}
+ \pgf@circ@trcircle@draw@style{\@@b}
+ \endpgfscope
+ \pgfscope % left side lower arc
+ \pgfpathmoveto{\pgfpoint{\circleleft+\circleradius}{-\circleradius}}
+ \pgfpatharc{-90}{-180}{\circleradius}
+ \pgf@circ@trcircle@draw@style{\@@c}
+ \endpgfscope
+ \pgfscope % left side upper arc
+ \pgfpathmoveto{\pgfpoint{\circleleft}{0pt}}
+ \pgfpatharc{-180}{-270}{\circleradius}
+ \pgf@circ@trcircle@draw@style{\@@d}
+ \endpgfscope
+}
%
\def\pgfcirc@transistorcircle{
\ifpgf@circ@trcircle
@@ -3394,7 +3447,15 @@
% \pgfmathsetlength{\pgf@circ@res@temp}{((#2+\extrabodydiodelen)-(#1)+(#3)*(#3)/((#2+\extrabodydiodelen)-(#1)))/2}
% \pgfpathcircle{\pgfpoint{#1+\pgf@circ@res@temp}{0pt}}{\pgf@circ@res@temp}
\pgfpathcircle{\pgfpoint{\circleleft+\circleradius}{0pt}}{\circleradius}
- \pgf@circ@draworfill
+ \edef\@@partial{\ctikzvalof{transistor circle/partial borders}}
+ \ifx\@@partial\pgf@nonetext
+ % Circle fill and draw if it's not partial... for speed
+ \pgf@circ@draworfill
+ \else
+ % otherwise, just fill and do the partial fill
+ \pgf@circ@maybefill
+ \pgf@circ@trcircle@draw@partial{\@@partial}
+ \fi
\endpgfscope
\fi
}
@@ -3539,6 +3600,19 @@
\anchor{circle center}{
\pgf@y=0pt\pgf@x=\circleleft\advance\pgf@x by\circleradius
}
+ \anchor{circle top}{
+ \pgf@y=\circleradius\pgf@x=\circleleft\advance\pgf@x by\circleradius
+ }
+ \anchor{circle bottom}{
+ \pgf@y=-\circleradius\pgf@x=\circleleft\advance\pgf@x by\circleradius
+ }
+ \anchor{circle left}{
+ \pgf@y=0pt\pgf@x=\circleleft
+ }
+ \anchor{circle right}{
+ \pgf@y=0pt\pgf@x=\circleleft
+ \advance\pgf@x by \circleradius\advance\pgf@x by \circleradius
+ }
\savedanchor{\centergap}{% this is the center position between gate and base
% get "left"
\pgfmathsetlength{\pgf@circ@scaled@Rlen}{\ctikzvalof{\ctikzclass/scale}\pgf@circ@Rlen}
@@ -7965,6 +8039,11 @@
\ctikzset{tubes/cathode right extend/.initial=0.075} % extension at the right side
\ctikzset{tubes/filament distance/.initial=0.1} % distance from cathode
\ctikzset{tubes/filament angle/.initial=15} % Angle from centerpoint
+% partial borders styles
+% this can be "none" or 6 numbers saying the style for each part:
+% 0 --- nothing, 1 --- solid, 2 --- dashed
+\ctikzset{tubes/partial borders/.initial=none} % Value none for normal borders
+\ctikzset{tubes/partial border dash/.initial={{2pt}{2pt}}}
\ctikzset{/tikz/circuitikz/tripoles/magnetron/width/.initial=1}
@@ -8138,27 +8217,135 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% Electronic tubes, submitted by J. op den Brouw
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
+%
+% draw partial tube outline
+%
+\def\pgf@circ@tubes@split#1#2#3#4#5#6\relax{%split the six numbers
+ \edef\@@a{#1}\edef\@@b{#2}\edef\@@c{#3}\edef\@@d{#4}\edef\@@e{#5}\edef\@@f{#6}%
+}
+\def\pgf@circ@tubes@setdash{%
+ \edef\@@dash{\ctikzvalof{tubes/partial border dash}}%
+ % \typeout{DASH:\@@dash}%
+ \expandafter\pgfsetdash\expandafter{\@@dash}{0pt}%
+}
+% this is the same as the transistor circles' one, but let's keep it separated
+\def\pgf@circ@tubes@draw@style#1{%
+ \ifcase#1
+ \pgfusepath{discard}% case 0, will discard the path
+ \or
+ \pgfsetdash{}{0pt}\pgfusepath{draw}% case 1, solid
+ \or
+ \pgf@circ@tubes@setdash\pgfusepath{draw}% case 2, dashed
+ \else
+ \pgfutil@packagewarning{circuitikz}{Tube border draw style not known!}%
+ \pgfusepath{draw}%
+ \fi
+}
+\def\pgf@circ@tubes@draw@partial#1{%
+ \expandafter\pgf@circ@tubes@split#1\relax
+ % \typeout{PARTIAL: \@@a:\@@b:\@@c:\@@d:\@@e:\@@f}
+ \ifdim\ctikzvalof{tubes/width}pt>\ctikzvalof{tubes/height}pt\relax
+ % horizontal tube
+ \pgfutil@tempdima=\pgf@circ@res@right
+ \advance\pgfutil@tempdima by -\pgf@circ@res@up
+ \pgfscope % left side upper arc
+ \pgfpathmoveto{\pgfpoint{-\pgf@circ@res@right}{0pt}}
+ \pgfpatharc{180}{90}{\pgf@circ@res@up}
+ \pgf@circ@tubes@draw@style{\@@a}
+ \endpgfscope
+ \pgfscope % upper horizontal part
+ \pgfpathmoveto{\pgfpoint{-\pgfutil@tempdima}{\pgf@circ@res@up}}
+ \pgfpathlineto{\pgfpoint{\pgfutil@tempdima}{\pgf@circ@res@up}}
+ \pgf@circ@tubes@draw@style{\@@b}
+ \endpgfscope
+ \pgfscope % right side upper arc
+ \pgfpathmoveto{\pgfpoint{\pgfutil@tempdima}{\pgf@circ@res@up}}
+ \pgfpatharc{90}{0}{\pgf@circ@res@up}
+ \pgf@circ@tubes@draw@style{\@@c}
+ \endpgfscope
+ \pgfscope % right side lower arc
+ \pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{0pt}}
+ \pgfpatharc{0}{-90}{\pgf@circ@res@up}
+ \pgf@circ@tubes@draw@style{\@@d}
+ \endpgfscope
+ \pgfscope % lower horizontal part
+ \pgfpathmoveto{\pgfpoint{\pgfutil@tempdima}{-\pgf@circ@res@up}}
+ \pgfpathlineto{\pgfpoint{-\pgfutil@tempdima}{-\pgf@circ@res@up}}
+ \pgf@circ@tubes@draw@style{\@@e}
+ \endpgfscope
+ \pgfscope % left side lower arc
+ \pgfpathmoveto{\pgfpoint{-\pgfutil@tempdima}{-\pgf@circ@res@up}}
+ \pgfpatharc{270}{180}{\pgf@circ@res@up}
+ \pgf@circ@tubes@draw@style{\@@f}
+ \endpgfscope
+ \else
+ % vertical tube
+ \pgfutil@tempdima=\pgf@circ@res@up
+ \advance\pgfutil@tempdima by -\pgf@circ@res@right
+ \pgfscope % left side upper arc
+ \pgfpathmoveto{\pgfpoint{0pt}{\pgf@circ@res@up}}
+ \pgfpatharc{90}{0}{\pgf@circ@res@right}
+ \pgf@circ@tubes@draw@style{\@@a}
+ \endpgfscope
+ \pgfscope % right vertical part
+ \pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{\pgfutil@tempdima}}
+ \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{-\pgfutil@tempdima}}
+ \pgf@circ@tubes@draw@style{\@@b}
+ \endpgfscope
+ \pgfscope % right side lower arc
+ \pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{-\pgfutil@tempdima}}
+ \pgfpatharc{0}{-90}{\pgf@circ@res@right}
+ \pgf@circ@tubes@draw@style{\@@c}
+ \endpgfscope
+ \pgfscope % right side lower arc
+ \pgfpathmoveto{\pgfpoint{0pt}{-\pgf@circ@res@up}}
+ \pgfpatharc{-90}{-180}{\pgf@circ@res@right}
+ \pgf@circ@tubes@draw@style{\@@d}
+ \endpgfscope
+ \pgfscope % left vertical part
+ \pgfpathmoveto{\pgfpoint{-\pgf@circ@res@right}{-\pgfutil@tempdima}}
+ \pgfpathlineto{\pgfpoint{-\pgf@circ@res@right}{\pgfutil@tempdima}}
+ \pgf@circ@tubes@draw@style{\@@e}
+ \endpgfscope
+ \pgfscope % left side upper arc
+ \pgfpathmoveto{\pgfpoint{-\pgf@circ@res@right}{\pgfutil@tempdima}}
+ \pgfpatharc{180}{90}{\pgf@circ@res@right}
+ \pgf@circ@tubes@draw@style{\@@f}
+ \endpgfscope
+ \fi
+}
% Draw tube outline
\def\pgf@circ@tubes@drawtube{%
- \ifdim\ctikzvalof{tubes/width}pt>\ctikzvalof{tubes/height}pt\relax
- \pgfpathmoveto{\pgfpoint{0pt}{\pgf@circ@res@up}}
- \pgfutil@tempdima=\pgf@circ@res@right
- \advance\pgfutil@tempdima by -\pgf@circ@res@up
- \pgfpathlineto{\pgfpoint{\pgfutil@tempdima}{\pgf@circ@res@up}}
- \pgfpatharc{90}{-90}{\pgf@circ@res@up}
- \pgfpathlineto{\pgfpoint{-\pgfutil@tempdima}{-\pgf@circ@res@up}}
- \pgfpatharc{270}{90}{\pgf@circ@res@up}
- \else
- \pgfpathmoveto{\pgfpoint{-\pgf@circ@res@right}{0pt}}
- \pgfutil@tempdima=\pgf@circ@res@up
- \advance\pgfutil@tempdima by -\pgf@circ@res@right
- \pgfpathlineto{\pgfpoint{-\pgf@circ@res@right}{\pgfutil@tempdima}}
- \pgfpatharc{180}{0}{\pgf@circ@res@right}
- \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{-\pgfutil@tempdima}}
- \pgfpatharc{180}{0}{-\pgf@circ@res@right}
- \fi
- \pgfpathclose
+ \ifdim\ctikzvalof{tubes/width}pt>\ctikzvalof{tubes/height}pt\relax
+ % horizontal tube
+ \pgfpathmoveto{\pgfpoint{0pt}{\pgf@circ@res@up}}
+ \pgfutil@tempdima=\pgf@circ@res@right
+ \advance\pgfutil@tempdima by -\pgf@circ@res@up
+ \pgfpathlineto{\pgfpoint{\pgfutil@tempdima}{\pgf@circ@res@up}}
+ \pgfpatharc{90}{-90}{\pgf@circ@res@up}
+ \pgfpathlineto{\pgfpoint{-\pgfutil@tempdima}{-\pgf@circ@res@up}}
+ \pgfpatharc{270}{90}{\pgf@circ@res@up}
+ \else
+ % vertical tube
+ \pgfpathmoveto{\pgfpoint{-\pgf@circ@res@right}{0pt}}
+ \pgfutil@tempdima=\pgf@circ@res@up
+ \advance\pgfutil@tempdima by -\pgf@circ@res@right
+ \pgfpathlineto{\pgfpoint{-\pgf@circ@res@right}{\pgfutil@tempdima}}
+ \pgfpatharc{180}{0}{\pgf@circ@res@right}
+ \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{-\pgfutil@tempdima}}
+ \pgfpatharc{180}{0}{-\pgf@circ@res@right}
+ \fi
+ \pgfpathclose
+ \edef\@@partial{\ctikzvalof{tubes/partial borders}}
+ \ifx\@@partial\pgf@nonetext
+ % Tube fill and draw if it's not partial... for speed
+ \pgf@circ@draworfill
+ \else
+ % otherwise, just fill and do the partial fill
+ \pgf@circ@maybefill
+ \pgf@circ@tubes@draw@partial{\@@partial}
+ %
+ \fi
}
%% The diode (tube), triode, tetrode and pentode only differ in the
@@ -8169,9 +8356,6 @@
\pgfdeclareshape{#1}{
\savedmacro{\ctikzclass}{\edef\ctikzclass{tubes}}
\saveddimen{\scaledRlen}{\pgfmathsetlength{\pgf@x}{\ctikzvalof{\ctikzclass/scale}\pgf@circ@Rlen}}
- \anchor{center}{
- \pgfpointorigin
- }
\savedanchor\northwest{%
\pgfmathsetlength{\pgf@circ@scaled@Rlen}{\ctikzvalof{\ctikzclass/scale}\pgf@circ@Rlen}
\pgf@circ@res@up=\ctikzvalof{tubes/height}\pgf@circ@scaled@Rlen
@@ -8182,40 +8366,58 @@
\pgf@x=-\pgf@circ@res@right
\pgf@x=.5\pgf@x
}
- \anchor{north} {%
- \northwest
- \pgf@x=0pt
- }
- \anchor{east}{%
- \northwest
- \pgf@x=-\pgf@x
- \pgf@y=0pt
- }
- \anchor{south}{%
- \northwest
- \pgf@y=-\pgf@y
- \pgf@x=0pt
- }
- \anchor{west}{%
- \northwest
- \pgf@y=0pt
- }
- \anchor{north west}{%
- \northwest
- }
- \anchor{north east}{%
- \northwest
- \pgf@x=-\pgf@x
- }
- \anchor{south east}{
- \northwest
- \pgf@x=-\pgf@x
- \pgf@y=-\pgf@y
+ \savedanchor\tubene{%
+ \pgfmathsetlength{\pgf@circ@scaled@Rlen}{\ctikzvalof{\ctikzclass/scale}\pgf@circ@Rlen}
+ \pgf@circ@res@temp=\ctikzvalof{tubes/height}\pgf@circ@scaled@Rlen
+ \pgf@circ@res@other=\ctikzvalof{tubes/width}\pgf@circ@scaled@Rlen
+ \pgf@circ@res@up=\ctikzvalof{tubes/tube radius}\pgf@circ@res@temp
+ \pgf@circ@res@right=\ctikzvalof{tubes/tube radius}\pgf@circ@res@other
+ \pgf@y=\pgf@circ@res@up
+ \pgf@x=\pgf@circ@res@right
}
- \anchor{south west}{
- \northwest
- \pgf@y=-\pgf@y
+ \savedanchor\tubesquarene{%
+ \pgfmathsetlength{\pgf@circ@scaled@Rlen}{\ctikzvalof{\ctikzclass/scale}\pgf@circ@Rlen}
+ \pgf@circ@res@temp=\ctikzvalof{tubes/height}\pgf@circ@scaled@Rlen
+ \pgf@circ@res@other=\ctikzvalof{tubes/width}\pgf@circ@scaled@Rlen
+ \pgf@circ@res@up=\ctikzvalof{tubes/tube radius}\pgf@circ@res@temp
+ \pgf@circ@res@right=\ctikzvalof{tubes/tube radius}\pgf@circ@res@other
+ \ifdim\ctikzvalof{tubes/width}pt>\ctikzvalof{tubes/height}pt\relax
+ % horizontal
+ \pgf@y=\pgf@circ@res@up
+ \pgf@x=\pgf@circ@res@right\advance\pgf@x by -\pgf@circ@res@up
+ \else
+ % vertical
+ \pgf@x=\pgf@circ@res@right
+ \pgf@y=\pgf@circ@res@up\advance\pgf@y by -\pgf@circ@res@right
+ \fi
}
+ \anchor{tube ne}{\tubene}
+ \anchor{tubesq ne}{\tubesquarene}
+ % tube shape anchors: geo
+ \anchor{tube top}{\tubene\pgf@x=0pt\relax}
+ \anchor{tube bottom}{\tubene\pgf@x=0pt\pgf@y=-\pgf@y}
+ \anchor{tube right}{\tubene\pgf@y=0pt\relax}
+ \anchor{tube left}{\tubene\pgf@y=0pt\pgf@x=-\pgf@x}
+ % tube shape straight part anchors
+ \anchor{tube top right}{\tubesquarene}
+ \anchor{tube bottom right}{\tubesquarene\pgf@y=-\pgf@y}
+ \anchor{tube top left}{\tubesquarene\pgf@x=-\pgf@x}
+ \anchor{tube bottom left}{\tubesquarene\pgf@y=-\pgf@y\pgf@x=-\pgf@x}
+ % tube shape centers
+ \anchor{tube top center}{\tubesquarene\pgf@x=0pt\relax}
+ \anchor{tube bottom center}{\tubesquarene\pgf@y=-\pgf@y\pgf@x=0pt\relax}
+ \anchor{tube right center}{\tubesquarene\pgf@y=0pt\relax}
+ \anchor{tube left center}{\tubesquarene\pgf@x=-\pgf@x\pgf@y=0pt\relax}
+ % rest of anchors
+ \anchor{center}{\pgfpointorigin}
+ % geo anchors based on north-west
+ \pgfcirc@northwest@symmetric@geoanchors
+ % text anchor
+ \anchor{text}{%
+ \northwest\pgf@x=-\pgf@x
+ \pgf@y=-.5\ht\pgfnodeparttextbox
+ }
+ % specific anchors
\anchor{anode} {%
\northwest
\pgf@x=0pt
@@ -8271,9 +8473,6 @@
\pgf@circ@res@up=0.5\pgf@circ@res@up
\pgf@circ@res@right=0.5\pgf@circ@res@right
- % Tube fill color (if any)
- \pgf@circ@draworfill
-
% Grid drawing
#3%
diff --git a/graphics/pgf/contrib/circuitikz/tex/t-circuitikz.tex b/graphics/pgf/contrib/circuitikz/tex/t-circuitikz.tex
index 261eeafcc5..7cf1d37aa0 100644
--- a/graphics/pgf/contrib/circuitikz/tex/t-circuitikz.tex
+++ b/graphics/pgf/contrib/circuitikz/tex/t-circuitikz.tex
@@ -10,8 +10,8 @@
%
% See the files gpl-3.0_license.txt and lppl-1-3c_license.txt for more details.
-\def\pgfcircversion{1.5.1}
-\def\pgfcircversiondate{2022/02/26}
+\def\pgfcircversion{1.5.2}
+\def\pgfcircversiondate{2022/05/08}
\writestatus{loading}{\pgfcircversiondate{} The CircuiTikz circuit drawing package version \pgfcircversion}
\usemodule[tikz]
diff --git a/macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/demo/trigon_demo.pdf b/macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/demo/trigon_demo.pdf
index 0b5b1c54dd..f9616191a3 100644
--- a/macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/demo/trigon_demo.pdf
+++ b/macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/demo/trigon_demo.pdf
Binary files differ
diff --git a/macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/docs/trigontheme.pdf b/macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/docs/trigontheme.pdf
index 44f97f0726..23b44851fb 100644
--- a/macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/docs/trigontheme.pdf
+++ b/macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/docs/trigontheme.pdf
Binary files differ
diff --git a/macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/source/beamercolorthemetrigon.dtx b/macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/source/beamercolorthemetrigon.dtx
index e45237be4d..0674562c27 100644
--- a/macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/source/beamercolorthemetrigon.dtx
+++ b/macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/source/beamercolorthemetrigon.dtx
@@ -13,7 +13,7 @@
% \iffalse
%<*package>
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{beamercolorthemetrigon}[2022/03/19 v0.6.4 Trigon color theme]
+\ProvidesPackage{beamercolorthemetrigon}[2022/05/08 v0.6.5 Trigon color theme]
%</package>
% \fi
% \CheckSum{0}
diff --git a/macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/source/beamerfontthemetrigon.dtx b/macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/source/beamerfontthemetrigon.dtx
index d3c8c302d5..8329019f27 100644
--- a/macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/source/beamerfontthemetrigon.dtx
+++ b/macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/source/beamerfontthemetrigon.dtx
@@ -13,7 +13,7 @@
% \iffalse
%<*package>
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{beamerfontthemetrigon}[2022/03/19 v0.6.4 Trigon font theme]
+\ProvidesPackage{beamerfontthemetrigon}[2022/05/08 v0.6.5 Trigon font theme]
%</package>
% \fi
% \CheckSum{0}
diff --git a/macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/source/beamerinnerthemetrigon.dtx b/macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/source/beamerinnerthemetrigon.dtx
index a0adf0a1c4..c79cb5d522 100644
--- a/macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/source/beamerinnerthemetrigon.dtx
+++ b/macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/source/beamerinnerthemetrigon.dtx
@@ -13,7 +13,7 @@
% \iffalse
%<*package>
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{beamerinnerthemetrigon}[2022/03/19 v0.6.4 Trigon inner theme]
+\ProvidesPackage{beamerinnerthemetrigon}[2022/05/08 v0.6.5 Trigon inner theme]
%</package>
% \fi
% \CheckSum{0}
@@ -181,6 +181,7 @@
% Defines a colored triangle with the base on the left side (pointing right).
% \begin{macrocode}
\newcommand{\leftColorTriangle}[3]{
+ \clip(0,0) rectangle(\the\paperwidth,\the\paperheight);
\path[fill=#3]
\leftTriangle{#1}{#2}
}
@@ -191,6 +192,7 @@
% Defines a colored triangle with the base on the right side (pointing left).
% \begin{macrocode}
\newcommand{\rightColorTriangle}[3]{
+ \clip(0,0) rectangle(\the\paperwidth,\the\paperheight);
\path[fill=#3]
\rightTriangle{#1}{#2}
}
@@ -201,6 +203,7 @@
% Defines a colored triangle with the base on the bottom side (pointing top).
% \begin{macrocode}
\newcommand{\topColorTriangle}[3]{
+ \clip(0,0) rectangle(\the\paperwidth,\the\paperheight);
\path[fill=#3]
\topTriangle{#1}{#2}
}
@@ -281,6 +284,7 @@
\begin{tikzpicture}
\useasboundingbox (0,0) rectangle(\the\paperwidth,\the\paperheight);
\begin{scope}[blend group=multiply]
+ \clip(0,0) rectangle(\the\paperwidth,\the\paperheight);
\path[fill=tTheme]\leftTriangle{0.5\paperwidth}{0};
\topColorTriangle{0.73\paperwidth}{0.70\paperheight}{tGrey!30!tBg};
\ifx\inserttitlegraphic\@empty
@@ -290,6 +294,7 @@
\node[anchor=north west, inner sep=0pt, outer sep=0pt] at (0,\the\paperheight) {\inserttitlegraphic};
\fi
\end{scope}
+ \clip(0,0) rectangle(\the\paperwidth,\the\paperheight);
\path[fill=tBg]\rightTriangle{0.45\paperwidth}{\the\paperheight};
\ifx\logbig\@empty \else
\node[anchor=north east,inner sep=0mm] at
diff --git a/macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/source/beamerouterthemetrigon.dtx b/macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/source/beamerouterthemetrigon.dtx
index 29eaa37c40..c350cf9c63 100644
--- a/macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/source/beamerouterthemetrigon.dtx
+++ b/macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/source/beamerouterthemetrigon.dtx
@@ -13,7 +13,7 @@
% \iffalse
%<*package>
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{beamerouterthemetrigon}[2022/03/19 v0.6.4 Trigon outer theme]
+\ProvidesPackage{beamerouterthemetrigon}[2022/05/08 v0.6.5 Trigon outer theme]
%</package>
% \fi
% \CheckSum{0}
diff --git a/macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/source/beamerthemetrigon.dtx b/macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/source/beamerthemetrigon.dtx
index 71fd1a5978..26ba892133 100644
--- a/macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/source/beamerthemetrigon.dtx
+++ b/macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/source/beamerthemetrigon.dtx
@@ -13,7 +13,7 @@
% \iffalse
%<*package>
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{beamerthemetrigon}[2022/03/19 v0.6.4 Trigon Beamer theme]
+\ProvidesPackage{beamerthemetrigon}[2022/05/08 v0.6.5 Trigon Beamer theme]
%</package>
% \fi
% \CheckSum{0}
diff --git a/macros/latex/contrib/changebar/CATALOG b/macros/latex/contrib/changebar/CATALOG
index 93611fa94a..a4ecdec11f 100644
--- a/macros/latex/contrib/changebar/CATALOG
+++ b/macros/latex/contrib/changebar/CATALOG
@@ -1,7 +1,7 @@
Name: ChangeBar
-Problems-To: texniek(at)braams.xs4all.nl
+Problems-To: johannes.braams(at)texniek.nl
Author: J.L. Braams
-Version: 3.6c
+Version: 3.6d
Description:
@@ -15,6 +15,4 @@ See-Also:
Address:
TeXniek
J.L. Braams
-Kersengaarde 33
-2723 BP Zoetermeer
The Netherlands
diff --git a/macros/latex/contrib/changebar/README b/macros/latex/contrib/changebar/README
index 1f51eec6e6..ffc63526e7 100644
--- a/macros/latex/contrib/changebar/README
+++ b/macros/latex/contrib/changebar/README
@@ -1,6 +1,6 @@
changebar bundle
- March 08, 2018
+ May 06, 2022
This bundle contains a package that I maintain to add changebars to a
LaTeX document.
@@ -14,7 +14,7 @@ be used to compare two versions of a document and automatically add
the changebars.
The file chbar.1, also contributed, documents the workings of chbar.sh
-Copyright (C) 2018 Johannes L. Braams texniek(at)braams.xs4all.nl
+Copyright (C) 2022 Johannes L. Braams johannes.braams(at)texniek.nl
This program can be redistributed and/or modified under the terms
of the LaTeX Project Public License Distributed from CTAN
diff --git a/macros/latex/contrib/changebar/cbtest1-ltx.pdf b/macros/latex/contrib/changebar/cbtest1-ltx.pdf
deleted file mode 100644
index a146caad90..0000000000
--- a/macros/latex/contrib/changebar/cbtest1-ltx.pdf
+++ /dev/null
Binary files differ
diff --git a/macros/latex/contrib/changebar/cbtest1-pdf.pdf b/macros/latex/contrib/changebar/cbtest1-pdf.pdf
deleted file mode 100644
index fcdb761c73..0000000000
--- a/macros/latex/contrib/changebar/cbtest1-pdf.pdf
+++ /dev/null
Binary files differ
diff --git a/macros/latex/contrib/changebar/cbtest1.tex b/macros/latex/contrib/changebar/cbtest1.tex
deleted file mode 100644
index 040518bbd9..0000000000
--- a/macros/latex/contrib/changebar/cbtest1.tex
+++ /dev/null
@@ -1,322 +0,0 @@
-\documentclass[12pt,twoside]{article}
-\usepackage{amsmath}
-\usepackage[outerbars,color]{changebar}
-\ifx\pdfoutput\undefined
-\else\ifnum\pdfoutput>0
- \usepackage{pdfcolmk}
-\fi\fi
-
-%\setcounter{changebargrey}{60}
-\cbcolor{red}
-
-\usepackage{fancyhdr}
-
-%Header-footer instructions
-\pagestyle{fancy}
-\setlength{\headheight}{15pt}
-\lhead{\scriptsize Changebar test file}
-\chead{}
-\rhead{v3.5}
-\lfoot{Onecolumn text}
-\cfoot{Page \thepage}
-\rfoot{}
-\renewcommand{\headrulewidth}{0.4pt} %print a rule below the header
-\renewcommand{\footrulewidth}{0.4pt} %print a rule above the footer
-
-\setcounter{page}{16}
-\setlength{\emergencystretch}{4em}
-
-\begin{document}
-
-%\tableofcontents
-
-\title{CHANGEBAR TEST FILE \\FOR ADVANCED FEATURES}
-\author{Piet van Oostrum}
-\maketitle
-
-\raggedbottom
-
-\begin {abstract}
-
-This file tests various advanced features of the changebar package.
-\cbstart\textcolor{red}{\textbf{Text that should have a changebar is
- printed in red, so that it can easily be checked that the changebars are
- in the proper position.} This changebar should be on the left.
-\cbend}
-
-This file contains the following features which in combinations used to
-give problems in versions of changebar before version 3.5:
-Twoside document, onecolumn and towcolumn text, figures, columns of
-figures, page changes in the midst of a document.
-
-This file tests various advanced features of the changebar package.
-This file contains the following features which in combinations used to
-give problems in versions of changebar before version 3.5:
-Twoside document, onecolumn and towcolumn text, figures, columns of
-figures, page changes in the midst of a document.
-It should work both with latex, followed by a supported Postscript driver,
-and with pdflatex.
-\end{abstract}
-
-\newpage
-
-This file tests various advanced features of the changebar package.
-\cbstart\textcolor{red}{Text that should have a changebar (like this) is
- printed in red, so that it can easily be checked that the changebars are
- in the proper position.On this page, the changebar should be on the right.
-\cbend}
-This file contains the following features which in combinations used to
-give problems in versions of changebar before version 3.5:
-Twoside document, onecolumn and towcolumn text, figures, columns of
-figures, page changes in the midst of a document.
-
-This file tests various advanced features of the changebar package.
-This file contains the following features which in combinations used to
-give problems in versions of changebar before version 3.5:
-Twoside document, onecolumn and towcolumn text, figures, columns of
-figures, page changes in the midst of a document.
-
-\cbstart[3mm] \textcolor{red}{Here is a thicker changebar. Text that should
- have a changebar (like this) is printed in red, so that it can easily be
- checked that the changebars are in the proper position.On this page, the
- changebar should be on the right. We also include a formula with large
- descenders which should be completely covered by the changebar:
- $\displaystyle \cfrac{1}{2+\cfrac{1}{3+\cfrac{1}{4+\cdots}}}$
- \cbend}
-
-\twocolumn
-\lfoot{Twocolumn page}
-
-\section{Introduction}
-
-\cbstart
-\color{red}
-This file tests various advanced features of the changebar package.
-This file contains the following features which in combinations used to
-give problems in versions of changebar before version 3.5:
-Twoside document, onecolumn and towcolumn text, figures, columns of
-figures, page changes in the midst of a document.
-It should work both with latex, followed by a supported Postscript driver,
-and with pdflatex.
-\cbend
-\color{black}
-
-\begin{figure}
- \centering
- \cbstart \color{red}
- \fbox{
- \parbox{0.8\linewidth}{
- This is a figure. It has its
- own changebar. This is a figure. This is a figure. It has its own
- changebar. This is a figure. This is a figure. It has its own
- changebar. This is a figure. This is a figure.\cbend}}
- \color{black}
- \caption{This is a test figure}
-\end{figure}
-
-This file tests various advanced features of the changebar package.
-This file contains the following features which in combinations used to
-give problems in versions of changebar before version 3.5:
-Twoside document, onecolumn and towcolumn text, figures, columns of
-figures, page changes in the midst of a document.
-
-\cbstart
-\color{red}
-Sections that have been added or modified are marked with a bar in
-the margins. This is a small paragraph that crosses a column boundary. It
-should have a changebar in both parts.\cbend
-\color{black}
-
-\section{Continuation}
-\cbstart
-\color{red}
-
-\begin{figure}
-\centering
-\color{red}
- \fbox{
- \parbox{0.8\linewidth}{ This is a figure. It inherits a changebar from
- the environment. This is a figure. This is a figure. This is a
- figure. This is a figure. It inherits a changebar from the
- environment. This is a figure. This is a figure.}}
-\caption{This is a test figure}
-\color{black}
-\end{figure}
-\cbend
-\color{black}
-
-\begin{figure}[p]
-\centering \fbox{\parbox{.9\linewidth}{
- This is a figure. This is a figure. This is a figure. This is a figure.
- This is a figure. This is a figure. This is a figure. This is a figure.
- This is a figure. This is a figure. This is a figure. This is a figure.
- This is a figure. This is a figure. This is a figure. This is a figure.
- }}
- \caption{Test figure}
-\end{figure}
-
-\begin{figure}[p]
-\cbstart \color{red}
-\centering \fbox{\parbox{.9\linewidth}{
- This is a figure. It has its own changebar. This is a figure. It has
- its own changebar.
- This is a figure. It has its own changebar. This is a figure. It has
- its own changebar.
- This is a figure. It has its own changebar. This is a figure. It has
- its own changebar.
- }} \cbend\color{black}
- \caption{Test figure}
-\end{figure}
-
-\color{red}
-\cbstart
-
-\begin{figure}[p]
-\color{red}
-\centering \fbox{\parbox{.9\linewidth}{
- This is a figure. It has a changebar from the environment. This is a
- figure. It has a changebar from the environment.
- This is a figure. It has a changebar from the environment. This is a
- figure. It has a changebar from the environment.
- }}
- \caption{Test figure}
-\end{figure}
-
-This part contains a changebar that crosses several column and page
-boundaries. Please note that it crosses several figures also but those have
-their own changebars (or not), they do not fall inside the continuation
-changebar.
-
-\enlargethispage{1cm}
-\subsection{Enlarged column}
-
-\noindent\parbox{\linewidth}{%
-This file tests various advanced features of the changebar package.
-This file contains the following features which in combinations used to
-give problems in versions of changebar before version 3.5:
-Twoside document, onecolumn and towcolumn text, figures, columns of
-figures, page changes in the midst of a document.
-\\
-\textbf{This column is enlarged, therefore its extends in the footer.
-The changebar should also cover the extended text.}}
-
-This file contains the following features which in combinations used to
-give problems in versions of changebar before version 3.5:
-Twoside document, onecolumn and towcolumn text, figures, columns of
-figures, page changes in the midst of a document.
-It should work both with latex, followed by a supported Postscript driver,
-and with pdflatex.
-
-\section*{Specific issues}
-
-\addtocounter{page}{1}
-\textbf{Here we change the page number (skipping one page). Therefore we
- have two even pages in a row. The page change is in the righthand column
- which is not proper LaTeX coding, but it should be handled properly.}
-This file tests various advanced features of the changebar package.
-This file contains the following features which in combinations used to
-give problems in versions of changebar before version 3.5:
-Twoside document, onecolumn and towcolumn text, figures, columns of
-figures, page changes in the midst of a document.
-It should work both with latex, followed by a supported Postscript driver,
-and with pdflatex.
-
-This part contains a changebar that crosses several column and page
-boundaries. Please note that it crosses several figures also but those have
-their own changebars (or not), they do not fall inside the continuation
-changebar.
-
-
-This file tests various advanced features of the changebar package.
-This file contains the following features which in combinations used to
-give problems in versions of changebar before version 3.5:
-Twoside document, onecolumn and towcolumn text, figures, columns of
-figures, page changes in the midst of a document.
-It should work both with latex, followed by a supported Postscript driver,
-and with pdflatex.
-
-This part contains a changebar that crosses several column and page
-boundaries. Please note that it crosses several figures also but those have
-their own changebars (or not), they do not fall inside the continuation
-changebar.
-
-This file tests various advanced features of the changebar package.
-This file contains the following features which in combinations used to
-give problems in versions of changebar before version 3.5:
-Twoside document, onecolumn and towcolumn text, figures, columns of
-figures, page changes in the midst of a document.
-It should work both with latex, followed by a supported Postscript driver,
-and with pdflatex.
-
-\begin{figure}[p]
-\color{red}
-\centering \fbox{\parbox{.9\linewidth}{
- This is a figure. It has a changebar from the environment. This is a
- figure. It has a changebar from the environment.
- This is a figure. It has a changebar from the environment. This is a
- figure. It has a changebar from the environment.
- }}
- \caption{Test figure}
-\end{figure}
-
-\begin{figure}[p]
-\color{red}
-\centering \fbox{\parbox{.9\linewidth}{
- This is a figure. It has a changebar from the environment. This is a
- figure. It has a changebar from the environment.
- This is a figure. It has a changebar from the environment. This is a
- figure. It has a changebar from the environment.
- This is a figure. It has a changebar from the environment. This is a
- figure. It has a changebar from the environment.
- }}
- \caption{Test figure}
-\end{figure}
-
-\begin{figure}[p]
-\color{red}
-\centering \fbox{\parbox{.9\linewidth}{
- This is a figure. It has a changebar from the environment. This is a
- figure. It has a changebar from the environment.
- This is a figure. It has a changebar from the environment. This is a
- figure. It has a changebar from the environment.
- }}
- \caption{Test figure}
-\end{figure}
-
-\begin{figure}[p]
-\color{red}
-\centering \fbox{\parbox{.9\linewidth}{
- This is a figure. It has a changebar from the environment. This is a
- figure. It has a changebar from the environment.
- This is a figure. It has a changebar from the environment. This is a
- figure. It has a changebar from the environment.
- }}
- \caption{Test figure}
-\end{figure}
-
-This part contains a changebar that crosses several column and page
-boundaries. Please note that it crosses several figures also but those have
-their own changebars (or not), they do not fall inside the continuation
-changebar. \cbend
-\color{black} The last sentence of this part is outside the changebar.
-\\[1ex]
-
-\color{red}\cbstart
-\noindent\fbox{\parbox[t]{0.95\linewidth}{%
-This is a parbox. It should have a changebar along its total height.
-This is a parbox. It should have a changebar along its total height.
-This is a parbox. It should have a changebar along its total height.
-This is a parbox. It should have a changebar along its total height.
-This is a parbox. It should have a changebar along its total height.
-This is a parbox. It should have a changebar along its total height.
-This is a parbox. It should have a changebar along its total height.
-This is a parbox. It should have a changebar along its total height.
-}}\cbend\color{black}
-\\[2cm]
-There should be a lonely figure with a changebar at the right.
-\end{document}
-
-%%% Local Variables:
-%%% mode: latex
-%%% TeX-master: t
-%%% End:
diff --git a/macros/latex/contrib/changebar/cbtest1good.pdf b/macros/latex/contrib/changebar/cbtest1good.pdf
deleted file mode 100644
index 1ebbe7300d..0000000000
--- a/macros/latex/contrib/changebar/cbtest1good.pdf
+++ /dev/null
Binary files differ
diff --git a/macros/latex/contrib/changebar/cbtest1wrong.pdf b/macros/latex/contrib/changebar/cbtest1wrong.pdf
deleted file mode 100644
index 2281a41da9..0000000000
--- a/macros/latex/contrib/changebar/cbtest1wrong.pdf
+++ /dev/null
Binary files differ
diff --git a/macros/latex/contrib/changebar/cbtest2-ltx.pdf b/macros/latex/contrib/changebar/cbtest2-ltx.pdf
deleted file mode 100644
index dbc4221f5c..0000000000
--- a/macros/latex/contrib/changebar/cbtest2-ltx.pdf
+++ /dev/null
Binary files differ
diff --git a/macros/latex/contrib/changebar/cbtest2-pdf.pdf b/macros/latex/contrib/changebar/cbtest2-pdf.pdf
deleted file mode 100644
index 769b847f2e..0000000000
--- a/macros/latex/contrib/changebar/cbtest2-pdf.pdf
+++ /dev/null
Binary files differ
diff --git a/macros/latex/contrib/changebar/cbtest2.tex b/macros/latex/contrib/changebar/cbtest2.tex
deleted file mode 100644
index 1f53624e4e..0000000000
--- a/macros/latex/contrib/changebar/cbtest2.tex
+++ /dev/null
@@ -1,322 +0,0 @@
-\documentclass[12pt,twoside]{article}
-\usepackage{amsmath}
-\usepackage[outerbars,xcolor]{changebar}
-\ifx\pdfoutput\undefined
-\else\ifnum\pdfoutput>0
- \usepackage{pdfcolmk}
-\fi\fi
-
-%\setcounter{changebargrey}{60}
-\cbcolor{red}
-
-\usepackage{fancyhdr}
-
-%Header-footer instructions
-\pagestyle{fancy}
-\setlength{\headheight}{15pt}
-\lhead{\scriptsize Changebar test file}
-\chead{}
-\rhead{v3.5}
-\lfoot{Onecolumn text}
-\cfoot{Page \thepage}
-\rfoot{}
-\renewcommand{\headrulewidth}{0.4pt} %print a rule below the header
-\renewcommand{\footrulewidth}{0.4pt} %print a rule above the footer
-
-\setcounter{page}{16}
-\setlength{\emergencystretch}{4em}
-
-\begin{document}
-
-%\tableofcontents
-
-\title{CHANGEBAR TEST FILE \\FOR ADVANCED FEATURES}
-\author{Piet van Oostrum}
-\maketitle
-
-\raggedbottom
-
-\begin {abstract}
-
-This file tests various advanced features of the changebar package.
-\cbstart\textcolor{red}{\textbf{Text that should have a changebar is
- printed in red, so that it can easily be checked that the changebars are
- in the proper position.} This changebar should be on the left.
-\cbend}
-
-This file contains the following features which in combinations used to
-give problems in versions of changebar before version 3.5:
-Twoside document, onecolumn and towcolumn text, figures, columns of
-figures, page changes in the midst of a document.
-
-This file tests various advanced features of the changebar package.
-This file contains the following features which in combinations used to
-give problems in versions of changebar before version 3.5:
-Twoside document, onecolumn and towcolumn text, figures, columns of
-figures, page changes in the midst of a document.
-It should work both with latex, followed by a supported Postscript driver,
-and with pdflatex.
-\end{abstract}
-
-\newpage
-
-This file tests various advanced features of the changebar package.
-\cbstart\textcolor{red}{Text that should have a changebar (like this) is
- printed in red, so that it can easily be checked that the changebars are
- in the proper position.On this page, the changebar should be on the right.
-\cbend}
-This file contains the following features which in combinations used to
-give problems in versions of changebar before version 3.5:
-Twoside document, onecolumn and towcolumn text, figures, columns of
-figures, page changes in the midst of a document.
-
-This file tests various advanced features of the changebar package.
-This file contains the following features which in combinations used to
-give problems in versions of changebar before version 3.5:
-Twoside document, onecolumn and towcolumn text, figures, columns of
-figures, page changes in the midst of a document.
-
-\cbstart[3mm] \textcolor{red}{Here is a thicker changebar. Text that should
- have a changebar (like this) is printed in red, so that it can easily be
- checked that the changebars are in the proper position.On this page, the
- changebar should be on the right. We also include a formula with large
- descenders which should be completely covered by the changebar:
- $\displaystyle \cfrac{1}{2+\cfrac{1}{3+\cfrac{1}{4+\cdots}}}$
- \cbend}
-
-\twocolumn
-\lfoot{Twocolumn page}
-
-\section{Introduction}
-
-\cbstart
-\color{red}
-This file tests various advanced features of the changebar package.
-This file contains the following features which in combinations used to
-give problems in versions of changebar before version 3.5:
-Twoside document, onecolumn and towcolumn text, figures, columns of
-figures, page changes in the midst of a document.
-It should work both with latex, followed by a supported Postscript driver,
-and with pdflatex.
-\cbend
-\color{black}
-
-\begin{figure}
- \centering
- \cbstart \color{red}
- \fbox{
- \parbox{0.8\linewidth}{
- This is a figure. It has its
- own changebar. This is a figure. This is a figure. It has its own
- changebar. This is a figure. This is a figure. It has its own
- changebar. This is a figure. This is a figure.\cbend}}
- \color{black}
- \caption{This is a test figure}
-\end{figure}
-
-This file tests various advanced features of the changebar package.
-This file contains the following features which in combinations used to
-give problems in versions of changebar before version 3.5:
-Twoside document, onecolumn and towcolumn text, figures, columns of
-figures, page changes in the midst of a document.
-
-\cbstart
-\color{red}
-Sections that have been added or modified are marked with a bar in
-the margins. This is a small paragraph that crosses a column boundary. It
-should have a changebar in both parts.\cbend
-\color{black}
-
-\section{Continuation}
-\cbstart
-\color{red}
-
-\begin{figure}
-\centering
-\color{red}
- \fbox{
- \parbox{0.8\linewidth}{ This is a figure. It inherits a changebar from
- the environment. This is a figure. This is a figure. This is a
- figure. This is a figure. It inherits a changebar from the
- environment. This is a figure. This is a figure.}}
-\caption{This is a test figure}
-\color{black}
-\end{figure}
-\cbend
-\color{black}
-
-\begin{figure}[p]
-\centering \fbox{\parbox{.9\linewidth}{
- This is a figure. This is a figure. This is a figure. This is a figure.
- This is a figure. This is a figure. This is a figure. This is a figure.
- This is a figure. This is a figure. This is a figure. This is a figure.
- This is a figure. This is a figure. This is a figure. This is a figure.
- }}
- \caption{Test figure}
-\end{figure}
-
-\begin{figure}[p]
-\cbstart \color{red}
-\centering \fbox{\parbox{.9\linewidth}{
- This is a figure. It has its own changebar. This is a figure. It has
- its own changebar.
- This is a figure. It has its own changebar. This is a figure. It has
- its own changebar.
- This is a figure. It has its own changebar. This is a figure. It has
- its own changebar.
- }} \cbend\color{black}
- \caption{Test figure}
-\end{figure}
-
-\color{red}
-\cbstart
-
-\begin{figure}[p]
-\color{red}
-\centering \fbox{\parbox{.9\linewidth}{
- This is a figure. It has a changebar from the environment. This is a
- figure. It has a changebar from the environment.
- This is a figure. It has a changebar from the environment. This is a
- figure. It has a changebar from the environment.
- }}
- \caption{Test figure}
-\end{figure}
-
-This part contains a changebar that crosses several column and page
-boundaries. Please note that it crosses several figures also but those have
-their own changebars (or not), they do not fall inside the continuation
-changebar.
-
-\enlargethispage{1cm}
-\subsection{Enlarged column}
-
-\noindent\parbox{\linewidth}{%
-This file tests various advanced features of the changebar package.
-This file contains the following features which in combinations used to
-give problems in versions of changebar before version 3.5:
-Twoside document, onecolumn and towcolumn text, figures, columns of
-figures, page changes in the midst of a document.
-\\
-\textbf{This column is enlarged, therefore its extends in the footer.
-The changebar should also cover the extended text.}}
-
-This file contains the following features which in combinations used to
-give problems in versions of changebar before version 3.5:
-Twoside document, onecolumn and towcolumn text, figures, columns of
-figures, page changes in the midst of a document.
-It should work both with latex, followed by a supported Postscript driver,
-and with pdflatex.
-
-\section*{Specific issues}
-
-\addtocounter{page}{1}
-\textbf{Here we change the page number (skipping one page). Therefore we
- have two even pages in a row. The page change is in the righthand column
- which is not proper LaTeX coding, but it should be handled properly.}
-This file tests various advanced features of the changebar package.
-This file contains the following features which in combinations used to
-give problems in versions of changebar before version 3.5:
-Twoside document, onecolumn and towcolumn text, figures, columns of
-figures, page changes in the midst of a document.
-It should work both with latex, followed by a supported Postscript driver,
-and with pdflatex.
-
-This part contains a changebar that crosses several column and page
-boundaries. Please note that it crosses several figures also but those have
-their own changebars (or not), they do not fall inside the continuation
-changebar.
-
-
-This file tests various advanced features of the changebar package.
-This file contains the following features which in combinations used to
-give problems in versions of changebar before version 3.5:
-Twoside document, onecolumn and towcolumn text, figures, columns of
-figures, page changes in the midst of a document.
-It should work both with latex, followed by a supported Postscript driver,
-and with pdflatex.
-
-This part contains a changebar that crosses several column and page
-boundaries. Please note that it crosses several figures also but those have
-their own changebars (or not), they do not fall inside the continuation
-changebar.
-
-This file tests various advanced features of the changebar package.
-This file contains the following features which in combinations used to
-give problems in versions of changebar before version 3.5:
-Twoside document, onecolumn and towcolumn text, figures, columns of
-figures, page changes in the midst of a document.
-It should work both with latex, followed by a supported Postscript driver,
-and with pdflatex.
-
-\begin{figure}[p]
-\color{red}
-\centering \fbox{\parbox{.9\linewidth}{
- This is a figure. It has a changebar from the environment. This is a
- figure. It has a changebar from the environment.
- This is a figure. It has a changebar from the environment. This is a
- figure. It has a changebar from the environment.
- }}
- \caption{Test figure}
-\end{figure}
-
-\begin{figure}[p]
-\color{red}
-\centering \fbox{\parbox{.9\linewidth}{
- This is a figure. It has a changebar from the environment. This is a
- figure. It has a changebar from the environment.
- This is a figure. It has a changebar from the environment. This is a
- figure. It has a changebar from the environment.
- This is a figure. It has a changebar from the environment. This is a
- figure. It has a changebar from the environment.
- }}
- \caption{Test figure}
-\end{figure}
-
-\begin{figure}[p]
-\color{red}
-\centering \fbox{\parbox{.9\linewidth}{
- This is a figure. It has a changebar from the environment. This is a
- figure. It has a changebar from the environment.
- This is a figure. It has a changebar from the environment. This is a
- figure. It has a changebar from the environment.
- }}
- \caption{Test figure}
-\end{figure}
-
-\begin{figure}[p]
-\color{red}
-\centering \fbox{\parbox{.9\linewidth}{
- This is a figure. It has a changebar from the environment. This is a
- figure. It has a changebar from the environment.
- This is a figure. It has a changebar from the environment. This is a
- figure. It has a changebar from the environment.
- }}
- \caption{Test figure}
-\end{figure}
-
-This part contains a changebar that crosses several column and page
-boundaries. Please note that it crosses several figures also but those have
-their own changebars (or not), they do not fall inside the continuation
-changebar. \cbend
-\color{black} The last sentence of this part is outside the changebar.
-\\[1ex]
-
-\color{red}\cbstart
-\noindent\fbox{\parbox[t]{0.95\linewidth}{%
-This is a parbox. It should have a changebar along its total height.
-This is a parbox. It should have a changebar along its total height.
-This is a parbox. It should have a changebar along its total height.
-This is a parbox. It should have a changebar along its total height.
-This is a parbox. It should have a changebar along its total height.
-This is a parbox. It should have a changebar along its total height.
-This is a parbox. It should have a changebar along its total height.
-This is a parbox. It should have a changebar along its total height.
-}}\cbend\color{black}
-\\[2cm]
-There should be a lonely figure with a changebar at the right.
-\end{document}
-
-%%% Local Variables:
-%%% mode: latex
-%%% TeX-master: t
-%%% End:
diff --git a/macros/latex/contrib/changebar/changebar.bug b/macros/latex/contrib/changebar/changebar.bug
index 2d239c93e6..bc04f1ca68 100644
--- a/macros/latex/contrib/changebar/changebar.bug
+++ b/macros/latex/contrib/changebar/changebar.bug
@@ -199,7 +199,10 @@
%
% v3.6c JLB: changed the definition of \cb@checkPDF in order to prevent
% an extra page at the end of the document, filled with "spsp"
-
+%
+% v3.6d JLB: Added \relax at the end of \openin statements in order to
+% prevent teX from looking too far ahead.
+%
% Known problems
% - changebars for mmarginal paragraphs collide with changebars
% for the main body of text
diff --git a/macros/latex/contrib/changebar/changebar.dtx b/macros/latex/contrib/changebar/changebar.dtx
index e146293a0c..b07d80083f 100644
--- a/macros/latex/contrib/changebar/changebar.dtx
+++ b/macros/latex/contrib/changebar/changebar.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-%% Copyright 1994-2018 (C) Johannes Braams. All rights reserved.
+%% Copyright 1994-2022 (C) Johannes Braams. All rights reserved.
%
% This file is part of the changebar package.
% -------------------------------------------
@@ -24,7 +24,7 @@
% and covered by LPPL is defined by the unpacking scripts (with
% extension .ins) which are part of the distribution.
% \fi
-% \CheckSum{2591}
+% \CheckSum{2594}
%
%\iffalse
% This file is built for \LaTeXe, so we make sure an error is
@@ -39,7 +39,7 @@
\ProvidesFile{changebar.dtx}
%</dtx>
%<+package>\ProvidesPackage{changebar}
- [2018/03/09 v3.6c Indicate changes with marginal bars]
+ [2022-05-06 v3.6d Indicate changes with marginal bars]
% \end{macrocode}
%
% \section{A driver for this document}
@@ -2997,6 +2997,7 @@
% Compute the left and right positions of the changebars.
% \changes{v3.4g}{2004/01/09}{Added tracing information for the left
% and right postions}
+% \changes{v3.6d}{2022-05-06}{Added \cs{relax} to end the filename}
% \begin{macrocode}
\cb@positions
\cb@trace{%
@@ -3006,7 +3007,7 @@
Even right: \the\cb@even@right
}%
\immediate\closeout\cb@write
- \immediate\openin\cb@read=\jobname.cb}
+ \immediate\openin\cb@read=\jobname.cb\relax}
% \end{macrocode}
% \end{macro}
%
@@ -3021,13 +3022,13 @@
% checking.
% \changes{3.2}{1994/04/21}{Use \cs{AtEndDocument} now instead of
% redefining \cs{enddocument}}
-%
+% \changes{v3.6d}{2022-05-06}{Added \cs{relax} to end the filename}
% \begin{macrocode}
\AtEndDocument{%
\clearpage
\cb@initstack\cb@historystack
\immediate\closein\cb@read
- \immediate\openin\cb@read=\jobname.cb%
+ \immediate\openin\cb@read=\jobname.cb\relax
% \end{macrocode}
%
% \changes{v3.5a}{2005/05/23}{For pdftex we also close and reread the
@@ -3037,7 +3038,7 @@
\ifx\cb@readxy\@undefined
\else
\immediate\closein\cb@readxy
- \immediate\openin\cb@readxy=\jobname.cb2%
+ \immediate\openin\cb@readxy=\jobname.cb2\relax
\def\cb@pdfpoints{}%
\def\cb@pdfpagenr{0}%
\fi
diff --git a/macros/latex/contrib/changebar/changebar.ins b/macros/latex/contrib/changebar/changebar.ins
index 8b5a9684f6..21a5332223 100644
--- a/macros/latex/contrib/changebar/changebar.ins
+++ b/macros/latex/contrib/changebar/changebar.ins
@@ -24,7 +24,7 @@
\preamble
This is a generated file.
-Copyright (C) 1994-2018 Johannes Braams, All rights reserved.
+Copyright (C) 1994-2022 Johannes Braams, All rights reserved.
This file was generated from file(s) of the changebar package.
--------------------------------------------------------------
diff --git a/macros/latex/contrib/changebar/changebar.pdf b/macros/latex/contrib/changebar/changebar.pdf
index 31ddeb649c..bbe1281088 100644
--- a/macros/latex/contrib/changebar/changebar.pdf
+++ b/macros/latex/contrib/changebar/changebar.pdf
Binary files differ
diff --git a/macros/latex/contrib/changebar/chbar.1 b/macros/latex/contrib/changebar/chbar.1
deleted file mode 100644
index f36e68e2bb..0000000000
--- a/macros/latex/contrib/changebar/chbar.1
+++ /dev/null
@@ -1,117 +0,0 @@
-.ds AL L\\v'.3m'A\\v'-.3m'\\*(ET
-.TH CHBAR 1 TeX
-.SH NAME
-chbar \- write \*(AL file with `change bars' showing change between input \*(AL files
-.SH SYNOPSIS
-.B chbar
-[
-.B \-h
-] [
-.B \-g
-] [
-.B \-G
-] [
-.BI \-d " dir"
-] [
-.BI \-r " rev"
-]
-.I old new
-[
-.I output
-]
-.sp
-.B chbar
-[
-.B \-h
-] [
-.B \-g
-] [
-.B \-G
-] [
-.BI \-d " dir"
-] [
-.BI \-r " rev"
-]
-.I old
-.sp
-.B chbar
-[
-.B \-h
-] [
-.B \-g
-] [
-.B \-G
-]
-.BI \-d " dir"
-.BI \-r " rev"
-.I files
-.SH DESCRIPTION
-.I chbar
-takes two \*(AL files and produce a third which
-has change bars highlighting the difference between them. There
-are three basic modes of operation: first, pathnames can
-be given for
-.I old
-and
-.IR new ;
-second, if only
-.I old
-is named, the
-.I new
-file is taken from standard input and the output is written to standard
-output; thirdly, if the
-.B \-r
-option is used
-.I files
-held by RCS must be named - (see the explanation of the
-.B \-r
-option).
-.sp
-Change bars are inserted for differences after '\ebegin{document}'.
-.SH OPTIONS
-.TP
-.BI \-d " dir"
-Write the output to file
-.IR dir/new ,
-if
-.I new
-is given or to file
-.IR dir/old .
-If
-.I dir
-does not exist, it is created.
-If
-.I output
-is given, it is discarded.
-.TP
-.BI \-r " rev"
-If the \*(AL
-.I files
-are kept under control of the Revision Control System RCS, the old files of
-the revision
-.I rev
-can be retrieved.
-.I rev
-is specified using the RCS conventions.
-This option must be used together with the
-.BI \-d " dir"
-option.
-.I files
-must be a nonempty list of files.
-.TP
-.B \-h
-Print a help text.
-.TP
-.B \-g
-Print some debugging info.
-.TP
-.B \-G
-Even more debug info.
-.SH SEE ALSO
-.IR diff (1),
-.IR rcs (1)
-.SH BUGS
-The
-.I new
-file can not be named `-'.
-
diff --git a/macros/latex/contrib/changebar/chbar.sh b/macros/latex/contrib/changebar/chbar.sh
deleted file mode 100755
index 232b1fcc37..0000000000
--- a/macros/latex/contrib/changebar/chbar.sh
+++ /dev/null
@@ -1,240 +0,0 @@
-#!/bin/sh
-# Gadget to take two LaTeX files and produce a third which
-# has changebars highlighting the difference between them.
-#
-# Version 1.2
-# Author:
-# Don Ward, Careful Computing (don@careful.co.uk)
-# v1.0 April 1989
-# v1.1 Feb 93 Amended to use changebar.sty (v3.0) and dvips
-# v1.2 Aug 95 Added support for LaTeX209/LaTeX2e
-# Added RCS support to retrive old files
-
-CMD=`basename $0`
-
-SED=sed
-RM="rm -f"
-DIFF=diff
-ED=ed
-AWK=awk
-GREP=grep
-MV=mv
-CAT=cat
-MKDIR=mkdir
-CO="co"
-
-TMPFILE=/tmp/$CMD.$$
-SED_CMD_FILE=$TMPFILE.sed
-
-usage()
-{
-$CAT << _END_
-Usage:
- $CMD [-hgG] [-d dir] old new [output]
- default output is stdout
-
- $CMD [-hgG] [-d dir] old
- new file on stdin, output on stdout
-
- $CMD [-hgG] -d dir -r rev files
- old file retrieved using RCS
-
- Gadget to take two LaTeX files and produce a third which
- has changebars highlighting the difference between them.
- Changebars are inserted for differences after '\begin{document}'.
-
- Feature: \`new' can not be named \`-'.
-
- Options are:
- -d dir : Write the output to file \`dir/new', if \`new' is given or
- to file \`dir/old'.
- If \`dir' does not exist, it is created.
- If \`output' is given, it is discarded.
-
- -r rev : If the LaTeX \`files' are kept under control of the
- Revision Control System RCS, the old files of
- the revision \`rev' can be retrived.
- \`rev' is specified using the RCS conventions.
- This option must be used together with the \`-d dir' option.
- \`files' must be a nonempty list of files.
-
- -h : Print this info text.
- -g : Print some debugging info.
- -G : Even more debug info.
-
- Version 1.2: August 3. 1995
-_END_
-exit 1
-}
-
-# parse options and arguments
-DEBUG="NO"
-DIR=
-REV=
-# process options
-while getopts d:r:gGh i $*
-do
- case $i in
- d ) DIR=$OPTARG;;
- r ) REV=$OPTARG;;
- g ) DEBUG="YES" ;;
- G ) set -x; DEBUG="YES";;
- h | \
- * ) usage ;;
- esac
-done
-
-shift `expr $OPTIND - 1`
-
-case $# in
- 1 ) OLD=$1; NEW="-"; OUT="" ;;
- 2 ) OLD=$1; NEW=$2; OUT="" ;;
- 3 ) OLD=$1; NEW=$2; OUT="$3" ;;
- * ) usage ;;
-esac
-
-# check correct options
-if [ ! -z "$DIR" ]
-then
- [ -d $DIR ] || $MKDIR $DIR
-fi
-
-if [ ! -z "$REV" ]
-then
- [ -z "$DIR" ] && usage
- FILES=$*
-else
- FILES=$NEW
-fi
-
-# do the work
-for NEW in $FILES
-do
- if [ ! -z "$DIR" ]
- then
- if [ $NEW = "-" ]
- then
- OUT=$DIR/$OLD
- else
- OUT=$DIR/$NEW
- fi
- fi
- if [ ! -z "$REV" ]
- then
- OLD=${TMPFILE}.old
- $CO -p"$REV" -q $NEW > $OLD
- fi
-
- [ $DEBUG = "YES" ] && echo "OLD=\`$OLD' NEW=\`$NEW' OUT=\`$OUT'"
-
- # gather some info about the file
- # Since we have for sure only the name of the OLD file, ...
- $GREP "^\\\\begin{document}" $OLD > /dev/null
- if [ $? -eq 0 ]
- then
- [ $DEBUG = "YES" ] && echo "contains a \\begin{document}"
- HAS_BEGIN_DOC="YES"
- else
- [ $DEBUG = "YES" ] && echo "contains no \\begin{document}"
- HAS_BEGIN_DOC="NO"
- fi
-
- # Method to do the work:
- # 1 Use diff to get an ed script to go from file1 to file2.
- # 2 Breath on it a bit (with sed) to insert changebar commands.
- # 3 Apply modified ed script to produce (nearly) the output.
- # 4 Use awk to insert the changebars option into the \documentstyle
- # and to handle changebar commands inside verbatim environments.
- # 5 Remove changebars before \begin{document} with sed
-
- # SED commands to edit ED commands to edit old file
- $CAT > $SED_CMD_FILE <<\_END_
-/^\.$/i\
-\\cbend{}%
-/^[0-9][0-9]*[ac]$/a\
-\\cbstart{}%
-/^[0-9][0-9]*,[0-9][0-9]*[ac]$/a\
-\\cbstart{}%
-/^[0-9][0-9]*d$/a\
-i\
-\\cbdelete{}%\
-.
-/^[0-9][0-9]*,[0-9][0-9]*d$/a\
-i\
-\\cbdelete{}%\
-.
-_END_
-
- # note DIFF accepts `-' as stdin
- $DIFF -b -e $OLD $NEW | \
- ( $SED -f $SED_CMD_FILE ; echo w ${TMPFILE}.1 ; echo q ) | \
- $ED - $OLD
-
- # AWK commands to insert Changebars style and to protect
- # changebar commands in verbatim environments
- # and to tell what driver is in use; we assume the `dvips' driver
-
- $AWK '
- BEGIN {kind=""; # we saw now \documentXXX[]{}
- }
- /^\\documentstyle/{
- kind = "209";
- if (index($0, "changebar") == 0 ) {
- opts = index($0, "[")
- if (opts > 0)
- printf "%schangebar,%s\n",substr($0,1,opts),substr($0,opts+1)
- else
- printf "\\documentstyle[changebar]%s\n", substr($0,15)
- next
- }
- }
- /^\\documentclass/{
- kind = "2e";
- printf "%s\n", $0
- printf "\\usepackage[dvips]{changebar}\n"
- next
- }
- /\\begin{document}/ {if (kind == "209" ) {print "\\driver{dvips}"}}
- /\\begin{verbatim}/{++nesting}
- /\\end{verbatim}/{--nesting}
- /\\cbstart{}%|\\cbend{}%|\cbdelete{}%/ {
- if ( nesting > 0) {
- # changebar command in a verbatim environment: Temporarily exit,
- # do the changebar command and reenter.
- #
- # The obvious ( printf "\\end{verbatim}%s\\begin{verbatim} , $0 )
- # leaves too much vertical space around the changed line(s).
- # The following magic seeems to work
- #
- print "\\end{verbatim}\\nointerlineskip"
- print "\\vskip -\\ht\\strutbox\\vskip -\\ht\\strutbox"
- printf "\\vbox to 0pt{\\vskip \\ht\\strutbox%s\\vss}\n", $0
- print "\\begin{verbatim}"
- next
- }
- }
- { print $0 }
- ' ${TMPFILE}.1 > ${TMPFILE}.2
-
- # if a \begin{document} is contained in the file,
- # remove the changebar commands before them
-
- if [ $HAS_BEGIN_DOC = "YES" ]
- then
- SED_CMD="1,/\\\\begin{document}/s/\(\\\\cb[sed][tne][adl][^{}]*{}%\)$/%%\1/"
- $SED "$SED_CMD" ${TMPFILE}.2 > ${TMPFILE}.3
- else
- $CAT ${TMPFILE}.2 > ${TMPFILE}.3
- fi
- if [ -z "$OUT" ]
- then
- $CAT ${TMPFILE}.3
- else
- $MV ${TMPFILE}.3 $OUT
- fi
-
-done
-
-[ $DEBUG = "NO" ] && $RM ${TMPFILE}.*
-
-###############################################################
diff --git a/macros/latex/contrib/hvextern/Changes b/macros/latex/contrib/hvextern/Changes
index 512bf9c194..0204c888fb 100644
--- a/macros/latex/contrib/hvextern/Changes
+++ b/macros/latex/contrib/hvextern/Changes
@@ -1,5 +1,7 @@
hvextern.sty ----------------
+v 0.23 2022-05-08 - added \runExtCmd
+ - added doctype shell
v 0.22 2022-05-05 - added mpvalign, tclbox
v 0.21 2022-04-30 - added java support
v 0.20 2022-04-27 - use L3 for the comma separated lists
diff --git a/macros/latex/contrib/hvextern/doc/hvdoctools.sty b/macros/latex/contrib/hvextern/doc/hvdoctools.sty
index 04cdd46724..23ff524a9a 100644
--- a/macros/latex/contrib/hvextern/doc/hvdoctools.sty
+++ b/macros/latex/contrib/hvextern/doc/hvdoctools.sty
@@ -24,13 +24,17 @@
\def\Lprog#1{\texttt{#1}\index{#1@\texttt{#1} (program)}}
\def\Lcolor#1{\texttt{#1}\index{#1@\texttt{#1} (color)}}
\def\Loption#1{\texttt{#1}\index{#1@\texttt{#1} (package option)}}
-\def\Lkeyword#1{\texttt{#1}\index{#1@\texttt{#1} (keyword)}}
+\def\Lkeyword#1{\texttt{#1}\index{#1@\texttt{#1} (keyword)}\index{Keyword!#1@\texttt{#1}}}
\def\Lkeyval#1{\texttt{#1}\index{#1@\texttt{#1} (value)}}
\def\Lskip#1{\texttt{\textbackslash#1}\index{#1@\texttt{\textbackslash#1} (skip)}}
\def\Lkeyset#1{\expandafter\Lkeyset@i#1\@nil}
\def\Lkeyset@i#1=#2\@nil{\texttt{#1=#2}%
\index{#1@\texttt{#1} (keyword)}\index{Keyword!#1@\texttt{#1}}
\index{#2@\texttt{#2} (value)}\index{Value!#2@\texttt{#2}}}
+
+\def\LKeyset#1{\expandafter\LKeyset@i#1\@nil}
+\def\LKeyset@i#1=#2\@nil{\texttt{#1=#2}%
+ \index{#1@\texttt{#1} (keyword)}\index{Keyword!#1@\texttt{#1}}}
\newsavebox\boxdef
\newenvironment{BDef}
{\begin{lrbox}{\boxdef}
@@ -40,6 +44,7 @@
{\BCmd\fbox{\usebox\boxdef}\endBCmd}
\aftergroup\@afterindentfalse\aftergroup\@afterheading
}
+\def\Lclass#1{\texttt{#1}\index{#1@\texttt{#1} (doc class)}}
\newskip\BDefaboveskip
\newskip\BDefbelowskip
diff --git a/macros/latex/contrib/hvextern/doc/hvextern.pdf b/macros/latex/contrib/hvextern/doc/hvextern.pdf
index 2817fa93b8..c521b487ea 100644
--- a/macros/latex/contrib/hvextern/doc/hvextern.pdf
+++ b/macros/latex/contrib/hvextern/doc/hvextern.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvextern/doc/hvextern.tex b/macros/latex/contrib/hvextern/doc/hvextern.tex
index c26ac017a0..8c104803e6 100644
--- a/macros/latex/contrib/hvextern/doc/hvextern.tex
+++ b/macros/latex/contrib/hvextern/doc/hvextern.tex
@@ -30,7 +30,7 @@ from within a main \LaTeX\ document~--v. \hvexternFileversion}
\newpage
-\setkeys{hv}{moveToExampleDir,ExampleDir=Examples,showFilename}
+\setkeys{hv}{moveToExampleDir,ExampleDir=Examples,showFilename,verbose}
\section{Syntax}
\begin{verbatim}
@@ -44,7 +44,7 @@ it into the main \LaTeX\ document.
\end{sloppypar}
-There is only one environment:
+There is only one environment and one command:
\begin{verbatim}
\begin{externalDocument}[<options>]{<external filename without extension>}
@@ -52,6 +52,8 @@ There is only one environment:
source code
...
\end{externalDocument}
+
+\runExtCmd[<options>]{<command with arguments>}{<external filename without extension>}
\end{verbatim}
The main document \emph{must} be run with the \Loption{-shell-escape} option, otherwise it won't work, e.g.:
@@ -71,7 +73,7 @@ automatically in the main document..
\noindent
\fbox{\begin{minipage}{\dimexpr\linewidth-2\fboxsep-2\fboxrule\relax}
\emph{All} examples in this document are created on-the-fly while running this \LaTeX\ document
-with \texttt{lualatex} with the \texttt{-\kern2pt-shell-escape} option.
+with \texttt{lualatex} with the \texttt{-\kern1pt-shell-escape} option.
\end{minipage}}
@@ -114,7 +116,7 @@ shown by the environment \Lenv{externalDocument}.
\end{minipage}
\begin{minipage}{.39\linewidth}
\begin{externalDocument}[
- compiler=pdflatex,force,cleanup={log,aux},verbose]{voss}
+ compiler=pdflatex,force=false,cleanup={log,aux},verbose]{voss}
\documentclass{standalone}
%StartVisiblePreamble
\usepackage{fontenc}
@@ -172,7 +174,7 @@ catagory, which is done internally by the package. The complete definition of th
showFilename,
code,
ext=py,
- force,
+ force=false,
docType=py,
usefancyvrb,
grfOptions={width=\linewidth}]{python}
@@ -222,7 +224,7 @@ line in the above code shows how it can be done with Python.
\begin{externalDocument}[
compiler=python3,
progpath=/usr/local/bin/,
- force,
+ force=false,
showFilename,
runs=1,
code,
@@ -271,7 +273,7 @@ image.save(imageName+".png", "PNG")
\begin{externalDocument}[grfOptions={width=0.95\linewidth},
compiler=xelatex,code,mpwidth=0.6\linewidth,
- crop,cleanup,force,usefancyvrb=false,ext=tex]{voss}
+ crop,cleanup,force=false,usefancyvrb=false,ext=tex]{voss}
\documentclass{article}
%StartVisiblePreamble
\usepackage{tikz}
@@ -354,7 +356,7 @@ ext=lua, compiler=lua, docType=lua, ...
The default setting is always shown in brackets.
\subsection{Programs and runs}
-The \texttt{progpath} should only in some
+The \Lkeyword{progpath} should only in some
rare cases needed. In general all used compilers will be found by the system. A given \Lkeyword{progpath}
must be end with a slash, e.g. \Lkeyval{./bin/}
@@ -366,9 +368,9 @@ must be end with a slash, e.g. \Lkeyval{./bin/}
\end{verbatim}
Instead of the optional arguments
- \\Lkeyword{compiler}, \\Lkeyword{biber}, and \\Lkeyword{xindex} one can define an individual
+ \Lkeyword{compiler}, \Lkeyword{biber}, and \Lkeyword{xindex} one can define an individual
command sequence by using the optional argument
- \\Lkeyword{runsequence}. It must be comma separated list:
+ \Lkeyword{runsequence}. It must be comma separated list:
\begin{verbatim}
runsequence={lualatex,biber,xindex -l de -c AU,lualatex,lualatex}
@@ -381,7 +383,7 @@ runsequence={lualatex,biber,xindex -l de -c AU,lualatex,lualatex}
runsequence={lualatex,biber,xindex -l de -c AU,lualatex,lualatex},
showFilename,
verbose,
- force,
+ force=false,
cleanup={log,aux,toc,bbl,blg},
code,docType=latex,
lstOptions={columns=fixed}]{voss}
@@ -420,7 +422,7 @@ the environment \Lenv{externalDocument} is:
\begin{externalDocument}[
verbose,
compiler=java,ext=java,code,
- force,docType=java,includegraphic,
+ force=false,docType=java,includegraphic,
usefancyvrb,grfOptions={width=0.9\linewidth}]{java}
import java.awt.Color;
import java.awt.Graphics;
@@ -484,7 +486,7 @@ public class Main {
\end{externalDocument}
-
+%$
\subsection{Grafik options}
@@ -545,7 +547,7 @@ to \Lcs{VerbatimInput}. The following example uses
mpwidth=0.6\linewidth,
crop,
cleanup,
- force,
+ force=false,
docType=latex]{voss}
\RequirePackage{pdfmanagement-testphase}
\DeclareDocumentMetadata{}
@@ -571,7 +573,7 @@ There are different colors for the preamble and body listing: the backgrund and
\define@key{hv}{BObody}[black8]{\def\hv@extern@BObody{#1}}
\end{verbatim}
-The options are passed to \Lpack{tcolorbox} and preset to \Lcolor{black12} and \Lcolor{black!8}.
+The options are passed to \Lpack{tcolorbox} and preset to \Lcolor{black"!12} and \Lcolor{black"!8}.
The color of the frame is set to the same values, hence not seen. The following example uses
\begin{verbatim}
@@ -591,7 +593,7 @@ The color of the frame is set to the same values, hence not seen. The following
mpwidth=0.6\linewidth,
crop,
cleanup,
- force,
+ force=false,
usefancyvrb,
docType=latex]{voss}
\RequirePackage{pdfmanagement-testphase}
@@ -668,7 +670,7 @@ The image Figure~\ref{img:cox} shows an example for a floting object.
% mpwidth=0.6\linewidth,
crop,
cleanup,
- force,
+ force=false,
usefancyvrb,
float,
caption={An example for Coxeter images},
@@ -730,7 +732,7 @@ The following example uses:
% mpwidth=0.6\linewidth,
% crop,
cleanup,
- force,
+ force=false,
frame,
% usefancyvrb,
% float,
@@ -756,7 +758,7 @@ The following example uses:
\subsection{Cropping the PDF}
-Instead of using the \Index{documentclass} \Lcs{standalone}, which already crops the created PDF,
+Instead of using the \Index{documentclass} \Lclass{standalone}, which already crops the created PDF,
one can use the optional argument \Lkeyword{crop}.
\begin{verbatim}
@@ -789,7 +791,7 @@ The follwoing example was created with
% mpwidth=0.6\linewidth,
crop, cropmargin=5,
cleanup,
- force,
+ force=false,
frame,
% usefancyvrb,
% float,
@@ -849,7 +851,7 @@ or \Lkeyval{b}.
code,
crop,
cleanup,
- force,
+ force=false,
docType=latex]{voss}
\documentclass{article}
\pagestyle{empty}
@@ -872,7 +874,7 @@ or \Lkeyval{b}.
code,
crop,
cleanup,
- force,
+ force=false,
docType=latex]{voss}
\documentclass{article}
\pagestyle{empty}
@@ -896,7 +898,7 @@ or \Lkeyval{b}.
code,
crop,
cleanup,
- force,
+ force=false,
docType=latex]{voss}
\documentclass{article}
\pagestyle{empty}
@@ -920,7 +922,7 @@ or \Lkeyval{b}.
code,
crop,
cleanup,
- force,
+ force=false,
mpwidth=0.5\linewidth,
docType=latex]{voss}
\documentclass{article}
@@ -944,7 +946,7 @@ or \Lkeyval{b}.
code,
crop,
cleanup,
- force,
+ force=false,
mpwidth=0.5\linewidth,
docType=latex]{voss}
\documentclass{article}
@@ -969,7 +971,7 @@ or \Lkeyval{b}.
code,
crop,
cleanup,
- force,
+ force=false,
mpwidth=0.5\linewidth,
docType=latex]{voss}
\documentclass{article}
@@ -981,18 +983,18 @@ or \Lkeyval{b}.
\subsection{Inline images}
By default code and image are own paragraphs. With the optional argument \Lkeyword{inline} the created
-image can be part of the current line. This may make sense, if you need characters which are
+image can be part of the \Index{current line}. This may make sense, if you need characters which are
not part of your current font.
\begin{verbatim}
\define@boolkey{hv}[hv@extern@]{inline}[true]{\hv@extern@codefalse}
\end{verbatim}
-With \texttt{inline=true} the optional argument \texttt{code} is automatically set to false. The
+With the setting \LKeyset{inline=true} the optional keyword \Lkeyword{code} is automatically set to false. The
next Chinese characters
\begin{externalDocument}[
compiler=xelatex, inline, runs=2, grfOptions={height=8pt},
- crop, cropmargin=0, cleanup, force, docType=latex]{voss}%
+ crop, cropmargin=0, cleanup, force=false, docType=latex]{voss}%
\documentclass{ctexart}
\pagestyle{empty}
\begin{document}
@@ -1008,7 +1010,7 @@ With \Lkeyset{inline} the optional argument \Lkeyword{code} is automatically set
next Chinese characters
\begin{externalDocument}[
compiler=xelatex, inline, runs=2, grfOptions={height=8pt},
- crop, cropmargin=0, cleanup, force, docType=latex]{voss}
+ crop, cropmargin=0, cleanup, force=false, docType=latex]{voss}
\documentclass{ctexart}
\pagestyle{empty}
\begin{document}
@@ -1020,9 +1022,9 @@ are inserted as inline image without showing the code. The complete code looks l
\subsection{Input text instead of an image}
-By default the created pdf which can be, of course, only test, wil be insert by \verb|\incudegraphics|.
-If you have only text as output and dont want to create a pdf you can insert this kind of
-output as verbatim text by setting \verb|includegraphic=false|.
+By default the created pdf which can be, of course, only text, will be inserted by \Lcs{includegraphics}.
+If you have only text as output and don't want to create a pdf you can insert this kind of
+output as verbatim text by setting \Lkeyset{includegraphic=false}.
\begin{verbatim}
\define@boolkey{hv}[hv@extern@]{includegraphic}[true]{}
@@ -1046,7 +1048,7 @@ sorted digits of the number $A$: $495=954-459$.
\begin{externalDocument}[
- compiler=perl, force, docType=pl, ext=pl, includegraphic=false,
+ compiler=perl, force=false, docType=pl, ext=pl, includegraphic=false,
code, mpwidth=0.6\linewidth]{voss}
#!/usr/bin/perl
#
@@ -1101,7 +1103,7 @@ outFile = io.open(shortFN..".txt","w+") -- open external file
\begin{externalDocument}[
- compiler=lua, force, docType=lua, ext=lua, includegraphic=false, code, usefancyvrb=false]{voss}
+ compiler=lua, force=false, docType=lua, ext=lua, includegraphic=false, code, usefancyvrb=false]{voss}
#!/usr/bin/env lua
local filename = arg[0]
local shortFN = filename:match("(.+)%..+")
@@ -1140,7 +1142,7 @@ outFile:close()
\subsection{Running additional external programs}
-For a \LaTeX\ additional programs for bibliography, index, a.s.o. maybe needed.
+For a \LaTeX\ additional programs for \Index{bibliography}, \Index{index}, a.s.o. maybe needed.
\begin{verbatim}
\define@boolkey{hv}[hv@extern@]{biber}[true]{}
@@ -1174,7 +1176,7 @@ The following examples uses
pages=2,
crop,
cleanup,
- force,
+ force=false,
xindex,
xindexOptions={-l DE --config AU},
mpwidth=0.6\linewidth,
@@ -1230,7 +1232,7 @@ runsequence={lualatex,biber,{xindex -l de -c AU},lualatex,lualatex}
runsequence={lualatex,biber,xindex -l de -c AU,lualatex,lualatex},
showFilename,
verbose,
- force,
+ force=false,
cleanup={log,aux,toc,bbl,blg},
code,docType=latex,
lstOptions={columns=fixed}]{voss}
@@ -1264,7 +1266,7 @@ Sort with xindex \verb|-l DE --config AU|
\subsection{Using \texttt{listings}}
-The default is using \verb|\lstinputlisting| for the printed code sequences.
+The default is using \Lcs{lstinputlisting} for the printed code sequences.
\begin{externalDocument}[
grfOptions={width=0.45\linewidth},
@@ -1272,7 +1274,7 @@ The default is using \verb|\lstinputlisting| for the printed code sequences.
frame,compiler=pdflatex,
showFilename,
% crop,
- force,runs=2,code,docType=latex,
+ force=false,runs=2,code,docType=latex,
frame,
lstOptions={columns=fixed}]{voss}
%StartVisiblePreamble
@@ -1322,7 +1324,7 @@ The default is using \verb|\lstinputlisting| for the printed code sequences.
-It also possible to use \verb|\VerbatimInput| from package \texttt{fancyvrb}. In general
+It also possible to use \Lcs{VerbatimInput} from package \Lpack{fancyvrb}. In general
it makes no difference using the optional argument \Lkeyword{usefancyvrb} or not.
@@ -1332,7 +1334,7 @@ it makes no difference using the optional argument \Lkeyword{usefancyvrb} or not
frame,compiler=pdflatex,
showFilename,
% crop,
- force,runs=2,code,docType=latex,
+ force=false,runs=2,code,docType=latex,
frame,usefancyvrb]{voss}
%StartVisiblePreamble
\documentclass[chapterprefix=on,parskip=half-,DIV=12,fontsize=12pt]{scrbook}
@@ -1392,7 +1394,7 @@ it makes no difference using the optional argument \Lkeyword{usefancyvrb} or not
compiler=mpost,
showFilename,
% crop,
- force,
+ force=false,
cleanup,
code,
docType=mp,
@@ -1424,7 +1426,7 @@ end;
compiler=tex,
showFilename,
% crop,
- force,
+ force=false,
code,
docType=tex,
ext=tex,]{voss}
@@ -1488,7 +1490,7 @@ This is the start of the introduction.
compiler=lualatex,
showFilename,
crop,
- force,
+ force=false,
code,
docType=latex,
ext=tex,]{voss}
@@ -1528,7 +1530,7 @@ This is the start of the introduction.
compiler=context,
showFilename,
runs=2,
- force,
+ force=false,
code,
docType=context,
ext=tex,]{voss}
@@ -1569,18 +1571,32 @@ foo
\end{externalDocument}
+\section{Running external commands}
+Integrating the current directory of this document we can use the macro \Lcs{runExtCmd} with
+the optional argument \Lkeyword{redirect}
+
+\begin{verbatim}
+\runExtCmd[redirect]{ls -la}{voss}
+\end{verbatim}
+
+to get the directory listed:
+
+\medskip
+\runExtCmd[redirect,verbose]{ls -la}{voss}
+
+
\section{Other options}
\begin{description}
-\item[\texttt{force=false}] can speed up the comiling time for the document. If a created image/output
+\item[\Lkeyset{force=false}] can speed up the comiling time for the document. If a created image/output
already exists, there is no need to create it with the next run again and again.
-\item[\texttt{cleanup}] the auxiliary files of a \LaTeX-run are deleted, preset to \texttt{.aux}, \texttt{.log}.
+\item[\Lkeyword{cleanup}] the auxiliary files of a \LaTeX-run are deleted, preset to \texttt{aux}, \texttt{log}.
It must be a comma seperated list of the extensions of the main file, s.g. \texttt{cleanup=\{aux,log\}}.
-\item[\texttt{copyToExampleDir}] name of a directory for the examples, must first be created by the user himself
-\item[\texttt{ExamplesDir}] move all examples into a directory
-\item[\texttt{tclbox=false}] Can be used if there are some negative interactions between package \texttt{listing}
- and package \texttt{tcolorbox}.
-\item[\texttt{eps}] create an eps from the pdf (historical)
+\item[\Lkeyword{copyToExampleDir}] name of a directory for the examples, must first be created by the user himself
+\item[\Lkeyword{ExamplesDir}] move all examples into a directory
+\item[\Lkeyset{tclbox=false}] Can be used if there are some negative interactions between package \Lpack{listings}
+ and package \Lpack{tcolorbox}.
+\item[\Lkeyword{eps}] create an eps from the pdf (historical).
\end{description}
diff --git a/macros/latex/contrib/hvextern/latex/hvextern.sty b/macros/latex/contrib/hvextern/latex/hvextern.sty
index f728f941ae..5179123aa2 100644
--- a/macros/latex/contrib/hvextern/latex/hvextern.sty
+++ b/macros/latex/contrib/hvextern/latex/hvextern.sty
@@ -11,8 +11,8 @@
%% and version 1.3c or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\def\hvexternFileversion{0.22}
-\ProvidesFile{hvextern}[2022/05/05 v\hvexternFileversion: package for running external documents (HV)]
+\def\hvexternFileversion{0.23}
+\ProvidesFile{hvextern}[2022/05/08 v\hvexternFileversion: package for running external documents (HV)]
\RequirePackage{shellesc,xkeyval,graphicx,marginnote,fancyvrb,tikz,listings,ifplatform}
\RequirePackage{tcolorbox,xparse}
@@ -81,7 +81,7 @@
%\define@key{hv}{compiler}[pdflatex]{\def\hv@extern@compiler{#1}}
\define@choicekey*+{hv}{compiler}[\val\nr]{mpost,tex,latex,luatex,python3,perl,lua,java,%
- xetex,pdflatex,lualatex,xelatex,context}[pdflatex]{%
+ xetex,pdflatex,lualatex,xelatex,context,sh,texlua}[pdflatex]{%
\hv@typeout{>>>> Compiler type \nr}%
\def\hv@extern@compiler{\val}%
\edef\hv@extern@compilerNo{\nr}%
@@ -297,6 +297,15 @@
{//StopVisiblePreamble}
+%---- Shell
+%\input{hvextern-sh.cfg}
+\hv@extern@ExampleType{sh}
+ {\NumChar StartVisibleMain}
+ {\NumChar StopVisibleMain}
+ {\NumChar StartVisiblePreamble}
+ {\NumChar StopVisiblePreamble}
+
+
%%%--------------------------------- end config part ------------------
%%
@@ -305,6 +314,7 @@
\newenvironment{externalDocument}[2][]{%
\xdef\hvExternDateiname{#2-\arabic{hv@example@counter}}%
\setkeys{hv}{#1}% \begin
+ \hv@typeout{External filename: \hvExternDateiname}%
\expandafter\IfFileExists\expandafter{\hv@extern@ExamplesDir\hvExternDateiname.pdf}{}{%
\expandafter\IfFileExists\expandafter{\hv@extern@ExamplesDir\hvExternDateiname.png}{}{%
\expandafter\IfFileExists\expandafter{\hv@extern@ExamplesDir\hvExternDateiname.txt}{}{%
@@ -332,10 +342,11 @@
\hv@typeout{>>>> running \hv@extern@compiler~ \hvExternDateiname\hv@extern@ext}%
\hv@extern@runLATEX{\hv@extern@progpath}{\hv@extern@compiler}{\hvExternDateiname}{\hv@extern@ext}%
\else
- \hv@typeout{>>>> running \hv@extern@compiler~ \hvExternDateiname\hv@extern@ext}%
\ifhv@extern@redirect
+ \hv@typeout{>>>> running \hv@extern@compiler~ \hvExternDateiname\hv@extern@ext > \hvExternDateiname.txt}%
\ShellEscape{\hv@extern@progpath\hv@extern@compiler\space\hvExternDateiname\hv@extern@ext\space > \hvExternDateiname.txt}%
\else
+ \hv@typeout{>>>> running \hv@extern@compiler~ \hvExternDateiname\hv@extern@ext}%
\ShellEscape{\hv@extern@progpath\hv@extern@compiler\space\hvExternDateiname\hv@extern@ext}%
\fi
\fi
@@ -350,7 +361,7 @@
\ShellEscape{xindex \hv@extern@xindexOptions\space \hvExternDateiname.idx}% NAch xindex nochmal latex
\ShellEscape{\hv@extern@progpath\hv@extern@compiler\space\hvExternDateiname}%
\fi
- \else
+ \else % runsequence
\expandafter\run@hv@extern@sequenceList\expandafter{\hv@extern@runsequence}%
\fi
\ifhv@extern@crop
@@ -360,8 +371,9 @@
\ifhv@extern@eps
\ShellEscape{pdftops -eps -f 1 -l 1 \hvExternDateiname.pdf}%
\fi
- \fi
+ \fi% end force
\ifhv@extern@code%-------------- Code Part
+ \hv@typeout{>>>>Starting Code part ...}%
\par\noindent
\begingroup
\ifdim\hv@extern@mpwidth>\z@ \minipage[\hv@extern@mpvalign]{\hv@extern@mpwidth}\vspace{0pt}\fi
@@ -402,8 +414,8 @@
\fi
\ifdim\hv@extern@mpwidth > \z@\relax \endminipage\fi
\endgroup
- \fi
- \ifhv@extern@code\else
+ \fi % end code part
+ \ifhv@extern@code\else % only if no code
\ifhv@extern@showFilename
\hv@typeout{>>>> Set filename in the margin!}%
\marginnote{\rotatebox{90}{\hvExternDateiname}}%
@@ -412,6 +424,7 @@
\ifhv@extern@moveToExampleDir
% \ShellEscape{mkdir\space\hv@extern@ExamplesDir/}%
\hv@typeout{>>>> Move file into example dir}%
+ \hv@typeout{>>>>>>\hvExternDateiname ---- \hv@extern@ExamplesDir}%
\ShellEscape{\hv@move \hvExternDateiname.*\space \hv@extern@ExamplesDir}%
\fi
\ifhv@extern@includegraphic
@@ -452,15 +465,76 @@
\else% no graphic, only text
\ifdim\hv@extern@mpwidth>\z@
\hfill\minipage[t]{\dimexpr\linewidth-\hv@extern@mpwidth-1em\relax}\vspace{0pt}
- \noindent\VerbatimInput{\hv@extern@ExamplesDir\hvExternDateiname.txt}
+ \noindent\BodyListing{\hv@extern@ExamplesDir\hvExternDateiname.txt}
\endminipage
\else
- \noindent\VerbatimInput{\hv@extern@ExamplesDir\hvExternDateiname.txt}
+ \noindent\BodyListing{\hv@extern@ExamplesDir\hvExternDateiname.txt}
\fi
\fi
\ifhv@extern@force\expandafter\run@hv@extern@cleanup\expandafter{\hv@extern@cleanup}\fi% cleanup
}
+
\stepcounter{hv@example@counter}%
+
+
+\newcommand\runExtCmd[3][]{%
+ \begingroup
+ \setkeys{hv}{code=false,includegraphic=false,#1}%
+ \xdef\hvExternDateiname{#3-\arabic{hv@example@counter}}%
+ \hv@typeout{>>>> running #2}%
+ \ifhv@extern@redirect
+ \ShellEscape{\hv@extern@progpath#2 > \hv@extern@ExamplesDir\hvExternDateiname.txt}%
+ \else
+ \ShellEscape{\hv@extern@progpath#2}%
+ \fi
+ \global\stepcounter{hv@example@counter}%
+ %------------------------------------- output -----------------------------------
+ \ifhv@extern@includegraphic
+ \ifhv@extern@inline
+ \expandafter\includegraphics\expandafter[\hv@extern@grfOptions]{\hv@extern@ExamplesDir\hvExternDateiname}%
+ \else
+ \ifhv@extern@float
+ \hv@typeout{>>>> Floating environment}%
+ \begin{figure}[!htb]
+ \else
+ \hv@typeout{>>>> No floating environment}%
+ \par\noindent\begingroup
+ \fi
+ \hv@extern@align
+ \hv@typeout{>>>> Input image \hv@extern@ExamplesDir\hvExternDateiname}%
+ \ifhv@extern@frame
+ \expandafter\@for\expandafter\next\expandafter:\expandafter=\hv@extern@pages\do{%
+ \fbox{\expandafter\includegraphics\expandafter[\hv@extern@grfOptions,page=\next]{\hv@extern@ExamplesDir\hvExternDateiname}}%
+ \hspace{5pt}}\hspace*{-5pt}%
+ \else
+ \expandafter\@for\expandafter\next\expandafter:\expandafter=\hv@extern@pages\do{%
+ \expandafter\includegraphics\expandafter[\hv@extern@grfOptions,page=\next]%
+ {\hv@extern@ExamplesDir\hvExternDateiname}%
+ \hspace{5pt}}\hspace*{-5pt}%
+ \fi
+ \ifx\hv@extern@caption\@empty\else\caption{\hv@extern@caption}\fi
+ \ifx\hv@extern@label\@empty\else\label{\hv@extern@label}\fi
+ \ifhv@extern@float
+ \end{figure}%
+ \else
+ \ifdim\hv@extern@mpwidth>\z@ \endminipage\else\par\endgroup\fi
+ \fi
+ \fi
+ \else% no graphic, only text
+ \ifhv@extern@float
+ \hv@typeout{>>>> Floating environment}%
+ \begin{figure}[!htb]
+ \noindent\BodyListing{\hv@extern@ExamplesDir\hvExternDateiname.txt}
+ \ifx\hv@extern@caption\@empty\else\caption{\hv@extern@caption}\fi
+ \ifx\hv@extern@label\@empty\else\label{\hv@extern@label}\fi
+ \end{figure}
+ \else
+ \noindent\BodyListing{\hv@extern@ExamplesDir\hvExternDateiname.txt}
+ \fi
+ \fi
+ \ifhv@extern@force\expandafter\run@hv@extern@cleanup\expandafter{\hv@extern@cleanup}\fi% cleanup
+ \endgroup
+}
%
%%
\endinput
diff --git a/macros/latex/contrib/hvlogos/Changes b/macros/latex/contrib/hvlogos/Changes
index 9517b17c84..3e81878f5a 100644
--- a/macros/latex/contrib/hvlogos/Changes
+++ b/macros/latex/contrib/hvlogos/Changes
@@ -1,4 +1,5 @@
hvlogos.sty:
+0.09 2022-05-06 - changed almost all \def to \providecommand
0.08 2022-04-25 - added \mkII, \mkIV
0.07 2022-02-28 - fix for \dante and \eV
0.06 2022-01-23 - added \BibLaTeXML
diff --git a/macros/latex/contrib/hvlogos/doc/hvlogos-doc.pdf b/macros/latex/contrib/hvlogos/doc/hvlogos-doc.pdf
index 8b483f54d1..c279a280b2 100644
--- a/macros/latex/contrib/hvlogos/doc/hvlogos-doc.pdf
+++ b/macros/latex/contrib/hvlogos/doc/hvlogos-doc.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvlogos/doc/hvlogos-doc.tex b/macros/latex/contrib/hvlogos/doc/hvlogos-doc.tex
index 30ffb01ad5..bf2e1a54ee 100644
--- a/macros/latex/contrib/hvlogos/doc/hvlogos-doc.tex
+++ b/macros/latex/contrib/hvlogos/doc/hvlogos-doc.tex
@@ -13,7 +13,7 @@
\title{\texttt{hvlogos} -- Print \TeX-related Logos}
\author{Herbert Voß\thanks{Thanks to
-Denis Bitouzé, Heiko Oberdiek, Mark Senn}}
+Karl Berry, Denis Bitouzé, Heiko Oberdiek, Mark Senn}}
\begin{document}
\maketitle
diff --git a/macros/latex/contrib/hvlogos/latex/hvlogos.sty b/macros/latex/contrib/hvlogos/latex/hvlogos.sty
index 5a94c04554..6fab62f878 100644
--- a/macros/latex/contrib/hvlogos/latex/hvlogos.sty
+++ b/macros/latex/contrib/hvlogos/latex/hvlogos.sty
@@ -10,7 +10,7 @@
%
%
% -------------------------------------
-\ProvidesPackage{hvlogos}[2022/04/25 v. 0.08 Logos (hv)]
+\ProvidesPackage{hvlogos}[2022/05/06 v. 0.09 Logos (hv)]
%
\newif\if@dtk@newengine \@dtk@newenginetrue
%
@@ -28,13 +28,13 @@
\DeclareRobustCommand\ffmfamily{\not@math@alphabet\ffmfamily\relax
\fontencoding{T1}\fontfamily{ffm}\selectfont}
\DeclareTextFontCommand{\textffm}{\ffmfamily}
-\def\MF{\textffm{META}\@dischyph\textffm{FONT}\@}
-\def\MP{\textffm{META}\@dischyph\textffm{POST}\@}
-\def\MT{\textffm{META}\@dischyph\textffm{TYPE1}\@}
+\providecommand\MF{\textffm{META}\@dischyph\textffm{FONT}\@}
+\providecommand\MP{\textffm{META}\@dischyph\textffm{POST}\@}
+\providecommand\MT{\textffm{META}\@dischyph\textffm{TYPE1}\@}
\fi
-\def\mpShort{\textffm{MP}\@}
-\def\mfShort{\textffm{MF}\@}
+\providecommand\mpShort{\textffm{MP}\@}
+\providecommand\mfShort{\textffm{MF}\@}
\ExplSyntaxOn
\DeclareDocumentCommand\hologo@La{ O{-0.25em} }%
@@ -68,13 +68,13 @@
\ExplSyntaxOff
-\def\AmS{\textsf{AMS}}
+\providecommand\AmS{\textsf{AMS}}
\let\AMS\AmS
%{\ifluatex\mathversion{XITS}\fi%
% $\mathcal{A}$\kern-.1667em\lower.5ex\hbox{$\mathcal{M}$}\kern-.125em$\mathcal{S}$}}% $
-\def\amsmath{\AMS\textsf{math}}
-\def\AmSLaTeX{\mbox{\textsf{AMS}-\LaTeX}}
-\def\AmSTeX{\mbox{\textsf{AMS}-\hologo{TeX}}}
+\providecommand\amsmath{\AMS\textsf{math}}
+\providecommand\AmSLaTeX{\mbox{\textsf{AMS}-\LaTeX}}
+\providecommand\AmSTeX{\mbox{\textsf{AMS}-\hologo{TeX}}}
\DeclareRobustCommand\Biber{\textsf{Biber}}
\let\biber\Biber
\DeclareRobustCommand{\BibLaTeXML}{B\kern-.05em%
@@ -86,28 +86,28 @@
\kern-.08em\-\LaTeX{}ML}
\DeclareRobustCommand\BibTeX{\@ifnextchar8\@@BibTeX\@BibTeX}
\def\@BibTeX{{\hologoLogoSetup{BibTeX}{variant=sc}\hologo{BibTeX}}}
-\def\BibTeXacht{{\hologoLogoSetup{BibTeX8}{variant=sc}\hologo{BibTeX8}}}
+\providecommand\BibTeXacht{{\hologoLogoSetup{BibTeX8}{variant=sc}\hologo{BibTeX8}}}
\def\@@BibTeX8{\hologo{BibTeX8}}
\DeclareRobustCommand\BibLaTeX{Bib\LaTeX}
\let\biblatex\BibLaTeX
-\def\ConTeXt{\hologo{ConTeXt}}
+\providecommand\ConTeXt{\hologo{ConTeXt}}
\let\context\ConTeXt
-\def\emTeX{\hologo{emTeX}}
-\def\eTeX{\hologo{eTeX}}
-\def\ExTeX{\hologo{ExTeX}}
-\def\HanTheThanh{\hologo{HanTheThanh}}%
+\providecommand\emTeX{\hologo{emTeX}}
+\providecommand\eTeX{\hologo{eTeX}}
+\providecommand\ExTeX{\hologo{ExTeX}}
+\providecommand\HanTheThanh{\hologo{HanTheThanh}}%
\let\HTT\HanTheThanh
-\def\iniTeX{\hologo{iniTeX}}
-\def\KOMAScript{\hologo{KOMAScript}}
+\providecommand\iniTeX{\hologo{iniTeX}}
+\providecommand\KOMAScript{\hologo{KOMAScript}}
-%\def\LaTeX{\hologo{LaTeX}}
-%\def\LaTeXTeX{\hologo{(La)TeX}}
-\def\LaTeXe{\hologo{LaTeX2e}}
-\def\LaTeXIII{\hologo{LaTeX3}}
-\def\LaTeXML{\hologo{LaTeXML}}
-\def\LuaLaTeX{\hologo{LuaLaTeX}}
+%\providecommand\LaTeX{\hologo{LaTeX}}
+%\providecommand\LaTeXTeX{\hologo{(La)TeX}}
+\providecommand\LaTeXe{\hologo{LaTeX2e}}
+\providecommand\LaTeXIII{\hologo{LaTeX3}}
+\providecommand\LaTeXML{\hologo{LaTeXML}}
+\providecommand\LuaLaTeX{\hologo{LuaLaTeX}}
\let\lualatex\LuaLaTeX
-\def\LuaTeX{\hologo{LuaTeX}}
+\providecommand\LuaTeX{\hologo{LuaTeX}}
\let\HoLogoHtml@LuaHBTeX\HoLogo@LuaHBTeX
\def\HoLogo@LuaHBTeX#1{%
@@ -117,13 +117,13 @@
}%
}
-\def\LuaHBTeX{\hologo{LuaHBTeX}}
+\providecommand\LuaHBTeX{\hologo{LuaHBTeX}}
\let\luahbtex\LuaHBTeX
\let\LuahbTeX\LuaHBTeX
\let\luatex\LuaTeX
%
-\def\LuaMetaTeX{%
+\providecommand\LuaMetaTeX{%
\mbox{Lua}%
% \HOLOGO@discretionary
% \mbox{\fontfamily{logo}\fontencoding{U}\selectfont META}
@@ -131,7 +131,7 @@
% \HOLOGO@discretionary
\hologo{TeX}%
}
-\def\LuaMetaLaTeX{%
+\providecommand\LuaMetaLaTeX{%
\mbox{Lua}%
% \HOLOGO@discretionary
% \mbox{\fontfamily{logo}\fontencoding{U}\selectfont META}
@@ -139,61 +139,61 @@
% \HOLOGO@discretionary
\hologo{LaTeX}%
}
-\def\LMTX{\textsf{LMTX}}
+\providecommand\LMTX{\textsf{LMTX}}
\let\lmtx\LMTX
-\def\LyX{\hologo{LyX}}
-\def\META{\HoLogoFont@font{METAFONT}{logo}{\mbox{META}}}
-\def\METAFONT{\hologo{METAFONT}}
+\providecommand\LyX{\hologo{LyX}}
+\providecommand\META{\HoLogoFont@font{METAFONT}{logo}{\mbox{META}}}
+\providecommand\METAFONT{\hologo{METAFONT}}
\let\MF\METAFONT
-\def\MetaFun{\textffm{METAFUN}}
+\providecommand\MetaFun{\textffm{METAFUN}}
\let\MFun\MetaFun
-\def\METAPOST{\hologo{METAPOST}}
-\def\MetaPost{\hologo{MetaPost}}
-\def\mkII{\textsf{mkII}}
+\providecommand\METAPOST{\hologo{METAPOST}}
+\providecommand\MetaPost{\hologo{MetaPost}}
+\providecommand\mkII{\textsf{mkII}}
\let\mkii\mkII
-\def\mkIV{\textsf{mkIV}}
+\providecommand\mkIV{\textsf{mkIV}}
\let\mkiv\mkIV
\let\MP\METAPOST
-\def\MiKTeX{\hologo{MiKTeX}}
-\def\NTS{\hologo{NTS}}
-\def\OzMF{\hologo{OzMF}}
-\def\OzMP{\hologo{OzMP}}
-\def\OzTeX{\hologo{OzTeX}}
-\def\OzTtH{\hologo{OzTtH}}
-\def\PCTeX{\hologo{PCTeX}}
-\def\pdfTeX{\hologo{pdfTeX}}
+\providecommand\MiKTeX{\hologo{MiKTeX}}
+\providecommand\NTS{\hologo{NTS}}
+\providecommand\OzMF{\hologo{OzMF}}
+\providecommand\OzMP{\hologo{OzMP}}
+\providecommand\OzTeX{\hologo{OzTeX}}
+\providecommand\OzTtH{\hologo{OzTtH}}
+\providecommand\PCTeX{\hologo{PCTeX}}
+\providecommand\pdfTeX{\hologo{pdfTeX}}
\let\pdftex\pdfTeX
-\def\pdfLaTeX{\hologo{pdfLaTeX}}
+\providecommand\pdfLaTeX{\hologo{pdfLaTeX}}
\let\pdflatex\pdfLaTeX
-\def\PiC{\hologo{PiC}}
-\def\PiCTeX{\hologo{PiCTeX}}
-\def\plainTeX{\hologo{plainTeX}}
-\def\PostScript{Post\-Script}
+\providecommand\PiC{\hologo{PiC}}
+\providecommand\PiCTeX{\hologo{PiCTeX}}
+\providecommand\plainTeX{\hologo{plainTeX}}
+\providecommand\PostScript{Post\-Script}
\let\PS\PostScript
-\def\SageTeX{\hologo{SageTeX}}
-\def\SLiTeX{\hologo{SLiTeX}}
-\def\teTeX{\hologo{teTeX}}
-\def\TeXivht{\hologo{TeX4ht}}
+\providecommand\SageTeX{\hologo{SageTeX}}
+\providecommand\SLiTeX{\hologo{SLiTeX}}
+\providecommand\teTeX{\hologo{teTeX}}
+\providecommand\TeXivht{\hologo{TeX4ht}}
\def\tex4ht{\hologo{TeX4ht}}
-\def\TTH{\hologo{TTH}}
-\def\virTeX{\hologo{virTeX}}
-\def\VTeX{\hologo{VTeX}}
-\def\XeLaTeX{\hologo{XeLaTeX}}
-\def\XeTeX{\hologo{XeTeX}}
+\providecommand\TTH{\hologo{TTH}}
+\providecommand\virTeX{\hologo{virTeX}}
+\providecommand\VTeX{\hologo{VTeX}}
+\providecommand\XeLaTeX{\hologo{XeLaTeX}}
+\providecommand\XeTeX{\hologo{XeTeX}}
\DeclareRobustCommand\xypic{\textsf{\hbox{\kern-.1em X\kern-.1em\lower.4ex\hbox{Y\kern-.1em}-pic}}}
\let\XYpic\xypic
%%
%
\newcommand\BibTool{\textsc{Bib\hskip-.1em
T\hskip-.15emo\hskip-.05emo\hskip-.05eml}\xspace}
-\def\tikzlogo{Ti\textit{k}Z}
-\def\ALEPH{\ensuremath{\aleph}}
+\providecommand\tikzlogo{Ti\textit{k}Z}
+\providecommand\ALEPH{\ensuremath{\aleph}}
\let\TikZ\tikzlogo
-\def\eV{e.\kern-0.1em V\kern-0.18em.}
+\providecommand\eV{e.\kern-0.1em V\kern-0.18em.}
-\def\dante{DANTE~e.\kern-0.1em V\kern-0.18em.}
+\providecommand\dante{DANTE~e.\kern-0.1em V\kern-0.18em.}
\iffalse
\def\d@nte{\@ifnextchar.%
@@ -222,34 +222,34 @@
\fi}
\providecommand\dtk{Die \TeX\-ni\-sche Ko\-mö\-die}
-\providecommand\DTK{``\dtk''}
+\providecommand\DTK{\glqq\dtk\grqq}
\providecommand\PS{Post\-Script}
\providecommand\TUG{\TeX{} Users Group}
\providecommand\TUGboat{\textsl{TUGboat}}
\let\DANTE\dantelogo
\def\pgf/tikz{pgf/Ti\textit{k}Z}
-\def\pgftikz{pgf/Ti\textit{k}Z}
-\def\TeXLive{\TeX{}Live\xspace}
+\providecommand\pgftikz{pgf/Ti\textit{k}Z}
+\providecommand\TeXLive{\TeX{}Live\xspace}
-\def\CTAN{\textsf{CTAN}\xspace}
+\providecommand\CTAN{\textsf{CTAN}\xspace}
-\def\PSTricks{\textsf{PSTricks}\xspace}
+\providecommand\PSTricks{\textsf{PSTricks}\xspace}
\let\pstricks\PSTricks
\if@dtk@newengine
\newfontfamily\dtk@LinWikipedia{Linux Libertine O}%
- \def\WikipediA{{\dtk@LinWikipedia\char"E02F\textsc{ikipediA}}} % hexadezimal
+ \providecommand\WikipediA{{\dtk@LinWikipedia\char"E02F\textsc{ikipediA}}} % hexadezimal
\else
- \def\WikipediA{WikipediA}%
+ \providecommand\WikipediA{WikipediA}%
\fi
\let\Wikipedia\WikipediA
\let\wikipedia\WikipediA
%
-\def\macOS{\textsf{macOS}\xspace}
+\providecommand\macOS{\textsf{macOS}\xspace}
-\def\PurdueThesis{P\kern-0.15ex urdue\kern-0.05ex T\kern-0.1ex hesis}
+\providecommand\PurdueThesis{P\kern-0.15ex urdue\kern-0.05ex T\kern-0.1ex hesis}
\let\purduethesis = \PurdueThesis
-\def\PuTh{P\kern-0.15ex u\kern-0.05ex T\kern-0.1ex h}
+\providecommand\PuTh{P\kern-0.15ex u\kern-0.05ex T\kern-0.1ex h}
\let\puth = \PuTh
diff --git a/macros/latex/contrib/nicematrix/nicematrix-french.pdf b/macros/latex/contrib/nicematrix/nicematrix-french.pdf
index bfccc07f4e..92b1181a85 100644
--- a/macros/latex/contrib/nicematrix/nicematrix-french.pdf
+++ b/macros/latex/contrib/nicematrix/nicematrix-french.pdf
Binary files differ
diff --git a/macros/latex/contrib/nicematrix/nicematrix-french.tex b/macros/latex/contrib/nicematrix/nicematrix-french.tex
index 4e76c71235..66246c9ba2 100644
--- a/macros/latex/contrib/nicematrix/nicematrix-french.tex
+++ b/macros/latex/contrib/nicematrix/nicematrix-french.tex
@@ -1170,64 +1170,6 @@ Cette commande |\diagbox| peut aussi être utilisée dans un |\Block|.
-\subsection{Filets en pointillés}
-
-\label{dotted}
-
-Dans les environnements de \pkg{nicematrix}, il est possible d'utiliser la
-commande |\hdottedline| (fournie par \pkg{nicematrix}) qui est l'équivalent pour
-les pointillés de la commande |\hline|.
-
-\medskip
-\begin{BVerbatim}[baseline=c,boxwidth=9.5cm]
-\begin{pNiceMatrix}
-1 & 2 & 3 & 4 & 5 \\
-~emphase#\hdottedline@
-6 & 7 & 8 & 9 & 10 \\
-11 & 12 & 13 & 14 & 15
-\end{pNiceMatrix}
-\end{BVerbatim}
-$\begin{pNiceMatrix}
-1 & 2 & 3 & 4 & 5 \\
-\hdottedline
-6 & 7 & 8 & 9 & 10 \\
-11 & 12 & 13 & 14 & 15
-\end{pNiceMatrix}$
-
-
-\medskip
-Dans les environnements avec un préambule explicite (comme |{NiceTabular}|,
-|{NiceArray}|, etc.), il est possible de dessiner un trait vertical en
-pointillés avec le spécificateur «|:|».
-
-\medskip
-\begin{BVerbatim}[baseline=c,boxwidth=9.5cm]
-\begin{pNiceArray}{cccc~emphase#:@c}
-1 & 2 & 3 & 4 & 5 \\
-6 & 7 & 8 & 9 & 10 \\
-11 & 12 & 13 & 14 & 15
-\end{pNiceArray}
-\end{BVerbatim}
-$\begin{pNiceArray}{cccc:c}
-1 & 2 & 3 & 4 & 5 \\
-6 & 7 & 8 & 9 & 10 \\
-11 & 12 & 13 & 14 & 15
-\end{pNiceArray}$
-
-\medskip
-Il est possible de changer dans \pkg{nicematrix} la lettre utilisée pour
-indiquer dans le préambule un trait vertical en pointillés avec l'option
-|letter-for-dotted-lines| disponible dans |\NiceMatrixOptions|.
-
-\medskip
-\emph{Remarque} : Quand l'extension \pkg{array} (sur laquelle s'appuie
-\pkg{nicematrix}) est chargée, les traits verticaux et horizontaux que l'on
-insère rendent le tableau plus large ou plus long d'une quantité égale à la
-largeur du trait\footnote{En fait, avec l'extension \pkg{array}, cela est vrai
- pour |\hline| et «\verb+|+» mais pas pour |\cline| : cf.
- p.~\pageref{remark-cline}}. Avec \pkg{nicematrix}, les lignes en pointillés
-tracées par |\hdottedline| et «|:|» ont ce même effet.
-
\subsection{Commandes pour filets personnalisés}
\label{custom-line}
@@ -1272,35 +1214,9 @@ d'intérêt que dans le cas où la clé |multiplicity| est utilisée).
\end{itemize}
\medskip
-\item \emph{Deuxième possibilité}\par\nobreak
-
-On peut utiliser la clé |dotted| qui impose un style de pointillés qui utilise
-le système de pointillés de la commande |\hdottedline| (et de la lettre
-\verb|:|) décrit à la partie précédente (cf. p.~\pageref{dotted}). La clé
-|color| est en fait aussi utilisable dans ce cas-là.
-
-\medskip
-\item \colorbox{yellow!50}{\textbf{Nouveau 6.6}}\enskip \emph{Troisième
- possibilité}
-
-On peut utiliser la clé |tikz| (si Tikz est chargé, \pkg{nicematrix} ne
-chargeant par défaut que \textsc{pgf}). Dans ce cas-là, le filet est tracé
-directement avec Tikz en utilisant comme paramètres la valeur de la clé |tikz|
-qui doit être une liste de couples \textsl{clé=valeur} applicables à un chemin
-Tikz.
-
-Par défaut aucune réservation de place n'est faite par défaut pour le filet qui
-sera tracé avec Tikz. On peut demander une réservation (horizontale pour un
-filet vertical et verticale pour un filet horizontal) avec la clé |width| qui
-est donc en quelque sorte la largeur du filet qui sera tracé (cette largeur
-n'est pas déduite des caractéristiques fournies par la clé |tikz|).
-\end{itemize}
-
-
-\medskip
Ce système permet en particulier de définir des commandes pour tracer des filets
-avec une couleur spécifique (et ces filets respecteront les blocs comme les
-autres filets de \pkg{nicematrix}).
+avec une couleur spécifique (et ces filets respecteront les blocs et les coinn
+comme les autres filets de \pkg{nicematrix}).
\medskip
\begin{Verbatim}
@@ -1331,31 +1247,40 @@ Produit C & 5 & 4 & 1 \\
\end{center}
+\item \colorbox{yellow!50}{\textbf{Nouveau 6.6}}\enskip \emph{Deuxième
+ possibilité}
+
+On peut utiliser la clé |tikz| (si Tikz est chargé, \pkg{nicematrix} ne
+chargeant par défaut que \textsc{pgf}). Dans ce cas-là, le filet est tracé
+directement avec Tikz en utilisant comme paramètres la valeur de la clé |tikz|
+qui doit être une liste de couples \textsl{clé=valeur} applicables à un chemin
+Tikz.
+
+Par défaut aucune réservation de place n'est faite par défaut pour le filet qui
+sera tracé avec Tikz. On peut demander une réservation (horizontale pour un
+filet vertical et verticale pour un filet horizontal) avec la clé |width| qui
+est donc en quelque sorte la largeur du filet qui sera tracé (cette largeur
+n'est pas déduite des caractéristiques fournies par la clé |tikz|).
+
\bigskip
-Voici un exemple avec la clé |tikz|.
+Voici ce que l'on obtient avec la clé |dotted| de Tikz.
\begin{Verbatim}
-\documentclass{article}
-\usepackage{nicematrix,tikz}
-\usetikzlibrary{decorations.pathmorphing}
-
\NiceMatrixOptions
{
custom-line =
{
letter = I ,
- ~emphase#tikz = { decorate, decoration = { coil, aspect = 0 } }}@ ,
- ~emphase#width = 2 mm@
+ ~emphase#tikz = dotted @ ,
+ ~emphase#width = \pgflinewidth@
}
}
-\begin{document}
\begin{NiceTabular}{cIcIc}
un & deux & trois \\
quatre & cinq & six \\
sept & huit & neuf
\end{NiceTabular}
-\end{document}
\end{Verbatim}
\begin{center}
@@ -1364,8 +1289,8 @@ sept & huit & neuf
custom-line =
{
letter = I ,
- tikz = { decorate, decoration = { coil, aspect = 0 } } ,
- width = 2 mm
+ tikz = dotted ,
+ width = \pgflinewidth
}
}
\begin{NiceTabular}{cIcIc}
@@ -1375,6 +1300,80 @@ sept & huit & neuf
\end{NiceTabular}
\end{center}
+\medskip
+\item \emph{Troisième possibilité} : la clé |dotted|\par\nobreak
+\label{dotted}
+
+Comme on le voit dans l'exemple précédent, les pointillés tracés par la clé
+|dotted| de Tikz ne sont pas ronds. C'est pourquoi l'extension \pkg{nicematrix}
+propose dans la clé |custom-line| une clé |dotted| qui va tracer des pointillés
+ronds. La valeur de la clé |width| est, dans ce cas-là, déjà réglée sur le
+diamètre des points. Ces pointillés ronds sont aussi utilisés par
+\pkg{nicematrix} pour des lignes en pointillées continues créées entre deux
+composantes de la matrice par |\Cdots|, |\Vdots|, etc (voir p.~\pageref{Cdots}).
+
+\medskip
+L'extension \pkg{nicematrix} prédéfinit en fait la commande |\hdottedline| et la
+lettre «|:|» pour ces filets en pointillés.\footnote{Néanmoins, l'utilisateur peut écraser ces définitions de |\hdottedline| et de
+«|:|» avec |custom-line| s'il le souhaite (par exemple pour les remplacer par des
+lignes en tiretés).}
+
+\smallskip
+\begin{BVerbatim}
+% ~textsl#présent dans nicematrix.sty@
+\NiceMatrixOptions
+ {
+ custom-line =
+ {
+ letter = : ,
+ command = hdottedline ,
+ dotted
+ }
+ }
+\end{BVerbatim}
+
+\bigskip
+Dans les environnements de \pkg{nicematrix}, il est donc possible d'utiliser la
+commande |\hdottedline| pour tracer des filets horizontaux en pointillés.
+
+\medskip
+\begin{BVerbatim}[baseline=c,boxwidth=9.5cm]
+\begin{pNiceMatrix}
+1 & 2 & 3 & 4 & 5 \\
+~emphase#\hdottedline@
+6 & 7 & 8 & 9 & 10 \\
+11 & 12 & 13 & 14 & 15
+\end{pNiceMatrix}
+\end{BVerbatim}
+$\begin{pNiceMatrix}
+1 & 2 & 3 & 4 & 5 \\
+\hdottedline
+6 & 7 & 8 & 9 & 10 \\
+11 & 12 & 13 & 14 & 15
+\end{pNiceMatrix}$
+
+
+\medskip
+Dans les environnements avec un préambule explicite (comme |{NiceTabular}|,
+|{NiceArray}|, etc.), il est possible de dessiner un trait vertical en
+pointillés avec le spécificateur «|:|».
+
+\medskip
+\begin{BVerbatim}[baseline=c,boxwidth=9.5cm]
+\begin{pNiceArray}{cccc~emphase#:@c}
+1 & 2 & 3 & 4 & 5 \\
+6 & 7 & 8 & 9 & 10 \\
+11 & 12 & 13 & 14 & 15
+\end{pNiceArray}
+\end{BVerbatim}
+$\begin{pNiceArray}{cccc:c}
+1 & 2 & 3 & 4 & 5 \\
+6 & 7 & 8 & 9 & 10 \\
+11 & 12 & 13 & 14 & 15
+\end{pNiceArray}$
+\end{itemize}
+
+
\section{Les couleurs des rangées et des colonnes}
@@ -2117,9 +2116,7 @@ $\begin{array}{c}
\label{varwidth}
-\colorbox{yellow!50}{\textbf{Nouveau 6.3}}
-\smallskip
Rappelons d'abord le fonctionnement d'un environnement |{varwidth}| de
l'extension éponyme \pkg{varwidth}. Un tel environnement est similaire à
l'environnement classique |{minipage}| mais la largeur indiquée (en argument)
@@ -3211,8 +3208,6 @@ a_{31} & a_{32} & a_{33}
\subsection{Les commandes \textbackslash OverBrace et \textbackslash
UnderBrace dans le \textbackslash CodeAfter}
-\colorbox{yellow!50}{\textbf{Nouveau 6.4}}
-
Les commandes |\OverBrace| and |\UnderBrace| permettent de placer des accolades
horizontales sur une partie du tableau. Ces commandes prennent trois arguments :
\begin{itemize}
@@ -3392,6 +3387,12 @@ des notes avant les notes numérotées.
\pkg{nicematrix}), la clé |notes/bottomrule| permet de faire tracer un
|\bottomrule| de \pkg{booktabs} \emph{après} les notes.
+\item \colorbox{yellow!50}{\textbf{Nouveau 6.8}}\enskip Lorsque plusieurs
+commandes |\tabularnote| sont utilisées avec le même argument, une seule note
+est insérée en fin de tableau (mais tous les labels sont marqués). Il est
+possible de désactiver cette fonctionnalité avec la clé
+|notes/detect-duplicates|
+
\item Il est possible de référencer une note de tableau (avec la commande
|\label| placée après le |\tabularnote|).
\end{itemize}
@@ -3406,8 +3407,7 @@ remarques illustrées. Cette table a été composée avec le code suivant.
\setlength{\belowcaptionskip}{1ex}
\centering
\caption{Utilisation de \texttt{\textbackslash
- tabularnote}~emphase#\tabularnote{On peut!
- ~emphase# mettre une note dans le titre.}!}
+ tabularnote}~emphase#\tabularnote{On peut mettre une note dans le titre.}!}
\label{t:tabularnote}
\begin{NiceTabular}{@{}llc@{}}%
[~emphase#notes/bottomrule!, tabularnote = Un peu de texte avant les notes.]
@@ -3417,9 +3417,9 @@ Nom & Prénom & Durée de vie \\
Barrère & Bertrand & 86\\
Nightingale~emphase#\tabularnote{Souvent considérée comme la première!
~emphase#infirmière.}\tabularnote{Surnommée «la Dame à la Lampe».}!
-& Florence & 90 \\
+& Florence~emphase#\tabularnote{Cette note est commune à deux appels de notes.}! & 90 \\
Schœlcher & Victor & 89~emphase#\tabularnote{L'appel de note déborde à droite.}!\\
-Touchet & Marie & 89 \\
+Touchet & Marie~emphase#\tabularnote{Cette note est commune à deux appels de notes.}! & 89 \\
Wallis & John & 87 \\
\bottomrule
\end{NiceTabular}
@@ -3441,9 +3441,9 @@ Nom & Prénom & Durée de vie \\
Barrère & Bertrand & 86\\
Nightingale\tabularnote{Souvent considérée comme la première
infirmière.}\tabularnote{Surnommée «la Dame à la Lampe».}
-& Florence & 90 \\
+& Florence\tabularnote{Cette note est commune à deux appels de notes.} & 90 \\
Schœlcher & Victor & 89\tabularnote{L'appel de note déborde à droite.}\\
-Touchet & Marie & 89 \\
+Touchet & Marie\tabularnote{Cette note est commune à deux appels de notes.} & 89 \\
Wallis & John & 87 \\
\bottomrule
\end{NiceTabular}
@@ -3603,13 +3603,10 @@ Si on souhaite, par exemple, que les notes soient composées en gris et en
On peut aussi mettre dans cette clé |\raggedright| ou |\RaggedRight| (cette
dernière est une commande de \pkg{ragged2e}).
-\item \colorbox{yellow!50}{\textbf{Nouveau 6.8}}\enskip À partir de la version
-6.8, les doublons dans les notes de tableau sont détectés par défaut: lorsque
-plusieurs commandes |\tabularnote| sont utilisées avec le même argument, une
-seule note est insérée en fin de tableau (mais tous les labels sont marqués). Il
-est possible de désactiver cette fonctionnalité avec la clé
-|notes/detect-duplicates| (sa valeur initiale est |true|).
+\item La clé |notes/detect-duplicates| active la détection des
+commandes |\tabularnote| avec le même argument.
+Valeur initiale : |true|
\end{itemize}
@@ -4085,10 +4082,9 @@ a & a & a
\end{pNiceMatrix}\]
-\colorbox{yellow!50}{\textbf{Nouveau 6.3}}\enskip Les nœuds de la dernière
-colonne (hors éventuelle «colonne extérieure» spécifiée par |last-col|) peuvent
-aussi être désignés par $i$-|last|. De même, les nœuds de la dernière ligne
-peuvent être désignés par |last|-$j$.
+Les nœuds de la dernière colonne (hors éventuelle «colonne extérieure» spécifiée
+par |last-col|) peuvent aussi être désignés par $i$-|last|. De même, les nœuds
+de la dernière ligne peuvent être désignés par |last|-$j$.
\medskip
\subsubsection{Les colonnes V de varwidth}
diff --git a/macros/latex/contrib/nicematrix/nicematrix.dtx b/macros/latex/contrib/nicematrix/nicematrix.dtx
index 74e7b7c98f..c95554cfac 100644
--- a/macros/latex/contrib/nicematrix/nicematrix.dtx
+++ b/macros/latex/contrib/nicematrix/nicematrix.dtx
@@ -15,8 +15,8 @@
%
% \fi
% \iffalse
-\def\myfileversion{6.8}
-\def\myfiledate{2022/03/11}
+\def\myfileversion{6.8a}
+\def\myfiledate{2022/05/08}
%
%
%<*batchfile>
@@ -101,6 +101,8 @@ version 2005/12/01 or later.
\makeatother
+
+
\begin{document}
\DocInput{nicematrix.dtx}
\end{document}
@@ -1181,59 +1183,7 @@ version 2005/12/01 or later.
% It's possible to use the command |\diagbox| in a |\Block|.
%
%
-% \subsection{Dotted rules}
-%
-% \label{dotted}
-%
-% In the environments of the package \pkg{nicematrix}, it's possible to use
-% the command |\hdottedline| (provided by \pkg{nicematrix}) which is a
-% counterpart of the classical command |\hline|.
-%
-% \medskip
-% \begin{BVerbatim}[baseline=c,boxwidth=9.5cm]
-% \begin{pNiceMatrix}
-% 1 & 2 & 3 & 4 & 5 \\
-% ~emphase#\hdottedline@
-% 6 & 7 & 8 & 9 & 10 \\
-% 11 & 12 & 13 & 14 & 15
-% \end{pNiceMatrix}
-% \end{BVerbatim}
-% $\begin{pNiceMatrix}
-% 1 & 2 & 3 & 4 & 5 \\
-% \hdottedline
-% 6 & 7 & 8 & 9 & 10 \\
-% 11 & 12 & 13 & 14 & 15
-% \end{pNiceMatrix}$
-%
-%
-% \bigskip
-% In the environments with an explicit preamble (like |{NiceTabular}|,
-% |{NiceArray}|, etc.), it's possible to draw a vertical dotted line with the
-% specifier ``|:|''.
-%
-% \medskip
-% \begin{BVerbatim}[baseline=c,boxwidth=9.5cm]
-% \left(\begin{NiceArray}{cccc~emphase#:@c}
-% 1 & 2 & 3 & 4 & 5 \\
-% 6 & 7 & 8 & 9 & 10 \\
-% 11 & 12 & 13 & 14 & 15
-% \end{NiceArray}\right)
-% \end{BVerbatim}
-% $\left(\begin{NiceArray}{cccc:c}
-% 1 & 2 & 3 & 4 & 5 \\
-% 6 & 7 & 8 & 9 & 10 \\
-% 11 & 12 & 13 & 14 & 15
-% \end{NiceArray}\right)$
-%
%
-% \bigskip
-% \emph{Remark}: In the package \pkg{array} (on which the package
-% \pkg{nicematrix} relies), horizontal and vertical rules make the array larger
-% or wider by a quantity equal to the width of the rule\footnote{In fact, with
-% \pkg{array}, this is true only for |\hline| and ``"|"'' but not for |\cline|:
-% cf p.~\pageref{remark-cline}}. In \pkg{nicematrix}, the dotted lines drawn by
-% |\hdottedline| and ``|:|'' do likewise.
-%
%
% \subsection{Commands for customized rules}
% \label{custom-line}
@@ -1274,36 +1224,12 @@ version 2005/12/01 or later.
% \item the key |sep-color| sets the color between two successive rules (should be
% used only in conjonction with |multiplicity|).
% \end{itemize}
-%
-% \bigskip
-% \item \emph{Second possibility}\par\nobreak
-%
-% The key |dotted| forces a style with dotted rules such as those created by
-% |\hdottedline| or the letter ``|:|'' in the preamble (cf.
-% p.~\pageref{dotted}). The key |color| may be used also in that case.
%
-% \bigskip
-% \item \colorbox{yellow!50}{\textbf{New 6.6}}\enskip \emph{Third
-% possibility}\par\nobreak
-%
-% It's possible to use the key |tikz| (if Tikz is loaded). In that case, the
-% rule is drawn directly with Tikz by using as parameters the value of the key
-% |tikz| which must be a list of \textsl{key=value} pairs which may be applied
-% to a Tikz path.
-%
-% By default, no space is reserved for the rule that will be drawn with Tikz. It
-% possible to specify a reservation (horizontal for a vertical rule and vertical
-% for an horizontal one) with the key |width|. That value of that key, is, in
-% some ways, the width of the rule that will be drawn (\pkg{nicematrix} does not
-% compute that width from the characteristics of the rule specified in |tikz|).
-% \end{itemize}
-%
-% \bigskip
+% \medskip
% That system may be used, in particular, for the definition of commands and
% letters to draw rules with a specific color (and those rules will respect the
-% blocks as do all rules of \pkg{nicematrix}).
-%
-%
+% blocks and corners as do all the rules of \pkg{nicematrix}).
+%
% \medskip
% \begin{Verbatim}
% \begin{NiceTabular}{lcIcIc}~emphase#[custom-line = {letter=I, color=blue}]@
@@ -1318,6 +1244,23 @@ version 2005/12/01 or later.
% \end{NiceTabular}
% \end{Verbatim}
%
+%
+% \bigskip
+% \item \colorbox{yellow!50}{\textbf{New 6.6}}\enskip \emph{Second
+% possibility}\par\nobreak
+%
+% It's possible to use the key |tikz| (if Tikz is loaded). In that case, the
+% rule is drawn directly with Tikz by using as parameters the value of the key
+% |tikz| which must be a list of \textsl{key=value} pairs which may be applied
+% to a Tikz path.
+%
+% By default, no space is reserved for the rule that will be drawn with Tikz. It
+% is possible to specify a reservation (horizontal for a vertical rule and
+% vertical for an horizontal one) with the key |width|. That value of that key,
+% is, in some ways, the width of the rule that will be drawn (\pkg{nicematrix}
+% does not compute that width from the characteristics of the rule specified in
+% |tikz|).
+%
%
% \begin{center}
% \begin{NiceTabular}{lcIcIc}[custom-line = {letter=I, color=blue}]
@@ -1333,40 +1276,33 @@ version 2005/12/01 or later.
% \end{center}
%
% \bigskip
-% Here is an example of the key |tikz|.
-%
-% \begin{Verbatim}
-% \documentclass{article}
-% \usepackage{nicematrix,tikz}
-% \usetikzlibrary{decorations.pathmorphing}
+% Here is an example with the key |dotted| of Tikz.
%
+% \begin{BVerbatim}[boxwidth=9cm,baseline=c]
% \NiceMatrixOptions
% {
% custom-line =
% {
% letter = I ,
-% ~emphase#tikz = { decorate, decoration = { coil, aspect = 0 } }}@ ,
-% ~emphase#width = 2 mm@
+% ~emphase#tikz = dotted@ ,
+% ~emphase#width = \pgflinewidth@
% }
% }
%
-% \begin{document}
% \begin{NiceTabular}{cIcIc}
% one & two & three \\
% four & five & six \\
% seven & eight & nine
% \end{NiceTabular}
-% \end{document}
-% \end{Verbatim}
-%
-% \begin{center}
+% \end{BVerbatim}
+% \begin{scope}
% \NiceMatrixOptions
% {
% custom-line =
% {
% letter = I ,
-% tikz = { decorate, decoration = { coil, aspect = 0 } } ,
-% width = 2 mm
+% tikz = dotted ,
+% width = \pgflinewidth
% }
% }
% \begin{NiceTabular}{cIcIc}
@@ -1374,9 +1310,81 @@ version 2005/12/01 or later.
% four & five & six \\
% seven & eight & nine
% \end{NiceTabular}
-% \end{center}
+% \end{scope}
+%
+% \bigskip
+% \item \emph{Third possibility} : the key |dotted|
+% \label{dotted}
+%
+% As one can see, the dots of a dotted line of Tikz have the shape of a square,
+% and not a circle. That's why the extension \pkg{nicematrix} provides in the
+% key |custom-line| a key |dotted| which will draw rounded dots. The value of
+% the key |width| is, in this case, preset to the diameter of the dots. Those
+% dotted rules are also used by \pkg{nicematrix} to draw continuous dotted rules
+% between cells of the matrix with |\Cdots|, |\Vdots|, etc. (cf. p.~\pageref{Cdots}).
+%
+% In fact, \pkg{nicematrix} defines by default the command |\hdottedline| and the
+% letter ``|:|'' for those dotted rules.\footnote{However, it's possible to
+% overwrite those definitions with a |custom-line| (in order, for example, to
+% switch to dashed lines).}
+%
+%\smallskip
+%\begin{BVerbatim}
+%
+% \NiceMatrixOptions % ~textsl#présent dans nicematrix.sty@
+% {
+% custom-line =
+% {
+% letter = : ,
+% command = hdottedline ,
+% ~emphase#dotted@
+% }
+% }
+% \end{BVerbatim}
+%
+% Thus, it's possible to use the command |\hdottedline| to draw a horizontal
+% dotted rule.
+%
+% \medskip
+% \begin{BVerbatim}[baseline=c,boxwidth=9.5cm]
+% \begin{pNiceMatrix}
+% 1 & 2 & 3 & 4 & 5 \\
+% ~emphase#\hdottedline@
+% 6 & 7 & 8 & 9 & 10 \\
+% 11 & 12 & 13 & 14 & 15
+% \end{pNiceMatrix}
+% \end{BVerbatim}
+% $\begin{pNiceMatrix}
+% 1 & 2 & 3 & 4 & 5 \\
+% \hdottedline
+% 6 & 7 & 8 & 9 & 10 \\
+% 11 & 12 & 13 & 14 & 15
+% \end{pNiceMatrix}$
%
%
+% \bigskip
+% In the environments with an explicit preamble (like |{NiceTabular}|,
+% |{NiceArray}|, etc.), it's possible to draw a vertical dotted line with the
+% specifier ``|:|''.
+%
+% \medskip
+% \begin{BVerbatim}[baseline=c,boxwidth=9.5cm]
+% \left(\begin{NiceArray}{cccc~emphase#:@c}
+% 1 & 2 & 3 & 4 & 5 \\
+% 6 & 7 & 8 & 9 & 10 \\
+% 11 & 12 & 13 & 14 & 15
+% \end{NiceArray}\right)
+% \end{BVerbatim}
+% $\left(\begin{NiceArray}{cccc:c}
+% 1 & 2 & 3 & 4 & 5 \\
+% 6 & 7 & 8 & 9 & 10 \\
+% 11 & 12 & 13 & 14 & 15
+% \end{NiceArray}\right)$
+%
+% \end{itemize}
+%
+%
+%
%\section{The color of the rows and columns}
%
% \subsection{Use of colortbl}
@@ -2092,9 +2100,6 @@ version 2005/12/01 or later.
%
% \label{varwidth}
%
-% \colorbox{yellow!50}{\textbf{New 6.3}}
-%
-% \smallskip
% Let's recall first the behaviour of the environment |{varwidth}| of the
% eponymous package \pkg{varwidth}. That environment is similar to the classical
% environment |{minipage}| but the width provided in the argument is only the
@@ -3168,8 +3173,6 @@ version 2005/12/01 or later.
% \subsection{The commands \textbackslash OverBrace and \textbackslash
% UnderBrace in the \textbackslash CodeAfter}
%
-% \colorbox{yellow!50}{\textbf{New 6.4}}
-%
% The commands |\OverBrace| and |\UnderBrace| provide a way to put
% horizontal braces on a part of the array. These commands take in three
% arguments:
@@ -3347,6 +3350,12 @@ version 2005/12/01 or later.
% the environment of \pkg{nicematrix}. Thus, it's possible to use it on the
% title inserted by |\caption| in an environment |{table}| of LaTeX.
%
+% \colorbox{yellow!50}{\textbf{New 6.8}}\enskip If several commands
+% |\tabularnote| are used in a tabular with the same argument, only one note is
+% inserted at the end of the tabular (but all the labels are composed, of
+% course). It's possible to control that feature with the key
+% |notes/detect-duplicates|.
+%
% \item It's possible to create a reference to a tabular note created by |\tabularnote|
% (with the usual command |\label| used after the |\tabularnote|).
% \end{itemize}
@@ -3370,11 +3379,11 @@ version 2005/12/01 or later.
% Last name & First name & Length of life \\
% \midrule
% Churchill & Wiston & 91\\
-% Nightingale~emphase#\tabularnote{Considered as the first nurse of!
-% ~emphase#history.}\tabularnote{Nicknamed ``the Lady with the Lamp''.}!
-% & Florence & 90 \\
+% Nightingale~emphase#\tabularnote{Considered as the first nurse of history}!
+% ~emphase#\tabularnote{Nicknamed ``the Lady with the Lamp''.}!
+% & Florence~emphase#\tabularnote{This note is shared by two references.}! & 90 \\
% Schoelcher & Victor & 89~emphase#\tabularnote{The label of the note is overlapping.}!\\
-% Touchet & Marie & 89 \\
+% Touchet & Marie~emphase#\tabularnote{This note is shared by two references.}! & 89 \\
% Wallis & John & 87 \\
% \bottomrule
% \end{NiceTabular}
@@ -3397,9 +3406,9 @@ version 2005/12/01 or later.
% Churchill & Wiston & 91\\
% Nightingale\tabularnote{Considered as the first nurse of
% history.}\tabularnote{Nicknamed ``the Lady with the Lamp''.}
-% & Florence & 90 \\
+% & Florence\tabularnote{This note is shared by two references.} & 90 \\
% Schoelcher & Victor & 89\tabularnote{The label of the note is overlapping.}\\
-% Touchet & Marie & 89 \\
+% Touchet & Marie\tabularnote{This note is shared by two references.} & 89 \\
% Wallis & John & 87 \\
% \bottomrule
% \end{NiceTabular}
@@ -3549,12 +3558,10 @@ version 2005/12/01 or later.
% It's also possible to add |\raggedright| or |\RaggedRight| in that key (|\RaggedRight|
% is a command of \pkg{ragged2e}).
%
-% \item \colorbox{yellow!50}{\textbf{New 6.8}}\enskip Since the version 6.8, the
-% duplicates in the notes of a tabular are detected by default: if several
-% commands |\tabularnote| are used in a tabular with the same argument, only one
-% note is inserted at the end of the tabular (but all the labels are composed,
-% of course). It's possible to de-activate that feature with the key
-% |notes/detect-duplicates| (whose initial value is |true|).
+% \item The key |notes/detect-duplicates| activates the detection of the commands
+% |\tabularnotes| with the same argument.
+%
+% Initial value : |true|
% \end{itemize}
%
%
@@ -11061,12 +11068,16 @@ version 2005/12/01 or later.
% by LaTeX for incorrect nested environments).
% \begin{macrocode}
{
- \peek_meaning_ignore_spaces:NTF \end \@@_analyze_end:Nn
+ \peek_remove_spaces:n
+ {
+ \peek_meaning:NTF \end
+ \@@_analyze_end:Nn
% \end{macrocode}
% Here is the call to |\array| (we have a dedicated macro |\@@_array:| because
% of compatibility with the classes \cls{revtex4-1} and \cls{revtex4-2}).
% \begin{macrocode}
- { \exp_args:NV \@@_array: \g_@@_preamble_tl }
+ { \exp_args:NV \@@_array: \g_@@_preamble_tl }
+ }
}
{
\@@_create_col_nodes:
@@ -13926,6 +13937,7 @@ version 2005/12/01 or later.
% \begin{macrocode}
\NewDocumentCommand \@@_RowStyle:n { O { } m }
{
+ \tl_clear:N \l_tmpa_tl
\keys_set:nn { NiceMatrix / RowStyle } { #1 }
% \end{macrocode}
% If the key |rowcolor| has been used.
@@ -15321,9 +15333,12 @@ version 2005/12/01 or later.
% \begin{macrocode}
\cs_set:Npn \@@_Hline_i:n #1
{
- \peek_meaning_ignore_spaces:NTF \Hline
- { \@@_Hline_ii:nn { #1 + 1 } }
- { \@@_Hline_iii:n { #1 } }
+ \peek_remove_spaces:n
+ {
+ \peek_meaning:NTF \Hline
+ { \@@_Hline_ii:nn { #1 + 1 } }
+ { \@@_Hline_iii:n { #1 } }
+ }
}
% \end{macrocode}
%
diff --git a/macros/latex/contrib/nicematrix/nicematrix.pdf b/macros/latex/contrib/nicematrix/nicematrix.pdf
index 3629b4506a..b09ef2e986 100644
--- a/macros/latex/contrib/nicematrix/nicematrix.pdf
+++ b/macros/latex/contrib/nicematrix/nicematrix.pdf
Binary files differ
diff --git a/macros/latex/contrib/simplebnf/simplebnf-doc.pdf b/macros/latex/contrib/simplebnf/simplebnf-doc.pdf
index 1285776fe6..fb80c407fb 100644
--- a/macros/latex/contrib/simplebnf/simplebnf-doc.pdf
+++ b/macros/latex/contrib/simplebnf/simplebnf-doc.pdf
Binary files differ
diff --git a/macros/latex/contrib/simplebnf/simplebnf-doc.tex b/macros/latex/contrib/simplebnf/simplebnf-doc.tex
index 62d6cba868..30ea889f18 100644
--- a/macros/latex/contrib/simplebnf/simplebnf-doc.tex
+++ b/macros/latex/contrib/simplebnf/simplebnf-doc.tex
@@ -8,7 +8,7 @@
\tcbset{listing engine=listings,colframe=black,colback=white,size=small}
\NewDocumentEnvironment {exampleside} {}
- { \tcblisting{listing side text,righthand width=.5\textwidth} }
+ { \tcblisting{listing side text,righthand width=.55\textwidth} }
{ \endtcblisting }
\NewDocumentCommand \cmd { m } {\texttt{\textbackslash#1}}
@@ -32,10 +32,10 @@
\title{%
\textsf{simplebnf} --- A simple package to format Backus-Naur form%
- \footnote{This file describes v0.2.0.}}
+ \footnote{This file describes v0.3.0.}}
\author{Jay Lee\footnote{E-mail: %
\href{mailto:jaeho.lee@snu.ac.kr}{\texttt{jaeho.lee@snu.ac.kr}}}}
-\date{2020/09/01}
+\date{2022/05/07}
\begin{document}
\maketitle
@@ -64,6 +64,8 @@ where each of the \textit{rhs} represents alternative syntactic forms of the \te
A sample code and the result is shown below:
\begin{exampleside}
\begin{bnfgrammar}
+ a \in \textit{Vars}
+ ;;
expr ::=
expr + term : sum
| term : term
@@ -73,4 +75,58 @@ A sample code and the result is shown below:
| a : variable
\end{bnfgrammar}
\end{exampleside}
-\end{document} \ No newline at end of file
+
+Annotations can also be provided on left-hand sides, to label the nonterminal instead of a specific production.
+\begin{exampleside}
+ \begin{bnfgrammar}
+ a : Variables \in \textit{Vars}
+ ;;
+ expr : Expressions ::=
+ expr + term
+ | term
+ ;;
+ term ::=
+ term * a
+ | a
+ \end{bnfgrammar}
+\end{exampleside}
+
+You can also provide an optional specification to the grammar environment, to redefine alignment or spacing.
+\begin{tcblisting}{text above listing}
+ \begin{bnfgrammar}[lr@{\hspace{4pt}}c@{\hspace{2pt}}ll]
+ a : Variables \in \textit{Vars}
+ ;;
+ expr ::=
+ expr + term : sum
+ | term : term
+ ;;
+ term ::=
+ term * a : product
+ | a : variable
+ \end{bnfgrammar}
+\end{tcblisting}
+
+If you want to typeset multiple productions on a single line, you can use double vertical bars by default.
+\begin{exampleside}
+ \begin{bnfgrammar}
+ a \in \textit{Vars}
+ ;;
+ expr ::= expr + term || term
+ ;;
+ term ::= term * a || a
+ \end{bnfgrammar}
+\end{exampleside}
+
+The second and third optional arguments specify regular expressions for the line-breaking and non-breaking RHS seperators:
+\begin{tcblisting}{text above listing}
+ \begin{bnfgrammar}[llcll][\|\|][\|]
+ a \in \textit{Vars}
+ ;;
+ expr ::= expr + term | term
+ ;;
+ term ::= term * a
+ || a
+ \end{bnfgrammar}
+\end{tcblisting}
+
+\end{document}
diff --git a/macros/latex/contrib/simplebnf/simplebnf.sty b/macros/latex/contrib/simplebnf/simplebnf.sty
index a8ae523036..fd7b707ff7 100644
--- a/macros/latex/contrib/simplebnf/simplebnf.sty
+++ b/macros/latex/contrib/simplebnf/simplebnf.sty
@@ -13,11 +13,13 @@
\RequirePackage{mathtools}
\ProvidesExplPackage
{simplebnf}
- {2020/09/01}
- {0.2.0}
+ {2022/05/07}
+ {0.3.0}
{A simple package to format Backus–Naur form}
-\cs_generate_variant:Nn \seq_set_split:Nnn {NVn}
+\cs_generate_variant:Nn \regex_split:nnNTF {nVNTF}
+\cs_generate_variant:Nn \regex_split:NnN {NVN}
+
\tl_new:N \g__simplebnf_defeq_tl
\tl_gset:Nn \g__simplebnf_defeq_tl { \ensuremath{\Coloneqq} }
@@ -32,6 +34,9 @@
\seq_new:N \l__keypairs_seq
\bool_new:N \l__first_rhs
+\regex_new:N \g_simplebnf_rhs_newline_r
+\regex_new:N \g_simplebnf_rhs_nb_r
+
%% Typeset a single rhs of a production.
%% \l__first_rhs = true => `::=' already typeset
%% \l__first_rhs = false => move to a newline and typeset `|'
@@ -43,15 +48,18 @@
\bool_set_false:N \l__first_rhs
}
{
- \tl_put_right:Nn \l__table_tl { \\ & \g__simplebnf_defor_tl & }
+ \tl_put_right:Nn \l__table_tl { \\ && \g__simplebnf_defor_tl & }
}
- \regex_split:nnNTF { : } { #1 } \l_tmpa_seq
+ \tl_set:Nn \l_tmpa_tl { #1 }
+ \regex_replace_once:nnN { ^\s+ } {} \l_tmpa_tl
+ \regex_replace_once:nnN { \s+$ } {} \l_tmpa_tl
+ \regex_split:nVNTF { : } \l_tmpa_tl \l_tmpa_seq
{
\seq_pop_left:NNT \l_tmpa_seq \l_tmpa_tl
{
- \tl_set:Nx \l_tmpa_tl { \bnfexpr { \l_tmpa_tl } }
- \tl_put_right:NV \l__table_tl \l_tmpa_tl
+ \regex_replace_all:NnN \g_simplebnf_rhs_nb_r { \c{g__simplebnf_defor_tl} } \l_tmpa_tl
+ \tl_put_right:Nx \l__table_tl { \bnfexpr { \l_tmpa_tl } }
}
\tl_put_right:Nn \l__table_tl { & }
@@ -63,34 +71,67 @@
}
}
{
- \tl_put_right:Nn \l__table_tl { \bnfexpr { #1 } &}
+ \regex_replace_all:NnN \g_simplebnf_rhs_nb_r { \c{g__simplebnf_defor_tl} } \l_tmpa_tl
+
+ \tl_put_right:Nx \l__table_tl { \bnfexpr { \l_tmpa_tl } }
+ \tl_put_right:Nn \l__table_tl { & }
+ }
+}
+
+%% Typeset a single lhs of a production.
+%% #1 - lhs : either term or (term : annotation)
+\cs_new:Nn \simplebnf_typeset_lhs:n
+{
+ \tl_set:Nx \l_tmpa_tl { #1 }
+ \regex_replace_once:nnN { ^\s+ } {} \l_tmpa_tl
+ \regex_replace_once:nnN { \s+$ } {} \l_tmpa_tl
+
+ \regex_split:nVNTF { : } \l_tmpa_tl \l_tmpa_seq
+ {
+ \seq_pop_right:NN \l_tmpa_seq \l_tmpa_tl
+ \tl_put_right:Nx \l__table_tl
+ {
+ \bnfannot{\l_tmpa_tl}
+ }
+ \seq_pop_left:NN \l_tmpa_seq \l_tmpa_tl
+ \tl_put_right:Nx \l__table_tl
+ {
+ & \bnfexpr { \l_tmpa_tl }
+ }
+ }
+ {
+ \tl_put_right:Nx \l__table_tl
+ {
+ & \bnfexpr { \l_tmpa_tl }
+ }
}
}
\NewDocumentCommand \bnfexpr { m } { \texttt { #1 } }
\NewDocumentCommand \bnfannot { m } { \textit{ #1 } }
-\NewDocumentEnvironment { bnfgrammar } { +b }
+%% Typeset a BNF grammar.
+%% #1 - tabular specification (llcll)
+%% #2 - regexp for newline separator for rhses
+%% #2 - regexp for non-breaking separator for rhses
+%% #3 - grammar
+\NewDocumentEnvironment { bnfgrammar } { O{llcll} O{[^\|]\|[^\|]} O{\|\|} +b }
{
+ \regex_gset:Nn \g_simplebnf_rhs_newline_r { #2 }
+ \regex_gset:Nn \g_simplebnf_rhs_nb_r { #3 }
+
%% \l__input_seq is a list of term definitions.
- \regex_split:nnN { ;; } { #1 } \l__input_seq
+ \regex_split:nnN { ;; } { #4 } \l__input_seq
\begin{center}
\tl_set:Nn \l__table_tl
{
- \begin{tabular}{lcll}
+ \begin{tabular}{#1}
}
+
\bool_set_true:N \l_tmp_first_term % Is this the first term in this grammar?
\seq_map_inline:Nn \l__input_seq
{
- %% \l__term_seq - (term, rhses)...
- %% \l__term_tl - term
- %% \l__keypairs_tl - rhses
- \regex_split:nnN { ::= } { ##1 } \l__term_seq
- \seq_pop_left:NN \l__term_seq \l__term_tl
- \seq_pop_left:NN \l__term_seq \l__keypairs_tl
-
- \regex_replace_once:nnN { ^\s+ } {} \l__term_tl
-
+ %% If not-first, add newline
\bool_if:NTF \l_tmp_first_term
{
\bool_set_false:N \l_tmp_first_term
@@ -98,15 +139,48 @@
{
\tl_put_right:Nn \l__table_tl { \\ }
}
- \tl_put_right:Nx \l__table_tl
+
+ \regex_split:nnNTF { ::= } { ##1 } \l__term_seq
+ % Parse a ::= definition
{
- \bnfexpr { \l__term_tl } & \g__simplebnf_defeq_tl &
+ %% \l__term_seq - (lhs, rhses)...
+ %% \l__term_tl - lhs
+ %% \l__keypairs_tl - rhses
+ \seq_pop_left:NN \l__term_seq \l__term_tl
+ \seq_pop_left:NN \l__term_seq \l__keypairs_tl
+
+ \simplebnf_typeset_lhs:n{\l__term_tl}
+ \tl_put_right:Nx \l__table_tl
+ {
+ & \g__simplebnf_defeq_tl &
+ }
+ %% \l__keypairs_seq - (rhs:annot | rhs)...
+ \regex_split:NVN \g_simplebnf_rhs_newline_r \l__keypairs_tl \l__keypairs_seq
+
+ \bool_set_true:N \l__first_rhs
+ \seq_map_function:NN \l__keypairs_seq \simplebnf_typeset_rhs:n
}
- %% \l__keypairs_seq - (rhs:annot | rhs)...
- \seq_set_split:NnV \l__keypairs_seq { | } \l__keypairs_tl
+ {
+ % Else, parse a \in declaration
+ \regex_split:nnNTF { \c{in} } { ##1 } \l__term_seq
+ {
+ %% \l__term_seq - (lhs, rhs)
+ \seq_pop_left:NN \l__term_seq \l_tmpa_tl
- \bool_set_true:N \l__first_rhs
- \seq_map_function:NN \l__keypairs_seq \simplebnf_typeset_rhs:n
+ \simplebnf_typeset_lhs:n{\l_tmpa_tl}
+ \tl_put_right:Nn \l__table_tl
+ {
+ & $\in$ & $
+ }
+ \seq_pop_left:NN \l__term_seq \l_tmpa_tl
+ \tl_put_right:NV \l__table_tl \l_tmpa_tl
+ \tl_put_right:Nn \l__table_tl
+ {
+ $ &
+ }
+ }
+ { \msg_error:nn {simplebnf} { Could not parser ##1 } }
+ }
}
\tl_put_right:Nn \l__table_tl { \end{tabular} }
diff --git a/macros/xetex/latex/xduts/README.md b/macros/xetex/latex/xduts/README.md
index 6d1c47efee..b8b0b431bd 100644
--- a/macros/xetex/latex/xduts/README.md
+++ b/macros/xetex/latex/xduts/README.md
@@ -1,6 +1,6 @@
# XDUTS
-[![](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)
+[![](https://img.shields.io/ctan/v/xduts)](https://www.ctan.org/pkg/xduts) [![](https://img.shields.io/github/v/tag/note286/xduts)](https://github.com/note286/xduts/tags) [![](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/discussions/note286/xduts)](https://github.com/note286/xduts/discussions) [![](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)
XDUTS (Xidian University TeX Suite) is a LaTeX3 document class and package suite for undergraduate/postgraduate students in Xidian University, which can be compiled with XeLaTeX on Windows, macOS, GNU/Linux, Overleaf, and TeXPage. It is designed to typesetting proposal/thesis and other documents.
@@ -65,7 +65,7 @@ xelatex xduts.dtx
## Note
-`xidian-text.pdf` and `xidian-logo.pdf` should be placed in the same directory as `xduugthesis.cls`.
+`xdulogo.pdf` should be placed in the same directory as `xduugthesis.cls`.
## License
diff --git a/macros/xetex/latex/xduts/xidian-logo.pdf b/macros/xetex/latex/xduts/xdulogo.pdf
index 1f676b4faf..6302258794 100644
--- a/macros/xetex/latex/xduts/xidian-logo.pdf
+++ b/macros/xetex/latex/xduts/xdulogo.pdf
Binary files differ
diff --git a/macros/xetex/latex/xduts/xduts.dtx b/macros/xetex/latex/xduts/xduts.dtx
index e17a05a32e..8ec2d39d83 100644
--- a/macros/xetex/latex/xduts/xduts.dtx
+++ b/macros/xetex/latex/xduts/xduts.dtx
@@ -1,19 +1,24 @@
% \iffalse
%<*driver>
\ProvidesFile{xduts.dtx}
-[2022/05/03 v1.8.1.0 Xidian University TeX Suite]
+[2022/05/08 v1.13.2.0 Xidian University TeX Suite]
%</driver>
%<class|sty>\NeedsTeXFormat{LaTeX2e}
%<class|sty>\RequirePackage{expl3}
%<xdufont>\ProvidesExplPackage{xdufont}
%<xdupgthesis>\ProvidesExplClass{xdupgthesis}
%<xduugthesis>\ProvidesExplClass{xduugthesis}
-%<class|sty> {2022/05/03}{1.8.1.0}
+%<class|sty> {2022/05/08}{1.13.2.0}
%<xdufont> {Xidian University Font package}
%<xdupgthesis> {Xidian University Postgraduate Thesis document class}
%<xduugthesis> {Xidian University Undergraduate Thesis document class}
%<*driver>
+\PassOptionsToPackage{AutoFakeBold=3}{xeCJK}
\documentclass{ctxdoc}
+\changes{v1.9.0.0}{2022/05/03}{支持中文选项默认值加粗}
+\changes{v1.9.0.0}{2022/05/03}{增大function环境盒子宽度}
+\addtolength{\marginparwidth}{5mm}
+\geometry{hmargin={0mm,10mm}}
\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}{调整文档目录缩进}
@@ -37,10 +42,15 @@
\usepackage{xurl}
\usepackage{xspace}
\xspaceaddexceptions{。?!,、;:“”‘’—….--~·《》<>_}
-\usepackage{tabularx}
\newcolumntype{Y}{>{\centering\arraybackslash}X}
\usepackage{multirow}
-\usepackage{makecell}
+\usepackage{pifont}
+\newcommand{\cmark}{\ding{51}}
+\usepackage{tabularray}
+\SetTblrStyle{caption-tag}{font=\bfseries}
+\DefTblrTemplate{caption-sep}{default}{\quad}
+\DefTblrTemplate{conthead-text}{default}{(续表)}
+\DefTblrTemplate{contfoot-text}{default}{接下页}
% 交叉引用
\newcommand{\secrefx}[1]{第\xspace\ref{#1}\xspace 节}
\newcommand{\tabrefx}[1]{\tablename\xspace\ref{#1}\xspace}
@@ -145,7 +155,7 @@
\end{document}
%</driver>
% \fi
-% \CheckSum{1195}
+% \CheckSum{1283}
% \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
@@ -320,7 +330,9 @@
% 包括\pkgx{subfig}宏包和\pkgx{subcaption}宏包。
% \subsection{表格}
% 主要适配表格内容字号,
-% 包括所有使用\envx{table}浮动体的表格和\pkgx{longtable}宏包提供的\envx{longtable}环境。
+% 包括所有使用\envx{table}浮动体的表格、
+% \pkgx{tabularray}宏包提供的\envx{tblr}、\envx{longtblr}环境
+% 和\pkgx{longtable}宏包提供的\envx{longtable}环境。
% \section{功能说明}
% \label{功能说明}
% 请根据\secrefx{使用说明}中相应文档类/宏包的说明来选择性地阅读本节内容。
@@ -414,9 +426,9 @@
% \end{syntax}
% 设置中文字体伪斜体倾斜程度。默认为\valuex{0.2}。
% \end{function}
-% \begin{function}[added=2022-03-06,updated=2022-04-13]{style/latin-font}
+% \begin{function}[added=2022-03-06,updated=2022-05-06]{style/latin-font}
% \begin{syntax}
-% \optx{style/latin-font}=\metax{tacn|thcs|(gyre)|none}
+% \optx{style/latin-font}=\metax{tac|tacn|thcs|(gyre)|none}
% \end{syntax}
% 设置英文字体,具体配置见\tabrefx{tab:latin-font}。
% \end{function}
@@ -432,14 +444,16 @@
% \toprule
% \strong{选项名称} & \strong{罗马字体族} & \strong{无衬线字体族} & \strong{打字机字体族} \\
% \midrule
-% |tacn|\tnote{1} & Times New Roman & Arial & Courier New \\
-% |thcs|\tnote{2} & Times New Roman & Helvetica & Courier Std \\
+% |tac|\tnote{1} & Times New Roman & Arial & Consolas \\
+% |tacn|\tnote{2} & Times New Roman & Arial & Courier New \\
+% |thcs|\tnote{3} & Times New Roman & Helvetica & Courier Std \\
% |gyre| & TeX Gyre Termes & TeX Gyre Heros & TeX Gyre Cursor \\
% \bottomrule
% \end{tabularx}
% \begin{tablenotes}
-% \item [1] \filex{times.ttf}、\filex{timesbd.ttf}、\filex{timesi.ttf}、\filex{timesbi.ttf}、\filex{arial.ttf}、\filex{arialbd.ttf}、\filex{ariali.ttf}、\filex{arialbi.ttf}、\filex{cour.ttf}、\filex{courbd.ttf}、\filex{couri.ttf}和\filex{courbi.ttf}。
-% \item [2] \filex{times.ttf}、\filex{timesbd.ttf}、\filex{timesi.ttf}、\filex{timesbi.ttf}、\filex{Helvetica.ttf}、\filex{Helvetica~Bold.ttf}、\filex{Helvetica~Oblique.ttf}、\filex{Helvetica~Bold~Oblique.ttf}、\filex{CourierStd.otf}、\filex{CourierStd-Bold.otf}、\filex{CourierStd-Oblique.otf}和\filex{CourierStd-BoldOblique.otf}。
+% \item [1] \filex{times.ttf}、\filex{timesbd.ttf}、\filex{timesi.ttf}、\filex{timesbi.ttf}、\filex{arial.ttf}、\filex{arialbd.ttf}、\filex{ariali.ttf}、\filex{arialbi.ttf}、\filex{consola.ttf}、\filex{consolab.ttf}、\filex{consolai.ttf}和\filex{consolaz.ttf}。
+% \item [2] \filex{times.ttf}、\filex{timesbd.ttf}、\filex{timesi.ttf}、\filex{timesbi.ttf}、\filex{arial.ttf}、\filex{arialbd.ttf}、\filex{ariali.ttf}、\filex{arialbi.ttf}、\filex{cour.ttf}、\filex{courbd.ttf}、\filex{couri.ttf}和\filex{courbi.ttf}。
+% \item [3] \filex{times.ttf}、\filex{timesbd.ttf}、\filex{timesi.ttf}、\filex{timesbi.ttf}、\filex{Helvetica.ttf}、\filex{Helvetica~Bold.ttf}、\filex{Helvetica~Oblique.ttf}、\filex{Helvetica~Bold~Oblique.ttf}、\filex{CourierStd.otf}、\filex{CourierStd-Bold.otf}、\filex{CourierStd-Oblique.otf}和\filex{CourierStd-BoldOblique.otf}。
% \end{tablenotes}
% \end{threeparttable}
% \end{table}
@@ -569,6 +583,16 @@
% \item[true] 对称。
% \item[false] 不对称。
% \end{optdesc}
+% \begin{function}[added=2022-05-08]{style/page-vertical-align}
+% \begin{syntax}
+% \optx{style/page-vertical-align}=\metax{分散对齐|(顶部对齐)}
+% \end{syntax}
+% 设置页面垂直方向的对齐方式。
+% \end{function}
+% \begin{optdesc}
+% \item[分散对齐] 页面高度均匀地填满,使每一页的底部直接对齐。
+% \item[顶部对齐] 页面中的内容保持它的自然高度,每一页的页面底部用空白填满。
+% \end{optdesc}
% \subsection{交叉引用配置}
% \label{交叉引用配置}
% \begin{function}[added=2022-04-16]{style/ref-add-space}
@@ -684,19 +708,99 @@
% \end{function}
% \subsection{信息录入}
% \label{信息录入}
-% \begin{function}[added=2022-05-02]{info/graduate-type}
+% \changes{v1.9.0.0}{2022/05/03}{增加信息录入选项分类表}
+% \changes{v1.10.3.1}{2022/05/04}{移除专业博士校外导师信息录入}
+% 用户根据\tabrefx{tblr:info}选择相应的选项进行信息录入。
+% \begin{tblr}
+% [
+% long,
+% caption = {信息录入选项分类},
+% label = {tblr:info}
+% ]
+% {
+% width = \linewidth,
+% colspec = lX[c]X[c]X[c]X[c]X[c]X[c],
+% cell{1}{1} = {r = 2}{},
+% cell{1}{2} = {c = 2}{},
+% cell{1}{4} = {c = 2}{},
+% cell{1}{6} = {c = 2}{},
+% hline{1,Z} = {.08em},
+% hline{2} = {2-3}{.08em, leftpos = -1, rightpos = -1, endpos},
+% hline{2} = {4-5}{.08em, leftpos = -1, rightpos = -1, endpos},
+% hline{2} = {6-7}{.08em, leftpos = -1, rightpos = -1, endpos},
+% hline{3} = {.08em},
+% cell{odd[3-Z]}{1-Z} = {gray9},
+% cell{3-Z}{1} = {cmd = \texttt},
+% rowhead = 2
+% }
+% & 本科 & & 硕士 & & 博士 & \\
+% & 校内 & 校外 & 学术 & 专业 & 学术 & 专业 \\
+% graduate-type & & & \cmark & \cmark & \cmark & \cmark \\
+% degree-type & & & \cmark & \cmark & \cmark & \cmark \\
+% degree & & & \cmark & \cmark & \cmark & \cmark \\
+% degree* & & & & \cmark & & \\
+% title & \cmark & \cmark & \cmark & \cmark & \cmark & \cmark \\
+% title* & & & \cmark & \cmark & \cmark & \cmark \\
+% department & \cmark & \cmark & \cmark & \cmark & \cmark & \cmark \\
+% major & \cmark & \cmark & \cmark & & \cmark & \\
+% major* & & & \cmark & & \cmark & \\
+% sub-major & & & \cmark & & \cmark & \\
+% domain & & & & \cmark & & \cmark \\
+% author & \cmark & \cmark & \cmark & \cmark & \cmark & \cmark \\
+% author* & & & \cmark & \cmark & \cmark & \cmark \\
+% supervisor & \cmark & & \cmark & \cmark & \cmark & \cmark \\
+% supervisor* & & & \cmark & \cmark & \cmark & \cmark \\
+% supervisor-department & \cmark & & & & & \\
+% supervisor-enterprise & & \cmark & & \cmark & & \\
+% supervisor-enterprise* & & & & \cmark & & \\
+% supervisor-school & & \cmark & & & & \\
+% supervisor-title & & & \cmark & \cmark & \cmark & \cmark \\
+% supervisor-title* & & & \cmark & \cmark & \cmark & \cmark \\
+% supervisor-enterprise-title & & & & \cmark & & \\
+% supervisor-enterprise-title* & & & & \cmark & & \\
+% class-id & \cmark & \cmark & & & & \\
+% student-id & \cmark & \cmark & \cmark & \cmark & \cmark & \cmark \\
+% clc & & & \cmark & \cmark & \cmark & \cmark \\
+% secret-level & & & \cmark & \cmark & \cmark & \cmark \\
+% submit-date & & & \cmark & \cmark & \cmark & \cmark \\
+% abstract & \cmark & \cmark & \cmark & \cmark & \cmark & \cmark \\
+% abstract* & \cmark & \cmark & \cmark & \cmark & \cmark & \cmark \\
+% keywords & \cmark & \cmark & \cmark & \cmark & \cmark & \cmark \\
+% keywords* & \cmark & \cmark & \cmark & \cmark & \cmark & \cmark \\
+% acknowledgements & \cmark & \cmark & \cmark & \cmark & \cmark & \cmark \\
+% \end{tblr}
+% \changes{v1.9.0.0}{2022/05/03}{增加研究生信息录入选项文档}
+% \begin{function}[added=2022-05-02,updated=2022-05-03]{info/graduate-type}
% \begin{syntax}
-% \optx{info/graduate-type}=\metax{(master)|doctor}
+% \optx{info/graduate-type}=\metax{(硕士)|博士}
% \end{syntax}
% 设置研究生类型。
% \end{function}
% \begin{optdesc}
-% \item[master] 硕士研究生。
-% \item[doctor] 博士研究生。
+% \item[硕士] 硕士研究生。
+% \item[博士] 博士研究生。
+% \end{optdesc}
+% \begin{function}[added=2022-05-03]{info/degree-type}
+% \begin{syntax}
+% \optx{info/degree-type}=\metax{(学术)|专业}
+% \end{syntax}
+% 设置研究生学位类型。
+% \end{function}
+% \begin{optdesc}
+% \item[学术] 学术学位。
+% \item[专业] 专业学位。
% \end{optdesc}
-% \begin{function}[added=2022-04-01]{info/title}
+% \begin{function}[added=2022-05-03]{info/degree,info/degree*}
% \begin{syntax}
-% \optx{info/title}=\argx{论文标题}
+% \optx{info/degree}=\argx{研究生学位类别中文名称}
+% \optx{info/degree*}=\argx{研究生学位类别英文名称}
+% \end{syntax}
+% 设置研究生学位类别。
+% \end{function}
+% \begin{function}[added=2022-04-01,updated=2022-05-03]{info/title,info/title*}
+% \begin{syntax}
+% \optx{info/title}=\argx{论文中文标题}
+% \optx{info/title*}=\argx{论文英文标题}
% \end{syntax}
% 设置论文标题。如果需要手动制定换行位点,请使用换行控制符(|\\|),最多两行。
% \end{function}
@@ -706,41 +810,71 @@
% \end{syntax}
% 设置院系名称。
% \end{function}
-% \begin{function}[added=2022-04-01]{info/major}
+% \begin{function}[added=2022-04-01,updated=2022-05-03]{info/major,info/major*}
+% \begin{syntax}
+% \optx{info/major}=\argx{专业名称/一级学科名称}
+% \optx{info/major*}=\argx{一级学科英文名称}
+% \end{syntax}
+% 设置专业名称/一级学科名称。
+% \end{function}
+% \begin{function}[added=2022-05-03]{info/sub-major}
% \begin{syntax}
-% \optx{info/major}=\argx{专业名称}
+% \optx{info/sub-major}=\argx{二级学科名称}
% \end{syntax}
-% 设置专业名称。
+% 设置二级学科名称。
% \end{function}
-% \begin{function}[added=2022-04-01]{info/author}
+% \begin{function}[added=2022-05-03]{info/domain}
+% \begin{syntax}
+% \optx{info/domain}=\argx{领域}
+% \end{syntax}
+% 设置领域名称。
+% \end{function}
+% \begin{function}[added=2022-04-01,updated=2022-05-03]{info/author,info/author*}
% \begin{syntax}
% \optx{info/author}=\argx{作者姓名}
+% \optx{info/author*}=\argx{作者姓名拼音}
% \end{syntax}
% 设置作者姓名。
% \end{function}
-% \begin{function}[added=2022-04-01]{info/supervisor}
+% \begin{function}[added=2022-04-01,updated=2022-05-03]{info/supervisor,info/supervisor*}
% \begin{syntax}
% \optx{info/supervisor}=\argx{导师姓名}
+% \optx{info/supervisor*}=\argx{导师姓名拼音}
% \end{syntax}
-% 设置导师姓名。非校外毕业设计填写。
+% 设置导师姓名。
% \end{function}
% \begin{function}[added=2022-04-01]{info/supervisor-department}
% \begin{syntax}
% \optx{info/supervisor-department}=\argx{院内导师姓名}
% \end{syntax}
-% 设置院内导师姓名。非校外毕业设计填写,如无院内导师,则无需填写。
+% 设置院内导师姓名。
% \end{function}
-% \begin{function}[added=2022-04-01]{info/supervisor-enterprise}
+% \begin{function}[added=2022-04-01,updated=2022-05-03]{info/supervisor-enterprise,info/supervisor-enterprise*}
% \begin{syntax}
% \optx{info/supervisor-enterprise}=\argx{校外导师姓名}
+% \optx{info/supervisor-enterprise*}=\argx{校外导师姓名拼音}
% \end{syntax}
-% 设置校外导师姓名。校外毕业设计填写。
+% 设置校外导师姓名。
% \end{function}
% \begin{function}[added=2022-04-01]{info/supervisor-school}
% \begin{syntax}
% \optx{info/supervisor-school}=\argx{校内导师姓名}
% \end{syntax}
-% 设置校内导师姓名。校外毕业设计填写。
+% 设置校内导师姓名。
+% \end{function}
+% \begin{function}[added=2022-05-03]{info/supervisor-title,info/supervisor-title*}
+% \begin{syntax}
+% \optx{info/supervisor-title}=\argx{导师职称}
+% \optx{info/supervisor-title*}=\argx{导师职称英文名称}
+% \end{syntax}
+% 设置导师职称。
+% \end{function}
+% \begin{function}[added=2022-05-03]{info/supervisor-enterprise-title,info/supervisor-enterprise-title*}
+% \begin{syntax}
+% \optx{info/supervisor-enterprise-title}=\argx{校外导师职称}
+% \optx{info/supervisor-enterprise-title*}=\argx{校外导师职称英文名称}
+% \end{syntax}
+% 设置校外导师职称。
% \end{function}
% \begin{function}[added=2022-04-01]{info/class-id}
% \begin{syntax}
@@ -754,6 +888,24 @@
% \end{syntax}
% 设置作者学号。
% \end{function}
+% \begin{function}[added=2022-05-03]{info/clc}
+% \begin{syntax}
+% \optx{info/clc}=\argx{中图分类号}
+% \end{syntax}
+% 设置中图分类号。
+% \end{function}
+% \begin{function}[added=2022-05-03]{info/secret-level}
+% \begin{syntax}
+% \optx{info/secret-level}=\metax{秘密|(公开)}
+% \end{syntax}
+% 设置密级。
+% \end{function}
+% \begin{function}[added=2022-05-03]{info/submit-date}
+% \begin{syntax}
+% \optx{info/submit-date}=\argx{提交日期}
+% \end{syntax}
+% 设置提交日期。
+% \end{function}
% \begin{function}[added=2022-04-02]{info/abstract,info/abstract*}
% \begin{syntax}
% \optx{info/abstract}=\argx{中文摘要文件路径}
@@ -814,16 +966,20 @@
%<*class>
% \end{macrocode}
% \begin{macro}{\PassOptionsToClass,\LoadClass}
-% 加载\clsx{ctexbook}文档类。
% \changes{v0.3.2.0}{2022/04/04}{修正行间距为1.5倍}
% \changes{v1.8.1.0}{2022/05/03}{修正页面尺寸}
+% \changes{v1.9.2.0}{2022/05/04}{修正行间距为1.625倍}
+% 加载\clsx{ctexbook}文档类。
+% \\
+% \LaTeX{}中基本行距是字号大小的1.2倍,Microsoft Word中基本行距是字号大小的1.3倍,
+% Microsoft Word中1.5倍行距,相当于LaTeX中$1.5\times\frac{1.3}{1.2}=1.625$倍行距。
% \begin{macrocode}
\PassOptionsToClass
{
a4paper,
zihao=-4,
sub4section,
- linespread = 1.5,
+%<xduugthesis> linespread = 1.625,
fontset = none
}
{ ctexbook }
@@ -925,7 +1081,7 @@
% \end{macrocode}
% 英文字体配置。
% \begin{macrocode}
- latin-font .choices:nn = { tacn, thcs, gyre, none }
+ latin-font .choices:nn = { tac, tacn, thcs, gyre, none }
{ \tl_set_eq:NN \l_@@_latin_font_tl \l_keys_choice_tl },
% \end{macrocode}
% 数学字体配置。
@@ -1475,6 +1631,21 @@
}
% \end{macrocode}
% \end{macro}
+% \begin{macro}{\@@_load_latin_font_tac:}
+% \changes{v1.12.0.0}{2022/05/06}{新增Arial和Consolas英文字体配置}
+% 英文字体配置\valuex{tac}。
+% \begin{macrocode}
+\cs_new:Npn \@@_load_latin_font_tac:
+ {
+ \@@_set_latin_main_font:nnnnn
+ { Times~New~Roman } { times.ttf } { timesbd.ttf } { timesi.ttf } { timesbi.ttf }
+ \@@_set_latin_sans_font:nnnnn
+ { Arial } { arial.ttf } { arialbd.ttf } { ariali.ttf } { arialbi.ttf }
+ \@@_set_latin_mono_font:nnnnn
+ { Consolas } { consola.ttf } { consolab.ttf } { consolai.ttf } { consolaz.ttf }
+ }
+% \end{macrocode}
+% \end{macro}
% \begin{macro}{\@@_load_latin_font_tacn:}
% 英文字体配置\valuex{tacn}。
% \begin{macrocode}
@@ -1860,14 +2031,91 @@
%<*xdupgthesis>
% \end{macrocode}
% \subsubsection{研究生}
+% \changes{v1.9.0.0}{2022/05/03}{增加研究生信息录入选项}
% \begin{variable}
% {
-% \l_@@_gr_type_tl
+% \l_@@_gr_type_tl,
+% \l_@@_degree_type_tl,
+% \l_@@_degree_str,
+% \l_@@_degree_en_str,
+% \l_@@_author_en_str,
+% \l_@@_supv_en_str,
+% \l_@@_supv_ent_en_str,
+% \l_@@_supv_t_str,
+% \l_@@_supv_t_en_str,
+% \l_@@_supv_ent_t_str,
+% \l_@@_supv_ent_t_en_str,
+% \l_@@_title_en_str,
+% \l_@@_major_en_str,
+% \l_@@_sub_major_str,
+% \l_@@_domain_str,
+% \l_@@_clc_str,
+% \l_@@_secret_lv_str,
+% \l_@@_submit_date_str
% }
% 研究生类型。
% \begin{macrocode}
\tl_new:N \l_@@_gr_type_tl
% \end{macrocode}
+% 学位类型。
+% \begin{macrocode}
+\tl_new:N \l_@@_degree_type_tl
+% \end{macrocode}
+% 学位类别。
+% \begin{macrocode}
+\str_new:N \l_@@_degree_str
+\str_new:N \l_@@_degree_en_str
+% \end{macrocode}
+% 作者姓名拼音。
+% \begin{macrocode}
+\str_new:N \l_@@_author_en_str
+% \end{macrocode}
+% 导师姓名拼音。
+% \begin{macrocode}
+\str_new:N \l_@@_supv_en_str
+% \end{macrocode}
+% 校外导师姓名拼音。
+% \begin{macrocode}
+\str_new:N \l_@@_supv_ent_en_str
+% \end{macrocode}
+% 导师职称。
+% \begin{macrocode}
+\str_new:N \l_@@_supv_t_str
+\str_new:N \l_@@_supv_t_en_str
+% \end{macrocode}
+% 校外导师职称。
+% \begin{macrocode}
+\str_new:N \l_@@_supv_ent_t_str
+\str_new:N \l_@@_supv_ent_t_en_str
+% \end{macrocode}
+% 论文标题英文。
+% \begin{macrocode}
+\str_new:N \l_@@_title_en_str
+% \end{macrocode}
+% 一级学科英文名称。
+% \begin{macrocode}
+\str_new:N \l_@@_major_en_str
+% \end{macrocode}
+% 二级学科。
+% \begin{macrocode}
+\str_new:N \l_@@_sub_major_str
+% \end{macrocode}
+% 领域。
+% \begin{macrocode}
+\str_new:N \l_@@_domain_str
+% \end{macrocode}
+% 中图分类号。
+% \begin{macrocode}
+\str_new:N \l_@@_clc_str
+% \end{macrocode}
+% 密级。
+% \begin{macrocode}
+\str_new:N \l_@@_secret_lv_str
+% \end{macrocode}
+% 提交日期。
+% \begin{macrocode}
+\str_new:N \l_@@_submit_date_str
+% \end{macrocode}
% \end{variable}
% \begin{macro}{\keys_define:nn}
% 定义信息键值。
@@ -1877,8 +2125,69 @@
% \end{macrocode}
% 研究生类型。
% \begin{macrocode}
- graduate-type .choices:nn = { master, doctor }
- { \tl_set_eq:NN \l_@@_gr_type_tl \l_keys_choice_tl }
+ graduate-type .choices:nn = { 硕士, 博士 }
+ { \tl_set_eq:NN \l_@@_gr_type_tl \l_keys_choice_tl },
+% \end{macrocode}
+% 学位类型。
+% \begin{macrocode}
+ degree-type .choices:nn = { 学术, 专业 }
+ { \tl_set_eq:NN \l_@@_degree_type_tl \l_keys_choice_tl },
+% \end{macrocode}
+% 学位类别。
+% \begin{macrocode}
+ degree .tl_set:N = \l_@@_degree_str,
+ degree* .tl_set:N = \l_@@_degree_en_str,
+% \end{macrocode}
+% 作者姓名拼音。
+% \begin{macrocode}
+ author* .tl_set:N = \l_@@_author_en_str,
+% \end{macrocode}
+% 导师姓名拼音。
+% \begin{macrocode}
+ supervisor* .tl_set:N = \l_@@_supv_en_str,
+% \end{macrocode}
+% 校外导师姓名拼音。
+% \begin{macrocode}
+ supervisor-enterprise* .tl_set:N = \l_@@_supv_ent_en_str,
+% \end{macrocode}
+% 导师职称。
+% \begin{macrocode}
+ supervisor-title .tl_set:N = \l_@@_supv_t_str,
+ supervisor-title* .tl_set:N = \l_@@_supv_t_en_str,
+% \end{macrocode}
+% 校外导师职称。
+% \begin{macrocode}
+ supervisor-enterprise-title .tl_set:N = \l_@@_supv_ent_t_str,
+ supervisor-enterprise-title* .tl_set:N = \l_@@_supv_ent_t_en_str,
+% \end{macrocode}
+% 论文标题英文。
+% \begin{macrocode}
+ title* .tl_set:N = \l_@@_title_en_str,
+% \end{macrocode}
+% 一级学科英文名称。
+% \begin{macrocode}
+ major* .tl_set:N = \l_@@_major_en_str,
+% \end{macrocode}
+% 二级学科。
+% \begin{macrocode}
+ sub-major .tl_set:N = \l_@@_sub_major_str,
+% \end{macrocode}
+% 领域。
+% \begin{macrocode}
+ domain .tl_set:N = \l_@@_domain_str,
+% \end{macrocode}
+% 中图分类号。
+% \begin{macrocode}
+ clc .tl_set:N = \l_@@_clc_str,
+% \end{macrocode}
+% 密级。
+% \begin{macrocode}
+ secret-level .choices:nn = { 秘密, 公开 }
+ { \tl_set_eq:NN \l_@@_secret_lv_str \l_keys_choice_tl },
+% \end{macrocode}
+% 提交日期。
+% \begin{macrocode}
+ submit-date .tl_set:N = \l_@@_submit_date_str
}
% \end{macrocode}
% \end{macro}
@@ -1889,7 +2198,24 @@
% \begin{macrocode}
\keys_set:nn { xdu }
{
- info / graduate-type = { master },
+ info / graduate-type = { 硕士 },
+ info / degree-type = { 学术 },
+ info / degree = { },
+ info / degree* = { },
+ info / author* = { },
+ info / supervisor* = { },
+ info / supervisor-enterprise* = { },
+ info / supervisor-title = { },
+ info / supervisor-title* = { },
+ info / supervisor-enterprise-title = { },
+ info / supervisor-enterprise-title* = { },
+ info / title* = { },
+ info / major* = { },
+ info / sub-major = { },
+ info / domain = { },
+ info / clc = { },
+ info / secret-level = { 公开 },
+ info / submit-date = { }
}
% \end{macrocode}
% \end{macro}
@@ -1914,7 +2240,8 @@
% \l_@@_subsubsec_tl,
% \l_@@_para_tl,
% \l_@@_subpara_tl,
-% \l_@@_sym_mgn_bool
+% \l_@@_sym_mgn_bool,
+% \l_@@_page_v_align_tl
% }
% 英文是否使用中文字体。
% \begin{macrocode}
@@ -1966,6 +2293,10 @@
% \begin{macrocode}
\bool_new:N \l_@@_sym_mgn_bool
% \end{macrocode}
+% 设置页面垂直方向的对齐方式。
+% \begin{macrocode}
+\tl_new:N \l_@@_page_v_align_tl
+% \end{macrocode}
% \end{variable}
% \begin{macro}{\keys_define:nn}
% 定义样式键值。
@@ -2026,7 +2357,11 @@
% \end{macrocode}
% 设置页边距是否对称。
% \begin{macrocode}
- symmetric-margin .bool_set:N = \l_@@_sym_mgn_bool
+ symmetric-margin .bool_set:N = \l_@@_sym_mgn_bool,
+% \end{macrocode}
+% 设置页面垂直方向的对齐方式。
+% \begin{macrocode}
+ page-vertical-align .tl_set:N = \l_@@_page_v_align_tl
}
% \end{macrocode}
% \end{macro}
@@ -2045,7 +2380,8 @@
style / algorithm-small-font = true,
style / before-skip = { 24pt, 18pt, 12pt, 12pt, 12pt, 12pt },
style / after-skip = { 18pt, 12pt, 6pt, 6pt, 6pt, 6pt },
- style / symmetric-margin = false
+ style / symmetric-margin = false,
+ style / page-vertical-align = {顶部对齐}
}
% \end{macrocode}
% \end{macro}
@@ -2093,12 +2429,12 @@
{
\@@_lang_switch:nn
{
- \tl_if_eq:NnTF \l_@@_gr_type_tl { master }
+ \tl_if_eq:NnTF \l_@@_gr_type_tl { 硕士 }
{ \str_set:Nn \l_@@_header_str { 西安电子科技大学硕士学位论文 } }
{ \str_set:Nn \l_@@_header_str { 西安电子科技大学博士学位论文 } }
}
{
- \tl_if_eq:NnTF \l_@@_gr_type_tl { master }
+ \tl_if_eq:NnTF \l_@@_gr_type_tl { 硕士 }
{
\str_set:Nn \l_@@_header_str
{ Master~Thesis~of~XIDIAN~UNIVERSITY }
@@ -2514,6 +2850,18 @@
%</xdupgthesis>
% \end{macrocode}
% \end{macro}
+% \subsubsection{对齐方式}
+% \begin{macro}{\raggedbottom,\flushbottom}
+% \changes{v1.13.0.0}{2022/05/08}{设置页面垂直方向的对齐方式}
+% \begin{macrocode}
+\ctex_at_end_preamble:n
+ {
+ \tl_if_eq:NnTF \l_@@_page_v_align_tl { 顶部对齐 }
+ { \raggedbottom }
+ { \flushbottom }
+ }
+% \end{macrocode}
+% \end{macro}
% \begin{macrocode}
%</thesis>
%<*xduugthesis>
@@ -2689,49 +3037,60 @@
% \end{macrocode}
% \end{macro}
% \subsection{目录}
+% \begin{macro}{\RequirePackage}
+% \changes{v0.4.1.0}{2022/04/05}{设置目录样式}
+% 设置目录样式。
+% \begin{macrocode}
+\RequirePackage [ titles ] { tocloft }
+% \end{macrocode}
+% \end{macro}
+% \begin{variable}{\cftchapleader}
+% 修改目录中一级标题引导点。
+% \begin{macrocode}
+\cs_set:Npn \cftchapleader { \bfseries \cftdotfill { \cftdotsep } }
+% \end{macrocode}
+% \end{variable}
% \begin{variable}
% {
-% \cftchapleader,
% \cftbeforechapskip,
-% \cftbeforesecskip,
-% \cftbeforesubsecskip,
-% \cftbeforesubsubsecskip,
-% \cftbeforeparaskip,
-% \cftbeforesubparaskip,
+% \cftbeforesecskip
+% }
+% \changes{v1.10.1.0}{2022/05/04}{修正目录条目间距}
+% 设置一级标题与其余各级标题条目前垂直间距一致。
+% \begin{macrocode}
+\dim_set_eq:NN \cftbeforechapskip \cftbeforesecskip
+% \end{macrocode}
+% \end{variable}
+% \begin{variable}
+% {
% \cftchapfont,
-% \cftchappagefont,
-% \cftsecfont,
-% \cftsubsecfont,
-% \cftsubsubsecfont,
-% \cftparafont,
-% \cftsubparafont,
-% \cftsecpagefont,
-% \cftsubsecpagefont,
-% \cftsubsubsecpagefont,
-% \cftparapagefont,
-% \cftsubparapagefont
+% \cftchappagefont
% }
-% 设置目录样式。
-% \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
+ \cftchapfont,
+ \cftchappagefont
}
- { \dim_set:Nn { #1 } { 5pt } }
- \clist_map_inline:nn
- {
- \cftchapfont,
- \cftchappagefont
- }
- { \renewcommand { #1 } { \@@_rm_family: \zihao { -4 } \bfseries } }
+ { \renewcommand { #1 } { \@@_rm_family: \zihao { -4 } \bfseries } }
+% \end{macrocode}
+% \end{variable}
+% \begin{variable}
+% {
+% \cftsecfont,,
+% \cftsubsecfont,,
+% \cftsubsubsecfont,,
+% \cftparafont,,
+% \cftsubparafont,,
+% \cftsecpagefont,,
+% \cftsubsecpagefont,,
+% \cftsubsubsecpagefont,,
+% \cftparapagefont,,
+% \cftsubparapagefont
+% }
+% 设置二三四五六级标题及相应页码字体字号。
+% \begin{macrocode}
\clist_map_inline:nn
{
\cftsecfont,
@@ -2748,6 +3107,10 @@
{ \renewcommand { #1 } { \@@_rm_family: \zihao { -4 } } }
% \end{macrocode}
% \end{variable}
+% \begin{macrocode}
+%</xduugthesis>
+%<*thesis>
+% \end{macrocode}
% \subsection{公式}
% \begin{macro}{\theequation}
% 重定义公式编号样式。
@@ -2859,7 +3222,7 @@
% \begin{macro}{\DeclareCaptionLabelSeparator,\DeclareCaptionFont,\captionsetup}
% \changes{v0.1.2.0}{2022/04/03}{设置图片标签与后面标题之间的间距}
% \changes{v0.1.3.0}{2022/04/03}{设置图片标签与标题字体字号}
-% 设置图表标签与后面标题之间的间距。
+% 设置图表标签与后面标题之间的间距及caption字体字号。
% \begin{macrocode}
\RequirePackage { caption }
\DeclareCaptionLabelSeparator { customskip } { \hskip \l_@@_cap_label_sep_tl }
@@ -2901,6 +3264,22 @@
}
% \end{macrocode}
% \end{macro}
+% \begin{macro}{\SetTblrStyle,\DefTblrTemplate}
+% \changes{v1.11.0.0}{2022/05/06}{适配\pkgx{tabularray}宏包caption样式}
+% 设置\pkgx{tabularray}宏包中表格标签与后面标题之间的间距及caption字体字号。
+% \begin{macrocode}
+\ctex_at_end_preamble:n
+ {
+ \@ifpackageloaded { tabularray }
+ {
+ \SetTblrStyle { head } { font = \@@_rm_family: \zihao { 5 } }
+ \DefTblrTemplate { caption-sep } { default }
+ { \hskip \l_@@_cap_label_sep_tl }
+ }
+ { }
+ }
+% \end{macrocode}
+% \end{macro}
% \subsection{图片}
% \begin{macro}{\PassOptionsToPackage,\captionsetup}
% \changes{v0.4.2.0}{2022/04/05}{设置子图标签与标题字体字号}
@@ -2929,7 +3308,7 @@
% \end{macro}
% \begin{macro}{longtable}
% \changes{v1.3.0.0}{2022/04/20}{设置\envx{longtable}环境字号是否为五号}
-% 设置\envx{longtable}环境字号是否为五号。
+% 设置\pkgx{longtable}宏包中\envx{longtable}环境字号是否为五号。
% \begin{macrocode}
\ctex_at_end_preamble:n
{
@@ -2946,12 +3325,35 @@
}
% \end{macrocode}
% \end{macro}
+% \begin{macro}{tblr,longtblr}
+% \changes{v1.11.0.0}{2022/05/06}{适配\pkgx{tabularray}宏包中\envx{tblr}和\envx{longtblr}环境字号}
+% 设置\pkgx{tabularray}宏包中\envx{tblr}和\envx{longtblr}环境字号是否为五号。
+% \begin{macrocode}
+\ctex_at_end_preamble:n
+ {
+ \@ifpackageloaded { tabularray }
+ {
+ \bool_if:NT \l_@@_tab_small_bool
+ {
+ \ctex_gadd_ltxhook:nn
+ { env/tblr/begin }
+ { \small }
+ \ctex_gadd_ltxhook:nn
+ { env/longtblr/begin }
+ { \small }
+ }
+ }
+ { }
+ }
+% \end{macrocode}
+% \end{macro}
% \subsection{超链接和PDF元数据}
% \begin{macro}{\hyperref}
-% 配置超链接和PDF元数据。
% \changes{v0.5.0.0}{2022/04/05}{添加PDF主题元数据}
+% \changes{v1.10.0.0}{2022/05/04}{添加PDF应用程序元数据}
+% 配置超链接和PDF元数据。
% \begin{macrocode}
-\RequirePackage{hyperref}
+\RequirePackage{ hyperref }
\hypersetup
{
bookmarksnumbered,
@@ -2962,7 +3364,10 @@
\hypersetup
{
pdftitle = \l_@@_pure_title_str,
-%<xduugthesis> pdfsubject = {西安电子科技大学本科毕业设计论文},
+%<xduugthesis> pdfsubject = { 西安电子科技大学本科毕业设计论文 },
+%<xduugthesis> pdfcreator = { XeLaTeX~with~xduugthesis~class~in~XDUTS },
+%<xdupgthesis> pdfsubject = \l_@@_header_str,
+%<xdupgthesis> pdfcreator = { XeLaTeX~with~xdupgthesis~class~in~XDUTS },
pdfauthor = \l_@@_author_str
}
}
@@ -3005,7 +3410,7 @@
{ \ctex_gadd_ltxhook:nn { env/document/begin } { #1 } }
% \end{macrocode}
% \end{macro}
-% \begin{macro}{\addbibresource}
+% \begin{macro}{\RequirePackage,\bibliographystyle,\addbibresource}
% 参考文献。
% \begin{macrocode}
\@@_begin_document:n
@@ -3023,6 +3428,10 @@
}
% \end{macrocode}
% \end{macro}
+% \begin{macrocode}
+%</thesis>
+%<*xduugthesis>
+% \end{macrocode}
% \subsection{附录}
% \begin{macro}{appendixes}
% 附录环境。
@@ -3060,14 +3469,14 @@
% \begin{macrocode}
\cs_new:Npn \@@_cover_i:nn #1#2
{
- \vbox_to_ht:nn {12pt}
+ \vbox_to_ht:nn { 12pt }
{
\mode_leave_vertical:
\hfill
\hbox:n
{
\@@_rm_family: \zihao { -4 } \bfseries
- \hbox_to_wd:nn { 3em } { #1 }
+ \hbox_to_wd:nn { 3em } { #1 }
\skip_horizontal:n { 1em }
\@@_uline:n { \hbox_to_wd:nn { 15ex } { \hfil #2 \hfil } }
\skip_horizontal:n { 1.5cm }
@@ -3078,21 +3487,26 @@
% \end{macro}
% \begin{macro}{\@@_cover_ii:nnn}
% \changes{v0.6.1.0}{2022/04/11}{修复logo不存在导致的无法编译}
+% \changes{v1.13.1.0}{2022/05/08}{使用融合logo文件}
% 绘制西电logo。
% \begin{arguments}
% \item 盒子高度。
% \item logo高度。
-% \item logo文件名称。
+% \item logo类型。
% \end{arguments}
% \begin{macrocode}
\cs_new:Npn \@@_cover_ii:nnn #1#2#3
{
- \vbox_to_ht:nn {#1}
+ \vbox_to_ht:nn { #1 }
{
\mode_leave_vertical:
\hfil
- \file_if_exist:nT { #3 }
- { \includegraphics [ height = #2, keepaspectratio ] { #3 } }
+ \file_if_exist:nT { xdulogo.pdf }
+ {
+ \str_if_eq:nnTF { #3 } { text }
+ { \includegraphics [ page = 1, height = #2 ] { xdulogo.pdf } }
+ { \includegraphics [ page = 2, height = #2 ] { xdulogo.pdf } }
+ }
\hfil
}
}
@@ -3110,7 +3524,7 @@
% \begin{macrocode}
\cs_new:Npn \@@_cover_iii:nnnnn #1#2#3#4#5
{
- \vbox_to_ht:nn {40pt}
+ \vbox_to_ht:nn { 42.5pt }
{
\vfill
\mode_leave_vertical:
@@ -3193,6 +3607,7 @@
% \end{macrocode}
% \end{macro}
% \begin{macro}{\frontmatter}
+% \changes{v1.9.1.0}{2022/05/04}{修正封面元素位置及尺寸}
% 排版正文前部分。
% \begin{macrocode}
\renewcommand { \frontmatter }
@@ -3210,16 +3625,22 @@
% \end{macrocode}
% 排版西电文字logo。
% \begin{macrocode}
- \@@_cover_ii:nnn { 65pt } { 35pt } { xidian-text.pdf }
+ \@@_cover_ii:nnn { 65pt } { 35pt } { text }
% \end{macrocode}
+% \changes{v1.13.2.0}{2022/05/08}{修正封面标题偏移}
% 排版封面标题。
% \begin{macrocode}
- \vbox_to_ht:nn { 75pt }
- { \@@_sf_family: \zihao { 0 } \centering { 本科毕业设计论文 } }
+ \vbox_to_ht:nn { 90pt }
+ {
+ \mode_leave_vertical:
+ \hfil
+ \hbox_to_wd:nn { 375pt } { \sffamily \zihao { 0 } 本科毕业设计论文 }
+ \hfil
+ }
% \end{macrocode}
% 排版西电logo。
% \begin{macrocode}
- \@@_cover_ii:nnn { 130pt } { 120pt } { xidian-logo.pdf }
+ \@@_cover_ii:nnn { 140pt } { 120pt } { icon }
% \end{macrocode}
% 拆分论文标题并排版。
% \begin{macrocode}
@@ -3266,11 +3687,12 @@
\cleardoublepage
% \end{macrocode}
% \changes{v0.8.0.0}{2022/04/12}{支持对称页边距}
+% \changes{v1.10.2.0}{2022/05/04}{修正正文前页码样式}
% 更换页面尺寸、页面样式和页码样式。
% \begin{macrocode}
\@@_load_main_geometry:
\pagestyle { plain }
- \pagenumbering { Roman }
+ \pagenumbering { roman }
% \end{macrocode}
% \changes{v1.2.1.0}{2022/04/19}{修正英文论文下中文摘要标题样式}
% 中文摘要,宋体小四号。
@@ -3289,18 +3711,25 @@
\file_if_exist_input:n { \l_@@_abstract_zh_tl }
}
% \end{macrocode}
+% \changes{v1.10.3.0}{2022/05/04}{使用弹性长度分隔关键词}
+% 关键词弹性分隔间距。
+% \begin{macrocode}
+ \cs_new:Npn \@@_keywords_space: { \hspace{ 2em plus 1em minus 1em } }
+% \end{macrocode}
% 中文关键词,黑体小四号。
% \begin{macrocode}
{
\sffamily \zihao { -4 } \par
- \@@_typeout_keywords:nNn { 关键词: } { \l_@@_keywords_zh_clist } { \qquad }
+ \@@_typeout_keywords:nNn
+ { 关键词: } { \l_@@_keywords_zh_clist } { \@@_keywords_space: }
}
\cleardoublepage
% \end{macrocode}
% 英文摘要,Times New Roman字体,小四号。
% \changes{v0.4.3.0}{2022/04/05}{修正英文摘要标题字体}
% \begin{macrocode}
- \@@_n_chapter_head_ii:nn {ABSTRACT} { \rmfamily \zihao { 3 } \bfseries \centering }
+ \@@_n_chapter_head_ii:nn
+ { ABSTRACT } { \rmfamily \zihao { 3 } \bfseries \centering }
{
\dim_set:Nn \parindent { 2 \ccwd }
\rmfamily \zihao { -4 }
@@ -3311,7 +3740,8 @@
% \begin{macrocode}
{
\rmfamily \zihao { -4 } \bfseries \par
- \@@_typeout_keywords:nNn { Keywords: } { \l_@@_keywords_en_clist } { \qquad }
+ \@@_typeout_keywords:nNn
+ { Keywords: } { \l_@@_keywords_en_clist } { \@@_keywords_space: }
}
\cleardoublepage
% \end{macrocode}
diff --git a/macros/xetex/latex/xduts/xduts.ins b/macros/xetex/latex/xduts/xduts.ins
index c87034a527..1151b48d28 100644
--- a/macros/xetex/latex/xduts/xduts.ins
+++ b/macros/xetex/latex/xduts/xduts.ins
@@ -19,7 +19,7 @@ The Current Maintainer of this work is @note286 in GitHub and CTAN.
This work consists of the files README.md, xduts.dtx, and xduts.ins
and the derived files xduts.pdf, xdufont.sty, xdupgthesis.cls, and xduugthesis.cls.
-The copyright of xidian-text.pdf and xidian-logo.pdf is Xidian University.
+The copyright of xdulogo.pdf is Xidian University.
\endpreamble
\postamble
diff --git a/macros/xetex/latex/xduts/xduts.pdf b/macros/xetex/latex/xduts/xduts.pdf
index a3a7be0362..8cd7f1c048 100644
--- a/macros/xetex/latex/xduts/xduts.pdf
+++ b/macros/xetex/latex/xduts/xduts.pdf
Binary files differ
diff --git a/macros/xetex/latex/xduts/xidian-text.pdf b/macros/xetex/latex/xduts/xidian-text.pdf
deleted file mode 100644
index aca2d6291a..0000000000
--- a/macros/xetex/latex/xduts/xidian-text.pdf
+++ /dev/null
Binary files differ
diff --git a/support/luafindfont/CHANGELOG b/support/luafindfont/CHANGELOG
index 38c1a9726a..acd81406f3 100644
--- a/support/luafindfont/CHANGELOG
+++ b/support/luafindfont/CHANGELOG
@@ -1,5 +1,6 @@
+0.09 2022-05-07 - load first a luc.gz database, if present
0.08 2022-05-05 - added --no-symbolic-names as a synonym
- edited some output messages
+ - edited some output messages
0.07 2022-05-01 - added -x option for a kpsewhich test
0.06 2022-02-08 - small fix for output log
0.05 2021-12-04 - use always lowercase for internal search
diff --git a/support/luafindfont/doc/luafindfont-doc.pdf b/support/luafindfont/doc/luafindfont-doc.pdf
index 4dc4203bd5..913da1bc1d 100644
--- a/support/luafindfont/doc/luafindfont-doc.pdf
+++ b/support/luafindfont/doc/luafindfont-doc.pdf
Binary files differ
diff --git a/support/luafindfont/doc/luafindfont-doc.tex b/support/luafindfont/doc/luafindfont-doc.tex
index 90d0c57d94..59ac70890c 100644
--- a/support/luafindfont/doc/luafindfont-doc.tex
+++ b/support/luafindfont/doc/luafindfont-doc.tex
@@ -1,4 +1,4 @@
- %% $Id: luafindfont-doc.tex 533 2022-05-01 18:31:44Z herbert $
+ %% $Id: luafindfont-doc.tex 545 2022-05-08 14:21:52Z herbert $
%
\listfiles\setcounter{errorcontextlines}{100}
\documentclass[paper=a4,fontsize=11pt,DIV=14,parskip=half-,
@@ -39,11 +39,13 @@
\usepackage{listings}
\usepackage{hvextern}
-\setkeys{hv}{moveToExampleDir,ExampleDir=Examples,showFilename=false}
+\setkeys{hv}{moveToExampleDir,ExampleDir=Examples,showFilename=false,force,verbose}
\lstset{basicstyle=\ttfamily\small,language=[LaTeX]TeX}
\usepackage{ragged2e}
+
\usepackage{makeidx}\makeindex
\usepackage{hvindex}
+
\def\Lfile#1{\texttt{#1}\index{#1 file@\texttt{#1} file}}
\def\Lext#1{\texttt{.#1}\index{#1 file extension@\texttt{.#1} file extension}}
\def\Lcs#1{\texttt{\textbackslash#1}\index{#1@\texttt{\textbackslash#1}}}
@@ -79,7 +81,7 @@
\def\setVersion#1{\setVVersion#1!!}
\def\setVVersion#1=#2!!{\def\luafindfontVersion{#2}}
-\setVersion{version = 0.08}% can be automatically changed by perl
+\setVersion{version = 0.09}% can be automatically changed by perl
\setkeys{hv}{cleanup={},force}
@@ -174,8 +176,8 @@ the length is limited to 50 characters and in the middle of the long name there
\section{How it works}
\FF uses the data file \Lfile{luaotfloadtool-names.lua} which is created by \LuaTeX. If it is
missing it will be created by \FF itself. The name of the font should be in lowercase
-characters and must not be the complete name. A \verb|time| for finding all fonts with
-time in its names is sufficiant.
+characters and must not be the complete name. A ``\verb|time|'' for finding all fonts with
+``time'' in its names is sufficiant for searching ``times new roman''.
\subsection{Fontname}
@@ -246,7 +248,7 @@ the usual way by running \texttt{texhash} or via a menu entry if using a file ma
\begin{externalDocument}[redirect,includegraphic=false,force,code,docType=sh,ext=sh,compiler=sh]{exa}
#StartVisibleMain
-luafindfont -x PStricksdotfont
+luafindfont -m 55 -x PStricksdotfont
#StopVisibleMain
\end{externalDocument}
@@ -267,7 +269,7 @@ luafindfont segoe
\begin{externalDocument}[redirect,includegraphic=false,force,code,docType=sh,ext=sh,compiler=sh]{exa}
#StartVisibleMain
-luafindfont -m 40 libertinus
+luafindfont -m 35 libertinus
#StopVisibleMain
\end{externalDocument}
diff --git a/support/luafindfont/man/luafindfont.1 b/support/luafindfont/man/luafindfont.1
index 8bc78a2a59..6814193fea 100644
--- a/support/luafindfont/man/luafindfont.1
+++ b/support/luafindfont/man/luafindfont.1
@@ -1,6 +1,6 @@
.\" Manpage for luafindfont.
.\" Contact hvoss@tug.org to correct errors or typos.
-.TH luafindfont 1 "05 may 2022" "0.08" "luafindfont man page"
+.TH luafindfont 1 "07 may 2022" "0.09" "luafindfont man page"
.SH NAME
luafindfont
\- retrieve font informations of all installed system and TeX fonts.
diff --git a/support/luafindfont/scripts/luafindfont.lua b/support/luafindfont/scripts/luafindfont.lua
index 62d0e8cd4f..d3532b643e 100755
--- a/support/luafindfont/scripts/luafindfont.lua
+++ b/support/luafindfont/scripts/luafindfont.lua
@@ -1,5 +1,5 @@
#!/usr/bin/env texlua
-
+--
-----------------------------------------------------------------------
-- FILE: luafindfont.lua
-- DESCRIPTION: search for fonts in the database
@@ -7,7 +7,7 @@
-- AUTHOR: Herbert Voß (C) 2022-05-05
-----------------------------------------------------------------------
luafindfont = luafindfont or { }
- local version = 0.08
+ local version = 0.09
luafindfont.version = version
--[[
@@ -34,6 +34,7 @@ kpse.set_program_name("luatex")
local f = kpse.find_file("lualibs.lua")
require("lualibs") -- all part of LuaTeX
+
--require("luafindfont-utflib")
if #arg == 0 then
@@ -112,7 +113,13 @@ while i <= #arg do
i = i + 1
end
-if args_verbose > 0 then
+local vlevel = args_verbose
+
+function logprint(str)
+ if vlevel > 0 then print(str) end
+end
+
+if vlevel > 0 then
print("Parameter:")
print("args_verbose = "..args_verbose)
print("args_nosymbolicnames = "..tostring(args_nosymbolicnames))
@@ -127,7 +134,6 @@ if not args_font then
os.exit()
end
-local vlevel = args_verbose
--local otfinfo = args_otfinfo
local info = args_info
local noSymbolicNames = args_nosymbolicnames
@@ -153,12 +159,14 @@ function getFileParts(fullpath,part)
else return file end
end
+-- for fileparts see also file fontloader-l-file.lua in /luaotfload
+
function getFileLocation()
local cachepaths = kpse.expand_var('$TEXMFCACHE') or ""
if cachepaths == "" or cachepaths == "$TEXMFCACHE" then
cachepaths = kpse.expand_var('$TEXMFVAR') or ""
end
- if vlevel > 0 then print("cachepaths: ",cachepaths) end
+ logprint("cachepaths: "..cachepaths)
if cachepaths == "" then
print("umghhh ....")
print("No cache path found ... ")
@@ -169,14 +177,14 @@ function getFileLocation()
else
paths = string.split(cachepaths,":")
end
- if vlevel > 0 then print ("Pathes: ", paths[1], paths[2]) end
+ logprint ("Pathes: "..paths[1]..", "..paths[2])
local file = paths[1].."/luatex-cache/generic/names"
- if vlevel > 0 then print("try: ",file) end
+ logprint("try path: "..file)
local f,err = io.open (file.."/test.tmp", "w")
if not f and #paths > 1 then
- if vlevel > 0 then print("first path has no file, I'll try the second one ...") end
+ logprint("first path has no file, I'll try the second one ...")
file = paths[2].."/luatex-cache/generic/names"
- if vlevel > 0 then print("try: ",file) end
+ logprint("try path: "..file)
f,err = io.open (file.."/test.tmp", "w")
if not f then
print("Error getting file location: \n",err)
@@ -192,42 +200,51 @@ function getFileLocation()
end
function readBinaryOrZippedFile(file)
- if vlevel > 0 then print("Check for file "..file..".luc") end
+ logprint("Check for file "..file..".luc.gz")
+ local f,err = io.open (file..".luc.gz", "rb")
+ if f then
+ logprint("Found a zipped binary data file ... ")
+ local chunk = gzip.decompress(f:read"*all")
+ f:close()
+ local func = load (chunk, "b")
+ str = func()
+ return str
+ end
+ logprint("There is no zipped binary data file ... ")
+ logprint("Check for unzipped file "..file..".luc")
local f,err = io.open (file..".luc", "rb")
- if not f then
- if vlevel > 0 then
- print("There is no binary data file ... checking for lua.gz")
- end
- f,err = io.open (file..".lua.gz", "r")
- if not f then
- if vlevel > 0 then print("There is no gzipped data file ... ") end
- f,err = io.open (file..".lua", "r")
- if not f then
- if vlevel > 0 then print("There is no data file ... ") end
- print("Error reading file: ",err)
- return nil
- else
- if vlevel > 0 then print("Found a normal data file ... ") end
- local str = dofile(f)
- f:close()
- return str
- end
- else
- if vlevel > 0 then print("Found a gzipped data file ... ") end
- local str = f:read("*all")
- local str2 = loadstring(gzip.decompress(str))
- str = str2()
- f:close()
- return str
- end
- else
- if vlevel > 0 then print("Found a binary data file ... ") end
+ if f then
+ logprint("Found a binary data file ... ")
local chunk = f:read"*all"
f:close()
local func = load (chunk, "b")
str = func()
return str
end
+ logprint("There is no binary data file ... ")
+ logprint("Check for zipped file "..file..".lua.gz")
+ f,err = io.open (file..".lua.gz", "rb")
+ if f then
+ logprint("Found a gzipped data file ... ")
+ local str = f:read("*all")
+ local str2 = loadstring(gzip.decompress(str))
+ str = str2()
+ f:close()
+ return str
+ end
+ logprint("There is no gzipped data file ... ")
+ logprint("Check for file "..file..".lua")
+ f,err = io.open (file..".lua", "r")
+ if f then
+ logprint("Found a normal data file ... ")
+ local str = dofile(f)
+ f:close()
+ return str
+ else
+ logprint("There is no data file ... ")
+ print("Error reading file: ",err)
+ return nil
+ end
end
function compareEntries(f1, f2)
@@ -240,7 +257,6 @@ function compareEntries(f1, f2)
end
end
-
local fontData = {}
local fontListFile = getFileLocation()
if fontListFile == "" then
@@ -302,6 +318,7 @@ fontDataMap = newFontDataMap
local j = 1
local fontList = {}
+-- now calculate the longest string for all colums
local l_max = {1, 1, 1}
for i, v in ipairs(fontDataMap) do
if v["familyname"] then
@@ -323,9 +340,9 @@ end
if l_max[3] > maxStrLength then l_max[3] = maxStrLength end
local minChars = 26
-local Fontname = "Fontname"
+local Fontname = "Filename"
local Path = "Path"
-local SymbolicName = "Symbolic Name"
+local SymbolicName = "Symbolic name"
local lfdNr = "No."
if (font_str ~= "*") and not noSymbolicNames then
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb b/systems/texlive/tlnet/tlpkg/texlive.tlpdb
index 9636c7f996..0e0564032f 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb
@@ -26,11 +26,11 @@ depend container_split_src_files/1
depend frozen/0
depend minrelease/2016
depend release/2022
-depend revision/63254
+depend revision/63265
name 00texlive.image
category TLCore
-revision 63255
+revision 63264
shortdesc TeX Live files only in the source repository
longdesc The files here are not copied by the installer and containers
longdesc are not built for them; they exist only in the source
@@ -53049,7 +53049,7 @@ catalogue-version 1.5
name changebar
category Package
-revision 46919
+revision 63259
shortdesc Generate changebars in LaTeX documents
relocated 1
longdesc Identify areas of text to be marked with changebars with the
@@ -53057,28 +53057,18 @@ longdesc \cbstart and \cbend commands; the bars may be coloured. The
longdesc package uses 'drivers' to place the bars; the available drivers
longdesc can work with dvitoln03, dvitops, dvips, the emTeX and TeXtures
longdesc DVI drivers, and VTeX and pdfTeX.
-containersize 7032
-containerchecksum fa75f75aead49adb949e0bb5b5c116387e14b5fcf804502e12b7214a2638ec2032699125adc6ba8c528445c9f5c552ec744007530d1e5a69159f1041d2b7bceb
-doccontainersize 636464
-doccontainerchecksum f25c8bd3cb493bfe8446d98f3c599ec002f818daecac76ec4f08d19bfd15581bf8bf8970fd145886a42c51cd40a53df7bfc2e10641df2f4c2cdcd8aa02bf6c30
-docfiles size=199
+containersize 7004
+containerchecksum 1d47e3e98e6923fda580a8a34b8fcdcc7aad164306a6380ff8fd9ed77f1256225221f8b15da604303e562471ed6ffdb7109b6b95a397b25b80c48fdc4e565b62
+doccontainersize 376148
+doccontainerchecksum f3ece8b350ee00ecb596f0f66ef2ded81b7c507c618d226084d4a4e403441b9183a3686c2c26430654c45f15471092e83864a28cddad3d08e60c656d3af8ebe1
+docfiles size=99
RELOC/doc/latex/changebar/CATALOG
RELOC/doc/latex/changebar/MANIFEST
RELOC/doc/latex/changebar/README details="Readme"
- RELOC/doc/latex/changebar/cbtest1-ltx.pdf
- RELOC/doc/latex/changebar/cbtest1-pdf.pdf
- RELOC/doc/latex/changebar/cbtest1.tex
- RELOC/doc/latex/changebar/cbtest1good.pdf
- RELOC/doc/latex/changebar/cbtest1wrong.pdf
- RELOC/doc/latex/changebar/cbtest2-ltx.pdf
- RELOC/doc/latex/changebar/cbtest2-pdf.pdf
- RELOC/doc/latex/changebar/cbtest2.tex
RELOC/doc/latex/changebar/changebar.bug
RELOC/doc/latex/changebar/changebar.pdf details="Package documentation"
- RELOC/doc/latex/changebar/chbar.1
- RELOC/doc/latex/changebar/chbar.sh
srccontainersize 27104
-srccontainerchecksum a7e2519d4dfd4b0b12a9cd8ea59ce32a37e4d0cb6e637b659e93ea5b296bed21298f8dfa13a13798eb87ce0ea0719546f721875a4115c62cf0ea6110d9ac8f76
+srccontainerchecksum 0615c7d0057e9138ba84e0f622560b7c0823d44021702ba31a77ab1e3bd13c24b8d59b1d96369d5e619d180797f2684c25d497e40a5c253a67eaf399b6cd0763
srcfiles size=31
RELOC/source/latex/changebar/changebar.dtx
RELOC/source/latex/changebar/changebar.ins
@@ -53088,7 +53078,7 @@ catalogue-also chbar xechangebar backgrnd
catalogue-ctan /macros/latex/contrib/changebar
catalogue-license lppl1.3
catalogue-topics editorial
-catalogue-version 3.6c
+catalogue-version 3.6d
name changelayout
category Package
@@ -140864,7 +140854,7 @@ catalogue-version 0.02
name hvextern
category Package
-revision 63255
+revision 63260
shortdesc Write and execute external code, and insert the output
relocated 1
longdesc This package allows to write MetaPost, TeX, ConTeXt, LaTeX,
@@ -140872,21 +140862,22 @@ longdesc LuaTeX, LuaLaTeX, XeTeX, XeLaTeX, Lua, Perl, or Python source
longdesc code into an external file, run that file via shell-escape to
longdesc create PDF, PNG, or text output, and include that output
longdesc automatically into the main LaTeX document.
-containersize 4824
-containerchecksum f9201b2e0158d669c9408e3ed20e1b5940a7c894d4f8793007517f67dd3a1ed5ed9422efd1e9970da8d58c4a0dfcd94f7fc11a0d49a5dae4b69348b258ff7d39
-doccontainersize 890192
-doccontainerchecksum 9fa9865444f47b3c26e3edb2af34b87e3d338e78e1e254f68b5187d3733110fea8dc504ea5c947dd3a3a4d9bbaafd5ba798fbc54f9be47b1062549242a9331a5
-docfiles size=303
+containersize 5104
+containerchecksum 9ebdc1da7443d16b7a13882b87db49f7bc89e2c388698aae3b53cf2482c793ff559d278b9ed8e3165c6673ceeb0b6433c496caa677d7a6189fbd8ac21e8ae472
+doccontainersize 906336
+doccontainerchecksum de4ea4b8aafb1590f3d97292f93fcf3c5485bf59825b4a477f348d9f54f5c4bce48500ae75ca81afabd0e7e8c1760f953849bb4fab50a77bf65ecb7451bae445
+docfiles size=308
RELOC/doc/latex/hvextern/Changes
RELOC/doc/latex/hvextern/README details="Readme"
+ RELOC/doc/latex/hvextern/hvdoctools.sty
RELOC/doc/latex/hvextern/hvextern.pdf details="Package documentation"
RELOC/doc/latex/hvextern/hvextern.tex
-runfiles size=5
+runfiles size=6
RELOC/tex/latex/hvextern/hvextern.sty
catalogue-ctan /macros/latex/contrib/hvextern
catalogue-license lppl1.3c
catalogue-topics ext-code comp-supp image-supp expl3
-catalogue-version 0.22
+catalogue-version 0.23
name hvfloat
category Package
@@ -141067,16 +141058,16 @@ catalogue-version 0.04
name hvlogos
category Package
-revision 63135
+revision 63261
shortdesc Print TeX-related names as logo
relocated 1
longdesc This package is more or less an extension to Heiko Oberdiek's
longdesc package hologo. It prints TeX-related names as logos. The
longdesc package requires fetamont, hologo, dantelogo, and xspace.
-containersize 2724
-containerchecksum f1a6354d7704b3b689dbb2e56c459b65e87cbb082297e121ce8e836a6b830c3a3c8bc9264c42d1471e424e66061c297c311e7ee6bc2adef0bff3db3b92a61f50
-doccontainersize 86292
-doccontainerchecksum 65cf289eeedb5ca43eac93b55c8be2ff981f8d1bc4df13b7becc93aa0b388f1ff0a91a805370b6a9bfbf8474746769ae7a8b3554addb67080eb0e19765b70d13
+containersize 2772
+containerchecksum 655f8db151a5fbd05b096d288a6fe93cd89de9df3741a68eb5ffd221276d3ed633ca1f17507177c8bec2485ece386d117f11a363f87483763a941a155015ab3a
+doccontainersize 87192
+doccontainerchecksum 459e93a38de9d5dd600d02eaef7ea512ef57127a683bfa8831c159ab68bf6f86bfc4a659aba98adc59f2c5ac7e26984db5f84e8c9933b4a49b30633ad46ee45a
docfiles size=26
RELOC/doc/latex/hvlogos/Changes
RELOC/doc/latex/hvlogos/README details="Readme"
@@ -141087,7 +141078,7 @@ runfiles size=2
catalogue-ctan /macros/latex/contrib/hvlogos
catalogue-license lppl
catalogue-topics logo
-catalogue-version 0.08
+catalogue-version 0.09
name hvpygmentex
category Package
@@ -188701,15 +188692,15 @@ catalogue-version 1.17
name luafindfont
category Package
-revision 63233
+revision 63265
shortdesc Search fonts in the LuaTeX font database
longdesc This Lua script searches for fonts in the font database.
depend luafindfont.ARCH
-containersize 5256
-containerchecksum af862a2afface58e54e9046de4a22ac2bc7a6fd9e589aac13705b54f23aeef95b82f22f9c3ea66f73b42df456d4b5c3f95f7e86e452c088faaed94a34d60fba9
-doccontainersize 106320
-doccontainerchecksum be873c289995f1ab9d88da29cfcb1b1e13c360d1396e9916a4126c6c4175c9fea22d759fec3735c1071de167dc1aedba360403b14e0aebf7dbc36db1df8e9015
-docfiles size=34
+containersize 5324
+containerchecksum dae957d775d8ad03b92909cc0ced99fd3e0bbf817fd9becc2c9875401e0d67a4d4489f775a910f3faa306d58378941800506fbd1761bf187054f8dffa4802bfc
+doccontainersize 110700
+doccontainerchecksum 6e120d9f10b1f617371f9719e35ff37522d180f379decc17532565fe75977192f4e9154bc5687940af68baea029c6aa62315c09a06d0125e55444093f716c653
+docfiles size=35
texmf-dist/doc/man/man1/luafindfont.1
texmf-dist/doc/man/man1/luafindfont.man1.pdf
texmf-dist/doc/support/luafindfont/CHANGELOG
@@ -188722,7 +188713,7 @@ catalogue-alias findfont
catalogue-ctan /support/luafindfont
catalogue-license lppl1.3c
catalogue-topics font-sel
-catalogue-version 0.08
+catalogue-version 0.09
name luafindfont.aarch64-linux
category Package
@@ -197081,17 +197072,17 @@ catalogue-version 0.5
name mcf2graph
category Package
-revision 62936
+revision 63258
shortdesc Draw chemical structure diagrams with MetaPost
relocated 1
longdesc The Molecular Coding Format (MCF) is a linear notation for
longdesc describing chemical structure diagrams. This package converts
longdesc MCF to graphic files using MetaPost.
-containersize 444
-containerchecksum bac4da2f647c282236e2f176573f85812e7457dc87e33c7b42e3cdb22efc569fa9f7dc9abb9075227f90ff25d39ec9b9e864893a6f899938c816563c9a3b36af
-doccontainersize 1035636
-doccontainerchecksum b260824ac54a8fa1a47c0a8fe2d0ddab4c13fbc56f6c94d129a6c60b132896e42e8fafac3e886969d53410331f53c4d1ac532c4273ad95235a7d5f086c189fbc
-docfiles size=334
+containersize 448
+containerchecksum a679843f33094b0491e20aee07f18a9c5f96159b559ccc4003f549fbb7109df8d861cabe28b96056be1354715d1939b64c585a7b84b273357df7b157a57a82be
+doccontainersize 1038060
+doccontainerchecksum 7d8a82a258d250ac8509e81db3bb5dcabc146dbebca92baa845ccd42adbb8734a1408cbab2da1f6755016a7b2df4af03976f6ce024bd530cdf6a399018b0b41a
+docfiles size=335
RELOC/doc/metapost/mcf2graph/CHANGELOG
RELOC/doc/metapost/mcf2graph/README details="Readme"
RELOC/doc/metapost/mcf2graph/mcf2graph.mp
@@ -197109,7 +197100,7 @@ docfiles size=334
catalogue-ctan /graphics/mcf2graph
catalogue-license mit
catalogue-topics graphics graphics-mpost chemistry
-catalogue-version 4.83
+catalogue-version 4.84
name mcite
category Package
@@ -219723,7 +219714,7 @@ catalogue-topics font font-type1 font-decor
name nicematrix
category Package
-revision 62660
+revision 63262
shortdesc Improve the typesetting of mathematical matrices with PGF
relocated 1
longdesc This package is based on the package array. It creates PGF/TikZ
@@ -219735,17 +219726,17 @@ longdesc border matrices); control of the width of the columns; tools to
longdesc color rows and columns with a good PDF result; blocks of cells;
longdesc etc. The package requires and loads l3keys2e, xparse, array,
longdesc amsmath, pgfcore, and the module shapes of PGF.
-containersize 34656
-containerchecksum c57d8a2b8ca5b37c9212b9fedd23a0b5893d9c8b18861a0e4fbcc51fa90bbf8ba6491bc0df8559451552ed91ac79cc0425eda4dab86ad80b28247ee7def1e2de
-doccontainersize 1975292
-doccontainerchecksum 274c56ef2feee371763572fbba28e0a2142aa6e0aada41bb2596a335d110a48d9be1b4d9481498d625d7e0cc29519e8c3e51da9642591fd8109aac2dac4cfe17
-docfiles size=541
+containersize 34644
+containerchecksum 5132bde724eed3a7912040b06bb084102d6a2f0463a67ee2716bcf3406fb3da932434a27267c273d2f8ebc0ddc6b0bfa31292ea2e4bcbcef02324597cf1e5919
+doccontainersize 1978384
+doccontainerchecksum 8cc584d0ec86599eb9ce28ad1bb162e0c410e990109f9d8d35f4735e840fabc5ab1b147df30ac02184c6d71759161822cc7c9864bc3cd452c897ad0624810fae
+docfiles size=542
RELOC/doc/latex/nicematrix/README.md details="Readme"
RELOC/doc/latex/nicematrix/nicematrix-french.pdf details="Package documentation in French" language="fr"
RELOC/doc/latex/nicematrix/nicematrix-french.tex
RELOC/doc/latex/nicematrix/nicematrix.pdf details="Package documentation"
-srccontainersize 113836
-srccontainerchecksum d304d26ddddd65b6d926aefef7229f7525010fa3f5e1db723ed1a894ed7a8c079cf707a8ed83dc6ff05da7ff8656426a1220aa043d8acc2a91173723e9b43fd3
+srccontainersize 113940
+srccontainerchecksum 91430884b49bbd6b3231fa8dcc6012136aa5f7e89ed2cec3959409ea00bec6bab8e869967c41ee651efb66371ced83625446c88a799bdb8b071b67cb77a389d5
srcfiles size=175
RELOC/source/latex/nicematrix/nicematrix.dtx
RELOC/source/latex/nicematrix/nicematrix.ins
@@ -219754,7 +219745,7 @@ runfiles size=77
catalogue-ctan /macros/latex/contrib/nicematrix
catalogue-license lppl1.3
catalogue-topics maths matrix pgf-tikz expl3
-catalogue-version 6.8
+catalogue-version 6.8a
name nicetext
category Package
@@ -273871,7 +273862,7 @@ catalogue-topics dissertation class
name simplebnf
category Package
-revision 56761
+revision 63263
shortdesc A simple package to format Backus-Naur form (BNF)
relocated 1
longdesc This package provides a simple way to format Backus-Naur form
@@ -273879,11 +273870,11 @@ longdesc (BNF). The included bnfgrammar environment parses BNF
longdesc expressions (possibly annotated), so users can write readable
longdesc BNF expressions in their documents. The package requires expl3,
longdesc xparse, and mathtools.
-containersize 2204
-containerchecksum f306851371767da793a60cb604776aa7f537401a3dcbdca899b347d090baee3d3e6d28550f8d95a287e722a92550137f9241d2c207d955b47fe0b392a44b5ed8
-doccontainersize 135860
-doccontainerchecksum cd4c3786d953669b53e9a3b5f6e13591ed67efcfbda7eac37f3e7c3709a8b6599f3e9f363e91658019fc03b91c4ed190ed40c81cc9e935bee697a77b51f4238a
-docfiles size=36
+containersize 2580
+containerchecksum 4635bc0fcf747ebb2271589987d783a982bf0fe2f2e023cd2bda054aa5a8c49ef0bf02d62893a080617a68f8c733d4eaf63d2c2ef275484cb6886985ea72730a
+doccontainersize 151296
+doccontainerchecksum c6eae1d9f3d141e9b13c6d8b69844e6649232ca654a509ffbbf13d3ff3579b4c566807d18bc3f4beba9fae78b3cf6d7469f81599986572e99caabe27d19fc7cb
+docfiles size=41
RELOC/doc/latex/simplebnf/LICENSE
RELOC/doc/latex/simplebnf/README.md details="Readme"
RELOC/doc/latex/simplebnf/simplebnf-doc.pdf details="Package documentation"
@@ -273896,7 +273887,7 @@ catalogue-contact-support https://github.com/Zeta611/simplebnf/issues
catalogue-ctan /macros/latex/contrib/simplebnf
catalogue-license mit
catalogue-topics expl3 formal-spec
-catalogue-version 0.2.0
+catalogue-version 0.3.0
name simplecd
category Package
@@ -338166,7 +338157,7 @@ catalogue-version 1.00
name xduts
category Package
-revision 63219
+revision 63264
shortdesc Xidian University TeX Suite
relocated 1
longdesc XDUTS is designed to help Xidian University students use LaTeX
@@ -338175,24 +338166,23 @@ 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 514680
-containerchecksum f7ffffc3f8b4a1bdac26959ff1239fbb7a7c798b848fa82e11f5a1ebf8a490e1c33e82fe402acc21dc1e8d29308d769aeb63c9d3667cd7fa45418041c9dcfa6c
-doccontainersize 390476
-doccontainerchecksum 82f33b69b7f42598e8b2b4a367c7ecaa5a3c986cc763346179eea68da9595df182b29249a68058ecdcc4964014b9e483f5ad244260d774cb240e619980a46136
-docfiles size=98
+containersize 514408
+containerchecksum 2b8a8628c7d6a7f94db8079361479590de7fd9b4fdcfe14bccc5ff4fda55ddf73b34bb488e86df6233ba6b2df58aa9b74721c3a10e2a40e010c3787211dbc880
+doccontainersize 422516
+doccontainerchecksum c4f07f7acc803add74694174a75198bd3daf44641fd87695017791098f4cd381f5cde820ce07cf2a02dcf0f9cedbe8df639d6040600c6e2ebe59a36ca9095bbe
+docfiles size=106
RELOC/doc/xelatex/xduts/README.md details="Readme"
RELOC/doc/xelatex/xduts/xduts.pdf details="Package documentation" language="zh"
-srccontainersize 21680
-srccontainerchecksum 4c9ec699fa0758664267930e9d2de485cd0dbc461f5f67d042aa2e1242f83f6b35171ec0bb309737917b99e3676c667f61034bc6b1a7e3e70f55d9fe280068f9
-srcfiles size=30
+srccontainersize 23956
+srccontainerchecksum 82765237ae6ae8591b9194ee8c155f1d7b7acd9e81012704e508af3b56b1061781e2d063ede01311fd392272603ab190821bf6e85de0e720d9577becf75cdc63
+srcfiles size=34
RELOC/source/xelatex/xduts/xduts.dtx
RELOC/source/xelatex/xduts/xduts.ins
-runfiles size=237
+runfiles size=240
RELOC/tex/xelatex/xduts/xdufont.sty
+ RELOC/tex/xelatex/xduts/xdulogo.pdf
RELOC/tex/xelatex/xduts/xdupgthesis.cls
RELOC/tex/xelatex/xduts/xduugthesis.cls
- RELOC/tex/xelatex/xduts/xidian-logo.pdf
- RELOC/tex/xelatex/xduts/xidian-text.pdf
catalogue-also xduthesis
catalogue-contact-bugs https://github.com/note286/xduts/issues
catalogue-contact-development https://github.com/note286
@@ -338201,7 +338191,7 @@ catalogue-contact-support https://github.com/note286/xduts/discussions
catalogue-ctan /macros/xetex/latex/xduts
catalogue-license lppl1.3c
catalogue-topics dissertation proposal
-catalogue-version 1.8.1.0
+catalogue-version 1.13.2.0
name xdvi
category TLCore
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
index 13f452e0a5..d37dda8a23 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
@@ -1 +1 @@
-4d0dcf44ea44b465fe3b6c6c88d346d0 texlive.tlpdb
+0ca40774f6cc19f4b9bc609a7b83cf4c texlive.tlpdb
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
index a0fa6f4789..10e15c80e1 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
@@ -1 +1 @@
-8f1bb7558ec738131da28969707125bfa6541f476391efe66361ca3851863682040f694612c416254bc6e7f580beb0a4c7dae7f656a5ad92850f9b39cd140a94 texlive.tlpdb
+e4a94a6200704c17d29f13e1a1842100dd7d84b8db1a22eded20891f2cbf939aeec5fc3ba90bffd9ff44c8f565710bc7def25fbb343fbf3cfb12864fd6f2ce63 texlive.tlpdb
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
index c0bf34d889..dff903aae1 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-----
-iQEcBAEBCgAGBQJidwbRAAoJEEzhh34ZQ4xwopUH/3m9JhbMfriNVFYJPBXCGHki
-4Lln2GSi0bDJHF6GVWNGJJ28iJTd/ZcyWwSDUgPZzCAEz2IieC0ldzPFj2NUd53B
-7GqZZlVTtqBylx0WWp7Sko5dYXlI5sm5m0TOv1AE3v9gWCbP8w/RaBzgcOS63ucx
-aW2TW65EDaemEOUZzXHCgHWfsyRAt5wPRMZ5M80W4/Gw7eWbPau4jcu/rETl2r8f
-H+cnyxTVFl/HHoyf46qANHshkb0mWNR3GbDmJTU6ySHg/Owmq0B2mgPuEZtHTjZW
-3nOWBnhIlabb6UOehfsg8zT/lVi1ftEucr4Bu2YmqXNUPxgz/cL7VA21mCRnVOI=
-=AUnW
+iQEcBAEBCgAGBQJieFfvAAoJEEzhh34ZQ4xw4boIAIYxKgIQjWLiV9HNm64xztKj
+qO/F4fQYnIFKWYntQId/fexH5HUYqKKe1C2VasR7uBGcCJjpDaE6tCB4eUC/pZ5r
+9QdT5jCHLWQyY573m2fhmxCpePzOcODWXdUUv3LHqTh7yn6wMkV890p2wkvuZyrz
+dWwXstUDGIk+EdbVZ9lka4IaX+ye7ue+dM+Lq+NKVym75rAPg6HKhO4PN1BnUDuT
+9kb9AopmD8eHCirrzTs+mqpGmEphMH1tmqnSBsKuN29//LKEQhOj+TcJMlDwio/a
+DkvHC3GPXdO9ZxUKukd1UYMSAQ0umLHQCUYDBAHDCG7uKcZD8wrlxvzNZKoFkhU=
+=xjyy
-----END PGP SIGNATURE-----
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
index b9c1263b90..657012ef57 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
Binary files differ
diff --git a/systems/win32/miktex/tm/packages/next/pr.ini b/systems/win32/miktex/tm/packages/next/pr.ini
index d8ea641685..232b122a5a 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=1651954675
+date=1652041070
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=d5c9a19bba569b15007e0a7a9f6c7d54
+lstdigest=20f5955959a1fb6d1e71b8b28501badf
numpkg=5582
relstate=next
-version=8162
+version=8163
;;;;This configuration file is signed by a MiKTeX maintainer. The signature follows.
;;;;-----BEGIN MIKTEX SIGNATURE-----
-;;;; signature/miktex: i/LkVlqD1LA0JQoXLCIiJoV3FqOgaC1zNe3o/Wc11MTLWh24tJMLZ4tp9XkEV9mGKU5JTcv1zhER4fkbnseH3Tjp/x3eXdQ3pLQRNm4DqIQlRZm1CO9dbcj+buuxyyUWaRCz6VL5iIq4rHyPOvLDTOLUJ2EosLE2vwPT9PGy/zir7dTyMonZ428xXPFxCOZbrwd0b6PEDG0IXVaNh9Hm7lVmHMVBimv5vXs8b0obQHnI7FWq1XuiKNgaoAPQn6Bm7HykrsL53Op+JEf01jmbuGHNAmkX32PVJEno6DpcbtNFKaILFKU8RfcD/JCCyaMuQfEQksGe+buWb60NMjMQ+w==
+;;;; signature/miktex: syqpmcSsz3Elk+gfKPma7qpB8k8k/GEcNj8YFfv+eJBCXoC7I1/ona9PQdh1F/d6ckuUOsYjIIxoMMGMUNbPbb+2AsTZVKVsemz5Q8YMVTnGksTpGtXEt51I3ZwRxRZbtDwn+3KXf36iX6ImxCO5PAGxnj4yfXRHEMOBZhDCSI9oqDiaF7cl5tczAw3uVHPuBu+syBXPFiFK4xMdAoZIYkN3rfxLMsT90//cK2l8rX+Yz9v04C6eEdMN50phPpPUbiKNhk5m6AeG1YfYdV/PT6hIdtgWFzFlJ3FrPtm4VT9w9CrXfVjHYg0eoMwEVBhjf40dN57f/t//T0/NxoWYUg==
;;;;-----END MIKTEX SIGNATURE-----
diff --git a/systems/win32/miktex/tm/packages/pr.ini b/systems/win32/miktex/tm/packages/pr.ini
index ec4afb642e..956f0aa2a3 100644
--- a/systems/win32/miktex/tm/packages/pr.ini
+++ b/systems/win32/miktex/tm/packages/pr.ini
@@ -1,13 +1,13 @@
[repository]
-date=1651954285
+date=1652040676
lastupd=arara arara__doc arara__source authorarchive authorarchive__doc authorarchive__source babel babel__doc babel__source beaulivre beaulivre__doc beaulivre__source bxpdfver bxpdfver__doc circledtext circledtext__doc circledtext__source circuitikz circuitikz__doc codehigh
-lstdigest=6ce88edaf55933ec1021542e15992981
+lstdigest=4035f78a3197df8f256ea4af86c07755
numpkg=5582
relstate=stable
-version=8162
+version=8163
;;;;This configuration file is signed by a MiKTeX maintainer. The signature follows.
;;;;-----BEGIN MIKTEX SIGNATURE-----
-;;;; signature/miktex: jDuIjPRjTreBeGSmORK04h+nyKOWKYfy9LCUO7FWBx++GoV8oGp+fF4WjHz1MzGxwgABPL0Vft77FxptSo5myDr238lGKo3J8RBMXnzlhqmh7eokpy6eKxLzNfwx/VDwklqfZ5C1y6mEaTpY5rXipN/20bxcxgq3lIaUG8vr5m4bDzIuXsmThTilzN0rO1Ws/WRWGxDxML30i9y6rLjoDNinY6zq47wWjeA0UHA5UYzHwSX6UF+yzvCnx9EdpcoZNO+oEm5ROk37D3jBtEKp3D0jpJ28nBPssjfadi1b/8yzvxCQTn/DuV6tPHzWKKtHSoOROj5fXq2FQZpMaoAe0A==
+;;;; signature/miktex: qs5eU8AHrxdh09i7rBFa2ECKk54wzZ8d5j7Kyd2djRpchGAU1zW6RqdYbgrwUVt2iESiW8RC1jARTrWuNYMqdajsxJmbvkZxXUAZ3RFRL6w8nnZIvZ0KIErzbxcsnZxl+TolmTNtAreMQlGsPolYRZQ1j0DubuB9DtyKUa7mhYT+a7Hhr4w63UXqYJsNEEvC137piWjQIk40Hqgwtaty9T4U7KKNQMn4AzlZQ7wi/+H/dhn+sw+DiEq96lzofPRlsSebuxJ4BoVikJNRQP2sGzC6tZl426IYqrQlA3qFz2u1BmmUDB4fMoiTKeyDFEgSr7HaZDEi9tw3zuOJkDuuGQ==
;;;;-----END MIKTEX SIGNATURE-----
diff --git a/timestamp b/timestamp
index 50ed466695..83ce3d6f2c 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-05-08-02-02
+2022-05-09-02-02