summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2021-02-22 03:01:54 +0000
committerNorbert Preining <norbert@preining.info>2021-02-22 03:01:54 +0000
commit1c74c0d7614ec471bea05b5919b68e67a05dd6c1 (patch)
tree8631538e81cccc6ba01275553fc571cb4d02e349
parentf35565737733e319e7293a9fafe1b78e87f8a14e (diff)
CTAN sync 202102220301
-rw-r--r--FILES.byname527
-rw-r--r--FILES.byname.gzbin2291257 -> 2291577 bytes
-rw-r--r--FILES.last07days857
-rw-r--r--graphics/mcf2graph/CHANGELOG9
-rw-r--r--graphics/mcf2graph/README2
-rw-r--r--graphics/mcf2graph/mcf2graph.mf436
-rw-r--r--graphics/mcf2graph/mcf_exa_soc.mf37
-rw-r--r--graphics/mcf2graph/mcf_example.pdfbin535780 -> 535779 bytes
-rw-r--r--graphics/mcf2graph/mcf_man_soc.mf321
-rw-r--r--graphics/mcf2graph/mcf_manual.pdfbin633398 -> 617135 bytes
-rw-r--r--graphics/mcf2graph/mcf_manual.tex336
-rw-r--r--graphics/mcf2graph/mcf_mplib_exa.pdfbin202100 -> 202477 bytes
-rw-r--r--graphics/mcf2graph/mcf_mplib_exa.tex155
-rw-r--r--graphics/pgf/contrib/spath3/calligraphy.pdfbin259702 -> 259536 bytes
-rw-r--r--graphics/pgf/contrib/spath3/knots.pdfbin341151 -> 341621 bytes
-rw-r--r--graphics/pgf/contrib/spath3/spath3.pdfbin353909 -> 388662 bytes
-rw-r--r--graphics/pgf/contrib/spath3/spath3.tex272
-rw-r--r--graphics/pgf/contrib/spath3/spath3_code.dtx1261
-rw-r--r--graphics/pgf/contrib/spath3/spath3_code.pdfbin576597 -> 571802 bytes
-rw-r--r--graphics/pgf/contrib/tikzmark/tikzmark.dtx134
-rw-r--r--graphics/pgf/contrib/tikzmark/tikzmark.pdfbin419430 -> 423477 bytes
-rw-r--r--macros/latex/contrib/easybook/doc/easybook-demo.pdfbin299161 -> 299163 bytes
-rw-r--r--macros/latex/contrib/easybook/doc/easybook-demo.tex2
-rw-r--r--macros/latex/contrib/easybook/doc/easybook.pdfbin231349 -> 231353 bytes
-rw-r--r--macros/latex/contrib/easybook/doc/easybook.tex2
-rw-r--r--macros/latex/contrib/easybook/easybook.cls20
-rw-r--r--systems/texlive/tlnet/tlpkg/TeXLive/TLDownload.pm31
-rw-r--r--systems/texlive/tlnet/tlpkg/texlive.tlpdb191
-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.xzbin2277608 -> 2280012 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--systems/win32/w32tex/ChangeLog12
-rw-r--r--timestamp2
36 files changed, 2709 insertions, 1932 deletions
diff --git a/FILES.byname b/FILES.byname
index 1b88a27777..a0609b94d8 100644
--- a/FILES.byname
+++ b/FILES.byname
@@ -3340,7 +3340,7 @@
2020/11/19 | 43916 | dviware/dvidvi/aclocal.m4
2009/04/23 | 325 | dviware/dvidvi/ac/withenable.ac
2006/01/17 | 138 | dviware/dvidvi/build.com
-2020/12/09 | 5259 | dviware/dvidvi/ChangeLog
+2021/02/19 | 5406 | dviware/dvidvi/ChangeLog
2020/05/02 | 4840 | dviware/dvidvi/config.h.in
2007/07/03 | 710 | dviware/dvidvi/configure
2020/05/02 | 953 | dviware/dvidvi/configure.ac
@@ -3351,16 +3351,16 @@
2011/02/04 | 5008 | dviware/dvidvi/dvidvi.1
2020/12/09 | 36558 | dviware/dvidvi/dvidvi.c
2006/01/17 | 4785 | dviware/dvidvi/dvidvi.kohm-patch
-2017/11/15 | 568 | dviware/dvidvi/dvidvi.test
+2021/02/19 | 668 | dviware/dvidvi/dvidvi.test
2006/01/17 | 1490 | dviware/dvidvi/dvisamp.tex
2017/06/23 | 863 | dviware/dvidvi/Makefile.am
2020/11/19 | 43831 | dviware/dvidvi/Makefile.in
2011/02/04 | 5976 | dviware/dvidvi/README
2011/10/03 | 2596 | dviware/dvidvi/tests/play.dvi
-2021/02/17 | 169 | dviware/dvidvi/tests/playout.2
-2021/02/17 | 173 | dviware/dvidvi/tests/playout.3
+2021/02/19 | 92 | dviware/dvidvi/tests/playout.2
+2021/02/19 | 96 | dviware/dvidvi/tests/playout.3
2017/06/19 | 2484 | dviware/dvidvi/tests/playtate.dvi
-2021/02/18 | 176283 | dviware/dvidvi.zip
+2021/02/21 | 176249 | dviware/dvidvi.zip
1997/08/03 | 3288 | dviware/dvi_economic/dvi_econ.txt
1997/08/13 | 12880 | dviware/dvi_economic/dvi_four.exe
1997/08/13 | 11152 | dviware/dvi_economic/dvi_par.exe
@@ -5087,7 +5087,7 @@
1990/10/02 | 5440 | dviware/vutex/vaxvms.hlp
1990/10/02 | 812 | dviware/vutex/vaxvms.ins
1990/10/02 | 127576 | dviware/vutex/vutex.web
-2021/02/20 | 161044 | FILES.last07days
+2021/02/21 | 180455 | FILES.last07days
2020/08/14 | 104065 | fonts/academicons/academicons.pdf
2020/08/14 | 17247 | fonts/academicons/academicons.sty
2020/08/14 | 6546 | fonts/academicons/academicons.tex
@@ -139087,19 +139087,19 @@
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
-2021/02/10 | 11367 | graphics/mcf2graph/CHANGELOG
-2021/02/11 | 89853 | graphics/mcf2graph/mcf2graph.mf
-2021/02/11 | 535780 | graphics/mcf2graph/mcf_example.pdf
+2021/02/20 | 11497 | graphics/mcf2graph/CHANGELOG
+2021/02/21 | 93761 | graphics/mcf2graph/mcf2graph.mf
+2021/02/21 | 535779 | graphics/mcf2graph/mcf_example.pdf
2021/01/23 | 2722 | graphics/mcf2graph/mcf_example.tex
-2021/02/11 | 36750 | graphics/mcf2graph/mcf_exa_soc.mf
-2021/02/11 | 37860 | graphics/mcf2graph/mcf_man_soc.mf
-2021/02/11 | 633398 | graphics/mcf2graph/mcf_manual.pdf
-2021/02/11 | 50659 | graphics/mcf2graph/mcf_manual.tex
-2021/02/11 | 202100 | graphics/mcf2graph/mcf_mplib_exa.pdf
-2021/02/11 | 16575 | graphics/mcf2graph/mcf_mplib_exa.tex
+2021/02/18 | 36555 | graphics/mcf2graph/mcf_exa_soc.mf
+2021/02/21 | 40740 | graphics/mcf2graph/mcf_man_soc.mf
+2021/02/21 | 617135 | graphics/mcf2graph/mcf_manual.pdf
+2021/02/21 | 53963 | graphics/mcf2graph/mcf_manual.tex
+2021/02/21 | 202477 | graphics/mcf2graph/mcf_mplib_exa.pdf
+2021/02/20 | 18598 | graphics/mcf2graph/mcf_mplib_exa.tex
2020/08/30 | 3638 | graphics/mcf2graph/mcf_setup.sty
-2021/02/07 | 3788 | graphics/mcf2graph/README
-2021/02/11 | 1366178 | graphics/mcf2graph.zip
+2021/02/21 | 3788 | graphics/mcf2graph/README
+2021/02/21 | 1351037 | 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
@@ -142877,16 +142877,16 @@
2016/12/23 | 3599 | graphics/pgf/contrib/smartdiagram/smartdiagram.ins
2016/12/23 | 267814 | graphics/pgf/contrib/smartdiagram/smartdiagram.pdf
2016/12/23 | 276207 | graphics/pgf/contrib/smartdiagram.zip
-2021/02/05 | 259702 | graphics/pgf/contrib/spath3/calligraphy.pdf
+2021/02/21 | 259536 | graphics/pgf/contrib/spath3/calligraphy.pdf
2021/02/05 | 16482 | graphics/pgf/contrib/spath3/calligraphy.tex
-2021/02/05 | 341151 | graphics/pgf/contrib/spath3/knots.pdf
+2021/02/21 | 341621 | graphics/pgf/contrib/spath3/knots.pdf
2021/02/05 | 27006 | graphics/pgf/contrib/spath3/knots.tex
-2021/02/06 | 523 | graphics/pgf/contrib/spath3/README
-2021/02/06 | 248660 | graphics/pgf/contrib/spath3/spath3_code.dtx
-2021/02/05 | 576597 | graphics/pgf/contrib/spath3/spath3_code.pdf
-2021/02/05 | 353909 | graphics/pgf/contrib/spath3/spath3.pdf
-2021/02/05 | 30128 | graphics/pgf/contrib/spath3/spath3.tex
-2021/02/06 | 1569258 | graphics/pgf/contrib/spath3.zip
+2021/02/21 | 523 | graphics/pgf/contrib/spath3/README
+2021/02/21 | 265415 | graphics/pgf/contrib/spath3/spath3_code.dtx
+2021/02/21 | 571802 | graphics/pgf/contrib/spath3/spath3_code.pdf
+2021/02/21 | 388662 | graphics/pgf/contrib/spath3/spath3.pdf
+2021/02/21 | 33598 | graphics/pgf/contrib/spath3/spath3.tex
+2021/02/21 | 1600674 | graphics/pgf/contrib/spath3.zip
2019/02/18 | 107163 | graphics/pgf/contrib/spectralsequences/examples/ANSS-S_2.pdf
2019/02/18 | 4304 | graphics/pgf/contrib/spectralsequences/examples/ANSS-S_2.tex
2019/02/18 | 48774 | graphics/pgf/contrib/spectralsequences/examples/ANSS-S_3.pdf
@@ -143152,10 +143152,10 @@
2020/12/04 | 8235 | graphics/pgf/contrib/tikzlings/tikzlings-squirrels.sty
2020/12/04 | 2354 | graphics/pgf/contrib/tikzlings/tikzlings.sty
2020/12/04 | 601844 | graphics/pgf/contrib/tikzlings.zip
-2019/10/04 | 469 | graphics/pgf/contrib/tikzmark/README
-2019/10/04 | 67415 | graphics/pgf/contrib/tikzmark/tikzmark.dtx
-2019/10/04 | 419430 | graphics/pgf/contrib/tikzmark/tikzmark.pdf
-2019/10/04 | 431112 | graphics/pgf/contrib/tikzmark.zip
+2021/02/21 | 469 | graphics/pgf/contrib/tikzmark/README
+2021/02/16 | 72059 | graphics/pgf/contrib/tikzmark/tikzmark.dtx
+2021/02/21 | 423477 | graphics/pgf/contrib/tikzmark/tikzmark.pdf
+2021/02/21 | 436319 | graphics/pgf/contrib/tikzmark.zip
2017/08/18 | 19039 | graphics/pgf/contrib/tikzmarmots/LICENSE.txt
2018/10/04 | 465 | graphics/pgf/contrib/tikzmarmots/README.md
2018/11/08 | 636 | graphics/pgf/contrib/tikzmarmots/tikzlibrarymarmots.code.tex
@@ -185171,7 +185171,7 @@
2013/04/01 | 14776 | macros/context/contrib/context-visualcounter/tex/context/third/visualcounter/t-visualcounter.mkvi
2018/03/05 | 11 | macros/context/contrib/context-visualcounter/VERSION
2018/03/22 | 276789 | macros/context/contrib/context-visualcounter.zip
-2021/02/19 | 119841904 | macros/context/latest/cont-tmf.zip
+2021/02/20 | 123791989 | macros/context/latest/cont-tmf.zip
2016/04/21 | 32846 | macros/cstex/base/cmexb.tar.gz
2016/06/26 | 1728262 | macros/cstex/base/csfonts-t1.tar.gz
2007/03/01 | 187106 | macros/cstex/base/csfonts.tar.gz
@@ -196172,18 +196172,18 @@
2008/02/10 | 19110 | macros/latex/contrib/ean13isbn/License.txt
2021/01/24 | 422 | macros/latex/contrib/ean13isbn/README
2021/01/24 | 322624 | macros/latex/contrib/ean13isbn.zip
-2021/02/20 | 299161 | macros/latex/contrib/easybook/doc/easybook-demo.pdf
-2021/02/20 | 2526 | macros/latex/contrib/easybook/doc/easybook-demo.tex
-2021/02/20 | 231349 | macros/latex/contrib/easybook/doc/easybook.pdf
-2021/02/20 | 27401 | macros/latex/contrib/easybook/doc/easybook.tex
+2021/02/21 | 299163 | macros/latex/contrib/easybook/doc/easybook-demo.pdf
+2021/02/21 | 2526 | macros/latex/contrib/easybook/doc/easybook-demo.tex
+2021/02/21 | 231353 | macros/latex/contrib/easybook/doc/easybook.pdf
+2021/02/21 | 27401 | macros/latex/contrib/easybook/doc/easybook.tex
2021/02/07 | 99 | macros/latex/contrib/easybook/doc/pages/appendix.tex
2021/02/09 | 4108 | macros/latex/contrib/easybook/doc/pages/chapter1.tex
2021/02/13 | 3823 | macros/latex/contrib/easybook/doc/pages/chapter2.tex
2021/02/13 | 2768 | macros/latex/contrib/easybook/doc/pages/chapter3.tex
2020/12/23 | 794 | macros/latex/contrib/easybook/doc/ref/refs.bib
-2021/02/20 | 44370 | macros/latex/contrib/easybook/easybook.cls
+2021/02/21 | 44383 | macros/latex/contrib/easybook/easybook.cls
2021/01/14 | 3005 | macros/latex/contrib/easybook/README.md
-2021/02/20 | 532980 | macros/latex/contrib/easybook.zip
+2021/02/21 | 533009 | macros/latex/contrib/easybook.zip
2009/06/17 | 82589 | macros/latex/contrib/easy/doc/docbib.pdf
2009/06/17 | 78378 | macros/latex/contrib/easy/doc/docbmat.pdf
2009/06/17 | 99132 | macros/latex/contrib/easy/doc/doceqn.pdf
@@ -264189,8 +264189,8 @@
2019/02/28 | 16432 | systems/texlive/tlnet/archive/biblatex-dw.r42649.tar.xz
2019/02/28 | 2284 | systems/texlive/tlnet/archive/biblatex-enc.doc.r44627.tar.xz
2019/02/28 | 8476 | systems/texlive/tlnet/archive/biblatex-enc.r44627.tar.xz
-2021/01/02 | 852692 | systems/texlive/tlnet/archive/biblatex-ext.doc.r57287.tar.xz
-2021/01/02 | 26876 | systems/texlive/tlnet/archive/biblatex-ext.r57287.tar.xz
+2021/02/20 | 854052 | systems/texlive/tlnet/archive/biblatex-ext.doc.r57812.tar.xz
+2021/02/20 | 26804 | systems/texlive/tlnet/archive/biblatex-ext.r57812.tar.xz
2019/02/28 | 595408 | systems/texlive/tlnet/archive/biblatex-fiwi.doc.r45876.tar.xz
2019/02/28 | 16768 | systems/texlive/tlnet/archive/biblatex-fiwi.r45876.tar.xz
2021/01/20 | 1563868 | systems/texlive/tlnet/archive/biblatex-gb7714-2015.doc.r57468.tar.xz
@@ -265215,7 +265215,7 @@
2020/03/04 | 408 | systems/texlive/tlnet/archive/collection-langpolish.r54074.tar.xz
2020/03/04 | 392 | systems/texlive/tlnet/archive/collection-langportuguese.r54074.tar.xz
2020/03/07 | 380 | systems/texlive/tlnet/archive/collection-langspanish.r54141.tar.xz
-2021/02/18 | 6256 | systems/texlive/tlnet/archive/collection-latexextra.r57774.tar.xz
+2021/02/20 | 6268 | systems/texlive/tlnet/archive/collection-latexextra.r57815.tar.xz
2020/12/03 | 696 | systems/texlive/tlnet/archive/collection-latex.r57048.tar.xz
2021/01/20 | 756 | systems/texlive/tlnet/archive/collection-latexrecommended.r57472.tar.xz
2021/02/05 | 712 | systems/texlive/tlnet/archive/collection-luatex.r57620.tar.xz
@@ -265753,7 +265753,7 @@
2020/03/02 | 132068 | systems/texlive/tlnet/archive/cweb.amd64-freebsd.r53999.tar.xz
2020/03/02 | 109228 | systems/texlive/tlnet/archive/cweb.amd64-netbsd.r53995.tar.xz
2020/03/04 | 86904 | systems/texlive/tlnet/archive/cweb.armhf-linux.r54033.tar.xz
-2021/02/12 | 428872 | systems/texlive/tlnet/archive/cweb.doc.r57710.tar.xz
+2021/02/20 | 428876 | systems/texlive/tlnet/archive/cweb.doc.r57807.tar.xz
2020/06/02 | 64164 | systems/texlive/tlnet/archive/cweb.i386-cygwin.r55384.tar.xz
2020/03/02 | 100396 | systems/texlive/tlnet/archive/cweb.i386-freebsd.r53999.tar.xz
2020/03/02 | 110428 | systems/texlive/tlnet/archive/cweb.i386-linux.r53999.tar.xz
@@ -265762,7 +265762,7 @@
2019/02/28 | 240884 | systems/texlive/tlnet/archive/cweb-latex.doc.r28878.tar.xz
2019/02/28 | 36236 | systems/texlive/tlnet/archive/cweb-latex.r28878.tar.xz
2019/02/28 | 9720 | systems/texlive/tlnet/archive/cweb-old.r49271.tar.xz
-2021/02/12 | 23496 | systems/texlive/tlnet/archive/cweb.r57710.tar.xz
+2021/02/20 | 23444 | systems/texlive/tlnet/archive/cweb.r57807.tar.xz
2020/03/02 | 71020 | systems/texlive/tlnet/archive/cweb.win32.r53994.tar.xz
2020/06/02 | 73320 | systems/texlive/tlnet/archive/cweb.x86_64-cygwin.r55384.tar.xz
2020/03/02 | 103824 | systems/texlive/tlnet/archive/cweb.x86_64-darwinlegacy.r53999.tar.xz
@@ -266538,8 +266538,8 @@
2021/01/25 | 1828 | systems/texlive/tlnet/archive/ean13isbn.r57514.tar.xz
2019/02/28 | 948 | systems/texlive/tlnet/archive/ean.doc.r20851.tar.xz
2019/02/28 | 3148 | systems/texlive/tlnet/archive/ean.r20851.tar.xz
-2021/02/14 | 514220 | systems/texlive/tlnet/archive/easybook.doc.r57734.tar.xz
-2021/02/14 | 10036 | systems/texlive/tlnet/archive/easybook.r57734.tar.xz
+2021/02/20 | 520196 | systems/texlive/tlnet/archive/easybook.doc.r57813.tar.xz
+2021/02/20 | 10068 | systems/texlive/tlnet/archive/easybook.r57813.tar.xz
2019/02/28 | 4540 | systems/texlive/tlnet/archive/easy.doc.r19440.tar.xz
2020/09/08 | 175976 | systems/texlive/tlnet/archive/easyfig.doc.r56291.tar.xz
2020/09/08 | 1936 | systems/texlive/tlnet/archive/easyfig.r56291.tar.xz
@@ -266702,8 +266702,8 @@
2019/02/28 | 154148 | systems/texlive/tlnet/archive/elocalloc.doc.r42712.tar.xz
2019/02/28 | 1084 | systems/texlive/tlnet/archive/elocalloc.r42712.tar.xz
2019/02/28 | 2216 | systems/texlive/tlnet/archive/elocalloc.source.r42712.tar.xz
-2020/08/21 | 447300 | systems/texlive/tlnet/archive/elpres.doc.r56141.tar.xz
-2020/08/21 | 3344 | systems/texlive/tlnet/archive/elpres.r56141.tar.xz
+2021/02/20 | 445960 | systems/texlive/tlnet/archive/elpres.doc.r57810.tar.xz
+2021/02/20 | 3476 | systems/texlive/tlnet/archive/elpres.r57810.tar.xz
2020/11/25 | 807964 | systems/texlive/tlnet/archive/elsarticle.doc.r56999.tar.xz
2020/11/25 | 18868 | systems/texlive/tlnet/archive/elsarticle.r56999.tar.xz
2020/11/25 | 10880 | systems/texlive/tlnet/archive/elsarticle.source.r56999.tar.xz
@@ -266727,8 +266727,8 @@
2020/04/25 | 392868 | systems/texlive/tlnet/archive/embedfile.doc.r54865.tar.xz
2020/04/25 | 5124 | systems/texlive/tlnet/archive/embedfile.r54865.tar.xz
2020/04/25 | 13236 | systems/texlive/tlnet/archive/embedfile.source.r54865.tar.xz
-2020/03/24 | 464356 | systems/texlive/tlnet/archive/embrac.doc.r54512.tar.xz
-2020/03/24 | 3792 | systems/texlive/tlnet/archive/embrac.r54512.tar.xz
+2021/02/20 | 464436 | systems/texlive/tlnet/archive/embrac.doc.r57814.tar.xz
+2021/02/20 | 3880 | systems/texlive/tlnet/archive/embrac.r57814.tar.xz
2019/02/28 | 325204 | systems/texlive/tlnet/archive/emf.doc.r42023.tar.xz
2019/02/28 | 1472 | systems/texlive/tlnet/archive/emf.r42023.tar.xz
2020/11/27 | 513396 | systems/texlive/tlnet/archive/emisa.doc.r57013.tar.xz
@@ -266893,6 +266893,9 @@
2019/02/28 | 214564 | systems/texlive/tlnet/archive/eqparbox.doc.r45215.tar.xz
2019/02/28 | 2792 | systems/texlive/tlnet/archive/eqparbox.r45215.tar.xz
2019/02/28 | 16336 | systems/texlive/tlnet/archive/eqparbox.source.r45215.tar.xz
+2021/02/20 | 639596 | systems/texlive/tlnet/archive/eq-pin2corr.doc.r57815.tar.xz
+2021/02/20 | 2144 | systems/texlive/tlnet/archive/eq-pin2corr.r57815.tar.xz
+2021/02/20 | 5152 | systems/texlive/tlnet/archive/eq-pin2corr.source.r57815.tar.xz
2019/02/28 | 685596 | systems/texlive/tlnet/archive/erdc.doc.r15878.tar.xz
2019/02/28 | 6056 | systems/texlive/tlnet/archive/erdc.r15878.tar.xz
2019/02/28 | 16276 | systems/texlive/tlnet/archive/erdc.source.r15878.tar.xz
@@ -268581,10 +268584,10 @@
2019/02/28 | 422664 | systems/texlive/tlnet/archive/isodate.doc.r16613.tar.xz
2019/02/28 | 7208 | systems/texlive/tlnet/archive/isodate.r16613.tar.xz
2019/02/28 | 21048 | systems/texlive/tlnet/archive/isodate.source.r16613.tar.xz
-2020/07/17 | 837972 | systems/texlive/tlnet/archive/isodoc.doc.r55850.tar.xz
+2021/02/20 | 838216 | systems/texlive/tlnet/archive/isodoc.doc.r57811.tar.xz
2019/02/28 | 812136 | systems/texlive/tlnet/archive/iso.doc.r15878.tar.xz
-2020/07/17 | 9300 | systems/texlive/tlnet/archive/isodoc.r55850.tar.xz
-2020/07/17 | 472000 | systems/texlive/tlnet/archive/isodoc.source.r55850.tar.xz
+2021/02/20 | 9308 | systems/texlive/tlnet/archive/isodoc.r57811.tar.xz
+2021/02/20 | 472076 | systems/texlive/tlnet/archive/isodoc.source.r57811.tar.xz
2019/02/28 | 643076 | systems/texlive/tlnet/archive/isomath.doc.r27654.tar.xz
2019/02/28 | 4648 | systems/texlive/tlnet/archive/isomath.r27654.tar.xz
2019/02/28 | 202564 | systems/texlive/tlnet/archive/isonums.doc.r17362.tar.xz
@@ -271833,7 +271836,7 @@
2019/02/28 | 357100 | systems/texlive/tlnet/archive/plainpkg.doc.r27765.tar.xz
2019/02/28 | 3304 | systems/texlive/tlnet/archive/plainpkg.r27765.tar.xz
2019/02/28 | 5264 | systems/texlive/tlnet/archive/plainpkg.source.r27765.tar.xz
-2019/02/28 | 70876 | systems/texlive/tlnet/archive/plain.r43076.tar.xz
+2021/02/21 | 29916 | systems/texlive/tlnet/archive/plain.r57819.tar.xz
2019/11/14 | 5000 | systems/texlive/tlnet/archive/plainyr.r52783.tar.xz
2019/02/28 | 218164 | systems/texlive/tlnet/archive/plantslabels.doc.r29803.tar.xz
2019/02/28 | 1260 | systems/texlive/tlnet/archive/plantslabels.r29803.tar.xz
@@ -274010,8 +274013,8 @@
2020/03/24 | 280 | systems/texlive/tlnet/archive/texlive-cz.r54496.tar.xz
2020/12/26 | 1338744 | systems/texlive/tlnet/archive/texlive-de.doc.r57223.tar.xz
2020/12/26 | 272 | systems/texlive/tlnet/archive/texlive-de.r57223.tar.xz
-2021/02/20 | 173076 | systems/texlive/tlnet/archive/texlive-docindex.doc.r57794.tar.xz
-2021/02/20 | 388 | systems/texlive/tlnet/archive/texlive-docindex.r57794.tar.xz
+2021/02/21 | 173172 | systems/texlive/tlnet/archive/texlive-docindex.doc.r57817.tar.xz
+2021/02/21 | 388 | systems/texlive/tlnet/archive/texlive-docindex.r57817.tar.xz
2020/04/16 | 1891392 | systems/texlive/tlnet/archive/texlive-en.doc.r54755.tar.xz
2020/04/16 | 272 | systems/texlive/tlnet/archive/texlive-en.r54755.tar.xz
2020/03/22 | 3090144 | systems/texlive/tlnet/archive/texlive-es.doc.r54465.tar.xz
@@ -275759,16 +275762,16 @@
2020/07/18 | 47816 | systems/texlive/tlnet/archive/zztex.doc.r55862.tar.xz
2020/07/18 | 101724 | systems/texlive/tlnet/archive/zztex.r55862.tar.xz
2021/02/17 | 106037 | systems/texlive/tlnet/install-tl
-2021/02/20 | 5824379 | systems/texlive/tlnet/install-tl-unx.tar.gz
-2021/02/20 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
-2021/02/20 | 455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
+2021/02/21 | 5824145 | systems/texlive/tlnet/install-tl-unx.tar.gz
+2021/02/21 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
+2021/02/21 | 455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
2020/08/23 | 4889 | systems/texlive/tlnet/install-tl-windows.bat
-2021/02/20 | 19657739 | systems/texlive/tlnet/install-tl-windows.exe
-2021/02/20 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
-2021/02/20 | 455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
-2021/02/20 | 24615087 | systems/texlive/tlnet/install-tl.zip
-2021/02/20 | 145 | systems/texlive/tlnet/install-tl.zip.sha512
-2021/02/20 | 455 | systems/texlive/tlnet/install-tl.zip.sha512.asc
+2021/02/21 | 19657150 | systems/texlive/tlnet/install-tl-windows.exe
+2021/02/21 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
+2021/02/21 | 455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
+2021/02/21 | 24615371 | systems/texlive/tlnet/install-tl.zip
+2021/02/21 | 145 | systems/texlive/tlnet/install-tl.zip.sha512
+2021/02/21 | 455 | systems/texlive/tlnet/install-tl.zip.sha512.asc
2020/03/05 | 1215 | systems/texlive/tlnet/README.md
2020/04/06 | 5961 | systems/texlive/tlnet/tlpkg/gpg/pubring.gpg
2016/04/12 | 600 | systems/texlive/tlnet/tlpkg/gpg/random_seed
@@ -275822,14 +275825,14 @@
2017/06/04 | 21326 | systems/texlive/tlnet/tlpkg/TeXLive/TLConfFile.pm
2020/03/06 | 11359 | systems/texlive/tlnet/tlpkg/TeXLive/TLConfig.pm
2020/05/17 | 20322 | systems/texlive/tlnet/tlpkg/TeXLive/TLCrypto.pm
-2020/05/03 | 4786 | systems/texlive/tlnet/tlpkg/TeXLive/TLDownload.pm
+2021/02/20 | 5400 | systems/texlive/tlnet/tlpkg/TeXLive/TLDownload.pm
2020/09/22 | 27563 | systems/texlive/tlnet/tlpkg/TeXLive/TLPaper.pm
-2021/02/20 | 17037451 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
-2021/02/20 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
+2021/02/21 | 17039688 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
+2021/02/21 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
2020/05/13 | 86417 | systems/texlive/tlnet/tlpkg/TeXLive/TLPDB.pm
-2021/02/20 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
-2021/02/20 | 455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
-2021/02/20 | 2277608 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
+2021/02/21 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
+2021/02/21 | 455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
+2021/02/21 | 2280012 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
2020/04/15 | 58761 | systems/texlive/tlnet/tlpkg/TeXLive/TLPOBJ.pm
2020/03/20 | 41736 | systems/texlive/tlnet/tlpkg/TeXLive/TLPSRC.pm
2020/05/11 | 15010 | systems/texlive/tlnet/tlpkg/TeXLive/TLTREE.pm
@@ -280420,7 +280423,7 @@
2020/10/03 | 318630 | systems/win32/miktex/tm/packages/filehook.tar.lzma
2012/12/04 | 924573 | systems/win32/miktex/tm/packages/fileinfo.tar.lzma
2011/09/21 | 281409 | systems/win32/miktex/tm/packages/filemod.tar.lzma
-2021/02/20 | 569814 | systems/win32/miktex/tm/packages/files.csv.lzma
+2021/02/21 | 569814 | 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
@@ -281610,9 +281613,9 @@
2018/01/12 | 157226 | systems/win32/miktex/tm/packages/miktex-zip-bin-x64.tar.lzma
2021/02/20 | 39398 | systems/win32/miktex/tm/packages/miktex-zlib-bin-2.9.tar.lzma
2021/02/20 | 43338 | systems/win32/miktex/tm/packages/miktex-zlib-bin-x64-2.9.tar.lzma
-2021/02/20 | 207199 | systems/win32/miktex/tm/packages/miktex-zzdb1-2.9.tar.lzma
-2021/02/20 | 1257813 | systems/win32/miktex/tm/packages/miktex-zzdb2-2.9.tar.lzma
-2021/02/20 | 1174769 | systems/win32/miktex/tm/packages/miktex-zzdb3-2.9.tar.lzma
+2021/02/21 | 207195 | systems/win32/miktex/tm/packages/miktex-zzdb1-2.9.tar.lzma
+2021/02/21 | 1257965 | systems/win32/miktex/tm/packages/miktex-zzdb2-2.9.tar.lzma
+2021/02/21 | 1174267 | systems/win32/miktex/tm/packages/miktex-zzdb3-2.9.tar.lzma
2021/02/20 | 13457 | systems/win32/miktex/tm/packages/miktex-zzip-bin-2.9.tar.lzma
2021/02/20 | 14333 | 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
@@ -281770,189 +281773,189 @@
2018/04/09 | 400132 | systems/win32/miktex/tm/packages/newunicodechar.tar.lzma
2011/09/19 | 101312 | systems/win32/miktex/tm/packages/newvbtm.tar.lzma
2020/09/06 | 231669 | systems/win32/miktex/tm/packages/newverbs.tar.lzma
-2021/02/20 | 570376 | systems/win32/miktex/tm/packages/next/files.csv.lzma
-2021/02/20 | 50742 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-2.9.tar.lzma
-2021/02/20 | 56491 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-x64-2.9.tar.lzma
-2021/02/20 | 968619 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-2.9.tar.lzma
-2021/02/20 | 1079142 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-x64-2.9.tar.lzma
-2021/02/20 | 29037 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-2.9.tar.lzma
-2021/02/20 | 31332 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-x64-2.9.tar.lzma
-2021/02/20 | 29468 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-2.9.tar.lzma
-2021/02/20 | 34297 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-x64-2.9.tar.lzma
-2021/02/20 | 50125 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-2.9.tar.lzma
-2021/02/20 | 57596 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-x64-2.9.tar.lzma
-2021/02/20 | 85385 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-2.9.tar.lzma
-2021/02/20 | 94686 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-x64-2.9.tar.lzma
-2021/02/20 | 67492 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-2.9.tar.lzma
-2021/02/20 | 75405 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-x64-2.9.tar.lzma
-2021/02/20 | 27209 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-2.9.tar.lzma
-2021/02/20 | 30875 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-x64-2.9.tar.lzma
-2021/02/20 | 330263 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-2.9.tar.lzma
-2021/02/20 | 392429 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-x64-2.9.tar.lzma
-2021/02/20 | 32448 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-2.9.tar.lzma
-2021/02/20 | 36664 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-x64-2.9.tar.lzma
-2021/02/20 | 51556 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-2.9.tar.lzma
-2021/02/20 | 56581 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-x64-2.9.tar.lzma
-2021/02/20 | 239850 | systems/win32/miktex/tm/packages/next/miktex-console-bin-2.9.tar.lzma
-2021/02/20 | 262020 | systems/win32/miktex/tm/packages/next/miktex-console-bin-x64-2.9.tar.lzma
-2021/02/20 | 179161 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-2.9.tar.lzma
-2021/02/20 | 195507 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-x64-2.9.tar.lzma
-2021/02/20 | 52472 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-2.9.tar.lzma
-2021/02/20 | 59094 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-x64-2.9.tar.lzma
-2021/02/20 | 21140 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-2.9.tar.lzma
-2021/02/20 | 23296 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-x64-2.9.tar.lzma
-2021/02/20 | 461332 | systems/win32/miktex/tm/packages/next/miktex-doc.tar.lzma
-2021/02/20 | 45647 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-2.9.tar.lzma
-2021/02/20 | 51187 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-x64-2.9.tar.lzma
-2021/02/20 | 281629 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-2.9.tar.lzma
-2021/02/20 | 321919 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-x64-2.9.tar.lzma
-2021/02/20 | 41107 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-2.9.tar.lzma
-2021/02/20 | 45262 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-x64-2.9.tar.lzma
-2021/02/20 | 116983 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-2.9.tar.lzma
-2021/02/20 | 131376 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-x64-2.9.tar.lzma
-2021/02/20 | 1285120 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-2.9.tar.lzma
-2021/02/20 | 1418732 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-x64-2.9.tar.lzma
-2021/02/20 | 87636 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-2.9.tar.lzma
-2021/02/20 | 99454 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-x64-2.9.tar.lzma
-2021/02/20 | 43064 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-2.9.tar.lzma
-2021/02/20 | 47866 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-x64-2.9.tar.lzma
-2021/02/20 | 25145 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-2.9.tar.lzma
-2021/02/20 | 28014 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-x64-2.9.tar.lzma
-2021/02/20 | 55793 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-2.9.tar.lzma
-2021/02/20 | 62770 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-x64-2.9.tar.lzma
-2021/02/20 | 134915 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-2.9.tar.lzma
-2021/02/20 | 152800 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-x64-2.9.tar.lzma
-2021/02/20 | 73176 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-2.9.tar.lzma
-2021/02/20 | 77878 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-x64-2.9.tar.lzma
-2021/02/20 | 71824 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-2.9.tar.lzma
-2021/02/20 | 80798 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-x64-2.9.tar.lzma
-2021/02/20 | 258575 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-2.9.tar.lzma
-2021/02/20 | 295514 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-x64-2.9.tar.lzma
-2021/02/20 | 22037 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-2.9.tar.lzma
-2021/02/20 | 25006 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-x64-2.9.tar.lzma
-2021/02/20 | 97357 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-2.9.tar.lzma
-2021/02/20 | 112294 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-x64-2.9.tar.lzma
-2021/02/20 | 63810 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-2.9.tar.lzma
-2021/02/20 | 72852 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-x64-2.9.tar.lzma
-2021/02/20 | 94599 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-2.9.tar.lzma
-2021/02/20 | 114015 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-x64-2.9.tar.lzma
-2021/02/20 | 38093 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-2.9.tar.lzma
-2021/02/20 | 42654 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-x64-2.9.tar.lzma
-2021/02/20 | 483682 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-2.9.tar.lzma
-2021/02/20 | 567267 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-x64-2.9.tar.lzma
-2021/02/20 | 147127 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-2.9.tar.lzma
-2021/02/20 | 159811 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-x64-2.9.tar.lzma
-2021/02/20 | 94807 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-2.9.tar.lzma
-2021/02/20 | 109199 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-x64-2.9.tar.lzma
-2021/02/20 | 16325 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-2.9.tar.lzma
-2021/02/20 | 17959 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-x64-2.9.tar.lzma
-2021/02/20 | 28138 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-2.9.tar.lzma
-2021/02/20 | 30012 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-x64-2.9.tar.lzma
-2021/02/20 | 625365 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-2.9.tar.lzma
-2021/02/20 | 680230 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-x64-2.9.tar.lzma
-2021/02/20 | 532135 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-2.9.tar.lzma
-2021/02/20 | 596447 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-x64-2.9.tar.lzma
-2021/02/20 | 475715 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-2.9.tar.lzma
-2021/02/20 | 511539 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-x64-2.9.tar.lzma
-2021/02/20 | 94161 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-2.9.tar.lzma
-2021/02/20 | 103270 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-x64-2.9.tar.lzma
-2021/02/20 | 1717696 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-2.9.tar.lzma
-2021/02/20 | 1994177 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-x64-2.9.tar.lzma
-2021/02/20 | 67684 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-2.9.tar.lzma
-2021/02/20 | 74141 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-x64-2.9.tar.lzma
-2021/02/20 | 27371 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-2.9.tar.lzma
-2021/02/20 | 31533 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-x64-2.9.tar.lzma
-2021/02/20 | 7740 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-2.9.tar.lzma
-2021/02/20 | 8775 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-x64-2.9.tar.lzma
-2021/02/20 | 195652 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-2.9.tar.lzma
-2021/02/20 | 214121 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-x64-2.9.tar.lzma
-2021/02/20 | 250275 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-2.9.tar.lzma
-2021/02/20 | 283998 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-x64-2.9.tar.lzma
-2021/02/20 | 97108 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-2.9.tar.lzma
-2021/02/20 | 101678 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-x64-2.9.tar.lzma
-2021/02/20 | 60633 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-2.9.tar.lzma
-2021/02/20 | 67866 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-x64-2.9.tar.lzma
-2021/02/20 | 124944 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-2.9.tar.lzma
-2021/02/20 | 136451 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-x64-2.9.tar.lzma
-2021/02/20 | 146985 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-2.9.tar.lzma
-2021/02/20 | 163654 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-x64-2.9.tar.lzma
-2021/02/20 | 199611 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-2.9.tar.lzma
-2021/02/20 | 180171 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-x64-2.9.tar.lzma
-2021/02/20 | 67393 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-2.9.tar.lzma
-2021/02/20 | 77426 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-x64-2.9.tar.lzma
-2021/02/20 | 31229 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-2.9.tar.lzma
-2021/02/20 | 35061 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-x64-2.9.tar.lzma
-2021/02/20 | 38048 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-2.9.tar.lzma
-2021/02/20 | 42595 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-x64-2.9.tar.lzma
-2021/02/20 | 42851 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-2.9.tar.lzma
-2021/02/20 | 46832 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-x64-2.9.tar.lzma
-2021/02/20 | 45975 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-2.9.tar.lzma
-2021/02/20 | 52415 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-x64-2.9.tar.lzma
-2021/02/20 | 193589 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-2.9.tar.lzma
-2021/02/20 | 210794 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-x64-2.9.tar.lzma
-2021/02/20 | 35457 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin.tar.lzma
-2021/02/20 | 39654 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin-x64.tar.lzma
-2021/02/20 | 747986 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-2.9.tar.lzma
-2021/02/20 | 815059 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-x64-2.9.tar.lzma
-2021/02/20 | 198088 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-2.9.tar.lzma
-2021/02/20 | 202488 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-x64-2.9.tar.lzma
-2021/02/20 | 208338 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-2.9.tar.lzma
-2021/02/20 | 243493 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-x64-2.9.tar.lzma
-2021/02/20 | 78816 | systems/win32/miktex/tm/packages/next/miktex-png-bin-2.9.tar.lzma
-2021/02/20 | 87674 | systems/win32/miktex/tm/packages/next/miktex-png-bin-x64-2.9.tar.lzma
-2021/02/20 | 1171601 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-2.9.tar.lzma
-2021/02/20 | 1305354 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-x64-2.9.tar.lzma
-2021/02/20 | 20116 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-2.9.tar.lzma
-2021/02/20 | 23874 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-x64-2.9.tar.lzma
-2021/02/20 | 31553 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-2.9.tar.lzma
-2021/02/20 | 37245 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-x64-2.9.tar.lzma
-2021/02/20 | 63907 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-2.9.tar.lzma
-2021/02/20 | 72193 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-x64-2.9.tar.lzma
-2021/02/20 | 43808 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-2.9.tar.lzma
-2021/02/20 | 51971 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-x64-2.9.tar.lzma
-2021/02/20 | 1295169 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-2.9.tar.lzma
-2021/02/20 | 1424112 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-x64-2.9.tar.lzma
-2021/02/20 | 42391 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-2.9.tar.lzma
-2021/02/20 | 51808 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-x64-2.9.tar.lzma
-2021/02/20 | 56261 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin.tar.lzma
-2021/02/20 | 59841 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-x64.tar.lzma
-2021/02/20 | 25421 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-2.9.tar.lzma
-2021/02/20 | 27448 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-x64-2.9.tar.lzma
-2021/02/20 | 16254 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-2.9.tar.lzma
-2021/02/20 | 18098 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-x64-2.9.tar.lzma
-2021/02/20 | 63678 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-2.9.tar.lzma
-2021/02/20 | 70145 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-x64-2.9.tar.lzma
-2021/02/20 | 153932 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-2.9.tar.lzma
-2021/02/20 | 167874 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-x64-2.9.tar.lzma
-2021/02/20 | 56899 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-2.9.tar.lzma
-2021/02/20 | 65323 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-x64-2.9.tar.lzma
-2021/02/20 | 98489 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-2.9.tar.lzma
-2021/02/20 | 104764 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-x64-2.9.tar.lzma
-2021/02/20 | 2497572 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-2.9.tar.lzma
-2021/02/20 | 2614820 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-x64-2.9.tar.lzma
-2021/02/20 | 55204 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-2.9.tar.lzma
-2021/02/20 | 62611 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-x64-2.9.tar.lzma
-2021/02/20 | 33541 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin.tar.lzma
-2021/02/20 | 37241 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin-x64.tar.lzma
-2021/02/20 | 27203 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-2.9.tar.lzma
-2021/02/20 | 33134 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-x64-2.9.tar.lzma
-2021/02/20 | 65851 | systems/win32/miktex/tm/packages/next/miktex-web-bin-2.9.tar.lzma
-2021/02/20 | 70349 | systems/win32/miktex/tm/packages/next/miktex-web-bin-x64-2.9.tar.lzma
-2021/02/20 | 311096 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-2.9.tar.lzma
-2021/02/20 | 345262 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-x64-2.9.tar.lzma
-2021/02/20 | 55554 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin.tar.lzma
-2021/02/20 | 57064 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin-x64.tar.lzma
-2021/02/20 | 583486 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-2.9.tar.lzma
-2021/02/20 | 618684 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-x64-2.9.tar.lzma
-2021/02/20 | 39538 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-2.9.tar.lzma
-2021/02/20 | 43384 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-x64-2.9.tar.lzma
-2021/02/20 | 207163 | systems/win32/miktex/tm/packages/next/miktex-zzdb1-2.9.tar.lzma
-2021/02/20 | 1257608 | systems/win32/miktex/tm/packages/next/miktex-zzdb2-2.9.tar.lzma
-2021/02/20 | 1175439 | systems/win32/miktex/tm/packages/next/miktex-zzdb3-2.9.tar.lzma
-2021/02/20 | 13477 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-2.9.tar.lzma
-2021/02/20 | 14334 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-x64-2.9.tar.lzma
+2021/02/21 | 570376 | systems/win32/miktex/tm/packages/next/files.csv.lzma
+2021/02/21 | 50741 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-2.9.tar.lzma
+2021/02/21 | 56490 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-x64-2.9.tar.lzma
+2021/02/21 | 968618 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-2.9.tar.lzma
+2021/02/21 | 1079140 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-x64-2.9.tar.lzma
+2021/02/21 | 29034 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-2.9.tar.lzma
+2021/02/21 | 31333 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-x64-2.9.tar.lzma
+2021/02/21 | 29467 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-2.9.tar.lzma
+2021/02/21 | 34298 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-x64-2.9.tar.lzma
+2021/02/21 | 50123 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-2.9.tar.lzma
+2021/02/21 | 57597 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-x64-2.9.tar.lzma
+2021/02/21 | 85382 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-2.9.tar.lzma
+2021/02/21 | 94685 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-x64-2.9.tar.lzma
+2021/02/21 | 67491 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-2.9.tar.lzma
+2021/02/21 | 75405 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-x64-2.9.tar.lzma
+2021/02/21 | 27210 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-2.9.tar.lzma
+2021/02/21 | 30876 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-x64-2.9.tar.lzma
+2021/02/21 | 330264 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-2.9.tar.lzma
+2021/02/21 | 392430 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-x64-2.9.tar.lzma
+2021/02/21 | 32449 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-2.9.tar.lzma
+2021/02/21 | 36664 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-x64-2.9.tar.lzma
+2021/02/21 | 51556 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-2.9.tar.lzma
+2021/02/21 | 56581 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-x64-2.9.tar.lzma
+2021/02/21 | 239850 | systems/win32/miktex/tm/packages/next/miktex-console-bin-2.9.tar.lzma
+2021/02/21 | 262020 | systems/win32/miktex/tm/packages/next/miktex-console-bin-x64-2.9.tar.lzma
+2021/02/21 | 179160 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-2.9.tar.lzma
+2021/02/21 | 195507 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-x64-2.9.tar.lzma
+2021/02/21 | 52472 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-2.9.tar.lzma
+2021/02/21 | 59095 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-x64-2.9.tar.lzma
+2021/02/21 | 21141 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-2.9.tar.lzma
+2021/02/21 | 23296 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-x64-2.9.tar.lzma
+2021/02/21 | 461332 | systems/win32/miktex/tm/packages/next/miktex-doc.tar.lzma
+2021/02/21 | 45647 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-2.9.tar.lzma
+2021/02/21 | 51186 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-x64-2.9.tar.lzma
+2021/02/21 | 281630 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-2.9.tar.lzma
+2021/02/21 | 321919 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-x64-2.9.tar.lzma
+2021/02/21 | 41107 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-2.9.tar.lzma
+2021/02/21 | 45262 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-x64-2.9.tar.lzma
+2021/02/21 | 116982 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-2.9.tar.lzma
+2021/02/21 | 131377 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-x64-2.9.tar.lzma
+2021/02/21 | 1285122 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-2.9.tar.lzma
+2021/02/21 | 1418732 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-x64-2.9.tar.lzma
+2021/02/21 | 87634 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-2.9.tar.lzma
+2021/02/21 | 99454 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-x64-2.9.tar.lzma
+2021/02/21 | 43065 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-2.9.tar.lzma
+2021/02/21 | 47865 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-x64-2.9.tar.lzma
+2021/02/21 | 25146 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-2.9.tar.lzma
+2021/02/21 | 28012 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-x64-2.9.tar.lzma
+2021/02/21 | 55792 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-2.9.tar.lzma
+2021/02/21 | 62769 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-x64-2.9.tar.lzma
+2021/02/21 | 134915 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-2.9.tar.lzma
+2021/02/21 | 152799 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-x64-2.9.tar.lzma
+2021/02/21 | 73177 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-2.9.tar.lzma
+2021/02/21 | 77878 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-x64-2.9.tar.lzma
+2021/02/21 | 71824 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-2.9.tar.lzma
+2021/02/21 | 80798 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-x64-2.9.tar.lzma
+2021/02/21 | 258575 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-2.9.tar.lzma
+2021/02/21 | 295514 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-x64-2.9.tar.lzma
+2021/02/21 | 22036 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-2.9.tar.lzma
+2021/02/21 | 25005 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-x64-2.9.tar.lzma
+2021/02/21 | 97356 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-2.9.tar.lzma
+2021/02/21 | 112294 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-x64-2.9.tar.lzma
+2021/02/21 | 63810 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-2.9.tar.lzma
+2021/02/21 | 72852 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-x64-2.9.tar.lzma
+2021/02/21 | 94599 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-2.9.tar.lzma
+2021/02/21 | 114015 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-x64-2.9.tar.lzma
+2021/02/21 | 38094 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-2.9.tar.lzma
+2021/02/21 | 42653 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-x64-2.9.tar.lzma
+2021/02/21 | 483681 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-2.9.tar.lzma
+2021/02/21 | 567267 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-x64-2.9.tar.lzma
+2021/02/21 | 147126 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-2.9.tar.lzma
+2021/02/21 | 159810 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-x64-2.9.tar.lzma
+2021/02/21 | 94807 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-2.9.tar.lzma
+2021/02/21 | 109199 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-x64-2.9.tar.lzma
+2021/02/21 | 16325 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-2.9.tar.lzma
+2021/02/21 | 17960 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-x64-2.9.tar.lzma
+2021/02/21 | 28139 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-2.9.tar.lzma
+2021/02/21 | 30013 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-x64-2.9.tar.lzma
+2021/02/21 | 625364 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-2.9.tar.lzma
+2021/02/21 | 680229 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-x64-2.9.tar.lzma
+2021/02/21 | 532131 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-2.9.tar.lzma
+2021/02/21 | 596447 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-x64-2.9.tar.lzma
+2021/02/21 | 475713 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-2.9.tar.lzma
+2021/02/21 | 511539 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-x64-2.9.tar.lzma
+2021/02/21 | 94160 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-2.9.tar.lzma
+2021/02/21 | 103269 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-x64-2.9.tar.lzma
+2021/02/21 | 1717695 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-2.9.tar.lzma
+2021/02/21 | 1994176 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-x64-2.9.tar.lzma
+2021/02/21 | 67685 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-2.9.tar.lzma
+2021/02/21 | 74140 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-x64-2.9.tar.lzma
+2021/02/21 | 27370 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-2.9.tar.lzma
+2021/02/21 | 31532 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-x64-2.9.tar.lzma
+2021/02/21 | 7740 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-2.9.tar.lzma
+2021/02/21 | 8775 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-x64-2.9.tar.lzma
+2021/02/21 | 195650 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-2.9.tar.lzma
+2021/02/21 | 214121 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-x64-2.9.tar.lzma
+2021/02/21 | 250271 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-2.9.tar.lzma
+2021/02/21 | 283998 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-x64-2.9.tar.lzma
+2021/02/21 | 97107 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-2.9.tar.lzma
+2021/02/21 | 101680 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-x64-2.9.tar.lzma
+2021/02/21 | 60633 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-2.9.tar.lzma
+2021/02/21 | 67866 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-x64-2.9.tar.lzma
+2021/02/21 | 124945 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-2.9.tar.lzma
+2021/02/21 | 136449 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-x64-2.9.tar.lzma
+2021/02/21 | 146984 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-2.9.tar.lzma
+2021/02/21 | 163655 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-x64-2.9.tar.lzma
+2021/02/21 | 199611 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-2.9.tar.lzma
+2021/02/21 | 180173 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-x64-2.9.tar.lzma
+2021/02/21 | 67393 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-2.9.tar.lzma
+2021/02/21 | 77426 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-x64-2.9.tar.lzma
+2021/02/21 | 31227 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-2.9.tar.lzma
+2021/02/21 | 35061 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-x64-2.9.tar.lzma
+2021/02/21 | 38047 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-2.9.tar.lzma
+2021/02/21 | 42595 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-x64-2.9.tar.lzma
+2021/02/21 | 42851 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-2.9.tar.lzma
+2021/02/21 | 46831 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-x64-2.9.tar.lzma
+2021/02/21 | 45974 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-2.9.tar.lzma
+2021/02/21 | 52416 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-x64-2.9.tar.lzma
+2021/02/21 | 193591 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-2.9.tar.lzma
+2021/02/21 | 210794 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-x64-2.9.tar.lzma
+2021/02/21 | 35458 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin.tar.lzma
+2021/02/21 | 39656 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin-x64.tar.lzma
+2021/02/21 | 747987 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-2.9.tar.lzma
+2021/02/21 | 815056 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-x64-2.9.tar.lzma
+2021/02/21 | 198088 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-2.9.tar.lzma
+2021/02/21 | 202488 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-x64-2.9.tar.lzma
+2021/02/21 | 208335 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-2.9.tar.lzma
+2021/02/21 | 243491 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-x64-2.9.tar.lzma
+2021/02/21 | 78817 | systems/win32/miktex/tm/packages/next/miktex-png-bin-2.9.tar.lzma
+2021/02/21 | 87673 | systems/win32/miktex/tm/packages/next/miktex-png-bin-x64-2.9.tar.lzma
+2021/02/21 | 1171600 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-2.9.tar.lzma
+2021/02/21 | 1305353 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-x64-2.9.tar.lzma
+2021/02/21 | 20114 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-2.9.tar.lzma
+2021/02/21 | 23874 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-x64-2.9.tar.lzma
+2021/02/21 | 31551 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-2.9.tar.lzma
+2021/02/21 | 37243 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-x64-2.9.tar.lzma
+2021/02/21 | 63905 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-2.9.tar.lzma
+2021/02/21 | 72192 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-x64-2.9.tar.lzma
+2021/02/21 | 43808 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-2.9.tar.lzma
+2021/02/21 | 51968 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-x64-2.9.tar.lzma
+2021/02/21 | 1295172 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-2.9.tar.lzma
+2021/02/21 | 1424113 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-x64-2.9.tar.lzma
+2021/02/21 | 42391 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-2.9.tar.lzma
+2021/02/21 | 51808 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-x64-2.9.tar.lzma
+2021/02/21 | 56260 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin.tar.lzma
+2021/02/21 | 59840 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-x64.tar.lzma
+2021/02/21 | 25420 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-2.9.tar.lzma
+2021/02/21 | 27448 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-x64-2.9.tar.lzma
+2021/02/21 | 16253 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-2.9.tar.lzma
+2021/02/21 | 18099 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-x64-2.9.tar.lzma
+2021/02/21 | 63676 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-2.9.tar.lzma
+2021/02/21 | 70143 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-x64-2.9.tar.lzma
+2021/02/21 | 153935 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-2.9.tar.lzma
+2021/02/21 | 167876 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-x64-2.9.tar.lzma
+2021/02/21 | 56900 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-2.9.tar.lzma
+2021/02/21 | 65323 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-x64-2.9.tar.lzma
+2021/02/21 | 98489 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-2.9.tar.lzma
+2021/02/21 | 104762 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-x64-2.9.tar.lzma
+2021/02/21 | 2497572 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-2.9.tar.lzma
+2021/02/21 | 2614821 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-x64-2.9.tar.lzma
+2021/02/21 | 55203 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-2.9.tar.lzma
+2021/02/21 | 62613 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-x64-2.9.tar.lzma
+2021/02/21 | 33541 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin.tar.lzma
+2021/02/21 | 37240 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin-x64.tar.lzma
+2021/02/21 | 27203 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-2.9.tar.lzma
+2021/02/21 | 33133 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-x64-2.9.tar.lzma
+2021/02/21 | 65850 | systems/win32/miktex/tm/packages/next/miktex-web-bin-2.9.tar.lzma
+2021/02/21 | 70348 | systems/win32/miktex/tm/packages/next/miktex-web-bin-x64-2.9.tar.lzma
+2021/02/21 | 311097 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-2.9.tar.lzma
+2021/02/21 | 345262 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-x64-2.9.tar.lzma
+2021/02/21 | 55554 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin.tar.lzma
+2021/02/21 | 57065 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin-x64.tar.lzma
+2021/02/21 | 583485 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-2.9.tar.lzma
+2021/02/21 | 618683 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-x64-2.9.tar.lzma
+2021/02/21 | 39536 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-2.9.tar.lzma
+2021/02/21 | 43384 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-x64-2.9.tar.lzma
+2021/02/21 | 207220 | systems/win32/miktex/tm/packages/next/miktex-zzdb1-2.9.tar.lzma
+2021/02/21 | 1257768 | systems/win32/miktex/tm/packages/next/miktex-zzdb2-2.9.tar.lzma
+2021/02/21 | 1174721 | systems/win32/miktex/tm/packages/next/miktex-zzdb3-2.9.tar.lzma
+2021/02/21 | 13476 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-2.9.tar.lzma
+2021/02/21 | 14332 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-x64-2.9.tar.lzma
2019/03/12 | 1412 | systems/win32/miktex/tm/packages/nextpage.tar.lzma
-2021/02/20 | 1153 | systems/win32/miktex/tm/packages/next/pr.ini
+2021/02/21 | 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
@@ -282283,7 +282286,7 @@
2020/10/20 | 342254 | systems/win32/miktex/tm/packages/preview.tar.lzma
2019/06/20 | 375963 | systems/win32/miktex/tm/packages/prftree.tar.lzma
2020/10/27 | 357822 | systems/win32/miktex/tm/packages/principia.tar.lzma
-2021/02/20 | 1127 | systems/win32/miktex/tm/packages/pr.ini
+2021/02/21 | 1127 | 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
@@ -283458,9 +283461,9 @@
2019/08/12 | 14654 | systems/win32/w32tex/00FILES.euc
2019/08/12 | 14654 | systems/win32/w32tex/00FILES.sjis
2021/02/19 | 5182256 | systems/win32/w32tex/aleph-w32.tar.xz
-2021/02/02 | 66704360 | systems/win32/w32tex/biblatex-biber.tar.xz
+2021/02/20 | 66705596 | systems/win32/w32tex/biblatex-biber.tar.xz
2016/12/13 | 65971452 | systems/win32/w32tex/cbfonts.tar.xz
-2021/02/19 | 788003 | systems/win32/w32tex/ChangeLog
+2021/02/20 | 788268 | systems/win32/w32tex/ChangeLog
2009/08/03 | 141221 | systems/win32/w32tex/ChangeLog.0
2009/08/03 | 221890 | systems/win32/w32tex/ChangeLog.1
2009/08/03 | 116462 | systems/win32/w32tex/ChangeLog.2
@@ -283468,8 +283471,8 @@
2017/06/24 | 644754 | systems/win32/w32tex/ChangeLog.4
2021/02/16 | 23445328 | systems/win32/w32tex/cjkzr.tar.xz
2013/04/27 | 15858676 | systems/win32/w32tex/context-doc.tar.xz
-2021/02/19 | 141993152 | systems/win32/w32tex/context.tar.xz
-2021/02/19 | 911112 | systems/win32/w32tex/cweb-w32.tar.xz
+2021/02/20 | 142000728 | systems/win32/w32tex/context.tar.xz
+2021/02/20 | 911120 | systems/win32/w32tex/cweb-w32.tar.xz
2020/09/21 | 6434128 | systems/win32/w32tex/datetime2.tar.xz
2021/02/19 | 845892 | systems/win32/w32tex/dvi2ps-w32.tar.xz
2021/02/19 | 484028 | systems/win32/w32tex/dvi2tty-w32.tar.xz
@@ -283543,8 +283546,8 @@
2021/02/19 | 49059248 | systems/win32/w32tex/web2c-w32.tar.xz
2021/02/19 | 811524 | systems/win32/w32tex/win64/aleph-w64.tar.xz
2020/08/20 | 22351540 | systems/win32/w32tex/win64/biblatex-biber-w64.tar.xz
-2021/02/19 | 2209888 | systems/win32/w32tex/win64/context-w64.tar.xz
-2021/02/19 | 440956 | systems/win32/w32tex/win64/cweb-w64.tar.xz
+2021/02/20 | 2209888 | systems/win32/w32tex/win64/context-w64.tar.xz
+2021/02/20 | 440824 | systems/win32/w32tex/win64/cweb-w64.tar.xz
2021/02/19 | 758536 | systems/win32/w32tex/win64/dvi2ps-w64.tar.xz
2021/02/19 | 448196 | systems/win32/w32tex/win64/dvi2tty-w64.tar.xz
2021/02/19 | 808556 | systems/win32/w32tex/win64/dvipdfm-w64.tar.xz
@@ -283681,7 +283684,7 @@
2004/06/04 | 404 | tds/tds.sed
2004/06/23 | 65418 | tds/tds.tex
2019/05/29 | 304264 | tds.zip
-2021/02/21 | 186 | timestamp
+2021/02/22 | 186 | timestamp
2002/08/26 | 61898 | usergrps/dante/antrag.pdf
2002/08/26 | 118217 | usergrps/dante/antrag.ps
2017/06/30 | 917 | usergrps/dante/dtk/doc/beispiel.bib
diff --git a/FILES.byname.gz b/FILES.byname.gz
index a0f544a526..a9ea627a84 100644
--- a/FILES.byname.gz
+++ b/FILES.byname.gz
Binary files differ
diff --git a/FILES.last07days b/FILES.last07days
index de50c905e1..a5d7eaa181 100644
--- a/FILES.last07days
+++ b/FILES.last07days
@@ -1,398 +1,480 @@
-2021/02/20 | 99454 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-x64-2.9.tar.lzma
+2021/02/21 | 99454 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-x64-2.9.tar.lzma
+2021/02/21 | 98489 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-2.9.tar.lzma
+2021/02/21 | 97356 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-2.9.tar.lzma
+2021/02/21 | 97107 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-2.9.tar.lzma
+2021/02/21 | 968618 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-2.9.tar.lzma
+2021/02/21 | 94807 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-2.9.tar.lzma
+2021/02/21 | 94685 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-x64-2.9.tar.lzma
+2021/02/21 | 94599 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-2.9.tar.lzma
+2021/02/21 | 94160 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-2.9.tar.lzma
+2021/02/21 | 93761 | graphics/mcf2graph/mcf2graph.mf
+2021/02/21 | 8775 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-x64-2.9.tar.lzma
+2021/02/21 | 87673 | systems/win32/miktex/tm/packages/next/miktex-png-bin-x64-2.9.tar.lzma
+2021/02/21 | 87634 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-2.9.tar.lzma
+2021/02/21 | 85382 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-2.9.tar.lzma
+2021/02/21 | 815056 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-x64-2.9.tar.lzma
+2021/02/21 | 80798 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-x64-2.9.tar.lzma
+2021/02/21 | 78817 | systems/win32/miktex/tm/packages/next/miktex-png-bin-2.9.tar.lzma
+2021/02/21 | 77878 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-x64-2.9.tar.lzma
+2021/02/21 | 77426 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-x64-2.9.tar.lzma
+2021/02/21 | 7740 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-2.9.tar.lzma
+2021/02/21 | 75405 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-x64-2.9.tar.lzma
+2021/02/21 | 747987 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-2.9.tar.lzma
+2021/02/21 | 74140 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-x64-2.9.tar.lzma
+2021/02/21 | 73177 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-2.9.tar.lzma
+2021/02/21 | 72852 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-x64-2.9.tar.lzma
+2021/02/21 | 72192 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-x64-2.9.tar.lzma
+2021/02/21 | 71824 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-2.9.tar.lzma
+2021/02/21 | 70348 | systems/win32/miktex/tm/packages/next/miktex-web-bin-x64-2.9.tar.lzma
+2021/02/21 | 70143 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-x64-2.9.tar.lzma
+2021/02/21 | 680229 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-x64-2.9.tar.lzma
+2021/02/21 | 67866 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-x64-2.9.tar.lzma
+2021/02/21 | 67685 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-2.9.tar.lzma
+2021/02/21 | 67491 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-2.9.tar.lzma
+2021/02/21 | 67393 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-2.9.tar.lzma
+2021/02/21 | 65850 | systems/win32/miktex/tm/packages/next/miktex-web-bin-2.9.tar.lzma
+2021/02/21 | 65323 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-x64-2.9.tar.lzma
+2021/02/21 | 63905 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-2.9.tar.lzma
+2021/02/21 | 63810 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-2.9.tar.lzma
+2021/02/21 | 63676 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-2.9.tar.lzma
+2021/02/21 | 62769 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-x64-2.9.tar.lzma
+2021/02/21 | 62613 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-x64-2.9.tar.lzma
+2021/02/21 | 625364 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-2.9.tar.lzma
+2021/02/21 | 618683 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-x64-2.9.tar.lzma
+2021/02/21 | 617135 | graphics/mcf2graph/mcf_manual.pdf
+2021/02/21 | 60633 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-2.9.tar.lzma
+2021/02/21 | 59840 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-x64.tar.lzma
+2021/02/21 | 596447 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-x64-2.9.tar.lzma
+2021/02/21 | 59095 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-x64-2.9.tar.lzma
+2021/02/21 | 583485 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-2.9.tar.lzma
+2021/02/21 | 5824145 | systems/texlive/tlnet/install-tl-unx.tar.gz
+2021/02/21 | 57597 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-x64-2.9.tar.lzma
+2021/02/21 | 571802 | graphics/pgf/contrib/spath3/spath3_code.pdf
+2021/02/21 | 57065 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin-x64.tar.lzma
+2021/02/21 | 570376 | systems/win32/miktex/tm/packages/next/files.csv.lzma
+2021/02/21 | 569814 | systems/win32/miktex/tm/packages/files.csv.lzma
+2021/02/21 | 56900 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-2.9.tar.lzma
+2021/02/21 | 567267 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-x64-2.9.tar.lzma
+2021/02/21 | 56581 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-x64-2.9.tar.lzma
+2021/02/21 | 56490 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-x64-2.9.tar.lzma
+2021/02/21 | 56260 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin.tar.lzma
+2021/02/21 | 55792 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-2.9.tar.lzma
+2021/02/21 | 55554 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin.tar.lzma
+2021/02/21 | 55203 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-2.9.tar.lzma
+2021/02/21 | 53963 | graphics/mcf2graph/mcf_manual.tex
+2021/02/21 | 535779 | graphics/mcf2graph/mcf_example.pdf
+2021/02/21 | 533009 | macros/latex/contrib/easybook.zip
+2021/02/21 | 532131 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-2.9.tar.lzma
+2021/02/21 | 52472 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-2.9.tar.lzma
+2021/02/21 | 52416 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-x64-2.9.tar.lzma
+2021/02/21 | 523 | graphics/pgf/contrib/spath3/README
+2021/02/21 | 51968 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-x64-2.9.tar.lzma
+2021/02/21 | 51808 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-x64-2.9.tar.lzma
+2021/02/21 | 51556 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-2.9.tar.lzma
+2021/02/21 | 51186 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-x64-2.9.tar.lzma
+2021/02/21 | 511539 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-x64-2.9.tar.lzma
+2021/02/21 | 50741 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-2.9.tar.lzma
+2021/02/21 | 50123 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-2.9.tar.lzma
+2021/02/21 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
+2021/02/21 | 483681 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-2.9.tar.lzma
+2021/02/21 | 47865 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-x64-2.9.tar.lzma
+2021/02/21 | 475713 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-2.9.tar.lzma
+2021/02/21 | 469 | graphics/pgf/contrib/tikzmark/README
+2021/02/21 | 46831 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-x64-2.9.tar.lzma
+2021/02/21 | 461332 | systems/win32/miktex/tm/packages/next/miktex-doc.tar.lzma
+2021/02/21 | 45974 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-2.9.tar.lzma
+2021/02/21 | 45647 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-2.9.tar.lzma
+2021/02/21 | 455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
+2021/02/21 | 455 | systems/texlive/tlnet/install-tl.zip.sha512.asc
+2021/02/21 | 455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
+2021/02/21 | 455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
+2021/02/21 | 45262 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-x64-2.9.tar.lzma
+2021/02/21 | 44383 | macros/latex/contrib/easybook/easybook.cls
+2021/02/21 | 43808 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-2.9.tar.lzma
+2021/02/21 | 436319 | graphics/pgf/contrib/tikzmark.zip
+2021/02/21 | 43384 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-x64-2.9.tar.lzma
+2021/02/21 | 43065 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-2.9.tar.lzma
+2021/02/21 | 42851 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-2.9.tar.lzma
+2021/02/21 | 42653 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-x64-2.9.tar.lzma
+2021/02/21 | 42595 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-x64-2.9.tar.lzma
+2021/02/21 | 42391 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-2.9.tar.lzma
+2021/02/21 | 423477 | graphics/pgf/contrib/tikzmark/tikzmark.pdf
+2021/02/21 | 41107 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-2.9.tar.lzma
+2021/02/21 | 40740 | graphics/mcf2graph/mcf_man_soc.mf
+2021/02/21 | 39656 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin-x64.tar.lzma
+2021/02/21 | 39536 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-2.9.tar.lzma
+2021/02/21 | 392430 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-x64-2.9.tar.lzma
+2021/02/21 | 388 | systems/texlive/tlnet/archive/texlive-docindex.r57817.tar.xz
+2021/02/21 | 388662 | graphics/pgf/contrib/spath3/spath3.pdf
+2021/02/21 | 38094 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-2.9.tar.lzma
+2021/02/21 | 38047 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-2.9.tar.lzma
+2021/02/21 | 3788 | graphics/mcf2graph/README
+2021/02/21 | 37243 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-x64-2.9.tar.lzma
+2021/02/21 | 37240 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin-x64.tar.lzma
+2021/02/21 | 36664 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-x64-2.9.tar.lzma
+2021/02/21 | 35458 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin.tar.lzma
+2021/02/21 | 35061 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-x64-2.9.tar.lzma
+2021/02/21 | 345262 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-x64-2.9.tar.lzma
+2021/02/21 | 34298 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-x64-2.9.tar.lzma
+2021/02/21 | 341621 | graphics/pgf/contrib/spath3/knots.pdf
+2021/02/21 | 33598 | graphics/pgf/contrib/spath3/spath3.tex
+2021/02/21 | 33541 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin.tar.lzma
+2021/02/21 | 33133 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-x64-2.9.tar.lzma
+2021/02/21 | 330264 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-2.9.tar.lzma
+2021/02/21 | 32449 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-2.9.tar.lzma
+2021/02/21 | 321919 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-x64-2.9.tar.lzma
+2021/02/21 | 31551 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-2.9.tar.lzma
+2021/02/21 | 31532 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-x64-2.9.tar.lzma
+2021/02/21 | 31333 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-x64-2.9.tar.lzma
+2021/02/21 | 31227 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-2.9.tar.lzma
+2021/02/21 | 311097 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-2.9.tar.lzma
+2021/02/21 | 30876 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-x64-2.9.tar.lzma
+2021/02/21 | 30013 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-x64-2.9.tar.lzma
+2021/02/21 | 29916 | systems/texlive/tlnet/archive/plain.r57819.tar.xz
+2021/02/21 | 299163 | macros/latex/contrib/easybook/doc/easybook-demo.pdf
+2021/02/21 | 295514 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-x64-2.9.tar.lzma
+2021/02/21 | 29467 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-2.9.tar.lzma
+2021/02/21 | 29034 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-2.9.tar.lzma
+2021/02/21 | 283998 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-x64-2.9.tar.lzma
+2021/02/21 | 281630 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-2.9.tar.lzma
+2021/02/21 | 28139 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-2.9.tar.lzma
+2021/02/21 | 28012 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-x64-2.9.tar.lzma
+2021/02/21 | 27448 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-x64-2.9.tar.lzma
+2021/02/21 | 27401 | macros/latex/contrib/easybook/doc/easybook.tex
+2021/02/21 | 27370 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-2.9.tar.lzma
+2021/02/21 | 27210 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-2.9.tar.lzma
+2021/02/21 | 27203 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-2.9.tar.lzma
+2021/02/21 | 265415 | graphics/pgf/contrib/spath3/spath3_code.dtx
+2021/02/21 | 262020 | systems/win32/miktex/tm/packages/next/miktex-console-bin-x64-2.9.tar.lzma
+2021/02/21 | 2614821 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-x64-2.9.tar.lzma
+2021/02/21 | 259536 | graphics/pgf/contrib/spath3/calligraphy.pdf
+2021/02/21 | 258575 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-2.9.tar.lzma
+2021/02/21 | 25420 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-2.9.tar.lzma
+2021/02/21 | 2526 | macros/latex/contrib/easybook/doc/easybook-demo.tex
+2021/02/21 | 25146 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-2.9.tar.lzma
+2021/02/21 | 250271 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-2.9.tar.lzma
+2021/02/21 | 25005 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-x64-2.9.tar.lzma
+2021/02/21 | 2497572 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-2.9.tar.lzma
+2021/02/21 | 24615371 | systems/texlive/tlnet/install-tl.zip
+2021/02/21 | 243491 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-x64-2.9.tar.lzma
+2021/02/21 | 239850 | systems/win32/miktex/tm/packages/next/miktex-console-bin-2.9.tar.lzma
+2021/02/21 | 23874 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-x64-2.9.tar.lzma
+2021/02/21 | 23296 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-x64-2.9.tar.lzma
+2021/02/21 | 231353 | macros/latex/contrib/easybook/doc/easybook.pdf
+2021/02/21 | 2280012 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
+2021/02/21 | 22036 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-2.9.tar.lzma
+2021/02/21 | 214121 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-x64-2.9.tar.lzma
+2021/02/21 | 21141 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-2.9.tar.lzma
+2021/02/21 | 210794 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-x64-2.9.tar.lzma
+2021/02/21 | 208335 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-2.9.tar.lzma
+2021/02/21 | 207220 | systems/win32/miktex/tm/packages/next/miktex-zzdb1-2.9.tar.lzma
+2021/02/21 | 207195 | systems/win32/miktex/tm/packages/miktex-zzdb1-2.9.tar.lzma
+2021/02/21 | 202488 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-x64-2.9.tar.lzma
+2021/02/21 | 202477 | graphics/mcf2graph/mcf_mplib_exa.pdf
+2021/02/21 | 20114 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-2.9.tar.lzma
+2021/02/21 | 199611 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-2.9.tar.lzma
+2021/02/21 | 1994176 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-x64-2.9.tar.lzma
+2021/02/21 | 198088 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-2.9.tar.lzma
+2021/02/21 | 19657150 | systems/texlive/tlnet/install-tl-windows.exe
+2021/02/21 | 195650 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-2.9.tar.lzma
+2021/02/21 | 195507 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-x64-2.9.tar.lzma
+2021/02/21 | 193591 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-2.9.tar.lzma
+2021/02/21 | 18099 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-x64-2.9.tar.lzma
+2021/02/21 | 180173 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-x64-2.9.tar.lzma
+2021/02/21 | 17960 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-x64-2.9.tar.lzma
+2021/02/21 | 179160 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-2.9.tar.lzma
+2021/02/21 | 176249 | dviware/dvidvi.zip
+2021/02/21 | 173172 | systems/texlive/tlnet/archive/texlive-docindex.doc.r57817.tar.xz
+2021/02/21 | 1717695 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-2.9.tar.lzma
+2021/02/21 | 17039688 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
+2021/02/21 | 167876 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-x64-2.9.tar.lzma
+2021/02/21 | 163655 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-x64-2.9.tar.lzma
+2021/02/21 | 16325 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-2.9.tar.lzma
+2021/02/21 | 16253 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-2.9.tar.lzma
+2021/02/21 | 1600674 | graphics/pgf/contrib/spath3.zip
+2021/02/21 | 159810 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-x64-2.9.tar.lzma
+2021/02/21 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
+2021/02/21 | 153935 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-2.9.tar.lzma
+2021/02/21 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
+2021/02/21 | 152799 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-x64-2.9.tar.lzma
+2021/02/21 | 147126 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-2.9.tar.lzma
+2021/02/21 | 146984 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-2.9.tar.lzma
+2021/02/21 | 145 | systems/texlive/tlnet/install-tl.zip.sha512
+2021/02/21 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
+2021/02/21 | 14332 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-x64-2.9.tar.lzma
+2021/02/21 | 1424113 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-x64-2.9.tar.lzma
+2021/02/21 | 1418732 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-x64-2.9.tar.lzma
+2021/02/21 | 136449 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-x64-2.9.tar.lzma
+2021/02/21 | 1351037 | graphics/mcf2graph.zip
+2021/02/21 | 134915 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-2.9.tar.lzma
+2021/02/21 | 13476 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-2.9.tar.lzma
+2021/02/21 | 131377 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-x64-2.9.tar.lzma
+2021/02/21 | 1305353 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-x64-2.9.tar.lzma
+2021/02/21 | 1295172 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-2.9.tar.lzma
+2021/02/21 | 1285122 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-2.9.tar.lzma
+2021/02/21 | 1257965 | systems/win32/miktex/tm/packages/miktex-zzdb2-2.9.tar.lzma
+2021/02/21 | 1257768 | systems/win32/miktex/tm/packages/next/miktex-zzdb2-2.9.tar.lzma
+2021/02/21 | 124945 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-2.9.tar.lzma
+2021/02/21 | 1174721 | systems/win32/miktex/tm/packages/next/miktex-zzdb3-2.9.tar.lzma
+2021/02/21 | 1174267 | systems/win32/miktex/tm/packages/miktex-zzdb3-2.9.tar.lzma
+2021/02/21 | 1171600 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-2.9.tar.lzma
+2021/02/21 | 116982 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-2.9.tar.lzma
+2021/02/21 | 1153 | systems/win32/miktex/tm/packages/next/pr.ini
+2021/02/21 | 114015 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-x64-2.9.tar.lzma
+2021/02/21 | 1127 | systems/win32/miktex/tm/packages/pr.ini
+2021/02/21 | 112294 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-x64-2.9.tar.lzma
+2021/02/21 | 109199 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-x64-2.9.tar.lzma
+2021/02/21 | 1079140 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-x64-2.9.tar.lzma
+2021/02/21 | 104762 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-x64-2.9.tar.lzma
+2021/02/21 | 103269 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-x64-2.9.tar.lzma
+2021/02/21 | 101680 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-x64-2.9.tar.lzma
2021/02/20 | 99409 | systems/win32/miktex/tm/packages/miktex-epstopdf-bin-x64-2.9.tar.lzma
-2021/02/20 | 98489 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-2.9.tar.lzma
2021/02/20 | 984871 | macros/latex/contrib/acrotex/doc/eformman.pdf
2021/02/20 | 98455 | systems/win32/miktex/tm/packages/miktex-texware-bin-2.9.tar.lzma
-2021/02/20 | 97357 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-2.9.tar.lzma
2021/02/20 | 97293 | systems/win32/miktex/tm/packages/miktex-mfware-bin-2.9.tar.lzma
-2021/02/20 | 97108 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-2.9.tar.lzma
2021/02/20 | 97039 | systems/win32/miktex/tm/packages/miktex-gd-bin-2.9.tar.lzma
2021/02/20 | 969226 | systems/win32/miktex/tm/packages/miktex-asymptote-bin-2.9.tar.lzma
-2021/02/20 | 968619 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-2.9.tar.lzma
-2021/02/20 | 94807 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-2.9.tar.lzma
2021/02/20 | 94773 | systems/win32/miktex/tm/packages/miktex-jpeg-bin-2.9.tar.lzma
2021/02/20 | 94749 | systems/win32/miktex/tm/packages/miktex-bibtex8bit-bin-x64-2.9.tar.lzma
-2021/02/20 | 94686 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-x64-2.9.tar.lzma
-2021/02/20 | 94599 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-2.9.tar.lzma
2021/02/20 | 94514 | systems/win32/miktex/tm/packages/miktex-gregorio-bin-2.9.tar.lzma
-2021/02/20 | 94161 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-2.9.tar.lzma
2021/02/20 | 94148 | systems/win32/miktex/tm/packages/miktex-lua53-bin-2.9.tar.lzma
2021/02/20 | 938 | graphics/pgf/contrib/circuitikz/doc/circuitikz-context.tex
2021/02/20 | 937253 | graphics/pgf/contrib/circuitikz/tex/circuitikz-1.1.2.sty
+2021/02/20 | 9308 | systems/texlive/tlnet/archive/isodoc.r57811.tar.xz
2021/02/20 | 929934 | graphics/pgf/contrib/circuitikz/tex/t-circuitikz-1.1.2.tex
+2021/02/20 | 911120 | systems/win32/w32tex/cweb-w32.tar.xz
2021/02/20 | 9109 | graphics/pgf/contrib/circuitikz/tex/pgfcircflow.tex
2021/02/20 | 8778 | systems/win32/miktex/tm/packages/miktex-md5-bin-x64-2.9.tar.lzma
-2021/02/20 | 8775 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-x64-2.9.tar.lzma
2021/02/20 | 87677 | systems/win32/miktex/tm/packages/miktex-png-bin-x64-2.9.tar.lzma
-2021/02/20 | 87674 | systems/win32/miktex/tm/packages/next/miktex-png-bin-x64-2.9.tar.lzma
-2021/02/20 | 87636 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-2.9.tar.lzma
2021/02/20 | 87602 | systems/win32/miktex/tm/packages/miktex-epstopdf-bin-2.9.tar.lzma
2021/02/20 | 8757 | graphics/pgf/contrib/circuitikz/tex/pgfcirccurrent.tex
2021/02/20 | 868528 | macros/latex/contrib/isodoc/isodoc.pdf
-2021/02/20 | 85385 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-2.9.tar.lzma
+2021/02/20 | 854052 | systems/texlive/tlnet/archive/biblatex-ext.doc.r57812.tar.xz
2021/02/20 | 84877 | systems/win32/miktex/tm/packages/miktex-bibtex8bit-bin-2.9.tar.lzma
2021/02/20 | 841461 | graphics/pgf/contrib/circuitikz/tex/circuitikz-1.0.sty
+2021/02/20 | 838216 | systems/texlive/tlnet/archive/isodoc.doc.r57811.tar.xz
2021/02/20 | 83433 | macros/latex/contrib/eq-pin2corr/examples/get-hash-string.pdf
2021/02/20 | 834142 | graphics/pgf/contrib/circuitikz/tex/t-circuitikz-1.0.tex
2021/02/20 | 8189 | macros/latex/contrib/asmeconf/README.md
2021/02/20 | 815151 | systems/win32/miktex/tm/packages/miktex-pdftex-bin-x64-2.9.tar.lzma
-2021/02/20 | 815059 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-x64-2.9.tar.lzma
2021/02/20 | 80968 | systems/win32/miktex/tm/packages/miktex-freeglut-bin-x64-2.9.tar.lzma
-2021/02/20 | 80798 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-x64-2.9.tar.lzma
-2021/02/20 | 78816 | systems/win32/miktex/tm/packages/next/miktex-png-bin-2.9.tar.lzma
+2021/02/20 | 788268 | systems/win32/w32tex/ChangeLog
2021/02/20 | 78744 | systems/win32/miktex/tm/packages/miktex-png-bin-2.9.tar.lzma
-2021/02/20 | 77878 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-x64-2.9.tar.lzma
2021/02/20 | 77833 | systems/win32/miktex/tm/packages/miktex-fonts-bin-x64-2.9.tar.lzma
-2021/02/20 | 77426 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-x64-2.9.tar.lzma
2021/02/20 | 77419 | systems/win32/miktex/tm/packages/miktex-mpmcli-bin-x64-2.9.tar.lzma
-2021/02/20 | 7740 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-2.9.tar.lzma
2021/02/20 | 7728 | systems/win32/miktex/tm/packages/miktex-md5-bin-2.9.tar.lzma
2021/02/20 | 758990 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.9.6.sty
-2021/02/20 | 75405 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-x64-2.9.tar.lzma
2021/02/20 | 75365 | systems/win32/miktex/tm/packages/miktex-bibtex-bin-x64-2.9.tar.lzma
2021/02/20 | 751663 | graphics/pgf/contrib/circuitikz/tex/t-circuitikz-0.9.6.tex
-2021/02/20 | 747986 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-2.9.tar.lzma
2021/02/20 | 743332 | systems/win32/miktex/tm/packages/miktex-pdftex-bin-2.9.tar.lzma
2021/02/20 | 74161 | systems/win32/miktex/tm/packages/miktex-lzma-bin-x64-2.9.tar.lzma
-2021/02/20 | 74141 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-x64-2.9.tar.lzma
2021/02/20 | 73324 | systems/win32/miktex/tm/packages/miktex-fonts-bin-2.9.tar.lzma
-2021/02/20 | 73176 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-2.9.tar.lzma
2021/02/20 | 72862 | systems/win32/miktex/tm/packages/miktex-graphite2-bin-x64-2.9.tar.lzma
-2021/02/20 | 72852 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-x64-2.9.tar.lzma
-2021/02/20 | 72193 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-x64-2.9.tar.lzma
2021/02/20 | 72150 | macros/latex/contrib/asmeconf/asmeconf.cls
2021/02/20 | 72144 | systems/win32/miktex/tm/packages/miktex-ps2pk-bin-x64-2.9.tar.lzma
-2021/02/20 | 71824 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-2.9.tar.lzma
2021/02/20 | 71739 | systems/win32/miktex/tm/packages/miktex-freeglut-bin-2.9.tar.lzma
2021/02/20 | 709370 | macros/latex/contrib/isodoc/isodoc.dtx
-2021/02/20 | 70349 | systems/win32/miktex/tm/packages/next/miktex-web-bin-x64-2.9.tar.lzma
2021/02/20 | 70322 | systems/win32/miktex/tm/packages/miktex-web-bin-x64-2.9.tar.lzma
-2021/02/20 | 70145 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-x64-2.9.tar.lzma
2021/02/20 | 70121 | systems/win32/miktex/tm/packages/miktex-tex4ht-bin-x64-2.9.tar.lzma
2021/02/20 | 690730 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.9.3.sty
2021/02/20 | 683433 | graphics/pgf/contrib/circuitikz/tex/t-circuitikz-0.9.3.tex
2021/02/20 | 682438 | macros/latex/contrib/eq-pin2corr.zip
-2021/02/20 | 680230 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-x64-2.9.tar.lzma
2021/02/20 | 679451 | systems/win32/miktex/tm/packages/miktex-lcdf-typetools-bin-x64-2.9.tar.lzma
-2021/02/20 | 67866 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-x64-2.9.tar.lzma
2021/02/20 | 67802 | systems/win32/miktex/tm/packages/miktex-mkfntmap-bin-x64-2.9.tar.lzma
-2021/02/20 | 67684 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-2.9.tar.lzma
2021/02/20 | 67655 | systems/win32/miktex/tm/packages/miktex-lzma-bin-2.9.tar.lzma
-2021/02/20 | 67492 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-2.9.tar.lzma
2021/02/20 | 67405 | systems/win32/miktex/tm/packages/miktex-mpmcli-bin-2.9.tar.lzma
-2021/02/20 | 67393 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-2.9.tar.lzma
2021/02/20 | 67317 | systems/win32/miktex/tm/packages/miktex-bibtex-bin-2.9.tar.lzma
+2021/02/20 | 66705596 | systems/win32/w32tex/biblatex-biber.tar.xz
2021/02/20 | 65919 | systems/win32/miktex/tm/packages/miktex-web-bin-2.9.tar.lzma
-2021/02/20 | 65851 | systems/win32/miktex/tm/packages/next/miktex-web-bin-2.9.tar.lzma
2021/02/20 | 65368 | systems/win32/miktex/tm/packages/miktex-texify-bin-x64-2.9.tar.lzma
-2021/02/20 | 65323 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-x64-2.9.tar.lzma
2021/02/20 | 64011 | systems/win32/miktex/tm/packages/miktex-ps2pk-bin-2.9.tar.lzma
-2021/02/20 | 63907 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-2.9.tar.lzma
-2021/02/20 | 63810 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-2.9.tar.lzma
+2021/02/20 | 639596 | systems/texlive/tlnet/archive/eq-pin2corr.doc.r57815.tar.xz
2021/02/20 | 638109 | macros/latex/contrib/asmeconf/asmeconf-template.pdf
2021/02/20 | 63787 | systems/win32/miktex/tm/packages/miktex-graphite2-bin-2.9.tar.lzma
-2021/02/20 | 63678 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-2.9.tar.lzma
2021/02/20 | 63657 | systems/win32/miktex/tm/packages/miktex-tex4ht-bin-2.9.tar.lzma
-2021/02/20 | 62770 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-x64-2.9.tar.lzma
2021/02/20 | 62727 | systems/win32/miktex/tm/packages/miktex-fmt-bin-x64-2.9.tar.lzma
-2021/02/20 | 62611 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-x64-2.9.tar.lzma
-2021/02/20 | 625365 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-2.9.tar.lzma
+2021/02/20 | 6268 | systems/texlive/tlnet/archive/collection-latexextra.r57815.tar.xz
2021/02/20 | 624975 | systems/win32/miktex/tm/packages/miktex-lcdf-typetools-bin-2.9.tar.lzma
2021/02/20 | 61969 | systems/win32/miktex/tm/packages/miktex-ttf2pk2-bin-x64-2.9.tar.lzma
2021/02/20 | 619048 | systems/win32/miktex/tm/packages/miktex-yap-bin-x64-2.9.tar.lzma
-2021/02/20 | 618684 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-x64-2.9.tar.lzma
2021/02/20 | 6106 | graphics/pgf/contrib/circuitikz/doc/ctikzmanutils.sty
-2021/02/20 | 60633 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-2.9.tar.lzma
2021/02/20 | 60535 | systems/win32/miktex/tm/packages/miktex-mkfntmap-bin-2.9.tar.lzma
-2021/02/20 | 59841 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-x64.tar.lzma
2021/02/20 | 59819 | systems/win32/miktex/tm/packages/miktex-tdsutil-bin-x64.tar.lzma
2021/02/20 | 596667 | systems/win32/miktex/tm/packages/miktex-libressl-bin-x64-2.9.tar.lzma
-2021/02/20 | 596447 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-x64-2.9.tar.lzma
2021/02/20 | 595 | macros/latex/contrib/eq-pin2corr/README.md
2021/02/20 | 59099 | systems/win32/miktex/tm/packages/miktex-cweb-bin-x64-2.9.tar.lzma
-2021/02/20 | 59094 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-x64-2.9.tar.lzma
-2021/02/20 | 583486 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-2.9.tar.lzma
2021/02/20 | 583164 | systems/win32/miktex/tm/packages/miktex-yap-bin-2.9.tar.lzma
-2021/02/20 | 5824379 | systems/texlive/tlnet/install-tl-unx.tar.gz
-2021/02/20 | 57596 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-x64-2.9.tar.lzma
2021/02/20 | 57557 | systems/win32/miktex/tm/packages/miktex-bibarts-bin-x64-2.9.tar.lzma
2021/02/20 | 57088 | systems/win32/miktex/tm/packages/miktex-xml2pmx-bin-x64.tar.lzma
-2021/02/20 | 57064 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin-x64.tar.lzma
-2021/02/20 | 570376 | systems/win32/miktex/tm/packages/next/files.csv.lzma
-2021/02/20 | 569814 | systems/win32/miktex/tm/packages/files.csv.lzma
2021/02/20 | 56913 | systems/win32/miktex/tm/packages/miktex-texify-bin-2.9.tar.lzma
-2021/02/20 | 56899 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-2.9.tar.lzma
2021/02/20 | 567888 | systems/win32/miktex/tm/packages/miktex-harfbuzz-bin-x64-2.9.tar.lzma
-2021/02/20 | 567267 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-x64-2.9.tar.lzma
2021/02/20 | 56650 | systems/win32/miktex/tm/packages/miktex-cjkutils-bin-x64-2.9.tar.lzma
-2021/02/20 | 56581 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-x64-2.9.tar.lzma
-2021/02/20 | 56491 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-x64-2.9.tar.lzma
2021/02/20 | 56458 | systems/win32/miktex/tm/packages/miktex-arctrl-bin-x64-2.9.tar.lzma
-2021/02/20 | 56261 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin.tar.lzma
2021/02/20 | 56241 | systems/win32/miktex/tm/packages/miktex-tdsutil-bin.tar.lzma
-2021/02/20 | 55793 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-2.9.tar.lzma
2021/02/20 | 55755 | systems/win32/miktex/tm/packages/miktex-fmt-bin-2.9.tar.lzma
-2021/02/20 | 55554 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin.tar.lzma
2021/02/20 | 55516 | systems/win32/miktex/tm/packages/miktex-xml2pmx-bin.tar.lzma
-2021/02/20 | 55204 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-2.9.tar.lzma
2021/02/20 | 55099 | systems/win32/miktex/tm/packages/miktex-ttf2pk2-bin-2.9.tar.lzma
2021/02/20 | 54038 | graphics/pgf/contrib/circuitikz/tex/pgfcircmonopoles.tex
-2021/02/20 | 532980 | macros/latex/contrib/easybook.zip
-2021/02/20 | 532135 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-2.9.tar.lzma
+2021/02/20 | 5400 | systems/texlive/tlnet/tlpkg/TeXLive/TLDownload.pm
2021/02/20 | 531519 | systems/win32/miktex/tm/packages/miktex-libressl-bin-2.9.tar.lzma
2021/02/20 | 526482 | macros/latex/contrib/acrotex/doc/aeb_man.tex
2021/02/20 | 52492 | systems/win32/miktex/tm/packages/miktex-cweb-bin-2.9.tar.lzma
-2021/02/20 | 52472 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-2.9.tar.lzma
2021/02/20 | 52425 | systems/win32/miktex/tm/packages/miktex-m-tx-bin-x64-2.9.tar.lzma
-2021/02/20 | 52415 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-x64-2.9.tar.lzma
-2021/02/20 | 51971 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-x64-2.9.tar.lzma
+2021/02/20 | 520196 | systems/texlive/tlnet/archive/easybook.doc.r57813.tar.xz
2021/02/20 | 51936 | systems/win32/miktex/tm/packages/miktex-psutils-bin-x64-2.9.tar.lzma
2021/02/20 | 51816 | systems/win32/miktex/tm/packages/miktex-synctex-bin-x64-2.9.tar.lzma
-2021/02/20 | 51808 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-x64-2.9.tar.lzma
-2021/02/20 | 51556 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-2.9.tar.lzma
+2021/02/20 | 5152 | systems/texlive/tlnet/archive/eq-pin2corr.source.r57815.tar.xz
2021/02/20 | 51374 | systems/win32/miktex/tm/packages/miktex-cjkutils-bin-2.9.tar.lzma
-2021/02/20 | 51187 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-x64-2.9.tar.lzma
2021/02/20 | 511850 | systems/win32/miktex/tm/packages/miktex-log4cxx-bin-x64-2.9.tar.lzma
2021/02/20 | 51153 | systems/win32/miktex/tm/packages/miktex-dvicopy-bin-x64-2.9.tar.lzma
-2021/02/20 | 511539 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-x64-2.9.tar.lzma
2021/02/20 | 509723 | systems/win32/miktex/doc/miktex.pdf
2021/02/20 | 50745 | systems/win32/miktex/tm/packages/miktex-arctrl-bin-2.9.tar.lzma
-2021/02/20 | 50742 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-2.9.tar.lzma
2021/02/20 | 50159 | systems/win32/miktex/tm/packages/miktex-bibarts-bin-2.9.tar.lzma
-2021/02/20 | 50125 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-2.9.tar.lzma
2021/02/20 | 4974288 | systems/texlive/tlnet/archive/newcomputermodern.r57801.tar.xz
-2021/02/20 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
2021/02/20 | 487446 | macros/latex/contrib/tasks.zip
2021/02/20 | 484408 | systems/win32/miktex/tm/packages/miktex-harfbuzz-bin-2.9.tar.lzma
-2021/02/20 | 483682 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-2.9.tar.lzma
-2021/02/20 | 47866 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-x64-2.9.tar.lzma
2021/02/20 | 47843 | systems/win32/miktex/tm/packages/miktex-expat-bin-x64-2.9.tar.lzma
2021/02/20 | 476534 | macros/latex/contrib/tasks/tasks-manual.pdf
-2021/02/20 | 475715 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-2.9.tar.lzma
2021/02/20 | 475637 | systems/win32/miktex/tm/packages/miktex-log4cxx-bin-2.9.tar.lzma
2021/02/20 | 4748 | macros/latex/contrib/acrotex/README.md
+2021/02/20 | 472076 | systems/texlive/tlnet/archive/isodoc.source.r57811.tar.xz
2021/02/20 | 470959 | macros/latex/contrib/elpres.zip
2021/02/20 | 468652 | macros/latex/contrib/embrac.zip
-2021/02/20 | 46832 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-x64-2.9.tar.lzma
2021/02/20 | 46794 | systems/win32/miktex/tm/packages/miktex-mtprint-bin-x64-2.9.tar.lzma
+2021/02/20 | 464436 | systems/texlive/tlnet/archive/embrac.doc.r57814.tar.xz
2021/02/20 | 461379 | systems/win32/miktex/tm/packages/miktex-doc.tar.lzma
-2021/02/20 | 461332 | systems/win32/miktex/tm/packages/next/miktex-doc.tar.lzma
-2021/02/20 | 45975 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-2.9.tar.lzma
2021/02/20 | 45908 | systems/win32/miktex/tm/packages/miktex-m-tx-bin-2.9.tar.lzma
2021/02/20 | 458837 | macros/latex/contrib/embrac/embrac_en.pdf
-2021/02/20 | 45647 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-2.9.tar.lzma
2021/02/20 | 45637 | systems/win32/miktex/tm/packages/miktex-dvicopy-bin-2.9.tar.lzma
-2021/02/20 | 455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
-2021/02/20 | 455 | systems/texlive/tlnet/install-tl.zip.sha512.asc
-2021/02/20 | 455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
-2021/02/20 | 455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
-2021/02/20 | 45262 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-x64-2.9.tar.lzma
2021/02/20 | 45240 | systems/win32/miktex/tm/packages/miktex-dvipng-bin-x64-2.9.tar.lzma
-2021/02/20 | 44370 | macros/latex/contrib/easybook/easybook.cls
-2021/02/20 | 43808 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-2.9.tar.lzma
+2021/02/20 | 445960 | systems/texlive/tlnet/archive/elpres.doc.r57810.tar.xz
+2021/02/20 | 440824 | systems/win32/w32tex/win64/cweb-w64.tar.xz
2021/02/20 | 43776 | systems/win32/miktex/tm/packages/miktex-psutils-bin-2.9.tar.lzma
-2021/02/20 | 43384 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-x64-2.9.tar.lzma
2021/02/20 | 43338 | systems/win32/miktex/tm/packages/miktex-zlib-bin-x64-2.9.tar.lzma
2021/02/20 | 43071 | systems/win32/miktex/tm/packages/miktex-expat-bin-2.9.tar.lzma
-2021/02/20 | 43064 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-2.9.tar.lzma
+2021/02/20 | 428876 | systems/texlive/tlnet/archive/cweb.doc.r57807.tar.xz
2021/02/20 | 42877 | systems/win32/miktex/tm/packages/miktex-mtprint-bin-2.9.tar.lzma
-2021/02/20 | 42851 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-2.9.tar.lzma
2021/02/20 | 42772 | macros/latex/contrib/asmeconf/asmeconf-template.tex
2021/02/20 | 42741 | systems/win32/miktex/tm/packages/knuth-lib.tar.lzma
-2021/02/20 | 42654 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-x64-2.9.tar.lzma
2021/02/20 | 42603 | systems/win32/miktex/tm/packages/miktex-gsf2pk-bin-x64-2.9.tar.lzma
-2021/02/20 | 42595 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-x64-2.9.tar.lzma
2021/02/20 | 42534 | systems/win32/miktex/tm/packages/miktex-mthelp-bin-x64-2.9.tar.lzma
-2021/02/20 | 42391 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-2.9.tar.lzma
2021/02/20 | 42390 | systems/win32/miktex/tm/packages/miktex-synctex-bin-2.9.tar.lzma
2021/02/20 | 422268 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.8.3.sty
2021/02/20 | 418 | graphics/pgf/contrib/circuitikz/doc/compatibility.tex
2021/02/20 | 416850 | graphics/pgf/contrib/circuitikz/tex/t-circuitikz-0.8.3.tex
-2021/02/20 | 41107 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-2.9.tar.lzma
2021/02/20 | 41055 | systems/win32/miktex/tm/packages/miktex-dvipng-bin-2.9.tar.lzma
2021/02/20 | 403539 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.7.sty
2021/02/20 | 39656 | systems/win32/miktex/tm/packages/miktex-patgen-bin-x64.tar.lzma
-2021/02/20 | 39654 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin-x64.tar.lzma
-2021/02/20 | 39538 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-2.9.tar.lzma
2021/02/20 | 394780 | graphics/pgf/contrib/circuitikz/doc/circuitikzmanual.tex
2021/02/20 | 39398 | systems/win32/miktex/tm/packages/miktex-zlib-bin-2.9.tar.lzma
2021/02/20 | 393856 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.6.sty
2021/02/20 | 392545 | systems/win32/miktex/tm/packages/miktex-cairo-bin-x64-2.9.tar.lzma
-2021/02/20 | 392429 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-x64-2.9.tar.lzma
-2021/02/20 | 388 | systems/texlive/tlnet/archive/texlive-docindex.r57794.tar.xz
+2021/02/20 | 3880 | systems/texlive/tlnet/archive/embrac.r57814.tar.xz
2021/02/20 | 3861594 | macros/latex/contrib/acrotex.zip
-2021/02/20 | 38093 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-2.9.tar.lzma
2021/02/20 | 38069 | systems/win32/miktex/tm/packages/miktex-mthelp-bin-2.9.tar.lzma
-2021/02/20 | 38048 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-2.9.tar.lzma
2021/02/20 | 38039 | systems/win32/miktex/tm/packages/miktex-gsf2pk-bin-2.9.tar.lzma
2021/02/20 | 3769 | macros/generic/xint/README.md
-2021/02/20 | 37245 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-x64-2.9.tar.lzma
-2021/02/20 | 37241 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin-x64.tar.lzma
2021/02/20 | 37233 | systems/win32/miktex/tm/packages/miktex-upmendex-bin-x64.tar.lzma
2021/02/20 | 37216 | systems/win32/miktex/tm/packages/miktex-posix-bin-x64-2.9.tar.lzma
-2021/02/20 | 36664 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-x64-2.9.tar.lzma
2021/02/20 | 36654 | systems/win32/miktex/tm/packages/miktex-chktex-bin-x64-2.9.tar.lzma
2021/02/20 | 364086 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.4.sty
2021/02/20 | 3590 | graphics/pgf/contrib/circuitikz/tex/t-circuitikz.tex
-2021/02/20 | 35457 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin.tar.lzma
2021/02/20 | 35431 | systems/win32/miktex/tm/packages/miktex-patgen-bin.tar.lzma
-2021/02/20 | 35061 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-x64-2.9.tar.lzma
2021/02/20 | 35046 | systems/win32/miktex/tm/packages/miktex-mspack-bin-x64-2.9.tar.lzma
2021/02/20 | 3495 | macros/latex/contrib/isodoc/isodoc.ins
+2021/02/20 | 3476 | systems/texlive/tlnet/archive/elpres.r57810.tar.xz
2021/02/20 | 34691 | graphics/pgf/contrib/circuitikz/tex/pgfcircvoltage.tex
2021/02/20 | 345301 | systems/win32/miktex/tm/packages/miktex-xetex-bin-x64-2.9.tar.lzma
-2021/02/20 | 345262 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-x64-2.9.tar.lzma
2021/02/20 | 344519 | graphics/pgf/contrib/circuitikz/tex/pgfcirctripoles.tex
2021/02/20 | 34299 | systems/win32/miktex/tm/packages/miktex-axohelp-bin-x64-2.9.tar.lzma
-2021/02/20 | 34297 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-x64-2.9.tar.lzma
-2021/02/20 | 33541 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin.tar.lzma
2021/02/20 | 334761 | macros/latex/contrib/eq-save.zip
2021/02/20 | 33331 | systems/win32/miktex/tm/packages/miktex-upmendex-bin.tar.lzma
-2021/02/20 | 33134 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-x64-2.9.tar.lzma
2021/02/20 | 33126 | systems/win32/miktex/tm/packages/miktex-uriparser-bin-x64-2.9.tar.lzma
-2021/02/20 | 330263 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-2.9.tar.lzma
2021/02/20 | 329912 | systems/win32/miktex/tm/packages/miktex-cairo-bin-2.9.tar.lzma
2021/02/20 | 3277 | graphics/pgf/contrib/circuitikz/README.md
2021/02/20 | 32648 | systems/win32/miktex/tm/packages/miktex-chktex-bin-2.9.tar.lzma
-2021/02/20 | 32448 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-2.9.tar.lzma
-2021/02/20 | 321919 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-x64-2.9.tar.lzma
2021/02/20 | 321693 | systems/win32/miktex/tm/packages/miktex-dvipdfmx-bin-x64-2.9.tar.lzma
2021/02/20 | 31856 | macros/latex/contrib/tasks/tasks.sty
2021/02/20 | 31564 | systems/win32/miktex/tm/packages/miktex-makeindex-bin-x64-2.9.tar.lzma
-2021/02/20 | 31553 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-2.9.tar.lzma
-2021/02/20 | 31533 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-x64-2.9.tar.lzma
2021/02/20 | 31507 | systems/win32/miktex/tm/packages/miktex-posix-bin-2.9.tar.lzma
2021/02/20 | 31335 | systems/win32/miktex/tm/packages/miktex-autosp-bin-x64-2.9.tar.lzma
-2021/02/20 | 31332 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-x64-2.9.tar.lzma
-2021/02/20 | 31229 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-2.9.tar.lzma
2021/02/20 | 31209 | systems/win32/miktex/tm/packages/miktex-mspack-bin-2.9.tar.lzma
2021/02/20 | 311165 | systems/win32/miktex/tm/packages/miktex-xetex-bin-2.9.tar.lzma
-2021/02/20 | 311096 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-2.9.tar.lzma
2021/02/20 | 3101 | graphics/pgf/contrib/circuitikz/tex/ctikzstyle-legacy.tex
2021/02/20 | 30990 | graphics/pgf/contrib/circuitikz/tex/pgfcircshapes.tex
-2021/02/20 | 30875 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-x64-2.9.tar.lzma
2021/02/20 | 30857 | systems/win32/miktex/tm/packages/miktex-bzip2-bin-x64-2.9.tar.lzma
2021/02/20 | 30336 | graphics/pgf/contrib/circuitikz/doc/changelog.tex
2021/02/20 | 30023 | systems/win32/miktex/tm/packages/miktex-lacheck-bin-x64-2.9.tar.lzma
-2021/02/20 | 30012 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-x64-2.9.tar.lzma
-2021/02/20 | 299161 | macros/latex/contrib/easybook/doc/easybook-demo.pdf
2021/02/20 | 2967 | macros/latex/contrib/eq-pin2corr/examples/qz-pin-to-correct.tex
-2021/02/20 | 295514 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-x64-2.9.tar.lzma
2021/02/20 | 295503 | systems/win32/miktex/tm/packages/miktex-freetype2-bin-x64-2.9.tar.lzma
-2021/02/20 | 29468 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-2.9.tar.lzma
2021/02/20 | 29414 | systems/win32/miktex/tm/packages/miktex-axohelp-bin-2.9.tar.lzma
2021/02/20 | 294027 | macros/latex/contrib/eq-save/docs/eqsave-man.pdf
2021/02/20 | 29047 | systems/win32/miktex/tm/packages/miktex-autosp-bin-2.9.tar.lzma
-2021/02/20 | 29037 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-2.9.tar.lzma
2021/02/20 | 29007 | graphics/pgf/contrib/circuitikz/tex/pgfcirc.defines.tex
2021/02/20 | 284046 | systems/win32/miktex/tm/packages/miktex-metapost-bin-x64-2.9.tar.lzma
-2021/02/20 | 283998 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-x64-2.9.tar.lzma
2021/02/20 | 2835955 | macros/latex/contrib/asmeconf.zip
2021/02/20 | 281635 | systems/win32/miktex/tm/packages/miktex-dvipdfmx-bin-2.9.tar.lzma
2021/02/20 | 28162 | systems/win32/miktex/tm/packages/plain.tar.lzma
-2021/02/20 | 281629 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-2.9.tar.lzma
-2021/02/20 | 28138 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-2.9.tar.lzma
2021/02/20 | 2810 | macros/latex/contrib/embrac/embrac_kerning_test.tex
2021/02/20 | 280 | graphics/pgf/contrib/circuitikz/tex/ctikzstyle-example.tex
2021/02/20 | 28056 | systems/win32/miktex/tm/packages/miktex-lacheck-bin-2.9.tar.lzma
-2021/02/20 | 28014 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-x64-2.9.tar.lzma
2021/02/20 | 27971 | systems/win32/miktex/tm/packages/miktex-findtexmf-bin-x64-2.9.tar.lzma
-2021/02/20 | 27448 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-x64-2.9.tar.lzma
2021/02/20 | 27421 | systems/win32/miktex/tm/packages/miktex-makeindex-bin-2.9.tar.lzma
2021/02/20 | 27411 | systems/win32/miktex/tm/packages/miktex-teckit-bin-x64-2.9.tar.lzma
-2021/02/20 | 27401 | macros/latex/contrib/easybook/doc/easybook.tex
-2021/02/20 | 27371 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-2.9.tar.lzma
-2021/02/20 | 27209 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-2.9.tar.lzma
-2021/02/20 | 27203 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-2.9.tar.lzma
2021/02/20 | 27184 | systems/win32/miktex/tm/packages/miktex-uriparser-bin-2.9.tar.lzma
2021/02/20 | 27174 | systems/win32/miktex/tm/packages/miktex-bzip2-bin-2.9.tar.lzma
+2021/02/20 | 26804 | systems/texlive/tlnet/archive/biblatex-ext.r57812.tar.xz
2021/02/20 | 2678 | graphics/pgf/contrib/circuitikz/tex/pgfcircutils.tex
2021/02/20 | 262181 | systems/win32/miktex/tm/packages/miktex-console-bin-x64-2.9.tar.lzma
-2021/02/20 | 262020 | systems/win32/miktex/tm/packages/next/miktex-console-bin-x64-2.9.tar.lzma
2021/02/20 | 2615932 | systems/win32/miktex/tm/packages/miktex-texworks-bin-x64-2.9.tar.lzma
-2021/02/20 | 2614820 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-x64-2.9.tar.lzma
2021/02/20 | 258668 | systems/win32/miktex/tm/packages/miktex-freetype2-bin-2.9.tar.lzma
-2021/02/20 | 258575 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-2.9.tar.lzma
2021/02/20 | 2574926 | systems/win32/miktex/tm/packages/asymptote.tar.lzma
2021/02/20 | 256673 | macros/latex/contrib/eq-pin2corr/doc/eq-pin2corr.pdf
-2021/02/20 | 25421 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-2.9.tar.lzma
2021/02/20 | 25306 | systems/win32/miktex/tm/packages/miktex-teckit-bin-2.9.tar.lzma
2021/02/20 | 2528466 | install/macros/generic/xint.tds.zip
-2021/02/20 | 2526 | macros/latex/contrib/easybook/doc/easybook-demo.tex
-2021/02/20 | 25145 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-2.9.tar.lzma
2021/02/20 | 25126 | systems/win32/miktex/tm/packages/miktex-findtexmf-bin-2.9.tar.lzma
-2021/02/20 | 250275 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-2.9.tar.lzma
2021/02/20 | 25016 | systems/win32/miktex/tm/packages/miktex-fribidixetex-bin-x64-2.9.tar.lzma
2021/02/20 | 250081 | systems/win32/miktex/tm/packages/miktex-metapost-bin-2.9.tar.lzma
-2021/02/20 | 25006 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-x64-2.9.tar.lzma
-2021/02/20 | 2497572 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-2.9.tar.lzma
2021/02/20 | 2496231 | systems/win32/miktex/tm/packages/miktex-texworks-bin-2.9.tar.lzma
-2021/02/20 | 24615087 | systems/texlive/tlnet/install-tl.zip
2021/02/20 | 245015 | macros/latex/contrib/eq-pin2corr/doc/eqpin2corrman.pdf
2021/02/20 | 2437590 | install/graphics/pgf/contrib/circuitikz.tds.zip
-2021/02/20 | 243493 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-x64-2.9.tar.lzma
2021/02/20 | 243493 | systems/win32/miktex/tm/packages/miktex-pmx-bin-x64-2.9.tar.lzma
2021/02/20 | 2428797 | macros/generic/xint.zip
2021/02/20 | 2422826 | graphics/pgf/contrib/circuitikz.zip
-2021/02/20 | 239850 | systems/win32/miktex/tm/packages/next/miktex-console-bin-2.9.tar.lzma
-2021/02/20 | 23874 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-x64-2.9.tar.lzma
2021/02/20 | 23845 | systems/win32/miktex/tm/packages/miktex-popt-bin-x64-2.9.tar.lzma
2021/02/20 | 236703 | systems/win32/miktex/tm/packages/miktex-console-bin-2.9.tar.lzma
+2021/02/20 | 23444 | systems/texlive/tlnet/archive/cweb.r57807.tar.xz
2021/02/20 | 23302 | systems/win32/miktex/tm/packages/miktex-devnag-bin-x64-2.9.tar.lzma
-2021/02/20 | 23296 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-x64-2.9.tar.lzma
-2021/02/20 | 231349 | macros/latex/contrib/easybook/doc/easybook.pdf
-2021/02/20 | 2277608 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
2021/02/20 | 226090 | graphics/pgf/contrib/circuitikz/tex/pgfcircbipoles.tex
-2021/02/20 | 22037 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-2.9.tar.lzma
+2021/02/20 | 2209888 | systems/win32/w32tex/win64/context-w64.tar.xz
2021/02/20 | 22021 | systems/win32/miktex/tm/packages/miktex-fribidixetex-bin-2.9.tar.lzma
2021/02/20 | 218848 | systems/texlive/tlnet/archive/texlive-scripts.doc.r57794.tar.xz
-2021/02/20 | 214121 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-x64-2.9.tar.lzma
+2021/02/20 | 2144 | systems/texlive/tlnet/archive/eq-pin2corr.r57815.tar.xz
2021/02/20 | 214069 | systems/win32/miktex/tm/packages/miktex-metafont-bin-x64-2.9.tar.lzma
2021/02/20 | 2117711 | macros/latex/contrib/acrotex/doc/aeb_man.pdf
-2021/02/20 | 21140 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-2.9.tar.lzma
2021/02/20 | 21119 | systems/win32/miktex/tm/packages/miktex-devnag-bin-2.9.tar.lzma
2021/02/20 | 210917 | systems/win32/miktex/tm/packages/miktex-omegaware-bin-x64-2.9.tar.lzma
-2021/02/20 | 210794 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-x64-2.9.tar.lzma
-2021/02/20 | 208338 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-2.9.tar.lzma
2021/02/20 | 208305 | systems/win32/miktex/tm/packages/miktex-pmx-bin-2.9.tar.lzma
-2021/02/20 | 207199 | systems/win32/miktex/tm/packages/miktex-zzdb1-2.9.tar.lzma
-2021/02/20 | 207163 | systems/win32/miktex/tm/packages/next/miktex-zzdb1-2.9.tar.lzma
-2021/02/20 | 202488 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-x64-2.9.tar.lzma
2021/02/20 | 202457 | systems/win32/miktex/tm/packages/miktex-pixman-bin-x64-2.9.tar.lzma
-2021/02/20 | 20116 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-2.9.tar.lzma
2021/02/20 | 20099 | systems/win32/miktex/tm/packages/miktex-popt-bin-2.9.tar.lzma
-2021/02/20 | 199611 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-2.9.tar.lzma
2021/02/20 | 199586 | systems/win32/miktex/tm/packages/miktex-mpfr-bin-2.9.tar.lzma
-2021/02/20 | 1994177 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-x64-2.9.tar.lzma
2021/02/20 | 198261 | systems/win32/miktex/tm/packages/miktex-pixman-bin-2.9.tar.lzma
-2021/02/20 | 198088 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-2.9.tar.lzma
2021/02/20 | 1968117 | systems/win32/miktex/tm/packages/miktex-luatex-bin-x64-2.9.tar.lzma
-2021/02/20 | 19657739 | systems/texlive/tlnet/install-tl-windows.exe
2021/02/20 | 19636 | macros/latex/contrib/tasks/tasks-manual.tex
2021/02/20 | 195696 | systems/win32/miktex/tm/packages/miktex-metafont-bin-2.9.tar.lzma
-2021/02/20 | 195652 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-2.9.tar.lzma
2021/02/20 | 195525 | systems/win32/miktex/tm/packages/miktex-curl-bin-x64-2.9.tar.lzma
-2021/02/20 | 195507 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-x64-2.9.tar.lzma
2021/02/20 | 193599 | systems/win32/miktex/tm/packages/miktex-omegaware-bin-2.9.tar.lzma
-2021/02/20 | 193589 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-2.9.tar.lzma
2021/02/20 | 189042 | macros/latex/contrib/acrotex/doc/eformman.tex
2021/02/20 | 1877 | graphics/pgf/contrib/circuitikz/tex/ctikzstyle-romano.tex
-2021/02/20 | 18098 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-x64-2.9.tar.lzma
+2021/02/20 | 18598 | graphics/mcf2graph/mcf_mplib_exa.tex
2021/02/20 | 18097 | systems/win32/miktex/tm/packages/miktex-tex2xindy-bin-x64-2.9.tar.lzma
-2021/02/20 | 180171 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-x64-2.9.tar.lzma
2021/02/20 | 179982 | systems/win32/miktex/tm/packages/miktex-mpfr-bin-x64-2.9.tar.lzma
-2021/02/20 | 17959 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-x64-2.9.tar.lzma
2021/02/20 | 17953 | systems/win32/miktex/tm/packages/miktex-kpathsea-bin-x64-2.9.tar.lzma
2021/02/20 | 179428 | systems/win32/miktex/tm/packages/miktex-curl-bin-2.9.tar.lzma
-2021/02/20 | 179161 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-2.9.tar.lzma
2021/02/20 | 17743 | graphics/pgf/contrib/circuitikz/doc/circuitikz-context.pdf
-2021/02/20 | 173076 | systems/texlive/tlnet/archive/texlive-docindex.doc.r57794.tar.xz
-2021/02/20 | 1717696 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-2.9.tar.lzma
2021/02/20 | 171609 | macros/latex/contrib/eq-pin2corr/examples/qz-pin-to-correct.pdf
2021/02/20 | 1715494 | systems/win32/miktex/tm/packages/miktex-luatex-bin-2.9.tar.lzma
-2021/02/20 | 17037451 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
2021/02/20 | 16896 | macros/latex/contrib/embrac/embrac.sty
-2021/02/20 | 167874 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-x64-2.9.tar.lzma
2021/02/20 | 167783 | systems/win32/miktex/tm/packages/miktex-tex-bin-x64-2.9.tar.lzma
2021/02/20 | 1671 | macros/latex/contrib/eq-pin2corr/examples/get-hash-string.tex
2021/02/20 | 1668 | macros/latex/contrib/embrac/README
@@ -402,88 +484,54 @@
2021/02/20 | 1643626 | macros/generic/xint/xint.dtx
2021/02/20 | 16404 | macros/latex/contrib/eq-pin2corr/doc/eqpin2corrman.tex
2021/02/20 | 163823 | systems/win32/miktex/tm/packages/miktex-mo-bin-x64-2.9.tar.lzma
-2021/02/20 | 163654 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-x64-2.9.tar.lzma
2021/02/20 | 16358 | systems/win32/miktex/tm/packages/miktex-tex2xindy-bin-2.9.tar.lzma
-2021/02/20 | 16325 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-2.9.tar.lzma
2021/02/20 | 16307 | systems/win32/miktex/tm/packages/miktex-kpathsea-bin-2.9.tar.lzma
-2021/02/20 | 16254 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-2.9.tar.lzma
2021/02/20 | 159953 | systems/win32/miktex/tm/packages/miktex-hunspell-bin-x64-2.9.tar.lzma
-2021/02/20 | 159811 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-x64-2.9.tar.lzma
-2021/02/20 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
-2021/02/20 | 153932 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-2.9.tar.lzma
2021/02/20 | 153911 | systems/win32/miktex/tm/packages/miktex-tex-bin-2.9.tar.lzma
-2021/02/20 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
2021/02/20 | 152886 | systems/win32/miktex/tm/packages/miktex-fontconfig-bin-x64-2.9.tar.lzma
-2021/02/20 | 152800 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-x64-2.9.tar.lzma
2021/02/20 | 14990 | macros/latex/contrib/embrac/embrac_en.tex
2021/02/20 | 147291 | systems/win32/miktex/tm/packages/miktex-hunspell-bin-2.9.tar.lzma
-2021/02/20 | 147127 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-2.9.tar.lzma
2021/02/20 | 146996 | systems/win32/miktex/tm/packages/miktex-mo-bin-2.9.tar.lzma
-2021/02/20 | 146985 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-2.9.tar.lzma
-2021/02/20 | 145 | systems/texlive/tlnet/install-tl.zip.sha512
-2021/02/20 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
2021/02/20 | 14437 | graphics/pgf/contrib/circuitikz/tex/pgfcirclabel.tex
-2021/02/20 | 14334 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-x64-2.9.tar.lzma
2021/02/20 | 14333 | systems/win32/miktex/tm/packages/miktex-zzip-bin-x64-2.9.tar.lzma
-2021/02/20 | 1424112 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-x64-2.9.tar.lzma
2021/02/20 | 1423679 | systems/win32/miktex/tm/packages/miktex-runtime-bin-x64-2.9.tar.lzma
2021/02/20 | 1422119 | systems/win32/miktex/tm/packages/miktex-dvisvgm-bin-x64-2.9.tar.lzma
-2021/02/20 | 1418732 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-x64-2.9.tar.lzma
-2021/02/20 | 136451 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-x64-2.9.tar.lzma
+2021/02/20 | 142000728 | systems/win32/w32tex/context.tar.xz
2021/02/20 | 136313 | systems/win32/miktex/tm/packages/miktex-mktex-bin-x64-2.9.tar.lzma
2021/02/20 | 1362 | macros/latex/contrib/tasks/README
-2021/02/20 | 134915 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-2.9.tar.lzma
-2021/02/20 | 13477 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-2.9.tar.lzma
2021/02/20 | 134701 | systems/win32/miktex/tm/packages/miktex-fontconfig-bin-2.9.tar.lzma
2021/02/20 | 13457 | systems/win32/miktex/tm/packages/miktex-zzip-bin-2.9.tar.lzma
2021/02/20 | 1328777 | macros/latex/contrib/isodoc.zip
2021/02/20 | 132272 | systems/texlive/tlnet/archive/texlive-scripts.r57794.tar.xz
2021/02/20 | 131476 | systems/win32/miktex/tm/packages/miktex-dvips-bin-x64-2.9.tar.lzma
-2021/02/20 | 131376 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-x64-2.9.tar.lzma
-2021/02/20 | 1305354 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-x64-2.9.tar.lzma
2021/02/20 | 1304874 | systems/win32/miktex/tm/packages/miktex-poppler-bin-x64-2.9.tar.lzma
-2021/02/20 | 1295169 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-2.9.tar.lzma
2021/02/20 | 1294777 | systems/win32/miktex/tm/packages/miktex-runtime-bin-2.9.tar.lzma
2021/02/20 | 1290008 | systems/win32/miktex/tm/packages/miktex-dvisvgm-bin-2.9.tar.lzma
-2021/02/20 | 1285120 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-2.9.tar.lzma
-2021/02/20 | 1257813 | systems/win32/miktex/tm/packages/miktex-zzdb2-2.9.tar.lzma
-2021/02/20 | 1257608 | systems/win32/miktex/tm/packages/next/miktex-zzdb2-2.9.tar.lzma
-2021/02/20 | 124944 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-2.9.tar.lzma
2021/02/20 | 124782 | systems/win32/miktex/tm/packages/miktex-mktex-bin-2.9.tar.lzma
2021/02/20 | 1243 | macros/latex/contrib/tasks/tasks.cfg
2021/02/20 | 1239 | macros/latex/contrib/eq-save/README.md
+2021/02/20 | 123791989 | macros/context/latest/cont-tmf.zip
2021/02/20 | 12348 | graphics/pgf/contrib/circuitikz/tex/circuitikz.sty
2021/02/20 | 12122 | macros/latex/contrib/eq-pin2corr/eq-pin2corr.dtx
-2021/02/20 | 1175439 | systems/win32/miktex/tm/packages/next/miktex-zzdb3-2.9.tar.lzma
-2021/02/20 | 1174769 | systems/win32/miktex/tm/packages/miktex-zzdb3-2.9.tar.lzma
2021/02/20 | 1171737 | systems/win32/miktex/tm/packages/miktex-poppler-bin-2.9.tar.lzma
-2021/02/20 | 1171601 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-2.9.tar.lzma
-2021/02/20 | 116983 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-2.9.tar.lzma
2021/02/20 | 116861 | systems/win32/miktex/tm/packages/miktex-dvips-bin-2.9.tar.lzma
-2021/02/20 | 1153 | systems/win32/miktex/tm/packages/next/pr.ini
+2021/02/20 | 11497 | graphics/mcf2graph/CHANGELOG
2021/02/20 | 114935 | graphics/pgf/contrib/circuitikz/tex/pgfcircquadpoles.tex
2021/02/20 | 114197 | systems/win32/miktex/tm/packages/miktex-gregorio-bin-x64-2.9.tar.lzma
-2021/02/20 | 114015 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-x64-2.9.tar.lzma
2021/02/20 | 113488 | macros/generic/xint/CHANGES.html
2021/02/20 | 1128438 | graphics/pgf/contrib/circuitikz/doc/circuitikzmanual.pdf
-2021/02/20 | 1127 | systems/win32/miktex/tm/packages/pr.ini
2021/02/20 | 112430 | systems/win32/miktex/tm/packages/miktex-gd-bin-x64-2.9.tar.lzma
-2021/02/20 | 112294 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-x64-2.9.tar.lzma
-2021/02/20 | 109199 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-x64-2.9.tar.lzma
2021/02/20 | 109172 | systems/win32/miktex/tm/packages/miktex-jpeg-bin-x64-2.9.tar.lzma
2021/02/20 | 1085 | macros/latex/contrib/isodoc/README.md
2021/02/20 | 1079803 | systems/win32/miktex/tm/packages/miktex-asymptote-bin-x64-2.9.tar.lzma
-2021/02/20 | 1079142 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-x64-2.9.tar.lzma
2021/02/20 | 105296 | graphics/pgf/contrib/circuitikz/tex/pgfcircmultipoles.tex
-2021/02/20 | 104764 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-x64-2.9.tar.lzma
2021/02/20 | 104740 | systems/win32/miktex/tm/packages/miktex-texware-bin-x64-2.9.tar.lzma
2021/02/20 | 103314 | systems/win32/miktex/tm/packages/miktex-lua53-bin-x64-2.9.tar.lzma
-2021/02/20 | 103270 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-x64-2.9.tar.lzma
2021/02/20 | 1026778 | macros/generic/xint/sourcexint.pdf
2021/02/20 | 1021921 | graphics/pgf/contrib/circuitikz/tex/circuitikz-1.2.7.sty
2021/02/20 | 101746 | systems/win32/miktex/tm/packages/miktex-mfware-bin-x64-2.9.tar.lzma
-2021/02/20 | 101678 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-x64-2.9.tar.lzma
2021/02/20 | 1014383 | graphics/pgf/contrib/circuitikz/tex/t-circuitikz-1.2.7.tex
+2021/02/20 | 10068 | systems/texlive/tlnet/archive/easybook.r57813.tar.xz
2021/02/20 | 1006708 | macros/generic/xint/xint.pdf
2021/02/19 | 99 | graphics/asymptote/base/asy_filetype.vim
2021/02/19 | 998 | graphics/asymptote/GUI/res/icons/chevron-with-circle-right.svg
@@ -504,6 +552,7 @@
2021/02/19 | 974 | graphics/asymptote/prc/Makefile
2021/02/19 | 973 | graphics/asymptote/examples/fequlogo.asy
2021/02/19 | 972 | graphics/asymptote/examples/triads.asy
+2021/02/19 | 96 | dviware/dvidvi/tests/playout.3
2021/02/19 | 969 | graphics/asymptote/runfile.h
2021/02/19 | 966 | graphics/asymptote/tests/array/solve.asy
2021/02/19 | 964 | graphics/asymptote/GUI/xasyTransform.py
@@ -520,12 +569,12 @@
2021/02/19 | 9328 | graphics/asymptote/doc/FAQ/bfnnconv.pl
2021/02/19 | 930 | graphics/asymptote/examples/polararea.asy
2021/02/19 | 9309 | graphics/asymptote/base/plain_paths.asy
+2021/02/19 | 92 | dviware/dvidvi/tests/playout.2
2021/02/19 | 9251 | graphics/asymptote/errors
2021/02/19 | 9243 | graphics/asymptote/glrender.h
2021/02/19 | 916 | graphics/asymptote/opcodes.h
2021/02/19 | 912 | graphics/asymptote/doc/errorbars.asy
2021/02/19 | 9126500 | fonts/newcomputermodern.zip
-2021/02/19 | 911112 | systems/win32/w32tex/cweb-w32.tar.xz
2021/02/19 | 908 | graphics/asymptote/modifier.h
2021/02/19 | 908 | graphics/asymptote/coenv.h
2021/02/19 | 908 | graphics/asymptote/base/map.asy
@@ -603,7 +652,6 @@
2021/02/19 | 790948 | systems/win32/w32tex/win64/pstoedit-w64.tar.xz
2021/02/19 | 78 | graphics/asymptote/examples/randompath3.asy
2021/02/19 | 788744 | systems/texlive/tlnet/archive/l3backend.doc.r57789.tar.xz
-2021/02/19 | 788003 | systems/win32/w32tex/ChangeLog
2021/02/19 | 78284 | systems/texlive/tlnet/archive/l3experimental.source.r57789.tar.xz
2021/02/19 | 780 | graphics/asymptote/GUI/res/icons/check.svg
2021/02/19 | 77 | graphics/asymptote/tests/gc/string.asy
@@ -707,6 +755,7 @@
2021/02/19 | 6725 | graphics/asymptote/guide.h
2021/02/19 | 66 | graphics/asymptote/examples/shade.asy
2021/02/19 | 669 | graphics/asymptote/drawpath.h
+2021/02/19 | 668 | dviware/dvidvi/dvidvi.test
2021/02/19 | 667 | graphics/asymptote/examples/spring.asy
2021/02/19 | 6675992 | systems/win32/w32tex/ptex-ng-w32.tar.xz
2021/02/19 | 66751 | graphics/asymptote/prc/writePRC.cc
@@ -835,6 +884,7 @@
2021/02/19 | 547 | graphics/asymptote/examples/tetra.asy
2021/02/19 | 5443 | graphics/asymptote/main.cc
2021/02/19 | 5441 | graphics/asymptote/env.cc
+2021/02/19 | 5406 | dviware/dvidvi/ChangeLog
2021/02/19 | 537060 | fonts/newcomputermodern/NewCMMono10-BoldOblique.otf
2021/02/19 | 5336 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tcomp.cbx
2021/02/19 | 52 | graphics/asymptote/doc/square.asy
@@ -946,7 +996,6 @@
2021/02/19 | 442 | graphics/asymptote/doc/join3.asy
2021/02/19 | 441 | graphics/asymptote/examples/triangles.asy
2021/02/19 | 441 | graphics/asymptote/doc/histogram.asy
-2021/02/19 | 440956 | systems/win32/w32tex/win64/cweb-w64.tar.xz
2021/02/19 | 43 | graphics/asymptote/examples/spring2.asy
2021/02/19 | 439 | graphics/asymptote/examples/gamma.asy
2021/02/19 | 4392 | graphics/asymptote/stm.h
@@ -1266,7 +1315,6 @@
2021/02/19 | 2222 | graphics/asymptote/tests/frames/loop.asy
2021/02/19 | 221 | fonts/newcomputermodern/NewComputerModernBook.fontspec
2021/02/19 | 221576 | fonts/newcomputermodern/NewCMMono10-Bold.otf
-2021/02/19 | 2209888 | systems/win32/w32tex/win64/context-w64.tar.xz
2021/02/19 | 219 | graphics/asymptote/doc/penimage.asy
2021/02/19 | 2194 | graphics/asymptote/locate.cc
2021/02/19 | 2193 | graphics/asymptote/GUI/pyUIClass/widg_addPolyOpt.py
@@ -1453,7 +1501,6 @@
2021/02/19 | 143 | graphics/asymptote/tests/gc/label.asy
2021/02/19 | 141 | graphics/asymptote/examples/sphere.asy
2021/02/19 | 141 | graphics/asymptote/examples/ring.asy
-2021/02/19 | 141993152 | systems/win32/w32tex/context.tar.xz
2021/02/19 | 14072 | graphics/asymptote/types.cc
2021/02/19 | 1402 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-note-common.cbx
2021/02/19 | 13980 | graphics/asymptote/arrayop.h
@@ -1533,7 +1580,6 @@
2021/02/19 | 12035 | graphics/asymptote/base/solids.asy
2021/02/19 | 12024 | graphics/asymptote/stm.cc
2021/02/19 | 119 | graphics/asymptote/fftw++asy.cc
-2021/02/19 | 119841904 | macros/context/latest/cont-tmf.zip
2021/02/19 | 1197 | graphics/asymptote/drawclipend.h
2021/02/19 | 1194 | graphics/asymptote/GUI/res/icons/code.svg
2021/02/19 | 119120 | systems/win32/miktex/tm/packages/chinese-jfm.tar.lzma
@@ -1666,7 +1712,6 @@
2021/02/18 | 6433 | macros/latex/contrib/l3kernel/l3news06.tex
2021/02/18 | 62760 | systems/texlive/tlnet/archive/langsci-affiliations.doc.r57774.tar.xz
2021/02/18 | 6267 | macros/latex/contrib/l3kernel/l3syntax-changes.tex
-2021/02/18 | 6256 | systems/texlive/tlnet/archive/collection-latexextra.r57774.tar.xz
2021/02/18 | 6231 | macros/latex/contrib/l3kernel/l3.ins
2021/02/18 | 6160884 | macros/latex/contrib/l3kernel/source3.pdf
2021/02/18 | 607244 | macros/latex/contrib/l3experimental/l3draw-code.pdf
@@ -1709,6 +1754,7 @@
2021/02/18 | 380237 | macros/latex/contrib/l3kernel/l3news.pdf
2021/02/18 | 37447 | macros/latex/contrib/l3kernel/l3prefixes.csv
2021/02/18 | 373064 | macros/latex/contrib/l3experimental/xcoffins.pdf
+2021/02/18 | 36555 | graphics/mcf2graph/mcf_exa_soc.mf
2021/02/18 | 363213 | macros/latex/contrib/l3experimental/l3graphics.pdf
2021/02/18 | 3608279 | macros/latex/contrib/lwarp.zip
2021/02/18 | 35834 | macros/latex/contrib/l3kernel/l3quark.dtx
@@ -1767,7 +1813,6 @@
2021/02/18 | 18591 | macros/latex/contrib/l3kernel/l3fp-round.dtx
2021/02/18 | 1846 | macros/latex/contrib/eq-pin2corr/eq-pin2corr.ins
2021/02/18 | 18438 | macros/latex/contrib/l3experimental/l3benchmark.dtx
-2021/02/18 | 176283 | dviware/dvidvi.zip
2021/02/18 | 1628 | macros/latex/contrib/l3experimental/xgalley.ins
2021/02/18 | 16276 | macros/latex/contrib/l3backend/l3backend-basics.dtx
2021/02/18 | 1624 | macros/latex/contrib/lwarp/README.txt
@@ -1858,14 +1903,12 @@
2021/02/17 | 18472 | macros/latex/contrib/langsci-affiliations/langsci-affiliations.dtx
2021/02/17 | 178915 | macros/latex/contrib/iodhbwm/doc/examples/bibliography/iodhbwm-biblatex-footcite.pdf
2021/02/17 | 174188 | macros/latex/contrib/iodhbwm/doc/examples/listings/iodhbwm-listings-color.pdf
-2021/02/17 | 173 | dviware/dvidvi/tests/playout.3
2021/02/17 | 1735 | macros/latex/contrib/iodhbwm/tex/i18n/english/dhbw-titlepage-sa.def
2021/02/17 | 1735 | macros/latex/contrib/iodhbwm/tex/i18n/english/dhbw-titlepage-pa.def
2021/02/17 | 1735 | macros/latex/contrib/iodhbwm/doc/examples/customizing/iodhbwm-replace-part-naming.tex
2021/02/17 | 17224 | macros/latex/contrib/iodhbwm/tex/iodhbwm.cls
2021/02/17 | 1712 | macros/latex/contrib/iodhbwm/tex/i18n/ngerman/dhbw-titlepage-pa.def
2021/02/17 | 1704 | macros/latex/contrib/iodhbwm/doc/examples/bibliography/iodhbwm-biblatex-custom-option.tex
-2021/02/17 | 169 | dviware/dvidvi/tests/playout.2
2021/02/17 | 168050 | macros/latex/contrib/iodhbwm/doc/examples/appendix/iodhbwm-appendix-auto.pdf
2021/02/17 | 167754 | macros/latex/contrib/iodhbwm/doc/examples/acronyms/iodhbwm-acro.pdf
2021/02/17 | 1643 | macros/latex/contrib/iodhbwm/doc/examples/customizing/iodhbwm-roman-numbers.tex
@@ -1899,6 +1942,7 @@
2021/02/16 | 8791732 | systems/texlive/tlnet/archive/libertinus-type1.r57754.tar.xz
2021/02/16 | 804 | systems/texlive/tlnet/archive/collection-langother.r57757.tar.xz
2021/02/16 | 7888 | systems/texlive/tlnet/archive/changes.r57756.tar.xz
+2021/02/16 | 72059 | graphics/pgf/contrib/tikzmark/tikzmark.dtx
2021/02/16 | 7180 | systems/texlive/tlnet/archive/bxpdfver.r57755.tar.xz
2021/02/16 | 707283 | macros/latex/contrib/verifiche.zip
2021/02/16 | 572942 | macros/latex/contrib/gzt.zip
@@ -1918,7 +1962,6 @@
2021/02/16 | 1480 | systems/texlive/tlnet/archive/collection-mathscience.r57759.tar.xz
2021/02/16 | 1407044 | systems/texlive/tlnet/archive/libertinus-type1.doc.r57754.tar.xz
2021/02/16 | 116496 | systems/texlive/tlnet/archive/chinese-jfm.doc.r57758.tar.xz
-2021/02/15 | 97829 | systems/doc/luatex/luatex-tex.tex
2021/02/15 | 972022 | macros/latex/contrib/numerica/numerica-basics.pdf
2021/02/15 | 9513 | macros/luatex/generic/chinese-jfm/jfm-zh_TW.lua
2021/02/15 | 93184 | macros/latex/contrib/numerica/numerica.sty
@@ -1930,7 +1973,6 @@
2021/02/15 | 7901114 | macros/latex/contrib/changes.zip
2021/02/15 | 7290 | macros/luatex/generic/chinese-jfm/jfm-ja_JP.lua
2021/02/15 | 715 | macros/luatex/generic/chinese-jfm/README.md
-2021/02/15 | 69942 | systems/doc/luatex/luatex-math.tex
2021/02/15 | 69098148 | systems/win32/w32tex/luatexja.tar.xz
2021/02/15 | 594736 | macros/latex/contrib/numerica/numerica-plus.pdf
2021/02/15 | 54756 | systems/texlive/tlnet/archive/reledmac.r57739.tar.xz
@@ -1941,16 +1983,11 @@
2021/02/15 | 4999 | macros/luatex/generic/chinese-jfm/chinese-jfm.tex
2021/02/15 | 492 | systems/unix/tex-fpc/webmac-fpc.tex
2021/02/15 | 486771 | systems/win32/miktex/tm/packages/komacv.tar.lzma
-2021/02/15 | 48312 | systems/doc/luatex/luatex-modifications.tex
-2021/02/15 | 47714 | systems/doc/luatex/luatex-enhancements.tex
2021/02/15 | 4672540 | systems/win32/miktex/tm/packages/twemojis.tar.lzma
2021/02/15 | 45465 | macros/latex/contrib/hindawi-latex-template.zip
2021/02/15 | 42257 | macros/latex/contrib/numerica/numerica-tables.def
2021/02/15 | 41796 | systems/unix/tex-fpc/tex.ch
-2021/02/15 | 3639 | systems/doc/luatex/luatex.tex
-2021/02/15 | 36260 | systems/doc/luatex/luatex-backend.tex
2021/02/15 | 3493531 | systems/win32/miktex/tm/packages/luatexja.tar.lzma
-2021/02/15 | 34333 | systems/doc/luatex/luatex-lua.tex
2021/02/15 | 32694 | macros/latex/contrib/numerica/numerica-plus.def
2021/02/15 | 3218452 | systems/texlive/tlnet/archive/luatexja.doc.r57741.tar.xz
2021/02/15 | 254612 | systems/unix/tex-fpc.zip
@@ -1969,7 +2006,6 @@
2021/02/15 | 178175 | systems/win32/miktex/tm/packages/pdfpc.tar.lzma
2021/02/15 | 1652703 | systems/win32/miktex/tm/packages/platex.tar.lzma
2021/02/15 | 1611 | macros/latex/contrib/numerica/numerica-lyx.def
-2021/02/15 | 1609366 | systems/doc/luatex/luatex.pdf
2021/02/15 | 14071 | systems/unix/tex-fpc/README
2021/02/15 | 1399 | macros/latex/contrib/hindawi-latex-template/README
2021/02/15 | 136830 | systems/win32/miktex/tm/packages/pxjahyper.tar.lzma
@@ -1982,370 +2018,3 @@
2021/02/15 | 1151 | macros/latex/contrib/numerica/README.txt
2021/02/15 | 10473259 | systems/win32/miktex/tm/packages/reledmac.tar.lzma
2021/02/15 | 10211000 | systems/texlive/tlnet/archive/reledmac.doc.r57739.tar.xz
-2021/02/14 | 99663 | macros/latex/contrib/changes/examples/changes.example.authormarkup.footnote.pdf
-2021/02/14 | 98926 | macros/latex/contrib/changes/examples/changes.example.setsummarytowidth.pdf
-2021/02/14 | 986596 | macros/latex/contrib/reledmac/reledpar.pdf
-2021/02/14 | 97975 | macros/latex/contrib/changes/examples/changes.example.listofchanges.summary.pdf
-2021/02/14 | 9791 | macros/latex/contrib/changes/changes.ins
-2021/02/14 | 97786 | macros/latex/contrib/changes/examples/changes.example.setsummarywidth.pdf
-2021/02/14 | 9765 | macros/luatex/generic/luatexja/src/addons/luatexja-ruby.sty
-2021/02/14 | 96371 | macros/latex/contrib/changes/examples/changes.example.settruncatewidth.pdf
-2021/02/14 | 94860 | macros/latex/contrib/changes/examples/changes.example.setaddedmarkup.pdf
-2021/02/14 | 94839 | macros/latex/contrib/changes/examples/changes.example.setauthormarkuptext.pdf
-2021/02/14 | 945 | macros/luatex/generic/luatexja/tool/table_ivd_aj1.lua
-2021/02/14 | 945 | macros/luatex/generic/luatexja/doc/jfm-testf.lua
-2021/02/14 | 94091 | macros/latex/contrib/changes/examples/changes.example.setdeletedmarkup.pdf
-2021/02/14 | 94058 | macros/latex/contrib/changes/examples/changes.example.setcommentmarkup.pdf
-2021/02/14 | 93929 | macros/latex/contrib/changes/examples/changes.example.sethighlightmarkup.pdf
-2021/02/14 | 93585 | macros/latex/contrib/changes/examples/changes.example.setauthormarkupposition.pdf
-2021/02/14 | 933 | macros/luatex/generic/luatexja/src/patches/lltjp-stfloats.sty
-2021/02/14 | 92919 | macros/latex/contrib/changes/examples/changes.example.simple.pdf
-2021/02/14 | 91 | macros/latex/contrib/changes/userdoc/comment_ex.tex
-2021/02/14 | 896 | macros/luatex/generic/luatexja/tool/otf-KozMinPr6N-Regular.txt
-2021/02/14 | 89121 | macros/latex/contrib/changes/examples/changes.example.listofchanges.show.pdf
-2021/02/14 | 890028 | macros/latex/contrib/reledmac/reledmac.dtx
-2021/02/14 | 88820 | macros/latex/contrib/changes/examples/changes.example.listofchanges.all.pdf
-2021/02/14 | 88402 | macros/latex/contrib/changes/examples/changes.example.deletedmarkup.uuline.pdf
-2021/02/14 | 88388 | macros/latex/contrib/changes/examples/changes.example.listofchanges.title.pdf
-2021/02/14 | 872964 | systems/texlive/tlnet/archive/beebe.r57723.tar.xz
-2021/02/14 | 86749 | macros/latex/contrib/changes/examples/changes.example.listofchanges.compactsummary.pdf
-2021/02/14 | 8609 | macros/luatex/generic/luatexja/src/ltj-otf.lua
-2021/02/14 | 8607 | macros/luatex/generic/luatexja/src/ltjltxdoc.dtx
-2021/02/14 | 86058 | macros/latex/contrib/changes/examples/changes.example.markup.bfit.pdf
-2021/02/14 | 85486 | macros/latex/contrib/changes/examples/changes.example.addedmarkup.bf.pdf
-2021/02/14 | 85414 | macros/latex/contrib/changes/examples/changes.example.setauthormarkup.pdf
-2021/02/14 | 85371 | macros/latex/contrib/changes/examples/changes.example.addedmarkup.uuline.pdf
-2021/02/14 | 85110 | macros/latex/contrib/changes/examples/changes.example.deletedmarkup.sl.pdf
-2021/02/14 | 84993 | macros/latex/contrib/changes/examples/changes.example.listofchanges.wrong.pdf
-2021/02/14 | 84993 | macros/latex/contrib/changes/examples/changes.example.listofchanges.list.pdf
-2021/02/14 | 84982 | macros/latex/contrib/changes/examples/changes.example.deletedmarkup.bf.pdf
-2021/02/14 | 84812 | macros/latex/contrib/changes/examples/changes.example.markup.underlined.pdf
-2021/02/14 | 84759 | macros/latex/contrib/changes/examples/changes.example.addedmarkup.uwave.pdf
-2021/02/14 | 84735 | macros/latex/contrib/changes/examples/changes.example.addedmarkup.sl.pdf
-2021/02/14 | 84681 | macros/latex/contrib/changes/examples/changes.example.markup.nocolor.pdf
-2021/02/14 | 84357 | macros/latex/contrib/changes/examples/changes.example.highlightmarkup.uwave.pdf
-2021/02/14 | 84182 | macros/latex/contrib/changes/examples/changes.example.packageoptions.xcolor.pdf
-2021/02/14 | 83 | macros/latex/contrib/changes/userdoc/setauthormarkup_ex.tex
-2021/02/14 | 83877 | macros/latex/contrib/changes/examples/changes.example.deletedmarkup.uwave.pdf
-2021/02/14 | 83846 | macros/latex/contrib/changes/examples/changes.example.authormarkuptext.name.pdf
-2021/02/14 | 83749 | macros/latex/contrib/changes/examples/changes.example.addedmarkup.it.pdf
-2021/02/14 | 83749 | macros/latex/contrib/changes/examples/changes.example.addedmarkup.em.pdf
-2021/02/14 | 83517 | macros/latex/contrib/changes/examples/changes.example.packageoptions.truncate.pdf
-2021/02/14 | 82 | macros/latex/contrib/changes/userdoc/usepackage_ulem_changes_ex.tex
-2021/02/14 | 82970 | macros/latex/contrib/changes/examples/changes.example.highlightmarkup.uuline.pdf
-2021/02/14 | 82935 | macros/latex/contrib/changes/examples/changes.example.addedmarkup.dashuline.pdf
-2021/02/14 | 82891 | macros/latex/contrib/changes/examples/changes.example.deletedmarkup.it.pdf
-2021/02/14 | 82891 | macros/latex/contrib/changes/examples/changes.example.deletedmarkup.em.pdf
-2021/02/14 | 82746 | macros/latex/contrib/changes/examples/changes.example.addedmarkup.uline.pdf
-2021/02/14 | 825 | macros/luatex/generic/luatexja/src/patches/lltjp-collcell.sty
-2021/02/14 | 82590 | macros/latex/contrib/changes/examples/changes.example.deletedmarkup.dashuline.pdf
-2021/02/14 | 82553 | macros/latex/contrib/changes/examples/changes.example.addedmarkup.dotuline.pdf
-2021/02/14 | 82299 | macros/latex/contrib/changes/examples/changes.example.defaultcolor.pdf
-2021/02/14 | 82295 | macros/latex/contrib/changes/examples/changes.example.setsocextension.pdf
-2021/02/14 | 82295 | macros/latex/contrib/changes/examples/changes.example.markup.wrong.pdf
-2021/02/14 | 82295 | macros/latex/contrib/changes/examples/changes.example.markup.default.pdf
-2021/02/14 | 82295 | macros/latex/contrib/changes/examples/changes.example.highlightmarkup.background.pdf
-2021/02/14 | 82295 | macros/latex/contrib/changes/examples/changes.example.draft.pdf
-2021/02/14 | 82295 | macros/latex/contrib/changes/examples/changes.example.deletedmarkup.wrong.pdf
-2021/02/14 | 82295 | macros/latex/contrib/changes/examples/changes.example.deletedmarkup.sout.pdf
-2021/02/14 | 82295 | macros/latex/contrib/changes/examples/changes.example.commentmarkup.todo.pdf
-2021/02/14 | 82295 | macros/latex/contrib/changes/examples/changes.example.commandnameprefix.wrong.pdf
-2021/02/14 | 82295 | macros/latex/contrib/changes/examples/changes.example.commandnameprefix.none.pdf
-2021/02/14 | 82295 | macros/latex/contrib/changes/examples/changes.example.commandnameprefix.ifneeded.pdf
-2021/02/14 | 82295 | macros/latex/contrib/changes/examples/changes.example.commandnameprefix.always.pdf
-2021/02/14 | 82295 | macros/latex/contrib/changes/examples/changes.example.authormarkup.wrong.pdf
-2021/02/14 | 82295 | macros/latex/contrib/changes/examples/changes.example.authormarkuptext.wrong.pdf
-2021/02/14 | 82295 | macros/latex/contrib/changes/examples/changes.example.authormarkuptext.id.pdf
-2021/02/14 | 82295 | macros/latex/contrib/changes/examples/changes.example.authormarkup.superscript.pdf
-2021/02/14 | 82295 | macros/latex/contrib/changes/examples/changes.example.authormarkupposition.wrong.pdf
-2021/02/14 | 82295 | macros/latex/contrib/changes/examples/changes.example.authormarkupposition.right.pdf
-2021/02/14 | 82295 | macros/latex/contrib/changes/examples/changes.example.authormarkupposition.left.pdf
-2021/02/14 | 82295 | macros/latex/contrib/changes/examples/changes.example.addedmarkup.wrong.pdf
-2021/02/14 | 82295 | macros/latex/contrib/changes/examples/changes.example.addedmarkup.colored.pdf
-2021/02/14 | 82294 | macros/latex/contrib/changes/examples/changes.example.authormarkup.subscript.pdf
-2021/02/14 | 82291 | macros/latex/contrib/changes/examples/changes.example.deletedmarkup.uline.pdf
-2021/02/14 | 81965 | macros/latex/contrib/changes/examples/changes.example.commentmarkup.uwave.pdf
-2021/02/14 | 8192 | systems/texlive/tlnet/archive/babel-japanese.source.r57733.tar.xz
-2021/02/14 | 8188 | systems/texlive/tlnet/archive/platex-tools.r57729.tar.xz
-2021/02/14 | 81687 | macros/latex/contrib/changes/examples/changes.example.deletedmarkup.dotuline.pdf
-2021/02/14 | 81521 | macros/latex/contrib/changes/examples/changes.example.deletedmarkup.xout.pdf
-2021/02/14 | 8136 | macros/luatex/generic/luatexja/src/ltj-base.sty
-2021/02/14 | 81125 | macros/latex/contrib/changes/examples/changes.example.deletedmarkup.colored.pdf
-2021/02/14 | 8106 | macros/luatex/generic/luatexja/src/jfm-min.lua
-2021/02/14 | 79 | macros/latex/contrib/changes/userdoc/usepackage_xcolor_changes_ex.tex
-2021/02/14 | 78953 | macros/latex/contrib/changes/examples/changes.example.commentmarkup.margin.pdf
-2021/02/14 | 7790 | macros/luatex/generic/luatexja/tool/jfm-convert.lua
-2021/02/14 | 7661 | macros/luatex/generic/luatexja/src/ltj-unicode-ccfix.lua
-2021/02/14 | 75270 | macros/latex/contrib/changes/examples/changes.example.packageoptions.ulem.pdf
-2021/02/14 | 748319 | install/macros/latex/contrib/gzt.tds.zip
-2021/02/14 | 74370 | macros/latex/contrib/changes/examples/changes.example.authormarkup.brackets.pdf
-2021/02/14 | 73913 | macros/latex/contrib/changes/examples/changes.example.authormarkup.none.pdf
-2021/02/14 | 7370 | macros/luatex/generic/luatexja/src/ltj-math.lua
-2021/02/14 | 7026 | macros/luatex/generic/luatexja/src/ltj-pretreat.lua
-2021/02/14 | 700774 | macros/luatex/generic/luatexja/doc/luatexja-en.pdf
-2021/02/14 | 6956 | systems/texlive/tlnet/archive/plautopatch.r57731.tar.xz
-2021/02/14 | 69366 | macros/luatex/generic/luatexja/doc/ltjltxdoc.pdf
-2021/02/14 | 6891 | macros/luatex/generic/luatexja/src/addons/luatexja-otf.sty
-2021/02/14 | 68141 | macros/latex/contrib/changes/examples/changes.example.final.pdf
-2021/02/14 | 6761 | fonts/libertinus-type1/latex/libertinus-type1.sty
-2021/02/14 | 66 | macros/latex/contrib/changes/userdoc/usepackage_authormarkupposition_changes_in.tex
-2021/02/14 | 659 | macros/latex/contrib/gzt/README.md
-2021/02/14 | 6497 | macros/luatex/generic/luatexja/src/patches/lltjdefs.sty
-2021/02/14 | 63 | macros/latex/contrib/changes/userdoc/setauthormarkupposition_ex.tex
-2021/02/14 | 6312 | systems/texlive/tlnet/archive/aalok.r57728.tar.xz
-2021/02/14 | 62 | macros/latex/contrib/changes/userdoc/replaced_in.tex
-2021/02/14 | 617 | macros/luatex/generic/luatexja/src/patches/lltjp-array.sty
-2021/02/14 | 6060 | macros/luatex/generic/luatexja/tool/kyoikukanjiChars.tex
-2021/02/14 | 5951 | macros/latex/contrib/bxpdfver/README-ja.md
-2021/02/14 | 5940 | macros/luatex/generic/luatexja/src/ltj-lotf_aux.lua
-2021/02/14 | 58 | macros/latex/contrib/changes/userdoc/usepackage_authormarkuptext_changes_in.tex
-2021/02/14 | 58 | macros/latex/contrib/changes/userdoc/listofchanges_in.tex
-2021/02/14 | 5850 | macros/luatex/generic/luatexja/src/patches/lltjp-fontspec.sty
-2021/02/14 | 580 | macros/luatex/generic/luatexja/tool/blocks2defcharrange.rb
-2021/02/14 | 57954 | macros/latex/contrib/changes/changes.dtx
-2021/02/14 | 573912 | systems/texlive/tlnet/archive/platex-tools.doc.r57729.tar.xz
-2021/02/14 | 56 | macros/latex/contrib/changes/userdoc/usepackage_highlightmarkup_changes_in.tex
-2021/02/14 | 56 | macros/latex/contrib/changes/userdoc/setlocextension_ex.tex
-2021/02/14 | 56 | macros/latex/contrib/changes/userdoc/setdeletedmarkup_ex.tex
-2021/02/14 | 5682 | macros/luatex/generic/luatexja/src/patches/lltjp-tascmac.sty
-2021/02/14 | 55 | macros/latex/contrib/changes/userdoc/settruncatewidth_ex.tex
-2021/02/14 | 55 | macros/latex/contrib/changes/userdoc/definechangesauthor_in.tex
-2021/02/14 | 55333 | macros/luatex/generic/luatexja/src/ltj-jfmglue.lua
-2021/02/14 | 551 | macros/luatex/generic/luatexja/tool/jfm-readable.rb
-2021/02/14 | 54427 | macros/luatex/generic/luatexja/src/ltj-jisx0208.lua
-2021/02/14 | 53 | macros/latex/contrib/changes/userdoc/setsummarywidth_ex.tex
-2021/02/14 | 530231 | macros/luatex/generic/luatexja/doc/luatexja.dtx
-2021/02/14 | 52 | macros/latex/contrib/changes/userdoc/usepackage_deletedmarkup_changes_in.tex
-2021/02/14 | 52 | macros/latex/contrib/changes/userdoc/usepackage_commentmarkup_changes_in.tex
-2021/02/14 | 52 | macros/latex/contrib/changes/userdoc/setauthormarkuptext_ex.tex
-2021/02/14 | 52 | macros/latex/contrib/changes/userdoc/setaddedmarkup_ex.tex
-2021/02/14 | 528662 | macros/latex/contrib/gzt/doc/gzt-fr.pdf
-2021/02/14 | 52254 | macros/latex/contrib/shtthesis/shtthesis-user-guide.tex
-2021/02/14 | 5222 | macros/luatex/generic/luatexja/src/ltj-debug.lua
-2021/02/14 | 51 | macros/latex/contrib/changes/userdoc/usepackage_draft_changes_in.tex
-2021/02/14 | 51 | macros/latex/contrib/changes/userdoc/usepackage_commandnameprefix_changes_in.tex
-2021/02/14 | 51944 | macros/luatex/generic/luatexja/doc/luatexja-ruby.tex
-2021/02/14 | 51942 | macros/latex/contrib/shtthesis/shtthesis.cls
-2021/02/14 | 518004 | systems/texlive/tlnet/archive/babel-japanese.doc.r57733.tar.xz
-2021/02/14 | 514220 | systems/texlive/tlnet/archive/easybook.doc.r57734.tar.xz
-2021/02/14 | 50 | macros/latex/contrib/changes/userdoc/usepackage_authormarkup_changes_in.tex
-2021/02/14 | 5030 | macros/latex/contrib/changes/example-screenshot.dtx
-2021/02/14 | 49 | macros/latex/contrib/changes/userdoc/setauthormarkupposition_in.tex
-2021/02/14 | 49 | macros/latex/contrib/changes/userdoc/deleted_in.tex
-2021/02/14 | 49052 | macros/luatex/generic/luatexja/src/patches/lltjfont.sty
-2021/02/14 | 48 | macros/latex/contrib/changes/userdoc/usepackage_todonotes_changes_ex.tex
-2021/02/14 | 48 | macros/latex/contrib/changes/userdoc/usepackage_addedmarkup_changes_in.tex
-2021/02/14 | 48 | macros/latex/contrib/changes/userdoc/setsocextension_ex.tex
-2021/02/14 | 4888 | macros/latex/contrib/changes/changes.drv
-2021/02/14 | 4871 | macros/luatex/generic/luatexja/src/ltj-stack.lua
-2021/02/14 | 48217 | macros/luatex/generic/luatexja/src/ltj-jfont.lua
-2021/02/14 | 4808 | macros/luatex/generic/luatexja/src/jfm-tmin.lua
-2021/02/14 | 47 | macros/latex/contrib/changes/userdoc/highlight_in.tex
-2021/02/14 | 47 | macros/latex/contrib/changes/userdoc/added_in.tex
-2021/02/14 | 457434 | macros/luatex/generic/luatexja/doc/ltjsclasses.pdf
-2021/02/14 | 4559 | macros/luatex/generic/luatexja/src/addons/luatexja-adjust.sty
-2021/02/14 | 4525 | macros/latex/contrib/bxpdfver/README.md
-2021/02/14 | 451472 | macros/latex/contrib/changes/changes.english.withcode.pdf
-2021/02/14 | 4452 | macros/luatex/generic/luatexja/doc/jfm-ujisc33.lua
-2021/02/14 | 4438 | fonts/libertinus-type1/doc/libertinus-samples.tex
-2021/02/14 | 43 | macros/latex/contrib/changes/userdoc/usepackage_defaultcolor_changes_in.tex
-2021/02/14 | 42 | macros/latex/contrib/changes/userdoc/usepackage_todonotes_changes_in.tex
-2021/02/14 | 4262 | macros/luatex/generic/luatexja/tool/kyoikukanji.txt
-2021/02/14 | 41 | macros/latex/contrib/changes/userdoc/usepackage_truncate_changes_in.tex
-2021/02/14 | 41 | macros/latex/contrib/changes/userdoc/usepackage_truncate_changes_ex.tex
-2021/02/14 | 41 | macros/latex/contrib/changes/userdoc/setauthormarkuptext_in.tex
-2021/02/14 | 41468 | systems/texlive/tlnet/archive/platex.r57730.tar.xz
-2021/02/14 | 41404 | macros/latex/contrib/changes/userdoc/changes.de.tex
-2021/02/14 | 405 | macros/luatex/generic/luatexja/src/patches/lltjp-everyshi.sty
-2021/02/14 | 400691 | macros/luatex/generic/luatexja/doc/ltjclasses.pdf
-2021/02/14 | 39 | macros/latex/contrib/changes/userdoc/usepackage_xcolor_changes_in.tex
-2021/02/14 | 3998 | macros/luatex/generic/luatexja/src/ltj-plain.sty
-2021/02/14 | 39902 | macros/luatex/generic/luatexja/src/ltj-direction.lua
-2021/02/14 | 3961 | macros/luatex/generic/luatexja/src/ltj-charrange.lua
-2021/02/14 | 3922 | macros/luatex/generic/luatexja/README
-2021/02/14 | 38 | macros/latex/contrib/changes/userdoc/usepackage_markup_changes_in.tex
-2021/02/14 | 38 | macros/latex/contrib/changes/userdoc/path_doc_examples_in.tex
-2021/02/14 | 385 | macros/luatex/generic/luatexja/src/ltjsclasses.ins
-2021/02/14 | 382321 | macros/luatex/generic/luatexja/doc/luatexja-ruby.pdf
-2021/02/14 | 37 | macros/latex/contrib/changes/userdoc/usepackage_ulem_changes_in.tex
-2021/02/14 | 3795080 | macros/luatex/generic/luatexja.zip
-2021/02/14 | 37818 | macros/latex/contrib/changes/userdoc/changes.en.tex
-2021/02/14 | 376378 | macros/latex/contrib/changes/changes.ngerman.pdf
-2021/02/14 | 3755 | macros/luatex/generic/luatexja/src/ltj-lineskip.lua
-2021/02/14 | 3748 | macros/luatex/generic/luatexja/src/ltj-compat.lua
-2021/02/14 | 368646 | macros/latex/contrib/changes/changes.english.pdf
-2021/02/14 | 357853 | macros/latex/contrib/reledmac/migration.pdf
-2021/02/14 | 3570 | macros/latex/contrib/shtthesis/README.md
-2021/02/14 | 355 | macros/luatex/generic/luatexja/tool/otf-AdobeMingStd-Light.txt
-2021/02/14 | 355 | macros/luatex/generic/luatexja/doc/luatexja.ins
-2021/02/14 | 3542 | macros/luatex/generic/luatexja/src/patches/lltjp-atbegshi.sty
-2021/02/14 | 35182 | macros/latex/contrib/shtthesis/LICENSE
-2021/02/14 | 34 | macros/latex/contrib/changes/userdoc/sethighlightmarkup_in.tex
-2021/02/14 | 3451 | macros/luatex/generic/luatexja/src/luatexja-compat.sty
-2021/02/14 | 3371 | macros/luatex/generic/luatexja/src/patches/lltjp-xunicode.sty
-2021/02/14 | 33461 | macros/luatex/generic/luatexja/src/addons/luatexja-ajmacros.sty
-2021/02/14 | 3326 | macros/luatex/generic/luatexja/src/ltj-latex.sty
-2021/02/14 | 3313 | macros/luatex/generic/luatexja/tool/ltj-unicode-ccfix_make2.pl
-2021/02/14 | 32 | macros/latex/contrib/changes/userdoc/usepackage_options_changes_in.tex
-2021/02/14 | 32 | macros/latex/contrib/changes/userdoc/setdeletedmarkup_in.tex
-2021/02/14 | 32 | macros/latex/contrib/changes/userdoc/setcommentmarkup_in.tex
-2021/02/14 | 326 | macros/luatex/generic/luatexja/tool/otf-AdobeMyungjoStd-Medium.txt
-2021/02/14 | 3238 | macros/luatex/generic/luatexja/doc/jfm-test.lua
-2021/02/14 | 32061 | macros/luatex/generic/luatexja/src/ltj-ruby.lua
-2021/02/14 | 32053 | macros/latex/contrib/reledmac/examples/3-reledpar_pages_different_languages_lualatex.pdf
-2021/02/14 | 31 | macros/latex/contrib/changes/userdoc/setauthormarkup_in.tex
-2021/02/14 | 317 | macros/luatex/generic/luatexja/tool/otf-AdobeSongStd-Light.txt
-2021/02/14 | 31051 | macros/latex/contrib/reledmac/examples/2-reledmac-right-to-left.pdf
-2021/02/14 | 3100 | macros/luatex/generic/luatexja/tool/table_jisx0208.tex
-2021/02/14 | 30 | macros/latex/contrib/changes/userdoc/setsocextension_in.tex
-2021/02/14 | 30 | macros/latex/contrib/changes/userdoc/setlocextension_in.tex
-2021/02/14 | 30 | macros/latex/contrib/changes/userdoc/setaddedmarkup_in.tex
-2021/02/14 | 3085 | fonts/libertinus-type1/README
-2021/02/14 | 304585 | macros/latex/contrib/reledmac/examples/2-subdivision-number-in-header.pdf
-2021/02/14 | 29 | macros/latex/contrib/changes/userdoc/comment_in.tex
-2021/02/14 | 2997 | macros/luatex/generic/luatexja/src/patches/lltjp-siunitx.sty
-2021/02/14 | 29741 | macros/latex/contrib/bxpdfver/bxpdfver.sty
-2021/02/14 | 297242 | macros/latex/contrib/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.pdf
-2021/02/14 | 292929 | macros/latex/contrib/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.pdf
-2021/02/14 | 29181 | macros/luatex/generic/luatexja/src/addons/luatexja-preset.sty
-2021/02/14 | 291128 | macros/latex/contrib/reledmac/examples/1-sidenotes.pdf
-2021/02/14 | 28 | macros/latex/contrib/changes/userdoc/usepackage_final_changes_in.tex
-2021/02/14 | 289371 | macros/latex/contrib/reledmac/examples/2-line_numbers_in_header.pdf
-2021/02/14 | 28900 | macros/luatex/generic/luatexja/src/luatexja-core.sty
-2021/02/14 | 285213 | macros/latex/contrib/reledmac/examples/2-manuscript-apparatus.pdf
-2021/02/14 | 284700 | macros/latex/contrib/reledmac/examples/3-reledpar_same_page_number_in_both_side.pdf
-2021/02/14 | 284597 | macros/latex/contrib/reledmac/examples/2-linespacing.pdf
-2021/02/14 | 283465 | macros/latex/contrib/reledmac/examples/2-titles_in_line_numbering_with_notes.pdf
-2021/02/14 | 2826912 | systems/win32/w32tex/platex.tar.xz
-2021/02/14 | 281520 | macros/latex/contrib/reledmac/examples/2-performances.pdf
-2021/02/14 | 280887 | macros/latex/contrib/reledmac/examples/1-tabular.pdf
-2021/02/14 | 280642 | macros/latex/contrib/reledmac/examples/2-glossaries.pdf
-2021/02/14 | 27 | macros/latex/contrib/changes/userdoc/settruncatewidth_in.tex
-2021/02/14 | 27 | macros/latex/contrib/changes/userdoc/setsummarytowidth_in.tex
-2021/02/14 | 27 | macros/latex/contrib/changes/userdoc/path_script_in.tex
-2021/02/14 | 279716 | macros/latex/contrib/reledmac/examples/2-indexing.pdf
-2021/02/14 | 273887 | macros/latex/contrib/reledmac/examples/2-lemma_disambigution.pdf
-2021/02/14 | 26 | macros/latex/contrib/changes/userdoc/setsummarywidth_in.tex
-2021/02/14 | 26765 | macros/luatex/generic/luatexja/src/lltjext.sty
-2021/02/14 | 2601 | macros/luatex/generic/luatexja/src/jfm-banjiao.lua
-2021/02/14 | 25 | macros/latex/contrib/changes/userdoc/script_pymergechanges_empty.tex
-2021/02/14 | 2586 | macros/luatex/generic/luatexja/src/jfm-kaiming.lua
-2021/02/14 | 2575 | macros/luatex/generic/luatexja/src/jfm-quanjiao.lua
-2021/02/14 | 254 | macros/latex/contrib/changes/userdoc/listofchanges_ex.tex
-2021/02/14 | 246187 | macros/latex/contrib/reledmac/examples/4-reledpar_pages_long_notes.pdf
-2021/02/14 | 2428 | systems/texlive/tlnet/archive/babel-japanese.r57733.tar.xz
-2021/02/14 | 2374 | macros/luatex/generic/luatexja/src/patches/lltjp-unicode-math.sty
-2021/02/14 | 2342 | macros/luatex/generic/luatexja/src/jfm-jis.lua
-2021/02/14 | 23264 | macros/latex/contrib/reledmac/examples/3-reledpar_columns_different_languages.pdf
-2021/02/14 | 229 | macros/latex/contrib/changes/userdoc/script_pymergechanges.tex
-2021/02/14 | 226528 | macros/latex/contrib/gzt/source/gzt.dtx
-2021/02/14 | 2252 | systems/texlive/tlnet/archive/pdfpc.r57735.tar.xz
-2021/02/14 | 224 | macros/latex/contrib/changes/userdoc/replaced_ex.tex
-2021/02/14 | 223 | macros/latex/contrib/changes/userdoc/highlight_ex.tex
-2021/02/14 | 221533 | macros/latex/contrib/reledmac/examples/4-reledpar_one_series_per_pstart.pdf
-2021/02/14 | 2208396 | macros/latex/contrib/shtthesis.zip
-2021/02/14 | 2207 | macros/luatex/generic/luatexja/src/jfm-CCT.lua
-2021/02/14 | 21 | macros/latex/contrib/changes/userdoc/usepackage_changes_in.tex
-2021/02/14 | 2193 | macros/luatex/generic/luatexja/src/addons/luatexja-zhfonts.sty
-2021/02/14 | 2173716 | macros/latex/contrib/shtthesis/shtthesis-user-guide.pdf
-2021/02/14 | 216 | macros/latex/contrib/changes/userdoc/setcommentmarkup_ex.tex
-2021/02/14 | 21234 | macros/luatex/generic/luatexja/src/luatexja.lua
-2021/02/14 | 209918 | macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.pdf
-2021/02/14 | 208856 | macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column.pdf
-2021/02/14 | 208585 | macros/latex/contrib/reledmac/examples/2-one_series_per_pstart.pdf
-2021/02/14 | 2057 | macros/luatex/generic/luatexja/src/patches/lltjp-microtype.sty
-2021/02/14 | 205371 | macros/latex/contrib/reledmac/examples/2-antilabe.pdf
-2021/02/14 | 203241 | macros/latex/contrib/reledmac/examples/4-reledpar_titles_not_in_line_numbering.pdf
-2021/02/14 | 202991 | macros/latex/contrib/reledmac/examples/2-notes-width.pdf
-2021/02/14 | 2024050 | macros/latex/contrib/reledmac/reledmac.pdf
-2021/02/14 | 201188 | macros/latex/contrib/reledmac/examples/4-reledpar_columns_alignment.pdf
-2021/02/14 | 200 | macros/luatex/generic/luatexja/src/jfm-prop.lua
-2021/02/14 | 200801 | macros/latex/contrib/reledmac/examples/4-reledpar_pages_notes_leftpage.pdf
-2021/02/14 | 200260 | macros/latex/contrib/reledmac/examples/4-reledpar_inside-outside-columns.pdf
-2021/02/14 | 199696 | macros/latex/contrib/reledmac/examples/2-footnote_spacing.pdf
-2021/02/14 | 197414 | macros/latex/contrib/reledmac/examples/1-verses-doublenumbering.pdf
-2021/02/14 | 197373 | macros/latex/contrib/reledmac/examples/1-criticalendnotes.pdf
-2021/02/14 | 197363 | macros/latex/contrib/reledmac/examples/1-verses.pdf
-2021/02/14 | 196 | macros/luatex/generic/luatexja/src/jfm-propw.lua
-2021/02/14 | 196 | macros/luatex/generic/luatexja/src/jfm-propv.lua
-2021/02/14 | 196882 | macros/latex/contrib/reledmac/examples/4-reledpar_pages_paragraph_separator_between.pdf
-2021/02/14 | 196250 | macros/latex/contrib/reledmac/examples/2-cross_referencing.pdf
-2021/02/14 | 196014 | macros/latex/contrib/reledmac/examples/2-titles_not_in_line_numbering.pdf
-2021/02/14 | 19572 | macros/luatex/generic/luatexja/src/ltj-adjust.lua
-2021/02/14 | 195586 | macros/latex/contrib/reledmac/examples/1-criticalnotes.pdf
-2021/02/14 | 192 | macros/luatex/generic/luatexja/src/jfm-mono.lua
-2021/02/14 | 192355 | macros/latex/contrib/reledmac/examples/4-reledpar_verse_text_between.pdf
-2021/02/14 | 190058 | macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted-nomax.pdf
-2021/02/14 | 189 | macros/luatex/generic/luatexja/src/patches/lltjp-preview.sty
-2021/02/14 | 189692 | macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax-shifted.pdf
-2021/02/14 | 189290 | macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted.pdf
-2021/02/14 | 188942 | macros/luatex/generic/luatexja/src/ltjsclasses.dtx
-2021/02/14 | 188809 | macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_shifted.pdf
-2021/02/14 | 188675 | macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nosync.pdf
-2021/02/14 | 188622 | macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax.pdf
-2021/02/14 | 186892 | systems/texlive/tlnet/archive/aalok.doc.r57728.tar.xz
-2021/02/14 | 18636 | macros/luatex/generic/luatexja/src/ltj-kinsoku.tex
-2021/02/14 | 18543 | macros/luatex/generic/luatexja/src/patches/lltjp-geometry.sty
-2021/02/14 | 18448 | systems/texlive/tlnet/archive/aalok.source.r57728.tar.xz
-2021/02/14 | 1832 | macros/luatex/generic/luatexja/src/luatexja.sty
-2021/02/14 | 182 | macros/latex/contrib/gzt/doc/README-TRANSLATION.md
-2021/02/14 | 182 | macros/latex/contrib/changes/userdoc/added_ex.tex
-2021/02/14 | 1786 | macros/luatex/generic/luatexja/src/ltj-inputbuf.lua
-2021/02/14 | 177 | macros/latex/contrib/changes/userdoc/deleted_ex.tex
-2021/02/14 | 177581 | macros/luatex/generic/luatexja/src/ltjclasses.dtx
-2021/02/14 | 175708 | systems/texlive/tlnet/archive/pdfpc.doc.r57735.tar.xz
-2021/02/14 | 174 | macros/latex/contrib/changes/userdoc/definechangesauthor_ex.tex
-2021/02/14 | 172561 | macros/latex/contrib/reledmac/examples/3-reledpar_mwe.pdf
-2021/02/14 | 171 | macros/latex/contrib/changes/userdoc/usepackage_markup_changes_ex.tex
-2021/02/14 | 168066 | macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_default.pdf
-2021/02/14 | 166557 | macros/luatex/generic/luatexja/doc/lltjp-geometry.pdf
-2021/02/14 | 16628 | macros/latex/contrib/changes/examples.dtx
-2021/02/14 | 164 | macros/latex/contrib/changes/userdoc/usepackage_commandnameprefix_changes_ex.tex
-2021/02/14 | 1637 | macros/luatex/generic/luatexja/src/addons/luatexja-fontspec.sty
-2021/02/14 | 15839 | macros/luatex/generic/luatexja/src/addons/luatexja-fontspec-27c.sty
-2021/02/14 | 154 | macros/latex/contrib/changes/userdoc/usepackage_authormarkup_changes_ex.tex
-2021/02/14 | 154828 | macros/luatex/generic/luatexja/src/ltj-ivd_aj1.lua
-2021/02/14 | 1536 | macros/luatex/generic/luatexja/COPYING
-2021/02/14 | 151 | macros/latex/contrib/changes/userdoc/usepackage_commentmarkup_changes_ex.tex
-2021/02/14 | 14936 | systems/texlive/tlnet/archive/pxjahyper.r57732.tar.xz
-2021/02/14 | 1489476 | systems/texlive/tlnet/archive/platex.doc.r57730.tar.xz
-2021/02/14 | 147 | macros/latex/contrib/changes/userdoc/usepackage_deletedmarkup_changes_ex.tex
-2021/02/14 | 14709 | macros/luatex/generic/luatexja/src/patches/lltjp-listings.sty
-2021/02/14 | 14517 | macros/luatex/generic/luatexja/src/ltj-rmlgbm.lua
-2021/02/14 | 143191 | macros/latex/contrib/changes/examples/changes.example.screenshot.pdf
-2021/02/14 | 142 | macros/latex/contrib/changes/userdoc/usepackage_addedmarkup_changes_ex.tex
-2021/02/14 | 1428 | macros/latex/contrib/verifiche/verifiche.ins
-2021/02/14 | 1406 | macros/luatex/generic/luatexja/src/patches/lltjp-footmisc.sty
-2021/02/14 | 1397 | macros/luatex/generic/luatexja/tool/ivslist.tex
-2021/02/14 | 13899 | macros/luatex/generic/luatexja/src/jfm-ujis.lua
-2021/02/14 | 13726 | macros/luatex/generic/luatexja/doc/lltjp-geometry.tex
-2021/02/14 | 136880 | systems/texlive/tlnet/archive/platex.source.r57730.tar.xz
-2021/02/14 | 13411 | macros/luatex/generic/luatexja/src/patches/lltjcore.sty
-2021/02/14 | 13287561 | macros/latex/contrib/reledmac.zip
-2021/02/14 | 1326 | macros/latex/contrib/changes/README
-2021/02/14 | 13253331 | install/fonts/libertinus-type1.tds.zip
-2021/02/14 | 13194 | macros/luatex/generic/luatexja/src/ltj-setwidth.lua
-2021/02/14 | 1278 | macros/luatex/generic/luatexja/src/ltjclasses.ins
-2021/02/14 | 127732 | systems/texlive/tlnet/archive/plautopatch.doc.r57731.tar.xz
-2021/02/14 | 126 | macros/luatex/generic/luatexja/src/ltjltxdoc.ins
-2021/02/14 | 12574 | macros/latex/contrib/shtthesis/CHANGELOG.md
-2021/02/14 | 1224 | macros/luatex/generic/luatexja/tool/chars2defcharrange.rb
-2021/02/14 | 12151 | macros/luatex/generic/luatexja/src/ltj-base.lua
-2021/02/14 | 121508 | systems/texlive/tlnet/archive/pxjahyper.doc.r57732.tar.xz
-2021/02/14 | 120 | macros/latex/contrib/changes/userdoc/usepackage_authormarkupposition_changes_ex.tex
-2021/02/14 | 117 | macros/latex/contrib/changes/userdoc/usepackage_highlightmarkup_changes_ex.tex
-2021/02/14 | 11506 | macros/luatex/generic/luatexja/src/jfm-ujisv.lua
-2021/02/14 | 1136034 | macros/luatex/generic/luatexja/doc/luatexja-ja.pdf
-2021/02/14 | 11335 | macros/luatex/generic/luatexja/tool/unicodeBlocks.tex
-2021/02/14 | 1130 | macros/luatex/generic/luatexja/tool/function_uax50.lua
-2021/02/14 | 1114923 | fonts/libertinus-type1/doc/libertinus-samples.pdf
-2021/02/14 | 110514 | macros/latex/contrib/changes/examples/changes.example.commentmarkup.footnote.pdf
-2021/02/14 | 11043 | macros/latex/contrib/changes/pyMergeChanges.py
-2021/02/14 | 109 | macros/latex/contrib/changes/userdoc/usepackage_authormarkuptext_changes_ex.tex
-2021/02/14 | 109 | macros/latex/contrib/changes/userdoc/setsummarytowidth_ex.tex
-2021/02/14 | 1091 | systems/unix/tex-fpc/MFT/plainfonts
-2021/02/14 | 1091 | macros/latex/contrib/bxpdfver/LICENSE
-2021/02/14 | 107 | macros/latex/contrib/changes/userdoc/sethighlightmarkup_ex.tex
-2021/02/14 | 106 | macros/latex/contrib/changes/userdoc/usepackage_defaultcolor_changes_ex.tex
-2021/02/14 | 104166 | macros/latex/contrib/changes/examples/changes.example.packageoptions.todonotes.pdf
-2021/02/14 | 10036 | systems/texlive/tlnet/archive/easybook.r57734.tar.xz
diff --git a/graphics/mcf2graph/CHANGELOG b/graphics/mcf2graph/CHANGELOG
index d0926ab209..8bf1b7f3d5 100644
--- a/graphics/mcf2graph/CHANGELOG
+++ b/graphics/mcf2graph/CHANGELOG
@@ -1,6 +1,13 @@
*******************************************************************************
- Changelog of mcf2graph software package by Akira Yamaji 2021-02-11
+ Changelog of mcf2graph software package by Akira Yamaji 2021-02-21
*******************************************************************************
+[ver. 4.58 / 2021-02-21]
+ -change syntax
+ "+" => p_
+ "-" => n_
+ -add function check_mc()
+ -update MCF manual,example
+
[ver. 4.57 / 2021-02-11]
-change syntax
n:@ => @n
diff --git a/graphics/mcf2graph/README b/graphics/mcf2graph/README
index 7b4bb20d03..dd818987a1 100644
--- a/graphics/mcf2graph/README
+++ b/graphics/mcf2graph/README
@@ -1,7 +1,7 @@
********************************************************************************
mcf2graph : Convert Molecular Coding Format to graphics with METAFONT/METAPOST
Author : Akira Yamaji
- version : 4.57 2021-02-11
+ version : 4.58 2021-02-21
E-mail : mcf2graph@gmail.com
Located at : http://www.ctan.org/pkg/mcf2graph
********************************************************************************
diff --git a/graphics/mcf2graph/mcf2graph.mf b/graphics/mcf2graph/mcf2graph.mf
index 0ebece8405..4a3f4a766a 100644
--- a/graphics/mcf2graph/mcf2graph.mf
+++ b/graphics/mcf2graph/mcf2graph.mf
@@ -1,5 +1,5 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% mcf2graph ver 4.57 Copyright (c) 2013-2021 Akira Yamaji
+% mcf2graph ver 4.58 Copyright (c) 2013-2021 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,
@@ -37,29 +37,55 @@
% Set to use plain.mp (label,arrow,atom) : mpost -s labeloffset=2 FILENAME
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
tracingstats:=1;
-message "* This is mcf2graph ver 4.57 2021.02.11";
+message "* This is mcf2graph ver 4.58 2021.02.21";
%-------------------------------------------------------------------------------------------------
newinternal cntA,cntB,cntM,minX,minY,maxX,maxY,sftX,sftY,com,par,envT,envB,lenT,lineT,angT,rotT,
- crR,nA,nB,nC,nD,nE,nF,nN,nP,nU,nP,nL,nR,nS,nW,xpos,ypos,markA,markB,saveA,saveB,bondL;
+ crR,nA,nB,nC,nD,nE,nF,nS,nL,nR,nU,nP,xpos,ypos,markA,markB,saveA,saveB,bondL;
numeric save_num[],comD[][],parD[][],adrD[][],cntD[],tbl_atom[],tbl_group[][],f_char[],
tbl_atom_wt[],tbl_atom_mi[],tbl_char_wd[],tbl_char_ht[],addA[],add_rot[],chargeA[],
com_group[][],par_group[][],cnt_group[],colorA[],colorB[],sumA[],bondC[],hideH[],
lineB[],sB[],eB[],angB[],angA[],lenB[],angX[],numS[],wdM[],htM[],wdA[],dxA[];
-string info[],save_str[],tbl_atom_str[],strD[],tag[],out_file_name,out_file_aux,
- out_file_rep,out_file_mpc,aux_delimiter,atomfont,mpfont,s_tag,s_var,
- cal_FM,cal_MW,cal_MI,inf_NO,inf_EN,inf_JN,inf_FM,inf_CAS,inf_USE,inf_EXA,inf_EXB,inf_MW;
+string info[],mc[],save_str[],tbl_atom_str[],strD[],tag[],out_file_name,out_file_aux,
+ out_file_rep,out_file_mpc,aux_delimiter,atomfont,mpfont,s_tag,s_var,cal_FM,cal_MW,cal_MI,
+ inf_NO,inf_EN,inf_JN,inf_FM,inf_CAS,inf_USE,inf_EXA,inf_EXB,inf_MW,mc,blank_str;
pair save_pair[],posA[],posM[][],msize,mposition,fsize,fmargin,save_mposition,posBs,posBe;
picture mol_stru[],atom_picture,save_picture,temp_picture;
path arrow_path,dottedline_path,line_path,arrow_head;
%-------------------------------------------------------------------------------------------------
char_num:=str_cnt:=tbl_cnt:=proc_end:=mangle:=sw_calc:=sw_ext_all:=0;
sw_numberA:=sw_numberB:=sw_aux_out:=sw_expand:=sw_fframe:=sw_mframe:=sw_aframe:=sw_trimming:=0;
-sw_rep_out:=sw_mol_out:=sw_group_off:=sw_single:=sw_arrow_emu:=0;
+sw_rep_out:=sw_mol_out:=sw_group_off:=sw_single:=sw_arrow_emu:=sw_indent_off:=0;
numberA_start:=numberB_start:=1; numberA_end:=numberB_end:=4095;
%-------------------------------------------------------------------------------------------------
aux_max:=max_inf_num:=20;
aux_delimiter:=";";
for i=1 upto aux_max: tag[i]:=""; endfor
+blank_str:= " ";
+%-------------------------------------------------------------------------------------------------
+a_paren_s:=ASCII("("); a_paren_e:=ASCII(")"); a_brace_s:=ASCII("{"); a_brace_e:=ASCII("}");
+a_bracket_s:=ASCII("["); a_bracket_e:=ASCII("]"); a_comma:=ASCII(","); a_equal:=ASCII("=");
+a_colon:=ASCII(":"); a_atmark:=ASCII("@"); a_zero:=ASCII("0"); a_nine:=ASCII("9");
+%--------------------------------------------------------------------------------------------------
+let DIV= /; let MUL= *; let LT= <; let GT= >; let AND= &; let :: = : ; let == = =; let ef=elseif;
+def ]]]=] ] ] enddef;
+%--------------------------------------------------------------------------------------------------
+primarydef a at b = fat(a,b) enddef;
+def fat(expr a,b)= mposition:=b; a enddef;
+def ext(text TXT)= sw_ext_all:=1; def EXT_ALL = TXT enddef; enddef;
+def ext_clear= sw_ext_all:=0; def EXT_ALL = enddef; enddef;
+%--------------------------------------------------------------------------------------------------
+vardef iif(expr a,b,c)=if a: b else: c fi enddef;
+vardef subc(expr i,s)= substring(i-1,i) of s enddef;
+vardef sfrt(expr a,b,c)= a shifted ((b,0) rotated c) enddef;
+def wpcs expr n= withpen pencircle scaled n enddef;
+def ppcs expr n= pickup pencircle scaled n enddef;
+def sbp(expr m,n)expr p=subpath(m*length(p),n*length(p)) of p enddef;
+%-------------------------------------------------------------------------------------------------
+vardef fsr(expr n)(expr s)= (substring(0,n-length(s)) of blank_str)&s enddef;
+vardef fsl(expr n)(expr s)= s&(substring(0,n-length(s)) of blank_str) enddef;
+vardef fdr(expr n)(expr s)= fsr(n)(decimal(s)) enddef;
+vardef fdl(expr n)(expr s)= fsl(n)(decimal(s)) enddef;
+def warning(expr s)= message "% "&decimal(char_num)&fdr(3)(incr warning_cnt)&")"&s; enddef;
%=================================================================================================
if (known green)and(known ahlength):
f_MP:=1;
@@ -74,8 +100,8 @@ if (known green)and(known ahlength):
def out_file_mol= jobname&"-"&fit_zero(char_num)&"-"&inf_EN&".mol" enddef;
%--default ahangle=45---------------------------------------------------------------------
if ahangle=0: outputformat:="eps"; % eps format(.mps)
- elseif ahangle=1: outputformat:="png"; hppp:=vppp:=0.12; % png format(600dpi)
elseif ahangle=11: outputformat:="png"; hppp:=vppp:=0.24; % png format(300dpi)
+ elseif ahangle=1: outputformat:="png"; hppp:=vppp:=0.12; % png format(600dpi)
elseif ahangle=12: outputformat:="png"; hppp:=vppp:=0.10; % png format(720dpi)
elseif ahangle=13: outputformat:="png"; hppp:=vppp:=0.06; % png format(1200dpi)
elseif ahangle=14: outputformat:="png"; hppp:=vppp:=0.04; % png format(1800dpi)
@@ -154,13 +180,6 @@ if f_MP=1:
message "* defaultfont="&defaultfont;
fi
%--------------------------------------------------------------------------------------------------
-let DIV= /; let MUL= *; let LT= <; let GT= >; let AND= &; let :: = : ; let == = =; let ef=elseif;
-%--------------------------------------------------------------------------------------------------
-primarydef a at b = fat(a,b) enddef;
-def fat(expr a,b)= mposition:=b; a enddef;
-def ext(text TXT)= sw_ext_all:=1; def EXT_ALL = TXT enddef; enddef;
-def ext_clear= sw_ext_all:=0; def EXT_ALL = enddef; enddef;
-%--------------------------------------------------------------------------------------------------
?3:=?20:=Ph:=Ph1:=Ph2:=hz:=0; vt:=1;
ratio_chain_ring:=0.66; ratio_atom_bond:=0.36; ratio_thickness_bond:=0.015;
ratio_thickness_char:=0.1; ratio_char_bond:=1.5; ratio_bondgap_bond:=0.15;
@@ -190,14 +209,14 @@ parts_int_start:=3000; % 3001 => 4000 for internal parts (max 1000)
def def_com(expr n)(text tx)= nA:=n; forsuffixes list=tx:: list:=nA; nA:=nA+1; endfor enddef;
def_com(-4090)(_com,_jp_atom,_jp_absA,_jp_bond,_cyc,_cyc_sB,_cyc_eB,_set_line,_tmp_line,
_chg_len,_get_len,_ring_len,_tmp_len,_rot_ang,_adj_ang,_chg_env,_tmp_env,_set_colorA,_set_colorB,
- _group_si,_set_adr,_mk_bond,_set_atom,_arg_ang,_chg_atom,_tmp_rot,_fuse,_size_atom,_numeric,
+ _group_si,_set_adr,_mk_bond,_set_atom,_arrange_ang,_chg_atom,_tmp_rot,_fuse,_size_atom,_numeric,
_jump_at,_set_add,_chg_add,_nop,_mark,_moff,_term,_len_s,_len_e,_len_ss,_len_ee,
_group_s,_group_e,_rest,_charge,
- si,dl,dr,db,dm,tm,wf,wb,bd,bz,zf,zb,dt,wv,nl,vf,vb,nb,si_,dl_,dr_,dm_,wf_,wb_,zf_,zb_,wv_,bd_);
+ si,dl,dl_,dr,dr_,db,dm,dm_,tm,wf,wb,bd,bz,zf,zb,dt,wv,nl,vf,vb,nb,si_,wf_,wb_,zf_,zb_,wv_,bd_);
%--------------------------------------------------------------------------------------------------
def parameter_list=
sw_rep_out,sw_numberA,sw_numberB,sw_mframe,sw_aux_out,sw_expand,sw_mol_out,sw_calc,
- sw_single,sw_ext_all,sw_aframe,sw_fframe,sw_group_off,sw_trimming,sw_arrow_emu,
+ sw_single,sw_ext_all,sw_aframe,sw_fframe,sw_group_off,sw_trimming,sw_arrow_emu,sw_indent_off,
ratio_atom_bond,ratio_thickness_bond,ratio_char_bond,ratio_chain_ring,ratio_bondgap_bond,
ratio_zebra_black,ratio_zebragap_bond,ratio_thickness_char,ratio_wedge_bond,ratio_atomgap_atom,
lonepairdiam,lonepairspace,blength,offset_atom,offset_wedge,max_blength,offset_zebra_gap,
@@ -207,14 +226,6 @@ def parameter_list=
Me,Et,CH3,NH,NH2,NO,NO2,OH,CHO,COOH,CN,SH,!CH3,!NH2,!NO2,!OH,!CHO,!COOH,!CN,!SH
enddef;
%--------------------------------------------------------------------------------------------------
-def ]]]=] ] ] enddef;
-vardef iif(expr a,b,c)=if a: b else: c fi enddef;
-vardef subc(expr i,s)= substring(i,i+1) of s enddef;
-vardef sfrt(expr a,b,c)= a shifted ((b,0) rotated c) enddef;
-def wpcs expr n= withpen pencircle scaled n enddef;
-def ppcs expr n= pickup pencircle scaled n enddef;
-def sbp(expr m,n)expr p=subpath(m*length(p),n*length(p)) of p enddef;
-%--------------------------------------------------------------------------------------------------
def init_par(text t)=
nA:=nB:=nC:=0;
for list=t:
@@ -247,29 +258,42 @@ enddef;
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
def beginfont(text s)=
begingroup
- save ',f_beginchar,f_ext,blen,ext,add,ang_br;
+ save ',f_beginchar,f_ext,blen,ext,add,ang_br,s_fw,s_bw,s_len,at_colon;
%------------------------------------------------------------------------------------------------
def ext=ext_to_font enddef;
def add=add_to_molecule enddef;
- vardef '(text TXT)== read_mcf(incr parts_cnt)((_com,_mark),TXT,(_com,_rest)); parts_cnt enddef;
+ def '=read_ud enddef;
%------------------------------------------------------------------------------------------------
inf_NO:=inf_EN:=inf_JN:=inf_MW:=inf_FM:=inf_CAS:=inf_USE:=inf_EXA:=inf_EXB:="-";
- cal_MW:=cal_MI:=cal_FM:="";
+ mc:=cal_MW:=cal_MI:=cal_FM:="";
%------------------------------------------------------------------------------------------------
parts_cnt:=parts_usr_start;
parts_int:=parts_int_start;
%------------------------------------------------------------------------------------------------
char_num:=char_num+1;
store_par(parameter_list);
- for i:=1 upto max_inf_num: info[i]:=":"; endfor
- f_ext:=inf_num:=cntM:=0;
+ for i:=1 upto max_inf_num: info[i]:=":"; mc[i]:=""; endfor
+ f_ext:=inf_num:=cntM:=mc_low:=0;
for list=s: inf_num:=inf_num+1; info[inf_num]:=list; endfor
%------------------------------------------------------------------------------------------------
for j=1 upto inf_num:
- nA:=0; for i=0 upto length(info[j]): if subc(i,info[j])=":": nA:=i; fi exitif nA>0; endfor
- if nA>0:
- s_tag:=substring (0,nA) of info[j];
- s_var:=substring (nA+1,length(info[j])) of info[j];
+ at_colon:=0;
+ for i=1 upto 9: if subc(i,info[j])=":": at_colon:=i; fi exitif at_colon>0; endfor
+ s_len:=length(info[j]);
+ if at_colon=1:
+ s_fw:=0; for k=2 upto s_len: if subc(k,info[j])<>" ": s_fw:=k; fi exitif s_fw>0; endfor
+ s_bw:=0; for k=s_len downto 2: if subc(k,info[j])<>" ": s_bw:=k; fi exitif s_bw>0; endfor
+ mc_low:=mc_low+1;
+ if sw_indent_off=0:
+ mc[mc_low]:=substring (2,s_len) of info[j];
+ mc:=mc&substring (s_fw-1,s_bw) of info[j];
+ else:
+ mc[mc_low]:=substring (s_fw-1,s_len) of info[j];
+ mc:=mc&mc[mc_low];
+ fi
+ ef at_colon>=1:
+ s_tag:=substring (0,at_colon-1) of info[j];
+ s_var:=substring (at_colon,s_len) of info[j];
if known scantokens("inf_"&s_tag): scantokens("inf_"&s_tag):=s_var; fi
fi
endfor
@@ -278,35 +302,46 @@ def beginfont(text s)=
enddef;
%==================================================================================================
def endfont=
- if sw_ext_all=1: ext_to_font(EXT_ALL); fi
- if sw_trimming>=1:
- nA:=nC:=4095; nB:=nD:=-4095;
- for i=1 upto cntM:
- if xpart(posM[1][i])<nA: nA:=xpart(posM[1][i]); fi
- if xpart(posM[2][i])>nB: nB:=xpart(posM[2][i]); fi
- if ypart(posM[1][i])<nC: nC:=ypart(posM[1][i]); fi
- if ypart(posM[2][i])>nD: nD:=ypart(posM[2][i]); fi
- endfor
- font_wd:=nB-nA+2margin_lr;
- font_ht:=nD-nC+2margin_tb;
- fsize:=(font_wd,font_ht);
+ if cntM>=1:
+ %-----------------------------------------------------------------------------------------
+ if sw_ext_all=1: ext_to_font(EXT_ALL); fi
+ if sw_trimming>=1:
+ nA:=nC:=4095; nB:=nD:=-4095;
+ for i=1 upto cntM:
+ if xpart(posM[1][i])<nA: nA:=xpart(posM[1][i]); fi
+ if xpart(posM[2][i])>nB: nB:=xpart(posM[2][i]); fi
+ if ypart(posM[1][i])<nC: nC:=ypart(posM[1][i]); fi
+ if ypart(posM[2][i])>nD: nD:=ypart(posM[2][i]); fi
+ endfor
+ font_wd:=nB-nA+2margin_lr;
+ font_ht:=nD-nC+2margin_tb;
+ fsize:=(font_wd,font_ht);
+ for i=1 upto cntM:
+ posM[0][i]:=posM[0][i]+(margin_lr-nA,margin_tb-nC);
+ posM[1][i]:=posM[1][i]+(margin_lr-nA,margin_tb-nC);
+ endfor
+ fi
+ %----------------------------------------------------------------------------------------
+ if f_MP=0: beginchar(char_num,font_wd/bp*bp#,font_ht/bp*bp#,0)
+ else: beginfig(char_num) w:=charwd:=font_wd; h:=charht:=font_ht; chardp:=0;
+ fi
+ if (sw_fframe=1)or(sw_fframe=3): ext(draw_frame((0,0),w,h,thickness_fframe);) fi
+ if (sw_fframe=2)or(sw_fframe=3): ext(draw_frame(p0,w0,h0,thickness_fframe);) fi
+ if sw_fframe=4: ext(draw_corner((0,0),w,h,0.2bp);) fi
for i=1 upto cntM:
- posM[0][i]:=posM[0][i]+(margin_lr-nA,margin_tb-nC);
- posM[1][i]:=posM[1][i]+(margin_lr-nA,margin_tb-nC);
+ addto currentpicture also mol_stru[i] shifted posM[0][i]; mol_stru[i]:=nullpicture;
+ if sw_mframe=1: ext(draw_frame(p[i],w[i],h[i],thickness_mframe)) fi
endfor
+ if f_ext=1: addto currentpicture also mol_stru[0]; mol_stru[0]:=nullpicture; fi
+ %-----------------------------------------------------------------------------------------
+ else:
+ font_wd:=xpart(fsize); font_ht:=ypart(fsize);
+ if f_MP=0: beginchar(char_num,font_wd/bp*bp#,font_ht/bp*bp#,0)
+ else: beginfig(char_num) w:=charwd:=font_wd; h:=charht:=font_ht;
+ fi
+ draw (0,h)--(0,0)--(w,0)--(w,h)--(0,h)--(w,0) wpcs 0.2bp;
fi
- %-----------------------------------------------------------------------------------------------
- if f_MP=0: beginchar(char_num,font_wd/bp*bp#,font_ht/bp*bp#,0)
- else: beginfig(char_num) w:=charwd:=font_wd; h:=charht:=font_ht; chardp:=0;
- fi
- if (sw_fframe=1)or(sw_fframe=3): ext(draw_frame((0,0),w,h,thickness_fframe);) fi
- if (sw_fframe=2)or(sw_fframe=3): ext(draw_frame(p0,w0,h0,thickness_fframe);) fi
- if sw_fframe=4: ext(draw_corner((0,0),w,h,0.2bp);) fi
- for i=1 upto cntM:
- addto currentpicture also mol_stru[i] shifted posM[0][i]; mol_stru[i]:=nullpicture;
- if sw_mframe=1: ext(draw_frame(p[i],w[i],h[i],thickness_mframe)) fi
- endfor
- if f_ext=1: addto currentpicture also mol_stru[0]; mol_stru[0]:=nullpicture; fi
+ %-----------------------------------------------------------------------------------------
endchar;
clearit;
restore_par(parameter_list);
@@ -321,28 +356,36 @@ enddef;
def set_def_MC=
save /,//,/*,*/,**,*/*,~,^,',`,<,>,&,:,=,\,\\,*\,\*,*\*,@,$,&,#,##,{,},|,||,_,inside_def_MC;
inside_def_MC:=1;
- _:=Me;
- tertiarydef a=b == if (known a)and(known b):: change_bond(a,b) else:: _nop fi enddef;
- tertiarydef a:b == if (known a)and(known b):: change_atom(a,b) else:: _nop fi enddef;
- def { == read_number( enddef; let } == ); def <primary n == (_rot_ang,n) enddef;
- tertiarydef a^b == if known b:: (_tmp_rot,b),a else:: _nop,a fi enddef;
- tertiarydef a`b == if known b:: (_tmp_len,b),a else:: _nop,a fi enddef;
- tertiarydef a~b == if known b:: (_tmp_line,b),a else:: _nop,a fi enddef;
- tertiarydef a>b == if known b:: (_tmp_env,b),a else:: _nop,a fi enddef;
- def @primary n == (_jp_atom,n) enddef; def &primary n == (_cyc,n) enddef;
- def \ == 0 enddef; def \\ == \~dm enddef; def *\ == \~wf enddef; def \* == \~zf enddef;
- def *\* == \~wv enddef;
- def | == (_com,_mark) enddef; def || == (_com,_moff) enddef;
- def #primary n == (_com,_len_s),(_chg_len,n) enddef; def ## == (_com,_len_e) enddef;
- def /secondary n == if known n:: (_group_si,n) else:: _nop fi enddef;
- def //secondary n == /n~dm enddef; def */secondary n == /n~wf enddef;
- def /*secondary n == /n~zf enddef; def */*secondary n == /n~wv enddef;
- def **secondary n == /n~nb enddef; vardef $primary a == a-4095 enddef;
- vardef '(text TXT)==read_mcf(incr parts_cnt)(|,#crR,TXT,##,(_com,_rest)); parts_cnt enddef;
+ pair |,||,##;
+ | :=(_com,_mark); || := (_com,_moff); ##:=(_com,_len_e);
+ _:=Me; \:=0; \\:=zero_dm; *\:=zero_wf; \*:=zero_zf; *\*:=zero_wv;
+ let = ==op_equ; let : ==op_col; let ^ ==op_hat; let ~ ==op_til; let > ==op_lt; let ` ==op_bq;
+ def { == read_number( enddef; let } == ); def '==read_id enddef;
+ def < == rot_angle enddef; def @ == jump_atom enddef; def & == cyc_atom enddef;
+ def # == chg_length enddef; def $ == abs_adress enddef;
+ def / == group_si enddef; def // == group_dm enddef; def */ == group_wf enddef;
+ def /* == group_zf enddef; def */* == group_wv enddef; def ** == group_nb enddef;
enddef;
%-------------------------------------------------------------------------------------------------
-def CP == com_par enddef; def CPe == com_par_ex(0) enddef; def CPx == com_par_ex(1) enddef;
vardef '(text TXT)= parts_cnt:=parts_cnt+1; read_mcf(parts_cnt)(TXT); parts_cnt enddef;
+vardef read_id(text TXT)=read_mcf(incr parts_cnt)(|,#crR,TXT,##,(_com,_rest)); parts_cnt enddef;
+vardef read_ud(text TXT)=read_mcf(incr parts_cnt)(|,TXT,(_com,_rest)); parts_cnt enddef;
+tertiarydef a op_equ b = if (known a)and(known b):: change_bond(a,b) else:: _nop fi enddef;
+tertiarydef a op_col b = if (known a)and(known b):: change_atom(a,b) else:: _nop fi enddef;
+tertiarydef a op_hat b = if known b:: (_tmp_rot,b),a else:: _nop,a fi enddef;
+tertiarydef a op_til b = if known b:: (_tmp_line,b),a else:: _nop,a fi enddef;
+tertiarydef a op_lt b = if known b:: (_tmp_env,b),a else:: _nop,a fi enddef;
+tertiarydef a op_bq b = if known b:: (_tmp_len,b),a else:: _nop,a fi enddef;
+def rot_angle primary n = (_rot_ang,n) enddef; def jump_atom primary n = (_jp_atom,n) enddef;
+def cyc_atom primary n = (_cyc,n) 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 == /n~dm enddef; def group_wf secondary n == /n~wf enddef;
+def group_zf secondary n == /n~zf enddef; def group_wv secondary n == /n~wv enddef;
+def group_nb secondary n == /n~nb enddef;
+vardef abs_adress primary n == n-4095 enddef;
+%-------------------------------------------------------------------------------------------------
+def CP = com_par enddef; def CPe = com_par_ex(0) enddef; def CPx = com_par_ex(1) enddef;
%=================================================================================================
def read_mcf(expr n)(text TXT)=
begingroup
@@ -362,12 +405,8 @@ def read_mcf(expr n)(text TXT)=
else:: nCP:=nCP+1; comD[n][nCP]:=_mk_bond; parD[n][nCP]:=list;
fi
elseif string list::
- if (list=="+")or(list=="-")::
- nCP:=nCP+1; comD[n][nCP]:=_set_add; parD[n][nCP]:=ASCII(list);
- else::
- str_cnt:=str_cnt+1; strD[str_cnt]:=list;
- nCP:=nCP+1; comD[n][nCP]:=_set_atom; parD[n][nCP]:=str_cnt;
- fi
+ str_cnt:=str_cnt+1; strD[str_cnt]:=list;
+ nCP:=nCP+1; comD[n][nCP]:=_set_atom; parD[n][nCP]:=str_cnt;
fi
else:: message "unknown command in "AND decimal(n);
fi
@@ -378,20 +417,20 @@ enddef;
%-------------------------------------------------------------------------------------------------
vardef read_number(text TXT)=
parts_int:=parts_int+1;
- nN:=0;
+ nA:=0;
for list==TXT::
if known list::
if numeric list::
if list==_nop:: message "unknown command in "AND decimal(parts_int);
- else:: nN:=nN+1; comD[parts_int][nN]:=_numeric; parD[parts_int][nN]:=list;
+ else:: nA:=nA+1; comD[parts_int][nA]:=_numeric; parD[parts_int][nA]:=list;
fi
elseif pair list::
- nN:=nN+1; comD[parts_int][nN]:=xpart(list); parD[parts_int][nN]:=ypart(list);
+ nA:=nA+1; comD[parts_int][nA]:=xpart(list); parD[parts_int][nA]:=ypart(list);
fi
else:: message "unknown command in "AND decimal(parts_int);
fi
endfor
- cntD[parts_int]:=nN;
+ cntD[parts_int]:=nA;
parts_int %------- Retern value -------
enddef;
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -465,9 +504,10 @@ vardef change_atom(expr a,b)=
CP(_tmp_line,dm) CP(_tmp_rot,-35) CPx(a)(_group_si,O) CP(_com,_group_e)
ef b==SO:: CPe(a)(_chg_atom,S) CP(_com,_group_s) CP(_tmp_line,dm)
CPx(a)(_group_si,O) CP(_com,_group_e)
+ ef b==n_:: CP(_com,_group_s) CP(_set_add,ASCII("-")) CP(_chg_add,a) CP(_com,_group_e)
+ ef b==p_:: CP(_com,_group_s) CP(_set_add,ASCII("+")) CP(_chg_add,a) CP(_com,_group_e)
fi
ef pair b:: CP(_com,_group_s) CPx(a)(xpart(b),ypart(b)) CP(_com,_group_e)
- ef string b:: CP(_com,_group_s) CP(_set_add,ASCII(b)) CP(_chg_add,a) CP(_com,_group_e)
ef color b:: color_list[incr cntC]:=b; CPe(a)(_set_colorA,cntC)
fi
cntD[parts_int]:=nCP;
@@ -495,13 +535,13 @@ def puts(expr POS)(expr STR)=
temp_p:=POS;
nC:=defaultscale*defaultsize;
if (defaultfont="draw")or(f_MP=0):
- for i=0 upto length(STR)-1:
+ for i=1 upto length(STR):
temp_c:=subc(i,STR);
draw_char(temp_c,temp_p,nC,ratio_thickness_char*nC,0);
temp_p:=temp_p+(nC*tbl_char_wd[ASCII(temp_c)],0);
endfor
else:
- for i=0 upto length(STR)-1:
+ for i=1 upto length(STR):
temp_c:=subc(i,STR);
temp_picture:=temp_c infont defaultfont scaled defaultscale;
addto currentpicture also temp_picture shifted temp_p;
@@ -554,11 +594,11 @@ def add_to_molecule(text TXT)=
lonepairspace:=.7aw;
circlediam:=.6aw;
circlepen:=.2bp;
- for i=1 upto An:
+ 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
- for i=1 upto Bn:
+ 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]);
@@ -652,18 +692,18 @@ vardef lone_pair_add expr ANG=
enddef;
%--------------------------------------------------------------------------------------------------
vardef label_emu@#(expr OBJ,POS) = %% modified 'thelabel@#(expr s,z)' of plain.mp
- save oft,fx,fy,wds,pA,pB,pC,pD,sC;
+ save oft,fx,fy,wd_s,wd_c,pA,pB,pC,pD,sC;
pair oft,oft.lft,oft.rt,oft.top,oft.bot,oft.ulft,oft.llft,oft.urt,oft.lrt,pA,pB,pC,pD;
- wds:=0;
- nC:=defaultscale*defaultsize;
+ wd_s:=0;
+ wd_c:=defaultscale*defaultsize;
%---------------------------------------------------------------
if string OBJ:
if (defaultfont="draw")or(f_MP=0):
- for i=0 upto length(OBJ)-1: wds:=wds+nC*tbl_char_wd[ASCII(subc(i,OBJ))]; endfor
+ for i=1 upto length(OBJ): wd_s:=wd_s+wd_c*tbl_char_wd[ASCII(subc(i,OBJ))]; endfor
else:
- for i=0 upto length(OBJ)-1:
+ for i=1 upto length(OBJ):
temp_picture:=subc(i,OBJ) infont defaultfont scaled defaultscale;
- wds:=wds+xpart(lrcorner temp_picture-llcorner temp_picture);
+ wd_s:=wd_s+xpart(lrcorner temp_picture-llcorner temp_picture);
endfor
fi
fi
@@ -679,7 +719,7 @@ vardef label_emu@#(expr OBJ,POS) = %% modified 'thelabel@#(expr s,z)' of plain.m
oft.lrt:= ( .7,-.7); fx.lrt:=0; fy.lrt:=1;
%---------------------------------------------------------------
if string OBJ:
- puts(POS+(labeloffset*oft@#)-(wds*fx@#,nC*fy@#))(OBJ);
+ puts(POS+(labeloffset*oft@#)-(wd_s*fx@#,wd_c*fy@#))(OBJ);
elseif picture OBJ:
pA:=llcorner(OBJ);
pB:=urcorner(OBJ);
@@ -730,8 +770,8 @@ enddef;
def MC(text TXT)=
begingroup
save f_bra,strAT,cnt_group,temp_lenE,temp_lenF,temp_cntB,f_term,f_at,f_lineT,f_rotT,
- f_lenT,f_envT,sA,factor,m_wd,m_ht,temp_p,defaultsize,defaultscale;
- string sA;
+ f_lenT,f_envT,temp_c,factor,m_wd,m_ht,temp_p,defaultsize,defaultscale;
+ string temp_c;
pair temp_p;
%-----------------------------------------------------------------------------------------------
if (sw_numberA>=1)or(sw_numberB>=1): ratio_atom_bond:=0.25; fi
@@ -775,13 +815,13 @@ def MC(text TXT)=
%-draw add to atom------------------------------------------------------------------------------
for i=1 upto cntA:
if addA[i]<>0:
- sA:=char(addA[i]); nA:=angX[i]+add_rot[i]; nC:=nA mod 90;
- if sA="+": chargeA[i]:=1; elseif sA="-": chargeA[i]:=-1; else: chargeA[i]:=0; fi
+ temp_c:=char(addA[i]); nA:=angX[i]+add_rot[i]; nC:=nA mod 90;
+ if temp_c="+": chargeA[i]:=1; elseif temp_c="-": chargeA[i]:=-1; else: chargeA[i]:=0; fi
if numS[i]=0: nB:=.5atom_wd;
else: nB:=.85wdA[i]+iif(nC<45,sind(nC),cosd(nC))*.5wdA[i];
fi
temp_p:=sfrt(posA[i]-(.35atom_wd,.35atom_wd),nB,nA);
- draw_char(sA,temp_p,atom_wd,bond_pen_wd*ratio_char_bond,0);
+ draw_char(temp_c,temp_p,atom_wd,bond_pen_wd*ratio_char_bond,0);
else: chargeA[i]:=0;
fi
endfor
@@ -885,8 +925,10 @@ def draw_corner(expr PS,LX,LY,PN)=
enddef;
%-------------------------------------------------------------------------------------------------
def proc_size_setup=
- if (blen*ratio_atom_bond+offset_atom)<.8blen: atom_wd:=blen*ratio_atom_bond+offset_atom;
- else: atom_wd:=.8blen; ratio_chain_ring:= .5;
+ if (blen*ratio_atom_bond+offset_atom)<.8blen:
+ atom_wd:=blen*ratio_atom_bond+offset_atom;
+ else:
+ atom_wd:=.8blen; ratio_chain_ring:= .5;
fi
wedge_wd:= blen*ratio_wedge_bond+offset_wedge;
zebra_gap:= blen*ratio_zebragap_bond+offset_zebra_gap;
@@ -902,11 +944,11 @@ def proc_scaling=
ypos:=ypart(posA[i]);
if numS[i]<>0:
nU:=nD:=nP:=nL:=nR:=0;
- for j=0 upto length(strD[numS[i]])-1:
- sA:=subc(j,strD[numS[i]]);
- if (sA="^"): nU:=.5atom_wd;
- elseif (sA="_"): nD:=.5atom_wd;
- elseif (sA<>"{")and(sA<>"}"): nP:=nP+atom_wd*tbl_char_wd[ASCII(sA)];
+ for j=1 upto length(strD[numS[i]]):
+ temp_c:=subc(j,strD[numS[i]]);
+ if (temp_c="^"): nU:=.5atom_wd;
+ elseif (temp_c="_"): nD:=.5atom_wd;
+ elseif (temp_c<>"{")and(temp_c<>"}"): nP:=nP+atom_wd*tbl_char_wd[ASCII(temp_c)];
fi
endfor
if (angX[i]<=90)or(angX[i]>=270): nR:=nP; else: nL:=nP; fi
@@ -923,12 +965,11 @@ enddef;
%-------------------------------------------------------------------------------------------------
def char_use_check=
for i=1 upto 128: f_char[i]:=0; endfor
- if (sw_numberA<>0)or(sw_numberB<>0):
- for j=ASCII("0") upto ASCII("9"): f_char[j]:=1; endfor
+ if (sw_numberA<>0)or(sw_numberB<>0): for j=a_zero upto a_nine: f_char[j]:=1; endfor
else:
for i=1 upto cntA:
if numS[i]<>0:
- for j=0 upto length(strD[numS[i]])-1: f_char[ASCII(subc(j,strD[numS[i]]))]:=1; endfor
+ for j=1 upto length(strD[numS[i]]): f_char[ASCII(subc(j,strD[numS[i]]))]:=1; endfor
fi
endfor
fi
@@ -1012,10 +1053,9 @@ def proc_skeleton(expr a)=
ef com=_jp_atom: termB; adrT:=getA(par); posBs:=posA[adrT]; angT:=angX[adrT]; f_bra:=1; rotT:=0;
ef com=_jp_absA: adrT:=par; posBs:=posA[adrT];
angT:=angX[adrT]; f_bra:=1; rotT:=0; temp_cntB:=cntB;
- ef com=_adj_ang: if (angT<40)or(angT>320): angT:=0;
- ef angT<140: angT:=90; ef angT<220: angT:=180; else: angT:=270; fi
- ef com=_rot_ang: angT:=(angT+par) mod 360;
- ef com=_tmp_rot: rotT:=par;
+ ef com=_adj_ang: angT:=adjust_ang(angT);
+ ef com=_rot_ang: angT:=(angT+par) mod 360;
+ ef com=_tmp_rot: rotT:=par;
ef com=_group_si: rotT:=0;
ef com=_chg_env: envB:=par;
ef com=_tmp_env: envT:=par;
@@ -1028,7 +1068,7 @@ def proc_skeleton(expr a)=
enddef;
%-------------------------------------------------------------------------------------------------
def add_bond(expr ROT,FLG)=
- if ROT=_arg_ang: nA:=arrange_ang(angT mod 360); else: nA:=ROT; fi
+ if ROT=_arrange_ang: nA:=arrange_ang(angT mod 360); else: nA:=ROT; fi
if f_bra=0:
adrT:=cntA:=cntA+1; posA[cntA]:=posBs; angA[cntA]:=angT;
angX[cntA]:=(angT+nA/2+iif(nA>=0,-90,90)) mod 360;
@@ -1052,12 +1092,14 @@ vardef arrange_ang(expr n)=
if cntB=0: angT:=(angT-180) mod 360; 180
else:
if envB>=parts_emb_start: parD[envB][cntB-temp_cntB+2]
- else: if envB=hz: if n=0: 60 ef n<=90:-60 ef n<=180: 60 ef n<270: -60 else: 60 fi
- ef envB=vt: if n=0:-60 ef n<90: 60 ef n<=180:-60 ef n<=270: 60 else:-60 fi
+ else: if envB=hz: if n=0: 60 ef n<=90: -60 ef n<=180: 60 ef n<270: -60 else: 60 fi
+ ef envB=vt: if n=0: -60 ef n<90: 60 ef n<=180: -60 ef n<=270: 60 else: -60 fi
ef abs(envB)<=180: envB fi
fi
fi
enddef;
+%-------------------------------------------------------------------------------------------------
+vardef adjust_ang(expr n)= if (n<40)or(n>320): 0 ef n<140: 90 ef n<220: 180 else: 270 fi enddef;
%=================================================================================================
vardef getA(expr n)= if n>=0: markA+n ef n>=-999: cntA+n+1 else: n+4095 fi enddef;
vardef getB(expr n)= if n>=0: markB+n ef n>=-999: cntB+n+1 else: n+4095 fi enddef;
@@ -1085,44 +1127,45 @@ enddef;
def draw_atom(expr NUM)=
begingroup
if numS[NUM]<>0:
- save slen,f_wd,f_ht,r_ff,pA,pB,sA,sB,dx;
- string sA,sB;
- pair pA,pB;
+ save slen,f_wd,f_ht,r_ff,pos_a,pos_c,temp_c,temp_s,dir_str;
+ string temp_c,temp_s;
+ pair pos_a,pos_c;
%-------------------------------------------------------
- sA:=strD[numS[NUM]]; slen:=length(sA)-1; nA:=angX[NUM];
- dxA[NUM]:=dx:=iif((nA<=90)or(nA>=270),1,-1);
- wdA[NUM]:=nC:=0; pB:=(0,0);
- pA:=posA[NUM]-(.5atom_wd*dx,.5atom_wd);
+ temp_s:=strD[numS[NUM]]; slen:=length(temp_s); nA:=angX[NUM];
+ dxA[NUM]:=dir_str:=iif((nA<=90)or(nA>=270),1,-1);
+ wdA[NUM]:=nC:=0; pos_c:=(0,0);
+ pos_a:=posA[NUM]-(.5atom_wd*dir_str,.5atom_wd);
if (atomfont<>"draw")and(f_MP=1):
atom_picture:="C" infont atomfont;
r_ff:=atom_wd/(ypart(ulcorner atom_picture)-ypart(llcorner atom_picture));
fi
- for i=0 upto slen:
+ for i=1 upto slen:
if nC=0:
- sB:=subc(i,sA);
- if (dx=-1)and(sB="{"):
- nD:=i+1; nC:=0; for j=nD upto slen: nC:=nC+1; exitif subc(j,sA)="}"; endfor
+ temp_c:=subc(i,temp_s);
+ if (dir_str=-1)and(temp_c="{"):
+ nD:=i; nC:=0; for j=nD upto slen: nC:=nC+1; exitif subc(j,temp_s)="}"; endfor
fi
- else: nC:=nC-1; sB:=subc(nD+nC,sA);
+ else: nC:=nC-1; temp_c:=subc(nD+nC,temp_s);
fi
- if sB="_": pB:=iif(pB=(0,0),(0,-.5atom_wd),(0,0));
- elseif sB="^": pB:=iif(pB=(0,0),(0, .5atom_wd),(0,0));
- elseif (sB<>"{")and(sB<>"}"):
+ if temp_c="_": pos_c:=iif(pos_c=(0,0),(0,-.5atom_wd),(0,0));
+ elseif temp_c="^": pos_c:=iif(pos_c=(0,0),(0, .5atom_wd),(0,0));
+ elseif (temp_c<>"{")and(temp_c<>"}"):
if (atomfont="draw")or(f_MP=0):
- f_wd:=atom_wd*tbl_char_wd[ASCII(sB)];
- if dx=-1: pA:=pA-(f_wd,0); fi
- draw_char(sB,pA+pB,atom_wd,bond_pen_wd*ratio_char_bond,NUM);
- if sw_aframe=1: draw_frame(pA+pB,f_wd,atom_wd,thickness_aframe); fi
- if dx=1: pA:=pA+(f_wd,0); fi
+ f_wd:=atom_wd*tbl_char_wd[ASCII(temp_c)];
+ if dir_str=-1: pos_a:=pos_a-(f_wd,0); fi
+ draw_char(temp_c,pos_a+pos_c,atom_wd,bond_pen_wd*ratio_char_bond,NUM);
+ if sw_aframe=1: draw_frame(pos_a+pos_c,f_wd,atom_wd,thickness_aframe); fi
+ if dir_str=1: pos_a:=pos_a+(f_wd,0); fi
else:
- atom_picture:=sB infont atomfont;
+ atom_picture:=temp_c infont atomfont;
f_wd:=(xpart(lrcorner atom_picture)-xpart(llcorner atom_picture))*r_ff;
f_ht:=(ypart(urcorner atom_picture)-ypart(llcorner atom_picture))*r_ff;
- if dx=-1: pA:=pA-(f_wd,0); fi
+ if dir_str=-1: pos_a:=pos_a-(f_wd,0); fi
addto currentpicture also atom_picture scaled (r_ff*(1-2ratio_atomgap_atom))
- shifted (pA+pB+(f_wd*ratio_atomgap_atom,f_ht*ratio_atomgap_atom)) Cp(colorA[NUM]);
- if sw_aframe=1: draw_frame(pA+pB,f_wd,f_ht,thickness_aframe); fi
- if dx=1: pA:=pA+(f_wd,0); fi
+ shifted (pos_a+pos_c+(f_wd*ratio_atomgap_atom,f_ht*ratio_atomgap_atom))
+ Cp(colorA[NUM]);
+ if sw_aframe=1: draw_frame(pos_a+pos_c,f_wd,f_ht,thickness_aframe); fi
+ if dir_str=1: pos_a:=pos_a+(f_wd,0); fi
fi
wdA[NUM]:=wdA[NUM]+f_wd;
fi
@@ -1219,7 +1262,7 @@ vardef frame_str(expr NUM)=
enddef;
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
def char_size_set(expr WD)(expr HT)(expr STR)=
- for j=0 upto length(STR)-1:
+ for j=1 upto length(STR):
nA:=ASCII(subc(j,STR)); tbl_char_wd[nA]:=WD; tbl_char_ht[nA]:=HT;
endfor
enddef;
@@ -1227,7 +1270,7 @@ enddef;
char_size_set( 1)( 1)("CGHMNOQW");
char_size_set( .9)( 1)("ABDFIJKPRSTUVXY/><#\%@");
char_size_set( .8)( 1)("ELZ&");
-char_size_set( .7)( 1)(" ()[]0123456789nh=tfg?~^");
+char_size_set( .7)( 1)(" ()[]{}0123456789nh=tfg?~^");
char_size_set( .7)( .9)("$");
char_size_set( .7)( .7)("-+*_");
char_size_set(.45)(.95)("l");
@@ -1254,10 +1297,10 @@ def dwvs (expr n)expr p=
def dwh expr p=draw (p) withpen penrazor rotated 90 scaled fP shifted pos Cp(colorA[NUM]) enddef;
def cdw expr p=cutdraw (p) shifted pos Cp(colorA[NUM]) enddef;
%-------------------------------------------------------------------------------------------------
-sC:=CHR; fP:=PEN; hP:=0.5fP; nW:=WD;
-aW:=nW*tbl_char_wd[ASCII(sC)]*(1-2ratio_atomgap_atom);
-aH:=nW*tbl_char_ht[ASCII(sC)]*(1-2ratio_atomgap_atom);
-pos:=POS+(nW*ratio_atomgap_atom,nW*ratio_atomgap_atom);
+sC:=CHR; fP:=PEN; hP:=0.5fP;
+aW:=WD*tbl_char_wd[ASCII(sC)]*(1-2ratio_atomgap_atom);
+aH:=WD*tbl_char_ht[ASCII(sC)]*(1-2ratio_atomgap_atom);
+pos:=POS+(WD*ratio_atomgap_atom,WD*ratio_atomgap_atom);
%-------------------------------------------------------------------------------------------------
fW:=aW-hP; hW:=.5aW; fH:=aH-hP; hH:=.5aH;
Z01:=( 0,hP); Z02:=(hP, 0); Z03:=(hP,hP); Z04:=(aW,hP); Z05:=(fW, 0); Z06:=(hW,aH); Z07:=(hW, 0);
@@ -1350,8 +1393,10 @@ ef sC="(": dw Z19...Z09...Z14;
ef sC=")": dw Z19...Z10...Z14;
ef sC="[": dwv Z07--Z06; dwh Z14--Z22; dwh Z19--Z21;
ef sC="]": dwv Z07--Z06; dwh Z14--Z13; dwh Z03--Z19;
-ef sC="<": cdw Z01--Z17--Z12;
-ef sC=">": cdw Z16--Z08--Z04;
+ef sC="{": dw Z19..(.3aW,.2aH)..(.3aW,.45aH)..(.2aW,.5aH)..(.3aW,.55aH)..(.3aW,.8aH)..Z14;
+ef sC="}": dw Z19..(.7aW,.2aH)..(.7aW,.45aH)..(.8aW,.5aH)..(.7aW,.55aH)..(.7aW,.8aH)..Z14;
+ef sC="<": cdw Z16--Z08--Z04;
+ef sC=">": cdw Z01--Z17--Z12;
ef sC="-": dwh Z09--Z10;
ef sC="=": dwh (hP,.3aH)--(fW,.3aH); dwh (hP,.6aH)--(fW,.6aH);
ef sC="/": dw Z22..Z01;
@@ -1372,31 +1417,24 @@ ef sC="&": cdw Z21..(hW,.35aH)..(.25aW,.75aH)..(hW,.fH)..(.75aW,.75fH)..(hP,.3aH
ef sC="@": cdw sbp(0,.7)zO; dwv (fW,hH)--(fW,0);
dw (fW,.45aH)..(.7aW,.75aH)..(.3aW,.45aH)..(.7aW,.15aH)..cycle;
ef sC="_": dwh Z01--Z04;
-ef sC="^": dwv (hP,.6aH)..(.5aW,.7aH)..(fW,.6aH);
+ef sC="^": dw (hP,.6aH)--(.5aW,fH)--(fW,.6aH);
else:
fi
endgroup
enddef;
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-def blank_str:= " " enddef;
-vardef fixed_r(expr n)(expr s)= (substring(0,n-length(s)) of blank_str)&s enddef;
-vardef fixed_l(expr n)(expr s)= s&(substring(0,n-length(s)) of blank_str) enddef;
-vardef fdr(expr n)(expr s)=fixed_r(n)(decimal(s)) enddef;
-vardef fdl(expr n)(expr s)=fixed_l(n)(decimal(s)) enddef;
-def warning(expr s)= message "% "&decimal(char_num)&fdr(3)(incr warning_cnt)&")"&s; enddef;
-%-------------------------------------------------------------------------------------------------
def warning_bond(expr a)=
if addA[a]=0:
- warning("A"&decimal(a)&" ( "&fixed_l(8)(strD[numS[a]])&") has"&fdr(2)(bond_cnt)&" bonds");
+ warning("A"&decimal(a)&" ( "&fsl(8)(strD[numS[a]])&") has"&fdr(2)(bond_cnt)&" bonds");
fi
enddef;
%-------------------------------------------------------------------------------------------------
-vardef cut_paren(expr ATOM)=
+vardef erase_brace(expr ATOM)=
save temp_c,temp_s;
string temp_c,temp_s;
temp_s:="";
if (length(ATOM)>=4)and(ATOM<>"COOH"):
- for i=0 upto length(ATOM)-1:
+ for i=1 upto length(ATOM):
temp_c:=subc(i,ATOM);
if (temp_c<>"{")and(temp_c<>"}")and(temp_c<>"_")and(temp_c<>"^")
and(temp_c<>"+")and(temp_c<>"-"):
@@ -1417,11 +1455,11 @@ def proc_calc=
knownA:=bond_cnt:=0;
nS:=numS[i];
for j=1 upto cntB:
- if (lineB[j]>=dl)and(lineB[j]<=dm): bondC[j]:=2;
- ef lineB[j]=tm: bondC[j]:=3;
- ef (lineB[j]=vf)or(lineB[j]=vb): bondC[j]:=0;
- ef lineB[j]=0: bondC[j]:=0;
- else: bondC[j]:=1;
+ if (lineB[j]>=dl)and(lineB[j]<=dm_): bondC[j]:=2;
+ ef lineB[j]=tm: bondC[j]:=3;
+ ef (lineB[j]=vf)or(lineB[j]=vb): bondC[j]:=0;
+ ef lineB[j]=0: bondC[j]:=0;
+ else: bondC[j]:=1;
fi
if (sB[j]=i)or(eB[j]=i): bond_cnt:=bond_cnt+bondC[j]; fi
endfor
@@ -1464,15 +1502,13 @@ def proc_calc=
if (tbl_atom_max=1)and(sumA[2]>0): tbl_atom_max:=2; fi
for i=1 upto tbl_atom_max:
if sumA[i]>=1:
- nA:=tbl_atom_wt[i]/100*sumA[i];
- nB:=tbl_atom_mi[i]/100*sumA[i];
- cen_MW:=cen_MW+nA;
- cen_MI:=cen_MI+nB;
+ nA:=tbl_atom_wt[i]/100*sumA[i]; nB:=tbl_atom_mi[i]/100*sumA[i];
+ cen_MW:=cen_MW+nA; cen_MI:=cen_MI+nB;
if (cen_MW<40)and(cen_MI<40):
num_MW:= num_MW+tbl_atom_wt[i]*sumA[i];
num_MI:= num_MI+tbl_atom_mi[i]*sumA[i];
fi
- cal_FM:=cal_FM&cut_paren(tbl_atom_str[i]) if sumA[i]>=2: &decimal(sumA[i]) fi;
+ cal_FM:=cal_FM&erase_brace(tbl_atom_str[i]) if sumA[i]>=2: &decimal(sumA[i]) fi;
fi
endfor
%-------------------------------------------------------------------------------------
@@ -1520,6 +1556,7 @@ def proc_auxfile_out=
ef tag[i]="USE": & inf_USE
ef tag[i]="EXA": & inf_EXA
ef tag[i]="EXB": & inf_EXB
+ ef tag[i]="MC": & inf_MC
fi
endfor
if sw_aux_out=3: for i=1 upto inf_num: &aux_delimiter&info[i] endfor; fi
@@ -1544,7 +1581,7 @@ def proc_report_out=
printf "------------------------------------------------------------------";
printf "< NO. ><atom(s) >( x axis , y axis )<bond><hideH><chg>";
for i=1 upto cntA:
- printf " A"&fdl(6)(i)&fixed_l(8)(cut_paren(strD[numS[i]]))&
+ printf " A"&fdl(6)(i)&fsl(8)(erase_brace(strD[numS[i]]))&
" ("&fdr(10)(round_auto(xpart(posA[i])/blen))&" , "&
fdr(10)(round_auto(ypart(posA[i])/blen))&" ) "&fdr(4)(Bcnt[i])&
iif(hideH[i]>0,fdr(6)(hideH[i])," ")
@@ -1567,14 +1604,14 @@ def proc_report_out=
if sumA[i]>=1:
nA:=tbl_atom_wt[i]/100*sumA[i]; nB:=tbl_atom_mi[i]/100*sumA[i];
printf " "&
- fixed_l(5)(cut_paren(tbl_atom_str[i]))&
+ fsl(5)(erase_brace(tbl_atom_str[i]))&
"("&fdr(9)(tbl_atom_wt[i])&")"&"["&fdr(9)(tbl_atom_mi[i])&"]"&" * "&fdr(4)(sumA[i])
if nA<40: &fdr(15)(tbl_atom_wt[i]*sumA[i])&"["&fdr(12)(tbl_atom_mi[i]*sumA[i])&"]";
else: &fdr(11)(nA)&"*100"&"["&fdr(9)(nB)&"*100"&"]";
fi
fi
endfor
- printf " Molecular Weight [Mono Isotopic] = "&fixed_r(12)(cal_MW)&"["&fixed_r(12)(cal_MI)&"]";
+ printf " Molecular Weight [Mono Isotopic] = "&fsr(12)(cal_MW)&"["&fsr(12)(cal_MI)&"]";
printf "------------------------------------------------------------------";
printf " Weight Calc: " &cal_MW &" / Input: "
if inf_MW<>"-": &inf_MW &" / weight gap= " &decimal(num_MW-scantokens(inf_MW)) fi;
@@ -1588,11 +1625,11 @@ def proc_mol_out=
out_file_name:=out_file_mol;
%-V2000---------------------------------------------------------------------------------------
if sw_mol_out=1:
- printf ""; printf " -MCFtoMOL- "&fixed_l(20)(info[1]); printf "";
+ printf ""; printf " -MCFtoMOL- "&fsl(20)(info[1]); printf "";
printf fdr(3)(cntA)&fdr(3)(cntB)&" 0 0 0 0 0 0 0 0999 V2000";
for i=1 upto cntA:
printf fdr(10)(xpart(posA[i])/blen)& fdr(10)(ypart(posA[i])/blen)&fdr(10)(0)&" "&
- fixed_l(2)(cut_paren(strD[numS[i]]))&" 0"&fdr(3)(bond_charge(chargeA[i]))&" 0 0";
+ fsl(2)(erase_brace(strD[numS[i]]))&" 0"&fdr(3)(bond_charge(chargeA[i]))&" 0 0";
endfor
for i=1 upto cntB:
if lineB[i]<>0:
@@ -1603,13 +1640,13 @@ def proc_mol_out=
printf "M END";
%-V3000---------------------------------------------------------------------------------------
elseif sw_mol_out=2:
- printf ""; printf " -MCFtoMOL- "&fixed_l(20)(info[1]); printf "";
+ printf ""; printf " -MCFtoMOL- "&fsl(20)(info[1]); printf "";
printf " 0 0 0 0 0 999 V3000";
printf "M V30 BEGIN CTAB";
printf "M V30 COUNTS "&decimal(cntA)&" "&decimal(cntB)&" 0 0 0";
printf "M V30 BEGIN ATOM";
for i=1 upto cntA:
- printf "M V30 "&decimal(i)&" "&cut_paren(strD[numS[i]])&" "&
+ printf "M V30 "&decimal(i)&" "&erase_brace(strD[numS[i]])&" "&
decimal(xpart(posA[i])/blen)&" "&decimal(ypart(posA[i])/blen)&" 0 0"
if chargeA[i]<>0: &" CHG="&decimal(chargeA[i]) fi;
endfor
@@ -1697,11 +1734,13 @@ parts_atom_end:=parts_cnt;
for i==3 upto 20: ?[i]:='((_com,_len_ss),(_get_len,_ring_len),<((-180 DIV i)-90)
for j==2 upto i:: ,(360 DIV i) endfor,(_cyc_sB,1-i),(_com,_len_ee)); endfor
Ph:=Ph1:='(?6,-2=dl,-4=dl,-6=dl); Ph2:='(?6,-1=dl,-3=dl,-5=dl);
-!:=!1:='((_mk_bond,_arg_ang)); !!:='(!~db); !!!:='(!~tm);
+!:=!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
Me:='(); Et:='(!); iPr:=?!:='(/_,!); tBu:=??!:='(/_,/_^60,60); !?!:='(!,?!); !??!:='(!,??!);
+n_:='((_set_add,ASCII("-"))); p_:='((_set_add,ASCII("+")));
+zero_wf:='(0~wf); zero_zf:='(0~zf); zero_dm:='(0~dm); zero_wv:='(0~wv);
%-------------------------------------------------------------------------------------------------
NH:='(N,/H~nl); N!:='(N,/_); N!2:='(N,/!); SO:='(S,//O); SOO:='(S,//O^-35,//O^35);
O!:='(O,!); O!2:='(O,!,!); O!3:='(O,!,!,!); O!?!:='(O,!,?!); O!??!:='(O,!,??!);
@@ -1744,4 +1783,27 @@ def expand_set=
!CH3:='(!,CH3); !OH:='(!,OH); !NH2:='(!,NH2); !CHO:='(!,CHO); !COOH:='(!,COOH); !CN:='(!,CN);
!SH:='(!,SH); !NO2:='(!,NO2);
enddef;
-%-------------------------------------------------------------------------------------------------
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+vardef check_mc(expr s)= %%%%% prototype version %%%%%%
+ save mc_char,mc_char,temp_c,err_cnt,char_cnt;
+ string temp_c;
+ numeric mc_char[];
+ err_cnt:=char_cnt:=nA:=nB:=nC:=nD:=nE:=nF:=0;
+ %-----------------------------------------------------------------------------------------------
+ for i=1 upto length(s):
+ temp_c:=subc(i,s); if temp_c<>" ": char_cnt:=char_cnt+1; mc_char[char_cnt]:=ASCII(temp_c); fi
+ endfor
+ %-- check brackets -----------------------------------------------------------------------------
+ for i=1 upto char_cnt:
+ if mc_char[i]=a_paren_s: nA:=nA+1; ef mc_char[i]=a_paren_e: nB:=nB+1;
+ ef mc_char[i]=a_brace_s: nC:=nC+1; ef mc_char[i]=a_brace_e: nD:=nD+1;
+ ef mc_char[i]=a_bracket_s: nE:=nE+1; ef mc_char[i]=a_bracket_e: nF:=nF+1;
+ fi
+ endfor
+ if nA<>nB: err_cnt:=err_cnt+1; fi if nC<>nD: err_cnt:=err_cnt+1; fi
+ if nE<>nF: err_cnt:=err_cnt+1; fi
+ %-----------------------------------------------------------------------------------------------
+ if err_cnt>=1: message "* "&decimal(err_cnt)&"fatal error"; fi
+ err_cnt
+enddef;
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/graphics/mcf2graph/mcf_exa_soc.mf b/graphics/mcf2graph/mcf_exa_soc.mf
index b167564775..65420533fc 100644
--- a/graphics/mcf2graph/mcf_exa_soc.mf
+++ b/graphics/mcf2graph/mcf_exa_soc.mf
@@ -1,8 +1,8 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Molecular Coding Format for mcf_example.tex by Akira Yamaji 2021.02.11
+% Molecular Coding Format for mcf_example.tex by Akira Yamaji 2021.02.21
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-input mcf2graph.mf; %%% it must be version 4.57
-message "* mcf_exa_soc 2021.02.11";
+input mcf2graph.mf; %%% it must be version 4.58
+message "* mcf_exa_soc 2021.02.21";
message "";
%-------------------------------------------------------------------------
fsize:=(35mm,24mm);
@@ -29,12 +29,7 @@ tag1:="F"; tag2:="C"; tag3:="fm"; tag4:="mw"; tag5:="EN"; tag6:="MW";
%%%% for i=nA step nA until w: draw(i,0)--(i,h); endfor
%%%% for i=nA step nA until h: draw(0,i)--(w,i); endfor );
%---------------------------------------------------------------------------
-%%%%sw_calc:=1;
-%%%%ext(defaultfont:="uhvr8r"; defaultscale:=.3;
-%%%% label.lrt(decimal(char_num)&":"&inf_EN&" MW="&cal_MW
-%%%% if (inf_MW<>"-")and(cen_MW<40):
-%%%% &"("& decimal(num_MW-scantokens(inf_MW))&")"
-%%%% else: &"(-)" fi ,(-2bp,1.5bp));)
+%%%%ext(defaultfont:="uhvr8r"; defaultscale:=.3; label.lrt(mc,(-2bp,1.5bp));)
%***************************************************************************
beginfont("EN:Adenine","MW:135.13")
MC(<30,?6,3=?5,{1,3,5,9}=dl,{2,6,9}:N,5:/NH2,7:NH)
@@ -116,8 +111,8 @@ endfont
%***************************************************************************
beginfont("EN:Thiamine","MW:300.81")
MC(<30,Ph,4:/NH2,@3,\`1,!,<-12,?5,{-1,-4}=dl,{1,5,8}:N,11:S,{6,9}:/_,
- @-3,\,!2,OH,8:"+"^72)
- MCat(.95,.75)(Cl,"-"^15)
+ @-3,\,!2,OH,8:p_^72)
+ MCat(.95,.75)(Cl,n_^15)
endfont
%**************************************************************************
beginfont("EN:Gibberellin A3","MW:346.379");
@@ -183,8 +178,8 @@ beginfont("EN:Sudan red 1","MW:248.28")
endfont
%***************************************************************************
beginfont("EN:Basic blue 1","MW:319.86")
- MC(<30,Ph,3=Ph,6=Ph,2:S,5:N,{8,13}:/N?!,2:"+")
- MCat(1,.7)(Cl,"-"^15)
+ MC(<30,Ph,3=Ph,6=Ph,2:S,5:N,{8,13}:/N?!,2:p_)
+ MCat(1,.7)(Cl,n_^15)
endfont
%***************************************************************************
beginfont("EN:Disperse violet 1","MW:238.25")
@@ -240,9 +235,9 @@ beginfont("EN:Halfenprox","MW:477.4")
endfont
%***************************************************************************
beginfont("EN:Paraquat","MW:257.16")
- MC(Ph,@4,\,Ph,{1,10}:N!,1:"+"^-90,10:"+"^90)
- MCat(1,.75)(Cl,"-"^15)
- MCat(1,.60)(Cl,"-"^15)
+ MC(Ph,@4,\,Ph,{1,10}:N!,1:p_^-90,10:p_^90)
+ MCat(1,.75)(Cl,n_^15)
+ MCat(1,.60)(Cl,n_^15)
endfont
%***************************************************************************
beginfont("EN:Picolinafen","MW:376.331")
@@ -484,9 +479,9 @@ endfont
%***************************************************************************
beginfont("EN:Cefalonium","MW:458.5107")
MC(<45,?4,-3=?6,-4=dl,2:N,8:S,
- 3^45:/*H,1://O^15,@5,\*,//O,!,O,"-"^40,
+ 3^45:/*H,1://O^15,@5,\*,//O,!,O,n_^40,
@4,*\^15,NH,!,//O,!2,?5,{-1,-3}=dl,-4:S,
- @6,\,!,|,Ph,1:N,1:"+"^180,@4,\,//O,!,NH2)
+ @6,\,!,|,Ph,1:N,1:p_^180,@4,\,//O,!,NH2)
endfont
%***************************************************************************
beginfont("EN:Cefazorin","MW:454.51")
@@ -498,9 +493,9 @@ endfont
%***************************************************************************
beginfont("EN:Cefquinome","MW:528.6")
MC(<45,?4,-3=?6,-4=dl,2:N,8:S,
- 3^45:/*H,1://O^15,@5,\*,//O,!,O,"-"^40,
+ 3^45:/*H,1://O^15,@5,\*,//O,!,O,n_^40,
@4,*\^15,NH,!,//O,!,//'(N,!,O,!),!,?5,{-2,-5}=dl,-3:S,-1:N,-2:/NH2,
- @6,\,!,Ph,-2=?6,-10:N,-10:"+"^180)
+ @6,\,!,Ph,-2=?6,-10:N,-10:p_^180)
endfont
%***************************************************************************
beginfont("EN:Ceftiofur","MW:523.5626")
@@ -803,7 +798,7 @@ beginfont("EN:illudin S","MW:264.3")
endfont
%***************************************************************************
beginfont("EN:Muscarine","MW:174.26")
- MC(<18,?5,2:O,1:*/_,5:/*OH,@3,*\,48,N,??,"+"^180,!)
+ MC(<18,?5,2:O,1:*/_,5:/*OH,@3,*\,48,N,??,p_^180,!)
endfont
%***************************************************************************
beginfont("EN:Psilocybin","MW:284.248")
diff --git a/graphics/mcf2graph/mcf_example.pdf b/graphics/mcf2graph/mcf_example.pdf
index 71e5a0dfb0..ba142e9818 100644
--- a/graphics/mcf2graph/mcf_example.pdf
+++ b/graphics/mcf2graph/mcf_example.pdf
Binary files differ
diff --git a/graphics/mcf2graph/mcf_man_soc.mf b/graphics/mcf2graph/mcf_man_soc.mf
index 0f99177e28..3a2da782e2 100644
--- a/graphics/mcf2graph/mcf_man_soc.mf
+++ b/graphics/mcf2graph/mcf_man_soc.mf
@@ -1,128 +1,134 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Molecular Coding Format file for mcf_manual.tex by Akira.Yamaji 2021.02.11
+% Molecular Coding Format file for mcf_manual.tex by Akira.Yamaji 2021.02.21
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-input mcf2graph.mf; %% it must be version 4.57
-message "mcf_man_soc 2021.01.31"; message "";
+input mcf2graph.mf; %% it must be version 4.578
+message "mcf_man_soc 2021.02.21"; message "";
%------------------------------------------------------------------------
sw_mframe:=0;
sw_expand:=0;
%%%%sw_aux_out:=0;
%%%%sw_rep_out:=1;
-%ext(defaultscale:=.5; label.bot(decimal(char_num)&":"&inf_EN,(.5w,0));)
+%%%%ext(defaultscale:=.5; label.bot(decimal(char_num)&":"&inf_EN,(.5w,0));)
+%%%%ext(defaultscale:=.5; label.bot(mc,(.5w,0));)
%***********************************************************************
fsize:=(40mm,25mm);
blength:=6mm;
%***********************************************************************
-beginfont("EN:Glycine")
- MC(<30,NH2,!2,COOH)
+beginfont("EN:Glycine",":<30,NH2,!2,COOH")
+ if check_mc(mc)=0: MC(scantokens(mc)) fi
endfont
%***********************************************************************
-beginfont("EN:L-Alanine")
- MC(<30,NH2,!~wb,/_,!,COOH)
+beginfont("EN:L-Alanine",":<30,NH2,!~wb,/_,!,COOH")
+ if check_mc(mc)=0: MC(scantokens(mc)) fi
endfont
%***********************************************************************
-beginfont("EN:L-Valine")
- MC(<30,NH2,!~wb,/!?!,!,COOH)
+beginfont("EN:L-Valine",":<30,NH2,!~wb,/!?!,!,COOH")
+ if check_mc(mc)=0: MC(scantokens(mc)) fi
endfont
%***********************************************************************
-beginfont("EN:L-Leucine")
- MC(<30,NH2,!~wb,/!?!,!,COOH)
+beginfont("EN:L-Leucine",":<30,NH2,!~wb,/!?!,!,COOH")
+ if check_mc(mc)=0: MC(scantokens(mc)) fi
endfont
%***********************************************************************
-beginfont("EN:L-Isoleucine")
- MC(<30,NH2,!~wb,/'(/*_,!2),!,COOH)
+beginfont("EN:L-Isoleucine",":<30,NH2,!~wb,/'(/*_,!2),!,COOH")
+ if check_mc(mc)=0: MC(scantokens(mc)) fi
endfont
%***********************************************************************
-beginfont("EN:L-Serine")
- MC(<30,NH2,!~wb,/!OH,!,COOH)
+beginfont("EN:L-Serine",":<30,NH2,!~wb,/!OH,!,COOH")
+ if check_mc(mc)=0: MC(scantokens(mc)) fi
endfont
%***********************************************************************
-beginfont("EN:L-Threonine")
- MC(<30,NH2,!~wb,/'(/_,!~wf,OH),!,COOH)
+beginfont("EN:L-Threonine",":<30,NH2,!~wb,/'(/_,!~wf,OH),!,COOH")
+ if check_mc(mc)=0: MC(scantokens(mc)) fi
endfont
%***********************************************************************
-beginfont("EN:L-Cysteine")
- MC(<30,NH2,!~wb,/!SH,!,COOH)
+beginfont("EN:L-Cysteine",":<30,NH2,!~wb,/!SH,!,COOH")
+ if check_mc(mc)=0: MC(scantokens(mc)) fi
endfont
%***********************************************************************
-beginfont("EN:L-Methionine")
- MC(<30,NH2,!~wb,/'(!2,S,!),!,COOH)
+beginfont("EN:L-Methionine",":<30,NH2,!~wb,/'(!2,S,!),!,COOH")
+ if check_mc(mc)=0: MC(scantokens(mc)) fi
endfont
%***********************************************************************
-beginfont("EN:L-Phenylalanine")
- MC(<30,NH2,!~wb,/!Ph,!,COOH)
+beginfont("EN:L-Phenylalanine",":<30,NH2,!~wb,/!Ph,!,COOH")
+ if check_mc(mc)=0: MC(scantokens(mc)) fi
endfont
%***********************************************************************
-beginfont("EN:L-Tyrosine")
- MC(<30,NH2,!~wb,/'(!Ph,-3:/OH),!,COOH)
+beginfont("EN:L-Tyrosine",":<30,NH2,!~wb,/'(!Ph,-3:/OH),!,COOH")
+ if check_mc(mc)=0: MC(scantokens(mc)) fi
endfont
%***********************************************************************
-beginfont("EN:L-Triptophan")
- MC(<30,NH2,!~wb,!,COOH,@2,\,!,<24,|,?5,-4=Ph,2=dr,5=dl,4:NH)
+beginfont("EN:L-Triptophan",
+ ":<30,NH2,!~wb,!,COOH,@2,\,!,<24,|,?5,-4=Ph,2=dr,5=dl,4:NH")
+ if check_mc(mc)=0: MC(scantokens(mc)) fi
endfont
%***********************************************************************
-beginfont("EN:L-Prorine")
- MC(<18,?5,3:NH,4:*/COOH)
+beginfont("EN:L-Prorine",":<18,?5,3:NH,4:*/COOH")
+ if check_mc(mc)=0: MC(scantokens(mc)) fi
endfont
%***********************************************************************
-beginfont("EN:L-Glutamine")
- MC(<30,NH2,!~wb,!,COOH,@2,\`1,!`1,!,//O,!,NH2)
+beginfont("EN:L-Glutamine",
+ ":<30,NH2,!~wb,!,COOH,@2,\`1,!`1,!,//O,!,NH2")
+ if check_mc(mc)=0: MC(scantokens(mc)) fi
endfont
%***********************************************************************
-beginfont("EN:L-Asparagine")
- MC(<30,NH2,!~wb,/'(!,//O,!,NH2),!,COOH)
+beginfont("EN:L-Asparagine",":<30,NH2,!~wb,/'(!,//O,!,NH2),!,COOH")
+ if check_mc(mc)=0: MC(scantokens(mc)) fi
endfont
%***********************************************************************
-beginfont("EN:L-Aspartic acid")
- MC(<30,NH2,!~wb,/!COOH,!,COOH)
+beginfont("EN:L-Aspartic acid",":<30,NH2,!~wb,/!COOH,!,COOH")
+ if check_mc(mc)=0: MC(scantokens(mc)) fi
endfont
%***********************************************************************
-beginfont("EN:L-Glutamic acid")
- MC(<30,NH2,!~wb,/'(!2,COOH),!,COOH)
+beginfont("EN:L-Glutamic acid",":<30,NH2,!~wb,/'(!2,COOH),!,COOH")
+ if check_mc(mc)=0: MC(scantokens(mc)) fi
endfont
%***********************************************************************
-beginfont("EN:L-Lysine")
- MC(<30,NH2,!~wb,/'(!4,NH2),!,COOH)
+beginfont("EN:L-Lysine",":<30,NH2,!~wb,/'(!4,NH2),!,COOH")
+ if check_mc(mc)=0: MC(scantokens(mc)) fi
endfont
%***********************************************************************
-beginfont("EN:L-Arginine")
- MC(<30,NH2,!~wb,!,COOH,@2,\`1,!`1,!2,NH,!,//NH,!,NH2)
+beginfont("EN:L-Arginine",
+ ":<30,NH2,!~wb,!,COOH,@2,\`1,!`1,!2,NH,!,//NH,!,NH2")
+ if check_mc(mc)=0: MC(scantokens(mc)) fi
endfont
%***********************************************************************
-beginfont("EN:L-Hystidine")
- MC(<30,NH2,!~wb,!,COOH,@2,\,!,|,?5,{1,3}=dl,3:N,5:NH)
+beginfont("EN:L-Hystidine",
+ ":<30,NH2,!~wb,!,COOH,@2,\,!,|,?5,{1,3}=dl,3:N,5:NH")
+ if check_mc(mc)=0: MC(scantokens(mc)) fi
endfont
%***********************************************************************
-beginfont("EN:L-DOPA")
- MC(<30,NH2,!~wb,!,COOH,@2,\,!,Ph,{-3,-4}:/OH)
+beginfont("EN:L-DOPA",":<30,NH2,!~wb,!,COOH,@2,\,!,Ph,{-3,-4}:/OH")
+ if check_mc(mc)=0: MC(scantokens(mc)) fi
endfont
%***********************************************************************
-beginfont("EN:Ornithine")
- MC(<30,NH2,!~wb,/'(!3,NH2),!,COOH)
+beginfont("EN:Ornithine",":<30,NH2,!~wb,/'(!3,NH2),!,COOH")
+ if check_mc(mc)=0: MC(scantokens(mc)) fi
endfont
%***********************************************************************
-beginfont("EN:Citrulline")
- MC(<30,NH2,!~wb,/'(!3,NH,!,//O,!,NH2),!,COOH)
+beginfont("EN:Citrulline",":<30,NH2,!~wb,/'(!3,NH,!,//O,!,NH2),!,COOH")
+ if check_mc(mc)=0: MC(scantokens(mc)) fi
endfont
%***********************************************************************
-beginfont("EN:GABA")
- MC(<30,NH2,!4,COOH)
+beginfont("EN:GABA",":<30,NH2,!4,COOH")
+ if check_mc(mc)=0: MC(scantokens(mc)) fi
endfont
%***********************************************************************
-beginfont("EN:amino Levulinic acid")
- MC(<30,NH2,!2,//O,!3,COOH)
+beginfont("EN:amino Levulinic acid",":<30,NH2,!2,//O,!3,COOH")
+ if check_mc(mc)=0: MC(scantokens(mc)) fi
endfont
%***********************************************************************
-beginfont("EN:4-amino benzoic acid")
- MC(<30,Ph,1:/NH2,4:/COOH)
+beginfont("EN:4-amino benzoic acid",":<30,Ph,1:/NH2,4:/COOH")
+ if check_mc(mc)=0: MC(scantokens(mc)) fi
endfont
%***********************************************************************
-beginfont("EN:L-Carboxyl glutamic acid")
- MC(<30,NH2,!~wb,/'(!,/COOH,!,COOH),!,COOH)
+beginfont("EN:L-Carboxyl glutamic acid",
+ ":<30,NH2,!~wb,/'(!,/COOH,!,COOH),!,COOH")
+ if check_mc(mc)=0: MC(scantokens(mc)) fi
endfont
%***********************************************************************
-beginfont("EN:L-Hydroxy Prorine")
- MC(<18,?5,1:/OH,3:NH,4:*/COOH)
+beginfont("EN:L-Hydroxy Prorine",":<18,?5,1:/OH,3:NH,4:*/COOH")
+ if check_mc(mc)=0: MC(scantokens(mc)) fi
endfont
%***********************************************************************
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -376,7 +382,7 @@ endfont
beginfont("EN:Charged atom")
sw_trimming:=1;
fsize:=(60mm,12mm);
- MC(<-30,!2,N,??,"+",!2,S,"-"^180,!6,7:N,7:??,9:S,7:"+",9:"-"^180)
+ MC(<-30,!2,N,??,p_,!2,S,n_^180,!6,7:N,7:??,9:S,7:p_,9:n_^180)
endfont
%***********************************************************************
beginfont("EN:fused ring")
@@ -883,25 +889,25 @@ beginfont("EN:Switwch bondtype off")
endfont
%***********************************************************************
beginfont("EN:Switwch font frame 1")
- fsize:=(40mm,10mm);
+ fsize:=(30mm,10mm);
fmargin:=(5mm,1.5mm);
sw_fframe:=1;
MC(<30,Ph)
endfont
beginfont("EN:Switwch font frame 2")
- fsize:=(40mm,10mm);
+ fsize:=(30mm,10mm);
fmargin:=(5mm,1.5mm);
sw_fframe:=2;
MC(<30,Ph)
endfont
beginfont("EN:Switwch font frame 3")
- fsize:=(40mm,10mm);
+ fsize:=(30mm,10mm);
fmargin:=(5mm,1.5mm);
sw_fframe:=3;
MC(<30,Ph)
endfont
beginfont("EN:Switwch font frame 4")
- fsize:=(40mm,10mm);
+ fsize:=(30mm,10mm);
fmargin:=(5mm,1.5mm);
sw_fframe:=4;
MC(<30,Ph)
@@ -962,23 +968,33 @@ endfont
%-----------------------------------------------------------------------
beginfont("EN:MCat()")
defaultsize:=5bp;
- fsize:=(75mm,75mm);
+ fsize:=(40mm,40mm);
fmargin:=(3mm,3mm);
- blength:=0.07;
+ blength:=0.1;
sw_fframe:=1;
mangle:=0;
- for i=1 step -0.25 until 0:
- for j=0 step 0.25 until 1:
+ for i=1 step -0.5 until 0:
+ for j=0 step 0.5 until 1:
MCat(j,i)(Ph,4:N)
add(
drawarrow((A1+A1up**aw)..A1);
label(decimal(mangle),p0+(0.5w,0.5h));
)
- mangle:=mangle+15;
+ mangle:=mangle+30;
endfor
endfor
endfont
%***********************************************************************
+beginfont("EN:Pyridine",":<30,Ph,2:N")
+ fsize:=(12mm,12mm);
+ if check_mc(mc)=0: MC(scantokens(mc)) fi
+endfont
+%-----------------------------------------------------------------------
+beginfont("EN:Pyridine",":<30,Ph,2):N")
+ fsize:=(12mm,12mm);
+ if check_mc(mc)=0: MC(scantokens(mc)) fi
+endfont
+%***********************************************************************
beginfont("EN:add() 1")
fsize:=(70mm,43mm);
sw_aframe:=sw_mframe:=1;
@@ -1097,102 +1113,115 @@ beginfont("EN:?6")
endfont
defaultsize:=save_defaultsize;
%***************************************************************************
-beginfont("EN:Luciferin","MW:280.33")
- fsize:=(60mm,20mm);
- MC(
- <30,Ph,3=?5,@8,\,?5,{9,16}=dl,
- {9,14}:N,{7,11}:S,1:/OH,-2:*/COOH
- )
+beginfont("EN:Luciferin","MW:280.33",
+ %---------------------------------------
+ ": <30,Ph,3=?5,@8,\,?5,{9,16}=dl, ",
+ ": {9,14}:N,{7,11}:S,1:/OH,-2:*/COOH ")
+ %---------------------------------------
+ fsize:=(50mm,15mm);
+ if check_mc(mc)=0: MC(scantokens(mc)) fi
endfont
%***************************************************************************
-beginfont("EN:Colchicine","MW:385.41")
- fsize:=(60mm,25mm);
- MC(
- <30,Ph,{1,2,6}:/O!,-4=?7,-5=?7,{-1,-4,-6}=dl,-2://O,-3:/O!,
- @9,\,NH,!,//O,!
- )
+beginfont("EN:Colchicine","MW:385.41",
+ %---------------------------------------
+ ": <30,Ph,{1,2,6}:/O!,-4=?7,-5=?7, ",
+ ": {-1,-4,-6}=dl,-2://O,-3:/O!, ",
+ ": @9,\,NH,!,//O,! ")
+ %---------------------------------------
+ fsize:=(50mm,20mm);
+ if check_mc(mc)=0: MC(scantokens(mc)) fi
endfont
%***************************************************************************
-beginfont("EN:Paclitaxel","MW:853.91")
- MC(
- ?6,5=dl,@3,#1,36,45,45,45,45,##,
- &($5),-4=?6,-4=?4,-1=wb,-3=wf,-1:O,||,
- 4:??,6:/_,{3^-60,15}:*/OH,8:/*H^-60,
- 9:*/_^60,10://O,
- @1,\,O,!,//O,!,*/OH,!,/Ph,60~wf,NH,-60,//O,60,Ph,
- @7,\*,O,-45,//O,60,Ph,@11,*\,O,-60,//O,60,
- @12,\*^-15,O,60,//O,-60
- )
+beginfont("EN:Paclitaxel","MW:853.91",
+ %------------------------------------------------------
+ ": ?6,5=dl,@3,#1,36,45,45,45,45,##, ",
+ ": &($5),-4=?6,-4=?4,-1=wb,-3=wf,-1:O,||, ",
+ ": 4:??,6:/_,{3^-60,15}:*/OH,8:/*H^-60, ",
+ ": 9:*/_^60,10://O, ",
+ ": @1,\,O,!,//O,!,*/OH,!,/Ph,60~wf,NH,-60,//O,60,Ph, ",
+ ": @7,\*,O,-45,//O,60,Ph,@11,*\,O,-60,//O,60, ",
+ ": @12,\*^-15,O,60,//O,-60 ")
+ %------------------------------------------------------
+ fsize:=(50mm,25mm);
+ if check_mc(mc)=0: MC(scantokens(mc)) fi
endfont
%***************************************************************************
-beginfont("EN:Lycorine","MW:287.31")
- fsize:=(60mm,25mm);
- MC(<30,
- Ph,-4=?6,-2=?6,6=?5,(9,12)=?5[3],
- 13=dl,8:N,{15,17}:O,
- 9:/*H^180,10:*/H^60,13:*/OH,14:/*OH
- )
-endfont
-%***********************************************************************
-beginfont("EN:Gibberellin A3","MW:346.37");
- fsize:=(60mm,20mm);
- MC(
- <18,?5,3=?7,5=?6[12],@8,160`1.3,&3,
- 13=dl,6=wf,8=wb,
- @5,40~zf`1,O,50,//O^180,&14~zb,
- 2:/COOH,7://_,13:*/OH,8:/*OH,
- 14:*/_,{1,4}:*/H^60
- )
+beginfont("EN:Lycorine","MW:287.31",
+ %-----------------------------------------
+ ": <30,Ph,-4=?6,-2=?6,6=?5,(9,12)=?5[3], ",
+ ": 13=dl,8:N,{15,17}:O, ",
+ ": 9:/*H^180,10:*/H^60,13:*/OH,14:/*OH ")
+ %-----------------------------------------
+ fsize:=(50mm,20mm);
+ if check_mc(mc)=0: MC(scantokens(mc)) fi
+endfont
+%***********************************************************************
+beginfont("EN:Gibberellin A3","MW:346.37",
+ %----------------------------------------
+ ": <18,?5,3=?7,5=?6[12],@8,160`1.3,&3, ",
+ ": 13=dl,6=wf,8=wb, ",
+ ": @5,40~zf`1,O,50,//O^180,&14~zb, ",
+ ": 2:/COOH,7://_,13:*/OH,8:/*OH, ",
+ ": 14:*/_,{1,4}:*/H^60 ")
+ %----------------------------------------
+ fsize:=(50mm,18mm);
+ if check_mc(mc)=0: MC(scantokens(mc)) fi
endfont
%***************************************************************************
-beginfont("EN:Quinine","MW:324.42")
- fsize:=(60mm,25mm);
- MC(
- <30,Ph,3=Ph,7:N,6:/O!,
- @10,\,*/OH,/H~zf^-60,!,
- |,?6,2:N,1:*/H^60,4:*/!!,
- @2,165~zf,60,&5~zb
- )
+beginfont("EN:Quinine","MW:324.42",
+ %----------------------------------------
+ ": <30,Ph,3=Ph,7:N,6:/O!, ",
+ ": @10,\,*/OH,/H~zf^-60,!, ",
+ ": |,?6,2:N,1:*/H^60,4:*/!!, ",
+ ": @2,165~zf,60,&5~zb ")
+ %----------------------------------------
+ fsize:=(50mm,20mm);
+ if check_mc(mc)=0: MC(scantokens(mc)) fi
endfont
%***************************************************************************
sw_calc:=1;
ext(defaultfont:="uhvr8r"; defaultscale:=.75;
- label.urt("NO = "&decimal(char_num),(0.1w,0.60h));
- label.urt("EN = "&inf_EN ,(0.1w,0.56h));
- label.urt("MW = "&inf_MW ,(0.1w,0.52h));
- label.urt("mw = "&cal_MW ,(0.1w,0.48h));
- label.urt("fm = "&cal_FM ,(0.1w,0.44h));
- label.urt("w = "&decimal(w) ,(0.1w,0.40h));
- label.urt("h = "&decimal(h) ,(0.1w,0.36h));
- label.urt("n = "&decimal(n) ,(0.1w,0.32h));
+ label.urt("NO = "&decimal(char_num),(0.01w,0.60h));
+ label.urt("EN = "&inf_EN ,(0.01w,0.57h));
+ label.urt("MW = "&inf_MW ,(0.01w,0.54h));
+ label.urt("mw = "&cal_MW ,(0.01w,0.51h));
+ label.urt("fm = "&cal_FM ,(0.01w,0.48h));
+ label.urt("w = "&decimal(w) ,(0.01w,0.45h));
+ label.urt("h = "&decimal(h) ,(0.01w,0.42h));
+ label.urt("n = "&decimal(n) ,(0.01w,0.39h));
label.urt("ratio_thickness_bond = "&decimal(ratio_thickness_bond),
- (0.1w,0.28h));
+ (0.01w,0.36h));
label.urt("ratio_atom_bond = "&decimal(ratio_atom_bond),
- (0.1w,0.24h));
+ (0.01w,0.33h));
label.urt("ratio_bondgap_bond = "&decimal(ratio_bondgap_bond),
- (0.1w,0.20h));
+ (0.01w,0.30h));
label.urt("ratio_chain_ring = "&decimal(ratio_chain_ring),
- (0.1w,0.16h));
- label.urt("sw_fframe = "&decimal(sw_fframe),(0.1w,0.12h));
- label.urt("sw_aframe = "&decimal(sw_aframe),(0.1w,0.08h));
- label.urt("sw_trimming = "&decimal(sw_trimming),(0.1w,0.04h));
+ (0.01w,0.27h));
+ label.urt("sw_fframe = "&decimal(sw_fframe),(0.01w,0.24h));
+ label.urt("sw_aframe = "&decimal(sw_aframe),(0.01w,0.21h));
+ label.urt("sw_trimming = "&decimal(sw_trimming),(0.01w,0.18h));
+ label.urt("mc1 ="&mc1,(0.01w,0.12h));
+ label.urt("mc2 ="&mc2,(0.01w,0.09h));
+ label.urt("mc3 ="&mc3,(0.01w,0.06h));
)
%***************************************************************************
-beginfont("EN:Ampicillin","MW:349.405")
- fsize:=(60mm,90mm);
- MCat(0.5,1)(<45,?4,-3=?5,2:N,7:S,
- {3^45,4^-45}:/*H,1://O^15,5:/*COOH^-18,6:??,
- @4,*\^75,NH,!,//O,!,/*NH2,!,Ph)
+beginfont("EN:Ampicillin","MW:349.405",
+": <45,?4,-3=?5,2:N,7:S,",
+": 3^45:/*H,1://O^15,5:/*COOH^-18,6:??,",
+": @4,*\^15,NH,!,//O,!,/*NH2,!,Ph"
+)
+ fsize:=(72mm,110mm);
+ blength:=7mm;
+ if check_mc(mc)=0: MCat(0.5,0.95)(scantokens(mc)) fi
endfont
%***************************************************************************
-beginfont("EN:Cholesterol","CAS:57-88-5","FM:C27H46O","MW:386.65")
- fsize:=(60mm,90mm);
- MCat(0.5,1)(
- <30,?6,{-4,-2}=?6,-4=?5,7=dl,
- 1:*/OH,{4,12}:*/_^60,9:*/H^60,
- 10:/*H^180,11:/*H^-60,17:/*H^-54,
- @-1,18,/*_,-60,!3,?!
- )
+beginfont("EN:Cholesterol","MW:386.65",
+ ": <30,?6,{-4,-2}=?6,-4=?5,7=dl, ",
+ ": 10:/*H^180,11:/*H^-60,17:/*H^-54, ",
+ ": 1:*/OH,{4,12}:*/_^60,@-1,18,/*_,-60,!3,?!")
+ fsize:=(72mm,110mm);
+ blength:=7mm;
+ if check_mc(mc)=0: MCat(0.5,0.95)(scantokens(mc)) fi
endfont
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
bye
diff --git a/graphics/mcf2graph/mcf_manual.pdf b/graphics/mcf2graph/mcf_manual.pdf
index 9e3950eeff..5b295a87bb 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 ef6c9b124f..aea619862a 100644
--- a/graphics/mcf2graph/mcf_manual.tex
+++ b/graphics/mcf2graph/mcf_manual.tex
@@ -1,5 +1,5 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Molecular Coding Format manual by Akira Yamaji 2021.02.11
+% Molecular Coding Format manual by Akira Yamaji 2021.02.21
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\documentclass[a4paper]{article}
\usepackage[pdftex]{graphicx}
@@ -52,9 +52,9 @@
}%
%---------------------------------------------------------------------------
\def\put@char{%
- \begin{picture}(75,110)%
- \put(0,100){\bf [\NO]\EN}%
- \put(5,95){\small\tt FM:\fm{ }MW:\mw}%
+ \begin{picture}(75,130)%
+ \put(0,120){\bf [\NO]\EN}%
+ \put(5,115){\small\tt FM:\fm{ }MW:\mw}%
\put(5,0){\font\@strufont=\File\relax%
\hbox{\@strufont\char\Char}}%
\end{picture}%
@@ -394,10 +394,10 @@ exact mass, molecular formula.
%-----------------------------------------------------------------------------
\subsubsection{Charged atom}
\begin{verbatim}
- "+" : positive / "-" : negative
+ p_ : positive / n_ : negative
-<-30,!2,N,??,"+",!2,S,"-"^180,
-!6,7:N,7:??,9:S,7:"+",9:"-"^180
+<-30,!2,N,??,p_,!2,S,n_^180,
+!6,7:N,7:??,9:S,7:n_,9:n_^180
\end{verbatim}
\MCFgraph
%-----------------------------------------------------------------------------
@@ -902,7 +902,7 @@ exact mass, molecular formula.
0.06 0.12 0.20
\end{verbatim}
%-----------------------------------------------------------------------------
-\newpage
+%%\newpage
%-----------------------------------------------------------------------------
\subsection{Drawing mode}
%-----------------------------------------------------------------------------
@@ -989,7 +989,7 @@ MCat(1, .5)(<30,Ph,4:/COOH,3:/NH2)
\end{verbatim}
\MCFgraph
\begin{verbatim}
- (Draw frame inside margin)
+ (Frame inside margin)
sw_fframe=2
\end{verbatim}
\MCFgraph
@@ -999,7 +999,7 @@ MCat(1, .5)(<30,Ph,4:/COOH,3:/NH2)
\end{verbatim}
\MCFgraph
\begin{verbatim}
- (Draw small dot at corner)
+ (Small dot at corner)
sw_fframe=4
\end{verbatim}
\MCFgraph
@@ -1018,6 +1018,28 @@ MCat(1, .5)(<30,Ph,4:/COOH,3:/NH2)
MC(<30,COOH,!,COOH)
\end{verbatim}
\MCFgraph
+%-----------------------------------------------------------------------------
+\subsubsection{Remove indent}
+\index{sw\_indent\_off}%
+\begin{verbatim}
+ ** default sw_indent_off=0
+ beginfont(": Ph ",
+ ": ,{1,4}:N ",
+ ": ,{2,3}:/_ ")
+ endfont
+
+ mc1=" Ph"
+ mc2=" ,{1,4}:N"
+ mc3=" ,{2,3}:/_"
+
+ sw_indent_off=1
+ mc1="Ph"
+ mc2=",{1,4}:N"
+ mc3=",{2,3}:/_"
+
+ mc="Ph,{1,4}:N,{2,3}:/_" ** 0 or 1
+\end{verbatim}
+%-----------------------------------------------------------------------------
\newpage
%-----------------------------------------------------------------------------
\subsection{Parameter setting}
@@ -1085,36 +1107,53 @@ MCat(1, .5)(<30,Ph,4:/COOH,3:/NH2)
MCat(c,d)(....) :
- mposition:=(c,d);
- MC(....)
+ mposition:=(c,d); MC(....)
- c: x axis position
- d: y axis position
+ c: x axis position d: y axis position
- beginfont()
defaultsize:=5bp;
- fsize:=(75mm,75mm);
- fmargin:=(3mm,3mm);
- blength:=0.07;
- sw_fframe:=1;
+ fsize:=(40mm,40mm); fmargin:=(3mm,3mm);
+ blength:=0.1; sw_fframe:=1;
mangle:=0;
- for i=1 step -0.25 until 0:
- for j=0 step 0.25 until 1:
- %----------------
+ for i=1 step -0.5 until 0:
+ for j=0 step 0.5 until 1:
MCat(j,i)(Ph,4:N)
- %----------------
- add(
- drawarrow((A1+A1up**aw)..A1);
- label(decimal(mangle),
- p0+(0.5w,0.5h));
+ add(drawarrow((A1+A1up**aw)..A1);
+ label(decimal(mangle),
+ p0+(0.5w,0.5h));
)
- mangle:=mangle+15;
+ mangle:=mangle+30;
endfor
endfor
- endfont
\end{verbatim}
\MCFgraph
+%-----------------------------------------------------------------------------
+\subsection{Function check\_mc()}
+\index{check\_mc()}%
+\begin{verbatim}
+ (immediately compile)
+
+ beginfont("EN:Pyridine")
+ MC(Ph,<30,2:N)
+ endfont
+
+ (check mcf and compile)
+
+ beginfont("EN:Pyridine",":<30,Ph,2:N")
+ if check_mc(mc)=0: MC(scantokens(mc)) fi
+ endfont
+
+ ** error in mcf check_mc(mc)=1
+ beginfont("EN:Pyridine",":<30,Ph,2):N")
+ if check_mc(mc)=0: MC(scantokens(mc)) fi
+ endfont
+
+\end{verbatim}
+\MCFgraph\hspace{15mm}\MCFgraph
+\begin{verbatim}
+ check_mc(mc)=0 check_mc(mc)>=1
+\end{verbatim}
%===============================================================================
\newpage
\subsection{Function add()}
@@ -1380,44 +1419,51 @@ endfont
\section{MCF example}
%-----------------------------------------------------------------------------
\subsection{Luciferin}
-\begin{verbatim}
-beginfont("EN:Luciferin","MW:280.33")
- fsize:=(60mm,20mm);
- MC(
- <30,Ph,3=?5,@8,\,?5,{9,16}=dl,
- {9,14}:N,{7,11}:S,1:/OH,-2:*/COOH
- )
+\index{check\_mc()}%
+\begin{verbatim}
+beginfont("EN:Luciferin","MW:280.33",
+ %-------------------------------------
+ ": <30,Ph,3=?5,@8,\,?5,{9,16}=dl, ",
+ ": {9,14}:N,{7,11}:S,1:/OH,-2:*/COOH ")
+ %-------------------------------------
+ fsize:=(50mm,20mm);
+ if check_mc(mc)=0: MC(scantokens(mc)) fi
endfont
\end{verbatim}
\MCFgraph
%-----------------------------------------------------------------------------
\subsection{Colchicine}
\begin{verbatim}
-beginfont("EN:Colchicine","MW:385.41")
- fsize:=(60mm,25mm);
- MC(
- <30,Ph,{1,2,6}:/O!,-4=?7,
- -5=?7,{-1,-4,-6}=dl,
- -2://O,-3:/O!,
- @9,\,NH,!,//O,!
- )
+beginfont("EN:Colchicine","MW:385.41",
+ %-------------------------------------
+ ": <30,Ph,{1,2,6}:/O!,-4=?7,-5=?7, ",
+ ": {-1,-4,-6}=dl,-2://O,-3:/O!, ",
+ ": @9,\,NH,!,//O,! ")
+ %-------------------------------------
+ fsize:=(50mm,20mm);
+ if check_mc(mc)=0: MC(scantokens(mc)) fi
endfont
\end{verbatim}
\MCFgraph
%-----------------------------------------------------------------------------
\subsection{Paclitaxel}
\begin{verbatim}
-beginfont("EN:Paclitaxel","MW:853.91")
- MC(
- ?6,5=dl,@3,#1,36,45,45,45,45,##,
- &.$5,-4=?6,-4=?4,-1=wb,-3=wf,-1:O,||,
- {4^35,4^-35,6}:/_,{3^-60,15}:*/OH,
- 8:/*H^-60,9:*/_^60,10://O,
- @1,\,O,!,//O,!,*/OH,!,/Ph,
- 60~wf,NH,-60,//O,60,Ph,
- @7,\*,O,-45,//O,60,Ph,
- @11,*/OCO!>rl,12:/*OCO!^-15>lr
- )
+beginfont("EN:Paclitaxel","MW:853.91",
+ %------------------------------------
+ ": ?6,5=dl,@3,#1,36,45,45,45,45,##, ",
+ ": &.$5", ",
+ ": -4=?6,-4=?4,-1=wb,-3=wf,-1:O,||, ",
+ ": 4:??,6:/_,{3^-60,15}:*/OH, ",
+ ": 8:/*H^-60,", ",
+ ": 9:*/_^60,10://O, ",
+ ": @1,\,O,!,//O,!,*/OH,!,/Ph,60~wf, ",
+ ": NH,-60,//O,60,Ph, ",
+ ": @7,\*,O,-45,//O,60,Ph, ",
+ ": @11,*\,O,-60,//O,60, ",
+ ": @12,\*^-15,O,60,//O,-60 ")
+ %------------------------------------
+ fsize:=(50mm,25mm);
+ if check_mc(mc)=0: MC(scantokens(mc)) fi
endfont
\end{verbatim}
\MCFgraph
@@ -1425,27 +1471,30 @@ endfont
\subsection{Lycorine}
\begin{verbatim}
beginfont("EN:Lycorine","MW:287.31")
- fsize:=(60mm,25mm);
- MC(<30,
- Ph,-4=?6,-2=?6,6=?5,(9,12)=?5[3],
- 13=dl,8:N,{15,17}:O,
- 9:/*H^180,10:*/H^60,13:*/OH,14:/*OH
- )
+ %--------------------------------------
+ ": Ph,-4=?6,-2=?6,6=?5,(9,12)=?5[3], ",
+ ": 13=dl,8:N,{15,17}:O, ",
+ ": 9:/*H^180,10:*/H^60, ",
+ ": 13:*/OH,14:/*OH ")
+ %--------------------------------------
+ fsize:=(50mm,20mm);
+ if check_mc(mc)=0: MC(scantokens(mc)) fi
endfont
\end{verbatim}
\MCFgraph
%-----------------------------------------------------------------------------
\subsection{Gibberellin}
\begin{verbatim}
-beginfont("EN:Gibberellin","MW:346.37");
- fsize:=(60mm,20mm);
- MC(
- <18,?5,3=?7,5=?6[12],@8,160`1.3,&3,
- 13=dl,6=wf,8=wb,
- @5,40~zf`1,O,50,//O^180,&14~zb,
- 2:/COOH,7://_,13:*/OH,8:/*OH,
- 14:*/_,{1,4}:*/H^60
- )
+beginfont("EN:Gibberellin A3","MW:346.37");
+ %----------------------------------------
+ ": <18,?5,3=?7,5=?6[12],@8,160`1.3,&3, ",
+ ": 13=dl,6=wf,8=wb, ",
+ ": @5,40~zf`1,O,50,//O^180,&14~zb, ",
+ ": 2:/COOH,7://_,13:*/OH,8:/*OH, ",
+ ": 14:*/_,{1,4}:*/H^60 ")
+ %----------------------------------------
+ fsize:=(50mm,18mm);
+ if check_mc(mc)=0: MC(scantokens(mc)) fi
endfont
\end{verbatim}
\MCFgraph
@@ -1453,13 +1502,14 @@ endfont
\subsection{Quinine}
\begin{verbatim}
beginfont("EN:Quinine","MW:324.42")
- fsize:=(60mm,25mm);
- MC(
- <30,Ph,3=Ph,7:N,6:/O!,
- @10,\,*/OH,/H~zf^-60,!,
- |,?6,2:N,1:*/H^60,4:*/!!,
- @2,165~zf,60,&5~zb
- )
+ %-------------------------------
+ ": <30,Ph,3=Ph,7:N,6:/O!, ",
+ ": @10,\,*/OH,/H~zf^-60,!, ",
+ ": |,?6,2:N,1:*/H^60,4:*/!!, ",
+ ": @2,165~zf,60,&5~zb ")
+ %-------------------------------
+ fsize:=(50mm,20mm);
+ if check_mc(mc)=0: MC(scantokens(mc)) fi
endfont
\end{verbatim}
\MCFgraph
@@ -1486,33 +1536,45 @@ tag4:="fm"; >
outputformat:="png"; hppp:=vppp:=0.1; > PNG output
outputtemplate:="%j-%3c.png"; >
%-------------------------------------------------------------------------
-beginfont("N:1","EN:Ampicillin") > begin font(information)
- MC(<45,?4,2:N,2=?5,-1:S, > begin MCF (1)
- {3^45,4^-45}:/*H,1://O^15,5:/*COOH^-18,6:??, >
- @4,75,NH,!,//O,!,/*NH,!,Ph) > end MCF
+beginfont("EN:Ampicillin","MW:349.405", > information
+ %---------------------------------------- >
+ ": <45,?4,-3=?5,2:N,7:S, ", > mc1
+ ": 3^45:/*H,1://O^15,5:/*COOH^-18,6:??, ", > mc2
+ ": @4,*\^15,NH,!,//O,!,/*NH2,!,Ph ") > mc3
+ %---------------------------------------- >
+ if check_mc(mc)=0: MC(scantokens(mc)) fi > mc=mc1&mc2&mc3
endfont > end font
%------------------------------------------------------------------------
-beginfont("N:2","EN:Cholesterol") > begin font(information)
- MC(<30,?6,{-4,-2}=?6,-4=?5,7=dl, > begin MCF (2)
- 1:*/OH,{4,12}:*/_^60,9:*/H^60, >
- 10:/*H^180,{11,-1}:/*H^-60, >
- @-1,17,/*_,!4,?!) > end MCF
+beginfont("EN:Cholesterol","MW:386.65", >information
+ %---------------------------------------- >
+ ": <30,?6,{-4,-2}=?6,-4=?5,7=dl, ", > mc1
+ ": 10:/*H^180,11:/*H^-60,17:/*H^-54, ", > mc2
+ ": {4,12}:*/_^60, ", > mc3
+ ": @-1,18,/*_,-60,!3,?! ") > mc4
+ %---------------------------------------- >
+ if check_mc(mc)=0: MC(scantokens(mc)) fi > mc=mc1&mc2&mc3
endfont > end font
%------------------------------------------------------------------------
-beginfont("N:3","EN:Limonin") > begin font(information)
- MC(<30,?6,{-3,-4}=?6, > begin MCF (3)
- -5=?3,-2=wf,-1=wb,6=?5,-4=?6,-5=wf, >
- {13,15,17,20}:O,{3,12,21}://O, >
- {4~wf^60,8~zf^60,18^35,18^-35}:/_, >
- {1^60,5^180,16^60}:/*H, >
- @14,\*,|,?5,{1,4}=dl,3:O) > end MCF
+beginfont("EN:Limonin", > information
+ %----------------------------------------- >
+ ": <30,?6,{-3,-4}=?6, ", > mc1
+ ": -5=?3,-2=wf,-1=wb,6=?5,-4=?6,-5=wf, ", > mc2
+ ": {13,15,17,20}:O,{3,12,21}://O, ", > mc3
+ ": {4~wf^60,8~zf^60,18^35,18^-35}:/_, ", > mc4
+ ": {1^60,5^180,16^60}:/*H, ", > mc5
+ ": @14,\*,|,?5,{1,4}=dl,3:O) ") > mc6
+ %----------------------------------------- >
+ if check_mc(mc)=0: MC(scantokens(mc)) fi > mc=mc1 - mc6
endfont > end font
%------------------------------------------------------------------------
-beginfont("N:4","EN:beta-carotene) > begin font(information)
- MC(<30,?6,3=dl,{3,5^35,5^-35}:/_, > begin MCF (4)
- @4,\,|,!18,{1,3,5,7,9,11,13,15,17}=dr, >
- {3,7,12,16}:/_, >
- |,?6,6=dl,2:??,6:/_) > end MCF
+beginfont("EN:beta-carotene", > information
+ %------------------------------------------ >
+ ": <30,?6,3=dl,{3,5^35,5^-35}:/_, ", > mc1
+ ": @4,\,|,!18,{1,3,5,7,9,11,13,15,17}=dr, ", > mc2
+ ": {3,7,12,16}:/_, ", > mc3
+ ": |,?6,6=dl,2:??,6:/_) ") > mc4
+ %------------------------------------------ >
+ if check_mc(mc)=0: MC(scantokens(mc)) fi > mc=mc1 - mc4
endfont > end font
%------------------------------------------------------------------------
bye
@@ -1718,60 +1780,64 @@ M END
\subsection{LuaTeX file example}
%############################################################################
\begin{verbatim}
-%--------------------------------------------------------------------
\documentclass{article}
\usepackage{luamplib}%
+\usepackage[T1]{fontenc}%
+\usepackage{textcomp}%
\mplibcodeinherit{enable}%
\mplibverbatim{enable}%
-\everymplib{if unknown Ph1:
- input mcf2graph.mf;
- mp_log_name:="temp-info.aux";
- sw_aux_out:=1;
- fi}%
-%--------------------------------------------------------------------
+\mplibnumbersystem{double}%
+\everymplib{%
+ if unknown Ph1: input mcf2graph.mf; fi
+ sw_calc:=1; sw_fframe:=4; max_blength:=4.5mm;
+ defaultfont:="uhvr8r"; defaultsize:=8bp; defaultscale:=1;
+}%
\begin{document}
\noindent%
%--------------------------------------------------------------------
\begin{mplibcode}
fsize:=(50mm,50mm);
- beginfont("NO:1","EN:Limonin","MW:470.51")
- MC(<30,
- ?6,{-3,-4}=?6,
- -5=?3,-2=wf,-1=wb,6=?5,-4=?6,-5=wf,
- {13,15,17,20}:O,{3,12,21}://O,
- {4~wf^60,8~zf^60,18^35,18^-35}:/_,
- {1^60,5^180,16^60}:/*H,
- @14,\*,|,?5,{1,4}=dl,3:O
- )
+ beginfont("NO:1","EN:Limonin","MW:470.51",
+ %----------------------------------------
+ ": <30,?6,{-3,-4}=?6, ",
+ ": -5=?3,-2=wf,-1=wb,6=?5,-4=?6,-5=wf, ",
+ ": {13,15,17,20}:O,{3,12,21}://O, ",
+ ": {4~wf^60,8~zf^60,18^35,18^-35}:/_, ",
+ ": {1^60,5^180,16^60}:/*H, ",
+ ": @14,\*,|,?5,{1,4}=dl,3:O ")
+ %----------------------------------------
+ if check_mc(mc)=0: MC(scantokens(mc)) fi
endfont
\end{mplibcode}\\
%--------------------------------------------------------------------
\begin{mplibcode}
fsize:=(80mm,50mm);
- beginfont("NO:2","EN:beta-carotene","MW:536.87")
- MC(<30,
- ?6,3=dl,{3,5^35,5^-35}:/_,
- @4,\,|,!18,{1,3,5,7,9,11,13,15,17}=dr,
- {3,7,12,16}:/_,
- |,?6,6=dl,{6,2^35,2^-35}:/_
- )
+ beginfont("NO:2","EN:beta-carotene","MW:536.87",
+ %------------------------------------------
+ ": <30,?6,3=dl,{3,5^35,5^-35}:/_, ",
+ ": @4,\,|,!18,{1,3,5,7,9,11,13,15,17}=dr, ",
+ ": {3,7,12,16}:/_, ",
+ ": |,?6,6=dl,{6,2^35,2^-35}:/_ ")
+ %------------------------------------------
+ if check_mc(mc)=0: MC(scantokens(mc)) fi
endfont
\end{mplibcode}\\
%--------------------------------------------------------------------
\begin{mplibcode}
fsize:=(50mm,50mm);
- beginfont("NO:3","EN:Gibberellin A3","MW:346.37");
- MC(<18,?5,3=?7,5=?6[12],
- @8,160`1.3,&3,13=dl,6=wf,8=wb,
- @5,40~zf`1,O,60,//O^180,&14~zb,
- 2:/COOH,7://_,13:*/OH,8:/*OH,
- 14:*/_,{1^60,4^60}:*/H
- )
+ beginfont("NO:3","EN:Gibberellin A3","MW:346.37",
+ %------------------------------------
+ ": <18,?5,3=?7,5=?6[12], ",
+ ": @8,160`1.3,&3,13=dl,6=wf,8=wb, ",
+ ": @5,40~zf`1,O,60,//O^180,&14~zb, ",
+ ": 2:/COOH,7://_,13:*/OH,8:/*OH, ",
+ ": 14:*/_,{1^60,4^60}:*/H ")
+ %------------------------------------
+ if check_mc(mc)=0: MC(scantokens(mc)) fi
endfont;
-\end{mplibcode}\\
%--------------------------------------------------------------------
+\end{mplibcode}\\
\end{document}
-%--------------------------------------------------------------------
\end{verbatim}%
%############################################################################
%------------------------------------------------------------------------
@@ -1801,16 +1867,16 @@ endfont;
%--------------------------------------------------------------------
\begin{document}
\unitlength=1mm%
-\INFO{F:mcf_man_soc,C:139,NO:1,mw:349.40462,fm:C16H19N3O4S,EN:Ampicillin}%
-\INFO{F:mcf_man_soc,C:140,NO:2,mw:386.6532,fm:C27H46O,EN:Cholesterol}%
+\INFO{F:mcf_man_soc,C:141,NO:1,mw:349.40462,fm:C16H19N3O4S,EN:Ampicillin}%
+\INFO{F:mcf_man_soc,C:142,NO:2,mw:386.6532,fm:C27H46O,EN:Cholesterol}%
\end{document}
%--------------------------------------------------------------------
\end{verbatim}%
%############################################################################
%------------------------------------------------------------------------
-\INFO{F:mcf_man_soc,C:139,NO:1,mw:349.40462,fm:C16H19N3O4S,EN:Ampicillin}%
-\INFO{F:mcf_man_soc,C:140,NO:2,mw:386.6532,fm:C27H46O,EN:Cholesterol}%
+\INFO{F:mcf_man_soc,C:141,NO:1,mw:349.40462,fm:C16H19N3O4S,EN:Ampicillin}%
+\INFO{F:mcf_man_soc,C:142,NO:2,mw:386.6532,fm:C27H46O,EN:Cholesterol}%
%------------------------------------------------------------------------
-\printindex
+\texttt{\printindex}
%------------------------------------------------------------------------
\end{document}
diff --git a/graphics/mcf2graph/mcf_mplib_exa.pdf b/graphics/mcf2graph/mcf_mplib_exa.pdf
index 71273591e4..473f7c635d 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 edf96d8953..84731a7e01 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 2021.02.11
+% Example of MCF typest with LuaLaTeX(luamplib) by A.Yamaji 2021.02.21
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%% mcf2graph.mf must be version 4.57
+%%% mcf2graph.mf must be version 4.58
\documentclass{article}
%------------------------------------------------------------------------------
\usepackage{luamplib}%
@@ -101,30 +101,32 @@ MC(
\subsection{Chlorophyll a}
\noindent%
\begin{verbatim}
-beginfont("NO:1","EN:Chlorophyll a","MW:893.49")
+beginfont("NO:1","EN:Chlorophyll a","MW:893.49",
+ %-----------------------------------------------------------------------
+ ": <54,#1,?5,{2,5}=dl,4:N,@3,\,54~dl,|,?5,{2,4}=dl,5:N, ",
+ ": @-2,\,54~dl,|,?5,2=dl,5:N,@-2,\~dl,54,|,?5,5=dl,5:N,@-2,\~dl,&.$5, ",
+ ": @-1,24,/*COO!^15,72,//O,&.$1,##,||, ",
+ ": {2,9,15,20~zf}:/_,8:/!,14:/!!, ",
+ ": @4,\`1.45,Mg,&17,@-1,&11~vb,@-1,&23~vb, ",
+ ": @21,-6~wf,!2,//O,!,O,!2,!!,|,!13,{1,5,9,13}:/_ ")
+ %-----------------------------------------------------------------------
fsize:=(100mm,50mm);
- MC(
- <54,#1,?5,{2,5}=dl,4:N,@3,\,54~dl,|,?5,{2,4}=dl,5:N,
- @-2,\,54~dl,|,?5,2=dl,5:N,@-2,\~dl,54,|,?5,5=dl,5:N,@-2,\~dl,&.$5,
- @-1,24,/*COO!^15,72,//O,&.$1,##,||,
- {2,9,15,20~zf}:/_,8:/!,14:/!!,
- @4,\`1.45,Mg,&17,@-1,&11~vb,@-1,&23~vb,
- @21,-6~wf,!2,//O,!,O,!2,!!,|,!13,{1,5,9,13}:/_
- )
+ if check_mc(mc)=0: MC(scantokens(mc)) fi
endfont
\end{verbatim}
%------------------------------------------------------------------------------------
\begin{mplibcode}
-beginfont("NO:1","EN:Chlorophyll a","MW:893.49")
+beginfont("NO:1","EN:Chlorophyll a","MW:893.49",
+ %-----------------------------------------------------------------------
+ ": <54,#1,?5,{2,5}=dl,4:N,@3,\,54~dl,|,?5,{2,4}=dl,5:N, ",
+ ": @-2,\,54~dl,|,?5,2=dl,5:N,@-2,\~dl,54,|,?5,5=dl,5:N,@-2,\~dl,&.$5, ",
+ ": @-1,24,/*COO!^15,72,//O,&.$1,##,||, ",
+ ": {2,9,15,20~zf}:/_,8:/!,14:/!!, ",
+ ": @4,\`1.45,Mg,&17,@-1,&11~vb,@-1,&23~vb, ",
+ ": @21,-6~wf,!2,//O,!,O,!2,!!,|,!13,{1,5,9,13}:/_ ")
+ %-----------------------------------------------------------------------
fsize:=(100mm,50mm);
- MC(
- <54,#1,?5,{2,5}=dl,4:N,@3,\,54~dl,|,?5,{2,4}=dl,5:N,
- @-2,\,54~dl,|,?5,2=dl,5:N,@-2,\~dl,54,|,?5,5=dl,5:N,@-2,\~dl,&.$5,
- @-1,24,/*COO!^15,72,//O,&.$1,##,||,
- {2,9,15,20~zf}:/_,8:/!,14:/!!,
- @4,\`1.45,Mg,&17,@-1,&11~vb,@-1,&23~vb,
- @21,-6~wf,!2,//O,!,O,!2,!!,|,!13,{1,5,9,13}:/_
- )
+ if check_mc(mc)=0: MC(scantokens(mc)) fi
ext(
defaultscale:=0.8;
label.lrt("FM(C): "&cal_FM,(0,h-5mm));
@@ -137,29 +139,32 @@ endfont
\subsection{Gibberellin A3}
\noindent%
\begin{verbatim}
-beginfont("NO:4","EN:Gibberellin A3","MW:346.37");
+beginfont("NO:4","EN:Gibberellin A3","MW:346.37",
+ %--------------------------------------------------------
+ ": <18,?5,3=?7,5=?6[12],@8,160`1.3,&3,13=dl,6=wf,8=wb, ",
+ ": @5,40~zf`1,O,60,//O^180,&14~zb, ",
+ ": 2:/COOH,7://_,13:*/OH,8:/*OH,14:*/_,{1,4}:*/H^60 ")
+ %--------------------------------------------------------
fsize:=(120mm,20mm);
- MC(
- <18,?5,3=?7,5=?6[12],@8,160`1.3,&3,13=dl,6=wf,8=wb,
- @5,40~zf`1,O,60,//O^180,&14~zb,
- 2:/COOH,7://_,13:*/OH,8:/*OH,14:*/_,{1,4}:*/H^60
- )
+ if check_mc(mc)=0: MC(scantokens(mc)) fi
endfont;
\end{verbatim}
%----------------------------------------------------------------------------
\begin{mplibcode}
-beginfont("NO:4","EN:Gibberellin A3","MW:346.37");
+beginfont("NO:4","EN:Gibberellin A3","MW:346.37",
+ %--------------------------------------------------------
+ ": <18,?5,3=?7,5=?6[12],@8,160`1.3,&3,13=dl,6=wf,8=wb, ",
+ ": @5,40~zf`1,O,60,//O^180,&14~zb, ",
+ ": 2:/COOH,7://_,13:*/OH,8:/*OH,14:*/_,{1,4}:*/H^60 ")
+ %--------------------------------------------------------
fsize:=(120mm,20mm);
- MC(
- <18,?5,3=?7,5=?6[12],@8,160`1.3,&3,13=dl,6=wf,8=wb,
- @5,40~zf`1,O,60,//O^180,&14~zb,
- 2:/COOH,7://_,13:*/OH,8:/*OH,14:*/_,{1,4}:*/H^60)
- ext(
- defaultscale:=0.8;
- label.lrt("FM(C): "&cal_FM,(0,h-5mm));
- label.lrt("MW(C): "&cal_MW,(0,h-9mm));
- label.lrt("MW(D): "&inf_MW,(0,h-13mm));
- )
+ if check_mc(mc)=0: MC(scantokens(mc)) fi
+ ext(
+ defaultscale:=0.8;
+ label.lrt("FM(C): "&cal_FM,(0,h-5mm));
+ label.lrt("MW(C): "&cal_MW,(0,h-9mm));
+ label.lrt("MW(D): "&inf_MW,(0,h-13mm));
+ )
endfont;
\end{mplibcode}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -167,60 +172,64 @@ endfont;
\noindent%
%----------------------------------------------------------------------------
\begin{verbatim}
-beginfont("NO:5","EN:Erythromycin","MW:733.93");
+beginfont("NO:5","EN:Erythromycin","MW:733.93",
+ %------------------------------------------------------------------
+ ": <30,#1,<-120,60,60,60,-60,60,60,-60,60,60,60,-60,60,60,##,&1, ",
+ ": 14:O,13:/*Et,{1,9}://O,{2,10}:*/_,{4,6^-35,8,12^35}:/*_, ",
+ ": {6^35,11,12^-35}:*/OH, ",
+ ": @.$3,\*,O,30,|,?6`.7,2:O,{3,5^35}:/_,4:/OH,5^-35:/O!, ",
+ ": @.$5,\*^30`1.7,O,!,|,?6`.7,6:O,5:/_,2:/OH,3:/N?! ")
+ %------------------------------------------------------------------
fsize:=(120mm,35mm);
- MC(
- <30,#1,<-120,60,60,60,-60,60,60,-60,60,60,60,-60,60,60,##,&1,
- 14:O,13:/*Et,{1,9}://O,{2,10}:*/_,{4,6^-35,8,12^35}:/*_,
- {6^35,11,12^-35}:*/OH,
- @.$3,\*,O,30,|,?6`.7,2:O,{3,5^35}:/_,4:/OH,5^-35:/O!,
- @.$5,\*^30`1.7,O,!,|,?6`.7,6:O,5:/_,2:/OH,3:/N?!
- )
+ if check_mc(mc)=0: MC(scantokens(mc)) fi
endfont;
\end{verbatim}
%----------------------------------------------------------------------------
\begin{mplibcode}
-beginfont("NO:5","EN:Erythromycin","MW:733.93");
+beginfont("NO:5","EN:Erythromycin","MW:733.93",
+ %------------------------------------------------------------------
+ ": <30,#1,<-120,60,60,60,-60,60,60,-60,60,60,60,-60,60,60,##,&1, ",
+ ": 14:O,13:/*Et,{1,9}://O,{2,10}:*/_,{4,6^-35,8,12^35}:/*_, ",
+ ": {6^35,11,12^-35}:*/OH, ",
+ ": @.$3,\*,O,30,|,?6`.7,2:O,{3,5^35}:/_,4:/OH,5^-35:/O!, ",
+ ": @.$5,\*^30`1.7,O,!,|,?6`.7,6:O,5:/_,2:/OH,3:/N?! ")
+ %------------------------------------------------------------------
fsize:=(120mm,35mm);
- MC(
- <30,#1,<-120,60,60,60,-60,60,60,-60,60,60,60,-60,60,60,##,&1,
- 14:O,13:/*Et,{1,9}://O,{2,10}:*/_,{4,6^-35,8,12^35}:/*_,
- {6^35,11,12^-35}:*/OH,
- @.$3,\*,O,30,|,?6`.7,2:O,{3,5^35}:/_,4:/OH,5^-35:/O!,
- @.$5,\*^30`1.7,O,!,|,?6`.7,6:O,5:/_,2:/OH,3:/N?!
- )
- ext(
- defaultscale:=0.8;
- label.lrt("FM(C): "&cal_FM,(0,h-5mm));
- label.lrt("MW(C): "&cal_MW,(0,h-9mm));
- label.lrt("MW(D): "&inf_MW,(0,h-13mm));
- )
+ if check_mc(mc)=0: MC(scantokens(mc)) fi
+ ext(
+ defaultscale:=0.8;
+ label.lrt("FM(C): "&cal_FM,(0,h-5mm));
+ label.lrt("MW(C): "&cal_MW,(0,h-9mm));
+ label.lrt("MW(D): "&inf_MW,(0,h-13mm));
+ )
endfont;
\end{mplibcode}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\subsection{Paclitaxel}
\noindent%
\begin{verbatim}
-beginfont("EN:Paclitaxel","MW:853.918")
+beginfont("EN:Paclitaxel","MW:853.918",
+ %---------------------------------------------------------------------
+ ": ?6,5=dl,@3,#1,36,45,45,45,45,##,&5,-4=?6,-4=?4,-1=wb,-3=wf,-1:O, ",
+ ": 4:??,6:/_,{3^-60,15}:*/OH,8:/*H^-60,9:*/_^60,10://O, ",
+ ": @1,\,O,!,//O,!,*/OH,!,/Ph,60~wf,NH,-60,//O,60,Ph, ",
+ ": @7,\*,O,-45,//O,60,Ph,11:*/OCO!>rl,12:/*OCO!^-15>lr ")
+ %---------------------------------------------------------------------
fsize:=(120mm,35mm);
- MC(
- ?6,5=dl,@3,#1,36,45,45,45,45,##,&5,-4=?6,-4=?4,-1=wb,-3=wf,-1:O,
- 4:??,6:/_,{3^-60,15}:*/OH,8:/*H^-60,9:*/_^60,10://O,
- @1,\,O,!,//O,!,*/OH,!,/Ph,60~wf,NH,-60,//O,60,Ph,
- @7,\*,O,-45,//O,60,Ph,11:*/OCO!>rl,12:/*OCO!^-15>lr
- )
+ if check_mc(mc)=0: MC(scantokens(mc)) fi
endfont
\end{verbatim}
%----------------------------------------------------------------------------
\begin{mplibcode}
-beginfont("EN:Paclitaxel","MW:853.918")
+beginfont("EN:Paclitaxel","MW:853.918",
+ %---------------------------------------------------------------------
+ ": ?6,5=dl,@3,#1,36,45,45,45,45,##,&5,-4=?6,-4=?4,-1=wb,-3=wf,-1:O, ",
+ ": 4:??,6:/_,{3^-60,15}:*/OH,8:/*H^-60,9:*/_^60,10://O, ",
+ ": @1,\,O,!,//O,!,*/OH,!,/Ph,60~wf,NH,-60,//O,60,Ph, ",
+ ": @7,\*,O,-45,//O,60,Ph,11:*/OCO!>rl,12:/*OCO!^-15>lr ")
+ %---------------------------------------------------------------------
fsize:=(120mm,35mm);
- MC(
- ?6,5=dl,@3,#1,36,45,45,45,45,##,&5,-4=?6,-4=?4,-1=wb,-3=wf,-1:O,
- 4:??,6:/_,{3^-60,15}:*/OH,8:/*H^-60,9:*/_^60,10://O,
- @1,\,O,!,//O,!,*/OH,!,/Ph,60~wf,NH,-60,//O,60,Ph,
- @7,\*,O,-45,//O,60,Ph,11:*/OCO!>rl,12:/*OCO!^-15>lr
- )
+ if check_mc(mc)=0: MC(scantokens(mc)) fi
ext(
defaultscale:=0.8;
label.lrt("FM(C): "&cal_FM,(0,h-5mm));
diff --git a/graphics/pgf/contrib/spath3/calligraphy.pdf b/graphics/pgf/contrib/spath3/calligraphy.pdf
index 6896a3b289..a700b4fc0e 100644
--- a/graphics/pgf/contrib/spath3/calligraphy.pdf
+++ b/graphics/pgf/contrib/spath3/calligraphy.pdf
Binary files differ
diff --git a/graphics/pgf/contrib/spath3/knots.pdf b/graphics/pgf/contrib/spath3/knots.pdf
index 1a2afd39db..39067dee2e 100644
--- a/graphics/pgf/contrib/spath3/knots.pdf
+++ b/graphics/pgf/contrib/spath3/knots.pdf
Binary files differ
diff --git a/graphics/pgf/contrib/spath3/spath3.pdf b/graphics/pgf/contrib/spath3/spath3.pdf
index 466b71e7e5..ebbefefa1a 100644
--- a/graphics/pgf/contrib/spath3/spath3.pdf
+++ b/graphics/pgf/contrib/spath3/spath3.pdf
Binary files differ
diff --git a/graphics/pgf/contrib/spath3/spath3.tex b/graphics/pgf/contrib/spath3/spath3.tex
index 49b897c481..7621db4a28 100644
--- a/graphics/pgf/contrib/spath3/spath3.tex
+++ b/graphics/pgf/contrib/spath3/spath3.tex
@@ -56,6 +56,8 @@
\maketitle
+\tableofcontents
+
\section{Introduction}
The \texttt{spath3} package was originally designed as a low-level package for manipulating the \emph{soft paths} defined by PGF/TikZ.
@@ -124,59 +126,61 @@ Clones one soft path into another.
In the second, the clone is global (the original need not be).
\end{function}
-\begin{function}{restore, restore reverse}
+\begin{function}{use}
\begin{syntax}
-|restore=|\meta{name}
-|restore reverse=|\meta{name}
+|use=|\meta{name}
+|use=|\marg{name, options}
\end{syntax}
-Restores a previously saved soft path to the current path.
-The \Verb+reverse+ version reverses the soft path first.
-This happens immediately so can be issued in the options to the main command and then the path can be extended with normal drawing commands.
-Any keys that affect the soft path directly should be applied \emph{before} this one.
+This uses a previously saved soft path at the current juncture in the path declaration.
+If before the path has begun, it is the initial part of the new path.
+If during the path construction then it is stuck in at the current place.
+Note that any keys that affect the soft path directly should be applied \emph{before} this one.
+
+The path can be modified first by using the second form -- note that as far as the \Verb+use+ key is concerned, the whole thing is a single argument.
+The options is a comma separated list and can include:
+%
+\begin{itemize}
+\item |reverse| reverses the inserted path first.
+\item |weld|, |no weld| determines whether to weld the inserted path to the current path.
+Welding means that the |move to| at the start of the inserted path is removed.
+Note that this doesn't \emph{move} the inserted path so this will usually modify the first segment of the inserted path, possibly in unexpected ways.
+\item |move|, |no move| determines whether the inserted path is translated so that it starts where the current path ends.
+\item |transform=|\marg{transformations} applies the specified transformations to the inserted path.
+See the |transform| key in Section~\ref{sec:transform}
+\item Any other key is taken as the name of the path (so it doesn't have to be specified first) with the last one winning.
+\end{itemize}
One thing should be noted about transformations.
By the time a soft path is built, all available transformations have been applied.
This means that when re-inserting a soft path back into a high level command (such as |\draw|), the effect of existing transformations might produce some confusing effects.
When restoring a path then the library tries to set up various internals of TikZ correctly, but there may be some things I've overlooked or not accounted for particularly with regard to existing transformations; if you spot anything working oddly then please report it to me.
-Restoring a path also sets things right for positioning nodes along the path.
+In particular, restoring a path should sets things right for positioning nodes along the path.
Using the \Verb+pos=D+ key on a node positions that node at a particular point on the path.
Exactly how the parameter is interpreted is the same as for the \Verb+spath+ coordinate system described in Section~\ref{sec:coordinates}.
\end{function}
\begin{function}{
+ restore,
+ restore reverse
+ insert,
+ insert reverse,
append,
append reverse,
append no move,
append reverse no move
}
-\begin{syntax}
-|append=|\meta{name}
-|append reverse=|\meta{name}
-|append no move=|\meta{name}
-|append reverse no move=|\meta{name}
-\end{syntax}
-
-This inserts a soft path, or its reverse, into the path at the current point, it is therefore more suited to being used part way through a path construction.
-In a sense, it is a little like a \texttt{pic} in that it enables the user to construct a path segment early to be reused at various places.
-The path is \emph{welded} on to the current path, meaning that the intervening \Verb+move+ is removed.
-This is particularly useful for creating filled regions.
-The first two versions translate the path so that it starts at the last point on the existing path, the second two versions don't do this translation (the intention being that in such a case the translation is omitted because it is \emph{unnecessary} rather than simply not wanted because the effect of removing the intervening move will adjust the initial segment of the appended path otherwise).
+These are all aliases to various versions of \Verb+use+ (they originally existed as separate code before I united them all as variants of \Verb+use+).
+The equivalences are:
-As with restoring a path, the last point and node positioning machinery is established.
-The positioning is relative to the appended part of the path, not the full path.
-\end{function}
-
-\begin{function}{insert, insert reverse}
-\begin{syntax}
-|insert=|\meta{name}
-|insert reverse=|\meta{name}
-\end{syntax}
-
-Like \Verb+append+ except that it doesn't remove the intervening \Verb+move+ and doesn't translate the inserted path.
-The \Verb+reverse+ version reverses the path first.
+\begin{itemize}
+\item |restore| and |insert| are aliases for |use|.
+\item |append| sets the |move| and |weld| keys.
+\item |append no move| just sets the |weld| key.
+\item |reverse| sets the |reverse| key.
+\end{itemize}
\end{function}
\begin{function}{to}
@@ -191,6 +195,7 @@ The path is transformed by rotation, translation, and uniform scaling so that it
\subsection{Transformation Routines}
+\label{sec:transform}
The following keys all apply some sort of transformation to the soft path.
They do not render the path, but simply adjust it.
@@ -236,40 +241,6 @@ This transforms the named path so that it goes from the start point to the end p
As with the \Verb+to+ path construction and the \Verb+splice+ method, this won't work if the path ends very close to where it starts.
\end{function}
-\begin{function}{splice, splice global}
-\begin{syntax}
-|splice=|\marg{initial path}\marg{splice path}\marg{final path}
-|splice globally=|\marg{initial path}\marg{splice path}\marg{final path}
-\end{syntax}
-
-This splices the middle path into the gap between the initial and final paths.
-The middle path is transformed to fit (don't try this with a path whose starting and ending points are close together) and the paths are joined so that the last component of the initial path and the first component of the splice path become a single component, and similarly at the other end.
-\end{function}
-
-\begin{function}{join components with, join components globally with}
-\begin{syntax}
-|join components with=|\marg{path}\marg{splice path}
-|join components globally with=|\marg{path}\marg{splice path}
-\end{syntax}
-
-This inserts the |splice path| in the gaps between components of |path|.
-A \emph{spot weld} is performed first to join any components where the end of one is the start of the next.
-The result is a single component path.
-This does \emph{not} close the resulting path, for that see the key |close with|.
-\end{function}
-
-\begin{function}{close, close globally, close with, close globally with}
-\begin{syntax}
-|close=|\marg{path}
-|close globally=|\marg{path}
-|close with=|\marg{path}\marg{splice path}
-|close globally with=|\marg{path}\marg{splice path}
-\end{syntax}
-
-These all close the last component of the given path.
-The first two will insert a line segment if the initial and final points of the component are not sufficiently close.
-The latter two allow you to specify another path to insert.
-\end{function}
\subsection{Intersection Routines}
@@ -317,6 +288,20 @@ The second path is not changed.
This inserts breaks into a pair of paths at their mutual intersections.
\end{function}
+\begin{function}{
+ replace lines,
+ replace lines globally
+}
+\begin{syntax}
+|replace lines=|\meta{path}
+|replace lines globally=|\meta{path}
+\end{syntax}
+
+The PGF intersection routines have difficulties with parallel, or near parallel, lines.
+One way to counter this is to replace all line segments by ``curves''.
+This is done so that the parametrisation of the curve matches that of the line segment that it is replacing.
+\end{function}
+
\subsection{Working with Components}
\begin{function}{
@@ -335,7 +320,7 @@ The macro can be used in a |\foreach|.
The macro consists of a comma separated list of names of the components (the actual names used are of the form \Verb+anonymous_N+).
To access an individual component, use the command \Verb+\getComponentOf+.
-This can be used directly in place of a path name in any other key, such as \Verb+restore+, (it is just the \LaTeX3 command \Verb+\clist_item:Nn+).
+This can be used directly in place of a path name in any other key, such as \Verb+use+, (it is just the \LaTeX3 command \Verb+\clist_item:Nn+).
Note that these are \emph{copies} of the components of the original path.
Changing a component doesn't update the original path.
@@ -365,11 +350,14 @@ It applies the following styles (in this order):
}
\begin{syntax}
|insert gaps after components=|\marg{path}\marg{gap}\marg{components}
+|insert gaps after components=|\marg{path}\marg{gap}
|insert gaps globally after components=|\marg{path}\marg{gap}\marg{components}
+|insert gaps globally after components=|\marg{path}\marg{gap}
\end{syntax}
This inserts a gap between components of a path by shortening the end of the specified component and start of the next one.
The list of components is passed through a |\foreach| loop so that syntax like |2,4,...,16| can be used.
+If the list of components is not given the gaps are inserted between all components.
\end{function}
\begin{function}{
@@ -386,6 +374,31 @@ The list of components is processed by |\foreach|.
If the component is the first one then it is joined to the last component.
\end{function}
+\begin{function}{join components with, join components globally with, join components upright with, join components globally upright with}
+\begin{syntax}
+|join components with=|\marg{path}\marg{splice path}
+|join components with=|\marg{path}\marg{splice path}\marg{list}
+|join components upright with=|\marg{path}\marg{splice path}
+|join components upright with=|\marg{path}\marg{splice path}\marg{list}
+|join components globally with=|\marg{path}\marg{splice path}
+|join components globally with=|\marg{path}\marg{splice path}\marg{list}
+|join components globally upright with=|\marg{path}\marg{splice path}
+|join components globally upright with=|\marg{path}\marg{splice path}\marg{list}
+\end{syntax}
+
+This inserts the |splice path| in the gaps between components of |path| specified by a comma separated list.
+The splice is inserted between each specified component and the next one.
+If the \marg{list} is not given (or is empty) then the splice is inserted between every component except that a \emph{spot weld} is performed first to join any components where the end of one is the start of the next.
+The spot weld is only performed if the list of components is empty.
+
+This does \emph{not} close the resulting path, even if the last component is specified in the list, for that see the key |close with|.
+
+Note that because there is an optional third argument to this key, the second argument must always be enclosed in braces unless it is a single token.
+
+The |upright| versions do a little test to see if the gap is oriented upside-down and if so then they insert the reflection of the splice path.
+\end{function}
+
+
\begin{function}{
spot weld,
spot weld globally
@@ -423,6 +436,31 @@ This removes the listed components of the path.
As with other list routines, the list is parsed via |foreach| first.
\end{function}
+
+\begin{function}{close, close globally, close with, close globally with}
+\begin{syntax}
+|close=|\marg{path}
+|close globally=|\marg{path}
+|close with=|\marg{path}\marg{splice path}
+|close globally with=|\marg{path}\marg{splice path}
+\end{syntax}
+
+These all close the last component of the given path.
+The first two will insert a line segment if the initial and final points of the component are not sufficiently close.
+The latter two allow you to specify another path to insert.
+\end{function}
+
+\begin{function}{splice, splice global}
+\begin{syntax}
+|splice=|\marg{initial path}\marg{splice path}\marg{final path}
+|splice globally=|\marg{initial path}\marg{splice path}\marg{final path}
+\end{syntax}
+
+This splices the middle path into the gap between the initial and final paths.
+The middle path is transformed to fit (don't try this with a path whose starting and ending points are close together) and the paths are joined so that the last component of the initial path and the first component of the splice path become a single component, and similarly at the other end.
+\end{function}
+
+
\subsection{Shortening Paths}
\begin{function}{
@@ -473,8 +511,8 @@ Saves the path to the file \texttt{path.svg} as an SVG document.
\subsection{Knots}
\begin{function}{
- global knot,
knot,
+ global knot,
draft mode
}
\begin{syntax}
@@ -544,7 +582,7 @@ The intention with the second key is that it is similar to what happens with the
\section{Examples}
\begin{enumerate}
-\item Saving, restoring, inserting, and appending.
+\item Saving and re-using.
\begin{example}
\begin{tikzpicture}
@@ -554,10 +592,10 @@ The intention with the second key is that it is similar to what happens with the
\node[above left] at (spath cs:rpath 0.\k) {\(0.\k\)};
}
\fill[green] (2,2) circle[radius=3pt];
-\draw[blue, spath/transform={rpath}{shift={(2,2)}}, spath/restore=rpath] node[right] {transform};
-\draw[orange] (3,0) [spath/insert=rpath] node[right] {insert};
+\draw[blue, spath/transform={rpath}{shift={(2,2)}}, spath/use=rpath] node[right] {transform};
+\draw[orange] (3,0) [spath/use={rpath, move}] node[right] {moving};
\draw[red] (3,-1) -- +(0,2) [spath/append=rpath] node[above] {append};
-\draw[spath/restore=rpath] node[right] {restore};
+\draw[spath/use=rpath] node[right] {use};
\end{tikzpicture}
\end{example}
@@ -570,8 +608,8 @@ The intention with the second key is that it is similar to what happens with the
green,
draw=black,
ultra thick,
- spath/restore=apath
-] -- ++(0,-4) [spath/append reverse=apath] -- cycle;
+ spath/use=apath
+] -- ++(0,-4) [spath/use={apath, reverse, move, weld}] -- cycle;
\end{tikzpicture}
\end{example}
@@ -583,7 +621,7 @@ The intention with the second key is that it is similar to what happens with the
\draw[rotate=45, xscale=2, yscale=3, ultra thick, red] (0,0) rectangle +(1,1);
\draw[
spath/transform={tpath}{rotate=45, xscale=2, yscale=3},
- spath/restore={tpath}];
+ spath/use={tpath}];
\end{tikzpicture}
\end{example}
@@ -615,7 +653,7 @@ The intention with the second key is that it is similar to what happens with the
(7,1) circle[radius=3pt]
;
-\draw[spath/restore=a];
+\draw[spath/use=a];
\end{tikzpicture}
\end{example}
@@ -653,9 +691,9 @@ The intention with the second key is that it is similar to what happens with the
shorten at end={apath}{7pt},
shorten at start={apath}{9pt},
translate={apath}{0pt}{1pt},
- restore=apath,
+ use=apath,
];
-\draw (0,0) circle[radius=9pt] [spath/insert=apath] circle[radius=7pt];
+\draw (0,0) circle[radius=9pt] [spath/use=apath] circle[radius=7pt];
\end{tikzpicture}
\end{example}
@@ -670,9 +708,9 @@ The intention with the second key is that it is similar to what happens with the
shorten at end={apath}{7pt},
shorten at start={apath}{9pt},
translate={apath}{0pt}{1pt},
- restore=apath,
+ use=apath,
];
-\draw (0,0) circle[radius=9pt] [spath/insert=apath] circle[radius=7pt];
+\draw (0,0) circle[radius=9pt] [spath/use=apath] circle[radius=7pt];
\end{tikzpicture}
\end{example}
@@ -699,7 +737,7 @@ The intention with the second key is that it is similar to what happens with the
path \k/.try,
spath/.cd,
translate=\cpt{0pt}{\k pt},
- restore=\cpt,
+ use=\cpt,
] +(0,3pt) -- +(0,-3pt);
\node[text=red] at (spath cs:{\cpt} .5) {\(\k\)};
}
@@ -734,12 +772,12 @@ One of the main motivations for implementing the intersection routines was to pr
}
\foreach[count=\k] \cpt in \pathAcomponents {
- \draw[spath/restore=\cpt,-Circle];
+ \draw[spath/use=\cpt,-Circle];
\node[fill=white, fill opacity=.5, circle, text opacity=1] at (spath cs:{\cpt} .5) {\(\k\)};
}
\foreach[count=\k] \cpt in \pathBcomponents {
- \draw[spath/restore=\cpt,-Circle];
+ \draw[spath/use=\cpt,-Circle];
\node[fill=white, fill opacity=.5, circle, text opacity=1] at (spath cs:{\cpt} .5) {\(\k\)};
}
\end{tikzpicture}
@@ -766,12 +804,12 @@ Although the paths were defined globally, the splitting in the previous example
\fill[pattern=bricks, pattern color=white] (-.5,-.5) rectangle (8.5,1.5);
\foreach[count=\k] \cpt in \pathAcomponents {
- \draw[blue, line width=2pt,spath/restore=\cpt];
+ \draw[blue, line width=2pt,spath/use=\cpt];
\node[fill=cyan, fill opacity=.5, circle, text opacity=1] at (spath cs:{\cpt} .3) {\(\k\)};
}
\foreach[count=\k] \cpt in \pathBcomponents {
- \draw[green, line width=2pt,spath/restore=\cpt];
+ \draw[green, line width=2pt,spath/use=\cpt];
\node[fill=green!50, fill opacity=.5, circle, text opacity=1] at (spath cs:{\cpt} .3) {\(\k\)};
}
\end{tikzpicture}
@@ -807,7 +845,7 @@ arc[radius=.5cm,start angle=90, delta angle=-180]
}
\foreach[count=\k] \cpt in \pathcomponents {
- \draw[spath/restore=\cpt,-|];
+ \draw[spath/use=\cpt,-|];
\node[fill=white, fill opacity=.5, circle, text opacity=1] at (spath cs:{\cpt} .5) {\(\k\)};
}
\end{tikzpicture}
@@ -826,7 +864,7 @@ arc[radius=.5cm,start angle=90, delta angle=-180]
}
\foreach[count=\k] \cpt in \pathcomponents {
- \draw[blue, line width=2pt,spath/restore=\cpt];
+ \draw[blue, line width=2pt,spath/use=\cpt];
}
\end{tikzpicture}
\end{example}
@@ -843,5 +881,65 @@ arc[radius=.5cm,start angle=90, delta angle=-180]
\tikzset{spath/knot={trefoil}{8pt}{1,3,5}}
\end{tikzpicture}
\end{example}
+
+\item Here's how to mark intersections of paths with ``bridges''.
+\begin{example}
+\begin{tikzpicture}
+\coordinate (a) at (-1,0.5);
+\coordinate (b) at (8,0.5);
+\coordinate (c) at (3,-0.5);
+\path[spath/save=sine]
+(-1.57,-1)
+cos ++(1.57,1)
+sin ++(1.57,1)
+cos ++(1.57,-1)
+sin ++(1.57,-1)
+cos ++(1.57,1)
+sin ++(1.57,1);
+\path[spath/save=over] (a) -- (c) |- (b);
+
+\path[spath/save=arc] (0,0) arc[radius=1cm, start angle=180, delta angle=-180];
+
+\tikzset{
+ spath/split at intersections with={over}{sine},
+ spath/insert gaps after components={over}{8pt},
+ spath/join components upright with={over}{arc},
+ spath/split at intersections with={sine}{over},
+ spath/insert gaps after components={sine}{4pt},
+}
+
+\draw[spath/use=sine];
+\draw[spath/use=over];
+\end{tikzpicture}
+\end{example}
+
+\item If there are lots of paths like the previous example, here's a convenient style to put them together.
+\begin{example}
+\tikzset{
+ bridging path/.initial=arc,
+ bridging span/.initial=8pt,
+ bridging gap/.initial=4pt,
+ bridge/.style 2 args={
+ spath/split at intersections with={#1}{#2},
+ spath/insert gaps after components={#1}{\pgfkeysvalueof{/tikz/bridging span}},
+ spath/join components upright with={#1}{\pgfkeysvalueof{/tikz/bridging path}},
+ spath/split at intersections with={#2}{#1},
+ spath/insert gaps after components={#2}{\pgfkeysvalueof{/tikz/bridging gap}},
+ }
+}
+
+% If used in the preamble, this needs surrounding in \AtBeginDocument
+%\AtBeginDocument{
+\tikz[overlay] \path[spath/save=arc] (0,0) arc[radius=1cm, start angle=180, delta angle=-180];
+%}
+\begin{tikzpicture}
+\path[spath/save=over] (0,0) -| ++(1,1) -| ++(-1,1) -| ++(1,1) -| ++(-1,1);
+\path[spath/save=under] (.5,-.5) -- ++(0,4);
+\tikzset{bridge={over}{under}}
+\draw[spath/use=over];
+\draw[spath/use=under];
+\end{tikzpicture}
+\end{example}
+
\end{enumerate}
\end{document}
diff --git a/graphics/pgf/contrib/spath3/spath3_code.dtx b/graphics/pgf/contrib/spath3/spath3_code.dtx
index 621ab942f7..afd132938c 100644
--- a/graphics/pgf/contrib/spath3/spath3_code.dtx
+++ b/graphics/pgf/contrib/spath3/spath3_code.dtx
@@ -143,7 +143,7 @@ and the derived files spath3.ins,
%</driver>
% \fi
%
-% \CheckSum{8404}
+% \CheckSum{8929}
%
% \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
@@ -168,6 +168,7 @@ and the derived files spath3.ins,
% \changes{1.4}{2020/12/18}{A fair amount of code reimplementation and reorganisation, together with defining TikZ keys to make functions available for use.}
% \changes{2.0}{2021/01/19}{Refactored the code to remove the OO approach and make it functional, introduced the spath3 TikZ library to provide a user interface.}
% \changes{2.2}{2021/02/05}{Bugfixes and improvements, mainly with regard to the intersection and splitting routines.}
+% \changes{2.4}{2021/02/21}{Rejigged how the routines for using paths were implemented, added some more routines for joining paths.}
%
% \DoNotIndex{\newcommand,\newenvironment}
%
@@ -256,7 +257,7 @@ and the derived files spath3.ins,
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
\RequirePackage{pgf}
-\ProvidesExplPackage {spath3} {2021/02/05} {2.2} {Functions for
+\ProvidesExplPackage {spath3} {2021/02/21} {2.4} {Functions for
manipulating PGF soft paths}
\RequirePackage{xparse}
% \end{macrocode}
@@ -1756,7 +1757,7 @@ manipulating PGF soft paths}
{
\spath_splice_between:NVnn #1#1{#2}{#3}
}
-\cs_generate_variant:Nn \spath_splice_between:Nnn {NVV, cnn, cvv, Nvn}
+\cs_generate_variant:Nn \spath_splice_between:Nnn {NVV, cnn, cvv, Nvn, NVn}
\cs_new_protected_nopar:Npn \spath_gsplice_between:Nnnn #1#2#3#4
{
\@@_splice_between:nnn {#2}{#3}{#4}
@@ -1768,7 +1769,7 @@ manipulating PGF soft paths}
{
\spath_gsplice_between:NVnn #1#1{#2}{#3}
}
-\cs_generate_variant:Nn \spath_gsplice_between:Nnn {NVV, cnn, cvv}
+\cs_generate_variant:Nn \spath_gsplice_between:Nnn {NVV, cnn, cvv, Nvn, NVn}
% \end{macrocode}
% \end{macro}
%
@@ -1919,7 +1920,7 @@ manipulating PGF soft paths}
{
\spath_append_no_move:NVn #1#1{#2}
}
-\cs_generate_variant:Nn \spath_append_no_move:Nn {NV, cv, Nv}
+\cs_generate_variant:Nn \spath_append_no_move:Nn {NV, cv, Nv, cV}
\cs_new_protected_nopar:Npn \spath_gappend_no_move:Nnn #1#2#3
{
\@@_append_no_move:nn {#2}{#3}
@@ -1931,7 +1932,7 @@ manipulating PGF soft paths}
{
\spath_gappend_no_move:NVn #1#1{#2}
}
-\cs_generate_variant:Nn \spath_gappend_no_move:Nn {NV, cv, Nv}
+\cs_generate_variant:Nn \spath_gappend_no_move:Nn {NV, cv, Nv, cV}
% \end{macrocode}
% \end{macro}
%
@@ -1953,7 +1954,7 @@ manipulating PGF soft paths}
{
\spath_append:NVn #1#1{#2}
}
-\cs_generate_variant:Nn \spath_append:Nn {NV, Nv, cv}
+\cs_generate_variant:Nn \spath_append:Nn {NV, Nv, cv, cV}
\cs_new_protected_nopar:Npn \spath_gappend:Nnn #1#2#3
{
\tl_gset:Nn #1 {#2}
@@ -1964,7 +1965,7 @@ manipulating PGF soft paths}
{
\spath_gappend:NVn #1#1{#2}
}
-\cs_generate_variant:Nn \spath_gappend:Nn {NV, Nv, cv}
+\cs_generate_variant:Nn \spath_gappend:Nn {NV, Nv, cv, cV}
% \end{macrocode}
% \end{macro}
%
@@ -2235,6 +2236,128 @@ manipulating PGF soft paths}
% \end{macro}
%
% \begin{macro}[internal]{
+% \spath_replace_lines:Nn,
+% \spath_replace_lines:Nn,
+% \spath_replace_lines:Nn,
+% \spath_replace_lines:Nn,
+% }
+% Replace any line segments by B\'ezier curves.
+% \begin{macrocode}
+\cs_new_protected_nopar:Npn \@@_replace_lines:n #1
+{
+ \group_begin:
+ \tl_set:Nn \l_@@_tmpa_tl {#1}
+ \tl_clear:N \l_@@_tmpb_tl
+ \dim_set:Nn \l_@@_tmpa_dim {0pt}
+ \dim_set:Nn \l_@@_tmpb_dim {0pt}
+
+ \bool_do_until:nn
+ {
+ \tl_if_empty_p:N \l_@@_tmpa_tl
+ }
+ {
+ \tl_set:Nx \l_@@_tmpc_tl {\tl_item:Nn \l_@@_tmpa_tl {1}}
+ \tl_set:Nx \l_@@_tmpd_tl {\tl_item:Nn \l_@@_tmpa_tl {2}}
+ \tl_set:Nx \l_@@_tmpe_tl {\tl_item:Nn \l_@@_tmpa_tl {3}}
+
+ \tl_if_eq:NNTF \l_@@_tmpc_tl \c_spath_lineto_tl
+ {
+ \tl_put_right:NV \l_@@_tmpb_tl \c_spath_curvetoa_tl
+ \tl_put_right:Nx \l_@@_tmpb_tl
+ {
+ {
+ \fp_to_dim:n
+ {
+ 2/3 * (\l_@@_tmpa_dim)
+ +
+ 1/3 * (\l_@@_tmpd_tl)
+ }
+ }
+ }
+ \tl_put_right:Nx \l_@@_tmpb_tl
+ {
+ {
+ \fp_to_dim:n
+ {
+ 2/3 * (\l_@@_tmpb_dim)
+ +
+ 1/3 * (\l_@@_tmpe_tl)
+ }
+ }
+ }
+ \tl_put_right:NV \l_@@_tmpb_tl \c_spath_curvetob_tl
+ \tl_put_right:Nx \l_@@_tmpb_tl
+ {
+ {
+ \fp_to_dim:n
+ {
+ 1/3 * (\l_@@_tmpa_dim)
+ +
+ 2/3 * (\l_@@_tmpd_tl)
+ }
+ }
+ }
+ \tl_put_right:Nx \l_@@_tmpb_tl
+ {
+ {
+ \fp_to_dim:n
+ {
+ 1/3 * (\l_@@_tmpb_dim)
+ +
+ 2/3 * (\l_@@_tmpe_tl)
+ }
+ }
+ }
+ \tl_put_right:NV \l_@@_tmpb_tl \c_spath_curveto_tl
+ \@@_tl_put_right_braced:NV \l_@@_tmpb_tl \l_@@_tmpd_tl
+ \@@_tl_put_right_braced:NV \l_@@_tmpb_tl \l_@@_tmpe_tl
+ }
+ {
+ \tl_put_right:NV \l_@@_tmpb_tl \l_@@_tmpc_tl
+ \@@_tl_put_right_braced:NV \l_@@_tmpb_tl \l_@@_tmpd_tl
+ \@@_tl_put_right_braced:NV \l_@@_tmpb_tl \l_@@_tmpe_tl
+ }
+
+ \dim_set:Nn \l_@@_tmpa_dim {\l_@@_tmpd_tl}
+ \dim_set:Nn \l_@@_tmpb_dim {\l_@@_tmpe_tl}
+
+ \prg_replicate:nn {3}
+ {
+ \tl_set:Nx \l_@@_tmpa_tl {\tl_tail:N \l_@@_tmpa_tl}
+ }
+ }
+ \tl_gset_eq:NN \g_@@_output_tl \l_@@_tmpb_tl
+ \group_end:
+}
+\cs_generate_variant:Nn \@@_replace_lines:n {V}
+\cs_new_protected_nopar:Npn \spath_replace_lines:Nn #1#2
+{
+ \@@_replace_lines:n {#2}
+ \tl_set_eq:NN #1 \g_@@_output_tl
+ \tl_gclear:N \g_@@_output_tl
+}
+\cs_generate_variant:Nn \spath_replace_lines:Nn {NV, cV, cv, Nv}
+\cs_new_protected_nopar:Npn \spath_replace_lines:N #1
+{
+ \spath_replace_lines:NV #1#1
+}
+\cs_generate_variant:Nn \spath_replace_lines:N {c}
+\cs_new_protected_nopar:Npn \spath_greplace_lines:Nn #1#2
+{
+ \@@_replace_lines:n {#2}
+ \tl_gset_eq:NN #1 \g_@@_output_tl
+ \tl_gclear:N \g_@@_output_tl
+}
+\cs_generate_variant:Nn \spath_greplace_lines:Nn {NV, cV, cv, Nv}
+\cs_new_protected_nopar:Npn \spath_greplace_lines:N #1
+{
+ \spath_greplace_lines:NV #1#1
+}
+\cs_generate_variant:Nn \spath_greplace_lines:N {c}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}[internal]{
% \spath_remove_empty_components:Nn,
% \spath_remove_empty_components:N,
% \spath_gremove_empty_components:Nn,
@@ -4709,8 +4832,8 @@ manipulating PGF soft paths}
\cs_generate_variant:Nn \spath_show:n {V, v}
% \end{macrocode}
% \end{macro}
-
-% \subsubsection{PGF and TikZ Interface Functions}
+%
+% \subsection{PGF and TikZ Interface Functions}
%
% Spaths come from PGF so we need some functions that get and set spaths from the pgf system.
%
@@ -4845,6 +4968,7 @@ manipulating PGF soft paths}
\tl_clear_new:c {tikz@timer}
\tl_set:cn {tikz@timer}
{
+ \pgftransformreset
\spath_reallength:Nn \l_@@_tmpa_int {#1}
\tl_set_eq:Nc \l_@@_tmpb_tl {tikz@time}
\tl_set:Nx \l_@@_tmpb_tl
@@ -4927,7 +5051,10 @@ manipulating PGF soft paths}
%
% \begin{macrocode}
\msg_new:nnn { spath3 } { missing soft path } { Soft~ path~ #1~ doesn't~ exist }
-\msg_new:nnn { spath3 } { empty soft path } { Soft~ path~ #1~ is~ empty }
+\msg_new:nnnn { spath3 } { empty soft path } { Soft~ path~ #1~ is~ empty}
+{If~ it~ was~ defined~ inside~ a~ group,~ try~ using~ "save~ global". }
+\msg_new:nnn { spath3 } { load intersections }
+{ You~ need~ to~ load~ the~ "intersections"~ library~ to~ work~ with~ intersections }
% \end{macrocode}
%
% When saving a soft path, by default we use a naming convention that is compatible with the intersections library so that paths saved here and paths saved by the \texttt{name path} facility of the intersections library are mutually exchangeable.
@@ -4990,6 +5117,73 @@ manipulating PGF soft paths}
% \end{macrocode}
% \end{macro}
%
+% \begin{macro}[internal]{
+% \@@_tikzset:n
+% }
+% Wrapper around \Verb+\tikzset+ for expansion.
+% \begin{macrocode}
+\cs_set_eq:NN \@@_tikzset:n \tikzset
+\cs_generate_variant:Nn \@@_tikzset:n {V, v}
+% \end{macrocode}
+% \end{macro}
+%
+% When joining two paths we provide a set of options for how to process the second path.
+%
+% \begin{macrocode}
+\bool_new:N \l_@@_reverse_bool
+\bool_new:N \l_@@_weld_bool
+\bool_new:N \l_@@_move_bool
+\bool_new:N \l_@@_global_bool
+\tl_new:N \l_@@_joinpath_tl
+\tl_new:N \l_@@_transformation_tl
+
+\cs_new_protected_nopar:Npn \@@_set_bool:Nn #1#2
+{
+ \tl_if_eq:nnTF {#2}{false}
+ {
+ \bool_set_false:N #1
+ }
+ {
+ \bool_set_true:N #1
+ }
+}
+\tikzset {
+ spath/join/.is~ family,
+ spath/join/.cd,
+ reverse/.code = {
+ \@@_set_bool:Nn \l_@@_reverse_bool {#1}
+ },
+ reverse/.default = true,
+ weld/.code = {
+ \@@_set_bool:Nn \l_@@_weld_bool {#1}
+ },
+ weld/.default = true,
+ no~ weld/.code = {
+ \@@_set_bool:Nn \l_@@_weld_bool {#1}
+ \bool_set:Nn \l_@@_weld_bool {! \l_@@_weld_bool}
+ },
+ no~ weld/.default = true,
+ move/.code = {
+ \@@_set_bool:Nn \l_@@_move_bool {#1}
+ },
+ move/.default = true,
+ no~ move/.code = {
+ \@@_set_bool:Nn \l_@@_move_bool {#1}
+ \bool_set:Nn \l_@@_move_bool {! \l_@@_move_bool}
+ },
+ no~ move/.default = true,
+ global/.code = {
+ \@@_set_bool:Nn \l_@@_global_bool {#1}
+ },
+ global/.default = true,
+ transform/.store~in=\l_@@_transformation_tl,
+ .unknown/.code = {
+ \tl_set_eq:NN \l_@@_joinpath_tl \pgfkeyscurrentname
+ }
+}
+% \end{macrocode}
+%
+%
% When we split a soft path into components, we make it a comma separated list so that it can be fed into a \Verb+\foreach+ loop.
% This can also make it possible to extract a single component, but to do this we need a wrapper around \Verb+\clist_item:Nn+ (there doesn't appear to be a PGF way of getting an item of a CS list).
%
@@ -5042,6 +5236,15 @@ manipulating PGF soft paths}
\l_@@_tmpa_tl
}
},
+ save~ global/.code={
+ \tikz@addmode{
+ \spath_get_current_path:N \l_@@_tmpa_tl
+ \spath_bake_round:NV \l_@@_tmpa_tl \l_@@_tmpa_tl
+ \spath_gsave_path:cV
+ {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
+ \l_@@_tmpa_tl
+ }
+ },
clone/.code~ 2~ args={
\tl_if_exist:cTF
{\tl_use:N \l_@@_prefix_tl #2 \tl_use:N \l_@@_suffix_tl}
@@ -5070,15 +5273,6 @@ manipulating PGF soft paths}
\msg_warning:nnn { spath3 } { missing soft path } { #2 }
}
},
- save~ global/.code={
- \tikz@addmode{
- \spath_get_current_path:N \l_@@_tmpa_tl
- \spath_bake_round:NV \l_@@_tmpa_tl \l_@@_tmpa_tl
- \spath_gsave_path:cV
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
- \l_@@_tmpa_tl
- }
- },
% \end{macrocode}
%
% Saves a soft path to the aux file.
@@ -5097,77 +5291,152 @@ manipulating PGF soft paths}
},
% \end{macrocode}
%
-% Restores a soft path to the current path.
+% Exports the path as an SVG file.
%
% \begin{macrocode}
- restore/.code={
+ export~ to~ svg/.code={
\tl_if_exist:cTF
{\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
{
- \tl_if_empty:cTF
+ \spath_export_to_svg:nv {#1}
{\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
- {
- \tl_clear:N \l_@@_tmpa_tl
- \tl_put_right:NV \l_@@_tmpa_tl \c_spath_moveto_tl
- \tl_put_right:Nn \l_@@_tmpa_tl {{0pt}{0pt}}
- \spath_set_current_path:V \l_@@_tmpa_tl
- \spath_set_tikz_data:V \l_@@_tmpa_tl
- \msg_warning:nnn { spath3 } { empty soft path } { #1 }
- }
- {
- \spath_set_current_path:c
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
- \spath_set_tikz_data:v
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
- }
}
{
- \tl_clear:N \l_@@_tmpa_tl
- \tl_put_right:NV \l_@@_tmpa_tl \c_spath_moveto_tl
- \tl_put_right:Nn \l_@@_tmpa_tl {{0pt}{0pt}}
- \spath_set_current_path:V \l_@@_tmpa_tl
- \spath_set_tikz_data:V \l_@@_tmpa_tl
\msg_warning:nnn { spath3 } { missing soft path } { #1 }
}
},
% \end{macrocode}
%
-% Restores the reverse of a soft path to the current path.
+% Inserts the named path at the current point in the path, with options for how this is accomplished.
+% The inserted path can be transformed, reversed, moved to the current point, and welded to the current path.
+% If this is used before the path has been started then it becomes the start of the path (and the ``current point'' is taken as the origin).
+%
%
% \begin{macrocode}
- restore~ reverse/.code={
+ use/.code={
+ \bool_set_false:N \l_@@_reverse_bool
+ \bool_set_false:N \l_@@_weld_bool
+ \bool_set_false:N \l_@@_move_bool
+ \tl_clear:N \l_@@_joinpath_tl
+ \tl_clear:N \l_@@_transformation_tl
+ \tikzset{
+ spath/join/.cd,
+ #1
+ }
+
\tl_if_exist:cTF
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
{
- \tl_if_empty:cTF
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
+ \tl_use:N \l_@@_prefix_tl
+ \tl_use:N \l_@@_joinpath_tl
+ \tl_use:N \l_@@_suffix_tl
+ }
+ {
+ \tl_if_empty:cT
+ {
+ \tl_use:N \l_@@_prefix_tl
+ \tl_use:N \l_@@_joinpath_tl
+ \tl_use:N \l_@@_suffix_tl
+ }
{
- \tl_clear:N \l_@@_tmpa_tl
- \tl_put_right:NV \l_@@_tmpa_tl \c_spath_moveto_tl
- \tl_put_right:Nn \l_@@_tmpa_tl {{0pt}{0pt}}
- \spath_set_current_path:V \l_@@_tmpa_tl
- \spath_set_tikz_data:V \l_@@_tmpa_tl
\msg_warning:nnn { spath3 } { empty soft path } { #1 }
}
+ \tl_set_eq:Nc \l_@@_joinpath_tl
{
- \spath_reverse:Nv
- \l_@@_reverse_tl
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
- \spath_set_current_path:N \l_@@_reverse_tl
- \spath_set_tikz_data:V \l_@@_reverse_tl
+ \tl_use:N \l_@@_prefix_tl
+ \tl_use:N \l_@@_joinpath_tl
+ \tl_use:N \l_@@_suffix_tl
+ }
+ \spath_get_current_path:N \l_@@_current_tl
+
+ \bool_if:NT \l_@@_reverse_bool
+ {
+ \spath_reverse:N \l_@@_joinpath_tl
+ }
+
+ \tl_if_empty:NF \l_@@_transformation_tl
+ {
+ \group_begin:
+ \pgftransformreset
+ \@@_tikzset:V \l_@@_transformation_tl
+ \pgfgettransform \l_@@_tmpa_tl
+ \tl_gset:Nn \g_@@_smuggle_tl
+ {
+ \spath_transform:Nnnnnnn
+ \l_@@_joinpath_tl
+ }
+ \tl_gput_right:NV \g_@@_smuggle_tl \l_@@_tmpa_tl
+ \group_end:
+ \tl_use:N \g_@@_smuggle_tl
+ }
+
+ \bool_if:NT \l_@@_move_bool
+ {
+ \tl_if_empty:NTF \l_@@_current_tl
+ {
+ \tl_set:Nn \l_@@_tmpc_tl { {0pt} {0pt} }
+ }
+ {
+ \spath_finalpoint:NV
+ \l_@@_tmpc_tl
+ \l_@@_current_tl
+ }
+ \spath_translate_to:NV \l_@@_joinpath_tl \l_@@_tmpc_tl
+ }
+
+ \tl_if_empty:NTF \l_@@_current_tl
+ {
+ \tl_if_empty:NTF \l_@@_joinpath_tl
+ {
+ \tl_set_eq:NN \l_@@_current_tl \c_spath_moveto_tl
+ \tl_put_right:Nn \l_@@_current_tl {{0pt}{0pt}}
+ }
+ {
+ \tl_set_eq:NN \l_@@_current_tl \l_@@_joinpath_tl
+ }
+ }
+ {
+
+ \tl_clear:N \l_@@_tmpa_tl
+ \tl_set:Nn \l_@@_tmpa_tl {spath_}
+
+ \tl_put_right:Nn \l_@@_tmpa_tl {append}
+
+ \bool_if:NT \l_@@_weld_bool
+ {
+ \tl_put_right:Nn \l_@@_tmpa_tl {_no_move}
+ }
+ \tl_put_right:Nn \l_@@_tmpa_tl {:NV}
+
+ \use:c {\tl_use:N \l_@@_tmpa_tl }
+ \l_@@_current_tl
+ \l_@@_joinpath_tl
}
+
+ \spath_set_current_path:N \l_@@_current_tl
+ \spath_set_tikz_data:V \l_@@_joinpath_tl
}
{
- \tl_clear:N \l_@@_tmpa_tl
- \tl_put_right:NV \l_@@_tmpa_tl \c_spath_moveto_tl
- \tl_put_right:Nn \l_@@_tmpa_tl {{0pt}{0pt}}
- \spath_set_current_path:V \l_@@_tmpa_tl
- \spath_set_tikz_data:V \l_@@_tmpa_tl
- \msg_warning:nnn { spath3 } { missing soft path } { #1 }
+ \msg_warning:nnx
+ { spath3 }
+ { missing soft path }
+ {\tl_use:N \l_@@_joinpath_tl }
}
},
% \end{macrocode}
%
+% Some aliases for the above.
+%
+% \begin{macrocode}
+ restore/.style={/tikz/spath/use={#1}},
+ restore~ reverse/.style={/tikz/spath/use={reverse, #1}},
+ append/.style={/tikz/spath/use={move, weld, #1}},
+ append~ no~ move/.style={/tikz/spath/use={weld, #1}},
+ append~ reverse/.style={/tikz/spath/use={move, weld, reverse, #1}},
+ append~ reverse~ no~ move/.style={/tikz/spath/use={weld, reverse, #1}},
+ insert/.style={/tikz/spath/use={#1}},
+ insert~ reverse/.style={/tikz/spath/use={reverse, #1}},
+% \end{macrocode}
+%
% Diagnostic, show the current path in the terminal and log.
%
% \begin{macrocode}
@@ -5204,45 +5473,99 @@ manipulating PGF soft paths}
},
% \end{macrocode}
%
-% Appends the named path to the current path with a weld.
-%
-% \begin{macrocode}
- append/.code={
- \tl_if_exist:cTF
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
- {
- \spath_get_current_path:N \l_@@_current_tl
- \spath_finalpoint:NV \l_@@_tmpa_tl \l_@@_current_tl
- \tl_set_eq:Nc
- \l_@@_tmpb_tl
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
- \spath_translate_to:NV \l_@@_tmpb_tl \l_@@_tmpa_tl
- \spath_append_no_move:NV \l_@@_current_tl \l_@@_tmpb_tl
- \spath_set_current_path:N \l_@@_current_tl
- \spath_set_tikz_data:V \l_@@_tmpb_tl
- }
- {
- \msg_warning:nnn { spath3 } { missing soft path } { #1 }
- }
- },
-% \end{macrocode}
-%
-% Joins the second named path to the first.
+% This joins a path on to an existing path, possibly modifying it first.
+% The possible options are the same as those for \Verb+use+.
+% It is possible to specify the same path both for the initial and the joining path as a copy is made internally first.
%
% \begin{macrocode}
join~ with/.code~ 2~ args={
\tl_if_exist:cTF
{\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
{
+ \bool_set_false:N \l_@@_reverse_bool
+ \bool_set_false:N \l_@@_weld_bool
+ \bool_set_false:N \l_@@_move_bool
+ \bool_set_false:N \l_@@_global_bool
+ \tl_clear:N \l_@@_joinpath_tl
+ \tl_clear:N \l_@@_transformation_tl
+ \tikzset{
+ spath/join/.cd,
+ #2
+ }
+
\tl_if_exist:cTF
- {\tl_use:N \l_@@_prefix_tl #2 \tl_use:N \l_@@_suffix_tl}
{
- \spath_append:cv
+ \tl_use:N \l_@@_prefix_tl
+ \tl_use:N \l_@@_joinpath_tl
+ \tl_use:N \l_@@_suffix_tl
+ }
+ {
+ \tl_set_eq:Nc \l_@@_joinpath_tl
+ {
+ \tl_use:N \l_@@_prefix_tl
+ \tl_use:N \l_@@_joinpath_tl
+ \tl_use:N \l_@@_suffix_tl
+ }
+
+ \bool_if:NT \l_@@_reverse_bool
+ {
+ \spath_reverse:N \l_@@_joinpath_tl
+ }
+
+ \tl_if_empty:NF \l_@@_transformation_tl
+ {
+ \group_begin:
+ \pgftransformreset
+ \@@_tikzset:V \l_@@_transformation_tl
+ \pgfgettransform \l_@@_tmpa_tl
+ \tl_gset:Nn \g_@@_smuggle_tl
+ {
+ \spath_transform:Nnnnnnn
+ \l_@@_joinpath_tl
+ }
+ \tl_gput_right:NV \g_@@_smuggle_tl \l_@@_tmpa_tl
+ \group_end:
+ \tl_use:N \g_@@_smuggle_tl
+ }
+
+ \bool_if:NT \l_@@_move_bool
+ {
+ \spath_finalpoint:Nv
+ \l_@@_tmpc_tl
+ {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
+ \spath_translate_to:NV \l_@@_joinpath_tl \l_@@_tmpc_tl
+ }
+
+ \tl_clear:N \l_@@_tmpa_tl
+ \tl_set:Nn \l_@@_tmpa_tl {spath_}
+
+ \bool_if:NT \l_@@_global_bool
+ {
+ \tl_put_right:Nn \l_@@_tmpa_tl {g}
+ }
+
+ \tl_put_right:Nn \l_@@_tmpa_tl {append}
+
+ \bool_if:NT \l_@@_weld_bool
+ {
+ \tl_put_right:Nn \l_@@_tmpa_tl {_no_move}
+ }
+ \tl_put_right:Nn \l_@@_tmpa_tl {:cV}
+
+ \cs_if_exist:cF {\tl_use:N \l_@@_tmpa_tl}
+ {
+ \tl_show:N \l_@@_tmpa_tl
+ }
+
+ \use:c {\tl_use:N \l_@@_tmpa_tl }
{\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
- {\tl_use:N \l_@@_prefix_tl #2 \tl_use:N \l_@@_suffix_tl}
+ \l_@@_joinpath_tl
}
{
- \msg_warning:nnn { spath3 } { missing soft path } { #2 }
+ \msg_warning:nnx
+ { spath3 }
+ { missing soft path }
+ {\tl_use:N \l_@@_joinpath_tl }
}
}
{
@@ -5305,113 +5628,6 @@ manipulating PGF soft paths}
},
% \end{macrocode}
%
-% Appends the reversal of the path to the current path.
-%
-% \begin{macrocode}
- append~ reverse/.code={
- \tl_if_exist:cTF
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
- {
- \spath_reverse:Nv
- \l_@@_reverse_tl
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
- \spath_get_current_path:N \l_@@_current_tl
- \spath_finalpoint:NV \l_@@_tmpa_tl \l_@@_current_tl
- \spath_translate_to:NV \l_@@_reverse_tl \l_@@_tmpa_tl
- \spath_append_no_move:NV \l_@@_current_tl \l_@@_reverse_tl
- \spath_set_current_path:N \l_@@_current_tl
- \spath_set_tikz_data:V \l_@@_reverse_tl
- }
- {
- \msg_warning:nnn { spath3 } { missing soft path } { #1 }
- }
- },
-% \end{macrocode}
-%
-% Inserts the named path into the current path as-is, meaning without transforming or welding it.
-%
-% \begin{macrocode}
- insert/.code={
- \tl_if_exist:cTF
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
- {
- \spath_get_current_path:N \l_@@_current_tl
- \spath_append:Nv
- \l_@@_current_tl
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
- \spath_set_current_path:N \l_@@_current_tl
- \spath_set_tikz_data:v
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
- }
- {
- \msg_warning:nnn { spath3 } { missing soft path } { #1 }
- }
- },
-% \end{macrocode}
-%
-% Inserts the reverse of the named path.
-%
-% \begin{macrocode}
- insert~ reverse/.code={
- \tl_if_exist:cTF
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
- {
- \spath_reverse:Nv
- \l_@@_reverse_tl
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
- \spath_get_current_path:N \l_@@_current_tl
- \spath_append:NV \l_@@_current_tl \l_@@_reverse_tl
- \spath_set_current_path:N \l_@@_current_tl
- \spath_set_tikz_data:V \l_@@_reverse_tl
- }
- {
- \msg_warning:nnn { spath3 } { missing soft path } { #1 }
- }
- },
-% \end{macrocode}
-%
-% Appends the named path to the current path without translating it.
-%
-% \begin{macrocode}
- append~ no~ move/.code={
- \tl_if_exist:cTF
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
- {
- \spath_get_current_path:N \l_@@_current_tl
- \spath_append_no_move:Nv
- \l_@@_current_tl
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
- \spath_set_current_path:N \l_@@_current_tl
- \spath_set_tikz_data:v
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
- }
- {
- \msg_warning:nnn { spath3 } { missing soft path } { #1 }
- }
- },
-% \end{macrocode}
-%
-% Appends the reverse of the named path without translating it.
-%
-% \begin{macrocode}
- append~ reverse~ no~ move/.code={
- \tl_if_exist:cTF
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
- {
- \spath_reverse:Nv
- \l_@@_reverse_tl
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
- \spath_get_current_path:N \l_@@_current_tl
- \spath_append_no_move:NV \l_@@_current_tl \l_@@_reverse_tl
- \spath_set_current_path:N \l_@@_current_tl
- \spath_set_tikz_data:V \l_@@_reverse_tl
- }
- {
- \msg_warning:nnn { spath3 } { missing soft path } { #1 }
- }
- },
-% \end{macrocode}
-%
% Adjust a path to span between two points.
%
% \begin{macrocode}
@@ -5519,36 +5735,99 @@ manipulating PGF soft paths}
% \end{macrocode}
%
% Join the components of a path by splicing in the second path whenever the components are sufficiently far apart.
+% The third argument is a list of components to splice after, if it is empty then all components are used and a spot weld is done first so that the splicing only happens if there is an actual gap.
+%
+% The \Verb+upright+ versions will join with the reflection of the splice path if it detects that the gap is ``upside-down''.
+%
%
% \begin{macrocode}
join~ components~ with/.code~2~args={
\tl_if_exist:cTF
{\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
{
+ \tl_if_head_is_group:nTF {#2}
+ {
+ \tl_set:Nx \l_@@_tmpc_tl { \tl_item:nn {#2} {1} }
+ \tl_set:Nx \l_@@_tmpd_tl { \tl_item:nn {#2} {2} }
+ }
+ {
+ \tl_set:Nn \l_@@_tmpc_tl {#2}
+ \tl_clear:N \l_@@_tmpd_tl
+ }
\tl_if_exist:cTF
- {\tl_use:N \l_@@_prefix_tl #2 \tl_use:N \l_@@_suffix_tl}
{
- \spath_spot_weld_components:c
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
+ \tl_use:N \l_@@_prefix_tl
+ \tl_use:N \l_@@_tmpc_tl
+ \tl_use:N \l_@@_suffix_tl
+ }
+ {
+ \tl_if_empty:NT \l_@@_tmpd_tl
+ {
+ \spath_spot_weld_components:c
+ {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
+ }
\spath_components_to_seq:Nv
\l_@@_tmpa_seq
{\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
+ \seq_gclear:N \g_@@_tmpa_seq
+
+ \tl_if_empty:NTF \l_@@_tmpd_tl
+ {
+ \int_step_inline:nnnn {1}{1} {\seq_count:N \l_@@_tmpa_seq}
+ {
+ \seq_gput_right:Nn \g_@@_tmpa_seq {##1}
+ }
+ }
+ {
+ \foreach \l_@@_tmpa_tl in \l_@@_tmpd_tl
+ {
+ \seq_gput_right:NV \g_@@_tmpa_seq \l_@@_tmpa_tl
+ }
+ \seq_gsort:Nn \g_@@_tmpa_seq
+ {
+ \int_compare:nNnTF {##1} < {##2}
+ { \sort_return_same: }
+ { \sort_return_swapped: }
+ }
+ }
+
\seq_pop_left:NN \l_@@_tmpa_seq \l_@@_tmpa_tl
-
- \seq_map_inline:Nn \l_@@_tmpa_seq
+ \seq_gpop_left:NN \g_@@_tmpa_seq \l_@@_tmpb_tl
+
+ \seq_map_indexed_inline:Nn \l_@@_tmpa_seq
{
- \spath_splice_between:Nvn \l_@@_tmpa_tl
- {\tl_use:N \l_@@_prefix_tl #2 \tl_use:N \l_@@_suffix_tl}
- {##1}
+ \int_compare:nTF
+ {
+ ##1 == \l_@@_tmpb_tl
+ }
+ {
+ \seq_gpop_left:NNF \g_@@_tmpa_seq \l_@@_tmpb_tl
+ {
+ \tl_set:Nn \l_@@_tmpb_tl {-1}
+ }
+ \spath_splice_between:Nvn \l_@@_tmpa_tl
+ {
+ \tl_use:N \l_@@_prefix_tl
+ \tl_use:N \l_@@_tmpc_tl
+ \tl_use:N \l_@@_suffix_tl
+ }
+ {##2}
+ }
+ {
+ \tl_put_right:Nn \l_@@_tmpa_tl {##2}
+ }
}
\tl_set_eq:cN
{\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
\l_@@_tmpa_tl
}
{
- \msg_warning:nnn { spath3 } { missing soft path } { #2 }
+ \msg_warning:nnx
+ { spath3 }
+ { missing soft path }
+ { \tl_use:N \l_@@_tmpc_tl }
}
}
{
@@ -5559,30 +5838,319 @@ manipulating PGF soft paths}
\tl_if_exist:cTF
{\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
{
+ \tl_if_head_is_group:nTF {#2}
+ {
+ \tl_set:Nx \l_@@_tmpc_tl { \tl_item:nn {#2} {1} }
+ \tl_set:Nx \l_@@_tmpd_tl { \tl_item:nn {#2} {2} }
+ }
+ {
+ \tl_set:Nn \l_@@_tmpc_tl {#2}
+ \tl_clear:N \l_@@_tmpd_tl
+ }
\tl_if_exist:cTF
- {\tl_use:N \l_@@_prefix_tl #2 \tl_use:N \l_@@_suffix_tl}
{
- \spath_spot_gweld_components:c
+ \tl_use:N \l_@@_prefix_tl
+ \tl_use:N \l_@@_tmpc_tl
+ \tl_use:N \l_@@_suffix_tl
+ }
+ {
+ \tl_if_empty:NT \l_@@_tmpd_tl
+ {
+ \spath_spot_weld_components:c
+ {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
+ }
+
+ \spath_components_to_seq:Nv
+ \l_@@_tmpa_seq
{\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
+
+ \seq_gclear:N \g_@@_tmpa_seq
+ \tl_if_empty:NTF \l_@@_tmpd_tl
+ {
+ \int_step_inline:nnnn {1}{1} {\seq_count:N \l_@@_tmpa_seq}
+ {
+ \seq_gput_right:Nn \g_@@_tmpa_seq {##1}
+ }
+ }
+ {
+ \foreach \l_@@_tmpa_tl in \l_@@_tmpd_tl
+ {
+ \seq_gput_right:NV \g_@@_tmpa_seq \l_@@_tmpa_tl
+ }
+ \seq_gsort:Nn \g_@@_tmpa_seq
+ {
+ \int_compare:nNnTF {##1} < {##2}
+ { \sort_return_same: }
+ { \sort_return_swapped: }
+ }
+ }
+
+ \seq_pop_left:NN \l_@@_tmpa_seq \l_@@_tmpa_tl
+ \seq_gpop_left:NN \g_@@_tmpa_seq \l_@@_tmpb_tl
+
+ \seq_map_indexed_inline:Nn \l_@@_tmpa_seq
+ {
+ \int_compare:nTF
+ {
+ ##1 == \l_@@_tmpb_tl
+ }
+ {
+ \seq_gpop_left:NNF \g_@@_tmpa_seq \l_@@_tmpb_tl
+ {
+ \tl_set:Nn \l_@@_tmpb_tl {-1}
+ }
+ \spath_splice_between:Nvn \l_@@_tmpa_tl
+ {
+ \tl_use:N \l_@@_prefix_tl
+ \tl_use:N \l_@@_tmpc_tl
+ \tl_use:N \l_@@_suffix_tl
+ }
+ {##2}
+ }
+ {
+ \tl_put_right:Nn \l_@@_tmpa_tl {##2}
+ }
+ }
+ \tl_gset_eq:cN
+ {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
+ \l_@@_tmpa_tl
+ }
+ {
+ \msg_warning:nnx
+ { spath3 }
+ { missing soft path }
+ { \tl_use:N \l_@@_tmpc_tl }
+ }
+ }
+ {
+ \msg_warning:nnn { spath3 } { missing soft path } { #1 }
+ }
+ },
+ join~ components~ upright~ with/.code~2~args={
+ \tl_if_exist:cTF
+ {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
+ {
+ \tl_if_head_is_group:nTF {#2}
+ {
+ \tl_set:Nx \l_@@_tmpc_tl { \tl_item:nn {#2} {1} }
+ \tl_set:Nx \l_@@_tmpd_tl { \tl_item:nn {#2} {2} }
+ }
+ {
+ \tl_set:Nn \l_@@_tmpc_tl {#2}
+ \tl_clear:N \l_@@_tmpd_tl
+ }
+ \tl_if_exist:cTF
+ {
+ \tl_use:N \l_@@_prefix_tl
+ \tl_use:N \l_@@_tmpc_tl
+ \tl_use:N \l_@@_suffix_tl
+ }
+ {
+ \tl_if_empty:NT \l_@@_tmpd_tl
+ {
+ \spath_spot_weld_components:c
+ {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
+ }
+
\spath_components_to_seq:Nv
\l_@@_tmpa_seq
{\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
+ \seq_gclear:N \g_@@_tmpa_seq
+
+ \tl_if_empty:NTF \l_@@_tmpd_tl
+ {
+ \int_step_inline:nnnn {1}{1} {\seq_count:N \l_@@_tmpa_seq}
+ {
+ \seq_gput_right:Nn \g_@@_tmpa_seq {##1}
+ }
+ }
+ {
+ \foreach \l_@@_tmpa_tl in \l_@@_tmpd_tl
+ {
+ \seq_gput_right:NV \g_@@_tmpa_seq \l_@@_tmpa_tl
+ }
+ \seq_gsort:Nn \g_@@_tmpa_seq
+ {
+ \int_compare:nNnTF {##1} < {##2}
+ { \sort_return_same: }
+ { \sort_return_swapped: }
+ }
+ }
+
\seq_pop_left:NN \l_@@_tmpa_seq \l_@@_tmpa_tl
-
- \seq_map_inline:Nn \l_@@_tmpa_seq
+ \seq_gpop_left:NN \g_@@_tmpa_seq \l_@@_tmpb_tl
+
+ \tl_set_eq:Nc \l_@@_tmpc_tl
{
- \spath_gsplice_between:Nvn \l_@@_tmpa_tl
- {\tl_use:N \l_@@_prefix_tl #2 \tl_use:N \l_@@_suffix_tl}
- {##1}
+ \tl_use:N \l_@@_prefix_tl
+ \tl_use:N \l_@@_tmpc_tl
+ \tl_use:N \l_@@_suffix_tl
+ }
+ \spath_transform:NVnnnnnn \l_@@_tmpd_tl \l_@@_tmpc_tl {1}{0}{0}{-1}{0pt}{0pt}
+
+ \seq_map_indexed_inline:Nn \l_@@_tmpa_seq
+ {
+ \int_compare:nTF
+ {
+ ##1 == \l_@@_tmpb_tl
+ }
+ {
+ \seq_gpop_left:NNF \g_@@_tmpa_seq \l_@@_tmpb_tl
+ {
+ \tl_set:Nn \l_@@_tmpb_tl {-1}
+ }
+ \spath_finalpoint:NV \l_@@_tmpe_tl \l_@@_tmpa_tl
+ \spath_initialpoint:Nn \l_@@_tmpf_tl {##2}
+
+ \dim_compare:nTF
+ {
+ \tl_item:Nn \l_@@_tmpe_tl {1}
+ >
+ \tl_item:Nn \l_@@_tmpf_tl {1}
+ }
+ {
+ \spath_splice_between:NVn
+ \l_@@_tmpa_tl
+ \l_@@_tmpd_tl
+ {##2}
+ }
+ {
+ \spath_splice_between:NVn
+ \l_@@_tmpa_tl
+ \l_@@_tmpc_tl
+ {##2}
+ }
+ }
+ {
+ \tl_put_right:Nn \l_@@_tmpa_tl {##2}
+ }
}
\tl_set_eq:cN
{\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
\l_@@_tmpa_tl
}
{
- \msg_warning:nnn { spath3 } { missing soft path } { #2 }
+ \msg_warning:nnx
+ { spath3 }
+ { missing soft path }
+ { \tl_use:N \l_@@_tmpc_tl }
+ }
+ }
+ {
+ \msg_warning:nnn { spath3 } { missing soft path } { #1 }
+ }
+ },
+ join~ components~ globally~ upright~ with/.code~2~args={
+ \tl_if_exist:cTF
+ {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
+ {
+ \tl_if_head_is_group:nTF {#2}
+ {
+ \tl_set:Nx \l_@@_tmpc_tl { \tl_item:nn {#2} {1} }
+ \tl_set:Nx \l_@@_tmpd_tl { \tl_item:nn {#2} {2} }
+ }
+ {
+ \tl_set:Nn \l_@@_tmpc_tl {#2}
+ \tl_clear:N \l_@@_tmpd_tl
+ }
+ \tl_if_exist:cTF
+ {
+ \tl_use:N \l_@@_prefix_tl
+ \tl_use:N \l_@@_tmpc_tl
+ \tl_use:N \l_@@_suffix_tl
+ }
+ {
+ \tl_if_empty:NT \l_@@_tmpd_tl
+ {
+ \spath_spot_weld_components:c
+ {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
+ }
+
+ \spath_components_to_seq:Nv
+ \l_@@_tmpa_seq
+ {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
+
+ \seq_gclear:N \g_@@_tmpa_seq
+
+ \tl_if_empty:NTF \l_@@_tmpd_tl
+ {
+ \int_step_inline:nnnn {1}{1} {\seq_count:N \l_@@_tmpa_seq}
+ {
+ \seq_gput_right:Nn \g_@@_tmpa_seq {##1}
+ }
+ }
+ {
+ \foreach \l_@@_tmpa_tl in \l_@@_tmpd_tl
+ {
+ \seq_gput_right:NV \g_@@_tmpa_seq \l_@@_tmpa_tl
+ }
+ \seq_gsort:Nn \g_@@_tmpa_seq
+ {
+ \int_compare:nNnTF {##1} < {##2}
+ { \sort_return_same: }
+ { \sort_return_swapped: }
+ }
+ }
+
+ \seq_pop_left:NN \l_@@_tmpa_seq \l_@@_tmpa_tl
+ \seq_gpop_left:NN \g_@@_tmpa_seq \l_@@_tmpb_tl
+
+ \tl_set_eq:Nc \l_@@_tmpc_tl
+ {
+ \tl_use:N \l_@@_prefix_tl
+ \tl_use:N \l_@@_tmpc_tl
+ \tl_use:N \l_@@_suffix_tl
+ }
+ \spath_transform:NVnnnnnn \l_@@_tmpd_tl \l_@@_tmpc_tl {1}{0}{0}{-1}{0pt}{0pt}
+
+ \seq_map_indexed_inline:Nn \l_@@_tmpa_seq
+ {
+ \int_compare:nTF
+ {
+ ##1 == \l_@@_tmpb_tl
+ }
+ {
+ \seq_gpop_left:NNF \g_@@_tmpa_seq \l_@@_tmpb_tl
+ {
+ \tl_set:Nn \l_@@_tmpb_tl {-1}
+ }
+ \spath_finalpoint:NV \l_@@_tmpe_tl \l_@@_tmpa_tl
+ \spath_initialpoint:Nn \l_@@_tmpf_tl {##2}
+
+ \dim_compare:nTF
+ {
+ \tl_item:Nn \l_@@_tmpe_tl {1}
+ >
+ \tl_item:Nn \l_@@_tmpf_tl {1}
+ }
+ {
+ \spath_splice_between:NVn
+ \l_@@_tmpa_tl
+ \l_@@_tmpd_tl
+ {##2}
+ }
+ {
+ \spath_splice_between:NVn
+ \l_@@_tmpa_tl
+ \l_@@_tmpc_tl
+ {##2}
+ }
+ }
+ {
+ \tl_put_right:Nn \l_@@_tmpa_tl {##2}
+ }
+ }
+ \tl_gset_eq:cN
+ {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
+ \l_@@_tmpa_tl
+ }
+ {
+ \msg_warning:nnx
+ { spath3 }
+ { missing soft path }
+ { \tl_use:N \l_@@_tmpc_tl }
}
}
{
@@ -5790,22 +6358,6 @@ manipulating PGF soft paths}
},
% \end{macrocode}
%
-% Exports the path as an SVG file.
-%
-% \begin{macrocode}
- export~ to~ svg/.code={
- \tl_if_exist:cTF
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
- {
- \spath_export_to_svg:nv {#1}
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
- }
- {
- \msg_warning:nnn { spath3 } { missing soft path } { #1 }
- }
- },
-% \end{macrocode}
-%
% Transforms the named path using TikZ transformation specifications.
%
% \begin{macrocode}
@@ -5858,40 +6410,58 @@ manipulating PGF soft paths}
% \begin{macrocode}
split~ at~ intersections~ with/.code~ n~ args={2}{
\tl_if_exist:cTF
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
+ {
+ tikz@library@intersections@loaded
+ }
{
\tl_if_exist:cTF
- {\tl_use:N \l_@@_prefix_tl #2 \tl_use:N \l_@@_suffix_tl}
+ {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
{
- \spath_split_path_at_intersections:cv
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
+ \tl_if_exist:cTF
{\tl_use:N \l_@@_prefix_tl #2 \tl_use:N \l_@@_suffix_tl}
+ {
+ \spath_split_path_at_intersections:cv
+ {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
+ {\tl_use:N \l_@@_prefix_tl #2 \tl_use:N \l_@@_suffix_tl}
+ }
+ {
+ \msg_warning:nnn { spath3 } { missing soft path } { #2 }
+ }
}
{
- \msg_warning:nnn { spath3 } { missing soft path } { #2 }
+ \msg_warning:nnn { spath3 } { missing soft path } { #1 }
}
}
{
- \msg_warning:nnn { spath3 } { missing soft path } { #1 }
+ \msg_warning:nn { spath3 } { load intersections }
}
},
split~ globally~ at~ intersections~ with/.code~ n~ args={2}{
\tl_if_exist:cTF
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
{
- \tl_if_exist:cTF
- {\tl_use:N \l_@@_prefix_tl #2 \tl_use:N \l_@@_suffix_tl}
+ tikz@library@intersections@loaded
+ }
+ {
+ \tl_if_exist:cTF
+ {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
{
- \spath_gsplit_path_at_intersections:cv
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
+ \tl_if_exist:cTF
{\tl_use:N \l_@@_prefix_tl #2 \tl_use:N \l_@@_suffix_tl}
+ {
+ \spath_gsplit_path_at_intersections:cv
+ {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
+ {\tl_use:N \l_@@_prefix_tl #2 \tl_use:N \l_@@_suffix_tl}
+ }
+ {
+ \msg_warning:nnn { spath3 } { missing soft path } { #2 }
+ }
}
{
- \msg_warning:nnn { spath3 } { missing soft path } { #2 }
+ \msg_warning:nnn { spath3 } { missing soft path } { #1 }
}
}
{
- \msg_warning:nnn { spath3 } { missing soft path } { #1 }
+ \msg_warning:nn { spath3 } { load intersections }
}
},
% \end{macrocode}
@@ -5901,40 +6471,58 @@ manipulating PGF soft paths}
% \begin{macrocode}
split~ at~ intersections/.code~ n~ args={2}{
\tl_if_exist:cTF
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
+ {
+ tikz@library@intersections@loaded
+ }
{
\tl_if_exist:cTF
- {\tl_use:N \l_@@_prefix_tl #2 \tl_use:N \l_@@_suffix_tl}
+ {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
{
- \spath_split_at_intersections:cc
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
+ \tl_if_exist:cTF
{\tl_use:N \l_@@_prefix_tl #2 \tl_use:N \l_@@_suffix_tl}
+ {
+ \spath_split_at_intersections:cc
+ {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
+ {\tl_use:N \l_@@_prefix_tl #2 \tl_use:N \l_@@_suffix_tl}
+ }
+ {
+ \msg_warning:nnn { spath3 } { missing soft path } { #2 }
+ }
}
{
- \msg_warning:nnn { spath3 } { missing soft path } { #2 }
+ \msg_warning:nnn { spath3 } { missing soft path } { #1 }
}
}
{
- \msg_warning:nnn { spath3 } { missing soft path } { #1 }
+ \msg_warning:nn { spath3 } { load intersections }
}
},
split~ globally~ at~ intersections/.code~ n~ args={2}{
\tl_if_exist:cTF
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
+ {
+ tikz@library@intersections@loaded
+ }
{
\tl_if_exist:cTF
- {\tl_use:N \l_@@_prefix_tl #2 \tl_use:N \l_@@_suffix_tl}
+ {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
{
- \spath_gsplit_at_intersections:cc
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
+ \tl_if_exist:cTF
{\tl_use:N \l_@@_prefix_tl #2 \tl_use:N \l_@@_suffix_tl}
+ {
+ \spath_gsplit_at_intersections:cc
+ {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
+ {\tl_use:N \l_@@_prefix_tl #2 \tl_use:N \l_@@_suffix_tl}
+ }
+ {
+ \msg_warning:nnn { spath3 } { missing soft path } { #2 }
+ }
}
{
- \msg_warning:nnn { spath3 } { missing soft path } { #2 }
+ \msg_warning:nnn { spath3 } { missing soft path } { #1 }
}
}
{
- \msg_warning:nnn { spath3 } { missing soft path } { #1 }
+ \msg_warning:nn { spath3 } { load intersections }
}
},
% \end{macrocode}
@@ -5944,24 +6532,42 @@ manipulating PGF soft paths}
% \begin{macrocode}
split~ at~ self~ intersections/.code={
\tl_if_exist:cTF
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
{
- \spath_split_at_self_intersections:c
+ tikz@library@intersections@loaded
+ }
+ {
+ \tl_if_exist:cTF
{\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
+ {
+ \spath_split_at_self_intersections:c
+ {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
+ }
+ {
+ \msg_warning:nnn { spath3 } { missing soft path } { #1 }
+ }
}
{
- \msg_warning:nnn { spath3 } { missing soft path } { #1 }
+ \msg_warning:nn { spath3 } { load intersections }
}
},
split~ globally~ at~ self~ intersections/.code={
\tl_if_exist:cTF
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
{
- \spath_gsplit_at_self_intersections:c
+ tikz@library@intersections@loaded
+ }
+ {
+ \tl_if_exist:cTF
{\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
+ {
+ \spath_gsplit_at_self_intersections:c
+ {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
+ }
+ {
+ \msg_warning:nnn { spath3 } { missing soft path } { #1 }
+ }
}
{
- \msg_warning:nnn { spath3 } { missing soft path } { #1 }
+ \msg_warning:nn { spath3 } { load intersections }
}
},
% \end{macrocode}
@@ -6069,40 +6675,64 @@ manipulating PGF soft paths}
% The list of components is passed through a \Verb+\foreach+ loop so can use the shortcut syntax from those loops.
%
% \begin{macrocode}
- insert~ gaps~ after~ components/.code~ n~ args={3}{
+ insert~ gaps~ after~ components/.code~ 2~ args={
\tl_if_exist:cTF
{\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
{
\group_begin:
+ \tl_if_head_is_group:nTF {#2}
+ {
+ \tl_set:Nx \l_@@_tmpc_tl { \tl_item:nn {#2} {1} }
+ \tl_set:Nx \l_@@_tmpd_tl { \tl_item:nn {#2} {2} }
+ }
+ {
+ \tl_set:Nn \l_@@_tmpc_tl {#2}
+ \tl_clear:N \l_@@_tmpd_tl
+ }
\seq_gclear:N \g_@@_tmpa_seq
\seq_gclear:N \g_@@_tmpb_seq
\spath_numberofcomponents:Nv \l_@@_tmpa_int
{\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
- \foreach \l_@@_tmpa_tl in {#3}
+
+ \spath_components_to_seq:Nv
+ \l_@@_tmpa_seq
+ {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
+
+ \tl_if_empty:NTF \l_@@_tmpd_tl
{
- \seq_gput_right:NV \g_@@_tmpa_seq \l_@@_tmpa_tl
- \seq_gput_right:Nx
- \g_@@_tmpb_seq
- {\int_eval:n
- {
- \int_mod:nn { \l_@@_tmpa_tl }{ \l_@@_tmpa_int } + 1
+ \int_step_inline:nnnn {1}{1} { \l_@@_tmpa_int - 1 }
+ {
+ \seq_gput_right:Nn \g_@@_tmpa_seq {##1}
+ \seq_gput_right:Nx
+ \g_@@_tmpb_seq
+ {\int_eval:n {##1 + 1}}
+ }
+ }
+ {
+ \foreach \l_@@_tmpa_tl in \l_@@_tmpd_tl
+ {
+ \seq_gput_right:NV \g_@@_tmpa_seq \l_@@_tmpa_tl
+ \seq_gput_right:Nx
+ \g_@@_tmpb_seq
+ {\int_eval:n
+ {
+ \int_mod:nn { \l_@@_tmpa_tl }{ \l_@@_tmpa_int } + 1
+ }
}
}
}
- \spath_components_to_seq:Nv
- \l_@@_tmpa_seq
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
+
\seq_clear:N \l_@@_tmpb_seq
\seq_map_indexed_inline:Nn \l_@@_tmpa_seq
{
\tl_set:Nn \l_@@_tmpa_tl {##2}
\seq_if_in:NnT \g_@@_tmpa_seq {##1}
{
- \spath_shorten_at_end:Nn \l_@@_tmpa_tl {#2/2}
+ \spath_shorten_at_end:Nn \l_@@_tmpa_tl {\l_@@_tmpc_tl/2}
}
\seq_if_in:NnT \g_@@_tmpb_seq {##1}
{
- \spath_shorten_at_start:Nn \l_@@_tmpa_tl {#2/2}
+ \spath_shorten_at_start:Nn \l_@@_tmpa_tl {\l_@@_tmpc_tl/2}
}
\seq_put_right:NV \l_@@_tmpb_seq \l_@@_tmpa_tl
}
@@ -6117,41 +6747,64 @@ manipulating PGF soft paths}
\msg_warning:nnn { spath3 } { missing soft path } { #1 }
}
},
- insert~ gaps~ globally~ after~ components/.code~ n~ args={3}{
+ insert~ gaps~ globally~ after~ components/.code~ 2~ args={
\tl_if_exist:cTF
{\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
{
\group_begin:
+ \tl_if_head_is_group:nTF {#2}
+ {
+ \tl_set:Nx \l_@@_tmpc_tl { \tl_item:nn {#2} {1} }
+ \tl_set:Nx \l_@@_tmpd_tl { \tl_item:nn {#2} {2} }
+ }
+ {
+ \tl_set:Nn \l_@@_tmpc_tl {#2}
+ \tl_clear:N \l_@@_tmpd_tl
+ }
\seq_gclear:N \g_@@_tmpa_seq
\seq_gclear:N \g_@@_tmpb_seq
\spath_numberofcomponents:Nv \l_@@_tmpa_int
{\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
- \foreach \l_@@_tmpa_tl in {#3}
+
+ \spath_components_to_seq:Nv
+ \l_@@_tmpa_seq
+ {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
+
+ \tl_if_empty:NTF \l_@@_tmpd_tl
{
- \seq_gput_right:NV \g_@@_tmpa_seq \l_@@_tmpa_tl
- \seq_gput_right:Nx
- \g_@@_tmpb_seq
+ \int_step_inline:nnnn {1}{1} { \l_@@_tmpa_int - 1 }
{
- \int_eval:n
- {
- \int_mod:nn { \l_@@_tmpa_tl }{ \l_@@_tmpa_int } + 1
+ \seq_gput_right:Nn \g_@@_tmpa_seq {##1}
+ \seq_gput_right:Nx
+ \g_@@_tmpb_seq
+ {\int_eval:n {##1 + 1}}
+ }
+ }
+ {
+ \foreach \l_@@_tmpa_tl in \l_@@_tmpd_tl
+ {
+ \seq_gput_right:NV \g_@@_tmpa_seq \l_@@_tmpa_tl
+ \seq_gput_right:Nx
+ \g_@@_tmpb_seq
+ {\int_eval:n
+ {
+ \int_mod:nn { \l_@@_tmpa_tl }{ \l_@@_tmpa_int } + 1
+ }
}
}
}
- \spath_components_to_seq:Nv
- \l_@@_tmpa_seq
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
+
\seq_clear:N \l_@@_tmpb_seq
\seq_map_indexed_inline:Nn \l_@@_tmpa_seq
{
\tl_set:Nn \l_@@_tmpa_tl {##2}
\seq_if_in:NnT \g_@@_tmpa_seq {##1}
{
- \spath_shorten_at_end:Nn \l_@@_tmpa_tl {#2/2}
+ \spath_shorten_at_end:Nn \l_@@_tmpa_tl {\l_@@_tmpc_tl/2}
}
\seq_if_in:NnT \g_@@_tmpb_seq {##1}
{
- \spath_shorten_at_start:Nn \l_@@_tmpa_tl {#2/2}
+ \spath_shorten_at_start:Nn \l_@@_tmpa_tl {\l_@@_tmpc_tl/2}
}
\seq_put_right:NV \l_@@_tmpb_seq \l_@@_tmpa_tl
}
@@ -6250,6 +6903,33 @@ manipulating PGF soft paths}
},
% \end{macrocode}
%
+% Replace all line segments by B\'ezier curves.
+%
+% \begin{macrocode}
+ replace~ lines/.code={
+ \tl_if_exist:cTF
+ {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
+ {
+ \spath_replace_lines:c
+ {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
+ }
+ {
+ \msg_warning:nnn { spath3 } { missing soft path } { #1 }
+ }
+ },
+ replace~ lines~ globally/.code={
+ \tl_if_exist:cTF
+ {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
+ {
+ \spath_greplace_lines:c
+ {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
+ }
+ {
+ \msg_warning:nnn { spath3 } { missing soft path } { #1 }
+ }
+ },
+% \end{macrocode}
+%
%
% Join the specified components together, joining each to its previous one.
%
@@ -6547,7 +7227,10 @@ manipulating PGF soft paths}
}
}
{
- \msg_warning:nnx { spath3 } { missing soft path } { \tl_use:N \l_@@_tmpa_tl }
+ \msg_warning:nnx
+ { spath3 }
+ { missing soft path }
+ { \tl_use:N \l_@@_tmpa_tl }
\tl_gset_eq:NN \g_@@_smuggle_tl \pgfpointorigin
}
\group_end:
diff --git a/graphics/pgf/contrib/spath3/spath3_code.pdf b/graphics/pgf/contrib/spath3/spath3_code.pdf
index 0fe9fd3e43..e61a569ddf 100644
--- a/graphics/pgf/contrib/spath3/spath3_code.pdf
+++ b/graphics/pgf/contrib/spath3/spath3_code.pdf
Binary files differ
diff --git a/graphics/pgf/contrib/tikzmark/tikzmark.dtx b/graphics/pgf/contrib/tikzmark/tikzmark.dtx
index 4dfaeb6e78..88aec1a4ed 100644
--- a/graphics/pgf/contrib/tikzmark/tikzmark.dtx
+++ b/graphics/pgf/contrib/tikzmark/tikzmark.dtx
@@ -36,7 +36,7 @@ See http://www.latex-project.org/lppl.txt
\endpreamble
\postamble
-Copyright (C) 2011-2018 by Andrew Stacey <loopspace@mathforge.org>
+Copyright (C) 2011-2021 by Andrew Stacey <loopspace@mathforge.org>
This work may be distributed and/or modified under the
conditions of the LaTeX Project Public License (LPPL), either
@@ -206,7 +206,7 @@ and the derived files tikzmark.ins,
%</driver>
% \fi
%
-% \CheckSum{1138}
+% \CheckSum{1178}
%
% \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
@@ -234,18 +234,19 @@ and the derived files tikzmark.ins,
% \changes{1.6}{2018/10/18}{Added the ability to save node information between runs and between TeX documents}
% \changes{1.7}{2019/05/07}{Added conditions to test if a tikzmark is on a particular page}
% \changes{1.8}{2019/10/04}{Fixed some bugs with subnode and tikzmarknode inside maths}
+% \changes{1.10}{2021/02/16}{Tikzmarknode is now prefix and suffix aware, and added a test to see if a picture id has been saved to the aux file for times when pictures are thrown away, eg in AMS's text command}
%
% \DoNotIndex{\newcommand,\newenvironment}
%
+% \GetFileInfo{tikzlibrarytikzmark.code.tex}
% \providecommand*{\url}{\texttt}
% \title{The \textsf{tikzmark} package}
% \author{Andrew Stacey \\ \url{loopspace@mathforge.org}}
-% \date{v1.8~from 2019/10/04}
+% \date{\fileversion~from \filedate}
%
%
% \maketitle
%
-%
% \section{Introduction}
%
% The \Verb+\tikzmark+ macro burst onto the scene in a blaze of glory on \href{http://tex.stackexchange.com}{TeX-SX}.
@@ -452,6 +453,23 @@ and the derived files tikzmark.ins,
% This is the TikZ key that is used by \Verb+\tikzmark+ to actually save the connection between the name and the picture coordinate.
% It can be used on an arbitrary picture to save its origin as a tikzmark.
%
+% \item \Verb+/tikz/check picture id+
+%
+% There are circumstances where, behind the scenes, a tikzpicture is actually placed in a box and processed several times (often this involves \Verb+\mathchoice+).
+% In such a situation, when defining nodes then the last one ``wins'' in that each node remembers the id of the last processed picture.
+% However, only the one that is actually used has its location remembered on the page (since the others don't have a position).
+% This can lead to the situation whereby a node becomes disassociated from its picture and so using it for later reference fails.
+% This key tries to get around that situation by checking the \Verb+aux+ file to see if the current picture was actually typeset last time (by checking for the presence of the remembered location) and if it find that it wasn't, it quietly appends the string \Verb+discard-+ to each node name.
+% The idea being that the version of the picture that is actually typeset will not have this happen and so its nodes ``survive''.
+%
+% \item \Verb+/tikz/maybe define node=#1+
+%
+% The previous key can lead to undefined nodes on the first time that the picture is processed.
+% Using this key will ensure that the specified node is aliased to its \Verb+discard-+ version providing it doesn't already exist.
+% This is purely to get rid of pointless error messages, and also should only be used in conjunction with \Verb+check picture id+.
+%
+% Note that due to the order in which code gets executed, \Verb+check picture id+ should be before any \Verb+maybe define node+ keys.
+%
% \item \Verb+/tikz/if picture id=#1#2#3+
%
% This is a key equivalent of the \Verb+\iftikzmark+ command.
@@ -791,6 +809,10 @@ and the derived files tikzmark.ins,
%
% The \Verb+save nodes+ code uses \LaTeX3.
% \begin{macrocode}
+\ProvidesFile{tikzlibrarytikzmark.code.tex}[%
+ 2021/02/16
+ v1.10
+ TikZ library for marking positions in a document]
\RequirePackage{expl3, l3keys2e, xparse}
% \end{macrocode}
%
@@ -819,6 +841,44 @@ and the derived files tikzmark.ins,
},
},
% \end{macrocode}
+% There are times when some code is executed and then discarded, such as in \Verb+\mathchoice+.
+% This can seriously mess with how TikZ pictures are remembered as the last \Verb+pgfpictureid+ to be \emph{processed} is the one that is used, but it is the one that is \emph{used} that is recorded in the \Verb+aux+ file.
+% This isn't particularly a tikzmark issue, but does come up from time to time with tikzmark as it's all about remembering locations.
+%
+% In actual fact, it only occurs with \Verb+\tikzmarknode+ since the issue is about how nodes are associated with pictures.
+%
+% The solution is to check to see if the \Verb+pgfpictureid+ has been recorded in the \Verb+aux+ file and if it hasn't, quietly prefix the node names with a discard term.
+% This needs to be used \emph{after} \Verb+remember picture+ has been invoked.
+% It probably messes with some other stuff so should only be used under controlled conditions, such as \Verb+\tikzmarknode+.
+% \begin{macrocode}
+ check picture id/.code={
+ \ifpgfrememberpicturepositiononpage
+ \@ifundefined{pgf@sys@pdf@mark@pos@\pgfpictureid}{%
+ \tikzset{%
+ name prefix/.get=\tzmk@name@prefix,
+ name prefix/.prefix=discard-,
+ execute at end picture={%
+ \tikzset{name prefix/.expand once=\tzmk@name@prefix}%
+ },
+ }%
+ }{}%
+ \fi
+ },
+% \end{macrocode}
+% We also want a failsafe that quietly handles the case where the document hasn't been compiled enough times (once) to get the information into the \Verb+aux+ file.
+% There will already be messages about needing reruns so we don't need to add to that.
+% We simply ensure that the node exists.
+% \begin{macrocode}
+ maybe define node/.style={%
+ execute at end picture={%
+ \ifpgfrememberpicturepositiononpage
+ \@ifundefined{pgf@sh@pi@\tikz@pp@name{#1}}{%
+ \pgfnodealias{\tikz@pp@name{#1}}{discard-\tikz@pp@name{#1}}%
+ }{}%
+ \fi
+ }%
+ },
+% \end{macrocode}
% The positions are already recorded in the \Verb+aux+ file, all we really need to do is provide them with better names.
% \begin{macrocode}
save picture id/.code={%
@@ -860,10 +920,14 @@ and the derived files tikzmark.ins,
\@ifundefined{save@pt@\tikzmark@pp@name{#1}}{%
\pgfkeysalso{#3}%
}{%
- \@ifundefined{save@pg@\csname save@pt@\tikzmark@pp@name{#1}\endcsname}{%
+ \@ifundefined{%
+ save@pg@\csname save@pt@\tikzmark@pp@name{#1}\endcsname
+ }{%
\pgfkeysalso{#3}%
}{%
- \ifnum\csname save@pg@\csname save@pt@\tikzmark@pp@name{#1}\endcsname\endcsname=\the\value{page}\relax%
+ \ifnum\csname save@pg@%
+ \csname save@pt@\tikzmark@pp@name{#1}\endcsname%
+ \endcsname=\the\value{page}\relax%
\pgfkeysalso{#2}%
\else
\pgfkeysalso{#3}%
@@ -875,10 +939,14 @@ and the derived files tikzmark.ins,
\@ifundefined{save@pt@\tikzmark@pp@name{#1}}{%
\pgfkeysalso{#4}%
}{%
- \@ifundefined{save@pg@\csname save@pt@\tikzmark@pp@name{#1}@label\endcsname}{%
+ \@ifundefined{%
+ save@pg@\csname save@pt@\tikzmark@pp@name{#1}@label\endcsname%
+ }{%
\pgfkeysalso{#4}%
}{%
- \ifnum\csname save@pg@\csname save@pt@\tikzmark@pp@name{#1}\endcsname\endcsname=#2\relax%
+ \ifnum\csname save@pg@%
+ \csname save@pt@\tikzmark@pp@name{#1}\endcsname%
+ \endcsname=#2\relax%
\pgfkeysalso{#3}%
\else
\pgfkeysalso{#4}%
@@ -969,7 +1037,12 @@ and the derived files tikzmark.ins,
\@ifundefined{save@pg@\csname save@pt@\tmk@label\endcsname}{}{%
\@ifundefined{save@pg@\pgfpictureid}{}{%
\pgfkeysvalueof{/tikz/next page vector}%
- \edef\tmk@pg{\the\numexpr \csname save@pg@\csname save@pt@\tmk@label\endcsname\endcsname - \csname save@pg@\pgfpictureid\endcsname\relax}%
+ \edef\tmk@pg{%
+ \the\numexpr \csname save@pg@%
+ \csname save@pt@\tmk@label\endcsname\endcsname%
+ -
+ \csname save@pg@\pgfpictureid\endcsname\relax%
+ }%
\ifnum \tmk@pg > 0 \relax
\advance \pgf@xa by \pgf@x\relax
\advance \pgf@ya by \pgf@y\relax
@@ -995,6 +1068,7 @@ and the derived files tikzmark.ins,
% This version is for when we're outside a tikzpicture environment
% \begin{macrocode}
\newcommand\tikzmark@outside[2][]{%
+\tikzset{external/export next/.try=false}%
\tikz[remember picture with id=#2]{#1}%
}
% \end{macrocode}
@@ -1004,7 +1078,8 @@ and the derived files tikzmark.ins,
\tikzset{remember picture}%
\tikz@scan@one@point\pgfutil@firstofone#2\relax
\protected@write\pgfutil@auxout{}{%
- \string\savepointas{\tikzmark@pp@name{#1}}{\pgfpictureid}{\the\pgf@x}{\the\pgf@y}}%
+ \string\savepointas%
+ {\tikzmark@pp@name{#1}}{\pgfpictureid}{\the\pgf@x}{\the\pgf@y}}%
}
% \end{macrocode}
% And finally, the ultimate invoker:
@@ -1111,7 +1186,9 @@ and the derived files tikzmark.ins,
\@ifundefined{save@pg@\csname save@pt@\tikzmark@pp@name{#1}\endcsname}{%
\tikzmark@false
}{%
- \ifnum\csname save@pg@\csname save@pt@\tikzmark@pp@name{#1}\endcsname\endcsname=#2\relax%
+ \ifnum\csname save@pg@%
+ \csname save@pt@\tikzmark@pp@name{#1}\endcsname%
+ \endcsname=#2\relax%
\tikzmark@true
\else
\tikzmark@false
@@ -1132,7 +1209,9 @@ and the derived files tikzmark.ins,
\@ifundefined{save@pg@\csname save@pt@\tikzmark@pp@name{#1}\endcsname}{%
\tikzmark@false
}{%
- \ifnum\csname save@pg@\csname save@pt@\tikzmark@pp@name{#1}\endcsname\endcsname=\the\value{page}\relax%
+ \ifnum\csname save@pg@%
+ \csname save@pt@\tikzmark@pp@name{#1}\endcsname%
+ \endcsname=\the\value{page}\relax%
\tikzmark@true
\else
\tikzmark@false
@@ -1252,10 +1331,13 @@ and the derived files tikzmark.ins,
% It does its best to work inside a math environment by a sneaky trick involving \Verb+\mathchoice+: the \Verb+remember picture+ key means that only the picture id of the typeset box is saved to the aux file. So comparing the possible picture ids of the four options with the one read from the aux file, we can figure out which box was actually used.
% \begin{macrocode}
\def\tikzmarknode@#1#2#3{%
+\tikzset{external/export next/.try=false}%
\tikz[%
remember picture,
- baseline=(#2.base),
save picture id={#2},
+ check picture id,
+ maybe define node={#2},
+ baseline=(#2.base),
every tikzmarknode picture/.try
] {
\node[
@@ -1290,25 +1372,25 @@ and the derived files tikzmark.ins,
\expandafter\ifx\csname\tzmk@pic\endcsname\relax
\edef\tzmk@pic{\tzmk@prfx\the\numexpr\the\pgf@picture@serial@count-3\relax}%
\expandafter\ifx\csname\tzmk@pic\endcsname\relax
- \pgfutil@ifundefined{pgf@sh@ns@#2}{%
- \pgfnodealias{#2}{#2-t}%
- \tikzmarkalias{#2}{#2-t}%
+ \pgfutil@ifundefined{pgf@sh@ns@\tikz@pp@name{#2}}{%
+ \pgfnodealias{\tikz@pp@name{#2}}{\tikz@pp@name{#2-t}}%
+ \tikzmarkalias{\tikzmark@pp@name{#2}}{\tikzmark@pp@name{#2-t}}%
}{}%
\else
- \pgfnodealias{#2}{#2-d}%
- \tikzmarkalias{#2}{#2-d}%
+ \pgfnodealias{\tikz@pp@name{#2}}{\tikz@pp@name{#2-d}}%
+ \tikzmarkalias{\tikzmark@pp@name{#2}}{\tikzmark@pp@name{#2-d}}%
\fi
\else
- \pgfnodealias{#2}{#2-t}%
- \tikzmarkalias{#2}{#2-t}%
+ \pgfnodealias{\tikz@pp@name{#2}}{\tikz@pp@name{#2-t}}%
+ \tikzmarkalias{\tikzmark@pp@name{#2}}{\tikzmark@pp@name{#2-t}}%
\fi
\else
- \pgfnodealias{#2}{#2-s}%
- \tikzmarkalias{#2}{#2-s}%
+ \pgfnodealias{\tikz@pp@name{#2}}{\tikz@pp@name{#2-s}}%
+ \tikzmarkalias{\tikzmark@pp@name{#2}}{\tikzmark@pp@name{#2-s}}%
\fi
\else
- \pgfnodealias{#2}{#2-ss}%
- \tikzmarkalias{#2}{#2-ss}%
+ \pgfnodealias{\tikz@pp@name{#2}}{\tikz@pp@name{#2-ss}}%
+ \tikzmarkalias{\tikzmark@pp@name{#2}}{\tikzmark@pp@name{#2-ss}}%
\fi
\else
\tikzmarknode@{#1}{#2}{#3}%
@@ -1886,8 +1968,10 @@ and the derived files tikzmark.ins,
%
% \begin{macro}{\iflst@linemark}
% A conditional to help with placing the mark at the first non-whitespace character.
+% Should be set to true so that we notice the first line of the code.
% \begin{macrocode}
- \newif\iflst@linemark
+ \newif\iflst@linemark
+ \lst@linemarktrue
% \end{macrocode}
% \end{macro}
%
diff --git a/graphics/pgf/contrib/tikzmark/tikzmark.pdf b/graphics/pgf/contrib/tikzmark/tikzmark.pdf
index 0b8d460f3e..62c1de9cca 100644
--- a/graphics/pgf/contrib/tikzmark/tikzmark.pdf
+++ b/graphics/pgf/contrib/tikzmark/tikzmark.pdf
Binary files differ
diff --git a/macros/latex/contrib/easybook/doc/easybook-demo.pdf b/macros/latex/contrib/easybook/doc/easybook-demo.pdf
index 4f348762ad..2a5217e816 100644
--- a/macros/latex/contrib/easybook/doc/easybook-demo.pdf
+++ b/macros/latex/contrib/easybook/doc/easybook-demo.pdf
Binary files differ
diff --git a/macros/latex/contrib/easybook/doc/easybook-demo.tex b/macros/latex/contrib/easybook/doc/easybook-demo.tex
index 7feeac246f..5502281ec2 100644
--- a/macros/latex/contrib/easybook/doc/easybook-demo.tex
+++ b/macros/latex/contrib/easybook/doc/easybook-demo.tex
@@ -95,7 +95,7 @@
\github~\url{https://github.com/texl3/easybook} \\
\edge~\url{https://latexstudio.net}
}
- \date{2021/02/20\hskip\ccwd\relax v1.23e}
+ \date{2021/02/21\hskip\ccwd\relax v1.23f}
}
\begin{document}
diff --git a/macros/latex/contrib/easybook/doc/easybook.pdf b/macros/latex/contrib/easybook/doc/easybook.pdf
index fd7a95f3bc..cb8064b6a5 100644
--- a/macros/latex/contrib/easybook/doc/easybook.pdf
+++ b/macros/latex/contrib/easybook/doc/easybook.pdf
Binary files differ
diff --git a/macros/latex/contrib/easybook/doc/easybook.tex b/macros/latex/contrib/easybook/doc/easybook.tex
index 6fd6415b4f..1550762496 100644
--- a/macros/latex/contrib/easybook/doc/easybook.tex
+++ b/macros/latex/contrib/easybook/doc/easybook.tex
@@ -3,7 +3,7 @@
\title{\sffamily easybook书籍文档类}
\author{瞿毅}
-\date{2021/02/20\hskip\ccwd\relax v1.23e\thanks{\url{https://gitee.com/texl3/easybook}}}
+\date{2021/02/21\hskip\ccwd\relax v1.23f\thanks{\url{https://gitee.com/texl3/easybook}}}
\begin{document}
\maketitle
diff --git a/macros/latex/contrib/easybook/easybook.cls b/macros/latex/contrib/easybook/easybook.cls
index 475920142e..16ae60d7a7 100644
--- a/macros/latex/contrib/easybook/easybook.cls
+++ b/macros/latex/contrib/easybook/easybook.cls
@@ -9,7 +9,7 @@
%% https://creativecommons.org/licenses/by/4.0/legalcode
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{l3keys2e}
-\ProvidesExplClass{easybook}{2021/02/20}{1.23e}{}
+\ProvidesExplClass{easybook}{2021/02/21}{1.23f}{}
\cs_generate_variant:Nn \keys_define:nn {nx}
\cs_generate_variant:Nn \int_to_arabic:n {v}
@@ -652,9 +652,9 @@
\DeclareCaptionLabelSeparator{ccwd}{\hspace{\ccwd}}
\DeclareCaptionLabelFormat{parens}{\bothIfFirst{#1}{~}(#2)}
-\DeclareCaptionFont{tablefont}{\l__table_font_tl}
-\DeclareCaptionFont{figurefont}{\l__figure_font_tl}
-\DeclareCaptionFont{listingfont}{\l__listing_font_tl}
+\DeclareCaptionFont{table@font}{\l__table_font_tl}
+\DeclareCaptionFont{figure@font}{\l__figure_font_tl}
+\DeclareCaptionFont{listing@font}{\l__listing_font_tl}
\captionsetup
{
format = hang,
@@ -665,13 +665,13 @@
labelsep = ccwd,
belowskip = 0pt,aboveskip = 10pt
}
-\captionsetup[table]{font += tablefont}
-\captionsetup[figure]{font += figurefont}
-\captionsetup[lstlisting]{singlelinecheck = false,font += listingfont}
+\captionsetup[table]{font += table@font}
+\captionsetup[figure]{font += figure@font}
+\captionsetup[lstlisting]{singlelinecheck = false,font += listing@font}
\captionsetup[subfigure]
{
labelformat = parens,
- font += figurefont,
+ font += figure@font,
belowskip = 2pt,aboveskip = 6pt
}
\captionsetup[figure][bi-second]{name = Figure}
@@ -875,8 +875,8 @@
detect-inline-family = math,
detect-inline-weight = math,
detect-display-math,
- unit-math-rm = \mathrm,
- number-math-rm = \mathrm,
+ range-phrase = \ensuremath{\sim},
+ range-units = single,
table-parse-only,
group-digits = false
}
diff --git a/systems/texlive/tlnet/tlpkg/TeXLive/TLDownload.pm b/systems/texlive/tlnet/tlpkg/TeXLive/TLDownload.pm
index e0bad45461..5d0f8490d1 100644
--- a/systems/texlive/tlnet/tlpkg/TeXLive/TLDownload.pm
+++ b/systems/texlive/tlnet/tlpkg/TeXLive/TLDownload.pm
@@ -1,6 +1,6 @@
-# $Id: TLDownload.pm 54993 2020-05-03 21:57:54Z karl $
+# $Id: TLDownload.pm 57809 2021-02-20 21:55:13Z karl $
# TeXLive::TLDownload.pm - module for abstracting the download modes
-# Copyright 2009-2020 Norbert Preining
+# Copyright 2009-2021 Norbert Preining
# This file is licensed under the GNU General Public License version 2
# or any later version.
@@ -9,7 +9,7 @@ package TeXLive::TLDownload;
use TeXLive::TLUtils;
use TeXLive::TLConfig;
-my $svnrev = '$Revision: 54993 $';
+my $svnrev = '$Revision: 57809 $';
my $_modulerevision;
if ($svnrev =~ m/: ([0-9]+) /) {
$_modulerevision = $1;
@@ -48,23 +48,38 @@ sub new
-sub reinit
-{
+sub reinit {
my $self = shift;
+
+ # Irritatingly, as of around version 6.52, when env_proxy is set, LWP
+ # started unconditionally complaining if the environment contains
+ # differing case-insensitive like foo=1 and FOO=2. Even on systems
+ # that have case-sensitive environments, and even about variables that
+ # have nothing whatsoever to do with LWP (like foo).
+ #
+ # So, only pass env_proxy=>1 when creating the UserAgent if there are
+ # in fact *_proxy variables (case-insensitive, just in case) set in
+ # the environment.
+ #
+ my @env_proxy = ();
+ if (grep { /_proxy/i } keys %ENV ) {
+ @env_proxy = ("env_proxy", 1);
+ }
+ #
my $ua = LWP::UserAgent->new(
agent => "texlive/lwp",
# use LWP::ConnCache, and keep 1 connection open
keep_alive => 1,
- env_proxy => 1,
timeout => $TeXLive::TLConfig::NetworkTimeout,
+ @env_proxy,
);
$self->{'ua'} = $ua;
$self->{'enabled'} = 1;
$self->{'errorcount'} = 0;
$self->{'initcount'} += 1;
}
-sub enabled
-{
+
+sub enabled {
my $self = shift;
return $self->{'enabled'};
}
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb b/systems/texlive/tlnet/tlpkg/texlive.tlpdb
index 5d80611cfa..fc081cdcf4 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/2020
-depend revision/57804
+depend revision/57818
name 00texlive.image
category TLCore
-revision 57774
+revision 57819
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
@@ -1568,6 +1568,7 @@ runfiles size=13852
tlpkg/tlpsrc/epspdfconversion.tlpsrc
tlpkg/tlpsrc/epstopdf-pkg.tlpsrc
tlpkg/tlpsrc/epstopdf.tlpsrc
+ tlpkg/tlpsrc/eq-pin2corr.tlpsrc
tlpkg/tlpsrc/eqell.tlpsrc
tlpkg/tlpsrc/eqexpl.tlpsrc
tlpkg/tlpsrc/eqlist.tlpsrc
@@ -36973,7 +36974,7 @@ catalogue-version 1.0
name biblatex-ext
category Package
-revision 57287
+revision 57812
shortdesc Extended BibLaTeX standard styles
relocated 1
longdesc The BibLaTeX-ext bundle provides styles that slightly extend
@@ -36983,17 +36984,17 @@ longdesc stylistic decisions made in the standard styles. At the same
longdesc time they stay as close to their standard counterparts as
longdesc possible, so that most customisation methods can be applied
longdesc here as well.
-containersize 26876
-containerchecksum 7b0bd0fa39775117eea6ea88eef2461f7599a67a19203642884b018de79ad05584b79a75faeb0c8c69d357c9708f3bcec656dba712bfe0b9490e76f32a55b0b2
-doccontainersize 852692
-doccontainerchecksum 8a486e482964c073e659375290daa927f7313975e2cc2a6839987e7b510b0f2fba286a0659e0c2728c4f004e1cd475aaffd0192f7015e2bea9b5a67e5ec1419d
-docfiles size=244
+containersize 26804
+containerchecksum 4096e6b6b1a194cb99383d9db755473cf9eefc2c200ac1b4c16523e15a82d0337a3d0152702f5a8d6db624d1016c00f87b18cce71e376bb89c0d97980fe8a467
+doccontainersize 854052
+doccontainerchecksum 69c7bed19aa6d91ddeb9a44ed6d6569e14d7eab1c880e958ffceff09fcc94cf7bf72a376dec04fdbab9ea6af9e3e22560b816208edd1499a9524185cbc41c3af
+docfiles size=245
RELOC/doc/latex/biblatex-ext/CHANGES.md
RELOC/doc/latex/biblatex-ext/README.md details="Readme"
RELOC/doc/latex/biblatex-ext/biblatex-ext-examples.bib
RELOC/doc/latex/biblatex-ext/biblatex-ext.pdf details="Package documentation"
RELOC/doc/latex/biblatex-ext/biblatex-ext.tex
-runfiles size=118
+runfiles size=117
RELOC/tex/latex/biblatex-ext/biblatex-ext-oa-doiapi.sty
RELOC/tex/latex/biblatex-ext/biblatex-ext-oa.sty
RELOC/tex/latex/biblatex-ext/biblatex-ext-oasymb-l3draw.sty
@@ -37073,7 +37074,7 @@ catalogue-contact-home https://github.com/moewew/biblatex-ext
catalogue-ctan /macros/latex/contrib/biblatex-contrib/biblatex-ext
catalogue-license lppl1.3c
catalogue-topics biblatex
-catalogue-version 0.10
+catalogue-version 0.11
name biblatex-fiwi
category Package
@@ -66501,7 +66502,7 @@ containerchecksum 0568a3251d71fb3106fbb3961427200419ae1df22d39b5e72c608e2d94fc35
name collection-latexextra
category Collection
-revision 57774
+revision 57815
shortdesc LaTeX additional packages
relocated 1
longdesc A very large collection of add-on packages for LaTeX.
@@ -66900,6 +66901,7 @@ depend envlab
depend epigraph
depend epigraph-keys
depend epiolmec
+depend eq-pin2corr
depend eqell
depend eqlist
depend eqnalign
@@ -67852,8 +67854,8 @@ depend ziffer
depend zref
depend zwgetfdate
depend zwpagelayout
-containersize 6256
-containerchecksum cb0defb9fbf3fed19111f3c62ee88de4021f5e9ab193a71477f89b6866152d358cc1b96815455e8c11ee1a0659bc32f080461b415565da720fb85de05cf59e63
+containersize 6268
+containerchecksum 34dfb780a9f928870c8e617686bb1fadb99bcd6eab89c9626f83f25bfd629a91505e20c3cd7a4207192f857aa417bbf59f5d2bea6b32a52dc096aefd404fdbad
name collection-latexrecommended
category Collection
@@ -83343,7 +83345,7 @@ catalogue-version 0.2
name cweb
category Package
-revision 57710
+revision 57807
catalogue cwebbin
shortdesc CWEB for ANSI-C/C++ compilers
longdesc A highly portable and extended version of Levy/Knuth CWEB 3.64c
@@ -83361,10 +83363,10 @@ longdesc version and adding new features from CWEBbin. As of November
longdesc 2019 CTAN no longer holds a copy of this material. Please go to
longdesc the package's github repository for more information.
depend cweb.ARCH
-containersize 23496
-containerchecksum 8ec74678fb50e34b0fd27b4eae0f552f9e34d01b41e67dad1966e20cd609b3a7080d1c5923acd08f985106e209c820c7d29178ce1a01a44805f94eaa925c47f6
-doccontainersize 428872
-doccontainerchecksum 91e7078f5a4ca117e094698c2120ada0f93d22c2d7fed3896d03b04826b596a936fd61198073e65661601c75bf3d54ff9f6bc54085a03d1648206a14fc8e9c2e
+containersize 23444
+containerchecksum c47511355ceba742c1b037b49506a8a4bbdba224892ebce6e4418081866b0a9e3105a7639b061a173cc3efd7aa4cfc6e7a92388ed16ae1587cc3a06ee6385cde
+doccontainersize 428876
+doccontainerchecksum 277ab201738c17b0e273ed0c16826a0eb104fe218e88b0ecd23117e03c991984537c563f9cb7ca7e6c59c41a6cce51b5c2e085c5c1d58854c224427ef9b1e2a3
docfiles size=136
texmf-dist/doc/man/man1/ctangle.1
texmf-dist/doc/man/man1/ctangle.man1.pdf
@@ -97372,16 +97374,16 @@ catalogue-topics notes editorial
name easybook
category Package
-revision 57734
+revision 57813
shortdesc Typeset Chinese books or notes
relocated 1
longdesc Easybook is a minimalist style template based on the ctexbook
longdesc book document class.
-containersize 10036
-containerchecksum f4406632dbd9f9430132495e497c0086df644de0649fd133521397dfb6271a207c937d3952cefb70911ebfe1a6ada5d458aa24c82b7fd14bee77a781d9db6258
-doccontainersize 514220
-doccontainerchecksum 062983a95aa6d98d9983ef835413b91f692c5a3effdfa1668c6f8f104ddf3820a26d260fbc00e1023a755b90ac62ae00e89ca68b0692b8fd4ea44e0547f95d88
-docfiles size=144
+containersize 10068
+containerchecksum 4ba9a0ad60dc0ae31c0ee3807784425b1e5e155a585646fee9553cdddf9f60a27e0c8a85fb078bb5cf82582e2bebb551fe9ffc1e7a1cd29323339439819c1c0a
+doccontainersize 520196
+doccontainerchecksum 5e8d19270d6e5e80cb321a73e16de176e13005996fd1b73df055837de6d46c2d9605e7606e46db4d41229a4d2f63712425b844c7c721f60f82c266c41d05387e
+docfiles size=146
RELOC/doc/latex/easybook/README.md details="Readme"
RELOC/doc/latex/easybook/appendix.tex
RELOC/doc/latex/easybook/chapter1.tex
@@ -97399,7 +97401,7 @@ catalogue-contact-repository https://gitee.com/texl3/easybook
catalogue-ctan /macros/latex/contrib/easybook
catalogue-license cc-by-4
catalogue-topics book-pub class chinese expl3
-catalogue-version 1.23d
+catalogue-version 1.23e
name easyfig
category Package
@@ -102946,34 +102948,37 @@ catalogue-version 0.03
name elpres
category Package
-revision 56141
+revision 57810
shortdesc A simple class for electronic presentations
relocated 1
longdesc Elpres is a simple class for electronic presentations to be
longdesc shown on screen or a beamer. Elpres is derived from article.cls
-longdesc and may be used with LaTeX or pdfLaTeX. The class requires
-longdesc ifthen, fancyhdr, hyperref, graphicx, xcolor, and geometry.
-containersize 3344
-containerchecksum cc227f98285ea264fd390c6691a9b75dc66121d4ccfdeaf0af27aef52234e9bda4a04baee6a19d37c141891542986d0304132cac7432ae7d30aaaa255478133f
-doccontainersize 447300
-doccontainerchecksum ac98e3cd7ef046c4f0ffa00e13e3fc119ef3dd1a98c4e560172624defb16fd942740e15536762fa4d9c575d329fecb4bd35debf91f7276ca54b95271289cb2a7
-docfiles size=143
+longdesc and may be used with LaTeX, pdfLaTeX, or LuaLaTeX. The class
+longdesc requires ifthen, fancyhdr, hyperref, graphicx, xcolor, and
+longdesc geometry. For enhanced features the packages ragged2e,
+longdesc overlays, wallpaper, eso-pic, tcolorbox, and footmisc are
+longdesc useful.
+containersize 3476
+containerchecksum e02fbd78c9be653d05e014a62e4a36d4c6ba969f38b24c3bbdae494b68a2eb0c6378dc9ab5ba519017f68ae3dd70c52ab6a8bde7b05a1b1c2c1c42e4f901591b
+doccontainersize 445960
+doccontainerchecksum d4e4c27c43f006932778db74d9fd42569caea218bd11a98be4ba8491b1ebf1c4f84c101bddd0859b9fd323f75b466b10536eddabac28ce747a07a4db67779423
+docfiles size=144
RELOC/doc/latex/elpres/README.md details="Readme"
- RELOC/doc/latex/elpres/bitmaps/ctan-lion.png
- RELOC/doc/latex/elpres/bitmaps/ep-ball-01.eps
- RELOC/doc/latex/elpres/bitmaps/ep-ball-01.png
- RELOC/doc/latex/elpres/bitmaps/ep-ball-02.eps
- RELOC/doc/latex/elpres/bitmaps/ep-ball-02.png
- RELOC/doc/latex/elpres/bitmaps/ep-ball-03.eps
- RELOC/doc/latex/elpres/bitmaps/ep-ball-03.png
- RELOC/doc/latex/elpres/bitmaps/ep-ball-04.eps
- RELOC/doc/latex/elpres/bitmaps/ep-ball-04.png
- RELOC/doc/latex/elpres/bitmaps/ep-ball-05.eps
- RELOC/doc/latex/elpres/bitmaps/ep-ball-05.png
+ RELOC/doc/latex/elpres/ctan-lion.png
RELOC/doc/latex/elpres/elpres-example.pdf details="Example of use"
RELOC/doc/latex/elpres/elpres-example.tex
RELOC/doc/latex/elpres/elpres-manual.pdf details="Package documentation"
RELOC/doc/latex/elpres/elpres-manual.tex
+ RELOC/doc/latex/elpres/ep-ball-01.eps
+ RELOC/doc/latex/elpres/ep-ball-01.png
+ RELOC/doc/latex/elpres/ep-ball-02.eps
+ RELOC/doc/latex/elpres/ep-ball-02.png
+ RELOC/doc/latex/elpres/ep-ball-03.eps
+ RELOC/doc/latex/elpres/ep-ball-03.png
+ RELOC/doc/latex/elpres/ep-ball-04.eps
+ RELOC/doc/latex/elpres/ep-ball-04.png
+ RELOC/doc/latex/elpres/ep-ball-05.eps
+ RELOC/doc/latex/elpres/ep-ball-05.png
runfiles size=7
RELOC/tex/latex/elpres/elpres.cls
RELOC/tex/latex/elpres/elpresbluelightgrayscheme.sty
@@ -102984,8 +102989,8 @@ runfiles size=7
catalogue-contact-home http://vkiefel.de/elpres.html
catalogue-ctan /macros/latex/contrib/elpres
catalogue-license lppl
-catalogue-topics presentation class
-catalogue-version 0.6
+catalogue-topics presentation class electronic
+catalogue-version 0.7
name els-cas-templates
category Package
@@ -103321,7 +103326,7 @@ catalogue-version 2.11
name embrac
category Package
-revision 54512
+revision 57814
shortdesc Upright brackets in emphasised text
relocated 1
longdesc The package redefines the commands \emph and \textit so that
@@ -103329,23 +103334,23 @@ longdesc parentheses and square brackets are typeset in an upright font
longdesc in their arguments. The package requires expl3 from the
longdesc l3kernel bundle, and xparse and l3keys2e from the l3packages
longdesc bundle.
-containersize 3792
-containerchecksum b85cea8799d7a281b980be195e170a769ea29f4681861e76f72ddaa62b6f1a00995e7f4b98749c529ce2d060899653f8f8187e839ece9820f620e2d83b8f5108
-doccontainersize 464356
-doccontainerchecksum 1f3db246e50c7f1f383efdb0f80f31380c4de9264a192f2d31d0c6ab07769e6722b5b7b7f26e066e8caaffe8af1dbb9632b36313cb38d55445f21fa6d5ed1b14
-docfiles size=118
+containersize 3880
+containerchecksum 930b42ef834a50dab0889598e1cdc531a610c9a5a8cffa31f7bea5f3c55d947db59453f71e061c8d055da53fb50fe20c17341e47c2fe5bb35a604ceac71922d9
+doccontainersize 464436
+doccontainerchecksum f56db972f586aab767cf7300a3fa34a62564a67ede77ab8f8b6fa03ecf07680692eb0023cd3ed99656235c5afe80b672a4b3e50ec8f0ef95c9744a48ee99c399
+docfiles size=119
RELOC/doc/latex/embrac/README details="Readme"
RELOC/doc/latex/embrac/embrac_en.pdf details="Package documentation"
RELOC/doc/latex/embrac/embrac_en.tex
RELOC/doc/latex/embrac/embrac_kerning_test.tex
-runfiles size=4
+runfiles size=5
RELOC/tex/latex/embrac/embrac.sty
catalogue-contact-bugs https://github.com/cgnieder/embrac/issues
catalogue-contact-repository https://github.com/cgnieder/embrac/
catalogue-ctan /macros/latex/contrib/embrac
catalogue-license lppl1.3
catalogue-topics typesetting paren-mgmt expl3
-catalogue-version 0.9
+catalogue-version 0.9a
name emf
category Package
@@ -105215,6 +105220,47 @@ binfiles arch=x86_64-solaris size=2
bin/x86_64-solaris/epstopdf
bin/x86_64-solaris/repstopdf
+name eq-pin2corr
+category Package
+revision 57815
+shortdesc Add PIN security to the "Correct" button of a quiz created by exerquiz
+relocated 1
+longdesc This package is an add-on to the quiz environment of the
+longdesc exerquiz package (part of the acrotex bundle). It adds PIN
+longdesc security to a quiz created by the quiz environment. To correct
+longdesc a quiz, the document consumer must press the "Correct" button
+longdesc of the quiz and successfully enter the correct PIN number. The
+longdesc PIN security is designed for the instructor to mark and record
+longdesc the student's effort on that quiz. The package works for the
+longdesc usual workflows.
+containersize 2144
+containerchecksum 878bbe22ea7a71b486a38942d11ab15a19c8fef10ac90e06b235a87a15f0e4478d00d7671751547cc0c8c440924c92cc7e07dbce4c816fdfd114468104fec040
+doccontainersize 639596
+doccontainerchecksum cc1dffd4989bdc5efc76e1ae44a8ee5f7cdea0c9617f98eda3ab0f079d242b408f91d80595a699212c5cf5910cf182c64d98517d6582af14fb1bec074f344eb9
+docfiles size=256
+ RELOC/doc/latex/eq-pin2corr/README.md details="Readme"
+ RELOC/doc/latex/eq-pin2corr/doc/eq-pin2corr.pdf details="Package documentation"
+ RELOC/doc/latex/eq-pin2corr/doc/eqpin2corrman.pdf details="User manual"
+ RELOC/doc/latex/eq-pin2corr/doc/eqpin2corrman.tex
+ RELOC/doc/latex/eq-pin2corr/doc/install_jsfiles.pdf
+ RELOC/doc/latex/eq-pin2corr/doc/install_jsfiles.tex
+ RELOC/doc/latex/eq-pin2corr/examples/get-hash-string.pdf
+ RELOC/doc/latex/eq-pin2corr/examples/get-hash-string.tex
+ RELOC/doc/latex/eq-pin2corr/examples/qz-pin-to-correct.pdf
+ RELOC/doc/latex/eq-pin2corr/examples/qz-pin-to-correct.tex
+srccontainersize 5152
+srccontainerchecksum eb0d10e680a935f9919b9dfcae1b137549dfaece3047b62e2ea06280cb3075d3882546df470f05cdae9716eb128f27faa981d86408acb50b85eced63bf104769
+srcfiles size=4
+ RELOC/source/latex/eq-pin2corr/eq-pin2corr.dtx
+ RELOC/source/latex/eq-pin2corr/eq-pin2corr.ins
+runfiles size=1
+ RELOC/tex/latex/eq-pin2corr/eq-pin2corr.sty
+catalogue-also exerquiz
+catalogue-ctan /macros/latex/contrib/eq-pin2corr
+catalogue-license lppl1.2
+catalogue-topics exercise exam security pdf-feat pdf-forms acrobat
+catalogue-version 1.0
+
name eqell
category Package
revision 22931
@@ -145509,7 +145555,7 @@ catalogue-version 2.28
name isodoc
category Package
-revision 55850
+revision 57811
shortdesc A LaTeX class for typesetting letters and invoices
relocated 1
longdesc The isodoc class can be used for the preparation of letters and
@@ -145518,15 +145564,15 @@ longdesc set up with options, thus making the class easily adaptable to
longdesc user's wishes and extensible for other document types. The
longdesc class is based on the NTG brief class by Victor Eijkhout, which
longdesc implements the NEN1026 standard.
-containersize 9300
-containerchecksum 98ad4aed4c18764615cc4361083b20f3f6d17c13b5a7d342e7c232071397de601ce94c831996e9f27a2663e28f66da3b2b4f3a01da1bfe90ef6b77f86f612b17
-doccontainersize 837972
-doccontainerchecksum 5b25fcbd7ba74c947bda92cb1b128205d22a2b708667ee448ec36784b4debb02d2c49d58cea7ffed9b3aefd46631a74a4170fbec9687a7dc66f4339d9050bd18
-docfiles size=213
- RELOC/doc/latex/isodoc/README details="Readme"
+containersize 9308
+containerchecksum b26c7f3b87f4892f6f3c31f62225b43918be6e168dbb85d287fa708069d9560312d00bff1198842ade1a0a542da59dfd5d802d59ba6f62cc1dd15ce75ecde015
+doccontainersize 838216
+doccontainerchecksum 11cc576322712103511c3025524fe068a3f011e726a2335051ec6eece18a6217931071ccae412ee46148d4665cc3526b0a91fc66f4455ddfdae7af9974ae5959
+docfiles size=214
+ RELOC/doc/latex/isodoc/README.md details="Readme"
RELOC/doc/latex/isodoc/isodoc.pdf details="Package documentation"
-srccontainersize 472000
-srccontainerchecksum d7498bf94a0e0da4eb5a8966bced00ed059ae78ecf6db671dfc10056603ed8d4f1af8e0f3b1dfefb5c2018095972110345143a15e22a6687be14495aaa66e4d0
+srccontainersize 472076
+srccontainerchecksum a56610f50bf8e9286e04f8d505158dc2d4838731e667279728edc5e46cb92ced25c4a23b02b6c0cdfd4830fb09d093ed1c87b6292a2917ca5b8d212317b59e3e
srcfiles size=176
RELOC/source/latex/isodoc/Makefile
RELOC/source/latex/isodoc/isodoc.dtx
@@ -145536,7 +145582,7 @@ runfiles size=11
catalogue-ctan /macros/latex/contrib/isodoc
catalogue-license lppl1.3c
catalogue-topics letter invoice class
-catalogue-version 1.11
+catalogue-version 1.12
name isomath
category Package
@@ -241665,15 +241711,15 @@ catalogue-version 2.0
name plain
category Package
-revision 43076
+revision 57819
shortdesc The Plain TeX format
relocated 1
longdesc Contains files used to build the Plain TeX format, as described
longdesc in the TeXbook, together with various supporting files (some
longdesc also discussed in the book).
-containersize 70876
-containerchecksum 66f585e1fb6b95913ce71406e840bb15953b2ddebc3ce0344eed791e496ea75b93c4969abc363016b71dcaf65c0c676064ec778bcccbb2490031959ef3276bf2
-runfiles size=336
+containersize 29916
+containerchecksum 21c1163a52c62068be0fc179d84e79f3fc9cceb7d9d7c9c438d87054f5e1f92f127af8fb22dc6923b5d25fcc95732f1e48f50419decf1efc17d62bec75a4cd52
+runfiles size=40
RELOC/makeindex/plain/plaintex.ist
RELOC/tex/plain/base/fontchart.tex
RELOC/tex/plain/base/gkpmac.tex
@@ -241693,7 +241739,6 @@ runfiles size=336
RELOC/tex/plain/config/pdfetex.ini
RELOC/tex/plain/config/pdftexmagfix.tex
RELOC/tex/plain/config/tex.ini
- RELOC/tex/plain/config/unicode-letters.def
catalogue-ctan /macros/plain/base
catalogue-license knuth
catalogue-topics format
@@ -296516,15 +296561,15 @@ docfiles size=591
name texlive-docindex
category TLCore
-revision 57794
+revision 57817
shortdesc top-level TeX Live doc.html, etc.
longdesc These files are regenerated as needed, which is often, so we
longdesc make them a separate package. See the tl-update-auto script for
longdesc the process.
containersize 388
-containerchecksum 04de00313bc8ff9bc406893ac4b3d2b70196ee89802f7f11e014a4a1cfba5f9079e1183ca920219f0705062bfdadbdfcd39af212051f85582a2d684383e9aeaa
-doccontainersize 173076
-doccontainerchecksum 975c71b79498c9e439912e51caa4a58f9caf21ccebaf364b09838fcc8d14348dab69f8e1b6fbdcb44a359fa1367df5c8884b3a1f775aaaeff757c00c9b7d94c5
+containerchecksum 6773cf5ead27e9790c09aa69655479dc6063f1da8bff424dfacf1db0a683f87be52d3262359af586edb7a09eb190f4a7d0585c6817ed2f2e54ee17c1c75a5187
+doccontainersize 173172
+doccontainerchecksum f8e3ef4d377766f2e541425e645fa717142b98e17643d306953fd42f1abcbe2ab2b15eb23580f7dfba841d250343974e699746214db5ea0700ae0ffefd725572
docfiles size=344
doc.html
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
index aab1249047..9df90616c0 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
@@ -1 +1 @@
-3ed7832492d7cc2f82578ca123bf0a53 texlive.tlpdb
+35d1db717de5fe11f58e9412b24ce3d2 texlive.tlpdb
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
index 2a672601da..1cb20bbb9e 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
@@ -1 +1 @@
-926c45c7e11a7015e0af315be636391e2a71cc0670e1787c938a6fe8de3dc07a1c32b2615108f0796bac399b67d51d57e05878dce83822a2b3673f6c376813d4 texlive.tlpdb
+59d142823586dda32ff753ef59032f90c5ae9814a8d46671ae15de7fc3836fc05612b9a20317e5b37de074ce30bb5af479fcb1876b47de91bccef943a351da9f texlive.tlpdb
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
index 7ab2c6968e..06657cd651 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-----
-iQEcBAEBCgAGBQJgMF6kAAoJEEzhh34ZQ4xwNgAH/36UG5ONLygbk0U/o1Izrvsm
-FaZE/oHpIfmQhcBJDOc+6ZhrIpT92wJGQ/yndzE7XAxYxs+CXy7MErGsZcOrH8Qg
-rTgwtmz75utNNmHObl/K64gtXysdip1FcxqW52wtq1BhzY3Lmeup7R7tT5bjTS9T
-FcOJ8IBozp5SBjUZlYi5P6pkANCIGwyZcYkMo1mLqkukr8PKe+NZC4Wod23LBJkZ
-OFzHvb44E1clTMW9XSPQTRckA1FxzIBG55x2enr09hQsQO+BdQfz4TntHbJbrQ09
-bfCmz8BtY89ml2KHFpcVaBVMEOSISzqfmTyi2pBVm/jUC2B/EKuoOPIMfK+8pz8=
-=8Hqp
+iQEcBAEBCgAGBQJgMa9tAAoJEEzhh34ZQ4xw9l0H/RuWk6YSsGy1AzTEkiMXH3Wk
+88rkYXsgwfaHRC5A5ZOhP8XtDuLDD+dos+xPj8ahRtTccbS8VXxWirfa9NmvhE+H
+miUqalfBYN7uXeMNlGr7RlBdnuxeDYWjzqx1hHhcnMxr2NIH0YyGKOKlHtF47eQN
+rNDWe4bB2kz3aqvbcbUaRIjGezGtNDYaOgyz5QfsgQLNIQ/fV6yD7dLYLO0ybuRP
+2zas9rM6X4Gqrh1k39Isdz975CFUeXokzz8dg9cWe1c3rrEas2L/FcOT1/UctEdc
+aEknGESva3/BR10pJDnwBBnybbkmG4YcBmET1UKnQpAM/a9wjNtbXs1PsTHcGFU=
+=E32L
-----END PGP SIGNATURE-----
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
index 8ae6ed69fd..bc06063f50 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 cb0d240d5d..0f90d894da 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=1613855898
+date=1613942070
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=ef866d0ee13187be7abafdfbeccfecf2
+lstdigest=68afce72c2ce117c30bece5d0e63ac4c
numpkg=4054
relstate=next
-version=7721
+version=7722
;;;;This configuration file is signed by a MiKTeX maintainer. The signature follows.
;;;;-----BEGIN MIKTEX SIGNATURE-----
-;;;; signature/miktex: wY73kvxSQZ8ckfGyeoGRMKnALovsisgYl1hKVuEhX51v+WmMsMttNyEzES888cI3rk3vu8W6b/vreZwBEA9djliu9HC+ukxXnXv8ToBe8vxZMv2Zo0tSWiIxpVuNIeZJYP/HnVwImmXqg3s/Oda2grdPEwbYOKHy1ycMwapf+hgwbhJjbukl1nmoNcLHn4N6Vu922go4tz5TwwHsOhJ7dPj2yumpGt0VGK2YCo1SkLUxjdkntlp+xSwTKOYWTf9GBh/2wxrXD1hjbdja2cEhW8kijHpcJVm1BDTE3x88deJUs2yh66R2BFQ5Ts0rLMt8OxkVBxecDKmT/iCtgrdHPQ==
+;;;; signature/miktex: LTOUYi4XFGIcwJYZawiTHPIZx02gDX55lTUqRH+ov0vm1iEA17u1Ptd/fjLvfXJdLUC91IbYimBxdw1Xh3fbx72Wb58CEy4ioCse1e3V6bm1hZK7csc6xRJ/a5TAcbD8wIZU4QmQtUvZQ4Sm+lgb+YYRF9D6k0MXkdqcOba3Vzr0gWAJno/jADt/fmMEPOCiXL82oPnS8yp8Edes+WXpgoS9RZFR79OeuLg3qxzdlU1QV0p+lSjuoqwSsmQzFXxXQSNoEWCh9mEAQXPucZLQ+iy2lkoaAZMvUPag5m44YpT5IWzOHrlC8JL0w8JeFfzxvR/nPWV2yK7jbWegkHehsA==
;;;;-----END MIKTEX SIGNATURE-----
diff --git a/systems/win32/miktex/tm/packages/pr.ini b/systems/win32/miktex/tm/packages/pr.ini
index dac4f0f5ee..8c3d8eddd7 100644
--- a/systems/win32/miktex/tm/packages/pr.ini
+++ b/systems/win32/miktex/tm/packages/pr.ini
@@ -1,13 +1,13 @@
[repository]
-date=1613855483
+date=1613941875
lastupd=asymptote knuth-lib 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
-lstdigest=d360308f25c6685c88a912316112d00c
+lstdigest=bfd15ccff6058bc791fed7c59fe77ff3
numpkg=4054
relstate=stable
-version=7721
+version=7722
;;;;This configuration file is signed by a MiKTeX maintainer. The signature follows.
;;;;-----BEGIN MIKTEX SIGNATURE-----
-;;;; signature/miktex: eu5kcUvjGXvH4PnWAprhzowyAW5trdhatZmf0NZvqCTZ9XrgZwSW9rwBOd6ZtGu4OrDHKPlpOVkeu72QybqhEP+ZB0eKa/J9phJk2Y4NRkKdo98d/2hxx8AbUpecHucho+rh2MP6WZG26kA88Mmw3oIKpxZQuKY5hnubvZyFUADMC34563x3q9U/q/jtpyq7MkTA5Y6f+IU2VX4cbh+FYed9uwlIGWdA+7cVHY7xrknoYNUHjp+ggj0iN4r4uEjhw8IMJHiWMc/hVBUwVvxzUpyVilLgVDLkYMFRygiXm5PS5epm2X/aCzP4XQnUYkqklyJauLKqJ/gmSYev20LILQ==
+;;;; signature/miktex: O1TMIsUVeYBhbrJ+Y64TZVp1Ne479qTCYeADmDwOMVY1hq2zUUokbzJ5+m6PTjl9z8c59zy+LONhJXmLZVTUultpJ2y+mouh4qnqQnDAKlO5xhJ5TDeYzPkbi9Dlrj78BNYt+qfe0E/zLO1kUi0ptGhaZGG8/7cUHy1JeUxTGgFQal0z8mCxwEa6h7shNnlrFgFAobH1OBTEquGSAkikMdJJ0sgm4r2Oy/ee76ovZrVLo/CYhui0ISB/IpUmULI+eSL4xvdVt/yb0aK0zC1jnv6tZloAU3f4UeBhGrOW173fBaoxYCVoRM69W2/2FEXqYZYwzXFRXZZjGOF/n9QgbA==
;;;;-----END MIKTEX SIGNATURE-----
diff --git a/systems/win32/w32tex/ChangeLog b/systems/win32/w32tex/ChangeLog
index 79e383d7f3..f73716f667 100644
--- a/systems/win32/w32tex/ChangeLog
+++ b/systems/win32/w32tex/ChangeLog
@@ -1,5 +1,17 @@
W32TeX (x86 & x64) ChangeLog
+[2021/02/20]
+(01) biblatex-biber.tar.xz
+ Update biblatex-ext.
+(02) context.tar.xz
+ ConTeXt version: 2021.02.19 13:12.
+(03) cweb-w32.tar.xz
+ Update cweb.
+(04) win64/context-w64.tar.xz
+ Update mtxrun.lua.
+(05) win64/cweb-w64.tar.xz
+ Update cweb.
+
[2021/02/19]
(01) aleph-w32.tar.xz
(02) context.tar.xz
diff --git a/timestamp b/timestamp
index 65c6efe46e..35d8037858 100644
--- a/timestamp
+++ b/timestamp
@@ -2,4 +2,4 @@
# The source CTAN of this site's material:
dante.ctan.org
# The year-month-day-hour-minute of this site's material:
-2021-02-21-02-02
+2021-02-22-02-02