summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--FILES.byname563
-rw-r--r--FILES.byname.gzbin2329777 -> 2329952 bytes
-rw-r--r--FILES.last07days538
-rw-r--r--graphics/mcf2graph/CHANGELOG14
-rw-r--r--graphics/mcf2graph/README2
-rw-r--r--graphics/mcf2graph/mcf2graph.mf46
-rw-r--r--graphics/mcf2graph/mcf_data_base.mcf794
-rw-r--r--graphics/mcf2graph/mcf_exa_soc.mf8
-rw-r--r--graphics/mcf2graph/mcf_example.pdfbin320334 -> 309948 bytes
-rw-r--r--graphics/mcf2graph/mcf_example.tex4
-rw-r--r--graphics/mcf2graph/mcf_man_soc.mf49
-rw-r--r--graphics/mcf2graph/mcf_manual.pdfbin383107 -> 381018 bytes
-rw-r--r--graphics/mcf2graph/mcf_manual.tex79
-rw-r--r--graphics/mcf2graph/mcf_mplib_exa.pdfbin184371 -> 183875 bytes
-rw-r--r--graphics/mcf2graph/mcf_mplib_exa.tex4
-rw-r--r--macros/generic/chemfig/README4
-rw-r--r--macros/generic/chemfig/chemfig-en.pdfbin1091080 -> 1123098 bytes
-rw-r--r--macros/generic/chemfig/chemfig-en.tex6
-rw-r--r--macros/generic/chemfig/chemfig-fr.pdfbin1118501 -> 1152787 bytes
-rw-r--r--macros/generic/chemfig/chemfig-fr.tex8
-rw-r--r--macros/generic/chemfig/chemfig.tex565
-rw-r--r--macros/latex/contrib/easybook/easybook.dtx178
-rw-r--r--macros/latex/contrib/easybook/easybook.pdfbin552330 -> 571527 bytes
-rw-r--r--macros/latex/contrib/easybook/easybook.tex291
-rw-r--r--macros/latex/contrib/elpres/README.md29
-rw-r--r--macros/latex/contrib/elpres/doc/elpres-example.pdfbin159639 -> 157784 bytes
-rw-r--r--macros/latex/contrib/elpres/doc/elpres-manual.pdfbin158286 -> 155411 bytes
-rw-r--r--macros/latex/contrib/elpres/doc/elpres-manual.tex13
-rw-r--r--macros/latex/contrib/elpres/tex/elpres.cls29
-rw-r--r--macros/latex/contrib/elpres/tex/elpresbluelightgrayscheme.sty24
-rw-r--r--macros/latex/contrib/elpres/tex/elpresgrayscheme.sty24
-rw-r--r--macros/latex/contrib/elpres/tex/elpreswhitebluescheme.sty24
-rw-r--r--macros/latex/contrib/elpres/tex/elpreswhiteredscheme.sty23
-rw-r--r--macros/latex/contrib/elpres/tex/elpreswhitetealscheme.sty25
-rw-r--r--macros/latex/contrib/iexec/README.md2
-rw-r--r--macros/latex/contrib/iexec/iexec.pdfbin108132 -> 107917 bytes
-rw-r--r--macros/latex/contrib/iexec/iexec.sty9
-rw-r--r--macros/latex/contrib/iexec/iexec.tex2
-rw-r--r--macros/latex/contrib/scrambledenvs/README.md15
-rw-r--r--macros/latex/contrib/scrambledenvs/scrambledenvs.dtx472
-rw-r--r--macros/latex/contrib/scrambledenvs/scrambledenvs.pdfbin0 -> 191739 bytes
-rw-r--r--macros/latex/contrib/tabularray/tabularray.pdfbin652813 -> 680990 bytes
-rw-r--r--macros/latex/contrib/tabularray/tabularray.sty359
-rw-r--r--macros/latex/contrib/tabularray/tabularray.tex956
-rw-r--r--support/wp2latex/html2latex.htm2
-rw-r--r--support/wp2latex/readme.txt2
-rw-r--r--support/wp2latex/wp2latex.lsm4
-rw-r--r--systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl7
-rw-r--r--systems/texlive/tlnet/tlpkg/texlive.tlpdb479
-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.xzbin2324120 -> 2328428 bytes
-rw-r--r--systems/win32/miktex/tm/packages/files.csv.lzmabin592787 -> 591522 bytes
-rw-r--r--systems/win32/miktex/tm/packages/next/files.csv.lzmabin593220 -> 591488 bytes
-rw-r--r--systems/win32/miktex/tm/packages/next/pr.ini10
-rw-r--r--systems/win32/miktex/tm/packages/pr.ini12
-rw-r--r--timestamp2
58 files changed, 3451 insertions, 2244 deletions
diff --git a/FILES.byname b/FILES.byname
index b812f52106..82b6c9a0ed 100644
--- a/FILES.byname
+++ b/FILES.byname
@@ -5100,7 +5100,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/07/31 | 87257 | FILES.last07days
+2021/08/01 | 86680 | FILES.last07days
2021/07/24 | 1139410 | fonts/aboensis/Aboensis.glyphs
2021/07/24 | 18907382 | fonts/aboensis/aboensis.pdf
2021/07/24 | 137860 | fonts/aboensis/Aboensis-Regular.otf
@@ -139661,20 +139661,20 @@
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/07/18 | 14978 | graphics/mcf2graph/CHANGELOG
-2021/07/18 | 106661 | graphics/mcf2graph/mcf2graph.mf
-2021/07/18 | 104847 | graphics/mcf2graph/mcf_data_base.mcf
-2021/07/18 | 320334 | graphics/mcf2graph/mcf_example.pdf
-2021/07/18 | 2318 | graphics/mcf2graph/mcf_example.tex
-2021/07/17 | 3002 | graphics/mcf2graph/mcf_exa_soc.mf
-2021/07/18 | 44910 | graphics/mcf2graph/mcf_man_soc.mf
-2021/07/18 | 383107 | graphics/mcf2graph/mcf_manual.pdf
-2021/07/18 | 60590 | graphics/mcf2graph/mcf_manual.tex
-2021/07/18 | 184371 | graphics/mcf2graph/mcf_mplib_exa.pdf
-2021/07/17 | 16349 | graphics/mcf2graph/mcf_mplib_exa.tex
+2021/07/31 | 15347 | graphics/mcf2graph/CHANGELOG
+2021/07/31 | 107903 | graphics/mcf2graph/mcf2graph.mf
+2021/08/01 | 97314 | graphics/mcf2graph/mcf_data_base.mcf
+2021/08/01 | 309948 | graphics/mcf2graph/mcf_example.pdf
+2021/08/01 | 2317 | graphics/mcf2graph/mcf_example.tex
+2021/08/01 | 3003 | graphics/mcf2graph/mcf_exa_soc.mf
+2021/08/01 | 44760 | graphics/mcf2graph/mcf_man_soc.mf
+2021/08/01 | 381018 | graphics/mcf2graph/mcf_manual.pdf
+2021/08/01 | 60838 | graphics/mcf2graph/mcf_manual.tex
+2021/08/01 | 183875 | graphics/mcf2graph/mcf_mplib_exa.pdf
+2021/07/31 | 16349 | graphics/mcf2graph/mcf_mplib_exa.tex
2021/05/03 | 3843 | graphics/mcf2graph/mcf_setup.sty
-2021/07/18 | 4485 | graphics/mcf2graph/README
-2021/07/18 | 956720 | graphics/mcf2graph.zip
+2021/07/31 | 4485 | graphics/mcf2graph/README
+2021/08/01 | 942637 | 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
@@ -186737,15 +186737,15 @@
2015/05/22 | 6015 | macros/generic/catcodes/use/catchdq.sty
2012/11/07 | 4853 | macros/generic/catcodes/use/stacklet.sty
2015/11/15 | 557118 | macros/generic/catcodes.zip
-2021/02/28 | 1091080 | macros/generic/chemfig/chemfig-en.pdf
-2021/02/28 | 184845 | macros/generic/chemfig/chemfig-en.tex
-2021/02/28 | 1118501 | macros/generic/chemfig/chemfig-fr.pdf
-2021/02/28 | 199148 | macros/generic/chemfig/chemfig-fr.tex
-2021/02/28 | 5803 | macros/generic/chemfig/chemfig-lewis.tex
-2021/02/28 | 388 | macros/generic/chemfig/chemfig.sty
-2021/02/28 | 117657 | macros/generic/chemfig/chemfig.tex
-2021/02/28 | 1125 | macros/generic/chemfig/README
-2021/02/28 | 2335094 | macros/generic/chemfig.zip
+2021/08/01 | 1123098 | macros/generic/chemfig/chemfig-en.pdf
+2021/08/01 | 185112 | macros/generic/chemfig/chemfig-en.tex
+2021/08/01 | 1152787 | macros/generic/chemfig/chemfig-fr.pdf
+2021/08/01 | 199400 | macros/generic/chemfig/chemfig-fr.tex
+2021/08/01 | 5803 | macros/generic/chemfig/chemfig-lewis.tex
+2021/08/01 | 388 | macros/generic/chemfig/chemfig.sty
+2021/08/01 | 118354 | macros/generic/chemfig/chemfig.tex
+2021/08/01 | 1125 | macros/generic/chemfig/README
+2021/08/01 | 2381770 | macros/generic/chemfig.zip
1996/04/17 | 17290 | macros/generic/code128/code128.tex
1996/04/17 | 716 | macros/generic/code128/README
1996/04/17 | 4503 | macros/generic/code128/test128.tex
@@ -197820,12 +197820,12 @@
2008/02/10 | 19110 | macros/latex/contrib/ean13isbn/License.txt
2021/01/24 | 422 | macros/latex/contrib/ean13isbn/README
2021/01/24 | 322624 | macros/latex/contrib/ean13isbn.zip
-2021/07/30 | 75479 | macros/latex/contrib/easybook/easybook.dtx
+2021/08/01 | 78149 | macros/latex/contrib/easybook/easybook.dtx
2021/07/28 | 1626 | macros/latex/contrib/easybook/easybook.ins
-2021/07/30 | 552330 | macros/latex/contrib/easybook/easybook.pdf
-2021/07/30 | 73283 | macros/latex/contrib/easybook/easybook.tex
+2021/08/01 | 571527 | macros/latex/contrib/easybook/easybook.pdf
+2021/08/01 | 75391 | macros/latex/contrib/easybook/easybook.tex
2021/07/14 | 1664 | macros/latex/contrib/easybook/README.md
-2021/07/30 | 591528 | macros/latex/contrib/easybook.zip
+2021/08/01 | 611044 | 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
@@ -198284,18 +198284,18 @@
2016/12/15 | 153494 | macros/latex/contrib/elocalloc/elocalloc.pdf
2015/05/10 | 385 | macros/latex/contrib/elocalloc/README.txt
2016/12/15 | 154818 | macros/latex/contrib/elocalloc.zip
-2020/08/19 | 159639 | macros/latex/contrib/elpres/doc/elpres-example.pdf
+2021/08/01 | 157784 | macros/latex/contrib/elpres/doc/elpres-example.pdf
2020/08/15 | 2640 | macros/latex/contrib/elpres/doc/elpres-example.tex
-2021/02/28 | 158286 | macros/latex/contrib/elpres/doc/elpres-manual.pdf
-2021/02/28 | 50867 | macros/latex/contrib/elpres/doc/elpres-manual.tex
-2021/02/28 | 2539 | macros/latex/contrib/elpres/README.md
+2021/08/01 | 155411 | macros/latex/contrib/elpres/doc/elpres-manual.pdf
+2021/08/01 | 51235 | macros/latex/contrib/elpres/doc/elpres-manual.tex
+2021/08/01 | 2524 | macros/latex/contrib/elpres/README.md
2005/09/27 | 81950 | macros/latex/contrib/elpres/tex/ctan-lion.png
-2021/02/28 | 1955 | macros/latex/contrib/elpres/tex/elpresbluelightgrayscheme.sty
-2021/02/28 | 6752 | macros/latex/contrib/elpres/tex/elpres.cls
-2021/02/28 | 1919 | macros/latex/contrib/elpres/tex/elpresgrayscheme.sty
-2021/02/28 | 2001 | macros/latex/contrib/elpres/tex/elpreswhitebluescheme.sty
-2021/02/28 | 1982 | macros/latex/contrib/elpres/tex/elpreswhiteredscheme.sty
-2021/02/28 | 2001 | macros/latex/contrib/elpres/tex/elpreswhitetealscheme.sty
+2021/08/01 | 2511 | macros/latex/contrib/elpres/tex/elpresbluelightgrayscheme.sty
+2021/08/01 | 7487 | macros/latex/contrib/elpres/tex/elpres.cls
+2021/08/01 | 2474 | macros/latex/contrib/elpres/tex/elpresgrayscheme.sty
+2021/08/01 | 2557 | macros/latex/contrib/elpres/tex/elpreswhitebluescheme.sty
+2021/08/01 | 2537 | macros/latex/contrib/elpres/tex/elpreswhiteredscheme.sty
+2021/08/01 | 2558 | macros/latex/contrib/elpres/tex/elpreswhitetealscheme.sty
2020/07/19 | 20447 | macros/latex/contrib/elpres/tex/ep-ball-01.eps
2020/07/19 | 7561 | macros/latex/contrib/elpres/tex/ep-ball-01.png
2020/07/19 | 18192 | macros/latex/contrib/elpres/tex/ep-ball-02.eps
@@ -198306,7 +198306,7 @@
2020/07/22 | 6581 | macros/latex/contrib/elpres/tex/ep-ball-04.png
2020/07/29 | 18454 | macros/latex/contrib/elpres/tex/ep-ball-05.eps
2020/07/29 | 6883 | macros/latex/contrib/elpres/tex/ep-ball-05.png
-2021/02/28 | 494715 | macros/latex/contrib/elpres.zip
+2021/08/01 | 487945 | macros/latex/contrib/elpres.zip
2020/11/20 | 100656 | macros/latex/contrib/elsarticle/doc/1pseperateaug.pdf
2020/11/20 | 100216 | macros/latex/contrib/elsarticle/doc/1psingleauthorgroup.pdf
2020/11/23 | 455186 | macros/latex/contrib/elsarticle/doc/elsdoc.pdf
@@ -202915,12 +202915,12 @@
2015/08/26 | 130521 | macros/latex/contrib/IEEEtran/tools/IEEEtrantools.sty
2015/08/27 | 4190 | macros/latex/contrib/IEEEtran/tools/README
2015/08/28 | 1727001 | macros/latex/contrib/IEEEtran.zip
-2021/07/12 | 27 | macros/latex/contrib/iexec/DEPENDS.txt
-2021/07/12 | 108132 | macros/latex/contrib/iexec/iexec.pdf
-2021/07/12 | 1653 | macros/latex/contrib/iexec/iexec.sty
-2021/07/12 | 2778 | macros/latex/contrib/iexec/iexec.tex
-2021/07/12 | 1250 | macros/latex/contrib/iexec/README.md
-2021/07/12 | 111524 | macros/latex/contrib/iexec.zip
+2021/08/01 | 27 | macros/latex/contrib/iexec/DEPENDS.txt
+2021/08/01 | 107917 | macros/latex/contrib/iexec/iexec.pdf
+2021/08/01 | 1739 | macros/latex/contrib/iexec/iexec.sty
+2021/08/01 | 2778 | macros/latex/contrib/iexec/iexec.tex
+2021/08/01 | 1264 | macros/latex/contrib/iexec/README.md
+2021/08/01 | 111353 | macros/latex/contrib/iexec.zip
2004/10/19 | 24919 | macros/latex/contrib/ifacmtg/ifac.bst
2003/06/12 | 62063 | macros/latex/contrib/ifacmtg/ifacmtg.cls
1999/04/22 | 1681 | macros/latex/contrib/ifacmtg/ifacsam.bib
@@ -211531,6 +211531,10 @@
2020/01/21 | 2224 | macros/latex/contrib/scontents/scontents.ins
2020/01/21 | 373717 | macros/latex/contrib/scontents/scontents.pdf
2020/01/21 | 389273 | macros/latex/contrib/scontents.zip
+2021/08/01 | 410 | macros/latex/contrib/scrambledenvs/README.md
+2021/08/01 | 18115 | macros/latex/contrib/scrambledenvs/scrambledenvs.dtx
+2021/08/01 | 191739 | macros/latex/contrib/scrambledenvs/scrambledenvs.pdf
+2021/08/01 | 190053 | macros/latex/contrib/scrambledenvs.zip
2020/09/03 | 613 | macros/latex/contrib/scratch3/README
2020/09/03 | 508889 | macros/latex/contrib/scratch3/scratch3-fr.pdf
2020/09/03 | 32095 | macros/latex/contrib/scratch3/scratch3-fr.tex
@@ -213921,10 +213925,10 @@
2009/06/01 | 150930 | macros/latex/contrib/tabularew.zip
2021/06/10 | 267 | macros/latex/contrib/tabularray/README
2021/05/25 | 145587 | macros/latex/contrib/tabularray/tabularray-2021.sty
-2021/07/01 | 652813 | macros/latex/contrib/tabularray/tabularray.pdf
-2021/07/01 | 200737 | macros/latex/contrib/tabularray/tabularray.sty
-2021/07/01 | 57970 | macros/latex/contrib/tabularray/tabularray.tex
-2021/07/01 | 610873 | macros/latex/contrib/tabularray.zip
+2021/08/01 | 680990 | macros/latex/contrib/tabularray/tabularray.pdf
+2021/08/01 | 208553 | macros/latex/contrib/tabularray/tabularray.sty
+2021/08/01 | 68115 | macros/latex/contrib/tabularray/tabularray.tex
+2021/08/01 | 637617 | macros/latex/contrib/tabularray.zip
2005/10/21 | 169 | macros/latex/contrib/tabulary/README
2014/06/21 | 29652 | macros/latex/contrib/tabulary/tabulary.dtx
2003/11/26 | 156 | macros/latex/contrib/tabulary/tabulary.ins
@@ -282996,9 +283000,9 @@
2013/04/15 | 341764 | systems/win32/miktex/tm/packages/beamertheme-upenn-bc.tar.lzma
2015/12/29 | 623849 | systems/win32/miktex/tm/packages/beamer-verona.tar.lzma
2020/04/22 | 794111 | systems/win32/miktex/tm/packages/bearwear.tar.lzma
-2021/07/28 | 681004 | systems/win32/miktex/tm/packages/beaulivre__doc.tar.lzma
-2021/07/28 | 16136 | systems/win32/miktex/tm/packages/beaulivre__source.tar.lzma
-2021/07/28 | 3560 | systems/win32/miktex/tm/packages/beaulivre.tar.lzma
+2021/08/01 | 687841 | systems/win32/miktex/tm/packages/beaulivre__doc.tar.lzma
+2021/08/01 | 16870 | systems/win32/miktex/tm/packages/beaulivre__source.tar.lzma
+2021/08/01 | 3604 | systems/win32/miktex/tm/packages/beaulivre.tar.lzma
2016/11/05 | 310673 | systems/win32/miktex/tm/packages/beebe.tar.lzma
2005/06/02 | 43896 | systems/win32/miktex/tm/packages/begriff.cab
2020/08/30 | 759144 | systems/win32/miktex/tm/packages/beilstein.tar.lzma
@@ -283461,9 +283465,9 @@
2020/10/20 | 240260 | systems/win32/miktex/tm/packages/color-edits.tar.lzma
2018/09/25 | 31097260 | systems/win32/miktex/tm/packages/coloremoji.tar.lzma
2016/05/15 | 27866 | systems/win32/miktex/tm/packages/coloring.tar.lzma
-2021/07/28 | 98630 | systems/win32/miktex/tm/packages/colorist__doc.tar.lzma
-2021/07/28 | 8204 | systems/win32/miktex/tm/packages/colorist__source.tar.lzma
-2021/07/28 | 9538 | systems/win32/miktex/tm/packages/colorist.tar.lzma
+2021/08/01 | 100025 | systems/win32/miktex/tm/packages/colorist__doc.tar.lzma
+2021/08/01 | 8421 | systems/win32/miktex/tm/packages/colorist__source.tar.lzma
+2021/08/01 | 9625 | systems/win32/miktex/tm/packages/colorist.tar.lzma
2018/12/20 | 115731 | systems/win32/miktex/tm/packages/colorprofiles.tar.lzma
2001/05/14 | 2083 | systems/win32/miktex/tm/packages/colorsep.tar.lzma
2019/03/28 | 124213 | systems/win32/miktex/tm/packages/colorspace.tar.lzma
@@ -283823,9 +283827,9 @@
2020/04/07 | 32910 | systems/win32/miktex/tm/packages/ehhline.tar.lzma
2009/01/10 | 276496 | systems/win32/miktex/tm/packages/eiad.tar.lzma
2006/09/22 | 7331 | systems/win32/miktex/tm/packages/eijkhout.cab
-2021/07/28 | 552679 | systems/win32/miktex/tm/packages/einfart__doc.tar.lzma
-2021/07/28 | 17858 | systems/win32/miktex/tm/packages/einfart__source.tar.lzma
-2021/07/28 | 3702 | systems/win32/miktex/tm/packages/einfart.tar.lzma
+2021/08/01 | 559624 | systems/win32/miktex/tm/packages/einfart__doc.tar.lzma
+2021/08/01 | 18616 | systems/win32/miktex/tm/packages/einfart__source.tar.lzma
+2021/08/01 | 3785 | systems/win32/miktex/tm/packages/einfart.tar.lzma
2020/10/27 | 374762 | systems/win32/miktex/tm/packages/ejpecp.tar.lzma
2019/01/06 | 228202 | systems/win32/miktex/tm/packages/ekaia.tar.lzma
2021/04/07 | 816803 | systems/win32/miktex/tm/packages/ekdosis.tar.lzma
@@ -283980,7 +283984,9 @@
2006/09/13 | 283408 | systems/win32/miktex/tm/packages/examdesign.cab
2016/12/21 | 863272 | systems/win32/miktex/tm/packages/exam-n.tar.lzma
2010/02/12 | 412857 | systems/win32/miktex/tm/packages/examplep.tar.lzma
-2019/01/11 | 284709 | systems/win32/miktex/tm/packages/exam-randomizechoices.tar.lzma
+2021/08/01 | 302186 | systems/win32/miktex/tm/packages/exam-randomizechoices__doc.tar.lzma
+2021/08/01 | 13671 | systems/win32/miktex/tm/packages/exam-randomizechoices__source.tar.lzma
+2021/08/01 | 5828 | systems/win32/miktex/tm/packages/exam-randomizechoices.tar.lzma
2021/03/03 | 566110 | systems/win32/miktex/tm/packages/exam.tar.lzma
2011/04/20 | 14721 | systems/win32/miktex/tm/packages/exceltex.tar.lzma
2010/03/08 | 220740 | systems/win32/miktex/tm/packages/excludeonly.tar.lzma
@@ -284075,7 +284081,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/07/31 | 592787 | systems/win32/miktex/tm/packages/files.csv.lzma
+2021/08/01 | 591522 | 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
@@ -284466,6 +284472,9 @@
2021/07/15 | 1843877 | systems/win32/miktex/tm/packages/hvfloat__source.tar.lzma
2021/07/15 | 11346 | systems/win32/miktex/tm/packages/hvfloat.tar.lzma
2017/12/14 | 78242 | systems/win32/miktex/tm/packages/hvindex.tar.lzma
+2021/08/01 | 74782 | systems/win32/miktex/tm/packages/hvlogos__doc.tar.lzma
+2021/08/01 | 1937 | systems/win32/miktex/tm/packages/hvlogos__source.tar.lzma
+2021/08/01 | 2619 | systems/win32/miktex/tm/packages/hvlogos.tar.lzma
2016/07/19 | 9825 | systems/win32/miktex/tm/packages/hvmath.tar.lzma
2021/05/20 | 106879 | systems/win32/miktex/tm/packages/hvqrurl.tar.lzma
2018/10/03 | 1542774 | systems/win32/miktex/tm/packages/hybrid-latex.tar.lzma
@@ -284765,9 +284774,9 @@
2021/06/20 | 2028658 | systems/win32/miktex/tm/packages/latex-graphics-dev__doc.tar.lzma
2021/06/06 | 52562 | systems/win32/miktex/tm/packages/latex-graphics-dev__source.tar.lzma
2021/06/06 | 15361 | systems/win32/miktex/tm/packages/latex-graphics-dev.tar.lzma
-2021/07/24 | 919327 | systems/win32/miktex/tm/packages/latexindent__doc.tar.lzma
-2021/07/24 | 113493 | systems/win32/miktex/tm/packages/latexindent__source.tar.lzma
-2021/07/24 | 62930 | systems/win32/miktex/tm/packages/latexindent.tar.lzma
+2021/08/01 | 921966 | systems/win32/miktex/tm/packages/latexindent__doc.tar.lzma
+2021/08/01 | 114861 | systems/win32/miktex/tm/packages/latexindent__source.tar.lzma
+2021/08/01 | 63681 | systems/win32/miktex/tm/packages/latexindent.tar.lzma
2021/01/07 | 716957 | systems/win32/miktex/tm/packages/latex-make.tar.lzma
2021/06/09 | 279382 | systems/win32/miktex/tm/packages/latexmk__doc.tar.lzma
2021/06/09 | 14661 | systems/win32/miktex/tm/packages/latexmk__source.tar.lzma
@@ -284799,9 +284808,9 @@
2019/10/04 | 982493 | systems/win32/miktex/tm/packages/leadsheets.tar.lzma
2020/11/09 | 359651 | systems/win32/miktex/tm/packages/leaflet.tar.lzma
2004/07/13 | 333977 | systems/win32/miktex/tm/packages/leawood.cab
-2021/07/28 | 599694 | systems/win32/miktex/tm/packages/lebhart__doc.tar.lzma
-2021/07/28 | 16598 | systems/win32/miktex/tm/packages/lebhart__source.tar.lzma
-2021/07/28 | 3578 | systems/win32/miktex/tm/packages/lebhart.tar.lzma
+2021/08/01 | 606132 | systems/win32/miktex/tm/packages/lebhart__doc.tar.lzma
+2021/08/01 | 17344 | systems/win32/miktex/tm/packages/lebhart__source.tar.lzma
+2021/08/01 | 3618 | systems/win32/miktex/tm/packages/lebhart.tar.lzma
2011/09/13 | 1558514 | systems/win32/miktex/tm/packages/lecturer.tar.lzma
2020/02/03 | 7953 | systems/win32/miktex/tm/packages/lectures.tar.lzma
2016/08/09 | 2514816 | systems/win32/miktex/tm/packages/ledmac.tar.lzma
@@ -285033,9 +285042,9 @@
2011/01/18 | 57807 | systems/win32/miktex/tm/packages/ly1.tar.lzma
2019/05/29 | 884130 | systems/win32/miktex/tm/packages/lyluatex.tar.lzma
2006/01/13 | 1323609 | systems/win32/miktex/tm/packages/m3d.cab
-2021/07/27 | 189868 | systems/win32/miktex/tm/packages/macrolist__doc.tar.lzma
-2021/07/27 | 4794 | systems/win32/miktex/tm/packages/macrolist__source.tar.lzma
-2021/07/27 | 2537 | systems/win32/miktex/tm/packages/macrolist.tar.lzma
+2021/08/01 | 191252 | systems/win32/miktex/tm/packages/macrolist__doc.tar.lzma
+2021/08/01 | 4944 | systems/win32/miktex/tm/packages/macrolist__source.tar.lzma
+2021/08/01 | 2556 | systems/win32/miktex/tm/packages/macrolist.tar.lzma
2011/07/28 | 185912 | systems/win32/miktex/tm/packages/macros2e.tar.lzma
2013/08/27 | 167652 | systems/win32/miktex/tm/packages/macroswap.tar.lzma
2006/09/22 | 66033 | systems/win32/miktex/tm/packages/mafr.tar.bz2
@@ -285409,9 +285418,9 @@
2018/01/12 | 157226 | systems/win32/miktex/tm/packages/miktex-zip-bin-x64.tar.lzma
2021/07/17 | 39091 | systems/win32/miktex/tm/packages/miktex-zlib-bin-2.9.tar.lzma
2021/07/17 | 43361 | systems/win32/miktex/tm/packages/miktex-zlib-bin-x64-2.9.tar.lzma
-2021/07/31 | 231888 | systems/win32/miktex/tm/packages/miktex-zzdb1-2.9.tar.lzma
-2021/07/31 | 1320637 | systems/win32/miktex/tm/packages/miktex-zzdb2-2.9.tar.lzma
-2021/07/31 | 1227675 | systems/win32/miktex/tm/packages/miktex-zzdb3-2.9.tar.lzma
+2021/08/01 | 232330 | systems/win32/miktex/tm/packages/miktex-zzdb1-2.9.tar.lzma
+2021/08/01 | 1322204 | systems/win32/miktex/tm/packages/miktex-zzdb2-2.9.tar.lzma
+2021/08/01 | 1228090 | systems/win32/miktex/tm/packages/miktex-zzdb3-2.9.tar.lzma
2021/07/17 | 13442 | systems/win32/miktex/tm/packages/miktex-zzip-bin-2.9.tar.lzma
2021/07/17 | 14316 | 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
@@ -285424,9 +285433,9 @@
2013/07/01 | 286736 | systems/win32/miktex/tm/packages/minibox.tar.lzma
2017/04/13 | 193445 | systems/win32/miktex/tm/packages/minidocument.tar.lzma
2014/01/06 | 486298 | systems/win32/miktex/tm/packages/minifp.tar.lzma
-2021/07/28 | 100970 | systems/win32/miktex/tm/packages/minimalist__doc.tar.lzma
-2021/07/28 | 8608 | systems/win32/miktex/tm/packages/minimalist__source.tar.lzma
-2021/07/28 | 7217 | systems/win32/miktex/tm/packages/minimalist.tar.lzma
+2021/08/01 | 102551 | systems/win32/miktex/tm/packages/minimalist__doc.tar.lzma
+2021/08/01 | 8852 | systems/win32/miktex/tm/packages/minimalist__source.tar.lzma
+2021/08/01 | 7352 | systems/win32/miktex/tm/packages/minimalist.tar.lzma
2021/06/10 | 262138 | systems/win32/miktex/tm/packages/minim__doc.tar.lzma
2021/06/10 | 26143 | systems/win32/miktex/tm/packages/minim-hatching__doc.tar.lzma
2021/06/10 | 2392 | systems/win32/miktex/tm/packages/minim-hatching__source.tar.lzma
@@ -285608,189 +285617,189 @@
2018/04/09 | 400132 | systems/win32/miktex/tm/packages/newunicodechar.tar.lzma
2011/09/19 | 101312 | systems/win32/miktex/tm/packages/newvbtm.tar.lzma
2021/03/17 | 232249 | systems/win32/miktex/tm/packages/newverbs.tar.lzma
-2021/07/31 | 593220 | systems/win32/miktex/tm/packages/next/files.csv.lzma
-2021/07/31 | 51113 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-2.9.tar.lzma
-2021/07/31 | 56477 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-x64-2.9.tar.lzma
-2021/07/31 | 975018 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-2.9.tar.lzma
-2021/07/31 | 1077990 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-x64-2.9.tar.lzma
-2021/07/31 | 29035 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-2.9.tar.lzma
-2021/07/31 | 31352 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-x64-2.9.tar.lzma
-2021/07/31 | 29840 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-2.9.tar.lzma
-2021/07/31 | 34666 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-x64-2.9.tar.lzma
-2021/07/31 | 50152 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-2.9.tar.lzma
-2021/07/31 | 57549 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-x64-2.9.tar.lzma
-2021/07/31 | 83540 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-2.9.tar.lzma
-2021/07/31 | 95402 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-x64-2.9.tar.lzma
-2021/07/31 | 67821 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-2.9.tar.lzma
-2021/07/31 | 75793 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-x64-2.9.tar.lzma
-2021/07/31 | 27199 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-2.9.tar.lzma
-2021/07/31 | 30823 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-x64-2.9.tar.lzma
-2021/07/31 | 330787 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-2.9.tar.lzma
-2021/07/31 | 392793 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-x64-2.9.tar.lzma
-2021/07/31 | 32674 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-2.9.tar.lzma
-2021/07/31 | 36629 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-x64-2.9.tar.lzma
-2021/07/31 | 51308 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-2.9.tar.lzma
-2021/07/31 | 56684 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-x64-2.9.tar.lzma
-2021/07/31 | 241811 | systems/win32/miktex/tm/packages/next/miktex-console-bin-2.9.tar.lzma
-2021/07/31 | 263957 | systems/win32/miktex/tm/packages/next/miktex-console-bin-x64-2.9.tar.lzma
-2021/07/31 | 180011 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-2.9.tar.lzma
-2021/07/31 | 195636 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-x64-2.9.tar.lzma
-2021/07/31 | 54633 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-2.9.tar.lzma
-2021/07/31 | 61812 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-x64-2.9.tar.lzma
-2021/07/31 | 21225 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-2.9.tar.lzma
-2021/07/31 | 23365 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-x64-2.9.tar.lzma
-2021/07/31 | 461813 | systems/win32/miktex/tm/packages/next/miktex-doc.tar.lzma
-2021/07/31 | 45905 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-2.9.tar.lzma
-2021/07/31 | 51201 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-x64-2.9.tar.lzma
-2021/07/31 | 284581 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-2.9.tar.lzma
-2021/07/31 | 325043 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-x64-2.9.tar.lzma
-2021/07/31 | 41194 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-2.9.tar.lzma
-2021/07/31 | 45311 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-x64-2.9.tar.lzma
-2021/07/31 | 119819 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-2.9.tar.lzma
-2021/07/31 | 133866 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-x64-2.9.tar.lzma
-2021/07/31 | 1291297 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-2.9.tar.lzma
-2021/07/31 | 1421867 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-x64-2.9.tar.lzma
-2021/07/31 | 100625 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-2.9.tar.lzma
-2021/07/31 | 112983 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-x64-2.9.tar.lzma
-2021/07/31 | 43028 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-2.9.tar.lzma
-2021/07/31 | 48252 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-x64-2.9.tar.lzma
-2021/07/31 | 25021 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-2.9.tar.lzma
-2021/07/31 | 28180 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-x64-2.9.tar.lzma
-2021/07/31 | 56318 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-2.9.tar.lzma
-2021/07/31 | 62786 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-x64-2.9.tar.lzma
-2021/07/31 | 136817 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-2.9.tar.lzma
-2021/07/31 | 154426 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-x64-2.9.tar.lzma
-2021/07/31 | 73196 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-2.9.tar.lzma
-2021/07/31 | 77952 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-x64-2.9.tar.lzma
-2021/07/31 | 71668 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-2.9.tar.lzma
-2021/07/31 | 80451 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-x64-2.9.tar.lzma
-2021/07/31 | 258881 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-2.9.tar.lzma
-2021/07/31 | 295204 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-x64-2.9.tar.lzma
-2021/07/31 | 22050 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-2.9.tar.lzma
-2021/07/31 | 24996 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-x64-2.9.tar.lzma
-2021/07/31 | 97339 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-2.9.tar.lzma
-2021/07/31 | 112087 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-x64-2.9.tar.lzma
-2021/07/31 | 64426 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-2.9.tar.lzma
-2021/07/31 | 73148 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-x64-2.9.tar.lzma
-2021/07/31 | 96633 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-2.9.tar.lzma
-2021/07/31 | 115352 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-x64-2.9.tar.lzma
-2021/07/31 | 38141 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-2.9.tar.lzma
-2021/07/31 | 43003 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-x64-2.9.tar.lzma
-2021/07/31 | 483653 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-2.9.tar.lzma
-2021/07/31 | 566528 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-x64-2.9.tar.lzma
-2021/07/31 | 147370 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-2.9.tar.lzma
-2021/07/31 | 159579 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-x64-2.9.tar.lzma
-2021/07/31 | 94798 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-2.9.tar.lzma
-2021/07/31 | 109031 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-x64-2.9.tar.lzma
-2021/07/31 | 16356 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-2.9.tar.lzma
-2021/07/31 | 17980 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-x64-2.9.tar.lzma
-2021/07/31 | 28389 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-2.9.tar.lzma
-2021/07/31 | 30058 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-x64-2.9.tar.lzma
-2021/07/31 | 629399 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-2.9.tar.lzma
-2021/07/31 | 681252 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-x64-2.9.tar.lzma
-2021/07/31 | 531849 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-2.9.tar.lzma
-2021/07/31 | 596929 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-x64-2.9.tar.lzma
-2021/07/31 | 476922 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-2.9.tar.lzma
-2021/07/31 | 510587 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-x64-2.9.tar.lzma
-2021/07/31 | 94310 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-2.9.tar.lzma
-2021/07/31 | 103400 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-x64-2.9.tar.lzma
-2021/07/31 | 1713892 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-2.9.tar.lzma
-2021/07/31 | 2009905 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-x64-2.9.tar.lzma
-2021/07/31 | 67619 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-2.9.tar.lzma
-2021/07/31 | 74210 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-x64-2.9.tar.lzma
-2021/07/31 | 27358 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-2.9.tar.lzma
-2021/07/31 | 31620 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-x64-2.9.tar.lzma
-2021/07/31 | 7722 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-2.9.tar.lzma
-2021/07/31 | 8768 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-x64-2.9.tar.lzma
-2021/07/31 | 196872 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-2.9.tar.lzma
-2021/07/31 | 215249 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-x64-2.9.tar.lzma
-2021/07/31 | 250266 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-2.9.tar.lzma
-2021/07/31 | 284025 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-x64-2.9.tar.lzma
-2021/07/31 | 98380 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-2.9.tar.lzma
-2021/07/31 | 103203 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-x64-2.9.tar.lzma
-2021/07/31 | 60638 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-2.9.tar.lzma
-2021/07/31 | 68024 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-x64-2.9.tar.lzma
-2021/07/31 | 124282 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-2.9.tar.lzma
-2021/07/31 | 136822 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-x64-2.9.tar.lzma
-2021/07/31 | 178354 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-2.9.tar.lzma
-2021/07/31 | 196741 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-x64-2.9.tar.lzma
-2021/07/31 | 199733 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-2.9.tar.lzma
-2021/07/31 | 180121 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-x64-2.9.tar.lzma
-2021/07/31 | 67484 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-2.9.tar.lzma
-2021/07/31 | 76825 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-x64-2.9.tar.lzma
-2021/07/31 | 31231 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-2.9.tar.lzma
-2021/07/31 | 35087 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-x64-2.9.tar.lzma
-2021/07/31 | 37805 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-2.9.tar.lzma
-2021/07/31 | 42712 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-x64-2.9.tar.lzma
-2021/07/31 | 42892 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-2.9.tar.lzma
-2021/07/31 | 46907 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-x64-2.9.tar.lzma
-2021/07/31 | 45969 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-2.9.tar.lzma
-2021/07/31 | 52523 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-x64-2.9.tar.lzma
-2021/07/31 | 194382 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-2.9.tar.lzma
-2021/07/31 | 206604 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-x64-2.9.tar.lzma
-2021/07/31 | 35691 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin.tar.lzma
-2021/07/31 | 40229 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin-x64.tar.lzma
-2021/07/31 | 744117 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-2.9.tar.lzma
-2021/07/31 | 815242 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-x64-2.9.tar.lzma
-2021/07/31 | 198170 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-2.9.tar.lzma
-2021/07/31 | 202797 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-x64-2.9.tar.lzma
-2021/07/31 | 208048 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-2.9.tar.lzma
-2021/07/31 | 243426 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-x64-2.9.tar.lzma
-2021/07/31 | 78774 | systems/win32/miktex/tm/packages/next/miktex-png-bin-2.9.tar.lzma
-2021/07/31 | 87777 | systems/win32/miktex/tm/packages/next/miktex-png-bin-x64-2.9.tar.lzma
-2021/07/31 | 1169718 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-2.9.tar.lzma
-2021/07/31 | 1301190 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-x64-2.9.tar.lzma
-2021/07/31 | 20137 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-2.9.tar.lzma
-2021/07/31 | 23903 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-x64-2.9.tar.lzma
-2021/07/31 | 31540 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-2.9.tar.lzma
-2021/07/31 | 37239 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-x64-2.9.tar.lzma
-2021/07/31 | 64184 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-2.9.tar.lzma
-2021/07/31 | 72207 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-x64-2.9.tar.lzma
-2021/07/31 | 50394 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-2.9.tar.lzma
-2021/07/31 | 57727 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-x64-2.9.tar.lzma
-2021/07/31 | 1340931 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-2.9.tar.lzma
-2021/07/31 | 1464203 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-x64-2.9.tar.lzma
-2021/07/31 | 42386 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-2.9.tar.lzma
-2021/07/31 | 51751 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-x64-2.9.tar.lzma
-2021/07/31 | 56514 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin.tar.lzma
-2021/07/31 | 60039 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-x64.tar.lzma
-2021/07/31 | 25291 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-2.9.tar.lzma
-2021/07/31 | 27390 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-x64-2.9.tar.lzma
-2021/07/31 | 16413 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-2.9.tar.lzma
-2021/07/31 | 18177 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-x64-2.9.tar.lzma
-2021/07/31 | 63777 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-2.9.tar.lzma
-2021/07/31 | 69914 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-x64-2.9.tar.lzma
-2021/07/31 | 154803 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-2.9.tar.lzma
-2021/07/31 | 169242 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-x64-2.9.tar.lzma
-2021/07/31 | 57012 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-2.9.tar.lzma
-2021/07/31 | 65787 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-x64-2.9.tar.lzma
-2021/07/31 | 98261 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-2.9.tar.lzma
-2021/07/31 | 105222 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-x64-2.9.tar.lzma
-2021/07/31 | 2672608 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-2.9.tar.lzma
-2021/07/31 | 2796724 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-x64-2.9.tar.lzma
-2021/07/31 | 56355 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-2.9.tar.lzma
-2021/07/31 | 62229 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-x64-2.9.tar.lzma
-2021/07/31 | 33544 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin.tar.lzma
-2021/07/31 | 37357 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin-x64.tar.lzma
-2021/07/31 | 27727 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-2.9.tar.lzma
-2021/07/31 | 33632 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-x64-2.9.tar.lzma
-2021/07/31 | 65618 | systems/win32/miktex/tm/packages/next/miktex-web-bin-2.9.tar.lzma
-2021/07/31 | 70646 | systems/win32/miktex/tm/packages/next/miktex-web-bin-x64-2.9.tar.lzma
-2021/07/31 | 312106 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-2.9.tar.lzma
-2021/07/31 | 345738 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-x64-2.9.tar.lzma
-2021/07/31 | 55496 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin.tar.lzma
-2021/07/31 | 57139 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin-x64.tar.lzma
-2021/07/31 | 589843 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-2.9.tar.lzma
-2021/07/31 | 624655 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-x64-2.9.tar.lzma
-2021/07/31 | 39127 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-2.9.tar.lzma
-2021/07/31 | 43423 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-x64-2.9.tar.lzma
-2021/07/31 | 231912 | systems/win32/miktex/tm/packages/next/miktex-zzdb1-2.9.tar.lzma
-2021/07/31 | 1320701 | systems/win32/miktex/tm/packages/next/miktex-zzdb2-2.9.tar.lzma
-2021/07/31 | 1228758 | systems/win32/miktex/tm/packages/next/miktex-zzdb3-2.9.tar.lzma
-2021/07/31 | 13463 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-2.9.tar.lzma
-2021/07/31 | 14347 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-x64-2.9.tar.lzma
+2021/08/01 | 591488 | systems/win32/miktex/tm/packages/next/files.csv.lzma
+2021/08/01 | 51112 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-2.9.tar.lzma
+2021/08/01 | 56476 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-x64-2.9.tar.lzma
+2021/08/01 | 975018 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-2.9.tar.lzma
+2021/08/01 | 1077990 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-x64-2.9.tar.lzma
+2021/08/01 | 29039 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-2.9.tar.lzma
+2021/08/01 | 31351 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-x64-2.9.tar.lzma
+2021/08/01 | 29842 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-2.9.tar.lzma
+2021/08/01 | 34664 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-x64-2.9.tar.lzma
+2021/08/01 | 50153 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-2.9.tar.lzma
+2021/08/01 | 57548 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-x64-2.9.tar.lzma
+2021/08/01 | 83541 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-2.9.tar.lzma
+2021/08/01 | 95402 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-x64-2.9.tar.lzma
+2021/08/01 | 67820 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-2.9.tar.lzma
+2021/08/01 | 75792 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-x64-2.9.tar.lzma
+2021/08/01 | 27199 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-2.9.tar.lzma
+2021/08/01 | 30824 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-x64-2.9.tar.lzma
+2021/08/01 | 330788 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-2.9.tar.lzma
+2021/08/01 | 392791 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-x64-2.9.tar.lzma
+2021/08/01 | 32675 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-2.9.tar.lzma
+2021/08/01 | 36630 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-x64-2.9.tar.lzma
+2021/08/01 | 51310 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-2.9.tar.lzma
+2021/08/01 | 56687 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-x64-2.9.tar.lzma
+2021/08/01 | 241810 | systems/win32/miktex/tm/packages/next/miktex-console-bin-2.9.tar.lzma
+2021/08/01 | 263959 | systems/win32/miktex/tm/packages/next/miktex-console-bin-x64-2.9.tar.lzma
+2021/08/01 | 180012 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-2.9.tar.lzma
+2021/08/01 | 195634 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-x64-2.9.tar.lzma
+2021/08/01 | 54633 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-2.9.tar.lzma
+2021/08/01 | 61811 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-x64-2.9.tar.lzma
+2021/08/01 | 21225 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-2.9.tar.lzma
+2021/08/01 | 23364 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-x64-2.9.tar.lzma
+2021/08/01 | 461812 | systems/win32/miktex/tm/packages/next/miktex-doc.tar.lzma
+2021/08/01 | 45906 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-2.9.tar.lzma
+2021/08/01 | 51202 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-x64-2.9.tar.lzma
+2021/08/01 | 284580 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-2.9.tar.lzma
+2021/08/01 | 325044 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-x64-2.9.tar.lzma
+2021/08/01 | 41194 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-2.9.tar.lzma
+2021/08/01 | 45310 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-x64-2.9.tar.lzma
+2021/08/01 | 119822 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-2.9.tar.lzma
+2021/08/01 | 133866 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-x64-2.9.tar.lzma
+2021/08/01 | 1291299 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-2.9.tar.lzma
+2021/08/01 | 1421868 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-x64-2.9.tar.lzma
+2021/08/01 | 100625 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-2.9.tar.lzma
+2021/08/01 | 112984 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-x64-2.9.tar.lzma
+2021/08/01 | 43027 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-2.9.tar.lzma
+2021/08/01 | 48252 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-x64-2.9.tar.lzma
+2021/08/01 | 25020 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-2.9.tar.lzma
+2021/08/01 | 28180 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-x64-2.9.tar.lzma
+2021/08/01 | 56319 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-2.9.tar.lzma
+2021/08/01 | 62786 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-x64-2.9.tar.lzma
+2021/08/01 | 136816 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-2.9.tar.lzma
+2021/08/01 | 154427 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-x64-2.9.tar.lzma
+2021/08/01 | 73197 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-2.9.tar.lzma
+2021/08/01 | 77951 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-x64-2.9.tar.lzma
+2021/08/01 | 71669 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-2.9.tar.lzma
+2021/08/01 | 80448 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-x64-2.9.tar.lzma
+2021/08/01 | 258882 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-2.9.tar.lzma
+2021/08/01 | 295205 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-x64-2.9.tar.lzma
+2021/08/01 | 22049 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-2.9.tar.lzma
+2021/08/01 | 24995 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-x64-2.9.tar.lzma
+2021/08/01 | 97339 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-2.9.tar.lzma
+2021/08/01 | 112086 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-x64-2.9.tar.lzma
+2021/08/01 | 64427 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-2.9.tar.lzma
+2021/08/01 | 73148 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-x64-2.9.tar.lzma
+2021/08/01 | 96634 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-2.9.tar.lzma
+2021/08/01 | 115351 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-x64-2.9.tar.lzma
+2021/08/01 | 38141 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-2.9.tar.lzma
+2021/08/01 | 43003 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-x64-2.9.tar.lzma
+2021/08/01 | 483653 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-2.9.tar.lzma
+2021/08/01 | 566529 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-x64-2.9.tar.lzma
+2021/08/01 | 147373 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-2.9.tar.lzma
+2021/08/01 | 159579 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-x64-2.9.tar.lzma
+2021/08/01 | 94798 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-2.9.tar.lzma
+2021/08/01 | 109031 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-x64-2.9.tar.lzma
+2021/08/01 | 16357 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-2.9.tar.lzma
+2021/08/01 | 17981 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-x64-2.9.tar.lzma
+2021/08/01 | 28390 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-2.9.tar.lzma
+2021/08/01 | 30059 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-x64-2.9.tar.lzma
+2021/08/01 | 629399 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-2.9.tar.lzma
+2021/08/01 | 681251 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-x64-2.9.tar.lzma
+2021/08/01 | 531849 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-2.9.tar.lzma
+2021/08/01 | 596929 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-x64-2.9.tar.lzma
+2021/08/01 | 476917 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-2.9.tar.lzma
+2021/08/01 | 510583 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-x64-2.9.tar.lzma
+2021/08/01 | 94311 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-2.9.tar.lzma
+2021/08/01 | 103400 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-x64-2.9.tar.lzma
+2021/08/01 | 1713894 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-2.9.tar.lzma
+2021/08/01 | 2009907 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-x64-2.9.tar.lzma
+2021/08/01 | 67619 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-2.9.tar.lzma
+2021/08/01 | 74210 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-x64-2.9.tar.lzma
+2021/08/01 | 27358 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-2.9.tar.lzma
+2021/08/01 | 31620 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-x64-2.9.tar.lzma
+2021/08/01 | 7722 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-2.9.tar.lzma
+2021/08/01 | 8769 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-x64-2.9.tar.lzma
+2021/08/01 | 196873 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-2.9.tar.lzma
+2021/08/01 | 215250 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-x64-2.9.tar.lzma
+2021/08/01 | 250266 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-2.9.tar.lzma
+2021/08/01 | 284026 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-x64-2.9.tar.lzma
+2021/08/01 | 98381 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-2.9.tar.lzma
+2021/08/01 | 103203 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-x64-2.9.tar.lzma
+2021/08/01 | 60638 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-2.9.tar.lzma
+2021/08/01 | 68025 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-x64-2.9.tar.lzma
+2021/08/01 | 124282 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-2.9.tar.lzma
+2021/08/01 | 136820 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-x64-2.9.tar.lzma
+2021/08/01 | 178355 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-2.9.tar.lzma
+2021/08/01 | 196740 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-x64-2.9.tar.lzma
+2021/08/01 | 199733 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-2.9.tar.lzma
+2021/08/01 | 180120 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-x64-2.9.tar.lzma
+2021/08/01 | 67484 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-2.9.tar.lzma
+2021/08/01 | 76826 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-x64-2.9.tar.lzma
+2021/08/01 | 31230 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-2.9.tar.lzma
+2021/08/01 | 35086 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-x64-2.9.tar.lzma
+2021/08/01 | 37805 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-2.9.tar.lzma
+2021/08/01 | 42712 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-x64-2.9.tar.lzma
+2021/08/01 | 42892 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-2.9.tar.lzma
+2021/08/01 | 46907 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-x64-2.9.tar.lzma
+2021/08/01 | 45971 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-2.9.tar.lzma
+2021/08/01 | 52523 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-x64-2.9.tar.lzma
+2021/08/01 | 194384 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-2.9.tar.lzma
+2021/08/01 | 206605 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-x64-2.9.tar.lzma
+2021/08/01 | 35693 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin.tar.lzma
+2021/08/01 | 40230 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin-x64.tar.lzma
+2021/08/01 | 744118 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-2.9.tar.lzma
+2021/08/01 | 815245 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-x64-2.9.tar.lzma
+2021/08/01 | 198171 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-2.9.tar.lzma
+2021/08/01 | 202796 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-x64-2.9.tar.lzma
+2021/08/01 | 208049 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-2.9.tar.lzma
+2021/08/01 | 243426 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-x64-2.9.tar.lzma
+2021/08/01 | 78775 | systems/win32/miktex/tm/packages/next/miktex-png-bin-2.9.tar.lzma
+2021/08/01 | 87777 | systems/win32/miktex/tm/packages/next/miktex-png-bin-x64-2.9.tar.lzma
+2021/08/01 | 1169717 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-2.9.tar.lzma
+2021/08/01 | 1301192 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-x64-2.9.tar.lzma
+2021/08/01 | 20137 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-2.9.tar.lzma
+2021/08/01 | 23902 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-x64-2.9.tar.lzma
+2021/08/01 | 31537 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-2.9.tar.lzma
+2021/08/01 | 37239 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-x64-2.9.tar.lzma
+2021/08/01 | 64186 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-2.9.tar.lzma
+2021/08/01 | 72208 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-x64-2.9.tar.lzma
+2021/08/01 | 50394 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-2.9.tar.lzma
+2021/08/01 | 57730 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-x64-2.9.tar.lzma
+2021/08/01 | 1340930 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-2.9.tar.lzma
+2021/08/01 | 1464203 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-x64-2.9.tar.lzma
+2021/08/01 | 42386 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-2.9.tar.lzma
+2021/08/01 | 51750 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-x64-2.9.tar.lzma
+2021/08/01 | 56515 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin.tar.lzma
+2021/08/01 | 60040 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-x64.tar.lzma
+2021/08/01 | 25291 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-2.9.tar.lzma
+2021/08/01 | 27390 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-x64-2.9.tar.lzma
+2021/08/01 | 16413 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-2.9.tar.lzma
+2021/08/01 | 18176 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-x64-2.9.tar.lzma
+2021/08/01 | 63777 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-2.9.tar.lzma
+2021/08/01 | 69914 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-x64-2.9.tar.lzma
+2021/08/01 | 154806 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-2.9.tar.lzma
+2021/08/01 | 169242 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-x64-2.9.tar.lzma
+2021/08/01 | 57013 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-2.9.tar.lzma
+2021/08/01 | 65786 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-x64-2.9.tar.lzma
+2021/08/01 | 98259 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-2.9.tar.lzma
+2021/08/01 | 105220 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-x64-2.9.tar.lzma
+2021/08/01 | 2672609 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-2.9.tar.lzma
+2021/08/01 | 2796726 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-x64-2.9.tar.lzma
+2021/08/01 | 56356 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-2.9.tar.lzma
+2021/08/01 | 62228 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-x64-2.9.tar.lzma
+2021/08/01 | 33545 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin.tar.lzma
+2021/08/01 | 37359 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin-x64.tar.lzma
+2021/08/01 | 27728 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-2.9.tar.lzma
+2021/08/01 | 33632 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-x64-2.9.tar.lzma
+2021/08/01 | 65619 | systems/win32/miktex/tm/packages/next/miktex-web-bin-2.9.tar.lzma
+2021/08/01 | 70647 | systems/win32/miktex/tm/packages/next/miktex-web-bin-x64-2.9.tar.lzma
+2021/08/01 | 312108 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-2.9.tar.lzma
+2021/08/01 | 345739 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-x64-2.9.tar.lzma
+2021/08/01 | 55497 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin.tar.lzma
+2021/08/01 | 57139 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin-x64.tar.lzma
+2021/08/01 | 589844 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-2.9.tar.lzma
+2021/08/01 | 624655 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-x64-2.9.tar.lzma
+2021/08/01 | 39129 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-2.9.tar.lzma
+2021/08/01 | 43424 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-x64-2.9.tar.lzma
+2021/08/01 | 232350 | systems/win32/miktex/tm/packages/next/miktex-zzdb1-2.9.tar.lzma
+2021/08/01 | 1321429 | systems/win32/miktex/tm/packages/next/miktex-zzdb2-2.9.tar.lzma
+2021/08/01 | 1229129 | systems/win32/miktex/tm/packages/next/miktex-zzdb3-2.9.tar.lzma
+2021/08/01 | 13465 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-2.9.tar.lzma
+2021/08/01 | 14348 | 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/07/31 | 1153 | systems/win32/miktex/tm/packages/next/pr.ini
+2021/08/01 | 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
@@ -285933,9 +285942,9 @@
2020/08/17 | 341442 | systems/win32/miktex/tm/packages/pagesel.tar.lzma
2015/12/22 | 982910 | systems/win32/miktex/tm/packages/pageslts.tar.lzma
2006/09/28 | 379872 | systems/win32/miktex/tm/packages/palatino.cab
-2021/07/29 | 178675 | systems/win32/miktex/tm/packages/palette__doc.tar.lzma
-2021/07/29 | 4299 | systems/win32/miktex/tm/packages/palette__source.tar.lzma
-2021/07/29 | 2036 | systems/win32/miktex/tm/packages/palette.tar.lzma
+2021/08/01 | 180372 | systems/win32/miktex/tm/packages/palette__doc.tar.lzma
+2021/08/01 | 4369 | systems/win32/miktex/tm/packages/palette__source.tar.lzma
+2021/08/01 | 2046 | systems/win32/miktex/tm/packages/palette.tar.lzma
2006/10/07 | 156955 | systems/win32/miktex/tm/packages/pandora-latex.cab
2006/08/13 | 31919 | systems/win32/miktex/tm/packages/papercdcase.tar.bz2
2011/08/28 | 427524 | systems/win32/miktex/tm/packages/papermas.tar.lzma
@@ -285981,9 +285990,9 @@
2019/11/20 | 111715 | systems/win32/miktex/tm/packages/pdfjam.tar.lzma
2018/02/13 | 89850 | systems/win32/miktex/tm/packages/pdflatexpicscale.tar.lzma
2019/12/09 | 306824 | systems/win32/miktex/tm/packages/pdflscape.tar.lzma
-2021/07/24 | 8163792 | systems/win32/miktex/tm/packages/pdfmanagement-testphase__doc.tar.lzma
-2021/07/24 | 120102 | systems/win32/miktex/tm/packages/pdfmanagement-testphase__source.tar.lzma
-2021/07/24 | 47458 | systems/win32/miktex/tm/packages/pdfmanagement-testphase.tar.lzma
+2021/08/01 | 8163695 | systems/win32/miktex/tm/packages/pdfmanagement-testphase__doc.tar.lzma
+2021/08/01 | 121654 | systems/win32/miktex/tm/packages/pdfmanagement-testphase__source.tar.lzma
+2021/08/01 | 47926 | systems/win32/miktex/tm/packages/pdfmanagement-testphase.tar.lzma
2011/08/11 | 384460 | systems/win32/miktex/tm/packages/pdfmarginpar.tar.lzma
2021/03/03 | 557874 | systems/win32/miktex/tm/packages/pdfoverlay.tar.lzma
2015/07/28 | 1817839 | systems/win32/miktex/tm/packages/pdfpagediff.tar.lzma
@@ -286033,7 +286042,9 @@
2014/07/12 | 183831 | systems/win32/miktex/tm/packages/pgfopts.tar.lzma
2019/08/13 | 825546 | systems/win32/miktex/tm/packages/pgfornament-han.tar.lzma
2020/05/30 | 3053763 | systems/win32/miktex/tm/packages/pgfornament.tar.lzma
-2021/05/09 | 217160 | systems/win32/miktex/tm/packages/pgf-pie.tar.lzma
+2021/08/01 | 219007 | systems/win32/miktex/tm/packages/pgf-pie__doc.tar.lzma
+2021/08/01 | 3031 | systems/win32/miktex/tm/packages/pgf-pie__source.tar.lzma
+2021/08/01 | 3917 | systems/win32/miktex/tm/packages/pgf-pie.tar.lzma
2021/06/06 | 13075713 | systems/win32/miktex/tm/packages/pgfplots__doc.tar.lzma
2021/06/06 | 1784445 | systems/win32/miktex/tm/packages/pgfplots__source.tar.lzma
2021/06/06 | 527889 | systems/win32/miktex/tm/packages/pgfplots.tar.lzma
@@ -286161,7 +286172,7 @@
2020/10/20 | 342254 | systems/win32/miktex/tm/packages/preview.tar.lzma
2019/06/20 | 375963 | systems/win32/miktex/tm/packages/prftree.tar.lzma
2021/04/23 | 274028 | systems/win32/miktex/tm/packages/principia.tar.lzma
-2021/07/31 | 894 | systems/win32/miktex/tm/packages/pr.ini
+2021/08/01 | 967 | 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
@@ -286175,9 +286186,9 @@
2017/05/12 | 61936 | systems/win32/miktex/tm/packages/program.tar.lzma
2014/05/05 | 89072 | systems/win32/miktex/tm/packages/progressbar.tar.lzma
2010/10/16 | 85014 | systems/win32/miktex/tm/packages/progress.tar.lzma
-2021/07/28 | 661414 | systems/win32/miktex/tm/packages/projlib__doc.tar.lzma
-2021/07/28 | 34385 | systems/win32/miktex/tm/packages/projlib__source.tar.lzma
-2021/07/28 | 12096 | systems/win32/miktex/tm/packages/projlib.tar.lzma
+2021/08/01 | 657394 | systems/win32/miktex/tm/packages/projlib__doc.tar.lzma
+2021/08/01 | 35226 | systems/win32/miktex/tm/packages/projlib__source.tar.lzma
+2021/08/01 | 12377 | systems/win32/miktex/tm/packages/projlib.tar.lzma
2019/05/23 | 390400 | systems/win32/miktex/tm/packages/proof-at-the-end.tar.lzma
2019/04/26 | 299565 | systems/win32/miktex/tm/packages/proofread.tar.lzma
2019/10/04 | 890932 | systems/win32/miktex/tm/packages/prooftrees.tar.lzma
@@ -286610,9 +286621,9 @@
2015/12/15 | 61175 | systems/win32/miktex/tm/packages/simpler-wick.tar.lzma
2017/01/03 | 2409668 | systems/win32/miktex/tm/packages/simple-thesis-dissertation.tar.lzma
2007/12/09 | 78409 | systems/win32/miktex/tm/packages/simplewick.tar.lzma
-2021/07/28 | 596199 | systems/win32/miktex/tm/packages/simplivre__doc.tar.lzma
-2021/07/28 | 17376 | systems/win32/miktex/tm/packages/simplivre__source.tar.lzma
-2021/07/28 | 3676 | systems/win32/miktex/tm/packages/simplivre.tar.lzma
+2021/08/01 | 622629 | systems/win32/miktex/tm/packages/simplivre__doc.tar.lzma
+2021/08/01 | 18160 | systems/win32/miktex/tm/packages/simplivre__source.tar.lzma
+2021/08/01 | 3759 | systems/win32/miktex/tm/packages/simplivre.tar.lzma
2013/08/19 | 11748 | systems/win32/miktex/tm/packages/simpsons.tar.lzma
2014/04/02 | 363940 | systems/win32/miktex/tm/packages/simurgh.tar.lzma
2008/07/22 | 360807 | systems/win32/miktex/tm/packages/sistyle.tar.lzma
@@ -286661,9 +286672,9 @@
2017/01/03 | 143479 | systems/win32/miktex/tm/packages/sparklines.tar.lzma
2019/04/14 | 106425 | systems/win32/miktex/tm/packages/spark-otf.tar.lzma
2021/02/22 | 1423643 | systems/win32/miktex/tm/packages/spath3.tar.lzma
-2021/07/30 | 65246 | systems/win32/miktex/tm/packages/spbmark__doc.tar.lzma
-2021/07/30 | 3414 | systems/win32/miktex/tm/packages/spbmark__source.tar.lzma
-2021/07/30 | 2676 | systems/win32/miktex/tm/packages/spbmark.tar.lzma
+2021/08/01 | 65105 | systems/win32/miktex/tm/packages/spbmark__doc.tar.lzma
+2021/08/01 | 3383 | systems/win32/miktex/tm/packages/spbmark__source.tar.lzma
+2021/08/01 | 2676 | systems/win32/miktex/tm/packages/spbmark.tar.lzma
2021/07/24 | 1788647 | systems/win32/miktex/tm/packages/spectralsequences__doc.tar.lzma
2021/07/24 | 52671 | systems/win32/miktex/tm/packages/spectralsequences__source.tar.lzma
2021/07/24 | 71962 | systems/win32/miktex/tm/packages/spectralsequences.tar.lzma
@@ -287241,7 +287252,9 @@
2019/07/13 | 220414 | systems/win32/miktex/tm/packages/versonotes.tar.lzma
2018/12/18 | 164919 | systems/win32/miktex/tm/packages/vertbars.tar.lzma
2013/12/23 | 27576 | systems/win32/miktex/tm/packages/vgrid.tar.lzma
-2013/04/22 | 344256 | systems/win32/miktex/tm/packages/vhistory.tar.lzma
+2021/08/01 | 330916 | systems/win32/miktex/tm/packages/vhistory__doc.tar.lzma
+2021/08/01 | 17639 | systems/win32/miktex/tm/packages/vhistory__source.tar.lzma
+2021/08/01 | 8628 | systems/win32/miktex/tm/packages/vhistory.tar.lzma
2006/03/25 | 1779757 | systems/win32/miktex/tm/packages/visualfaq.cab
2004/07/22 | 25936 | systems/win32/miktex/tm/packages/vmargin.cab
2013/05/21 | 6039731 | systems/win32/miktex/tm/packages/vntex.tar.lzma
@@ -287571,7 +287584,7 @@
2004/06/04 | 404 | tds/tds.sed
2004/06/23 | 65418 | tds/tds.tex
2019/05/29 | 304264 | tds.zip
-2021/08/01 | 186 | timestamp
+2021/08/02 | 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 092bd76301..d391439884 100644
--- a/FILES.byname.gz
+++ b/FILES.byname.gz
Binary files differ
diff --git a/FILES.last07days b/FILES.last07days
index 2af8403369..b1bb1c6b9c 100644
--- a/FILES.last07days
+++ b/FILES.last07days
@@ -1,251 +1,387 @@
+2021/08/01 | 98381 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-2.9.tar.lzma
+2021/08/01 | 98259 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-2.9.tar.lzma
+2021/08/01 | 975018 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-2.9.tar.lzma
+2021/08/01 | 97339 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-2.9.tar.lzma
+2021/08/01 | 97314 | graphics/mcf2graph/mcf_data_base.mcf
+2021/08/01 | 967 | systems/win32/miktex/tm/packages/pr.ini
+2021/08/01 | 96634 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-2.9.tar.lzma
+2021/08/01 | 9625 | systems/win32/miktex/tm/packages/colorist.tar.lzma
+2021/08/01 | 95402 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-x64-2.9.tar.lzma
+2021/08/01 | 94798 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-2.9.tar.lzma
+2021/08/01 | 94311 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-2.9.tar.lzma
+2021/08/01 | 942637 | graphics/mcf2graph.zip
+2021/08/01 | 921966 | systems/win32/miktex/tm/packages/latexindent__doc.tar.lzma
+2021/08/01 | 8852 | systems/win32/miktex/tm/packages/minimalist__source.tar.lzma
+2021/08/01 | 87777 | systems/win32/miktex/tm/packages/next/miktex-png-bin-x64-2.9.tar.lzma
+2021/08/01 | 8769 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-x64-2.9.tar.lzma
+2021/08/01 | 8628 | systems/win32/miktex/tm/packages/vhistory.tar.lzma
+2021/08/01 | 8421 | systems/win32/miktex/tm/packages/colorist__source.tar.lzma
+2021/08/01 | 83541 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-2.9.tar.lzma
+2021/08/01 | 8163695 | systems/win32/miktex/tm/packages/pdfmanagement-testphase__doc.tar.lzma
+2021/08/01 | 815245 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-x64-2.9.tar.lzma
+2021/08/01 | 80448 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-x64-2.9.tar.lzma
+2021/08/01 | 78775 | systems/win32/miktex/tm/packages/next/miktex-png-bin-2.9.tar.lzma
+2021/08/01 | 78149 | macros/latex/contrib/easybook/easybook.dtx
+2021/08/01 | 77951 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-x64-2.9.tar.lzma
+2021/08/01 | 7722 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-2.9.tar.lzma
+2021/08/01 | 76826 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-x64-2.9.tar.lzma
+2021/08/01 | 75792 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-x64-2.9.tar.lzma
+2021/08/01 | 75391 | macros/latex/contrib/easybook/easybook.tex
+2021/08/01 | 7487 | macros/latex/contrib/elpres/tex/elpres.cls
+2021/08/01 | 74782 | systems/win32/miktex/tm/packages/hvlogos__doc.tar.lzma
2021/08/01 | 744469 | info/install-latex-guide-zh-cn/install-latex-guide-zh-cn.pdf
-2021/07/31 | 98380 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-2.9.tar.lzma
-2021/07/31 | 98261 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-2.9.tar.lzma
+2021/08/01 | 744118 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-2.9.tar.lzma
+2021/08/01 | 74210 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-x64-2.9.tar.lzma
+2021/08/01 | 7352 | systems/win32/miktex/tm/packages/minimalist.tar.lzma
+2021/08/01 | 73197 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-2.9.tar.lzma
+2021/08/01 | 73148 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-x64-2.9.tar.lzma
+2021/08/01 | 72208 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-x64-2.9.tar.lzma
+2021/08/01 | 71669 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-2.9.tar.lzma
+2021/08/01 | 70647 | systems/win32/miktex/tm/packages/next/miktex-web-bin-x64-2.9.tar.lzma
+2021/08/01 | 69914 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-x64-2.9.tar.lzma
+2021/08/01 | 687841 | systems/win32/miktex/tm/packages/beaulivre__doc.tar.lzma
+2021/08/01 | 681251 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-x64-2.9.tar.lzma
+2021/08/01 | 68115 | macros/latex/contrib/tabularray/tabularray.tex
+2021/08/01 | 680990 | macros/latex/contrib/tabularray/tabularray.pdf
+2021/08/01 | 68025 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-x64-2.9.tar.lzma
+2021/08/01 | 67820 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-2.9.tar.lzma
+2021/08/01 | 67619 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-2.9.tar.lzma
+2021/08/01 | 67484 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-2.9.tar.lzma
+2021/08/01 | 65786 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-x64-2.9.tar.lzma
+2021/08/01 | 657394 | systems/win32/miktex/tm/packages/projlib__doc.tar.lzma
+2021/08/01 | 65619 | systems/win32/miktex/tm/packages/next/miktex-web-bin-2.9.tar.lzma
+2021/08/01 | 65105 | systems/win32/miktex/tm/packages/spbmark__doc.tar.lzma
+2021/08/01 | 64427 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-2.9.tar.lzma
+2021/08/01 | 64186 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-2.9.tar.lzma
+2021/08/01 | 63777 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-2.9.tar.lzma
+2021/08/01 | 637617 | macros/latex/contrib/tabularray.zip
+2021/08/01 | 63681 | systems/win32/miktex/tm/packages/latexindent.tar.lzma
+2021/08/01 | 629399 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-2.9.tar.lzma
+2021/08/01 | 62786 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-x64-2.9.tar.lzma
+2021/08/01 | 624655 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-x64-2.9.tar.lzma
+2021/08/01 | 622629 | systems/win32/miktex/tm/packages/simplivre__doc.tar.lzma
+2021/08/01 | 62228 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-x64-2.9.tar.lzma
+2021/08/01 | 61811 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-x64-2.9.tar.lzma
+2021/08/01 | 611044 | macros/latex/contrib/easybook.zip
+2021/08/01 | 60838 | graphics/mcf2graph/mcf_manual.tex
+2021/08/01 | 60638 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-2.9.tar.lzma
+2021/08/01 | 606132 | systems/win32/miktex/tm/packages/lebhart__doc.tar.lzma
+2021/08/01 | 60040 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-x64.tar.lzma
+2021/08/01 | 596929 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-x64-2.9.tar.lzma
+2021/08/01 | 591522 | systems/win32/miktex/tm/packages/files.csv.lzma
+2021/08/01 | 591488 | systems/win32/miktex/tm/packages/next/files.csv.lzma
+2021/08/01 | 589844 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-2.9.tar.lzma
+2021/08/01 | 5828 | systems/win32/miktex/tm/packages/exam-randomizechoices.tar.lzma
+2021/08/01 | 5803 | macros/generic/chemfig/chemfig-lewis.tex
+2021/08/01 | 57730 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-x64-2.9.tar.lzma
+2021/08/01 | 57548 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-x64-2.9.tar.lzma
+2021/08/01 | 571527 | macros/latex/contrib/easybook/easybook.pdf
+2021/08/01 | 57139 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin-x64.tar.lzma
+2021/08/01 | 57013 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-2.9.tar.lzma
+2021/08/01 | 56687 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-x64-2.9.tar.lzma
+2021/08/01 | 566529 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-x64-2.9.tar.lzma
+2021/08/01 | 56515 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin.tar.lzma
+2021/08/01 | 56476 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-x64-2.9.tar.lzma
+2021/08/01 | 56356 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-2.9.tar.lzma
+2021/08/01 | 56319 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-2.9.tar.lzma
+2021/08/01 | 559624 | systems/win32/miktex/tm/packages/einfart__doc.tar.lzma
+2021/08/01 | 55497 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin.tar.lzma
+2021/08/01 | 54633 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-2.9.tar.lzma
+2021/08/01 | 531849 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-2.9.tar.lzma
+2021/08/01 | 52523 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-x64-2.9.tar.lzma
+2021/08/01 | 51750 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-x64-2.9.tar.lzma
+2021/08/01 | 51310 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-2.9.tar.lzma
+2021/08/01 | 51235 | macros/latex/contrib/elpres/doc/elpres-manual.tex
+2021/08/01 | 51202 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-x64-2.9.tar.lzma
+2021/08/01 | 51112 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-2.9.tar.lzma
+2021/08/01 | 510583 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-x64-2.9.tar.lzma
+2021/08/01 | 50394 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-2.9.tar.lzma
+2021/08/01 | 50153 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-2.9.tar.lzma
+2021/08/01 | 4944 | systems/win32/miktex/tm/packages/macrolist__source.tar.lzma
+2021/08/01 | 487945 | macros/latex/contrib/elpres.zip
+2021/08/01 | 483653 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-2.9.tar.lzma
+2021/08/01 | 48252 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-x64-2.9.tar.lzma
+2021/08/01 | 47926 | systems/win32/miktex/tm/packages/pdfmanagement-testphase.tar.lzma
+2021/08/01 | 476917 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-2.9.tar.lzma
+2021/08/01 | 46907 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-x64-2.9.tar.lzma
+2021/08/01 | 461812 | systems/win32/miktex/tm/packages/next/miktex-doc.tar.lzma
+2021/08/01 | 45971 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-2.9.tar.lzma
+2021/08/01 | 45906 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-2.9.tar.lzma
+2021/08/01 | 45310 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-x64-2.9.tar.lzma
+2021/08/01 | 44760 | graphics/mcf2graph/mcf_man_soc.mf
+2021/08/01 | 4369 | systems/win32/miktex/tm/packages/palette__source.tar.lzma
+2021/08/01 | 43424 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-x64-2.9.tar.lzma
+2021/08/01 | 43027 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-2.9.tar.lzma
+2021/08/01 | 43003 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-x64-2.9.tar.lzma
+2021/08/01 | 42892 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-2.9.tar.lzma
+2021/08/01 | 42712 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-x64-2.9.tar.lzma
+2021/08/01 | 42386 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-2.9.tar.lzma
+2021/08/01 | 41194 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-2.9.tar.lzma
+2021/08/01 | 410 | macros/latex/contrib/scrambledenvs/README.md
+2021/08/01 | 40230 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin-x64.tar.lzma
+2021/08/01 | 392791 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-x64-2.9.tar.lzma
+2021/08/01 | 3917 | systems/win32/miktex/tm/packages/pgf-pie.tar.lzma
+2021/08/01 | 39129 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-2.9.tar.lzma
+2021/08/01 | 388 | macros/generic/chemfig/chemfig.sty
+2021/08/01 | 38141 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-2.9.tar.lzma
+2021/08/01 | 381018 | graphics/mcf2graph/mcf_manual.pdf
+2021/08/01 | 3785 | systems/win32/miktex/tm/packages/einfart.tar.lzma
+2021/08/01 | 37805 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-2.9.tar.lzma
+2021/08/01 | 3759 | systems/win32/miktex/tm/packages/simplivre.tar.lzma
+2021/08/01 | 37359 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin-x64.tar.lzma
+2021/08/01 | 37239 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-x64-2.9.tar.lzma
+2021/08/01 | 36630 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-x64-2.9.tar.lzma
+2021/08/01 | 3618 | systems/win32/miktex/tm/packages/lebhart.tar.lzma
+2021/08/01 | 3604 | systems/win32/miktex/tm/packages/beaulivre.tar.lzma
+2021/08/01 | 35693 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin.tar.lzma
+2021/08/01 | 35226 | systems/win32/miktex/tm/packages/projlib__source.tar.lzma
+2021/08/01 | 35086 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-x64-2.9.tar.lzma
+2021/08/01 | 34664 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-x64-2.9.tar.lzma
+2021/08/01 | 345739 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-x64-2.9.tar.lzma
+2021/08/01 | 3383 | systems/win32/miktex/tm/packages/spbmark__source.tar.lzma
+2021/08/01 | 33632 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-x64-2.9.tar.lzma
+2021/08/01 | 33545 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin.tar.lzma
+2021/08/01 | 330916 | systems/win32/miktex/tm/packages/vhistory__doc.tar.lzma
+2021/08/01 | 330788 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-2.9.tar.lzma
+2021/08/01 | 32675 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-2.9.tar.lzma
+2021/08/01 | 325044 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-x64-2.9.tar.lzma
+2021/08/01 | 31620 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-x64-2.9.tar.lzma
+2021/08/01 | 31537 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-2.9.tar.lzma
+2021/08/01 | 31351 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-x64-2.9.tar.lzma
+2021/08/01 | 31230 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-2.9.tar.lzma
+2021/08/01 | 312108 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-2.9.tar.lzma
+2021/08/01 | 309948 | graphics/mcf2graph/mcf_example.pdf
+2021/08/01 | 30824 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-x64-2.9.tar.lzma
+2021/08/01 | 3031 | systems/win32/miktex/tm/packages/pgf-pie__source.tar.lzma
+2021/08/01 | 302186 | systems/win32/miktex/tm/packages/exam-randomizechoices__doc.tar.lzma
+2021/08/01 | 30059 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-x64-2.9.tar.lzma
+2021/08/01 | 3003 | graphics/mcf2graph/mcf_exa_soc.mf
+2021/08/01 | 29842 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-2.9.tar.lzma
+2021/08/01 | 295205 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-x64-2.9.tar.lzma
+2021/08/01 | 29039 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-2.9.tar.lzma
+2021/08/01 | 284580 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-2.9.tar.lzma
+2021/08/01 | 284026 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-x64-2.9.tar.lzma
+2021/08/01 | 28390 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-2.9.tar.lzma
+2021/08/01 | 28180 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-x64-2.9.tar.lzma
+2021/08/01 | 27 | macros/latex/contrib/iexec/DEPENDS.txt
+2021/08/01 | 2796726 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-x64-2.9.tar.lzma
+2021/08/01 | 2778 | macros/latex/contrib/iexec/iexec.tex
+2021/08/01 | 27728 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-2.9.tar.lzma
+2021/08/01 | 27390 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-x64-2.9.tar.lzma
+2021/08/01 | 27358 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-2.9.tar.lzma
+2021/08/01 | 27199 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-2.9.tar.lzma
+2021/08/01 | 2676 | systems/win32/miktex/tm/packages/spbmark.tar.lzma
+2021/08/01 | 2672609 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-2.9.tar.lzma
+2021/08/01 | 263959 | systems/win32/miktex/tm/packages/next/miktex-console-bin-x64-2.9.tar.lzma
+2021/08/01 | 2619 | systems/win32/miktex/tm/packages/hvlogos.tar.lzma
+2021/08/01 | 258882 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-2.9.tar.lzma
+2021/08/01 | 2558 | macros/latex/contrib/elpres/tex/elpreswhitetealscheme.sty
+2021/08/01 | 2557 | macros/latex/contrib/elpres/tex/elpreswhitebluescheme.sty
+2021/08/01 | 2556 | systems/win32/miktex/tm/packages/macrolist.tar.lzma
+2021/08/01 | 2537 | macros/latex/contrib/elpres/tex/elpreswhiteredscheme.sty
+2021/08/01 | 25291 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-2.9.tar.lzma
+2021/08/01 | 2524 | macros/latex/contrib/elpres/README.md
+2021/08/01 | 2511 | macros/latex/contrib/elpres/tex/elpresbluelightgrayscheme.sty
+2021/08/01 | 250266 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-2.9.tar.lzma
+2021/08/01 | 25020 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-2.9.tar.lzma
+2021/08/01 | 24995 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-x64-2.9.tar.lzma
+2021/08/01 | 2474 | macros/latex/contrib/elpres/tex/elpresgrayscheme.sty
+2021/08/01 | 243426 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-x64-2.9.tar.lzma
+2021/08/01 | 241810 | systems/win32/miktex/tm/packages/next/miktex-console-bin-2.9.tar.lzma
+2021/08/01 | 23902 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-x64-2.9.tar.lzma
+2021/08/01 | 2381770 | macros/generic/chemfig.zip
+2021/08/01 | 23364 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-x64-2.9.tar.lzma
+2021/08/01 | 232350 | systems/win32/miktex/tm/packages/next/miktex-zzdb1-2.9.tar.lzma
+2021/08/01 | 232330 | systems/win32/miktex/tm/packages/miktex-zzdb1-2.9.tar.lzma
+2021/08/01 | 2317 | graphics/mcf2graph/mcf_example.tex
+2021/08/01 | 22049 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-2.9.tar.lzma
+2021/08/01 | 219007 | systems/win32/miktex/tm/packages/pgf-pie__doc.tar.lzma
+2021/08/01 | 215250 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-x64-2.9.tar.lzma
+2021/08/01 | 21225 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-2.9.tar.lzma
+2021/08/01 | 208553 | macros/latex/contrib/tabularray/tabularray.sty
+2021/08/01 | 208049 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-2.9.tar.lzma
+2021/08/01 | 206605 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-x64-2.9.tar.lzma
+2021/08/01 | 2046 | systems/win32/miktex/tm/packages/palette.tar.lzma
+2021/08/01 | 202796 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-x64-2.9.tar.lzma
+2021/08/01 | 20137 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-2.9.tar.lzma
+2021/08/01 | 2009907 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-x64-2.9.tar.lzma
+2021/08/01 | 199733 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-2.9.tar.lzma
+2021/08/01 | 199400 | macros/generic/chemfig/chemfig-fr.tex
+2021/08/01 | 198171 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-2.9.tar.lzma
+2021/08/01 | 196873 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-2.9.tar.lzma
+2021/08/01 | 196740 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-x64-2.9.tar.lzma
+2021/08/01 | 195634 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-x64-2.9.tar.lzma
+2021/08/01 | 194384 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-2.9.tar.lzma
+2021/08/01 | 1937 | systems/win32/miktex/tm/packages/hvlogos__source.tar.lzma
+2021/08/01 | 191739 | macros/latex/contrib/scrambledenvs/scrambledenvs.pdf
+2021/08/01 | 191252 | systems/win32/miktex/tm/packages/macrolist__doc.tar.lzma
+2021/08/01 | 190053 | macros/latex/contrib/scrambledenvs.zip
+2021/08/01 | 18616 | systems/win32/miktex/tm/packages/einfart__source.tar.lzma
+2021/08/01 | 185112 | macros/generic/chemfig/chemfig-en.tex
+2021/08/01 | 183875 | graphics/mcf2graph/mcf_mplib_exa.pdf
+2021/08/01 | 18176 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-x64-2.9.tar.lzma
+2021/08/01 | 18160 | systems/win32/miktex/tm/packages/simplivre__source.tar.lzma
+2021/08/01 | 18115 | macros/latex/contrib/scrambledenvs/scrambledenvs.dtx
+2021/08/01 | 180372 | systems/win32/miktex/tm/packages/palette__doc.tar.lzma
+2021/08/01 | 180120 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-x64-2.9.tar.lzma
+2021/08/01 | 180012 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-2.9.tar.lzma
+2021/08/01 | 17981 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-x64-2.9.tar.lzma
+2021/08/01 | 178355 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-2.9.tar.lzma
+2021/08/01 | 17639 | systems/win32/miktex/tm/packages/vhistory__source.tar.lzma
+2021/08/01 | 1739 | macros/latex/contrib/iexec/iexec.sty
+2021/08/01 | 17344 | systems/win32/miktex/tm/packages/lebhart__source.tar.lzma
+2021/08/01 | 1713894 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-2.9.tar.lzma
+2021/08/01 | 169242 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-x64-2.9.tar.lzma
+2021/08/01 | 16870 | systems/win32/miktex/tm/packages/beaulivre__source.tar.lzma
+2021/08/01 | 16413 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-2.9.tar.lzma
+2021/08/01 | 16357 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-2.9.tar.lzma
+2021/08/01 | 159579 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-x64-2.9.tar.lzma
+2021/08/01 | 157784 | macros/latex/contrib/elpres/doc/elpres-example.pdf
+2021/08/01 | 155411 | macros/latex/contrib/elpres/doc/elpres-manual.pdf
+2021/08/01 | 154806 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-2.9.tar.lzma
+2021/08/01 | 154427 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-x64-2.9.tar.lzma
+2021/08/01 | 147373 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-2.9.tar.lzma
+2021/08/01 | 1464203 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-x64-2.9.tar.lzma
+2021/08/01 | 14348 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-x64-2.9.tar.lzma
+2021/08/01 | 1421868 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-x64-2.9.tar.lzma
+2021/08/01 | 136820 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-x64-2.9.tar.lzma
+2021/08/01 | 136816 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-2.9.tar.lzma
+2021/08/01 | 13671 | systems/win32/miktex/tm/packages/exam-randomizechoices__source.tar.lzma
+2021/08/01 | 13465 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-2.9.tar.lzma
+2021/08/01 | 1340930 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-2.9.tar.lzma
+2021/08/01 | 133866 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-x64-2.9.tar.lzma
+2021/08/01 | 1322204 | systems/win32/miktex/tm/packages/miktex-zzdb2-2.9.tar.lzma
+2021/08/01 | 1321429 | systems/win32/miktex/tm/packages/next/miktex-zzdb2-2.9.tar.lzma
+2021/08/01 | 1301192 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-x64-2.9.tar.lzma
+2021/08/01 | 1291299 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-2.9.tar.lzma
+2021/08/01 | 1264 | macros/latex/contrib/iexec/README.md
+2021/08/01 | 124282 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-2.9.tar.lzma
+2021/08/01 | 12377 | systems/win32/miktex/tm/packages/projlib.tar.lzma
+2021/08/01 | 1229129 | systems/win32/miktex/tm/packages/next/miktex-zzdb3-2.9.tar.lzma
+2021/08/01 | 1228090 | systems/win32/miktex/tm/packages/miktex-zzdb3-2.9.tar.lzma
+2021/08/01 | 121654 | systems/win32/miktex/tm/packages/pdfmanagement-testphase__source.tar.lzma
+2021/08/01 | 119822 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-2.9.tar.lzma
+2021/08/01 | 118354 | macros/generic/chemfig/chemfig.tex
+2021/08/01 | 1169717 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-2.9.tar.lzma
+2021/08/01 | 1153 | systems/win32/miktex/tm/packages/next/pr.ini
+2021/08/01 | 115351 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-x64-2.9.tar.lzma
+2021/08/01 | 1152787 | macros/generic/chemfig/chemfig-fr.pdf
+2021/08/01 | 114861 | systems/win32/miktex/tm/packages/latexindent__source.tar.lzma
+2021/08/01 | 112984 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-x64-2.9.tar.lzma
+2021/08/01 | 1125 | macros/generic/chemfig/README
+2021/08/01 | 1123098 | macros/generic/chemfig/chemfig-en.pdf
+2021/08/01 | 112086 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-x64-2.9.tar.lzma
+2021/08/01 | 111353 | macros/latex/contrib/iexec.zip
+2021/08/01 | 109031 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-x64-2.9.tar.lzma
+2021/08/01 | 107917 | macros/latex/contrib/iexec/iexec.pdf
+2021/08/01 | 1077990 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-x64-2.9.tar.lzma
+2021/08/01 | 105220 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-x64-2.9.tar.lzma
+2021/08/01 | 103400 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-x64-2.9.tar.lzma
+2021/08/01 | 103203 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-x64-2.9.tar.lzma
+2021/08/01 | 102551 | systems/win32/miktex/tm/packages/minimalist__doc.tar.lzma
+2021/08/01 | 100625 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-2.9.tar.lzma
+2021/08/01 | 100025 | systems/win32/miktex/tm/packages/colorist__doc.tar.lzma
2021/07/31 | 9803909 | support/latexindent/latexindent.exe
-2021/07/31 | 975018 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-2.9.tar.lzma
-2021/07/31 | 97339 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-2.9.tar.lzma
-2021/07/31 | 96633 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-2.9.tar.lzma
2021/07/31 | 9541 | support/latexindent/LatexIndent/IfElseFi.pm
-2021/07/31 | 95402 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-x64-2.9.tar.lzma
2021/07/31 | 949988 | support/latexindent/documentation/latexindent.pdf
2021/07/31 | 948089 | macros/latex/contrib/pdfmanagement-testphase/hyperref-generic.pdf
-2021/07/31 | 94798 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-2.9.tar.lzma
-2021/07/31 | 94310 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-2.9.tar.lzma
-2021/07/31 | 894 | systems/win32/miktex/tm/packages/pr.ini
2021/07/31 | 88494 | macros/latex/contrib/exam-randomizechoices/exam-randomizechoices.pdf
-2021/07/31 | 87777 | systems/win32/miktex/tm/packages/next/miktex-png-bin-x64-2.9.tar.lzma
-2021/07/31 | 8768 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-x64-2.9.tar.lzma
-2021/07/31 | 83540 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-2.9.tar.lzma
2021/07/31 | 833 | support/latexindent/LatexIndent/Version.pm
-2021/07/31 | 815242 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-x64-2.9.tar.lzma
-2021/07/31 | 80451 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-x64-2.9.tar.lzma
2021/07/31 | 7969 | support/latexindent/documentation/sec-introduction.tex
2021/07/31 | 7881 | support/latexindent/LatexIndent/LogFile.pm
-2021/07/31 | 78774 | systems/win32/miktex/tm/packages/next/miktex-png-bin-2.9.tar.lzma
2021/07/31 | 783736 | info/install-latex-guide-zh-cn.zip
-2021/07/31 | 77952 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-x64-2.9.tar.lzma
2021/07/31 | 77401 | macros/latex/contrib/hvlogos.zip
2021/07/31 | 7728 | macros/latex/contrib/pdfmanagement-testphase/color-ltx.sty
-2021/07/31 | 7722 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-2.9.tar.lzma
-2021/07/31 | 76825 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-x64-2.9.tar.lzma
-2021/07/31 | 75793 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-x64-2.9.tar.lzma
-2021/07/31 | 744117 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-2.9.tar.lzma
-2021/07/31 | 74210 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-x64-2.9.tar.lzma
2021/07/31 | 739256 | macros/latex/contrib/pdfmanagement-testphase/l3pdffield.pdf
-2021/07/31 | 73196 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-2.9.tar.lzma
-2021/07/31 | 73148 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-x64-2.9.tar.lzma
2021/07/31 | 7234 | support/latexindent/documentation/subsubsec-no-add-remaining-code-blocks.tex
-2021/07/31 | 72207 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-x64-2.9.tar.lzma
-2021/07/31 | 71668 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-2.9.tar.lzma
2021/07/31 | 7161 | support/latexindent/documentation/figure-schematic.png
-2021/07/31 | 70646 | systems/win32/miktex/tm/packages/next/miktex-web-bin-x64-2.9.tar.lzma
-2021/07/31 | 69914 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-x64-2.9.tar.lzma
2021/07/31 | 68758 | support/latexindent/documentation/sec-default-user-local.tex
-2021/07/31 | 681252 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-x64-2.9.tar.lzma
-2021/07/31 | 68024 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-x64-2.9.tar.lzma
2021/07/31 | 6793 | support/latexindent/LatexIndent/MandatoryArgument.pm
-2021/07/31 | 67821 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-2.9.tar.lzma
2021/07/31 | 67782 | macros/latex/contrib/pdfmanagement-testphase/l3pdffield.dtx
-2021/07/31 | 67619 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-2.9.tar.lzma
-2021/07/31 | 67484 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-2.9.tar.lzma
2021/07/31 | 673135 | macros/latex/contrib/pdfmanagement-testphase/l3pdfmanagement.pdf
2021/07/31 | 663896 | macros/latex/contrib/pdfmanagement-testphase/l3pdfmeta.pdf
2021/07/31 | 66280 | support/latexindent/documentation/subsec-poly-switches.tex
2021/07/31 | 6589 | support/latexindent/LatexIndent/FileExtension.pm
-2021/07/31 | 65787 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-x64-2.9.tar.lzma
-2021/07/31 | 65618 | systems/win32/miktex/tm/packages/next/miktex-web-bin-2.9.tar.lzma
2021/07/31 | 6549 | macros/latex/contrib/pdfmanagement-testphase/l3pdfxform.dtx
-2021/07/31 | 64426 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-2.9.tar.lzma
-2021/07/31 | 64184 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-2.9.tar.lzma
2021/07/31 | 6408 | support/latexindent/LatexIndent/Item.pm
2021/07/31 | 6385 | support/latexindent/LatexIndent/TrailingComments.pm
-2021/07/31 | 63777 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-2.9.tar.lzma
2021/07/31 | 6335 | support/latexindent/LatexIndent/Environment.pm
2021/07/31 | 63320 | macros/latex/contrib/pdfmanagement-testphase/l3pdfmanagement.dtx
-2021/07/31 | 629399 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-2.9.tar.lzma
-2021/07/31 | 62786 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-x64-2.9.tar.lzma
-2021/07/31 | 624655 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-x64-2.9.tar.lzma
-2021/07/31 | 62229 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-x64-2.9.tar.lzma
-2021/07/31 | 61812 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-x64-2.9.tar.lzma
2021/07/31 | 61612 | support/latexindent/LatexIndent/AlignmentAtAmpersand.pm
-2021/07/31 | 60638 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-2.9.tar.lzma
2021/07/31 | 6062 | support/latexindent/LatexIndent/OptionalArgument.pm
2021/07/31 | 6042 | support/latexindent/LatexIndent/BackUpFileProcedure.pm
-2021/07/31 | 60039 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-x64.tar.lzma
2021/07/31 | 5992676 | support/latexindent.zip
2021/07/31 | 5979 | support/latexindent/documentation/subsubsec-commands-with-arguments.tex
2021/07/31 | 5969 | support/latexindent/LatexIndent/Else.pm
-2021/07/31 | 596929 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-x64-2.9.tar.lzma
-2021/07/31 | 593220 | systems/win32/miktex/tm/packages/next/files.csv.lzma
-2021/07/31 | 592787 | systems/win32/miktex/tm/packages/files.csv.lzma
2021/07/31 | 591169 | macros/latex/contrib/pdfmanagement-testphase/l3backend-testphase.pdf
-2021/07/31 | 589843 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-2.9.tar.lzma
2021/07/31 | 580 | macros/latex/contrib/pdfmanagement-testphase/transparent-ltx.sty
2021/07/31 | 5777 | support/latexindent/LatexIndent/UnNamedGroupingBracesBrackets.pm
2021/07/31 | 577331 | macros/latex/contrib/pdfmanagement-testphase/l3pdfannot.pdf
-2021/07/31 | 57727 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-x64-2.9.tar.lzma
2021/07/31 | 576314 | macros/latex/contrib/pdfmanagement-testphase/l3pdffield-radiobutton.pdf
-2021/07/31 | 57549 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-x64-2.9.tar.lzma
2021/07/31 | 5736 | support/latexindent/documentation/subsec-combine-text-wrap-para-line-breaks.tex
-2021/07/31 | 57139 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin-x64.tar.lzma
-2021/07/31 | 57012 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-2.9.tar.lzma
-2021/07/31 | 56684 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-x64-2.9.tar.lzma
-2021/07/31 | 566528 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-x64-2.9.tar.lzma
-2021/07/31 | 56514 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin.tar.lzma
-2021/07/31 | 56477 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-x64-2.9.tar.lzma
-2021/07/31 | 56355 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-2.9.tar.lzma
-2021/07/31 | 56318 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-2.9.tar.lzma
2021/07/31 | 55632 | macros/latex/contrib/pdfmanagement-testphase/l3backend-testphase.dtx
-2021/07/31 | 55496 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin.tar.lzma
2021/07/31 | 553330 | macros/latex/contrib/pdfmanagement-testphase/l3pdffile.pdf
2021/07/31 | 547881 | macros/latex/contrib/pdfmanagement-testphase/l3pdffield-action.pdf
-2021/07/31 | 54633 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-2.9.tar.lzma
2021/07/31 | 536935 | macros/latex/contrib/pdfmanagement-testphase/ltdocinit.pdf
2021/07/31 | 534125 | macros/latex/contrib/pdfmanagement-testphase/l3pdffield-choice.pdf
-2021/07/31 | 531849 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-2.9.tar.lzma
2021/07/31 | 5312 | support/latexindent/LatexIndent/KeyEqualsValuesBraces.pm
2021/07/31 | 530911 | macros/latex/contrib/pdfmanagement-testphase/l3pdffield-checkbox.pdf
2021/07/31 | 5286 | support/latexindent/documentation/subsubsec-headings.tex
2021/07/31 | 52738 | support/latexindent/LatexIndent/GetYamlSettings.pm
2021/07/31 | 527111 | macros/latex/contrib/pdfmanagement-testphase/l3pdfdict.pdf
2021/07/31 | 526311 | macros/latex/contrib/pdfmanagement-testphase/l3pdffield-pushbutton.pdf
-2021/07/31 | 52523 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-x64-2.9.tar.lzma
2021/07/31 | 518296 | macros/latex/contrib/pdfmanagement-testphase/l3pdftools.pdf
-2021/07/31 | 51751 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-x64-2.9.tar.lzma
-2021/07/31 | 51308 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-2.9.tar.lzma
-2021/07/31 | 51201 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-x64-2.9.tar.lzma
-2021/07/31 | 51113 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-2.9.tar.lzma
-2021/07/31 | 510587 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-x64-2.9.tar.lzma
2021/07/31 | 505534 | macros/latex/contrib/pdfmanagement-testphase/l3pdffield-textfield.pdf
-2021/07/31 | 50394 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-2.9.tar.lzma
-2021/07/31 | 50152 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-2.9.tar.lzma
2021/07/31 | 492 | support/latexindent/documentation/cmhlistings.tex
2021/07/31 | 4873 | support/latexindent/documentation/subsubsec-ifelsefi.tex
-2021/07/31 | 483653 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-2.9.tar.lzma
-2021/07/31 | 48252 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-x64-2.9.tar.lzma
2021/07/31 | 4798 | support/latexindent/LatexIndent/BlankLines.pm
-2021/07/31 | 476922 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-2.9.tar.lzma
2021/07/31 | 47023 | macros/latex/contrib/exam-randomizechoices/exam-randomizechoices-doc.tex
-2021/07/31 | 46907 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-x64-2.9.tar.lzma
2021/07/31 | 4685 | info/install-latex-guide-zh-cn/appendix/updateinfo.tex
-2021/07/31 | 461813 | systems/win32/miktex/tm/packages/next/miktex-doc.tar.lzma
2021/07/31 | 4617 | macros/latex/contrib/pdfmanagement-testphase/xcolor-patches-tmp-ltx.sty
-2021/07/31 | 45969 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-2.9.tar.lzma
-2021/07/31 | 45905 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-2.9.tar.lzma
2021/07/31 | 4570 | macros/latex/contrib/pdfmanagement-testphase/CHANGELOG.md
-2021/07/31 | 45311 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-x64-2.9.tar.lzma
+2021/07/31 | 4485 | graphics/mcf2graph/README
2021/07/31 | 446355 | macros/latex/contrib/pdfmanagement-testphase/pdfmanagement-testphase.pdf
2021/07/31 | 44096 | support/latexindent/documentation/logo.png
2021/07/31 | 4355 | support/latexindent/LatexIndent/RoundBrackets.pm
-2021/07/31 | 43423 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-x64-2.9.tar.lzma
-2021/07/31 | 43028 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-2.9.tar.lzma
-2021/07/31 | 43003 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-x64-2.9.tar.lzma
-2021/07/31 | 42892 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-2.9.tar.lzma
2021/07/31 | 4284 | support/latexindent/LatexIndent/NamedGroupingBracesBrackets.pm
-2021/07/31 | 42712 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-x64-2.9.tar.lzma
-2021/07/31 | 42386 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-2.9.tar.lzma
2021/07/31 | 421483 | macros/latex/contrib/pdfmanagement-testphase/pdfmanagement-firstaid.pdf
2021/07/31 | 4212 | macros/latex/contrib/pdfmanagement-testphase/hyperxmp-patches-tmp-ltx.sty
2021/07/31 | 418329 | macros/latex/contrib/pdfmanagement-testphase/l3pdfxform.pdf
-2021/07/31 | 41194 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-2.9.tar.lzma
-2021/07/31 | 40229 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin-x64.tar.lzma
-2021/07/31 | 392793 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-x64-2.9.tar.lzma
-2021/07/31 | 39127 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-2.9.tar.lzma
2021/07/31 | 3850 | support/latexindent/documentation/subsubsec-special.tex
-2021/07/31 | 38141 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-2.9.tar.lzma
-2021/07/31 | 37805 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-2.9.tar.lzma
-2021/07/31 | 37357 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin-x64.tar.lzma
-2021/07/31 | 37239 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-x64-2.9.tar.lzma
-2021/07/31 | 36629 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-x64-2.9.tar.lzma
2021/07/31 | 3618 | support/latexindent/LatexIndent/Replacement.pm
-2021/07/31 | 35691 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin.tar.lzma
2021/07/31 | 3542 | macros/latex/contrib/exam-randomizechoices/README.md
-2021/07/31 | 35087 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-x64-2.9.tar.lzma
-2021/07/31 | 34666 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-x64-2.9.tar.lzma
2021/07/31 | 3463 | support/latexindent/LatexIndent/Preamble.pm
-2021/07/31 | 345738 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-x64-2.9.tar.lzma
2021/07/31 | 3450 | support/latexindent/documentation/subsubsec-environments-with-items.tex
2021/07/31 | 3394 | support/latexindent/LatexIndent/HorizontalWhiteSpace.pm
-2021/07/31 | 33632 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-x64-2.9.tar.lzma
-2021/07/31 | 33544 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin.tar.lzma
-2021/07/31 | 330787 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-2.9.tar.lzma
2021/07/31 | 3273 | support/latexindent/LatexIndent/Tokens.pm
-2021/07/31 | 32674 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-2.9.tar.lzma
-2021/07/31 | 325043 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-x64-2.9.tar.lzma
2021/07/31 | 320254 | macros/latex/contrib/exam-randomizechoices.zip
-2021/07/31 | 31620 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-x64-2.9.tar.lzma
-2021/07/31 | 31540 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-2.9.tar.lzma
-2021/07/31 | 31352 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-x64-2.9.tar.lzma
-2021/07/31 | 31231 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-2.9.tar.lzma
-2021/07/31 | 312106 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-2.9.tar.lzma
-2021/07/31 | 30823 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-x64-2.9.tar.lzma
2021/07/31 | 3075 | support/latexindent/documentation/sec-the-m-switch.tex
2021/07/31 | 30568 | macros/latex/contrib/pdfmanagement-testphase/l3pdfmeta.dtx
-2021/07/31 | 30058 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-x64-2.9.tar.lzma
-2021/07/31 | 29840 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-2.9.tar.lzma
-2021/07/31 | 295204 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-x64-2.9.tar.lzma
-2021/07/31 | 29035 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-2.9.tar.lzma
-2021/07/31 | 284581 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-2.9.tar.lzma
-2021/07/31 | 284025 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-x64-2.9.tar.lzma
-2021/07/31 | 28389 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-2.9.tar.lzma
-2021/07/31 | 28180 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-x64-2.9.tar.lzma
2021/07/31 | 28041 | macros/latex/contrib/pdfmanagement-testphase/l3pdffile.dtx
-2021/07/31 | 2796724 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-x64-2.9.tar.lzma
2021/07/31 | 27837 | macros/latex/contrib/pdfmanagement-testphase/l3pdfannot.dtx
-2021/07/31 | 27727 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-2.9.tar.lzma
2021/07/31 | 27438 | macros/latex/contrib/pdfmanagement-testphase/l3pdffield-radiobutton.dtx
-2021/07/31 | 27390 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-x64-2.9.tar.lzma
-2021/07/31 | 27358 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-2.9.tar.lzma
-2021/07/31 | 27199 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-2.9.tar.lzma
-2021/07/31 | 2672608 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-2.9.tar.lzma
2021/07/31 | 26672 | macros/latex/contrib/pdfmanagement-testphase/l3pdffield-action.dtx
2021/07/31 | 26662 | macros/latex/contrib/pdfmanagement-testphase/l3pdffield-pushbutton.dtx
2021/07/31 | 2645 | support/latexindent/latexindent.pl
-2021/07/31 | 263957 | systems/win32/miktex/tm/packages/next/miktex-console-bin-x64-2.9.tar.lzma
-2021/07/31 | 258881 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-2.9.tar.lzma
2021/07/31 | 25321 | macros/latex/contrib/exam-randomizechoices/exam-randomizechoices.tex
-2021/07/31 | 25291 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-2.9.tar.lzma
-2021/07/31 | 250266 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-2.9.tar.lzma
-2021/07/31 | 25021 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-2.9.tar.lzma
-2021/07/31 | 24996 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-x64-2.9.tar.lzma
2021/07/31 | 246 | support/latexindent/documentation/references.tex
-2021/07/31 | 243426 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-x64-2.9.tar.lzma
-2021/07/31 | 241811 | systems/win32/miktex/tm/packages/next/miktex-console-bin-2.9.tar.lzma
2021/07/31 | 23932 | support/latexindent/documentation/latexindent.tex
-2021/07/31 | 23903 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-x64-2.9.tar.lzma
2021/07/31 | 23600 | support/latexindent/LatexIndent/Arguments.pm
-2021/07/31 | 23365 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-x64-2.9.tar.lzma
-2021/07/31 | 231912 | systems/win32/miktex/tm/packages/next/miktex-zzdb1-2.9.tar.lzma
-2021/07/31 | 231888 | systems/win32/miktex/tm/packages/miktex-zzdb1-2.9.tar.lzma
2021/07/31 | 22938 | support/latexindent/LatexIndent/ModifyLineBreaks.pm
2021/07/31 | 22875 | macros/latex/contrib/exam-randomizechoices/exam-randomizechoices.sty
2021/07/31 | 22855 | support/latexindent/LatexIndent/Verbatim.pm
2021/07/31 | 2212 | support/latexindent/LatexIndent/Logger.pm
2021/07/31 | 22113 | macros/latex/contrib/pdfmanagement-testphase/l3pdffield-textfield.dtx
2021/07/31 | 22107 | support/latexindent/documentation/subsec-one-sentence-per-line.tex
-2021/07/31 | 22050 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-2.9.tar.lzma
2021/07/31 | 217081 | macros/latex/contrib/exam-randomizechoices/exam-randomizechoices-doc.pdf
2021/07/31 | 21650 | support/latexindent/documentation/sec-replacements.tex
-2021/07/31 | 215249 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-x64-2.9.tar.lzma
-2021/07/31 | 21225 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-2.9.tar.lzma
2021/07/31 | 21217 | support/latexindent/LatexIndent/Document.pm
2021/07/31 | 2120 | support/latexindent/documentation/sec-demonstration.tex
2021/07/31 | 20834 | info/install-latex-guide-zh-cn/chapter/windows.tex
-2021/07/31 | 208048 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-2.9.tar.lzma
-2021/07/31 | 206604 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-x64-2.9.tar.lzma
2021/07/31 | 20575 | support/latexindent/LatexIndent/Indent.pm
2021/07/31 | 20556 | macros/latex/contrib/pdfmanagement-testphase/l3pdffield-choice.dtx
-2021/07/31 | 202797 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-x64-2.9.tar.lzma
-2021/07/31 | 20137 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-2.9.tar.lzma
-2021/07/31 | 2009905 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-x64-2.9.tar.lzma
-2021/07/31 | 199733 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-2.9.tar.lzma
2021/07/31 | 1992 | support/latexindent/LatexIndent/Switches.pm
2021/07/31 | 19864 | support/latexindent/LatexIndent/Sentence.pm
-2021/07/31 | 198170 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-2.9.tar.lzma
-2021/07/31 | 196872 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-2.9.tar.lzma
-2021/07/31 | 196741 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-x64-2.9.tar.lzma
-2021/07/31 | 195636 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-x64-2.9.tar.lzma
-2021/07/31 | 194382 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-2.9.tar.lzma
2021/07/31 | 194141 | macros/latex/contrib/macrolist.zip
2021/07/31 | 194057 | macros/latex/contrib/macrolist/macrolist.pdf
2021/07/31 | 1909 | support/latexindent/documentation/subsec-noAdditionalIndent-indentRules.tex
@@ -256,75 +392,38 @@
2021/07/31 | 1874 | support/latexindent/README
2021/07/31 | 18289 | macros/latex/contrib/pdfmanagement-testphase/l3pdffield-checkbox.dtx
2021/07/31 | 1822 | macros/latex/contrib/pdfmanagement-testphase/pdflscape-ltx.sty
-2021/07/31 | 18177 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-x64-2.9.tar.lzma
2021/07/31 | 18082 | support/latexindent/documentation/subsec-text-wrap.tex
-2021/07/31 | 180121 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-x64-2.9.tar.lzma
-2021/07/31 | 180011 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-2.9.tar.lzma
-2021/07/31 | 17980 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-x64-2.9.tar.lzma
-2021/07/31 | 178354 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-2.9.tar.lzma
2021/07/31 | 17807 | macros/latex/contrib/pdfmanagement-testphase/pdfmanagement-testphase.dtx
2021/07/31 | 17429 | macros/latex/contrib/pdfmanagement-testphase/l3pdfdict.dtx
2021/07/31 | 173067 | macros/latex/contrib/pdfmanagement-testphase/hyperref-generic.dtx
-2021/07/31 | 1713892 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-2.9.tar.lzma
-2021/07/31 | 169242 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-x64-2.9.tar.lzma
2021/07/31 | 1688 | support/latexindent/documentation/sec-conclusions-know-limitations.tex
2021/07/31 | 16703 | support/latexindent/documentation/subsubsec-environments-and-their-arguments.tex
2021/07/31 | 1664 | support/latexindent/documentation/logo.tex
-2021/07/31 | 16413 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-2.9.tar.lzma
-2021/07/31 | 16356 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-2.9.tar.lzma
-2021/07/31 | 159579 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-x64-2.9.tar.lzma
+2021/07/31 | 16349 | graphics/mcf2graph/mcf_mplib_exa.tex
2021/07/31 | 15944 | macros/latex/contrib/pdfmanagement-testphase/ltdocinit.dtx
2021/07/31 | 15784 | macros/latex/contrib/pdfmanagement-testphase/l3pdftools.dtx
2021/07/31 | 15661 | macros/latex/contrib/macrolist/macrolist.dtx
2021/07/31 | 1558 | support/latexindent/latexindent-module-installer.pl
-2021/07/31 | 154803 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-2.9.tar.lzma
-2021/07/31 | 154426 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-x64-2.9.tar.lzma
+2021/07/31 | 15347 | graphics/mcf2graph/CHANGELOG
2021/07/31 | 1483 | support/latexindent/LatexIndent/DoubleBackSlash.pm
2021/07/31 | 1477 | support/latexindent/documentation/title.tex
-2021/07/31 | 147370 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-2.9.tar.lzma
-2021/07/31 | 1464203 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-x64-2.9.tar.lzma
2021/07/31 | 1442 | support/latexindent/documentation/subsec-text-wrap-summary.tex
-2021/07/31 | 14347 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-x64-2.9.tar.lzma
-2021/07/31 | 1421867 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-x64-2.9.tar.lzma
2021/07/31 | 14050 | support/latexindent/documentation/subsec-commands-and-their-options.tex
-2021/07/31 | 136822 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-x64-2.9.tar.lzma
-2021/07/31 | 136817 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-2.9.tar.lzma
2021/07/31 | 13572 | support/latexindent/LatexIndent/Special.pm
-2021/07/31 | 13463 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-2.9.tar.lzma
-2021/07/31 | 1340931 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-2.9.tar.lzma
-2021/07/31 | 133866 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-x64-2.9.tar.lzma
-2021/07/31 | 1320701 | systems/win32/miktex/tm/packages/next/miktex-zzdb2-2.9.tar.lzma
-2021/07/31 | 1320637 | systems/win32/miktex/tm/packages/miktex-zzdb2-2.9.tar.lzma
2021/07/31 | 13109 | support/latexindent/documentation/appendices.tex
-2021/07/31 | 1301190 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-x64-2.9.tar.lzma
-2021/07/31 | 1291297 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-2.9.tar.lzma
2021/07/31 | 12661 | support/latexindent/LatexIndent/Braces.pm
-2021/07/31 | 124282 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-2.9.tar.lzma
2021/07/31 | 12302 | support/latexindent/LatexIndent/HiddenChildren.pm
-2021/07/31 | 1228758 | systems/win32/miktex/tm/packages/next/miktex-zzdb3-2.9.tar.lzma
-2021/07/31 | 1227675 | systems/win32/miktex/tm/packages/miktex-zzdb3-2.9.tar.lzma
2021/07/31 | 12024 | support/latexindent/documentation/sec-fine-tuning.tex
-2021/07/31 | 119819 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-2.9.tar.lzma
2021/07/31 | 1195 | macros/latex/contrib/pdfmanagement-testphase/README.md
2021/07/31 | 11823 | support/latexindent/LatexIndent/FileContents.pm
-2021/07/31 | 1169718 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-2.9.tar.lzma
2021/07/31 | 11600 | support/latexindent/documentation/subsec-remove-para-line-breaks.tex
-2021/07/31 | 1153 | systems/win32/miktex/tm/packages/next/pr.ini
-2021/07/31 | 115352 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-x64-2.9.tar.lzma
2021/07/31 | 1137 | macros/latex/contrib/macrolist/README.md
-2021/07/31 | 112983 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-x64-2.9.tar.lzma
-2021/07/31 | 112087 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-x64-2.9.tar.lzma
2021/07/31 | 11151 | macros/latex/contrib/pdfmanagement-testphase/pdfmanagement-firstaid.dtx
-2021/07/31 | 109031 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-x64-2.9.tar.lzma
2021/07/31 | 10859 | support/latexindent/documentation/sec-indent-config-and-settings.tex
2021/07/31 | 10806 | support/latexindent/LatexIndent/Heading.pm
-2021/07/31 | 1077990 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-x64-2.9.tar.lzma
+2021/07/31 | 107903 | graphics/mcf2graph/mcf2graph.mf
2021/07/31 | 10666138 | macros/latex/contrib/pdfmanagement-testphase.zip
-2021/07/31 | 105222 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-x64-2.9.tar.lzma
2021/07/31 | 10361 | support/latexindent/LatexIndent/Command.pm
-2021/07/31 | 103400 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-x64-2.9.tar.lzma
-2021/07/31 | 103203 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-x64-2.9.tar.lzma
-2021/07/31 | 100625 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-2.9.tar.lzma
2021/07/30 | 99 | graphics/pgf/contrib/pgf-pie/demo/legend.tex
2021/07/30 | 98659 | macros/latex/contrib/minimalist/minimalist-doc.pdf
2021/07/30 | 95143 | macros/latex/contrib/colorist/colorist-doc.pdf
@@ -345,9 +444,7 @@
2021/07/30 | 76 | graphics/pgf/contrib/pgf-pie/demo/square.tex
2021/07/30 | 76164 | macros/latex/contrib/hvlogos/doc/hvlogos-doc.pdf
2021/07/30 | 75 | graphics/pgf/contrib/pgf-pie/demo/polar.tex
-2021/07/30 | 75479 | macros/latex/contrib/easybook/easybook.dtx
2021/07/30 | 744096 | macros/unicodetex/latex/beaulivre.zip
-2021/07/30 | 73283 | macros/latex/contrib/easybook/easybook.tex
2021/07/30 | 69089 | macros/latex/contrib/spbmark.zip
2021/07/30 | 68 | graphics/pgf/contrib/pgf-pie/demo/first-pie.tex
2021/07/30 | 684863 | macros/unicodetex/latex/simplivre.zip
@@ -355,15 +452,12 @@
2021/07/30 | 67488 | systems/texlive/tlnet/archive/spbmark.doc.r60111.tar.xz
2021/07/30 | 65290 | macros/latex/contrib/spbmark/spbmark.pdf
2021/07/30 | 652777 | macros/unicodetex/latex/lebhart.zip
-2021/07/30 | 65246 | systems/win32/miktex/tm/packages/spbmark__doc.tar.lzma
2021/07/30 | 632 | macros/latex/contrib/palette/README.md
2021/07/30 | 609838 | macros/unicodetex/latex/einfart.zip
2021/07/30 | 596 | graphics/pgf/contrib/pgf-pie/RELEASE_NOTES.md
-2021/07/30 | 591528 | macros/latex/contrib/easybook.zip
2021/07/30 | 5855 | macros/latex/contrib/minimalist/minimart.cls
2021/07/30 | 5852 | macros/latex/contrib/minimalist/minimbook.cls
2021/07/30 | 55 | macros/latex/contrib/hvlogos/Changes
-2021/07/30 | 552330 | macros/latex/contrib/easybook/easybook.pdf
2021/07/30 | 5488 | macros/latex/contrib/colorist/colorart.cls
2021/07/30 | 5485 | macros/latex/contrib/colorist/colorbook.cls
2021/07/30 | 5250 | macros/latex/contrib/hvlogos/latex/hvlogos.sty
@@ -382,7 +476,6 @@
2021/07/30 | 3755903 | systems/win32/miktex/tm/packages/media9__doc.tar.lzma
2021/07/30 | 3724824 | systems/texlive/tlnet/archive/media9.doc.r60110.tar.xz
2021/07/30 | 3595 | systems/win32/miktex/tm/packages/tikztosvg__source.tar.lzma
-2021/07/30 | 3414 | systems/win32/miktex/tm/packages/spbmark__source.tar.lzma
2021/07/30 | 3373 | macros/latex/contrib/hvlogos/doc/hvlogos-doc.tex
2021/07/30 | 327163 | macros/unicodetex/latex/beaulivre/beaulivre-doc-cn.pdf
2021/07/30 | 325472 | macros/latex/contrib/projlib/ProjLib-doc-cn.pdf
@@ -394,7 +487,6 @@
2021/07/30 | 28033 | macros/latex/contrib/colorist/colorist-doc.tex
2021/07/30 | 27401 | macros/unicodetex/latex/simplivre/simplivre-doc-fr.tex
2021/07/30 | 27243 | macros/unicodetex/latex/lebhart/lebhart-doc-fr.tex
-2021/07/30 | 2676 | systems/win32/miktex/tm/packages/spbmark.tar.lzma
2021/07/30 | 26619 | macros/unicodetex/latex/einfart/einfart-doc-en.tex
2021/07/30 | 259625 | macros/unicodetex/latex/einfart/einfart-doc-cn.pdf
2021/07/30 | 25738 | macros/unicodetex/latex/beaulivre/beaulivre-doc-fr.tex
@@ -491,7 +583,6 @@
2021/07/29 | 5045 | systems/win32/miktex/tm/packages/lacheck__doc.tar.lzma
2021/07/29 | 447112 | systems/win32/miktex/tm/packages/logix__doc.tar.lzma
2021/07/29 | 44533 | language/japanese/jlreq/README-ja.md
-2021/07/29 | 4299 | systems/win32/miktex/tm/packages/palette__source.tar.lzma
2021/07/29 | 4218 | support/tikztosvg/tikztosvg
2021/07/29 | 382501 | systems/win32/miktex/tm/packages/logix.tar.lzma
2021/07/29 | 3776 | systems/texlive/tlnet/archive/palette.source.r60104.tar.xz
@@ -510,10 +601,8 @@
2021/07/29 | 237777 | systems/win32/miktex/tm/packages/moderncv__doc.tar.lzma
2021/07/29 | 23412 | language/japanese/jlreq/jlreq-helpers.sty
2021/07/29 | 2189256 | systems/texlive/tlnet/archive/logix.r60099.tar.xz
-2021/07/29 | 2036 | systems/win32/miktex/tm/packages/palette.tar.lzma
2021/07/29 | 193153 | support/tikztosvg.zip
2021/07/29 | 1887 | support/tikztosvg/man/man.adoc
-2021/07/29 | 178675 | systems/win32/miktex/tm/packages/palette__doc.tar.lzma
2021/07/29 | 17847 | systems/win32/miktex/tm/packages/lipsum__source.tar.lzma
2021/07/29 | 178100 | systems/texlive/tlnet/archive/palette.doc.r60104.tar.xz
2021/07/29 | 1760 | systems/texlive/tlnet/archive/palette.r60104.tar.xz
@@ -534,14 +623,12 @@
2021/07/29 | 105970 | systems/win32/miktex/tm/packages/siunitx__source.tar.lzma
2021/07/29 | 105848 | systems/texlive/tlnet/archive/siunitx.source.r60105.tar.xz
2021/07/29 | 10549 | systems/win32/miktex/tm/packages/moderncv__source.tar.lzma
-2021/07/28 | 98630 | systems/win32/miktex/tm/packages/colorist__doc.tar.lzma
2021/07/28 | 985 | macros/latex/contrib/moderncv/KNOWN_BUGS
2021/07/28 | 98064 | macros/latex/contrib/lipsum/lipsum-cs.txt
2021/07/28 | 9720 | macros/latex/contrib/moderncv/moderncvheadii.sty
2021/07/28 | 9617 | macros/latex/contrib/vhistory/doc/de_vhistory.tex
2021/07/28 | 9604 | systems/texlive/tlnet/archive/colorist.r60090.tar.xz
2021/07/28 | 955616 | systems/texlive/tlnet/archive/pfdicons.doc.r60089.tar.xz
-2021/07/28 | 9538 | systems/win32/miktex/tm/packages/colorist.tar.lzma
2021/07/28 | 942417 | systems/win32/miktex/tm/packages/pfdicons__doc.tar.lzma
2021/07/28 | 9379 | macros/latex/contrib/moderncv/moderncvbodyv.sty
2021/07/28 | 9357 | macros/latex/contrib/moderncv/moderncvheadiv.sty
@@ -553,13 +640,11 @@
2021/07/28 | 9108 | systems/texlive/tlnet/archive/pfdicons.r60089.tar.xz
2021/07/28 | 90095 | graphics/tpic2pdftex.zip
2021/07/28 | 8930 | macros/latex/contrib/moderncv/moderncvheadi.sty
-2021/07/28 | 8608 | systems/win32/miktex/tm/packages/minimalist__source.tar.lzma
2021/07/28 | 8436 | systems/texlive/tlnet/archive/texplate.source.r60096.tar.xz
2021/07/28 | 8427 | macros/latex/contrib/vhistory/doc/en_vhistory.tex
2021/07/28 | 8307 | macros/latex/contrib/moderncv/moderncvheadvi.sty
2021/07/28 | 8248 | fonts/logix/README
2021/07/28 | 823 | macros/latex/contrib/moderncv/publications.bib
-2021/07/28 | 8204 | systems/win32/miktex/tm/packages/colorist__source.tar.lzma
2021/07/28 | 81508 | systems/texlive/tlnet/archive/pyluatex.doc.r60095.tar.xz
2021/07/28 | 7990 | macros/latex/contrib/moderncv/moderncvheadv.sty
2021/07/28 | 780920 | macros/latex/contrib/lipsum.zip
@@ -567,30 +652,24 @@
2021/07/28 | 7717 | macros/latex/contrib/moderncv/moderncvheadiii.sty
2021/07/28 | 7506 | macros/latex/contrib/moderncv/moderncvbodyi.sty
2021/07/28 | 7220 | macros/latex/contrib/moderncv/moderncvbodyiv.sty
-2021/07/28 | 7217 | systems/win32/miktex/tm/packages/minimalist.tar.lzma
2021/07/28 | 7131 | macros/latex/contrib/moderncv/moderncvfooti.sty
2021/07/28 | 7040 | systems/texlive/tlnet/archive/minimalist.r60090.tar.xz
2021/07/28 | 69588 | fonts/logix/fonts/logixMono.ttf
2021/07/28 | 695532 | systems/texlive/tlnet/archive/beaulivre.doc.r60090.tar.xz
2021/07/28 | 69080 | macros/latex/contrib/moderncv/moderncvskillmatrix.sty
2021/07/28 | 68416 | fonts/logix/opentype/logixMono.otf
-2021/07/28 | 681004 | systems/win32/miktex/tm/packages/beaulivre__doc.tar.lzma
2021/07/28 | 678536 | systems/texlive/tlnet/archive/projlib.doc.r60092.tar.xz
-2021/07/28 | 661414 | systems/win32/miktex/tm/packages/projlib__doc.tar.lzma
2021/07/28 | 650355 | macros/latex/contrib/lipsum/lipsum.pdf
2021/07/28 | 614436 | systems/texlive/tlnet/archive/lebhart.doc.r60090.tar.xz
2021/07/28 | 611492 | systems/texlive/tlnet/archive/simplivre.doc.r60090.tar.xz
2021/07/28 | 6056 | systems/texlive/tlnet/archive/pyluatex.r60095.tar.xz
-2021/07/28 | 599694 | systems/win32/miktex/tm/packages/lebhart__doc.tar.lzma
2021/07/28 | 596404 | systems/texlive/tlnet/archive/easybook.doc.r60091.tar.xz
-2021/07/28 | 596199 | systems/win32/miktex/tm/packages/simplivre__doc.tar.lzma
2021/07/28 | 59416 | macros/latex/contrib/moderncv/picture.eps
2021/07/28 | 58283 | macros/latex/contrib/lipsum/lipsum.dtx
2021/07/28 | 574396 | fonts/logix/opentype/logix.otf
2021/07/28 | 570 | macros/latex/contrib/vhistory/README.md
2021/07/28 | 568524 | systems/texlive/tlnet/archive/einfart.doc.r60090.tar.xz
2021/07/28 | 562 | graphics/pstricks/contrib/pst-arrow/README
-2021/07/28 | 552679 | systems/win32/miktex/tm/packages/einfart__doc.tar.lzma
2021/07/28 | 546299 | fonts/logix/source/logixMono.vfc
2021/07/28 | 531656 | fonts/logix/fonts/logix.woff
2021/07/28 | 527 | graphics/pstricks/contrib/pst-arrow/latex/pst-arrow.sty
@@ -605,17 +684,12 @@
2021/07/28 | 388708 | fonts/logix/doc/logix.tex
2021/07/28 | 38108 | systems/texlive/tlnet/archive/easybook.source.r60091.tar.xz
2021/07/28 | 3735 | macros/latex/contrib/lipsum/lipsum.ins
-2021/07/28 | 3702 | systems/win32/miktex/tm/packages/einfart.tar.lzma
-2021/07/28 | 3676 | systems/win32/miktex/tm/packages/simplivre.tar.lzma
-2021/07/28 | 3578 | systems/win32/miktex/tm/packages/lebhart.tar.lzma
2021/07/28 | 3575 | macros/latex/contrib/moderncv/moderncvcollection.sty
-2021/07/28 | 3560 | systems/win32/miktex/tm/packages/beaulivre.tar.lzma
2021/07/28 | 354 | graphics/pstricks/contrib/pst-arrow/Changes
2021/07/28 | 3541 | macros/latex/contrib/moderncv/moderncviconsawesome.sty
2021/07/28 | 3524 | systems/texlive/tlnet/archive/einfart.r60090.tar.xz
2021/07/28 | 350876 | fonts/logix/fonts/logix.woff2
2021/07/28 | 3496 | systems/texlive/tlnet/archive/simplivre.r60090.tar.xz
-2021/07/28 | 34385 | systems/win32/miktex/tm/packages/projlib__source.tar.lzma
2021/07/28 | 34284 | fonts/logix/fonts/logixMono.woff
2021/07/28 | 34274 | macros/latex/contrib/moderncv/moderncv.cls
2021/07/28 | 34028 | systems/texlive/tlnet/archive/projlib.source.r60092.tar.xz
@@ -652,14 +726,10 @@
2021/07/28 | 19097 | systems/win32/miktex/tm/packages/pfdicons__source.tar.lzma
2021/07/28 | 19039 | macros/latex/contrib/moderncv/LICENSE.txt
2021/07/28 | 178993 | dviware/dvidvi.zip
-2021/07/28 | 17858 | systems/win32/miktex/tm/packages/einfart__source.tar.lzma
-2021/07/28 | 17376 | systems/win32/miktex/tm/packages/simplivre__source.tar.lzma
2021/07/28 | 1659 | macros/latex/contrib/lipsum/CHANGELOG.md
-2021/07/28 | 16598 | systems/win32/miktex/tm/packages/lebhart__source.tar.lzma
2021/07/28 | 16496 | systems/texlive/tlnet/archive/easybook.r60091.tar.xz
2021/07/28 | 1645 | macros/latex/contrib/moderncv/picture.jpg
2021/07/28 | 1626 | macros/latex/contrib/easybook/easybook.ins
-2021/07/28 | 16136 | systems/win32/miktex/tm/packages/beaulivre__source.tar.lzma
2021/07/28 | 15509 | macros/latex/contrib/moderncv/manual/moderncv_userguide.tex
2021/07/28 | 15363 | macros/latex/contrib/moderncv/moderncviconsmarvosym.sty
2021/07/28 | 15345 | macros/latex/contrib/moderncv/template.tex
@@ -667,7 +737,6 @@
2021/07/28 | 149475 | graphics/pstricks/contrib/pst-arrow.zip
2021/07/28 | 134671 | macros/latex/contrib/lipsum/lipsum-cicero.txt
2021/07/28 | 133245 | support/lacheck.zip
-2021/07/28 | 12096 | systems/win32/miktex/tm/packages/projlib.tar.lzma
2021/07/28 | 1199428 | fonts/logix/fonts/logix.ttf
2021/07/28 | 11912 | systems/texlive/tlnet/archive/projlib.r60092.tar.xz
2021/07/28 | 114922 | systems/win32/miktex/tm/packages/texplate__doc.tar.lzma
@@ -685,7 +754,6 @@
2021/07/28 | 1052 | macros/latex/contrib/moderncv/moderncvcolorred.sty
2021/07/28 | 105220 | systems/texlive/tlnet/archive/colorist.doc.r60090.tar.xz
2021/07/28 | 1040 | macros/latex/contrib/moderncv/moderncvcolorblack.sty
-2021/07/28 | 100970 | systems/win32/miktex/tm/packages/minimalist__doc.tar.lzma
2021/07/27 | 978911 | graphics/pgf/contrib/pfdicons.zip
2021/07/27 | 96919 | systems/win32/miktex/tm/packages/aboensis.tar.lzma
2021/07/27 | 9622 | macros/latex/contrib/tuda-ci/tex/tudamecheng.cfg
@@ -747,7 +815,6 @@
2021/07/27 | 5172 | macros/latex/contrib/tuda-ci/example/DEMO-TUDaLetter.tex
2021/07/27 | 48840 | systems/texlive/tlnet/archive/make4ht.r60077.tar.xz
2021/07/27 | 48829 | systems/win32/miktex/tm/packages/make4ht.tar.lzma
-2021/07/27 | 4794 | systems/win32/miktex/tm/packages/macrolist__source.tar.lzma
2021/07/27 | 47656 | indexing/makeindexk/Makefile.in
2021/07/27 | 4644 | systems/win32/miktex/tm/packages/tonevalue__source.tar.lzma
2021/07/27 | 45182 | dviware/dviljk/aclocal.m4
@@ -791,7 +858,6 @@
2021/07/27 | 2644 | macros/latex/contrib/tuda-ci/example/DEMO-TUDaBibliography.bib
2021/07/27 | 2643 | systems/win32/miktex/tm/packages/beamertheme-simpledarkblue__source.tar.lzma
2021/07/27 | 25509 | systems/win32/miktex/tm/packages/latex2nemeth__doc.tar.lzma
-2021/07/27 | 2537 | systems/win32/miktex/tm/packages/macrolist.tar.lzma
2021/07/27 | 2530 | support/texplate/source/main/kotlin/org/islandoftex/texplate/util/MessageUtils.kt
2021/07/27 | 2503 | support/texplate/source/main/kotlin/org/islandoftex/texplate/model/Configuration.kt
2021/07/27 | 244306 | systems/win32/miktex/tm/packages/pgf-spectra.tar.lzma
@@ -804,7 +870,6 @@
2021/07/27 | 214575 | systems/win32/miktex/tm/packages/mindflow__doc.tar.lzma
2021/07/27 | 2101641 | systems/win32/miktex/tm/packages/musixtex__doc.tar.lzma
2021/07/27 | 20650 | dviware/dviljk/win32/Makefile.in
-2021/07/27 | 189868 | systems/win32/miktex/tm/packages/macrolist__doc.tar.lzma
2021/07/27 | 189292 | systems/texlive/tlnet/archive/macrolist.doc.r60081.tar.xz
2021/07/27 | 18915 | macros/latex/contrib/tuda-ci/tex/tudasciposter.cls
2021/07/27 | 18703715 | systems/win32/miktex/tm/packages/aboensis__source.tar.lzma
@@ -1052,34 +1117,3 @@
2021/07/26 | 1021798 | graphics/pgf/contrib/circuitikz/tex/circuitikz-1.2.7-body.tex
2021/07/26 | 1014383 | graphics/pgf/contrib/circuitikz/tex/t-circuitikz-1.2.7.tex
2021/07/26 | 10106 | macros/latex/contrib/siunitx/siunitx-abbreviation.dtx
-2021/07/25 | 704 | systems/texlive/tlnet/archive/latex2e-help-texinfo.r60038.tar.xz
-2021/07/25 | 6360 | systems/texlive/tlnet/archive/mindflow.source.r60041.tar.xz
-2021/07/25 | 63476 | systems/texlive/tlnet/archive/latexindent.r60045.tar.xz
-2021/07/25 | 6027 | graphics/pgf/contrib/tonevalue/tonevalue.sty
-2021/07/25 | 567 | graphics/pgf/contrib/tonevalue/LICENSE
-2021/07/25 | 5626 | macros/latex/contrib/beamer-contrib/themes/beamertheme-simpledarkblue/beamertheme-simpledarkblue-sample.tex
-2021/07/25 | 4730 | macros/latex/contrib/semantex/stripsemantex.sty
-2021/07/25 | 442570 | macros/latex/contrib/semantex.zip
-2021/07/25 | 43212 | macros/latex/contrib/beamer-contrib/themes/beamertheme-simpledarkblue.zip
-2021/07/25 | 423 | macros/latex/contrib/beamer-contrib/themes/beamertheme-simpledarkblue/README.md
-2021/07/25 | 41507 | macros/latex/contrib/beamer-contrib/themes/beamertheme-simpledarkblue/beamertheme-simpledarkblue-sample.pdf
-2021/07/25 | 385078 | macros/latex/contrib/semantex/semantex.pdf
-2021/07/25 | 37838640 | fonts/aboensis.zip
-2021/07/25 | 317833 | macros/latex/contrib/semantex/semantex.sty
-2021/07/25 | 30636 | systems/texlive/tlnet/archive/nicematrix.r60042.tar.xz
-2021/07/25 | 3062052 | systems/texlive/tlnet/archive/latexindent.win32.r60045.tar.xz
-2021/07/25 | 2660 | systems/texlive/tlnet/archive/mindflow.r60041.tar.xz
-2021/07/25 | 213188 | systems/texlive/tlnet/archive/mindflow.doc.r60041.tar.xz
-2021/07/25 | 209 | graphics/pgf/contrib/tonevalue/README
-2021/07/25 | 2066616 | systems/texlive/tlnet/archive/latex2e-help-texinfo.doc.r60038.tar.xz
-2021/07/25 | 1784760 | systems/texlive/tlnet/archive/nicematrix.doc.r60042.tar.xz
-2021/07/25 | 177492 | macros/latex/contrib/semantex/semantex.tex
-2021/07/25 | 157071 | graphics/pgf/contrib/tonevalue/tonevalue.pdf
-2021/07/25 | 156812 | graphics/pgf/contrib/tonevalue.zip
-2021/07/25 | 1504 | systems/texlive/tlnet/archive/collection-mathscience.r60037.tar.xz
-2021/07/25 | 1438 | macros/latex/contrib/beamer-contrib/themes/beamertheme-simpledarkblue/beamerfontthemeSimpleDarkBlue.sty
-2021/07/25 | 1435 | macros/latex/contrib/beamer-contrib/themes/beamertheme-simpledarkblue/beamercolorthemeSimpleDarkBlue.sty
-2021/07/25 | 1328 | macros/latex/contrib/beamer-contrib/themes/beamertheme-simpledarkblue/beamerthemeSimpleDarkBlue.sty
-2021/07/25 | 12606 | graphics/pgf/contrib/tonevalue/tonevalue.tex
-2021/07/25 | 1030844 | systems/texlive/tlnet/archive/latexindent.doc.r60045.tar.xz
-2021/07/25 | 102368 | systems/texlive/tlnet/archive/nicematrix.source.r60042.tar.xz
diff --git a/graphics/mcf2graph/CHANGELOG b/graphics/mcf2graph/CHANGELOG
index fcde9811d3..ebd3e9395d 100644
--- a/graphics/mcf2graph/CHANGELOG
+++ b/graphics/mcf2graph/CHANGELOG
@@ -1,6 +1,18 @@
*******************************************************************************
- Changelog of mcf2graph software package by Akira Yamaji 2021-07-18
+ Changelog of mcf2graph software package by Akira Yamaji 2021-08-01
*******************************************************************************
+[ver. 4.70 / 2021-08-01]
+ -change syntax of @(x,y)
+ @(x,y) : Move (x,y) from current position
+ @$(x,y) : Move (x,y) from origin(@1)
+ -add bond type for glycan
+ arc_lb : arc left > bottom
+ arc_br : arc bottom > right
+ arc_lbr : arc left > bottom > right
+ arc_ltr : arc left > top > right
+ -update mcf_data_base.mcf
+ -update MCF manual,example
+
[ver. 4.69 / 2021-07-18]
-add bond type wf_r,wb_r,bd_r for steric ring
-update mcf_data_base.mcf
diff --git a/graphics/mcf2graph/README b/graphics/mcf2graph/README
index c6252c7f5c..80a6d640ac 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.69 2021-07-18
+ version : 4.70 2021-08-01
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 d248fe014a..b01dff4de5 100644
--- a/graphics/mcf2graph/mcf2graph.mf
+++ b/graphics/mcf2graph/mcf2graph.mf
@@ -1,5 +1,5 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% mcf2graph ver 4.69 Copyright (c) 2013-2021 Akira Yamaji
+% mcf2graph ver 4.70 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,7 +37,7 @@
% Set to use plain.mp (label,arrow,atom) : mpost -s labeloffset=2 FILENAME
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
tracingstats:=1;
-message "* This is mcf2graph ver 4.69 2021.07.18";
+message "* This is mcf2graph ver 4.70 2021.08.01";
%-------------------------------------------------------------------------------------------------
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,nS,nL,nR,nU,nP,xpos,ypos,markA,markB,saveA,saveB,bondL;
@@ -207,7 +207,7 @@ def_com(-4090)(_com,_jp_atom,_jp_absA,_jp_bond,_cyc,_cyc_sB,_cyc_eB,_set_line,_t
_jump_at,_set_add,_chg_add,_nop,_mark,_moff,_term,_len_s,_len_e,_len_ss,_len_ee,
_group_s,_group_e,_rest,_charge,_from,_until,
si,dl,dl_,dr,dr_,db,dm,dm_,tm,wf,wb,bd,bz,zf,zb,dt,wv,nl,vf,vb,nb,wf_r,wb_r,bd_r,
- si_,wf_,wb_,zf_,zb_,wv_,bd_);
+ arc_lb,arc_br,arc_lbr,arc_ltr,si_,wf_,wb_,zf_,zb_,wv_,bd_);
%--------------------------------------------------------------------------------------------------
def parameter_list=
sw_numbering,sw_expand,sw_output,sw_ext_all,sw_frame,sw_trimming,sw_arrow_emu,sw_abbreviate,
@@ -454,7 +454,9 @@ def set_def_MC=
| :=(_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 @$ == @.$ enddef; def { == read_number( enddef; let } == ); def '==read_id enddef;
+%%%%%%%%% def @$ == @.$ enddef;
+ def @$ == jump_atom_abs enddef;
+ 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 &$ == &.$ enddef;
def / == group_si enddef; def // == group_dm enddef; def */ == group_wf enddef;
@@ -474,8 +476,11 @@ 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 cyc_atom primary n = (_cyc,n) enddef;
+def jump_atom_abs primary a =
+ if numeric a:: (_jp_atom,$a) elseif pair a:: (_jp_atom,$1),<$0,angle(a)~0`length(a),<$0 fi
+enddef;
def jump_atom primary a =
- if numeric a:: (_jp_atom,a) elseif pair a:: (_jp_atom,$1),<$0,angle(a)~0`length(a),<$0 fi
+ if numeric a:: (_jp_atom,a) elseif pair a:: <$0,angle(a)~0`length(a),<$0 fi
enddef;
def chg_length primary n = (_com,_len_s),(_chg_len,n) enddef;
def group_si secondary n = if known n:: (_group_si,n) else:: _nop fi enddef;
@@ -1289,12 +1294,12 @@ enddef;
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
def draw_bond(expr NUM)=
begingroup
- save ww,ap,am,ang,col,len,Ls,Le,pA,zA,zL;
+ save ww,aw,ap,am,ang,col,len,Ls,Le,pA,zA,zL;
pair pA,Ls,Le;
path zA,zL;
%-----------------------------------------------------------------------------------------------
- nL:=lineB[NUM]; ang:=angB[NUM]; nS:=sB[NUM]; nE:=eB[NUM]; col:=colorB[NUM];
- zL:=posA[nS]--posA[nE]; ww:=wedge_wd; ap:=ang+90; am:=ang-90;
+ nL:=lineB[NUM]; ang:=angB[NUM]; nS:=sB[NUM]; nE:=eB[NUM];
+ col:=colorB[NUM]; zL:=posA[nS]--posA[nE]; ww:=wedge_wd; ap:=ang+90; am:=ang-90; aw:=atom_wd;
%-----------------------------------------------------------------------------------------------
if (numS[nS]=0)and(numS[nE]=0)or(sw_numbering>=1):
Ls:=posA[nS]; Le:=posA[nE]; pA:=(.1,.9);
@@ -1323,17 +1328,15 @@ def draw_bond(expr NUM)=
draw Le for i=1 upto nB:
..controls(((i-.5)/nB)[sfrt(Le,nA,iif(odd(i),ap,am)),sfrt(Ls,nA,iif(odd(i),ap,am))])
..(i/nB)[Le,Ls] endfor ..Ls Cp(col);
-%
ef nL=wf_r: filldraw Ls--sfrt(Le,.35ww,am)--sfrt(Le,.35ww,ap)--cycle wpcs .05ww Cp(col);
ef nL=wb_r: filldraw sfrt(Ls,.35ww,am)--Le--sfrt(Ls,.35ww,ap)--cycle wpcs .05ww Cp(col);
ef nL=bd_r: draw zA wpcs .65bondgap Cp(col);
-%
- ef nL=vf: draw zA Cp(col);draw sfrt(Le,bondgap,ang-150)--Le--sfrt(Le,bondgap,ang+150) Cp(col);
- ef nL=vb: draw zA Cp(col);draw sfrt(Ls,bondgap,ang-30)--Ls--sfrt(Ls,bondgap,ang+30) Cp(col);
- ef nL=si_: erase draw subpath (0.15,0.85) of zA wpcs 0.8bondgap; draw zA Cp(col);
- ef nL=dl_: erase draw subpath (0.15,0.85) of sfrt(subpath pA of zA,.5bondgap,ap) wpcs 1.8bondgap;
+ ef nL=vf: draw zA Cp(col);draw sfrt(Le,bondgap,ang-150)--Le--sfrt(Le,bondgap,ang+150) Cp(col);
+ ef nL=vb: draw zA Cp(col);draw sfrt(Ls,bondgap,ang-30)--Ls--sfrt(Ls,bondgap,ang+30) Cp(col);
+ ef nL=si_: erase draw subpath (.15,.85) of zA wpcs 0.8bondgap; draw zA Cp(col);
+ ef nL=dl_: erase draw subpath (.15,.85) of sfrt(subpath pA of zA,.5bondgap,ap) wpcs 1.8bondgap;
draw zA Cp(col); draw sfrt(subpath pA of zA,bondgap,ap) Cp(col);
- ef nL=dr_: erase draw subpath (0.15,0.85) of sfrt(subpath pA of zA,.5bondgap,am) wpcs 1.8bondgap;
+ ef nL=dr_: erase draw subpath (.15,.85) of sfrt(subpath pA of zA,.5bondgap,am) wpcs 1.8bondgap;
draw zA Cp(col); draw sfrt(subpath pA of zA,bondgap,am) Cp(col);
ef nL=dm_: erase draw subpath(0.15,0.85) of zA wpcs 1.8 bondgap;
draw sfrt(zA,bondgap/1.75,ap) Cp(col); draw sfrt(zA,bondgap/1.75,am) Cp(col);
@@ -1354,6 +1357,16 @@ def draw_bond(expr NUM)=
ef nL=bd_: erase draw subpath(0.15,0.85) of zA wpcs 1.6bondgap;
draw zA withpen penrazor rotated ap scaled bondgap Cp(col);
ef nL=nb:
+ %-- bond type for glycan ----------------------------------------------------------------------
+ ef nL=arc_lb: draw Ls--Ls-(0,aw)..posA[nE]+(-1.2aw,0)..posA[nE]-(.6aw,0) Cp(col);
+ ef nL=arc_br: draw posA[nS]+(.6aw,0)..posA[nS]+(1.2aw,0)..Le-(0,aw)--Le Cp(col);
+ ef nL=arc_lbr: draw posA[nS]+(0,iif(numS[nS]=0,0,-.6aw))--posA[nS]+(0,-.8aw)
+ ..0.5[posA[nS],posA[nE]]+(0,-1.7aw)..posA[nE]+(0,-.8aw)
+ --posA[nE]+(0,iif(numS[nE]=0,0,-.6aw)) Cp(col);
+ ef nL=arc_ltr: draw posA[nS]+(0,iif(numS[nS]=0,0,0.6aw))--posA[nS]+(0,.8aw)
+ ..0.5[posA[nS],posA[nE]]+(0,1.7aw)..posA[nE]+(0,.8aw)
+ --posA[nE]+(0,iif(numS[nE]=0,0,.6aw)) Cp(col);
+ %----------------------------------------------------------------------------------------------
fi
endgroup
enddef;
@@ -1932,6 +1945,9 @@ for i=5,6,7,8: for j=11 upto 15: ?[i][j]:='((_fuse,i),(j,0)); endfor endfor
R:='("R"); R1:='("{R^1^}"); R2:='("{R^2^}"); R3:='("{R^3^}"); R4:='("R^4^"); R5:='("{R^5^}");
R6:='("R6"); R7:='("{R^7^}"); R8:='("{R^8^}"); R9:='("{R^9^}"); R10:='("R^10^"); R11:='("{R^11^}");
%-------------------------------------------------------------------------------------------------
+hexose_hp:='(#1.4,-30~wf_r,30~bd_r`1,30~wb_r,120,O,30,&1,##);
+Pyranose_hp:='(#1.4,-35~wf_r,35~bd_r`1,30~wb_r,130`1.66,O,&1,##);
+%-------------------------------------------------------------------------------------------------
xCH3:='(/H,/H^60,60,H); xNH:='(N,/H); xNH2:='(N,/H,60,H); xNO2:='(N,//O,60~dm,O); xNO:='(N,!~dm,O);
xSO2H:='(S,//O,!,O,!,H); xSO3H:='(S,//O^35,//O^-35,!,O,!,H); xCOO:='(//O,!,O);
xOH:='(O,!,H); xCHO:='(//O,!,H); xCOOH:='(//O,!,O,!,H); xCN:='(!~tm,N); xSH:='(S,!,H);
diff --git a/graphics/mcf2graph/mcf_data_base.mcf b/graphics/mcf2graph/mcf_data_base.mcf
index 3b56141203..848ad6470d 100644
--- a/graphics/mcf2graph/mcf_data_base.mcf
+++ b/graphics/mcf2graph/mcf_data_base.mcf
@@ -1,5 +1,5 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% molecular data base file mcf_data_base.mcf by Akira Yamaji 2021.07.18
+% molecular data base file mcf_data_base.mcf by Akira Yamaji 2021.08.01
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% tag1:var1;tag2:var2;tag3:var3 .....
% first character of line "%" comment out
@@ -43,7 +43,7 @@ Cat:biological;EN:L-Valine;MW:117.15;EXA:-
+
<30,NH2,!~wb,/?!,!,COOH
+------------------------------------------------------------------------------
-Cat:biological;EN:L-Leucine;MW:131.16;EXA:-
+Cat:biological;EN:L-Leucine;MW:131.16;EXA:1
+
<30,NH2,!~wb,/'(!,?!),!,COOH
+------------------------------------------------------------------------------
@@ -75,7 +75,7 @@ Cat:biological;EN:L-Tyrosine;MW:181.19;EXA:-
+
<30,NH2,!~wb,/'(!Ph,-3:/OH),!,COOH
+------------------------------------------------------------------------------
-Cat:biological;EN:L-Triptophan;MW:204.21;EXA:1
+Cat:biological;EN:L-Triptophan;MW:204.21;EXA:-
+
<30,NH2,!~wb,!,COOH,@2,\,!,<24,|,?5,-4=Ph,2=dr,5=dl,4:NH
+------------------------------------------------------------------------------
@@ -112,129 +112,185 @@ Cat:biological;EN:L-Hystidine;MW:155.16;EXA:-
<30,NH2,!~wb,!,COOH,@2,\,!,|,?5,{1,3}=dl,3:N,5:NH
+------------------------------------------------------------------------------
%==============================================================================
-Cat:biological;EN:Citrate;MW:192.12;EXA:3
+Cat:biological;EN:L-DOPA;MW:197.19;EXA:-
++
+<30,NH2,!~wb,!,COOH,@2,\,!,Ph,{-3,-4}:/OH
++------------------------------------------------------------------------------
+Cat:biological;EN:Ornithine;MW:132.16;EXA:-
++
+<30,NH2,!~wb,/'(!3,NH2),!,COOH
++------------------------------------------------------------------------------
+Cat:biological;EN:Citrulline;MW:175.2;EXA:-
++
+<30,NH2,!~wb,/'(!3,NH,!,//O,!,NH2),!,COOH
++------------------------------------------------------------------------------
+Cat:biological;EN:GABA;MW:103.12;EXA:-
++
+<30,NH2,!4,COOH
++------------------------------------------------------------------------------
+%==============================================================================
+Cat:biological;EN:Citrate;MW:192.12;EXA:-
+
<30,COOH,!,!2`1.2,!,COOH,@-4`1,\,COOH,4:/OH
+------------------------------------------------------------------------------
-Cat:biological;EN:cis-Aconitate;MW:174.11;EXA:3
+Cat:biological;EN:cis-Aconitate;MW:174.11;EXA:-
+
<30,COOH,!2,!~dr,!,COOH,@-4`1,\,COOH
+------------------------------------------------------------------------------
-Cat:biological;EN:Isocitrate;MW:192.12;EXA:3
+Cat:biological;EN:Isocitrate;MW:192.12;EXA:-
+
<30,COOH,!4,COOH,@-3,\`1,COOH,4:/OH
+------------------------------------------------------------------------------
-Cat:biological;EN:Oxalosuccinate;MW:190.11;EXA:3
+Cat:biological;EN:Oxalosuccinate;MW:190.11;EXA:-
+
<30,COOH,!,!2`1.2,//O,!,COOH,@-4,\`1,COOH
+------------------------------------------------------------------------------
-Cat:biological;EN:alfa-Ketoglutarate;MW:146.1;EXA:3
+Cat:biological;EN:alfa-Ketoglutarate;MW:146.1;EXA:-
+
<30,COOH,!3,//O,!,COOH
+------------------------------------------------------------------------------
-Cat:biological;EN:Succinate;MW:118.09;EXA:3
+Cat:biological;EN:Succinate;MW:118.09;EXA:-
+
<30,COOH,!3,COOH
+------------------------------------------------------------------------------
-Cat:biological;EN:Fumarate;MW:116.07;EXA:3
+Cat:biological;EN:Fumarate;MW:116.07;EXA:-
+
<30,COOH,!,!~dr,!,COOH
+------------------------------------------------------------------------------
-Cat:biological;EN:L-Malate;MW:132.07;EXA:3
+Cat:biological;EN:L-Malate;MW:132.07;EXA:-
+
<30,COOH,!3,COOH,3:/OH
+------------------------------------------------------------------------------
-Cat:biological;EN:Oxaloacetate;MW:132.07;EXA:3
+Cat:biological;EN:Oxaloacetate;MW:132.07;EXA:-
+
<30,COOH,!,//O,!2,COOH
+------------------------------------------------------------------------------
%==============================================================================
-Cat:biological;EN:Glucose;MW:180.16;EXA:-
+Cat:biological;EN:Glucose 1;MW:180.16;EXA:1
+
<30,?6,5:O,2:*/OH,{1,3}:/*OH,4:*/*OH,6:*/!OH
+------------------------------------------------------------------------------
-Cat:biological;EN:Glucose;MW:180.16;EXA:-
+Cat:biological;EN:Glucose 2;MW:180.16;EXA:1
+
<-30,OH,!2,*/OH,!,/*OH,!,/*OH,!,/*OH,!,//O,!,H
+------------------------------------------------------------------------------
-Cat:biological;EN:Fructose;MW:180.16;EXA:-
+Cat:biological;EN:D-Glucose;MW:180.16;EXA:1
++
+hexose_hp,{1^$-90,2^$90,3^$-90,4^$-90}:/OH`-.5,6^$90:/!OH`-.5
++------------------------------------------------------------------------------
+Cat:biological;EN:Fructose 1;MW:180.16;EXA:1
+
<30,OH,!2,/*OH,!,*/OH,!,*/OH,!,//O,!2,OH
+------------------------------------------------------------------------------
-Cat:biological;EN:Fructose;MW:180.16;EXA:-
+Cat:biological;EN:Fructose 2;MW:180.16;EXA:1
+
<-18,?5,5:O,1^-48:*/*!OH,1^48:/OH,2:/*OH,3:*/OH,4:/*!OH
+------------------------------------------------------------------------------
-Cat:biological;EN:Glucose(1);MW:180.16;EXA:1
+Cat:biological;EN:D-Fluctose;MW:180.16;EXA:1
+
-#1,-60~wf_r,75~bd_r,-30~wb_r,130,O,75,&1,##,
-{1^$-160,2^$175,3^$-60}:/OH`-.5,4:*/*OH`-.5,6:/!OH^$90`-.5
+Pyranose_hp,1^$-90:/OH,{2^$-90,3^$90}:/OH`-.45,{1^$90,4^$-90}:/!OH`-.45
+------------------------------------------------------------------------------
-Cat:biological;EN:Glucose(2);MW:180.16;EXA:1
+Cat:biological;EN:D-Galactose;MW:180.16;EXA:1
+
-#1.25,-30~wf_r,30~bd_r`1,30~wb_r,120,O,30,&1,##,
- {1^$-90,2^$90,3^$-90,4^$90}:/OH`-.5,6^$90:/!OH`-.5
+hexose_hp,{1^$90,2^$90,3^$-90,4^$-90}:/OH`-.5,6^$90:/!OH`-.5
+------------------------------------------------------------------------------
-Cat:biological;EN:Fluctose;MW:180.16;EXA:-
+Cat:biological;EN:D-Mannose;MW:180.16;EXA:1
+
-#1.4,-35~wf_r,35~bd_r`1,30~wb_r,130`1.66,O,&1,##,
- 1^$-90:/OH,{2^$-90,3^$90}:/OH`-.45,{1^$90,4^$90}:/!OH`-.45
+hexose_hp,{1^$-90,2^$90,3^$90,4^$-90}:/OH`-.5,6^$90:/!OH`-.5
+------------------------------------------------------------------------------
-%==============================================================================
-Cat:biological;EN:Geraniol;MW:154.25;EXA:1
+Cat:biological;EN:L-Fucose;MW:164.16;EXA:1
+
-<30,!8,OH,{2,6}=dr,{2,6}:/_
+hexose_hp,{1^$-90,,2^$-90,3^$90,4^$90}:/OH`-.5,6^$-90:/_`.5
+------------------------------------------------------------------------------
-Cat:biological;EN:Limonene;MW:136.24;EXA:1
+Cat:biological;EN:D-Ribose;MW:150.13;EXA:1
+
-<30,?6,2=dl,2:/_,@5,*\,/_,!!
+Pyranose_hp,{2^$-90,3^$-90,4^$90}:/OH`-.45,1^$90:/!OH`-.45
+------------------------------------------------------------------------------
-Cat:biological;EN:l-Menthol;MW:156.27;EXA:1
+Cat:biological;EN:D-Deoxyribose;MW:134.13;EXA:1
+
-<30,?6,2:/*?!,5:*/_,3:*/OH
+Pyranose_hp,{2^$-90,4^$90}:/OH`-.45,1^$90:/!OH`-.45
+------------------------------------------------------------------------------
-Cat:biological;EN:Allicin;MW:162.28;EXA:1
+Cat:biological;EN:D-Glucosamine;MW:179.17;EXA:1
+
-<-30,!!,!2,SO,!,S,!2,!!
+hexose_hp,{1^$-90,2^$90,4^$-90}:/OH`-.5,3^$-90:/NH2,6^$90:/!OH`-.5
++------------------------------------------------------------------------------
+Cat:biological;EN:N-acetyl-glucosamine;MW:221.21;EXA:-
++
+hexose_hp,{1^$-90,2^$90,4^$-90}:/OH`-.5,3^$-90>lr:/NHCO!,6^$90:/!OH`-.5
++------------------------------------------------------------------------------
+Cat:biological;EN:Glucuronic acid;MW:194.14;EXA:1
++
+hexose_hp,{1^$-90,2^$90,3^$-90,4^$-90}:/OH`-.5,6^$90:/COOH`-.5
++------------------------------------------------------------------------------
+Cat:biological;EN:Maltose;MW:342.3;EXA:1
++
+hexose_hp,{1^$-90,2^$90,3^$-90}:/OH`-.5,6^$90:/!OH`-.5,
+ @4,$-50~arc_lb`1,O,$50~arc_br`1,<$0,
+ |,hexose_hp,{2^$90,3^$-90,4^$-90}:/OH`-.5,6^$90:/!OH`-.5
++------------------------------------------------------------------------------
+Cat:biological;EN:Sucrose;MW:342.3;EXA:1
++
+hexose_hp,{1^$-90,2^$90,3^$-90}:/OH`-.5,6^$90:/!OH`-.5,
+ @4,$-50~arc_lb`1,O,$50~arc_br`1,<$0,
+ |,#1.4,-35~wf_r,35~bd_r`1,30~wb_r,130`1.66,O,&1,##,
+ {2^$-90,3^$90}:/OH`-.45,{1^$90,4^$-90}:/!OH`-.45
++------------------------------------------------------------------------------
+Cat:biological;EN:Lactose;MW:342.3;EXA:1
++
+hexose_hp,{1^$90,2^$90,3^$-90}:/OH`-.5,6^$90:/!OH`-.5,
+ @4,$0~arc_ltr,O,$0~arc_lbr,
+ |,hexose_hp,{2^$90,3^$-90,4^$-90}:/OH`-.5,6^$90:/!OH`-.5,
++------------------------------------------------------------------------------
+Cat:biological;EN:Cellobiose;MW:342.3;EXA:1
++
+hexose_hp,{1^$-90,2^$90,3^$-90}:/OH`-.5,6^$90:/!OH`-.5,
+ @4,$0~arc_lbr,O,$0~arc_ltr,
+ |,hexose_hp,{2^$90,3^$-90,4^$-90}:/OH`-.5,6^$90:/!OH`-.5
++------------------------------------------------------------------------------
+Cat:biological;EN:Trehalose;MW:342.3;EXA:1
++
+hexose_hp,{1^$-90,2^$90,3^$-90}:/OH`-.5,6^$90:/!OH`-.5,
+ @4,@(1,0),|,hexose_hp,{1^$-90,2^$90,3^$-90}:/OH`-.5,6^$90:/!OH`-.5,
+ ||,@4,$-37~arc_lb`3.25,O,&10~arc_br
+------------------------------------------------------------------------------
%==============================================================================
-Cat:synthetic;EN:Benzene;MW:78.11;EXA:3
+Cat:biological;EN:Geraniol;MW:154.25;EXA:1
+
-<30,Ph
+<30,!8,OH,{2,6}=dr,{2,6}:/_
+------------------------------------------------------------------------------
-Cat:synthetic;EN:Phenol;MW:94.11;EXA:3
+Cat:biological;EN:Limonene;MW:136.24;EXA:1
+
-<30,Ph,3:/OH
+<30,?6,2=dl,2:/_,@5,*\,/_,!!
+------------------------------------------------------------------------------
-Cat:synthetic;EN:Aniline;MW:93.13;EXA:3
+Cat:biological;EN:l-Menthol;MW:156.27;EXA:1
+
-<30,Ph,3:/NH2
+<30,?6,2:/*?!,5:*/_,3:*/OH
+------------------------------------------------------------------------------
-Cat:synthetic;EN:Picric acid;MW:229.10;EXA:3
+Cat:biological;EN:Allicin;MW:162.28;EXA:1
+
-<30,Ph,{1,3,5}:/NO2,2:/OH
+<-30,!!,!2,SO,!,S,!2,!!
+------------------------------------------------------------------------------
-Cat:biological;EN:Benzoic acid;MW:122.12;EXA:3
+Cat:biological;EN:Benzoic acid;MW:122.12;EXA:-
+
<30,Ph,3:/COOH
+------------------------------------------------------------------------------
-Cat:biological;EN:Gallic acid;MW:170.12;EXA:3
+Cat:biological;EN:Gallic acid;MW:170.12;EXA:-
+
<30,Ph,3:/COOH,{1,5,6}:/OH
+------------------------------------------------------------------------------
-Cat:biological;EN:Salicylic acid;MW:138.12;EXA:3
+Cat:biological;EN:Salicylic acid;MW:138.12;EXA:-
+
<30,Ph,3:/COOH,4:/OH
+------------------------------------------------------------------------------
-Cat:biological;EN:Cinnamic acid;MW:148.16;EXA:3
+Cat:biological;EN:Cinnamic acid;MW:148.16;EXA:-
+
<30,Ph,@3,\,!!,!,COOH
+------------------------------------------------------------------------------
-Cat:biological;EN:Cinnamaldehyde;MW:132.16;EXA:3
+Cat:biological;EN:Cinnamaldehyde;MW:132.16;EXA:-
+
<30,Ph,@3,\,!!,!,CHO
+------------------------------------------------------------------------------
-Cat:biological;EN:Caffeic acid;MW:180.16;EXA:3
+Cat:biological;EN:Caffeic acid;MW:180.16;EXA:1
+
<30,Ph,{1,6}:/OH,@3,\,!!,!,COOH
+------------------------------------------------------------------------------
@@ -242,7 +298,6 @@ Cat:biological;EN:Vanillin;MW:152.15;EXA:1
+
<30,Ph,2:/OH,3:/O!,5:/CHO
+------------------------------------------------------------------------------
-%==============================================================================
Cat:biological;EN:Stearic acid;MW:284.48;EXA:1
+
<30,!17,COOH
@@ -255,7 +310,6 @@ Cat:biological;EN:Sphingosine;MW:299.50;EXA:1
+
<30,!18,OH,14=dr,-3:*/OH,-2:/*NH2
+------------------------------------------------------------------------------
-%==============================================================================
Cat:biological;EN:Tocopherol;MW:430.717;EXA:1
+
<30,Ph,3=?6,7:O,{1,2,5}:/_,8:/*_^60,6:/OH,@8,\,|,!12,{4,8}:/*_,12:/_
@@ -284,7 +338,7 @@ Cat:biological;EN:Capsaicin;MW:305.418;EXA:1
Cat:biological;EN:Thiamine;MW:300.81;EXA:1
+
<30,Ph,4:/NH2,@3,\`1,!,<-12,?5,{-1,-4}=dl,{1,5,8}:N,11:S,{6,9}:/_,
- @-3,\,!2,OH,8:p_^72,@(6.7,1.5),Cl,n_^15
+ @-3,\,!2,OH,8:p_^72,@8,@(3.5,1.5),Cl,n_^15
+------------------------------------------------------------------------------
Cat:biological;EN:Gibberellin A3;MW:346.379;EXA:1
+
@@ -310,308 +364,282 @@ Cat:biological;EN:Glutathione;MW:307.33;EXA:1
+
<-30,COOH,!,/*NH2,!3,//O,!,NH,!,*/!SH,!,//O,!,NH,!2,COOH
+------------------------------------------------------------------------------
-%==============================================================================
-Cat:synthetic;EN:Hexaphenylbenzene;MW:534.6876;EXA:1
-+
-<30,Ph,{1,2,3,4,5,6}:/Ph
-+------------------------------------------------------------------------------
-Cat:synthetic;EN:Naphthalene;MW:128.17;EXA:3
-+
-<30,Ph,3=Ph1
-+------------------------------------------------------------------------------
-Cat:synthetic;EN:Anthracene;MW:178.23;EXA:3
-+
-<30,Ph,3=Ph1,6=Ph1
-+------------------------------------------------------------------------------
-Cat:synthetic;EN:Phenanthrene;MW:178.23;EXA:3
-+
-<30,Ph,4=Ph1,6=Ph1
-+------------------------------------------------------------------------------
-Cat:synthetic;EN:Naphthacene;MW:228.3;EXA:3
-+
-<30,Ph,6=Ph1,3=Ph1,-3=Ph1
-+------------------------------------------------------------------------------
-Cat:synthetic;EN:Chrysene;MW:228.3;EXA:3
-+
-<30,Ph2,6=Ph1,4=Ph1,-4=Ph1
-+------------------------------------------------------------------------------
-Cat:synthetic;EN:Pyrene;MW:202.25;EXA:3
-+
-<30,Ph2,6=Ph1,4=Ph1,(16,7)=?6[3],-2=dl
-+------------------------------------------------------------------------------
-Cat:synthetic;EN:Kekulene;MW:600.7;EXA:1
-+
-<30,Ph,{3,-2,-3,-2,-3,-2,-3,-2,-3,-2}=?6,(-3,6)=?6[3],@-4,&6,
- {8,12,14,16,18,22,24,26,28,32,34,36,38,42,44,46,48,52,54,56,58}=dl
-+------------------------------------------------------------------------------
-%==============================================================================
-Cat:synthetic;EN:12-Crown-4;MW:176.21;EXA:3
+Cat:biological;EN:Trenbolone;MW:270.37;EXA:1
+
-<-180,O,30,60,60,O,-30,60,60,O,-30,60,60,O,-30,60,&1
+<30,?6,{3,10}=?6,13=?5,{2,11,15}=dl,1://O,12:*/_^60,-1:/*OH,9:*/H^60,11:/*H^-60
+------------------------------------------------------------------------------
-Cat:synthetic;EN:15-Crown-5;MW:220.26;EXA:3
+Cat:biological;EN:Luciferin;MW:280.33;EXA:1
+
-<-180,O,48,60,60,O,-48,60,60,O,-48,60,60,O,-48,60,60,O,-48,60,&1
+<30,Ph,3=?5,@8,\,?5,{9,16}=dl,{9,14}:N,{7,11}:S,1:/OH,-2:*/COOH
+------------------------------------------------------------------------------
-Cat:synthetic;EN:18-Crown-6;MW:264.32;EXA:1
+Cat:biological;EN:Chlorophyll a;MW:893.509;EXA:1
+
-<-180,O,60,60,60,O,-60,60,60,O,-60,60,60,O,-60,60,60,O,-60,60,60,O,-60,60,&1
+<-36,#1,?5,@3,\,54,?5,@-2,\,54,?5,@-2,\,54,?5,@-2,\,&5,@6,22,70,&8,##,
+ {4,6,8,10,14,16,18,21,23,27}=dl,@4,\`1.48~vf,Mg,&17~vb,@11,&27,@27,&23,
+ {4,11,17,23}:N,{1~zf,9,15,21}:/_,14:/!,20:/!!,25:/*COO!,26://O,
+ @2,*\^-6,!2,//O,!,O,!2,!!,|,!13,{1,5,9,13}:/_
+------------------------------------------------------------------------------
%==============================================================================
-Cat:synthetic;EN:Porphyrin;MW:310.4;EXA:1
-+
-<9,#1,?5,@3,\,54,?5,@-2,\,54,?5,@-2,\,54,?5,@-2,\,&5,##,
- {1,4,6,8,10,14,16,18,21,23,27}=dl,{4,17}:N,{11,23}:NH
-+------------------------------------------------------------------------------
-Cat:synthetic;EN:Sulflower;MW:448.69;EXA:1
+Cat:biological;EN:Flavone;MW:222.24;EXA:1
+
-<67.5,?8,{1,3,5,7}=?5,@11,30`1.15,&12,@14,30`1.15,&15,
- @17,30`1.15,&18,@20,30`1.15,&9,{9,12,13,16,17,20,21,24}=dl,
- {10,13,16,19,21,22,23,24}:S
-+------------------------------------------------------------------------------
-Cat:synthetic;EN:Arsphenamine x5;MW:915.2;EXA:1
-+
-<18,?5,{1,2,3,4,5}:As,{1,2,3,4,5}:/'(Ph,3:/NH2,4:/OH)
+<30,Ph,3=?6,9=dl,10:O,7://O,9:/Ph,
+------------------------------------------------------------------------------
-Cat:synthetic;EN:Melamine;MW:126.12;EXA:1
+Cat:biological;EN:Isoflavone;MW:222.24;EXA:1
+
-<30,Ph,{2,4,6}:N,{1,3,5}:/NH2
+<30,Ph,3=?6,9=dl,10:O,7://O,8:/Ph,
+------------------------------------------------------------------------------
-%==============================================================================
-Cat:synthetic;EN:Sudan red 1;MW:248.28;EXA:1
+Cat:biological;EN:Flavanone;MW:224.25;EXA:1
+
-<30,Ph,1=Ph,4:/OH,@3,\,N,!!,N,!,Ph
+<30,Ph,3=?6,10:O,7://O,8:/OH,9:/Ph,
+------------------------------------------------------------------------------
-Cat:synthetic;EN:Basic blue 1;MW:319.86;EXA:1
+Cat:biological;EN:Flavonol;MW:238.24;EXA:1
+
-<30,Ph,3=Ph,6=Ph,2:S,5:N,{8,13}:/N?!,2:p_,@(4.2,1.5),Cl,n_^15
+<30,Ph,3=?6,9=dl,10:O,7://O,8:/OH,9:/Ph,
+------------------------------------------------------------------------------
-Cat:synthetic;EN:Disperse violet 1;MW:238.25;EXA:1
+Cat:biological;EN:Cianidanol;MW:290.27;EXA:1
+
-<30,Ph,3=?6,-3=dr,9=Ph,{7,10}://O,{-1,-4}:/NH2
+<30,Ph,3=?6,@8,*\,Ph,7:O,{1,5,13,14}:/OH,9:/*OH
+------------------------------------------------------------------------------
-Cat:synthetic;EN:Vat blue 1;MW:262.27;EXA:1
+Cat:biological;EN:Quercetin;MW:302.24;EXA:1
+
-<30,Ph,3=?5,@8,\\,?5,-3=dr,-3=Ph,{7,14}:NH,{9,11}://O
+<30,Ph,3=?6,@9,\,Ph,9=dl,10:O,7://O,{2,6,8,13,14}:/OH
+------------------------------------------------------------------------------
%==============================================================================
-Cat:pesticide;EN:Atrazine;MW:215.7;EXA:1
+Cat:biological;EN:Limonin;MW:470.518;EXA:1
+
-<30,Ph,{2,4,6}:N,5:/Cl,1:/NH!2,3:/NH!?!
+<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:??,{1^60,5^180,16^60}:/*H,
+ @14,\*,|,?5,{1,4}=dl,3:O
+------------------------------------------------------------------------------
-Cat:pesticide;EN:BHC;MW:290.83;EXA:1
+Cat:biological;EN:Cromolyn;MW:468.37;EXA:1
+
-<30,?6`1.2,{1,3,4,6}:*/Cl,{2,5}:/*Cl
+<30,Ph,|,-1=?6,3=dl,1:O,4://O,2:/COOH,
+ @$2,\,O,!2,/OH,!2,O,60,Ph,|,-5=?6,3=dl,4:O,1://O,3:/COOH
+------------------------------------------------------------------------------
-Cat:pesticide;EN:pp-DDT;MW:354.49;EXA:1
+Cat:biological;EN:Emetine;MW:480.649;EXA:1
+
-<30,Ph,6:/Cl,@3,\,/CCl3,!,Ph,-3:/Cl
+<30,Ph,{-4,-4}=?6,8:N,{1,6}:/O!,-2:/*!,{7^-60,12^-60}:/*H,
+ @-3,\,!~zb,<-60,|,?6,5=dl,2:NH,-6^-60:*/H,|,-2=?6,{2,4}=dl,{-2,-3}:/O!
+------------------------------------------------------------------------------
-Cat:pesticide;EN:Endrin;MW:380.91;EXA:1
+Cat:biological;EN:Acronycine;MW:321.376;EXA:1
+
-<30,?6`1.3,3=?6,6=dl,9=?3,-1:O,
- @2,210~wf`1.5,&5~wb,@7,210~zf`1.5,&10~zb,{1,2,5,6,12^-210,12^-150}:/Cl
+<30,Ph,|,-4=?6,1:N!,4://O,-3=Ph2,-1:/O!,|,-4=?6,2=dl,4:O,3:??
+------------------------------------------------------------------------------
-Cat:pesticide;EN:Acrinathrin;MW:541.45;EXA:1
+Cat:biological;EN:Piperine;MW:285.343;EXA:1
+
-<-30,?3,2^-35:*/_,2^35:/*_,
- @1,\,!~dl,!,//O,!,O,!,/CF3,!,CF3,@3,\,//O,!,O,!,/CN,!,Ph,@-4,\,O,-60,Ph
+<30,Ph,|,-1=?5,{1,3}:O,@$4,\,!!,!,!!,!,//O,!,|,?6,1:N
+------------------------------------------------------------------------------
-Cat:pesticide;EN:Cafenstrole;MW:350.4;EXA:1
+Cat:biological;EN:Febrifugine;MW:301.346;EXA:1
+
-<30,Ph,{2,4,6}:/_,@3,\,SOO,!,|,?5,{2,5}=dl,{2,4,5}:N,@-2,\,//O,!,N,/!,!2
+<30,Ph,|,-4=?6,2=dl,{1,3}:N,4://O,@$9,\,!,//O,!,!~zf,|,?6,2:NH,-1:*/OH
+------------------------------------------------------------------------------
-Cat:pesticide;EN:Carfentrazone-ethyl;MW:412.19;EXA:1
+Cat:biological;EN:Mitomycine C;MW:334.332;EXA:1
+
-<30,Ph,4:/F,6:/Cl,@1,\,!,/Cl,!,//O,!,O,!2,
- @3,\,|,?5,4=dl,{1,3,5}:N,-4://O,-3:/CF2,-2:/_
+<30,?6,{3,6}=dl,{2,5}://O,1:/_,-4=?5,-3:N,
+ 6:/NH2,,-3=?5,-2=?3,-1=wb,-2=wf,-1:NH,8:/*O!^35,@$9,\,!,O,60,//O,!,NH2
+------------------------------------------------------------------------------
-Cat:pesticide;EN:Carboxin;MW:235.301;EXA:1
+Cat:biological;EN:Podophyllotoxin;MW:414.41;EXA:1
+
-<30,?6,3=dl,2:S,5:O,4:/_,@3,\,//O,!,NH,!,Ph
+<0,?5,{2,5}:O,-3=Ph2,-3=?6,-3=?5,-2:O,-1=wb,-3://O,
+ @10,\*,Ph,{-2,-3,-4}:/O!,13:/*OH,{11~wf^-60,12~zf^60}:/H
+------------------------------------------------------------------------------
-Cat:pesticide;EN:Clomazone;MW:239.7;EXA:1
+Cat:biological;EN:Warfarin;MW:308.333;EXA:1
+
-<30,Ph,2:/Cl,@3,\,!,|,?5,1:N,2:O,-2:??,-1://O
+<30,Ph,3=?6,8=dl,10:O,7:/OH,9://O,@8,\,/Ph`1,60,!,//O,!
+------------------------------------------------------------------------------
-Cat:pesticide;EN:Halfenprox;MW:477.4;EXA:1
+Cat:biological;EN:Genistein;MW:270.24;EXA:1
+
-<30,Ph,@6,\,O,!,/F^35,/F^-35,!,Br,@3,\,!,??,!,O,!,!,Ph,@-2,\,O,60,Ph
+<30,Ph,3=?6,9=dl,10:O,{2,6}:/OH,7://O,@8,\,Ph,-3:/OH
+------------------------------------------------------------------------------
-Cat:pesticide;EN:Paraquat;MW:257.16;EXA:1
+Cat:biological;EN:Baicalein;MW:270.24;EXA:1
+
-Ph,@4,\,Ph,{1,10}:N!,1:p_^-90,10:p_^90,@(5,1),Cl,n_^15,@(-0.5,1),Cl,n_^15
+<30,Ph,3=?6,9=dl,10:O,{1,2,6}:/OH,7://O,@8,\,Ph
+------------------------------------------------------------------------------
-Cat:pesticide;EN:Picolinafen;MW:376.331;EXA:1
+Cat:biological;EN:Reserpine;MW:608.688;EXA:1
+
-<30,Ph,5:/CF3,@3,\,O,!,|,Ph,2:N,@3,\,//O,!,NH,!,|,Ph,4:/F
+<54,Ph,-4=?5,-2=?6,-4=?6,-3=?6,9=dl,11:N,7:NH,10:*/H^-60,{15^-60,16^60}:/*H,
+ @20,*\,O,!,//O,!,Ph,{-2,-3,-4}:/O!,{1,19~zf>rl}:/O!,18:*/COO!>lr
+------------------------------------------------------------------------------
-Cat:pesticide;EN:Quinoxyfen;MW:308.13;EXA:1
+Cat:biological;EN:Rotenone;MW:394.423;EXA:1
+
-<30,Ph,4=Ph,10:N,{2,6}:/Cl,@7,\,O,!,|,Ph,4:/F
+<-60,?5,{-3,-2,-3,-4}=?6,{7,9,-2,-4}=dl,{3,17}=dr,
+ {2,13,16}:O,10://O,{11^-60,12^60}:*/H,{-2,-3}:/O!,@1,*\,/_,!!
+------------------------------------------------------------------------------
-Cat:pesticide;EN:Quitozene;MW:295.3;EXA:1
+Cat:biological;EN:Pyrethrin I;MW:328.452;EXA:1
+
-<30,Ph,{1,2,3,4,6}:/Cl,5:/NO2
+<30,?3,{3^35~wf,3^-35~zf}:/_,@1,*\,!!,?!,
+ @2,\*,//O,!,O,-36~zb,|,?5,-2=dl,-1:/_,-3://O,@-2,\,!4,{-1,-3}=dl
+------------------------------------------------------------------------------
-Cat:pesticide;EN:Bitertanol;MW:337.4;EXA:1
+Cat:biological;EN:Oseltamivir;MW:312.40;EXA:1
+
-<30,Ph,@3,\,Ph,@-3,\,O,!2,/OH,!,??!,@14,\,|,?5,{2,4}=dl,{1,2,4}:N
+<30,?6,3=dl,6:*/NH2,@1,\*,NH,!,//O,!,@2,*\,O,!,/!,!2,@4,\,//O,!,O,!2
+------------------------------------------------------------------------------
-Cat:pesticide;EN:Bifenox;MW:342.14;EXA:1
+Cat:biological;EN:Paclitaxel;MW:853.918;EXA:1
+
-<30,Ph,{4,6}:/Cl,@3,\,O,!,Ph,-4:/COO!,-3:/NO2
+?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
+------------------------------------------------------------------------------
-Cat:pesticide;EN:Simeconazole;MW:293.417;EXA:1
+Cat:biological;EN:Mevastatin;MW:390.52;EXA:1
+
-<36,?5,{1,3,5}:N,{1,4}=dl,@3,30,!,/OH^30,!2,Si,/_,/_^60,!,@7,-30,Ph,-3:/F
+<30,?6,2=dl,4:*/H^60,-4=?6,-4=dl,9:*/_,
+ @10,*\,!,60~wb,?6,6:O,-2://O,-4:/*OH,@5,\*,O,60,//O,!,*/_,!2
+------------------------------------------------------------------------------
-Cat:pesticide;EN:Fenamidone;MW:311.403;EXA:1
+Cat:biological;EN:Sesamine;MW:354.35;EXA:1
+
-<18,?5,4=dl,{3,5}:N,2://O,@3,\,NH,!,Ph,4:/S!,1^52:*/_,1^-48~zf:/Ph
+<54,?5,1=?5,{4,7}:O,{1^-54,2^54}:*/H,{5,8}:*/'(Ph,4=?5,7:O,9:O)^-12
+------------------------------------------------------------------------------
-Cat:pesticide;EN:Fenpyroximate;MW:421.49;EXA:1
+Cat:biological;EN:Morphine;MW:285.343;EXA:1
+
-<-6,?5,{3,5}=db,{1,2}:N,{2,5}:/Me,@3,\^-15,O,!,Ph,
- @4,\,!~dr,N,!,O,!2,|,Ph,@4,\,//O,-60,O,!4
+<30,Ph,2=?6,-4=?6,(1,12)=?5[2],-1:O,-1=zb,
+ @7,60~wf`0.75,70~si_`1.3,45,N!,&9~wb,15=dl,6:/OH,8^180:*/H,12:/*OH
+------------------------------------------------------------------------------
-Cat:pesticide;EN:Chlorsulron;MW:380.648;EXA:1
+Cat:biological;EN:Quinine;MW:324.424;EXA:1
+
-<30,Ph,6:/NH2,@1,\,SOO,!,NH2,@3,\,SOO,!,NH2,@4,\,/Cl,60~dl,/Cl,!,Cl
+<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
+------------------------------------------------------------------------------
-Cat:pesticide;EN:Enrofloxacin;MW:359.401;EXA:1
+Cat:biological;EN:Atoropin;MW:289.375;EXA:1
+
-<30,Ph,-4=?6,9=dl,7:N,6:/F,7:/?3,9:/COOH,10://O,@1,\,|,?6,1:N,4:N,4:/!
+<30,O,!,//O,!,!,Ph,@$1,\~zb^-60,|,?7`1.1,@6,*\^190`1.25,N!,&3~wb,$3:/!OH~wv
+------------------------------------------------------------------------------
-Cat:pesticide;EN:Fenitrothion;MW:277.23;EXA:1
+Cat:biological;EN:Colchicine;MW:399.443;EXA:1
+
-<-30,!,O,!,P,//S,/O!^160,!,O,!,|,Ph,3:/_,2:/NO2
+<30,Ph,{1,2,6}:/O!,-4=?7,-5=?7,{-1,-4,-6}=dl,-2://O,-3:/O!,9:/NHCO!
+------------------------------------------------------------------------------
-Cat:pesticide;EN:Fipronil;MW:437.2;EXA:1
+Cat:biological;EN:Lycorine;MW:287.315;EXA:1
+
-<30,Ph,{2,4}:/Cl,6:/CF3,@3,\,|,?5,{2,4}=dl,{1,2}:N,3:/CN,5:/NH2,
- @-2,\,S,//O,!,CF3
+<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
+------------------------------------------------------------------------------
-Cat:pesticide;EN:Flumequine;MW:261.225;EXA:1
+Cat:biological;EN:Ibotenic acid;MW:158.113;EXA:1
+
-<30,Ph,3=?6,(2,7)=?6[4],9=dl,7:N,6:/F,9:/COOH,10://O,13:/_
+<18,?5,4=dl,3:O,2:NH,1://O,@4,-24,/NH2,!,COOH
+------------------------------------------------------------------------------
-Cat:pesticide;EN:Imidacloprid;MW:255.662;EXA:1
+Cat:biological;EN:illudin S;MW:264.3;EXA:1
+
-<30,Ph,1:N,6:/Cl,@3,\,!,|,?5,2=dl,1:N,3:N,2:/'(NH,!,NO2)
+<30,?6,3=?5,6:**?3,{4,7}=dl,2://O,5:/_,
+ {1^35,8^35}:*/_,1:/*OH^-35,9:*/OH,8:/*!OH^-35
+------------------------------------------------------------------------------
-Cat:pesticide;EN:Kresoxim-Methyl;MW:313.348;EXA:1
+Cat:biological;EN:Muscarine;MW:174.26;EXA:1
+
-<30,Ph,@3,\,/COO!,!~dr,N,!,O,!,@4,\,!,O,!,Ph,-1:/_
+<18,?5,2:O,1:*/_,5:/*OH,@3,*\,48,N,??,p_^180,!
+------------------------------------------------------------------------------
-Cat:antibacterial;EN:Nalidixic acid;MW:232.239;EXA:1
+Cat:biological;EN:Psilocybin;MW:284.248;EXA:1
+
-<30,Ph,3=?6,9=dl,5:N,6:/_,7://O,8:/COOH,10:N!2
+<30,Ph,3=?5,8=dl,9:NH,@2,\,O,-60,P,//O^-45,/OH^45,90,OH,@7,\,!,-60,N?!
+------------------------------------------------------------------------------
-Cat:antibacterial;EN:Oryzalin;MW:346.4;EXA:1
+Cat:biological;EN:Tetrodotoxine;MW:319.27;EXA:1
+
-<30,Ph,{1,3}:/NO2,@5,\,SOO,!,NH2,@2,\,/!2,N,!3
+#1,<60,-90,60,-30`1.15,150,60,&1,@3,-135,60,-30`1.15,150,&4,
+ @10,\,O,60`1.33,60,&($3)~si_,@8,-15~si_,O,&12,##,
+ @9,45,-60,OH,1^120://NH,{5~zf^-15,7,9^-75,12,13~zf}:/OH,{2,6^180}:NH
+------------------------------------------------------------------------------
-Cat:antibacterial;EN:Oxadiazon;MW:345.2;EXA:1
+Cat:biological;EN:Aflatoxin B1;MW:312.27;EXA:1
+
-<30,Ph,{4,6}:/Cl,1:/O!?!,@3,\,|,?5,2=dl,{1,2}:N,4:O,5://O,3:/??!
+<30,Ph,6=?6,-2=?5,4=?5,-2=?5,{-2,10}=dl,{7,14,17}:O,
+ 2:/O!,{8,11}://O,{15^-54,16^54}:*/H
+------------------------------------------------------------------------------
-Cat:antibacterial;EN:Oxadixyl;MW:278.3;EXA:1
+%==============================================================================
+Cat:synthetic;EN:Benzene;MW:78.11;EXA:-
+
-<30,Ph,{2,4}:/_,@3,\,N,!1,//O,!2,O,!,@7,\,|,?5,1:N,2:O,5://O
+<30,Ph
+------------------------------------------------------------------------------
-Cat:antibacterial;EN:Oxyfluorfen;MW:361.701;EXA:1
+Cat:synthetic;EN:Phenol;MW:94.11;EXA:-
+
-<30,Ph,6:/CF3,4:/Cl,@3,\,O,!,Ph,-3:/NO2,@-4,\,O,!2
+<30,Ph,3:/OH
+------------------------------------------------------------------------------
-Cat:antibacterial;EN:Sulfadimidine;MW:278.33;EXA:1
+Cat:synthetic;EN:Aniline;MW:93.13;EXA:-
+
-<30,Ph,1:/NH2,@4,\,SOO,!,NH,!,|,Ph,{2,4}:N,{3,5}:/_
+<30,Ph,3:/NH2
+------------------------------------------------------------------------------
-Cat:antibacterial;EN:Sulfamerazine;MW:264.303;EXA:1
+Cat:synthetic;EN:Picric acid;MW:229.10;EXA:-
+
-<30,Ph,1:/NH2,@4,\,SOO,!,NH,!,|,Ph,{2,6}:N,3:/_
+<30,Ph,{1,3,5}:/NO2,2:/OH
+------------------------------------------------------------------------------
-Cat:antibacterial;EN:Sulfadoxine;MW:310.328;EXA:1
+Cat:synthetic;EN:Hexaphenylbenzene;MW:534.6876;EXA:1
+
-<30,Ph,1:/NH2,@4,\,SOO,!,NH,!,|,Ph,{4,6}:N,{2,3}:/O!
+<30,Ph,{1,2,3,4,5,6}:/Ph
+------------------------------------------------------------------------------
-Cat:antibacterial;EN:Sulfamethoxazole;MW:253.276;EXA:1
+Cat:synthetic;EN:Naphthalene;MW:128.17;EXA:-
+
-<30,Ph,1:/NH2,@4,\,SOO,!,NH,!,|,?5,{2,5}=dl,4:O,5:N,3:/_
+<30,Ph,3=Ph1
+------------------------------------------------------------------------------
-Cat:antibacterial;EN:Thiamethoxam;MW:291.71;EXA:1
+Cat:synthetic;EN:Anthracene;MW:178.23;EXA:-
+
-<30,?6,4:N,2:O,6:N!,5://'(N,!,NO2),@4,\,!,|,?5,{1,3}=dl,3:N,5:S,4:/Cl
+<30,Ph,3=Ph1,6=Ph1
+------------------------------------------------------------------------------
-Cat:antibacterial;EN:Thiamphenicol;MW:355;EXA:1
+Cat:synthetic;EN:Phenanthrene;MW:178.23;EXA:-
+
-<30,Ph,@1,\,SOO,!,@4,\,/OH,!,/!OH,!`1.1,NH,!`1.1,//O,!,/Cl,!,Cl
+<30,Ph,4=Ph1,6=Ph1
+------------------------------------------------------------------------------
-Cat:pesticide;EN:Pyridaphenthion;MW:340.334;EXA:1
+Cat:synthetic;EN:Naphthacene;MW:228.3;EXA:-
+
-<30,!2,O,!,P,//S,/O!2^160>rl,!,O,!,|,?6,{1,5}=dl,{2,3}:N,4://O,3:/Ph
+<30,Ph,6=Ph1,3=Ph1,-3=Ph1
+------------------------------------------------------------------------------
-Cat:pesticide;EN:Permethrin;MW:391.288;EXA:1
+Cat:synthetic;EN:Chrysene;MW:228.3;EXA:-
+
-<-30,?3,2^-35:*/_,2^35:/*_,1:/'(!!,/Cl,!,Cl),@3,\,//O,!,O,!2,|,Ph,@3,\,O,-60,Ph
+<30,Ph2,6=Ph1,4=Ph1,-4=Ph1
+------------------------------------------------------------------------------
-Cat:pesticide;EN:Isoprothiolane;MW:290.392;EXA:1
+Cat:synthetic;EN:Pyrene;MW:202.25;EXA:-
+
-<-30,!,?!,O,!,//O,!,//'(?5,2:S,5:S),!,//O,!,O,!,?!
+<30,Ph2,6=Ph1,4=Ph1,(16,7)=?6[3],-2=dl
+------------------------------------------------------------------------------
-Cat:pesticide;EN:Oxine-Copper;MW:351.852;EXA:1
+Cat:synthetic;EN:Kekulene;MW:600.7;EXA:1
+
-Ph,4:N,5=Ph,@-4,\,O,-60,<90,Cu,-90,O,60,|,Ph,5=Ph,10:N,||,@4,&12~vf,@23,&12~vf
+<30,Ph,{3,-2,-3,-2,-3,-2,-3,-2,-3,-2}=?6,(-3,6)=?6[3],@-4,&6,
+ {8,12,14,16,18,22,24,26,28,32,34,36,38,42,44,46,48,52,54,56,58}=dl
+------------------------------------------------------------------------------
-Cat:pesticide;EN:Tetraconazole;MW:372.145;EXA:1
+%==============================================================================
+Cat:synthetic;EN:12-Crown-4;MW:176.21;EXA:-
+
-<-6,?5,{2,5}=dl,{1,2,4}:N,@4,\,!3,O,!,/F^35,/F^-35,!,CF2,@7,\,|,Ph,{4,6}:/Cl
+<-180,O,30,60,60,O,-30,60,60,O,-30,60,60,O,-30,60,&1
+------------------------------------------------------------------------------
-Cat:pesticide;EN:Endosulfan;MW:406.904;EXA:1
+Cat:synthetic;EN:15-Crown-5;MW:220.26;EXA:-
+
-<26,?7,7=?6[13],@11,208~wf`1.45,&8~wb,10=dl,{3,5}:O,4:S,4://O,
- {8,9,10,11,12^-210,12^-150}:/Cl
+<-180,O,48,60,60,O,-48,60,60,O,-48,60,60,O,-48,60,60,O,-48,60,&1
+------------------------------------------------------------------------------
-Cat:pesticide;EN:Uniconazole-P;MW:291.779;EXA:1
+Cat:synthetic;EN:18-Crown-6;MW:264.32;EXA:1
+
-<30,Ph,6:/Cl,@3,\,!~dl,!,/OH,!,??!,@8,\,|,?5,{2,4}=dl,{1,2,4}:N
+<-180,O,60,60,60,O,-60,60,60,O,-60,60,60,O,-60,60,60,O,-60,60,60,O,-60,60,&1
+------------------------------------------------------------------------------
%==============================================================================
-Cat:antibacterial;EN:Oxadiargyl;MW:341.19;EXA:1
+Cat:synthetic;EN:Porphyrin;MW:310.4;EXA:1
+
-<30,Ph,{1,3}:/Cl,6:/'(O,!2,!!!),@4,\,|,?5,2=dl,{1,2}:N,4:O,5://O,3:/??!
+<9,#1,?5,@3,\,54,?5,@-2,\,54,?5,@-2,\,54,?5,@-2,\,&5,##,
+ {1,4,6,8,10,14,16,18,21,23,27}=dl,{4,17}:N,{11,23}:NH
+------------------------------------------------------------------------------
-Cat:antibacterial;EN:Oxaziclomefone;MW:376.277;EXA:1
+Cat:synthetic;EN:Sulflower;MW:448.69;EXA:1
+
-<30,?6,6=dl,4:N,2:O,1:/_,5://O,6:/Ph,@4,\,??,!,|,Ph,{3,5}:/Cl
+<67.5,?8,{1,3,5,7}=?5,@11,30`1.15,&12,@14,30`1.15,&15,
+ @17,30`1.15,&18,@20,30`1.15,&9,{9,12,13,16,17,20,21,24}=dl,
+ {10,13,16,19,21,22,23,24}:S
+------------------------------------------------------------------------------
-Cat:antibacterial;EN:Trimetoprim;MW:290.323;EXA:1
+Cat:synthetic;EN:Arsphenamine x5;MW:915.2;EXA:1
+
-<30,Ph,{1,5}:N,{2,6}:/NH2,@3,\,!,|,Ph,{3--5}:/O!
+<18,?5,{1,2,3,4,5}:As,{1,2,3,4,5}:/'(Ph,3:/NH2,4:/OH)
+------------------------------------------------------------------------------
-Cat:antibacterial;EN:Ciprofloxacin;MW:331.347;EXA:1
+Cat:synthetic;EN:Melamine;MW:126.12;EXA:1
+
-<30,Ph,-4=?6,9=dl,7:N,6:/F,7:/?3,9:/COOH,10://O,@1,\,|,?6,1:N,4:NH
+<30,Ph,{2,4,6}:N,{1,3,5}:/NH2
+------------------------------------------------------------------------------
-Cat:antibacterial;EN:Danofloxacin;MW:357.385;EXA:1
+%==============================================================================
+Cat:synthetic;EN:Sudan red 1;MW:248.28;EXA:1
+
-<30,Ph,-4=?6,9=dl,7:N,6:/F,7:/?3,9:/COOH,10://O,
- @1,\,|,?6,@2,-200`1.1,&5,{1,4}:N,4:*/_
+<30,Ph,1=Ph,4:/OH,@3,\,N,!!,N,!,Ph
+------------------------------------------------------------------------------
-Cat:pesticide;EN:Marbofloxacin;MW:362.361;EXA:1
+Cat:synthetic;EN:Basic blue 1;MW:319.86;EXA:
+
-<30,Ph,3=?6,9=dl,(2,7)=?6[4],6:/F,7:N,11:O,9:/COOH,10://O,13:N!,
- @1,\,|,?6,1:N,4:N!
+<30,Ph,3=Ph,6=Ph,2:S,5:N,{8,13}:/N?!,2:p_,@2,@(3.5,1.5),Cl,n_^15
+------------------------------------------------------------------------------
-Cat:antibacterial;EN:Ofloxacin;MW:361.373;EXA:1
+Cat:synthetic;EN:Disperse violet 1;MW:238.25;EXA:1
+
-<30,Ph,3=?6,(2,7)=?6[4],9=dl,7:N,11:O,6:/F,9:/COOH,10://O,13:/_,
- @1,\,|,?6,{1,4}:N,4:/_
+<30,Ph,3=?6,-3=dr,9=Ph,{7,10}://O,{-1,-4}:/NH2
+------------------------------------------------------------------------------
-Cat:antibacterial;EN:Ormetoprim;MW:274.324;EXA:1
+Cat:synthetic;EN:Vat blue 1;MW:262.27;EXA:1
+
-<30,Ph,{1,5}:N,{2,6}:/NH2,@3,\,!,|,Ph,2:/_,{4,5}:/O!
+<30,Ph,3=?5,@8,\\,?5,-3=dr,-3=Ph,{7,14}:NH,{9,11}://O
+------------------------------------------------------------------------------
%==============================================================================
Cat:antibiotics;EN:Amoxicillin;MW:365.4042;EXA:1
@@ -705,7 +733,7 @@ Cat:antibiotics;EN:Kanamycin;MW:484.499;EXA:1
<-30,?6,@1,\*,O,0~zb,?6,-5:O,@5,\,O,0,?6,-5:O,
{2,4,12}:*/NH2,{6,19}:*/OH,{11,13,18,20}:/*OH,10:*/!OH,17:*/!NH2
+------------------------------------------------------------------------------
-Cat:antibiotics;EN:DihydroStreptmycin;MW:583.574;EXA:1
+Cat:antibiotics;EN:DihydroStreptmycin;MW:583.574;EXA:-
+
<54,?5,3:O,4:/*_,5:/!OH^-48,5:/*OH^35,@1,\*,O,-24~wb,?6,-5:O,@2,*\,O,24~zb,?6,
{10,15}:*/OH,{11,16,18}:/*OH,9:/*!OH,12:*/NH!,
@@ -818,191 +846,11 @@ Cat:antibiotics;EN:Rifampicin;MW:822.94;EXA:1
-4:/*O!,@-6,-30,O,!,//O,!,@$11,\,!!,N,!,|,?6,1:N,4:N!
+------------------------------------------------------------------------------
%==============================================================================
-Cat:biological;EN:Trenbolone;MW:270.37;EXA:1
-+
-<30,?6,{3,10}=?6,13=?5,{2,11,15}=dl,1://O,12:*/_^60,-1:/*OH,9:*/H^60,11:/*H^-60
-+------------------------------------------------------------------------------
-Cat:biological;EN:Luciferin;MW:280.33;EXA:1
-+
-<30,Ph,3=?5,@8,\,?5,{9,16}=dl,{9,14}:N,{7,11}:S,1:/OH,-2:*/COOH
-+------------------------------------------------------------------------------
-Cat:biological;EN:Chlorophyll a;MW:893.509;EXA:1
-+
-<-36,#1,?5,@3,\,54,?5,@-2,\,54,?5,@-2,\,54,?5,@-2,\,&5,@6,22,70,&8,##,
- {4,6,8,10,14,16,18,21,23,27}=dl,@4,\`1.48~vf,Mg,&17~vb,@11,&27,@27,&23,
- {4,11,17,23}:N,{1~zf,9,15,21}:/_,14:/!,20:/!!,25:/*COO!,26://O,
- @2,*\^-6,!2,//O,!,O,!2,!!,|,!13,{1,5,9,13}:/_
-+------------------------------------------------------------------------------
-%==============================================================================
-Cat:biological;EN:Flavone;MW:222.24;EXA:3
-+
-<30,Ph,3=?6,9=dl,10:O,7://O,9:/Ph,
-+------------------------------------------------------------------------------
-Cat:biological;EN:Isoflavone;MW:222.24;EXA:3
-+
-<30,Ph,3=?6,9=dl,10:O,7://O,8:/Ph,
-+------------------------------------------------------------------------------
-Cat:biological;EN:Flavanone;MW:224.25;EXA:3
-+
-<30,Ph,3=?6,10:O,7://O,8:/OH,9:/Ph,
-+------------------------------------------------------------------------------
-Cat:biological;EN:Flavonol;MW:238.24;EXA:3
-+
-<30,Ph,3=?6,9=dl,10:O,7://O,8:/OH,9:/Ph,
-+------------------------------------------------------------------------------
-Cat:biological;EN:Cianidanol;MW:290.27;EXA:3
-+
-<30,Ph,3=?6,@8,*\,Ph,7:O,{1,5,13,14}:/OH,9:/*OH
-+------------------------------------------------------------------------------
-Cat:biological;EN:Quercetin;MW:302.24;EXA:1
-+
-<30,Ph,3=?6,@9,\,Ph,9=dl,10:O,7://O,{2,6,8,13,14}:/OH
-+------------------------------------------------------------------------------
-%==============================================================================
-Cat:biological;EN:Limonin;MW:470.518;EXA:1
-+
-<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:??,{1^60,5^180,16^60}:/*H,
- @14,\*,|,?5,{1,4}=dl,3:O
-+------------------------------------------------------------------------------
-Cat:biological;EN:Cromolyn;MW:468.37;EXA:1
-+
-<30,Ph,|,-1=?6,3=dl,1:O,4://O,2:/COOH,
- @$2,\,O,!2,/OH,!2,O,60,Ph,|,-5=?6,3=dl,4:O,1://O,3:/COOH
-+------------------------------------------------------------------------------
-Cat:biological;EN:Emetine;MW:480.649;EXA:1
-+
-<30,Ph,{-4,-4}=?6,8:N,{1,6}:/O!,-2:/*!,{7^-60,12^-60}:/*H,
- @-3,\,!~zb,<-60,|,?6,5=dl,2:NH,-6^-60:*/H,|,-2=?6,{2,4}=dl,{-2,-3}:/O!
-+------------------------------------------------------------------------------
-Cat:biological;EN:Acronycine;MW:321.376;EXA:1
-+
-<30,Ph,|,-4=?6,1:N!,4://O,-3=Ph2,-1:/O!,|,-4=?6,2=dl,4:O,3:??
-+------------------------------------------------------------------------------
-Cat:biological;EN:Piperine;MW:285.343;EXA:1
-+
-<30,Ph,|,-1=?5,{1,3}:O,@$4,\,!!,!,!!,!,//O,!,|,?6,1:N
-+------------------------------------------------------------------------------
-Cat:biological;EN:Febrifugine;MW:301.346;EXA:1
-+
-<30,Ph,|,-4=?6,2=dl,{1,3}:N,4://O,@$9,\,!,//O,!,!~zf,|,?6,2:NH,-1:*/OH
-+------------------------------------------------------------------------------
-Cat:biological;EN:Mitomycine C;MW:334.332;EXA:1
-+
-<30,?6,{3,6}=dl,{2,5}://O,1:/_,-4=?5,-3:N,
- 6:/NH2,,-3=?5,-2=?3,-1=wb,-2=wf,-1:NH,8:/*O!^35,@$9,\,!,O,60,//O,!,NH2
-+------------------------------------------------------------------------------
-Cat:biological;EN:Podophyllotoxin;MW:414.41;EXA:1
-+
-<0,?5,{2,5}:O,-3=Ph2,-3=?6,-3=?5,-2:O,-1=wb,-3://O,
- @10,\*,Ph,{-2,-3,-4}:/O!,13:/*OH,{11~wf^-60,12~zf^60}:/H
-+------------------------------------------------------------------------------
-Cat:biological;EN:Warfarin;MW:308.333;EXA:1
-+
-<30,Ph,3=?6,8=dl,10:O,7:/OH,9://O,@8,\,/Ph`1,60,!,//O,!
-+------------------------------------------------------------------------------
-Cat:biological;EN:Genistein;MW:270.24;EXA:-
-+
-<30,Ph,3=?6,9=dl,10:O,{2,6}:/OH,7://O,@8,\,Ph,-3:/OH
-+------------------------------------------------------------------------------
-Cat:biological;EN:Baicalein;MW:270.24;EXA:1-
-+
-<30,Ph,3=?6,9=dl,10:O,{1,2,6}:/OH,7://O,@8,\,Ph
-+------------------------------------------------------------------------------
-Cat:biological;EN:Reserpine;MW:608.688;EXA:1
-+
-<54,Ph,-4=?5,-2=?6,-4=?6,-3=?6,9=dl,11:N,7:NH,10:*/H^-60,{15^-60,16^60}:/*H,
- @20,*\,O,!,//O,!,Ph,{-2,-3,-4}:/O!,{1,19~zf>rl}:/O!,18:*/COO!>lr
-+------------------------------------------------------------------------------
-Cat:biological;EN:Rotenone;MW:394.423;EXA:1
-+
-<-60,?5,{-3,-2,-3,-4}=?6,{7,9,-2,-4}=dl,{3,17}=dr,
- {2,13,16}:O,10://O,{11^-60,12^60}:*/H,{-2,-3}:/O!,@1,*\,/_,!!
-+------------------------------------------------------------------------------
-Cat:biological;EN:Pyrethrin I;MW:328.452;EXA:1
-+
-<30,?3,{3^35~wf,3^-35~zf}:/_,@1,*\,!!,?!,
- @2,\*,//O,!,O,-36~zb,|,?5,-2=dl,-1:/_,-3://O,@-2,\,!4,{-1,-3}=dl
-+------------------------------------------------------------------------------
-Cat:biological;EN:Oseltamivir;MW:312.40;EXA:1
-+
-<30,?6,3=dl,6:*/NH2,@1,\*,NH,!,//O,!,@2,*\,O,!,/!,!2,@4,\,//O,!,O,!2
-+------------------------------------------------------------------------------
-Cat:biological;EN:Paclitaxel;MW:853.918;EXA:1
-+
-?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
-+------------------------------------------------------------------------------
-Cat:biological;EN:Mevastatin;MW:390.52;EXA:1
-+
-<30,?6,2=dl,4:*/H^60,-4=?6,-4=dl,9:*/_,
- @10,*\,!,60~wb,?6,6:O,-2://O,-4:/*OH,@5,\*,O,60,//O,!,*/_,!2
-+------------------------------------------------------------------------------
-Cat:biological;EN:Sesamine;MW:354.35;EXA:1
-+
-<54,?5,1=?5,{4,7}:O,{1^-54,2^54}:*/H,{5,8}:*/'(Ph,4=?5,7:O,9:O)^-12
-+------------------------------------------------------------------------------
-Cat:biological;EN:Morphine;MW:285.343;EXA:1
-+
-<30,Ph,2=?6,-4=?6,(1,12)=?5[2],-1:O,-1=zb,
- @7,60~wf`0.75,70~si_`1.3,45,N!,&9~wb,15=dl,6:/OH,8^180:*/H,12:/*OH
-+------------------------------------------------------------------------------
-Cat:biological;EN:Quinine;MW:324.424;EXA:1
-+
-<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
-+------------------------------------------------------------------------------
-Cat:biological;EN:Atoropin;MW:289.375;EXA:1
-+
-<30,O,!,//O,!,!,Ph,@$1,\~zb^-60,|,?7`1.1,@6,*\^190`1.25,N!,&3~wb,$3:/!OH~wv
-+------------------------------------------------------------------------------
-Cat:biological;EN:Colchicine;MW:399.443;EXA:1
-+
-<30,Ph,{1,2,6}:/O!,-4=?7,-5=?7,{-1,-4,-6}=dl,-2://O,-3:/O!,9:/NHCO!
-+------------------------------------------------------------------------------
-Cat:biological;EN:Lycorine;MW:287.315;EXA:1
-+
-<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
-+------------------------------------------------------------------------------
-Cat:biological;EN:Ibotenic acid;MW:158.113;EXA:1
-+
-<18,?5,4=dl,3:O,2:NH,1://O,@4,-24,/NH2,!,COOH
-+------------------------------------------------------------------------------
-Cat:biological;EN:illudin S;MW:264.3;EXA:1
-+
-<30,?6,3=?5,6:**?3,{4,7}=dl,2://O,5:/_,
- {1^35,8^35}:*/_,1:/*OH^-35,9:*/OH,8:/*!OH^-35
-+------------------------------------------------------------------------------
-Cat:biological;EN:Muscarine;MW:174.26;EXA:1
-+
-<18,?5,2:O,1:*/_,5:/*OH,@3,*\,48,N,??,p_^180,!
-+------------------------------------------------------------------------------
-Cat:biological;EN:Psilocybin;MW:284.248;EXA:1
-+
-<30,Ph,3=?5,8=dl,9:NH,@2,\,O,-60,P,//O^-45,/OH^45,90,OH,@7,\,!,-60,N?!
-+------------------------------------------------------------------------------
-Cat:biological;EN:Tetrodotoxine;MW:319.27;EXA:1
-+
-#1,<60,-90,60,-30`1.15,150,60,&1,@3,-135,60,-30`1.15,150,&4,
- @10,\,O,60`1.33,60,&($3)~si_,@8,-15~si_,O,&12,##,
- @9,45,-60,OH,1^120://NH,{5~zf^-15,7,9^-75,12,13~zf}:/OH,{2,6^180}:NH
-+------------------------------------------------------------------------------
-Cat:biological;EN:Aflatoxin B1;MW:312.27;EXA:1
-+
-<30,Ph,6=?6,-2=?5,4=?5,-2=?5,{-2,10}=dl,{7,14,17}:O,
- 2:/O!,{8,11}://O,{15^-54,16^54}:*/H
-+------------------------------------------------------------------------------
-%==============================================================================
-% other molecular data
-%==============================================================================
-Cat:pesticide;EN:BHC;MW:290.83;EXA:-
+Cat:pesticide;EN:BHC;MW:290.83;EXA:1
+
<30,?6`1.2,{1,3,4,6}:*/Cl,{2,5}:/*Cl
+------------------------------------------------------------------------------
-Cat:pesticide;EN:pp-DDT;MW:354.49;EXA:-
+Cat:pesticide;EN:pp-DDT;MW:354.49;EXA:1
+
<30,Ph,6:/Cl,@3,\,/CCl3,!,Ph,-3:/Cl
+------------------------------------------------------------------------------
@@ -1018,24 +866,24 @@ Cat:pesticide;EN:pp-DDE;MW:318;EXA:-
+
<30,Ph,6:/Cl,@3,\,/CCl2~dm,!,Ph,-3:/Cl
+------------------------------------------------------------------------------
-Cat:pesticide;EN:EPN;MW:323.303;EXA:-
+Cat:pesticide;EN:EPN;MW:323.303;EXA:1
+
<30,!2,O,!,P,//S,/Ph^170,!,O,!,|,Ph,4:/NO2
+------------------------------------------------------------------------------
-Cat:pesticide;EN:XMC;MW:179.2;EXA:-
+Cat:pesticide;EN:XMC;MW:179.2;EXA:1
+
<30,Ph,{1,5}:/_,@3,\,O,!,//O,!,NH,!
+------------------------------------------------------------------------------
-Cat:pesticide;EN:Acrinathrin;MW:541.45;EXA:-
+Cat:pesticide;EN:Acrinathrin;MW:541.45;EXA:1
+
<-30,?3,2^-35:*/_,2^35:/*_,
@1,\,!~dl,!,//O,!,O,!,/CF3,!,CF3,@3,\,//O,!,O,!,/CN,!,Ph,@-4,\,O,-60,Ph
+------------------------------------------------------------------------------
-Cat:pesticide;EN:Azaconazole;MW:300.139;EXA:-
+Cat:pesticide;EN:Azaconazole;MW:300.139;EXA:1
+
<30,Ph,{4,6}:/Cl,@3,\,!2,?5,{-2,-4}=dl,{-2,-4,-5}:N,@7,?5,{-1,-4}:O
+------------------------------------------------------------------------------
-Cat:pesticide;EN:Acetochlor;MW:269.769;EXA:-
+Cat:pesticide;EN:Acetochlor;MW:269.769;EXA:1
+
<30,Ph,2:/_,4:/!,@3,\,N,!2,O,!2,@7,\,//O,!2,Cl
+------------------------------------------------------------------------------
@@ -1371,7 +1219,7 @@ Cat:pesticide;EN:Tebufenpyrad;MW:333.86;EXA:-
+
<6,?5,{3,5}=dl,{1,2}:N,4:/Cl,5:/!,2:/_,@3,\,//O,!,NH,!2,Ph,-3:/??!
+------------------------------------------------------------------------------
-Cat:pesticide;EN:Tefluthrin;MW:418.736
+Cat:pesticide;EN:Tefluthrin;MW:418.736;EXA:-
+
<-30,?3,{2^-35~wf,2^35~zf}:/_,@1,\,!~dl,/CF3,!,Cl,
@3,\,//O,!,O,!2,|,Ph,{2,3,5,6}:/F,4:/_
@@ -1766,6 +1614,27 @@ Cat:pesticide;EN:Lenacil;MW:234.3;EXA:-
+
<30,?6,3=?5,3=dl,6:N,2:NH,{1,5}://O,6:/?6
+------------------------------------------------------------------------------
+Cat:pesticide;EN:Halfenprox;MW:477.4;EXA:-
++
+<30,Ph,@6,\,O,!,/F^35,/F^-35,!,Br,@3,\,!,??,!,O,!,!,Ph,@-2,\,O,60,Ph
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Paraquat;MW:257.16;EXA:-
++
+Ph,@4,\,Ph,{1,10}:N!,1:p_^-90,10:p_^90,@1,@(0,1.2),Cl,n_^15,@10,@(0,1.2),Cl,n_^15
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Oxine-Copper;MW:351.852;EXA:-
++
+Ph,4:N,5=Ph,@-4,\,O,-60,<90,Cu,-90,O,60,|,Ph,5=Ph,10:N,||,@4,&12~vf,@23,&12~vf
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Endosulfan;MW:406.904;EXA:-
++
+<26,?7,7=?6[13],@11,208~wf`1.45,&8~wb,10=dl,{3,5}:O,4:S,4://O,
+ {8,9,10,11,12^-210,12^-150}:/Cl
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Uniconazole-P;MW:291.779;EXA:-
++
+<30,Ph,6:/Cl,@3,\,!~dl,!,/OH,!,??!,@8,\,|,?5,{2,4}=dl,{1,2,4}:N
++------------------------------------------------------------------------------
%******************************************************************************
Cat:pesticide;EN:Azinphos-methyl;MW:317.318;EXA:-
+
@@ -1812,10 +1681,6 @@ Cat:pesticide;EN:Indoxacarb;MW:527.837;EXA:-
<-6,Ph,3=?5,9=?6,15=dl,10:O,{12,13}:N,1:/Cl,8`1^-54:/COO!,
@12,\,//O,!,N,/COO!,!,Ph,@-3,\,O,!,CF3
+------------------------------------------------------------------------------
-Cat:pesticide;EN:Oxaziclomefone;MW:376.277;EXA:-
-+
-<30,?6,6=dl,2:O,4:N,1:/_,5://O,6:/Ph,@4,\,??,!,|,Ph,{3,5}:/Cl
-+------------------------------------------------------------------------------
Cat:pesticide;EN:Oxamyl;MW:219.3;EXA:-
+
<-30,!,N,/_,!,//O,!,/S!,!~dr,N,!,O,!,//O,!,NH,!
@@ -2060,23 +1925,23 @@ Cat:pesticide;EN:Lufenuron;MW:511.15;EXA:-
@3,\,//O,!,NH,!,//O,!,NH,!,Ph,{-1,-4}:/Cl,@-3,\,O,!,/F^35,/F^-35,!,/F,!,CF3
+------------------------------------------------------------------------------
%******************************************************************************
-Cat:antibacterial;EN:Sulfacetamide;MW:214.239;EXA:-
+Cat:antibacterial;EN:Sulfacetamide;MW:214.239;EXA:1
+
<30,Ph,1:/NH2,@4,\,SOO,!,NH,!,//O,!
+------------------------------------------------------------------------------
-Cat:antibacterial;EN:Sulfatiazole;MW:255.31;EXA:-
+Cat:antibacterial;EN:Sulfatiazole;MW:255.31;EXA:1
+
<30,Ph,1:/NH2,@4,\,SOO,!,NH,!,|,?5,{1,3}=dl,2:N,5:S
+------------------------------------------------------------------------------
-Cat:antibacterial;EN:Chlopidol;MW:192.039;EXA:-
+Cat:antibacterial;EN:Chlopidol;MW:192.039;EXA:1
+
<30,Ph,{1,3}:/_,2:N,{4,6}:/Cl,5:/OH
+------------------------------------------------------------------------------
-Cat:antibacterial;EN:Sulfadiadine;MW:250.276;EXA:-
+Cat:antibacterial;EN:Sulfadiadine;MW:250.276;EXA:1
+
<30,Ph,1:/NH2,@4,\,SOO,!,NH,!,|,Ph,{2,6}:N
+------------------------------------------------------------------------------
-Cat:antibacterial;EN:Levamisole;MW:204.29;EXA:-
+Cat:antibacterial;EN:Levamisole;MW:204.29;EXA:1
+
?5,3=?5,6=dl,2:S,{4,6}:N,@7,\,Ph
+------------------------------------------------------------------------------
@@ -2084,49 +1949,49 @@ Cat:antibacterial;EN:5-(Propylsulphonyl)-1-H-Benzimidazole-2-Amine;MW:0;EXA:-
+
<30,Ph,3=?6,8=dl,7:N,9:NH,6:/S!3,8:/NH2
+------------------------------------------------------------------------------
-Cat:antibacterial;EN:Sulfapyrizine;MW:249.288;EXA:-
+Cat:antibacterial;EN:Sulfapyrizine;MW:249.288;EXA:1
+
<30,Ph,1:/NH2,@4,\,SOO,!,NH,!,|,Ph,6:N
+------------------------------------------------------------------------------
-Cat:antibacterial;EN:Marbofloxacin;MW:362.361;EXA:-
+Cat:antibacterial;EN:Marbofloxacin;MW:362.361;EXA:1
+
<30,Ph,3=?6,-3=dl,(2,7)=?6[4],6:/F,{7,13}:N,11:O,9:/COOH,10://O,13:/_,
@1,\,|,?6,{1,4}:N,4:/_
+------------------------------------------------------------------------------
-Cat:antibacterial;EN:Sulfamerazine;MW:264.303;EXA:-
+Cat:antibacterial;EN:Sulfamerazine;MW:264.303;EXA:1
+
<30,Ph,1:/NH2,@4,\,SOO,!,NH,!,|,Ph,{2,6}:N,3:/_
+------------------------------------------------------------------------------
-Cat:antibacterial;EN:Trimetoprim;MW:290.323;EXA:-
+Cat:antibacterial;EN:Trimetoprim;MW:290.323;EXA:1
+
<30,Ph,{1,5}:N,6:/NH2,@3,\,!,|,Ph,{3,4,5}:/O!
+------------------------------------------------------------------------------
-Cat:antibacterial;EN:Ofloxacin;MW:361.373;EXA:-
+Cat:antibacterial;EN:Ofloxacin;MW:361.373;EXA:1
+
<30,Ph,3=?6,(2,7)=?6[4],7:N,11:O,9:/COOH,10://O,13:/_,@1,\,|,?6,{1,4}:N,4:/!
+------------------------------------------------------------------------------
-Cat:antibacterial;EN:Ciprofloxacin;MW:331.347;EXA:-
+Cat:antibacterial;EN:Ciprofloxacin;MW:331.347;EXA:1
+
<30,Ph,-4=?6,9=dl,7:N,6:/F,7:/?3,9:/COOH,10://O,@1,\,|,?6,1:N,4:NH
+------------------------------------------------------------------------------
-Cat:antibacterial;EN:Enrofloxacin;MW:359.401;EXA:-
+Cat:antibacterial;EN:Enrofloxacin;MW:359.401;EXA:1
+
<30,Ph,-4=?6,9=dl,7:N,6:/F,7:/?3,9:/COOH,10://O,@1,\,|,?6,{1,4}:N,4:/!
+------------------------------------------------------------------------------
-Cat:antibacterial;EN:Danofloxacin;MW:357.385;EXA:-
+Cat:antibacterial;EN:Danofloxacin;MW:357.385;EXA:1
+
<30,Ph,-4=?6,9=dl,7:N,6:/F,7:/?3,9:/COOH,10://O,
@1,\,|,?6,@2,-200`1.1,&5,{1,4}:N,4:*/_
+------------------------------------------------------------------------------
-Cat:antibacterial;EN:Ormetoprim;MW:274.324;EXA:-
+Cat:antibacterial;EN:Ormetoprim;MW:274.324;EXA:1
+
<30,Ph,{1,5}:N,{2,6}:/NH2,@3,\,!,|,Ph,2:/_,{4,5}:/O!
+------------------------------------------------------------------------------
-Cat:antibacterial;EN:Sulfadimidine;MW:278.33;EXA:-
+Cat:antibacterial;EN:Sulfadimidine;MW:278.33;EXA:1
+
<30,Ph,1:/NH2,@4,\,SOO,!,NH,!,|,Ph,{2,4}:N,{3,5}:/_
+------------------------------------------------------------------------------
-Cat:antibacterial;EN:Orbifloxacin;MW:395.382;EXA:-
+Cat:antibacterial;EN:Orbifloxacin;MW:395.382;EXA:1
+
<30,Ph,-4=?6,9=dl,7:N,{2,5,6}:/F,7:/?3,9:/COOH,10://O,
@1,\,|,?6,1:N,{3,5}:*/_,4:NH
@@ -2135,11 +2000,11 @@ Cat:antibacterial;EN:Sulfamethoxypyridazine;MW:280.302;EXA:-
+
<30,Ph,1:/NH2,@4,\,SOO,!,NH,!,|,Ph,{5,6}:N,4:/O!
+------------------------------------------------------------------------------
-Cat:antibacterial;EN:Sarafloxacin;MW:385.371;EXA:-
+Cat:antibacterial;EN:Sarafloxacin;MW:385.371;EXA:1
+
<30,Ph,3=?6,9=dl,7:N,6:/F,9:/COOH,10://O,@1,\,?6,-6:N,-3:NH,@7,\,|,Ph,-3:/F
+------------------------------------------------------------------------------
-Cat:antibacterial;EN:Difloxacin;MW:399.398;EXA:-
+Cat:antibacterial;EN:Difloxacin;MW:399.398;EXA:1
+
<30,Ph,-4=?6,9=dl,7:N,6:/F,9:/COOH,10://O,@1,\,|,?6,{1,4}:N,4:/_,
||,@7,\,Ph,-3:/F
@@ -2156,19 +2021,19 @@ Cat:antibacterial;EN:Sulfadoxine;MW:310.328;EXA:-
+
<30,Ph,1:/NH2,@4,\,SOO,!,NH,!,|,Ph,{4,6}:N,{2,3}:/O!
+------------------------------------------------------------------------------
-Cat:antibacterial;EN:Sulfamethoxazole;MW:253.276;EXA:-
+Cat:antibacterial;EN:Sulfamethoxazole;MW:253.276;EXA:1
+
<30,Ph,1:/NH2,@4,\,SOO,!,NH,!,|,?5,{2,5}=dl,4:O,5:N,3:/_
+------------------------------------------------------------------------------
-Cat:antibacterial;EN:Pirimethamin;MW:248.714;EXA:-
+Cat:antibacterial;EN:Pirimethamin;MW:248.714;EXA:1
+
<30,?6,{1,4}=dl,{1,5}:N,4:/!,6://NH,@3,\,Ph,-3:/Cl
+------------------------------------------------------------------------------
-Cat:antibacterial;EN:Oxibendazole;MW:249.27;EXA:-
+Cat:antibacterial;EN:Oxibendazole;MW:249.27;EXA:1
+
<30,Ph,-4=?5,9=dl,7:NH,9:N,1:/O!3,@8,\,NH,!,COOH
+------------------------------------------------------------------------------
-Cat:antibacterial;EN:Oxolinic acid;MW:261.233;EXA:-
+Cat:antibacterial;EN:Oxolinic acid;MW:261.233;EXA:1
+
<30,Ph,3=?6,6=?5,9=dl,7:N,{11,13}:O,10://O,7:/!,9:/COOH
+------------------------------------------------------------------------------
@@ -2208,47 +2073,16 @@ Cat:antibacterial;EN:Xylazine;MW:220.334;EXA:-
+
<30,?6,3=dl,2:S,4:N,@3,\,NH,!,|,Ph,{2,6}:/_
+------------------------------------------------------------------------------
-Cat:antibacterial;EN:Tiamulin;MW:493.74;EXA:-
-+
-<-45.5,?8,-3=?5,@8,#.8,-210~zf,/_^60,45,56,##,&6~zb,
- {3^-45,5,8}:*/_,@3,\*^30,!~dl,4:/*OH,11://O,7:*/H^60,||,
- @1,\^15,O,!,//O,!2,S,60,60,-60,N,/!,60,-60
-+------------------------------------------------------------------------------
-Cat:antibacterial;EN:alfa-Trenbolone;MW:312.403;EXA:-
-+
-<30,?6,{3,10}=?6,13=?5,{2,11,15}=dl,1://O,12:*/_^60,-1:/*OH
-+------------------------------------------------------------------------------
-Cat:antibacterial;EN:beta-Trenbolone;MW:312.403;EXA:-
-+
-<30,?6,{3,10}=?6,13=?5,{2,11,15}=dl,1://O,12:*/_^60,-1:*/OH
-+------------------------------------------------------------------------------
Cat:antibacterial;EN:Famphur;MW:325.3;EXA:-
+
<-30,!,O,!,P,//S,/O!^160,!,O,!,Ph,@-3,\,SOO,!,N!,!
+------------------------------------------------------------------------------
-Cat:antibacterial;EN:Lincomycin;MW:406.54;EXA:-
+Cat:antibacterial;EN:Lincomycin;MW:406.54;EXA:1
+
<6,?5,5:N,5:*/_,2:*/!2,
@3,\*,//O,!,NH,!,!~wb,?6,-1:O,-3:/*OH,{-4,-5}:*/OH,-2:/*S!,
@8,\^-30,/_,60,OH
+------------------------------------------------------------------------------
-Cat:antibacterial;EN:Emamectine;MW:886.133;EXA:-
-+
-<24,?6,6=?5,3=dl,9:O,2:*/OH,3:/_,6:/*OH^-60,
- @5,#1.04,6,//O,-60,O,60,60,-60,60,60,-60,60,60,60,-60,60,##,&7,
- 3=wb,{-1,-3,-7}=dl,(-11,-10)=?6[4],@-2,?6,-1=wb,-6=zf,-2=dl,
- {-5,-6}:O,-3:/*_,-4:/?!,
- 17:/_,19:/*_,@18,\,O,!,?6`.8,-1:O,-2:*/_,-4:*/O!,
- @-3,\,O,60,?6`.8,-1:O,-2:*/_,-3:/*OH,-4:*/O!,-5:/*O!
-+------------------------------------------------------------------------------
-Cat:antibacterial;EN:Tilmicosin;MW:869.133;EXA:-
-+
-<-90,#1,60,60,-60,60,60,-60,60,60,-60,60,60,60,-60,60,-60,&1,##,
- {12,14}=dl,2:O,1:/*!,5:/*OH,{3,11}://O,{6,10}:/*_,14:/_,
- @7,\*,O,0,?6`.7,-5:O,-2:/NMe!,,{-1,-3}:/OH,-4:/_,
- @8,\*,!2,?6`.7,-6:N,{-2,-4}:*/_,
- @16,\,-60,O,0,?6`.7,-5:O,{-1,-2}:/O!,-3:/OH,-4:/_
-+------------------------------------------------------------------------------
Cat:antibacterial;EN:2-acethylamino-5-nitrothiazole;MW:187.178;EXA:-
+
<18,?5,{2,5}=dl,2:N,4:S,3:/NHCO!,5:/NO2
@@ -2266,6 +2100,14 @@ Cat:antibacterial;EN:Thiamphenicol;MW:355;EXA:-
+
<30,Ph,@1,\,SOO,!,@4,\,/OH,!,/!OH,!`1.1,NH,!`1.1,//O,!,/Cl,!,Cl
+------------------------------------------------------------------------------
+Cat:antibacterial;EN:Oxadiargyl;MW:341.19;EXA:-
++
+<30,Ph,{1,3}:/Cl,6:/'(O,!2,!!!),@4,\,|,?5,2=dl,{1,2}:N,4:O,5://O,3:/??!
++------------------------------------------------------------------------------
+Cat:antibacterial;EN:Oxaziclomefone;MW:376.277;EXA:-
++
+<30,?6,6=dl,4:N,2:O,1:/_,5://O,6:/Ph,@4,\,??,!,|,Ph,{3,5}:/Cl
++------------------------------------------------------------------------------
%******************************************************************************
Cat:antibiotics;EN:Vancomycin;MW:1449.25;EXA:2
+
diff --git a/graphics/mcf2graph/mcf_exa_soc.mf b/graphics/mcf2graph/mcf_exa_soc.mf
index 1f947a342f..64563827f0 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.07.18
+% Molecular Coding Format for mcf_example.tex by Akira Yamaji 2021.08.01
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-input mcf2graph.mf; %%% it must be version 4.69
-message "* mcf_exa_soc 2021.07.18";
+input mcf2graph.mf; %%% it must be version 4.70
+message "* mcf_exa_soc 2021.08.01";
message "";
%------------------------------------------------------------------------------
fsize:=(35mm,24mm);
@@ -14,7 +14,7 @@ tag1:="J"; tag2:="C"; tag3:="fm"; tag4:="mw"; tag5:="EN"; tag6:="MW";
%ext(defaultfont:="uhvr8r"; defaultscale:=.6; label.lrt(inf_EN,(-2bp,1.5bp));)
%sw_output:=Font;
%ext(defaultfont:="uhvr8r"; defaultscale:=.6;
-%label.lrt(inf_EN&"MW="&cal_MW
+%label.lrt(inf_EN&" MW="&cal_MW
% &"("&decimal(num_MW-scantokens(inf_MW))&")",(-2bp,1.5bp));
%)
%------------------------------------------------------------------------------
diff --git a/graphics/mcf2graph/mcf_example.pdf b/graphics/mcf2graph/mcf_example.pdf
index 0201f795ed..ea5fc8c2c8 100644
--- a/graphics/mcf2graph/mcf_example.pdf
+++ b/graphics/mcf2graph/mcf_example.pdf
Binary files differ
diff --git a/graphics/mcf2graph/mcf_example.tex b/graphics/mcf2graph/mcf_example.tex
index 0069f100e6..c9fe31929a 100644
--- a/graphics/mcf2graph/mcf_example.tex
+++ b/graphics/mcf2graph/mcf_example.tex
@@ -1,5 +1,5 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Example of MCF typeset by LaTeX mcf_examples.tex by A.Yamaji 2021.07.18
+% Example of MCF typeset by LaTeX mcf_examples.tex by A.Yamaji 2021.08.01
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\documentclass[a4paper]{article}
\usepackage{graphicx}
@@ -10,7 +10,7 @@
%--------------------------------
%%%%\pdfpkresolution=1200
%--------------------------------
-%%%%\edef\f@ext{pk}%
+%%%\edef\f@ext{pk}%
\edef\f@ext{mps}%
%--------------------------------
\pagestyle{empty}
diff --git a/graphics/mcf2graph/mcf_man_soc.mf b/graphics/mcf2graph/mcf_man_soc.mf
index 1561ec3b64..179f38de43 100644
--- a/graphics/mcf2graph/mcf_man_soc.mf
+++ b/graphics/mcf2graph/mcf_man_soc.mf
@@ -1,9 +1,9 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Molecular Coding Format file for mcf_manual.tex by Akira.Yamaji 2021.07.18
+% Molecular Coding Format file for mcf_manual.tex by Akira.Yamaji 2021.08.01
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-input mcf2graph.mf; %% it must be version 4.69
+input mcf2graph.mf; %% it must be version 4.70
% ** use data base file 'mcf_data_base.mcf'
-message "mcf_man_soc 2021.07.18"; message "";
+message "mcf_man_soc 2021.08.01"; message "";
%------------------------------------------------------------------------
sw_mframe:=0;
sw_expand:=0;
@@ -591,7 +591,7 @@ beginfont("EN:Move position")
fsize:=(70mm,16mm);
fmargin:=(2mm,1mm);
sw_trimming:=1;
- MC(<30,?6,@3,\,!3,//O,!,O,n_^60,@(6,1),H,p_^15)
+ MC(<30,?6,@3,\,!3,//O,!,O,n_^60,@$(6,1),H,p_^15)
add(drawdot A1 withpen pencircle scaled 2bp;
pickup pencircle scaled 0.1bp;
for i=0 upto 6:
@@ -1269,35 +1269,26 @@ beginfont("EN:Paclitaxel","MW:853.91",
if check(mc)=0: MC(scantokens(mc)) fi
endfont
%***************************************************************************
-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 ")
- %-----------------------------------------
+beginfont("EN:Maltose","MW:342.3",
+ %------------------------------------------------------
+ ": #1.25,-30~wf_r,30~bd_r`1,30~wb_r,120,O,30,&1,##, ",
+ ": {1^$-90,2^$90,3^$-90}:/OH`-.5,6^$90:/!OH`-.5, ",
+ ": @4,$-50~arc_lb`1,O,$50~arc_br`1,<$0, ",
+ ": |,#1.25,-30~wf_r,30~bd_r`1,30~wb_r,120,O,30,&1,##,",
+ ": {2^$90,3^$-90,4^$-90}:/OH`-.5,6^$90:/!OH`-.5 ")
+ %------------------------------------------------------
fsize:=(50mm,20mm);
if check(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)=0: MC(scantokens(mc)) fi
-endfont
-%***************************************************************************
-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 ")
- %----------------------------------------
+beginfont("EN:Cellobiose","MW:342.3",
+ %------------------------------------------------------
+ ": #1.25,-30~wf_r,30~bd_r`1,30~wb_r,120,O,30,&1,##, ",
+ ": {1^$-90,2^$90,3^$-90}:/OH`-.5,6^$90:/!OH`-.5, ",
+ ": @4,$0~arc_ltr,O,$0~arc_lbr, ",
+ ": |,#1.25,-30~wf_r,30~bd_r`1,30~wb_r,120,O,30,&1,##,",
+ ": {2^$90,3^$-90,4^$-90}:/OH`-.5,6^$90:/!OH`-.5 ")
+ %------------------------------------------------------
fsize:=(50mm,20mm);
if check(mc)=0: MC(scantokens(mc)) fi
endfont
diff --git a/graphics/mcf2graph/mcf_manual.pdf b/graphics/mcf2graph/mcf_manual.pdf
index e3f8d908bc..0cb30245ad 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 415adf1bf0..077d105ae3 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.07.18
+% Molecular Coding Format manual by Akira Yamaji 2021.08.01
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\documentclass[a4paper]{article}
\usepackage[pdftex]{graphicx}
@@ -667,10 +667,11 @@ MC(<30,?6,{4,6}:/iBuOH)
\subsubsection{Move position}
\index{"@()}%
\begin{verbatim}
-@(x,y) : Move to (l*x,l*y) from origin
- ** l=bond length of ring
+@(x,y) : Move (l*x,l*y) from current position
+@$(x,y): Move (l*x,l*y) from origin(@1)
+ ** l=bond length of ring
-<30,?6,@3,!4,//O,!,O,n_^60,@(6,1),H,p_^15
+<30,?6,@3,!4,//O,!,O,n_^60,@$(6,1),H,p_^15
\end{verbatim}
\MCFgraph
%-----------------------------------------------------------------------------
@@ -1451,46 +1452,52 @@ endfont
\end{verbatim}
\MCFgraph
%-----------------------------------------------------------------------------
-\subsection{Lycorine}
+\subsection{Maltose}
+\index{arc\_lb}
+\index{arc\_br}
\begin{verbatim}
-beginfont("EN:Lycorine","MW:287.31",
- %--------------------------------------
- ": 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 ")
- %--------------------------------------
+(bond type for glycan)
+arc_lb : arc left > bottom
+arc_br : arc bottom right
+
+beginfont("EN:Maltose","MW:342.3",
+ %-----------------------------------------
+ ": #1.25,-30~wf_r,30~bd_r`1,30~wb_r, ",
+ ": 120,O,30,&1,##, ",
+ ": {1^$-90,2^$90,3^$-90}:/OH`-.5, ",
+ ": 6^$90:/!OH`-.5, ",
+ ": @4,$-50~arc_lb`1,O,$50~arc_br`1,<$0, ",
+ ": |,#1.25,-30~wf_r,30~bd_r`1,30~wb_r, ",
+ ": 120,O,30,&1,##, ",
+ ": {2^$90,3^$-90,4^$-90}:/OH`-.5, ",
+ ": 6^$90:/!OH`-.5 ")
+ %-----------------------------------------
fsize:=(50mm,20mm);
if check(mc)=0: MC(scantokens(mc)) fi
endfont
\end{verbatim}
\MCFgraph
%-----------------------------------------------------------------------------
-\subsection{Gibberellin}
-\begin{verbatim}
-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)=0: MC(scantokens(mc)) fi
-endfont
-\end{verbatim}
-\MCFgraph
-%-----------------------------------------------------------------------------
-\subsection{Quinine}
+\subsection{Cellobiose}
+\index{arc\_lbr}
+\index{arc\_ltr}
\begin{verbatim}
-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 ")
- %-------------------------------
+(bond type for glycan)
+arc_lbr : arc left > bottom > right
+arc_ltr : arc left > top > right
+
+beginfont("EN:Cellobiose","MW:342.3",
+ %-----------------------------------------
+ ": #1.25,-30~wf_r,30~bd_r`1,30~wb_r, ",
+ ": 120,O,30,&1,##, ",
+ ": {1^$-90,2^$90,3^$-90}:/OH`-.5, ",
+ ": 6^$90:/!OH`-.5, ",
+ ": @4,$0~arc_ltr,O,$0~arc_lbr, ",
+ ": |,#1.25,-30~wf_r,30~bd_r`1,30~wb_r, ",
+ ": 120,O,30,&1,##, ",
+ ": {2^$90,3^$-90,4^$-90}:/OH`-.5, ",
+ ": 6^$90:/!OH`-.5 ")
+ %-----------------------------------------
fsize:=(50mm,20mm);
if check(mc)=0: MC(scantokens(mc)) fi
endfont
diff --git a/graphics/mcf2graph/mcf_mplib_exa.pdf b/graphics/mcf2graph/mcf_mplib_exa.pdf
index a7641d4bad..6cfa746a5c 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 b536b62860..e7e7614c28 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.07.18
+% Example of MCF typest with LuaLaTeX(luamplib) by A.Yamaji 2021.08.01
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% ** mcf2graph.mf must be version 4.69
+% ** mcf2graph.mf must be version 4.70
% ** use mcf_data_base.mcf
\documentclass{article}
%------------------------------------------------------------------------------
diff --git a/macros/generic/chemfig/README b/macros/generic/chemfig/README
index 29671ba13e..593d70bf7c 100644
--- a/macros/generic/chemfig/README
+++ b/macros/generic/chemfig/README
@@ -2,9 +2,9 @@ ___________________________________
The
Chemfig package
- v1.6a
+ v1.6b
- 2021/02/28
+ 2021/08/01
___________________________________
Maintainer: Christian Tellechea
diff --git a/macros/generic/chemfig/chemfig-en.pdf b/macros/generic/chemfig/chemfig-en.pdf
index a9ba585b85..0173183489 100644
--- a/macros/generic/chemfig/chemfig-en.pdf
+++ b/macros/generic/chemfig/chemfig-en.pdf
Binary files differ
diff --git a/macros/generic/chemfig/chemfig-en.tex b/macros/generic/chemfig/chemfig-en.tex
index aded31ec95..79c4024359 100644
--- a/macros/generic/chemfig/chemfig-en.tex
+++ b/macros/generic/chemfig/chemfig-en.tex
@@ -117,7 +117,7 @@
\newcommand\falseverb[1]{{\ttfamily\detokenize\expandafter{\string#1}}}
-\def\CFengdate@i#1/#2/#3\@nil{\number#3\relax\ifnum#3=1 \ier{}\fi\space \ifcase#2 \or january\or february\or march\or april\or may\or june\or july\or august\or september\or october\or november\or december\fi\space#1}
+\def\CFengdate@i#1/#2/#3\@nil{\number#3\relax\ifnum#3=1 \space\fi\space \ifcase#2 \or january\or february\or march\or april\or may\or june\or july\or august\or september\or october\or november\or december\fi\space#1}
\edef\CFengdate{\expandafter\CFengdate@i\CFdate\@nil}
\DeclareRobustCommand\CF{%
@@ -403,7 +403,9 @@ If one bond is followed immediately by another, then \CF inserts an empty group
\label{bond style}The \chevrons{key} \CFkv{bond style}{tikz code} sets the style for all the bonds drawn thereafter. The \CFval{tikz code} is empty by default. To custom a single bond, see page~\pageref{perso-liaisons}.
\exemple{Style of bonds}/\chemfig[bond style={line width=1pt,red}]{A-B=C>|D<E>:F}/
-\label{modif.retrait} The spacing $\delta$ for just one bond can be specified with the character \verb-#-. This character must be placed \emph{immediately} after the bond symbol and has one required argument between parentheses of the form ``\Verb-#(<dim1>,<dim2>)-'', where \Verb-<dim1>- is the spacing $\delta$ at the beginning of the bond and \Verb-<dim2>- is the that at the end. If \Verb-<dim2>- is omitted, the spacing at the end of the bond takes the value of $\delta$ in effect at that time. One can see in the example how the shortening, set to 4pt to be more visible, is nullified for the bond arriving at ``B'', then for the one leaving ``B'', and finally for both:
+\label{modif.retrait} The spacing $\delta$ for just one bond can be specified with either the character \verb-#-, the macro \verb|\#| or \verb|\CFhash|. It is important to notice that if the macro \verb|\chemfig| is in the argument of a macro, \verb-#- must \emph{not} be used and in that case, \verb|\#| or \verb|\CFhash| must be prefered.
+
+The token \verb-#-, \verb|\#| or \verb|\CFhash| must be placed \emph{immediately} after the bond symbol and has one required argument between parentheses of the form ``\Verb-(<dim1>,<dim2>)-'', where \Verb-<dim1>- is the spacing $\delta$ at the beginning of the bond and \Verb-<dim2>- is the that at the end. If \Verb-<dim2>- is omitted, the spacing at the end of the bond takes the value of $\delta$ in effect at that time. One can see in the example how the shortening, set to 4pt to be more visible, is nullified for the bond arriving at ``B'', then for the one leaving ``B'', and finally for both:
\begingroup
\catcode`\#12
\exemple{Fine adjustment of bond shortening}/\setchemfig{bond offset=4pt}
diff --git a/macros/generic/chemfig/chemfig-fr.pdf b/macros/generic/chemfig/chemfig-fr.pdf
index 57fa60fb01..1232ef95e0 100644
--- a/macros/generic/chemfig/chemfig-fr.pdf
+++ b/macros/generic/chemfig/chemfig-fr.pdf
Binary files differ
diff --git a/macros/generic/chemfig/chemfig-fr.tex b/macros/generic/chemfig/chemfig-fr.tex
index b9c25cc5f0..72fbf7b70c 100644
--- a/macros/generic/chemfig/chemfig-fr.tex
+++ b/macros/generic/chemfig/chemfig-fr.tex
@@ -31,7 +31,7 @@
\newcommand\exemple{%
\begingroup
\parskip\z@
- \@makeother\;\@makeother\!\@makeother\?\@makeother\:% neutralise frenchb
+ \@makeother\;\@makeother\!\@makeother\?\@makeother\:% neutralise french
\@ifstar{\@exstartrue\exemple@}{\@exstarfalse\exemple@}}
\newcommand\exemple@[2][65]{%
@@ -117,7 +117,7 @@
\newcommand\falseverb[1]{{\ttfamily\detokenize\expandafter{\string#1}}}
-\def\CFfrdate@i#1/#2/#3\@nil{\number#3\relax\ifnum#3=1 \ier{}\fi\space \ifcase#2 \or janvier\or février\or mars\or avril\or mai\or juin\or juillet\or aout\or septembre\or octobre\or novembre\or décembre\fi\space#1}
+\def\CFfrdate@i#1/#2/#3\@nil{\number#3\relax\ifnum#3=1 \noexpand\ier{}\fi\space \ifcase#2 \or janvier\or février\or mars\or avril\or mai\or juin\or juillet\or aout\or septembre\or octobre\or novembre\or décembre\fi\space#1}
\edef\CFfrdate{\expandafter\CFfrdate@i\CFdate\@nil}
\DeclareRobustCommand\CF{%
@@ -403,7 +403,9 @@ Si deux liaisons se suivent, alors \CF insère un groupe vide \verb-{}-, et auto
\label{bond style}La \chevrons{clé} \CFkv{bond style}{code tikz} définit le style de toutes les liaisons qui seront dessinées par la suite. Le \CFval{code tikz} est vide par défaut. Pour personnaliser les liaisons une par une, voir page~\pageref{perso-liaisons}.
\exemple{Style des liaisons}/\chemfig[bond style={line width=1pt,red}]{A-B=C>|D<E>:F}/
-\label{modif.retrait}On peut spécifier l'espacement $\delta$ pour une seule liaison avec le caractère \verb-#-. Ce caractère doit se situer \emph{immédiatement} après le signe de liaison et dispose d'un argument obligatoire entre parenthèses de la forme «\Verb-#(<dim1>,<dim2>)-», où \Verb-<dim1>- représente l'espacement $\delta$ au début de la liaison et \Verb-<dim2>- celui de la fin. Si \Verb-<dim2>- est omis, l'espacement en fin de liaison prend la valeur de $\delta$ en vigueur à ce moment. On peut observer sur cet exemple comment le retrait, réglé à 4pt pour être plus visible, est rendu nul pour la liaison arrivant sur «B», puis partant de «B» et enfin pour les deux à la fois :
+\label{modif.retrait}On peut spécifier l'espacement $\delta$ pour une seule liaison avec un marqueur qui est, au choix, le caractère \verb-#-, la macro \verb|\#| ou \verb|\CFhash|. Attention, si la macro \verb|\chemfig| se trouve dans l'argument d'une autre macro, il \emph{faut} utiliser la macro \verb|\#| ou \verb|\CFhash| au lieu du caractère \verb|#|.
+
+Ce marqueur doit se situer \emph{immédiatement} après le signe de liaison et dispose d'un argument obligatoire entre parenthèses de la forme «\Verb-(<dim1>,<dim2>)-», où \Verb-<dim1>- représente l'espacement $\delta$ au début de la liaison et \Verb-<dim2>- celui de la fin. Si \Verb-<dim2>- est omis, l'espacement en fin de liaison prend la valeur de $\delta$ en vigueur à ce moment. On peut observer sur cet exemple comment le retrait, réglé à 4pt pour être plus visible, est rendu nul pour la liaison arrivant sur «B», puis partant de «B» et enfin pour les deux à la fois :
\begingroup
\catcode`\#12
\exemple{Réglage fin du retrait des liaisons}/\setchemfig{bond offset=4pt}
diff --git a/macros/generic/chemfig/chemfig.tex b/macros/generic/chemfig/chemfig.tex
index 576108ae28..ed8948b2eb 100644
--- a/macros/generic/chemfig/chemfig.tex
+++ b/macros/generic/chemfig/chemfig.tex
@@ -1,12 +1,12 @@
-% !TeX encoding = ISO-8859-1
+% !TeX encoding = UTF-8
% Ce fichier contient le code de l'extension "chemfig"
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% %
\def\CFname {chemfig} %
-\def\CFver {1.6a} %
+\def\CFver {1.6b} %
% %
-\def\CFdate {2021/02/28} %
+\def\CFdate {2021/08/01} %
% %
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
@@ -31,7 +31,7 @@
%--------------------------------------------------------------------
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%% P R É A L A B L E %%%
+%%% P R É A L A B L E %%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\csname CFloadonce\endcsname
\let\CFloadonce\endinput
@@ -42,7 +42,7 @@
Draw molecule with an easy syntax (CT)}%
\fi
-%-------------------------- Régime catcodes --------------------------
+%-------------------------- Régime catcodes --------------------------
\begingroup
\def\X#1{\catcode\number`#1=\number\catcode`#1\relax}
\xdef\CFrestorecatcode{\X\[\X\]\X\:\X\(\X\)\X\,\X\-\X\=\X\~\X\!\X\?\X\<\X\>\X\;\X\*\X\|\X\@\X\ \X\_}%
@@ -53,10 +53,10 @@
\catcode`\>12 \catcode`\;12 \catcode`\*12 \catcode`\|12
\catcode`\@12 \catcode`\#6 \catcode`\ 10 \catcode`\_11
-%-------------------- Vérification des prérequis ---------------------
+%-------------------- Vérification des prérequis ---------------------
\def\CF_error#1{\errmessage{Package \CFname\space Error: #1.}}
\def\CF_warning#1{\immediate\write-1{Package \CFname\space Warning: #1^^J}}
-\def\CF_checkprimitive#1#2{% Vérifie que #1 est une primitive et sinon, émet le message #2 et exécute \endinput
+\def\CF_checkprimitive#1#2{% Vérifie que #1 est une primitive et sinon, émet le message #2 et exécute \endinput
\begingroup
\edef\__tempa{\meaning#1}\edef\__tempb{\string#1}\expandafter
\endgroup
@@ -161,7 +161,7 @@
\def\CF_assigntonil#1#2\_nil{\def#1{#2}}
\def\CF_edefaddtomacro#1#2{\CF_expsecond{\CF_addtomacro#1}{\expanded{#2}}}
\def\CF_ifnextchar#1#2#3{%
- \let\CF_ifnextchartok=#1% <- espace indésirable, bugfix v1.31
+ \let\CF_ifnextchartok=#1% <- espace indésirable, bugfix v1.31
\def\CF_ifnextcharcodetrue{#2}%
\def\CF_ifnextcharcodefalse{#3}%
\futurelet\CF_temptok\CF_ifnextchara
@@ -187,7 +187,7 @@
\endgroup
\CF_ifempty{#1}%
}
-\def\CF_iffirsttokmatch#1#2{% est ce que #1 et #2 commencent par les mêmes tokens ?
+\def\CF_iffirsttokmatch#1#2{% est ce que #1 et #2 commencent par les mêmes tokens ?
\futurelet\CF_toksa\CF_gobtonil#1\relax\_nil
\futurelet\CF_toksb\CF_gobtonil#2\relax\_nil
\CF_ifx\CF_toksa\CF_toksb
@@ -271,8 +271,8 @@
}
\def\CF_grabargassigntonil#1\_nil#2{\CF_expsecond{\def#2}{\CF_gobarg#1}}
\def\CF_ifbracefirst#1{\CF_ifnum{\catcode\CF_threeea`\expandafter\CF_firsttonil\detokenize{#1.}\_nil=1 }}
-\def\CF_substonly#1#2{% #1=entier maxi>0 #2=macro : dans la sc#1, remplace tous les <motif> par <pattern> sauf lorsque le motif est suivi d'un caractère >#1
- \def\CF_atendsubstitute{\edef#2{\the\CF_substtoks}}% macro exécutée à la fin
+\def\CF_substonly#1#2{% #1=entier maxi>0 #2=macro : dans la sc#1, remplace tous les <motif> par <pattern> sauf lorsque le motif est suivi d'un caractère >#1
+ \def\CF_atendsubstitute{\edef#2{\the\CF_substtoks}}% macro exécutée à la fin
\let\CF_substnogroups\CF_substnogrouponly
\CF_ifnum{#1>0 }
{\let\CF_testifx\empty
@@ -290,8 +290,8 @@
\CF_exptwomacroargs\CF_ifstartwith\CF_substcode\CF_substsubst
{\CF_grabfirstarg\CF_substcode\CF_temp
\CF_expafter{\futurelet\CF_nexttok\CF_gobtonil}\CF_substcode\relax\_nil
- \CF_ifnum{0\CF_testifx=1 }% si le prochain token est \let-égal à 1...#1
- {\edef\CF_nexttok{\CF_threeea\CF_firsttonil\expandafter\string\CF_substcode\_nil}% le détokéniser
+ \CF_ifnum{0\CF_testifx=1 }% si le prochain token est \let-égal à 1...#1
+ {\edef\CF_nexttok{\CF_threeea\CF_firsttonil\expandafter\string\CF_substcode\_nil}% le détokéniser
\CF_ifnum{0\CF_testif=1 }
{\CF_eaddtotoks\CF_substtoks\CF_temp
\CF_grabfirstarg\CF_substcode\CF_temp
@@ -314,7 +314,7 @@
}%
}
\def\CF_substall#1{% #1=macro
- \def\CF_atendsubstitute{\edef#1{\the\CF_substtoks}}% macro exécutée à la fin
+ \def\CF_atendsubstitute{\edef#1{\the\CF_substtoks}}% macro exécutée à la fin
\let\CF_substnogroups\CF_substnogroupall
\CF_expsecond\CF_substi#1%
}
@@ -347,7 +347,7 @@
\expandafter\endgroup\expandafter\CF_addtotoks\expandafter\CF_substtoks\expandafter{\expandafter{\the\CF_substtoks}}%
\CF_substgroups
}%
- \CF_substtoks{}% initialiser à vide
+ \CF_substtoks{}% initialiser à vide
\expandafter\def\expandafter\CF_substcode\CF_substauxarg
\CF_substgroups
}%
@@ -355,7 +355,7 @@
}%
}
-%---------------------------- Paramètres -----------------------------
+%---------------------------- Paramètres -----------------------------
\def\CF_defifempty#1#2#3{\CF_ifempty{#2}{\def#1{#3}}{\def#1{#2}}}
\defKV[chemfig]{%
atom style = \def\CF_atomstyle {#1},
@@ -388,8 +388,8 @@
\def\setchemfig{\setKV[chemfig]}
\def\resetchemfig{\restoreKV[chemfig]}
\setKVdefault[chemfig]{%
- atom style = {},% code tikz mis à la fin de every node/.style
- chemfig style = {},% code tikz mis à la fin de l'arugment optionnel de \tikzpicture
+ atom style = {},% code tikz mis à la fin de every node/.style
+ chemfig style = {},% code tikz mis à la fin de l'arugment optionnel de \tikzpicture
bond join = false,
fixed length = false,
cram rectangle = false,
@@ -425,7 +425,7 @@
}%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%% D E S S I N M O L É C U L E S %%%
+%%% D E S S I N M O L É C U L E S %%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\def\CF_sanitizecatcode{%
\CF_makeother\[\CF_makeother\]\CF_makeother\:\CF_makeother\(\CF_makeother\)%
@@ -439,8 +439,8 @@
\def\CF_nodecontent{\CF_expsecond\printatom{\csname atom_\number\CF_cntatom\endcsname\CF_nodestrut}}
\def\chemskipalign{%
- \CF_doifempty\CF_bondoutcontentsaved% sauf si un \chemskipalign a été fait à l'atome précédent
- {\global\let\CF_bondoutcontentsaved\CF_bondoutcontent}% sauvegarder l'atome d'où vient la liaison
+ \CF_doifempty\CF_bondoutcontentsaved% sauf si un \chemskipalign a été fait à l'atome précédent
+ {\global\let\CF_bondoutcontentsaved\CF_bondoutcontent}% sauvegarder l'atome d'où vient la liaison
\let\CF_nodestrut\empty
}
@@ -448,7 +448,7 @@
\def\redefinesubmol{\CF_definesubmolfalse\def_submol}
\def\def_submol#1{%
- \CF_cntatomgroup=0 % nombre d'arguments supposé
+ \CF_cntatomgroup=0 % nombre d'arguments supposé
\def\CF_temp{#1}% nom
\futurelet\CF_toksa\CF_submoltestnxttok
}
@@ -458,7 +458,7 @@
{\begingroup\CF_sanitizecatcode\CF_expsecond\CF_submolgrabopt{\CF_temp}%
}
{\afterassignment\CF_submoltestnxttoka% pas d'argument entre crochet
- \CF_cntatomgroup=0% cherche le nombre d'arguments éventuels
+ \CF_cntatomgroup=0% cherche le nombre d'arguments éventuels
}%
}
@@ -478,7 +478,7 @@
\CF_cntatomgroup=0
}
{}%
- \ifcat\relax\expandafter\noexpand\CF_firsttonil#1\_nil\expandafter\CF_execfirst\else\expandafter\CF_execsecond\fi% si #1 est une séquence de contrôle
+ \ifcat\relax\expandafter\noexpand\CF_firsttonil#1\_nil\expandafter\CF_execfirst\else\expandafter\CF_execsecond\fi% si #1 est une séquence de contrôle
{\expandafter\ifdefined\CF_firsttonil#1\_nil
\ifCF_definesubmol
\CF_warning{the submol \expandafter\string\CF_firsttonil#1\_nil\space is already defined, the previous definition is lost}%
@@ -542,11 +542,11 @@
\let#1\CFthesubmol
}
-\def\CF_seeknode#1#2#3{% cherche un noeud au début de #1 l'assigne dans la sc #2 et met le reste dans #3
+\def\CF_seeknode#1#2#3{% cherche un noeud au début de #1 l'assigne dans la sc #2 et met le reste dans #3
\let#2\empty
\def#3{#1}%
\CF_iffirsttokmatch{#1}{ }%
- {\CF_expsecond\CF_seeknodea{\romannumeral-`\.\noexpand#1}#2#3}% ignore les espaces au début du groupe d'atome
+ {\CF_expsecond\CF_seeknodea{\romannumeral-`\.\noexpand#1}#2#3}% ignore les espaces au début du groupe d'atome
{\CF_seeknodea{#1}#2#3}%
}
@@ -581,7 +581,7 @@
}
% on sait que #1 commence par -,=,~,<,>. On analyse cette liaison
-% #2 reçoit le type de liaisons (1 pour -, 2 pour =, 3 pour ~)
+% #2 reçoit le type de liaisons (1 pour -, 2 pour =, 3 pour ~)
\def\CF_assignbondcode#1#2{%
\futurelet\CF_toksa\CF_gobtonil#1\_nil
\edef#2{%
@@ -589,14 +589,14 @@
\ifx=\CF_toksa2\else
\ifx~\CF_toksa3\else
\ifx>\CF_toksa4\else
- \ifx<\CF_toksa5\else0% si 0 --> il y a une erreur non due à l'utilisateur
+ \ifx<\CF_toksa5\else0% si 0 --> il y a une erreur non due à l'utilisateur
\fi\fi\fi\fi\fi}%
\ifnum#2>3 % si c'est une liaison de Cram
- \CF_expafter{\futurelet\CF_toksa\CF_gobtonil}{\CF_gobarg#1\_nil}% chope le caractère suivant
+ \CF_expafter{\futurelet\CF_toksa\CF_gobtonil}{\CF_gobarg#1\_nil}% chope le caractère suivant
\CF_ifx:\CF_toksa
- {\edef#2{\number\numexpr#2+2}% si c 'est un ":", signe du pointillé, ajoute 2
+ {\edef#2{\number\numexpr#2+2}% si c 'est un ":", signe du pointillé, ajoute 2
}%
- {\CF_ifx|\CF_toksa% si c 'est un "|", signe du triangle évidé, ajouter 4
+ {\CF_ifx|\CF_toksa% si c 'est un "|", signe du triangle évidé, ajouter 4
{\edef#2{\number\numexpr#2+4}}
{}%
}%
@@ -620,7 +620,7 @@
\CF_assignbondcode{#1}#2%
\CF_expsecond{\def\CF_remainafterbond}{\CF_gobarg#1}%mange le premier signe de la liaison
\let\CF_doublebondtype\CF_zero
- \ifnum#2=2 % si c'est une double liaison, regarde s'il y a un + ou - derrière
+ \ifnum#2=2 % si c'est une double liaison, regarde s'il y a un + ou - derrière
\CF_expafter{\futurelet\CF_toksa\CF_gobtonil}{\CF_gobarg#1\_nil}%
\CF_ifx^\CF_toksa
{\def\CF_doublebondtype{1}%
@@ -632,12 +632,12 @@
\fi
}%
\else
- \ifnum#2>5 % si c'est une laision de Cram pointillée ou triangle évidé
- \CF_expsecond{\def\CF_remainafterbond}{\CF_gobtwoargs#1}% mange un caractère de plus
+ \ifnum#2>5 % si c'est une laision de Cram pointillée ou triangle évidé
+ \CF_expsecond{\def\CF_remainafterbond}{\CF_gobtwoargs#1}% mange un caractère de plus
\fi
\fi
\CF_expsecond\CF_iffirsttokmatch\CF_remainafterbond\CFhash
- {\CF_eexpsecond\CF_iffirsttokmatch{\expandafter\CF_gobarg\CF_remainafterbond.}(%si parenthèse juste après
+ {\CF_eexpsecond\CF_iffirsttokmatch{\expandafter\CF_gobarg\CF_remainafterbond.}(%si parenthèse juste après
{\expandafter\CF_grabbondoffset\CF_remainafterbond\_nil}
{}%
}%
@@ -659,7 +659,7 @@
\pgfmathsetmacro\CF_cycleincrementangle{360/\CF_cyclenum+\CF_initcycleangle}%
\edef\CF_currentstringangle{::+\CF_cycleincrementangle}%
\def\CF_initcycleangle{0}%
- \let\CF_currentlength\CF_defaultlength% et on ignore la longueur de liaison spécifiée
+ \let\CF_currentlength\CF_defaultlength% et on ignore la longueur de liaison spécifiée
\fi
\CF_expsecond\CF_setbondangle{\CF_currentstringangle}\CF_currentangle
}
@@ -690,7 +690,7 @@
\def#3{#1}\def\CF_movebondcoeff{#2}%
}
-% Argument limités légitimes ici car #2 (qui est ce qui suit "@{<nom>}" dans l'argument optionnel) ne DOIT PAS
+% Argument limités légitimes ici car #2 (qui est ce qui suit "@{<nom>}" dans l'argument optionnel) ne DOIT PAS
% commencer par une accolade.
\def\CF_grabmovearg @#1#2\_nil{%
\CF_ifinstr{#1},%
@@ -730,7 +730,7 @@
\CF_expsecond{\def#2}{\CF_gobarg#1}%
}
-\def\CF_seeksubmol#1#2{% cherche et remplace ! au début de #1. #1=code #2=macro recevant le résultat
+\def\CF_seeksubmol#1#2{% cherche et remplace ! au début de #1. #1=code #2=macro recevant le résultat
\def\CF_seeksubmloltemp{#1}%
\CF_seeksubmola
\let#2\CF_seeksubmloltemp
@@ -739,7 +739,7 @@
\def\CF_seeksubmola{%
\CF_expsecond{\def\CF_seeksubmloltemp}{\romannumeral-`\.\expandafter\noexpand\CF_seeksubmloltemp}%
\CF_expsecond\CF_iffirsttokmatch{\CF_seeksubmloltemp}!%
- {\CF_eexpsecond{\def\CF_seeksubmloltemp}{\expandafter\CF_gobarg\CF_seeksubmloltemp}% enlève le "!"
+ {\CF_eexpsecond{\def\CF_seeksubmloltemp}{\expandafter\CF_gobarg\CF_seeksubmloltemp}% enlève le "!"
\CF_ifx\empty\CF_seeksubmloltemp
{\CF_error{no submol name found after "!"}}
{}%
@@ -755,13 +755,13 @@
\def\CF_seeksubmolb#1{\CF_seeksubmold#1\relax}
-\def\CF_seeksubmolc#1{\expandafter\CF_seeksubmold\csname CF__#1\endcsname\relax}% nom de la sous molécule
+\def\CF_seeksubmolc#1{\expandafter\CF_seeksubmold\csname CF__#1\endcsname\relax}% nom de la sous molécule
-\def\CF_seeksubmold#1#2\_nil{%#1=macro de la sous molécule #2=reste du code commençant par \relax
- \CF_expsecond{\CF_eexpsecond{\def\CF_seeksubmloltemp}}{\expandafter#1\CF_gobarg#2}% supprime le \relax puis ajoute la macro au début et la 2-développe
+\def\CF_seeksubmold#1#2\_nil{%#1=macro de la sous molécule #2=reste du code commençant par \relax
+ \CF_expsecond{\CF_eexpsecond{\def\CF_seeksubmloltemp}}{\expandafter#1\CF_gobarg#2}% supprime le \relax puis ajoute la macro au début et la 2-développe
}
-\def\CF_insertemptygroup#1{% insère {} au début de la sc #1
+\def\CF_insertemptygroup#1{% insère {} au début de la sc #1
\CF_expsecond{\def#1}{\expandafter{\expandafter}#1}%
}
@@ -783,7 +783,7 @@
}
{\let\CF_atendofchemfig\relax
}%
- \expanded{% début du tikzpicture
+ \expanded{% début du tikzpicture
\unexpanded{#1}[%
remember picture,%
every node/.style={%
@@ -797,7 +797,7 @@
\unexpanded\expandafter{\CF_chemfigstyle}%
]%
}%
- \begingroup% \endgroup rajouté en sortie de tracé par \CF_chemfigd
+ \begingroup% \endgroup rajouté en sortie de tracé par \CF_chemfigd
\let\CF_hooklist\empty
\ifboolKV[chemfig]{fixed length}
{\CF_macrofixedbondlengthtrue}
@@ -813,16 +813,16 @@
\ifboolKV[chemfig]{autoreset cntcycle}
{\global\CF_cntcycle0 }
{}%
- \let\CF_lastaction\CF_zero% 0=début du dessin 1=tracé d'un noeud 2=tracé d'une liaison
+ \let\CF_lastaction\CF_zero% 0=début du dessin 1=tracé d'un noeud 2=tracé d'une liaison
\let\CF_startoffset\empty
\let\CF_endoffset\empty
\let\CF_bondoutcontentsaved\empty
\def\CF_cycleanglecorrection{180/\CF_cyclenum}%
\def\CF_defaultangle{0}%
- \def\CF_defaultstringangle{:0}% angle pris par défaut si le champ est vide
+ \def\CF_defaultstringangle{:0}% angle pris par défaut si le champ est vide
\def\CF_defaultlength{1}%
- \let\CF_defaultfromatom\empty% numero de l'atome d'où partent les liaisons par défaut
- \let\CF_defaulttoatom\empty% numéro de l'atome où arrivent les laisons par défaut
+ \let\CF_defaultfromatom\empty% numero de l'atome d'où partent les liaisons par défaut
+ \let\CF_defaulttoatom\empty% numéro de l'atome où arrivent les laisons par défaut
\let\CF_defaulttikz\empty
\let\CF_previousbondangle\empty
\let\CF_joinbond\CF_zero
@@ -832,22 +832,22 @@
\expandafter\CF_assigntonil\expandafter\CF_molecule\scantokens{#4}%
\CF_expsecond{\CF_substall\CF_molecule}\CFhash\CFhash
\CF_expsecond\CF_chemfigc{\CF_molecule}%
- %\endgroup <-- rajouté par \CF_chemfigd
+ %\endgroup <-- rajouté par \CF_chemfigd
#2% fin du tikzpicture
\CF_atendofchemfig
\endgroup
\let\CF_flipstate\CF_zero
}
-\def\CF_chemfigc#1{% #1 est le code de la molécule
+\def\CF_chemfigc#1{% #1 est le code de la molécule
\ifnum\CF_lastaction=3
\ifCF_incycle
\def\CF_defaultangle{0}%
\else
- \ifnum\CF_cntcyclebonds=0 % si c'est le début d'un cycle
- \pgfmathsetmacro\CF_defaultangle{\CF_previousangle+180+\CF_cycleanglecorrection}% on met la liaison à +180° + correction
+ \ifnum\CF_cntcyclebonds=0 % si c'est le début d'un cycle
+ \pgfmathsetmacro\CF_defaultangle{\CF_previousangle+180+\CF_cycleanglecorrection}% on met la liaison à +180° + correction
\else
- \pgfmathsetmacro\CF_defaultangle{\CF_previousangle-90+180/\CF_cyclenum}% sinon à la bissectrice du sommet du cycle
+ \pgfmathsetmacro\CF_defaultangle{\CF_previousangle-90+180/\CF_cyclenum}% sinon à la bissectrice du sommet du cycle
\fi
\fi
\let\CF_defaultstringangle\empty
@@ -882,7 +882,7 @@
{}%
\ifCF_cyclearc% on doit tracer l'arc de cercle dans le cycle ?
\pgfmathsetmacro\CF_cyclearcradius{\CF_cycleradiuscoeff*\CF_currentlength*\CF_atomsep/(2*tan(180/\CF_cyclenum))}%
- \node[at=(cyclecenter\number\CF_cntcycle),shift=(\CF_cyclearcstartangle:\CF_cyclearcradius pt)](initarc){};% le début de l'arc
+ \node[at=(cyclecenter\number\CF_cntcycle),shift=(\CF_cyclearcstartangle:\CF_cyclearcradius pt)](initarc){};% le début de l'arc
\CF_expafter{\draw[}\CF_cyclearcdirecttikz](initarc) arc (\CF_cyclearcstartangle:\CF_cyclearcendangle:\CF_cyclearcradius pt);%
\fi
\else
@@ -899,7 +899,7 @@
}
\def\CF_chemfigd{%
- \let\CF_nextaction\CF_chemfigd% à priori, on reboucle
+ \let\CF_nextaction\CF_chemfigd% à priori, on reboucle
\CF_ifx\CF_molecule\empty
{\let\CF_nextaction\endgroup
}
@@ -922,8 +922,8 @@
\fi}%
\CF_expafter{\futurelet\CF_toksa\CF_gobtonil}{\CF_molecule\relax\_nil}%
\CF_iffirsttokina{-=<>~}% la suite est une liaison
- {\ifnum\CF_lastaction=2 % c'est la deuxième liaison consécutive ?
- \CF_insertemptygroup\CF_molecule% insère un groupe vide
+ {\ifnum\CF_lastaction=2 % c'est la deuxième liaison consécutive ?
+ \CF_insertemptygroup\CF_molecule% insère un groupe vide
\edef\CF_bondoutnode{\CF_bondoutnode}%
\else
\ifCF_incycle
@@ -954,18 +954,18 @@
}%
\fi
\ifcat\relax\detokenize\expandafter{\romannumeral-`\.\expandafter\noexpand\CF_molecule}\relax
- % s'il ne reste plus rien après la liaison (sans tenir compte de l'espace devant)-> insère un groupe vide
+ % s'il ne reste plus rien après la liaison (sans tenir compte de l'espace devant)-> insère un groupe vide
\CF_insertemptygroup\CF_molecule
\fi
}%
- {\edef\CF_bondoutnode{\CF_bondoutnode}% évalue le l'atome de départ de liaison
- \CF_ifx(\CF_toksa% une parenthèse pour commencer ?
+ {\edef\CF_bondoutnode{\CF_bondoutnode}% évalue le l'atome de départ de liaison
+ \CF_ifx(\CF_toksa% une parenthèse pour commencer ?
{\ifnum\CF_lastaction=2 % il y avait une liaison juste avant ?
\CF_insertemptygroup\CF_molecule
\else
\CF_expsecond\CF_grabsubmol{\CF_molecule}%
\begingroup
- \ifCF_incycle\def\CF_lastaction{3}\fi% on était dans un cycle
+ \ifCF_incycle\def\CF_lastaction{3}\fi% on était dans un cycle
\CF_incyclefalse
\aftergroup\CF_chemfigd
\def\CF_nextaction{\CF_expsecond\CF_chemfigc{\CF_molinparen}}%
@@ -974,19 +974,19 @@
{\CF_ifx\CF_molecule\empty
{\let\CF_nextaction\endgroup
}
- {% ce qui reste après le noeud courant n'est pas vide, ne commence pas par "-=~", ni par une parenthèse
+ {% ce qui reste après le noeud courant n'est pas vide, ne commence pas par "-=~", ni par une parenthèse
\CF_ifx*\CF_toksa% un cycle ?
{\ifnum\CF_lastaction=2
- \CF_insertemptygroup\CF_molecule% insère un groupe vide
+ \CF_insertemptygroup\CF_molecule% insère un groupe vide
\else
\ifCF_incycle
\def\CF_lastaction{3}%
- \fi% on était dans un cycle
+ \fi% on était dans un cycle
\ifnum\CF_lastaction=3
\let\CF_lastcyclenum\CF_cyclenum
\fi
\CF_eexpsecond\CF_iffirsttokmatch{\expandafter\CF_gobarg\CF_molecule}*%
- {\CF_eexpsecond{\def\CF_molecule}{\expandafter\CF_gobarg\CF_molecule}% enlève la 1er étoile
+ {\CF_eexpsecond{\def\CF_molecule}{\expandafter\CF_gobarg\CF_molecule}% enlève la 1er étoile
\CF_eexpsecond\CF_iffirsttokmatch{\expandafter\CF_gobarg\CF_molecule}[% un crochet ensuite ?
{\expandafter\CF_cycleparsepreamblewithoptarg\CF_molecule\_nil% \begingroup inclus
}%
@@ -1083,8 +1083,8 @@
\CF_next
}
-% Créé 4 noeuds au dessus et au dessous des noeuds #1 et #2
-% à une distance de #3 du noeud #1 et #4 du noeud #2
+% Créé 4 noeuds au dessus et au dessous des noeuds #1 et #2
+% à une distance de #3 du noeud #1 et #4 du noeud #2
\def\CF_createnormnodes#1#2#3#4{%
\CF_doifnotempty{#3}
{\node[shape=coordinate,at=(#1),xshift=#3*\CF_normx,yshift=#3*\CF_normy](#11){};
@@ -1118,7 +1118,7 @@
}%
}
-\def\CF_drawbond#1#2#3#4#5{% #1=type de liaison #2 et #3:nom de noeuds de début et fin #4 et #5: contenu des atomes de début et fin
+\def\CF_drawbond#1#2#3#4#5{% #1=type de liaison #2 et #3:nom de noeuds de début et fin #4 et #5: contenu des atomes de début et fin
\CF_setoffset\CF_startoffset#4%
\CF_setoffset\CF_endoffset#5%
\let\CF_currentbondstyle\CF_bondstyle
@@ -1154,7 +1154,7 @@
\or
\CF_createnormnodes{#2@@}{#3@@}\CF_doublesep\CF_doublesep
\CF_drawaxisbond{#2}{#3}% trace la liaison simple dans l'axe\CF_drawbonda(#2@@)--(#3@@);
- \begingroup% ajuste éventuellement les longueurs des liaisons doubles
+ \begingroup% ajuste éventuellement les longueurs des liaisons doubles
\ifCF_incycle
\ifdim\CF_startoffset=0pt
\CF_edefaddtomacro\CF_currentbondstyle{,shorten <=\CF_doublebondlengthcorrection pt}%
@@ -1168,7 +1168,7 @@
\or
\CF_createnormnodes{#2@@}{#3@@}\CF_doublesep\CF_doublesep
\CF_drawaxisbond{#2}{#3}% trace la liaison simple dans l'axe\CF_drawbonda(#2@@)--(#3@@);
- \begingroup% ajuste éventuellement les longueurs des liaisons doubles
+ \begingroup% ajuste éventuellement les longueurs des liaisons doubles
\ifCF_incycle
\ifdim\CF_startoffset=0pt
\CF_edefaddtomacro\CF_currentbondstyle{,shorten \ifnum\CF_flipstate=0 <=-\else>=\fi\CF_doublebondlengthcorrection pt}%
@@ -1193,25 +1193,25 @@
\CF_createnormnodes{#3@@}{#2@@}{\CF_crambasewidth/2}{}%
\CF_expafter{\filldraw[}\CF_currentbondstyle,line join=bevel](#3@@1)--(#3@@2)--(#2@@)--cycle;
\let\CF_joinbond\CF_zero
- \or% 6 = liaison Cram pointillée de #2 vers #3
+ \or% 6 = liaison Cram pointillée de #2 vers #3
\scope
\CF_createnormnodes{#2@@}{#3@@}{\CF_crambasewidth/2}{}%
\CF_clipcramornot(#2@@1)--(#2@@2)--(#3@@)--(#2@@1);
\CF_expafter{\draw[}\CF_currentbondstyle,dash pattern=on \CF_cramdashlength off \CF_cramdashsep,line width=\CF_crambasewidth](#2@@)--(#3@@);
\endscope
\let\CF_joinbond\CF_zero
- \or% 7 = liaison Cram pointillée de #3 vers #2
+ \or% 7 = liaison Cram pointillée de #3 vers #2
\scope
\CF_createnormnodes{#3@@}{#2@@}{\CF_crambasewidth/2}{}%
\CF_clipcramornot(#3@@1)--(#3@@2)--(#2@@)--(#3@@1);
\CF_expafter{\draw[}\CF_currentbondstyle,dash pattern=on \CF_cramdashlength off \CF_cramdashsep,line width=\CF_crambasewidth](#3@@)--(#2@@);
\endscope
\let\CF_joinbond\CF_zero
- \or% 8 = liaison cram rectangle évidé de #2 vers #3
+ \or% 8 = liaison cram rectangle évidé de #2 vers #3
\CF_createnormnodes{#2@@}{#3@@}{\CF_crambasewidth/2}{}%
\CF_expafter{\draw[}\CF_currentbondstyle,line join=bevel](#2@@1)--(#2@@2)--(#3@@)--cycle;
\let\CF_joinbond\CF_zero
- \or% 9 = liaison cram rectangle évidé de #3 vers #1
+ \or% 9 = liaison cram rectangle évidé de #3 vers #1
\CF_createnormnodes{#3@@}{#2@@}{\CF_crambasewidth/2}{}%
\CF_expafter{\draw[}\CF_currentbondstyle,line join=bevel](#3@@1)--(#3@@2)--(#2@@)--cycle;
\let\CF_joinbond\CF_zero
@@ -1227,7 +1227,7 @@
\def\CF_drawaxisbondnojoin#1#2{\CF_drawbonda(#1@@)--(#2@@);}
-\def\CF_drawaxisbondjoin#1#2{% dessine une liaison simple dans l'axe avec raccord rétrograde
+\def\CF_drawaxisbondjoin#1#2{% dessine une liaison simple dans l'axe avec raccord rétrograde
\ifCF_incycle\ifnum\CF_cntcyclebonds=\CF_cyclenum\relax
\let\CF_nexttikz\CF_cyclefirsttikz
\fi\fi
@@ -1251,7 +1251,7 @@
\CF_ifx\CF_previoustikz\CF_currenttikz
{\def\CF_joinbond{1}%
\CF_ifzerodim\CF_previousatomgroup
- {\CF_ifx\CF_previousbondangle\empty% si début molécule
+ {\CF_ifx\CF_previousbondangle\empty% si début molécule
{\CF_drawbonda(#1@@)--(#2@@);
}
{\ifdim\CF_startoffset=0pt
@@ -1306,7 +1306,7 @@
\def\CF_hookdrawall{% dessine tous les crochets contenus dans la sc \CF_hookdraw
\CF_doifnotempty\CF_hookdrawlist
- {\expandafter\CF_hookdrawfirst\CF_hookdrawlist\_nil% trace un lien de crochet à crochet
+ {\expandafter\CF_hookdrawfirst\CF_hookdrawlist\_nil% trace un lien de crochet à crochet
\CF_hookdrawall
}%
}
@@ -1326,7 +1326,7 @@
\endgroup
}
-\def\CF_extractatom#1-#2\_nil{#2}% transforme le bound@outnode en n° de l'atome
+\def\CF_extractatom#1-#2\_nil{#2}% transforme le bound@outnode en n° de l'atome
\def\CF_gobblemovearg @#1#2\_nil#3{%
\expandafter\def\csname atom_\number\CF_cntatom\endcsname{#2}%
@@ -1341,8 +1341,8 @@
\def\vflipnext{\def\CF_flipstate{2}}
\let\CF_flipstate\CF_zero
-\def\CF_drawatomgroup#1#2#3{% #1=angle d'arrivée de la liaison #2=numero atome sur lequel arrive la liaison #3=groupe d'atomes
- \expandafter\let\expandafter\CF_bondoutcontent% assigne le contenu de l'atome d'où part la liaison
+\def\CF_drawatomgroup#1#2#3{% #1=angle d'arrivée de la liaison #2=numero atome sur lequel arrive la liaison #3=groupe d'atomes
+ \expandafter\let\expandafter\CF_bondoutcontent% assigne le contenu de l'atome d'où part la liaison
\csname
\ifdefined\CF_bondoutnode
atom_\expandafter\CF_extractatom\CF_bondoutnode\_nil
@@ -1358,7 +1358,7 @@
{\CF_drawatomgroupa{{}#3}}
{\CF_drawatomgroupa{#3}}%
\def\CF_currentatomgroup{#3}%
- \CF_removemovearg\CF_currentatomgroup% enlève les "@{<nom>}"
+ \CF_removemovearg\CF_currentatomgroup% enlève les "@{<nom>}"
\CF_ifinstr{#3}?%
{\CF_removehook\CF_currentatomgroup
\ifcat\relax\detokenize\expandafter{\romannumeral-`\.\expandafter\noexpand\CF_currentatomgroup}\relax
@@ -1398,7 +1398,7 @@
{\def\CF_nodestrut{\vphantom\CF_bondoutcontent}}%
{\def\CF_nodestrut{\vphantom\CF_bondoutcontentsaved}}%
}%
- \edef\CF_optstring{anchor=\ifnum\CF_lastaction=0 base\else\ifCF_incycle center\else\ifCF_macrofixedbondlength 180+#1\else center\fi\fi\fi,at=(CF_node),\CF_nodestyle}% premier atome de la molécule affiché
+ \edef\CF_optstring{anchor=\ifnum\CF_lastaction=0 base\else\ifCF_incycle center\else\ifCF_macrofixedbondlength 180+#1\else center\fi\fi\fi,at=(CF_node),\CF_nodestyle}% premier atome de la molécule affiché
\loop
\unless\ifnum\CF_cntatom>\CF_cntatomgroup
\CF_eexpafter
@@ -1422,10 +1422,10 @@
\repeat
\CF_cntatom\CF_hookatomnumber
\ifnum\CF_lastaction=2 % s'il faut tracer une liaison
- \gdef\CF_cycleanglecorrection{0}% alors c'est qu'un cycle ne peut pas commencer la molécule : annulation de la correction d'angle
+ \gdef\CF_cycleanglecorrection{0}% alors c'est qu'un cycle ne peut pas commencer la molécule : annulation de la correction d'angle
\CF_drawbond\CF_bondtype{\CF_bondoutnode}{n\number\CF_cntgroup-\number\CF_cntatom}\CF_previousatomgroup\CF_currentatomgroup
\fi
- \def\CF_lastaction{1}% met la dernière action à 1 : affichage d'un noeud
+ \def\CF_lastaction{1}% met la dernière action à 1 : affichage d'un noeud
\loop
\ifnum\CF_cntatom>1
\advance\CF_cntatom-1
@@ -1503,7 +1503,7 @@
}%
}
-% enlève tous les "@{nom}" de la sc #1
+% enlève tous les "@{nom}" de la sc #1
\def\CF_removemovearg#1{%
\CF_expsecond\CF_ifinstr{#1}@%
{\expandafter\CF_removemovearga#1\_nil#1%
@@ -1512,7 +1512,7 @@
{}%
}
-% enlève le premier "@{<nom>}" de l'argument et l'assigne à #2
+% enlève le premier "@{<nom>}" de l'argument et l'assigne à #2
\def\CF_removemovearga#1\_nil#2{%
\def\CF_removemoveargb##1@{%
\CF_expsecond{\def#2}{\CF_gobarg##1}% mange le \relax
@@ -1552,15 +1552,15 @@
\CF_drawatomgroupa{#1}%
}%
{\CF_ifx?\CF_toksa
- {\CF_expsecond\CF_iffirsttokmatch{\CF_gobarg#1}[% un crochet après le "?"
+ {\CF_expsecond\CF_iffirsttokmatch{\CF_gobarg#1}[% un crochet après le "?"
{\expandafter\CF_graboptarg\CF_gobarg#1\_nil\CF_afterhook}%
{\CF_expafter{\CF_graboptarg[]}{\CF_gobarg#1}\_nil\CF_afterhook}%
- \CF_exptwomacroargs\CF_ifinstr{\CF_hooklist}{\expandafter(\CF_hookcurrentname)}% crochet déjà défini ?
- {\CF_expsecond\CF_hookparselist{\CF_hookcurrentname}% chercher les caractéristiques du crochet sauvegardé
+ \CF_exptwomacroargs\CF_ifinstr{\CF_hooklist}{\expandafter(\CF_hookcurrentname)}% crochet déjà défini ?
+ {\CF_expsecond\CF_hookparselist{\CF_hookcurrentname}% chercher les caractéristiques du crochet sauvegardé
\CF_edefaddtomacro\CF_hookdrawlist{%
[\CF_hookcurrentname,\CF_hookcurrentlink,\CF_hookcurrenttikz]{\CF_hooksavedcoord}{n\number\CF_cntgroup-\number\CF_cntatomgroup}}%
\CF_eaddtomacro\CF_hookdrawlist{\expandafter{\CF_hooksavedcontent}}%
- \CF_eaddtomacro\CF_hookdrawlist{\expandafter{\CF_currentatom}}% ajoute les 4 arguments à la liste des crochets à tracer
+ \CF_eaddtomacro\CF_hookdrawlist{\expandafter{\CF_currentatom}}% ajoute les 4 arguments à la liste des crochets à tracer
\global\let\CF_hookdrawlist\CF_hookdrawlist
}%
{\CF_edefaddtomacro\CF_hooklist{(\CF_hookcurrentname)|n\number\CF_cntgroup-\number\CF_cntatomgroup|}%
@@ -1595,7 +1595,7 @@
\def#3{#2}%
}
-\def\CF_hookparselist#1{% #1 est le nom du noeud à retrouver
+\def\CF_hookparselist#1{% #1 est le nom du noeud à retrouver
\def\CF_hookparselista##1(#1)|##2|##3|##4\_nil{\def\CF_hooksavedcoord{##2}\def\CF_hooksavedcontent{##3}}%
\expandafter\CF_hookparselista\CF_hooklist\_nil
}
@@ -1630,12 +1630,12 @@
macro atom = \printatom,%macro qui prendra comme argument l'atome recevant la charge
circle = false,% false => noeud atome = rectangle
macro charge = ,% macro attendue (\printatom ou \ensuremath, par exemple) qui prendra comme argument la charge
- extra sep = 1.5pt,% séparation additionnelle entre le noeud (cercle ou rectangle) et la position des charges
+ extra sep = 1.5pt,% séparation additionnelle entre le noeud (cercle ou rectangle) et la position des charges
overlay = true,% charges en "surimpression"
shortcuts = true,% raccourcis \. \: \| et \" actifs pour Lewis
lewisautorot = true,% rotation auto charge Lewis
.radius = 0.15ex,% rayon du point
- :sep = 0.3em,% séparation des deux points
+ :sep = 0.3em,% séparation des deux points
.style = {fill=black},% style des points
"length = 1.5ex,% longueur rectangle
"width = .3ex,% largeur rectangle
@@ -1723,7 +1723,7 @@
\def\charge_b#1[#2]#3\_nil{%
\charge_c{#1}[#2]{#3}%
}
-\def\charge_c#1[#2]#3#4{% #1=TF pour overlay, #2= réglages, #3=liste d'emplacements, #4=atome
+\def\charge_c#1[#2]#3#4{% #1=TF pour overlay, #2= réglages, #3=liste d'emplacements, #4=atome
\setcharge{overlay=#1,#2}%
\setbox\CF_chargebox\hbox{\useKV[charge]{macro atom}{#4}}%
\CF_ifinsidetikz
@@ -1761,7 +1761,7 @@
\vrule width\wd\CF_chargebox height\CF_zero depth\CF_zero};% noeud pour placer les charges
\let\enableshortcuts\relax
\let\disableshortcuts\relax
- \ifboolKV[charge]{shortcuts}\CF_enableshortcuts{}% l'atome n'est _PAS_ concerné par les racourcis
+ \ifboolKV[charge]{shortcuts}\CF_enableshortcuts{}% l'atome n'est _PAS_ concerné par les racourcis
\charge_d#3,\CF_quark=%
\endtikzpicture
\CF_atendofcharge
@@ -1875,7 +1875,7 @@
}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%% S C H É M A S R É A C T I O N N E L S %%%
+%%% S C H É M A S R É A C T I O N N E L S %%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\let\CF_schemenest\CF_zero
@@ -1970,7 +1970,7 @@
}
\def\CF_schemestartb[#1]{%
- \ifnum\CF_schemenest=1 % la commande n'est pas imbriquée ?
+ \ifnum\CF_schemenest=1 % la commande n'est pas imbriquée ?
\CF_cntcompound0
\fi
\edef\CF_currentnodename{c\number\CF_cntcompound}%
@@ -1998,7 +1998,7 @@
{\CF_ifx\CF_toksa\bgroup
{\ifCF_compound_is_chemfig% bugfix 1.6
\edef\CF_restore_hashcatcode{\catcode\number`\#=\number\catcode`\# \relax}%
- \catcode`\#12 % TODO ou carrément mettre # à 12 dans tout l'environnement ?
+ \catcode`\#12 % TODO ou carrément mettre # à 12 dans tout l'environnement ?
\fi
\CF_addnextarg
}
@@ -2007,7 +2007,7 @@
\CF_schemestartd
}
{\CF_ifx\CF_toksa\chemfig
- \CF_compound_is_chemfigtrue% mettre le flag à vrai
+ \CF_compound_is_chemfigtrue% mettre le flag à vrai
{}%
\afterassignment\CF_schemestartc
\CF_addtomacro\CF_compound
@@ -2020,7 +2020,7 @@
\CF_addtomacro\CF_compound{{#1}}%
\ifCF_compound_is_chemfig% bugfix 1.6
\CF_restore_hashcatcode
- \CF_compound_is_chemfigfalse% mettre le flag à faux
+ \CF_compound_is_chemfigfalse% mettre le flag à faux
\fi
\CF_schemestartc
}
@@ -2100,7 +2100,7 @@
}
\def\CF_arrowb(#1.#2[#3]--#4.#5[#6])#7{%
- \def\CF_currentarrowtype{#7}% nom de la flèche
+ \def\CF_currentarrowtype{#7}% nom de la flèche
\CF_doifempty\CF_currentarrowtype{\def\CF_currentarrowtype{->}}%
\CF_testopt{\CF_arrowc(#1.#2[#3]--#4.#5[#6])}{}%
}
@@ -2118,7 +2118,7 @@
}
% #1, #4 : nom des nodes #2, #5 : ancres des nodes #3, #6 : styles des nodes
-% #7 : angle flèche #8 : longueur flèche #9 : style tikz de la flèche
+% #7 : angle flèche #8 : longueur flèche #9 : style tikz de la flèche
\def\CF_arrowe(#1.#2[#3]--#4.#5[#6])#7#8#9{%
\let\CF_arrowcurrentstyle\CF_arrowstyle
\if @\expandafter\CF_firsttonil\detokenize{#1.}\_nil% si #1 commence par @
@@ -2154,7 +2154,7 @@
\def\CF_nextnodestyle{#6}%
\fi
\fi
- \CF_arrowgobspaces% mange les espaces puis exécute \CF_nextaction
+ \CF_arrowgobspaces% mange les espaces puis exécute \CF_nextaction
}
\def\CF_arrowgobspaces{\futurelet\CF_toksa\CF_arrowgobspacesa}
@@ -2167,7 +2167,7 @@
\expandafter\def\expandafter\CF_arrowgobspacesb\space{\futurelet\CF_toksa\CF_arrowgobspacesa}
-\def\CF_arrowf#1#2#3#4{% #1=angle #2=longueur #3=ancre départ #4=ancre arrivée
+\def\CF_arrowf#1#2#3#4{% #1=angle #2=longueur #3=ancre départ #4=ancre arrivée
\def\CF_nextaction{\let\CF_compound\empty\CF_schemestartc}%
\def\CF_arrowcurrentangle{#1}\CF_doifempty\CF_arrowcurrentangle{\let\CF_arrowcurrentangle\CF_arrowangle}%
\def\CF_currentarrowlength{#2}\CF_doifempty\CF_currentarrowlength{\let\CF_currentarrowlength\CF_arrowlength}%
@@ -2187,8 +2187,8 @@
\edef\CF_nextnodeanchor{\CF_ifempty{#4}{180+\CF_arrowcurrentangle}{#4}}%
}
-% trace un flèche initiée par (@nom--@nom)
-% #1=type de flèche #2=nom depart #3=ancre départ #4=nom arrivée #5=ancre arrivée #6=style flèche
+% trace un flèche initiée par (@nom--@nom)
+% #1=type de flèche #2=nom depart #3=ancre départ #4=nom arrivée #5=ancre arrivée #6=style flèche
\def\CF_directarrow#1#2#3#4#5#6{%
\CF_expsecond{\def\CF_arrowstartname}{\CF_gobarg#2}%
\CF_expsecond{\def\CF_arrowendname}{\CF_gobarg#4}%
@@ -2236,7 +2236,7 @@
\def\CF_mergexmin{16383.99999pt}\let\CF_mergeymin\CF_mergexmin
\CF_mergeparsenodelist#1(\relax)% calcule les maxi des positions
\pgfmathsetmacro\CF_mergeextremeresult{\csname CF_merge\CF_mergeextreme\endcsname\CF_mergesign\CF_mergefromcoeff*\CF_compoundsep}%
- \CF_mergec#1(\relax)% trace les lignes entre les noeuds précédents et la ligne de jonction
+ \CF_mergec#1(\relax)% trace les lignes entre les noeuds précédents et la ligne de jonction
\CF_expsecond{\def\CF_temp}{\expandafter[\CF_mergestyle,shorten <=0,shorten >=0,-]}%
\if x\expandafter\CF_firsttonil\CF_mergeextreme\_nil
\CF_addtomacro\CF_temp{(\CF_mergeextremeresult pt,\CF_mergeymax)--(\CF_mergeextremeresult pt,\CF_mergeymin)}%
@@ -2382,7 +2382,7 @@
{\CF_arrowcurrentangle-#390-#1}%
}
-% #1 = label #2 = position #3 = + ou - (au dessus ou au dessous) #4 : nom du noeud de départ
+% #1 = label #2 = position #3 = + ou - (au dessus ou au dessous) #4 : nom du noeud de départ
% #5 = label #6 = position #7 = + ou - (au dessus ou au dessous) #8 : nom du noeud de fin
\def\CF_arrowdisplaylabel#1#2#3#4#5#6#7#8{%
\CF_doifnotempty{#1#5}
@@ -2410,7 +2410,7 @@
}%
}
-% pose des noeuds décalés de la dimension #1 à (\CF_arrowstartnode) et (\CF_arrowendnode)
+% pose des noeuds décalés de la dimension #1 à (\CF_arrowstartnode) et (\CF_arrowendnode)
\def\CF_arrowshiftnodes#1{%
\unless\ifdim\CF_ifempty{#1}\CF_zero{#1}=0pt
\expanded{%
@@ -2713,226 +2713,226 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
v0.1 2010/06/23
- - Première version publique sur le CTAN
+ - Première version publique sur le CTAN
----------------------------------------------------------------------
v0.2 2010/08/31
- Ajout de la documentation en anglais.
- Correction de bugs.
- - \printatom est désormais une macro publique.
- - Les espaces sont permis dans les molécules. Ils seront
- ignorés par défaut puisque les atomes sont composés en
+ - \printatom est désormais une macro publique.
+ - Les espaces sont permis dans les molécules. Ils seront
+ ignorés par défaut puisque les atomes sont composés en
mode math par \printatom
- - Une paire de Lewis peut être représentée ":".
+ - Une paire de Lewis peut être représentée ":".
- Dans les cycles, une correction de la longueur du trait
- déporté des liaisons doubles est fait de telle sorte que si
- l'on écrit \chemfig{*5(=====)}, on obtient deux polygones
- réguliers concentriques.
- - La séquence de contrôle \setnodestyle permet de spécifier
- le style des n?uds dessinés par tikz.
+ déporté des liaisons doubles est fait de telle sorte que si
+ l'on écrit \chemfig{*5(=====)}, on obtient deux polygones
+ réguliers concentriques.
+ - La séquence de contrôle \setnodestyle permet de spécifier
+ le style des n?uds dessinés par tikz.
----------------------------------------------------------------------
v0.3 2010/11/21
- - Amélioration de \definesubmol qui accepte les séquences de
- contrôle. On peut aussi choisir un alias dont la substitution
- est différente selon l'orientation de la liaison qui lui
+ - Amélioration de \definesubmol qui accepte les séquences de
+ contrôle. On peut aussi choisir un alias dont la substitution
+ est différente selon l'orientation de la liaison qui lui
arrive dessus.
- - Le caractère "|" force la fin d'un atome. Si on écrit
+ - Le caractère "|" force la fin d'un atome. Si on écrit
"D|ef" alors, chemfig verra deux atomes "D" et "ef".
- - Le caractère "#" est reconnu lorsqu'il suit un caractère de
- liaison. Il doit être suivi d'un argument entre parenthèses
- qui contient l'offset de début et de fin qui s'appliqueront
- à cette liaison.
- - La macro \chemfig admet un argument optionnel qui sera passé
- à l'environnement tikzpicture dans lequel elle est dessinée
- - Mise en place de la représentation des mécanismes
- réactionnels avec la syntaxe "@{<nom>}" devant un atome où
- "@{<nom>,<coeff>}" au tout début de l'argument d'une liaison.
+ - Le caractère "#" est reconnu lorsqu'il suit un caractère de
+ liaison. Il doit être suivi d'un argument entre parenthèses
+ qui contient l'offset de début et de fin qui s'appliqueront
+ à cette liaison.
+ - La macro \chemfig admet un argument optionnel qui sera passé
+ à l'environnement tikzpicture dans lequel elle est dessinée
+ - Mise en place de la représentation des mécanismes
+ réactionnels avec la syntaxe "@{<nom>}" devant un atome où
+ "@{<nom>,<coeff>}" au tout début de l'argument d'une liaison.
Cette syntaxe permet de placer un n?ud (au sens de tikz) qui
- deviendra l'extrémité des flèches des mécanismes.
- Le tracé des flèches est faite par la macro \chemmove dont
+ deviendra l'extrémité des flèches des mécanismes.
+ Le tracé des flèches est faite par la macro \chemmove dont
l'argument optionnel devient celui de l'environnement
- tikzpicture dans lequel sont faites les flèches.
- - Pour le mécanisme d'alignement vertical via le \vphantom, la
+ tikzpicture dans lequel sont faites les flèches.
+ - Pour le mécanisme d'alignement vertical via le \vphantom, la
commande \chemskipalign permet d'ignorer le groupe d'atomes
- dans lequel elle est écrite.
+ dans lequel elle est écrite.
- La commande \chemname permet d'afficher un nom sous une
- molécule. la commande \chemnameinit initialise la plus grande
- profondeur rencontrée.
- - La commande \lewis a été modifiée de telle sorte que les
- dessins des décorations soient proportionnels à la taille
+ molécule. la commande \chemnameinit initialise la plus grande
+ profondeur rencontrée.
+ - La commande \lewis a été modifiée de telle sorte que les
+ dessins des décorations soient proportionnels à la taille
de la police.
----------------------------------------------------------------------
v0.3a 2011/01/08
- Correction d'un bug dans l'argument optionnel de \definesubmol
lorsque celui-ci comporte des crochets.
- - Mise à jour du manuel en anglais.
+ - Mise à jour du manuel en anglais.
- Ajout de \vflipnext et \hflipnext pour retourner
- horizontalement ou verticalement la prochaine molécule.
+ horizontalement ou verticalement la prochaine molécule.
----------------------------------------------------------------------
v0.4 2011/03/07
- - chemfig est désormais écrit en plain-etex et donc
+ - chemfig est désormais écrit en plain-etex et donc
utilisable par d'autres formats que LaTeX.
- - Un peu plus de rigueur avec les catcodes des caractères
- spéciaux, notamment lorsque la commande \chemfig se trouve
+ - Un peu plus de rigueur avec les catcodes des caractères
+ spéciaux, notamment lorsque la commande \chemfig se trouve
dans l'argument de \chemmove, \chemabove, \chembelow, \chemrel.
- TODO : faut-il \scantoker l'argument de \chemfig pour être
- définitivement débarrassé de ces histoires de catcode ???
+ TODO : faut-il \scantoker l'argument de \chemfig pour être
+ définitivement débarrassé de ces histoires de catcode ???
- Correction d'un bug dans le calcul de l'angle des liaisons
----------------------------------------------------------------------
v0.4a 2011/04/10
- - Correction d'un bug concernant l'argument optionnel en début
- de molécule.
+ - Correction d'un bug concernant l'argument optionnel en début
+ de molécule.
----------------------------------------------------------------------
v0.4b 2011/04/24
- - l'argument de \chemfig est tokénisé avec \scantokens ce qui
- rend caduc tout souci de code de catégorie, à part #.
- - la commande \setbondstyle permet de définir le style des
+ - l'argument de \chemfig est tokénisé avec \scantokens ce qui
+ rend caduc tout souci de code de catégorie, à part #.
+ - la commande \setbondstyle permet de définir le style des
liaisons.
- correction de l'affichage incorrect des doubles liaisons dans
- les cycles après les commandes \hflipnext et \vflipnext
- - correction d'un bug lorsqu'un alias commence une molécule
+ les cycles après les commandes \hflipnext et \vflipnext
+ - correction d'un bug lorsqu'un alias commence une molécule
----------------------------------------------------------------------
v1.0 2011/06/15
- - les schémas réactionnels sont désormais disponibles.
+ - les schémas réactionnels sont désormais disponibles.
- \Chemabove et \Chembelow modifient la boite englobante.
- \Lewis modifie la boite englobante
- les macros \chemleft, \chemright, \chemup et \chemdown
- affichent des délimiteurs extensibles à gauche, à droite,
- au dessus et au dessous d'un matériel.
+ affichent des délimiteurs extensibles à gauche, à droite,
+ au dessus et au dessous d'un matériel.
----------------------------------------------------------------------
v1.0a 2011/09/18
- les macros \Lewis et \lewis admettent un argument optionnel
- - la macro \setlewisdist règle la distance entre les 2
- électrons
+ - la macro \setlewisdist règle la distance entre les 2
+ électrons
----------------------------------------------------------------------
v1.0b 2011/11/29
- - la commande \merge est désormais protégée entre
- \schemestart et \schemestop contre des définitions par d'autres
+ - la commande \merge est désormais protégée entre
+ \schemestart et \schemestop contre des définitions par d'autres
packages.
- - \box0 est utilisé au lieu du maladroit \unhbox0
+ - \box0 est utilisé au lieu du maladroit \unhbox0
----------------------------------------------------------------------
v1.0c 2011/11/30
- - la macro \+ n'est plus explicitement écrite
- - vérifie que eTeX est le moteur utilisé
+ - la macro \+ n'est plus explicitement écrite
+ - vérifie que eTeX est le moteur utilisé
----------------------------------------------------------------------
v1.0d 2011/12/19
- - les cercles des cycles étaient tracés au mauvais moment. La
- longueur de la liaison qui les précédait influait sur le
+ - les cercles des cycles étaient tracés au mauvais moment. La
+ longueur de la liaison qui les précédait influait sur le
rayon du cercle : \chemfig{-[,0.5]**6(------)} donnait un bug
- à l'affichage.
+ à l'affichage.
----------------------------------------------------------------------
v1.0e 2012/01/13
- la gestion des espaces dans les groupes d'atomes est
- désormais plus rigoureuse. Plusieurs bugs ont été
- corrigé
+ désormais plus rigoureuse. Plusieurs bugs ont été
+ corrigé
----------------------------------------------------------------------
v1.0f 2012/02/24
- - correction d'un bug avec \definesubmol, les catcodes n'étaient
- pas correctement gérés.
+ - correction d'un bug avec \definesubmol, les catcodes n'étaient
+ pas correctement gérés.
----------------------------------------------------------------------
v1.0g 2012/11/16
- correction d'un bug dans \CF_directarrow pour faire prendre en
- compte le style des flèche par défaut
- - correction d'un bug dans \CF_lewisc : la boite *doit* être
- composée en dehors de l'environnement tikzpicture pour
- éviter nullfont si jamais \printatom ne passe pas en mode
+ compte le style des flèche par défaut
+ - correction d'un bug dans \CF_lewisc : la boite *doit* être
+ composée en dehors de l'environnement tikzpicture pour
+ éviter nullfont si jamais \printatom ne passe pas en mode
math.
- correction d'un bug dans \CF_chemfigc : si une longueur par
- défaut est modifiée par [,<l>] au début d'une molécule
- et si des cycles étaient emboités, cette longueur n'était
- pas appliquée aux sous-cycles.
- - ré-écriture des macros \chemabove et \chembemow pour
- prendre en compte le bug (désormais corrigé) dans luatex.
- - nouvelle macro \setstacksep qui définit l'espacement par
- défaut dans les macros \chemabove et \chembelow.
+ défaut est modifiée par [,<l>] au début d'une molécule
+ et si des cycles étaient emboités, cette longueur n'était
+ pas appliquée aux sous-cycles.
+ - ré-écriture des macros \chemabove et \chembemow pour
+ prendre en compte le bug (désormais corrigé) dans luatex.
+ - nouvelle macro \setstacksep qui définit l'espacement par
+ défaut dans les macros \chemabove et \chembelow.
----------------------------------------------------------------------
v1.0h 2013/11/28
- - \chemname admet maintenant une version étoilé qui ne tient
- pas compte des profondeurs précédentes.
- - \CF_dpmax est géré globalement.
- - correction d'un bug dans "-U>" : le style de la flèche
- n'était pris en compte pour l'arc.
+ - \chemname admet maintenant une version étoilé qui ne tient
+ pas compte des profondeurs précédentes.
+ - \CF_dpmax est géré globalement.
+ - correction d'un bug dans "-U>" : le style de la flèche
+ n'était pris en compte pour l'arc.
- correction d'un bug dans \CF_directarrow : l'angle de la
- flèche n'était pas calculé
+ flèche n'était pas calculé
----------------------------------------------------------------------
v1.1 2015/02/13
- correction d'un bug dans \CF_seeksubmol : la macro
- \CF_molecule est dépouillé de son éventuel espace
- en première position.
+ \CF_molecule est dépouillé de son éventuel espace
+ en première position.
- correction d'un bug dans \CF_arrowf : le nom du prochain
- n?ud courant "end@arrow@i" était erroné dans le cas où une
- flèche contenait un sous schéma. Ce nom doit dépendre de
+ n?ud courant "end@arrow@i" était erroné dans le cas où une
+ flèche contenait un sous schéma. Ce nom doit dépendre de
\CF_schemenest.
- - la jonction entre deux liaisons consécutives dans l'axe peut
- être activé avec \enablebondjoin et désactivé avec
- \disablebondjoin (préférable, état par défaut).
- - \chemfig suivi d'une "*" demande à ce que les liaisons aient
+ - la jonction entre deux liaisons consécutives dans l'axe peut
+ être activé avec \enablebondjoin et désactivé avec
+ \disablebondjoin (préférable, état par défaut).
+ - \chemfig suivi d'une "*" demande à ce que les liaisons aient
une longueur invariable : la distance inter-atome devient donc
- variable. Cette fonctionnalité est désactivé dans les
- cycles afin que les polygones soient réguliers.
- \enablefixedbondlength permet cette fonctionnalité pour
- toutes les macros \chemfig (même non étoilée) tandis que
- \disablefixedbondlength le désactive.
+ variable. Cette fonctionnalité est désactivé dans les
+ cycles afin que les polygones soient réguliers.
+ \enablefixedbondlength permet cette fonctionnalité pour
+ toutes les macros \chemfig (même non étoilée) tandis que
+ \disablefixedbondlength le désactive.
----------------------------------------------------------------------
v1.1a 2015/02/23
- correction d'un bug dans \CF_grabbondoffset. Si \chemfig est
- dans l'argument d'une macro, les # sont doublés par l'action
+ dans l'argument d'une macro, les # sont doublés par l'action
de \scantokens de la macro \CF_chemfigb et il faut un
- argument délimité avant "(" pour absorber tous les #.
+ argument délimité avant "(" pour absorber tous les #.
----------------------------------------------------------------------
v1.2 2015/10/08
- - correction d'un bug dans le tracé des liaisons de Cram.
- - création de \setangleincrement.
- - chargement de "arrows.meta" et définition de la flèche "CF"
- basée sur "Stealth" et définie avec \pgfdeclarearrow.
- Les anciennes flèches "CF_full" et "CF_half" sont
- abandonnées puisque définies avec \pgfarrowsdeclare.
- - flèche "-U>" corrigée : le placement des labels est
+ - correction d'un bug dans le tracé des liaisons de Cram.
+ - création de \setangleincrement.
+ - chargement de "arrows.meta" et définition de la flèche "CF"
+ basée sur "Stealth" et définie avec \pgfdeclarearrow.
+ Les anciennes flèches "CF_full" et "CF_half" sont
+ abandonnées puisque définies avec \pgfarrowsdeclare.
+ - flèche "-U>" corrigée : le placement des labels est
maintenant correct dans tous les cas. Ainsi :
-U>[<a>][<b>][<d>][r][a]
- place le label <a> près du début de la flèche, quels que
+ place le label <a> près du début de la flèche, quels que
soient les signes du rayon r et de l'angle a.
- - \chemrel, \setchemrel et \chemsign sont supprimées.
- - compatibilité, avec les limitations d'usage, avec la
+ - \chemrel, \setchemrel et \chemsign sont supprimées.
+ - compatibilité, avec les limitations d'usage, avec la
librairie "externalize" : le \begin{tikzpicture} voit
- désormais le \end{tikzpicture} correspondant dans la macro
+ désormais le \end{tikzpicture} correspondant dans la macro
\CF_chemfigb.
----------------------------------------------------------------------
v1.2a 2015/10/21
- - erreur de copier-coller dans le code: une adresse url était
- malencontreusement présente en plein milieu d'une ligne de
+ - erreur de copier-coller dans le code: une adresse url était
+ malencontreusement présente en plein milieu d'une ligne de
code
----------------------------------------------------------------------
v1.2b 2015/11/15
- bug dans \CF_seeksubmol qui laissait "*" dans le flux de
- lecture de TeX. Un message d'erreur est également ajouté
+ lecture de TeX. Un message d'erreur est également ajouté
en cas de "!" en fin de traitement.
- - correction d'un bug dans \CF_setbondangle où l'angle [<:a>]
- n'était pas évalué par \pgfmathsetmacro.
+ - correction d'un bug dans \CF_setbondangle où l'angle [<:a>]
+ n'était pas évalué par \pgfmathsetmacro.
----------------------------------------------------------------------
v1.2c 2015/11/20
- - Correction d'un bug dans \CF_setbondangle : l'angle renvoyé
- pouvait être négatif
+ - Correction d'un bug dans \CF_setbondangle : l'angle renvoyé
+ pouvait être négatif
- Correction d'un bug dans \CF_directarrow : la macro \CF_ifempty
- n'est pas correctement développée dans l'argument de
+ n'est pas correctement développée dans l'argument de
\pgfpointanchor
----------------------------------------------------------------------
v1.2d 2015/12/01
- - correction d'un bug dans la flèche "-U"
- - la version étoilée de \setcrambond dessine les liaisons de
- Cram en pointillés sous forme de trait large et non pas sous
+ - correction d'un bug dans la flèche "-U"
+ - la version étoilée de \setcrambond dessine les liaisons de
+ Cram en pointillés sous forme de trait large et non pas sous
forme de triangle.
----------------------------------------------------------------------
v1.2e 2017/05/20
- - la macro contenant la définition d'une flèche est
- désormais "\CF_arrow(<nom>)", ainsi la macro \0 n'est plus
- définie par \definearrow
- - remerciements rajoutés après une suppression indue, pour ne
- froisser aucune susceptibilité
+ - la macro contenant la définition d'une flèche est
+ désormais "\CF_arrow(<nom>)", ainsi la macro \0 n'est plus
+ définie par \definearrow
+ - remerciements rajoutés après une suppression indue, pour ne
+ froisser aucune susceptibilité
----------------------------------------------------------------------
v1.3 2018/03/08
- - tous les paramètres sont désormais passés via \setchemfig qui
- fait appel à "simplekv". Par conséquent, _toutes_ les macros qui
- réglaient des paramètres deviennent obsolètes, à savoir :
+ - tous les paramètres sont désormais passés via \setchemfig qui
+ fait appel à "simplekv". Par conséquent, _toutes_ les macros qui
+ réglaient des paramètres deviennent obsolètes, à savoir :
\setcrambond, \setatomsep, \setbondoffset, \setdoublesep,
\setangleincrement, \enablefixedbondlength,
\disablefixedbondlength, \setnodestyle, \setbondstyle,
@@ -2940,42 +2940,42 @@ v1.3 2018/03/08
\setarrowdefault, \setandsign, \setarrowoffset,
\setcompoundsep, \setarrowlabelsep, \enablebondjoin,
\disablebondjoin et \schemedebug.
- et ces macros seront *supprimées* dans une future version.
- - la version étoilée "\chemfig*" et les deux arguments optionnels
- de la macro "\chemfig[][]" sont également optionnels et seront
- *supprimé*s dans une future version afin d'accéder à la syntaxe
- \chemfig[clés=valeurs]{code}
- - 6 nouveaux paramètres : "lewis radius", "arrow double sep",
+ et ces macros seront *supprimées* dans une future version.
+ - la version étoilée "\chemfig*" et les deux arguments optionnels
+ de la macro "\chemfig[][]" sont également optionnels et seront
+ *supprimé*s dans une future version afin d'accéder à la syntaxe
+ \chemfig[clés=valeurs]{code}
+ - 6 nouveaux paramètres : "lewis radius", "arrow double sep",
"arrow double coeff", "arrow double harpoon", "cycle radius
coeff", "arrow head".
- correction d'un bug dans \CF_parsemergeopt qui dans certains
- cas, envoyait vers l'affichage des caractères
+ cas, envoyait vers l'affichage des caractères
- petit toilettage du code
- - macro \polymerdelim (non documentée) expérimentale et encore
+ - macro \polymerdelim (non documentée) expérimentale et encore
en phase de tests
- - suppression d'un registre d'écriture de fichier
+ - suppression d'un registre d'écriture de fichier
----------------------------------------------------------------------
v1.31 2018/04/05
- - correction d'un espace indésirable dans \CF_ifnextchar
+ - correction d'un espace indésirable dans \CF_ifnextchar
----------------------------------------------------------------------
v1.32 2018/08/23
- - définition de \printatom, \CF_begintikzpicture et
+ - définition de \printatom, \CF_begintikzpicture et
\CF_endtikzpicture dans le fichier t-chemfig.tex
----------------------------------------------------------------------
v1.33 2018/10/31
- - les macros définies par \definesubmol peuvent désormais avoir un ou
+ - les macros définies par \definesubmol peuvent désormais avoir un ou
plusieurs arguments
- - macro \polymerdelim documentée
+ - macro \polymerdelim documentée
----------------------------------------------------------------------
v1.34 2019/02/23
- - bug dans la flèche "<->" corrigé
+ - bug dans la flèche "<->" corrigé
----------------------------------------------------------------------
v1.4 2019/04/18
- corrections de nombreux bugs
- - caractère privé "_" et non plus "@" -> modifications à prévoir
- notamment dans la doc avec les codes spécifiques aux flèches, ça
+ - caractère privé "_" et non plus "@" -> modifications à prévoir
+ notamment dans la doc avec les codes spécifiques aux flèches, ça
risque de couiner sur tex.stackexchange.com
- - anciennes macros abandonnées et désormais indéfinies :
+ - anciennes macros abandonnées et désormais indéfinies :
\setcrambond, \setatomsep, \setbondoffset, \setdoublesep,
\setangleincrement, \enablefixedbondlength,
\disablefixedbondlength, \setnodestyle, \setbondstyle,
@@ -2983,64 +2983,69 @@ v1.4 2019/04/18
\setarrowdefault, \setandsign, \setarrowoffset,
\setcompoundsep, \setarrowlabelsep, \enablebondjoin,
\disablebondjoin et \schemedebug
- - l'ancienne syntaxe \chemfig[][]{} est abandonnée et n'est plus
- acceptée, désormais c'est
- \chemfig[<clés>=<valeurs>]{<code molécule>}
+ - l'ancienne syntaxe \chemfig[][]{} est abandonnée et n'est plus
+ acceptée, désormais c'est
+ \chemfig[<clés>=<valeurs>]{<code molécule>}
- l'ancienne syntaxe \lewis[<coeff>] ou \Lewis[<coeff>] n'est
- plus acceptée au profit de \lewis[<clés>=<valeurs>]
+ plus acceptée au profit de \lewis[<clés>=<valeurs>]
----------------------------------------------------------------------
v1.41 2019/05/21
- utilisation de la nouvelle primitive \expanded
- - nouvelle clé "h align" (true par défaut) pour les délimiteurs
- de \polymerdelim. Lorsque à false, les délimiteurs ne sont
- plus alignés horizontalement mais positionnés aux noeuds demandés
- - nouvelle clé "auto rotate" qui n'a de sens que si h align=false :
- les délimiteurs sont automatiquement inclinés
- - nouvelle clé "rotate" qui n'a de sens que si halign=false ET
- auto rotate=false : l'inclinaison des délimiteurs peut être
+ - nouvelle clé "h align" (true par défaut) pour les délimiteurs
+ de \polymerdelim. Lorsque à false, les délimiteurs ne sont
+ plus alignés horizontalement mais positionnés aux noeuds demandés
+ - nouvelle clé "auto rotate" qui n'a de sens que si h align=false :
+ les délimiteurs sont automatiquement inclinés
+ - nouvelle clé "rotate" qui n'a de sens que si halign=false ET
+ auto rotate=false : l'inclinaison des délimiteurs peut être
choisie
----------------------------------------------------------------------
v1.5 2020/03/05
- nouvelles macros \charge et \Charge. Les macros \lewis et \Lewis
- sont obsolètes et amenées à disparaitre à moyen terme (au moins
+ sont obsolètes et amenées à disparaitre à moyen terme (au moins
9 mois), soit fin 2020
- prise en compte de la dimension d'un groupe d'atome pour tracer
des liaisons jointives
- - bug corrigé dans \CF_seeknode
+ - bug corrigé dans \CF_seeknode
- ajout d'une section dans le manuel (placement des atomes)
----------------------------------------------------------------------
v1.51 2020/04/06
- - bug corrigé dans \chargerect_a et \chargeline_a
+ - bug corrigé dans \chargerect_a et \chargeline_a
----------------------------------------------------------------------
v1.52 2020/04/14
- - bug : définition corrigée de \CFthesubmol dans \def_submolc pour
- qu'elle se développe en 1 coup seulement
+ - bug : définition corrigée de \CFthesubmol dans \def_submolc pour
+ qu'elle se développe en 1 coup seulement
----------------------------------------------------------------------
v1.53 2020/04/27
- - mise à jour en fonction des nouvelles fonctionnalités de
+ - mise à jour en fonction des nouvelles fonctionnalités de
l'extension simplekv
- - bug : \CF_ifzerodim interrompt maintenant le tracé dans la \hbox
+ - bug : \CF_ifzerodim interrompt maintenant le tracé dans la \hbox
----------------------------------------------------------------------
v1.54 2020/05/21
- chemfig ne peut plus fonctionner sans \expanded
- - bug : un signe "=" laissé par erreur dans le flux
+ - bug : un signe "=" laissé par erreur dans le flux
----------------------------------------------------------------------
v1.55 2020/06/15
- - chemfig est incompatible avec conTeXt, vu que ce moteur redéfinit
- des primitives telles que \expanded, \unexpanded et peut être
+ - chemfig est incompatible avec conTeXt, vu que ce moteur redéfinit
+ des primitives telles que \expanded, \unexpanded et peut être
d'autres.
----------------------------------------------------------------------
v1.56 2020/07/13
- - le centre des cycles est désormais accessible via un noeud
- spécifique pour chacun d'eux.
+ - le centre des cycles est désormais accessible via un noeud
+ spécifique pour chacun d'eux.
----------------------------------------------------------------------
v1.6 2021/02/26
- - les macros des formules de Lewis sont retirées et placées dans
- le fichier séparé "lewis.tex" que l'utilisateur peut charger
+ - les macros des formules de Lewis sont retirées et placées dans
+ le fichier séparé "lewis.tex" que l'utilisateur peut charger
s'il le souhaite
- - ajout d'une clé <debug> pour le trousseau [chemfig]
- - à l'intérieur d'un schéma, le token '#' est permis dans
+ - ajout d'une clé <debug> pour le trousseau [chemfig]
+ - à l'intérieur d'un schéma, le token '#' est permis dans
l'argument de \chemfig
----------------------------------------------------------------------
v1.6a 2021/02/28
- - le fichier lewis.tex a été renommé chemfig-lewis.tex
+ - le fichier lewis.tex a été renommé chemfig-lewis.tex
+----------------------------------------------------------------------
+v1.6b 2021/08/01
+ - encodage UTF-8
+ - la macro \# n'était pas définie pour remplacer «#(...)» lorsque
+ \chemfig se trouve dans l'argument d'une macro.
diff --git a/macros/latex/contrib/easybook/easybook.dtx b/macros/latex/contrib/easybook/easybook.dtx
index 3e61fa0833..7f671cf194 100644
--- a/macros/latex/contrib/easybook/easybook.dtx
+++ b/macros/latex/contrib/easybook/easybook.dtx
@@ -8,7 +8,7 @@
%<*class>
\NeedsTeXFormat{LaTeX2e}[2020/10/01]
\RequirePackage{l3keys2e}
-\ProvidesExplClass{easybook}{2021/07/30}{1.28}
+\ProvidesExplClass{easybook}{2021/08/01}{1.28b}
{Typeset Chinese theses or books}
\bool_set_false:N \l__eb_compile_draft_bool
@@ -292,11 +292,10 @@
%<*package>
\NeedsTeXFormat{LaTeX2e}[2020/10/01]
\RequirePackage{l3keys2e,etoolbox}
-\ProvidesExplPackage{easybase}{2021/07/30}{1.28}
+\ProvidesExplPackage{easybase}{2021/08/01}{1.28b}
{Typeset Chinese theses or books}
\cs_generate_variant:Nn \int_to_arabic:n { v }
-\cs_generate_variant:Nn \int_to_alph:n { v }
\cs_generate_variant:Nn \dim_add:Nn { NV,Nv }
\cs_generate_variant:Nn \dim_set:Nn { NV }
\cs_generate_variant:Nn \prop_set_from_keyval:Nn { NV }
@@ -728,8 +727,6 @@
\cs_if_exist:NF \kaishu { \cs_gset_eq:NN \kaishu \itshape }
}
-\tl_new:N \l__eb_fnmark_number_choice_tl
-\bool_new:N \l__eb_fntext_bottom_bool
\ctex_define:nn { style }
{
footwith .choices:nn =
@@ -738,6 +735,73 @@
footwith .value_required:n = true,
footwith .initial:n = chapter
}
+\NewDocumentCommand{\eb_assign_fnmark_code:n}
+ {>{\SplitArgument{1}{,}}m}
+ {\eb_assign_fnmark_code_pos:nn #1}
+\cs_new_protected:Npn \eb_assign_fnmark_code_pos:nn #1#2
+ {
+ \tl_set:Nn \l__eb_fnmark_before_tl {#1}
+ \tl_if_novalue:nTF {#2}
+ { \tl_clear:N \l__eb_fnmark_after_tl }
+ { \tl_set:Nn \l__eb_fnmark_after_tl {#2} }
+ }
+\cs_new:Npn \eb_fnmark_counter_pifont:N #1
+ { \ding{\int_eval:n { 171 + #1 }} }
+\cs_new:Npn \eb_fnmark_counter_pifont_neg:N #1
+ { \ding{\int_eval:n { 181 + #1 }} }
+\cs_new:Npn \eb_fnmark_counter_pifont_sans:N #1
+ { \ding{\int_eval:n { 191 + #1 }} }
+\cs_new:Npn \eb_fnmark_counter_pifont_sans_neg:N #1
+ { \ding{\int_eval:n { 201 + #1 }} }
+\cs_new:Npn \eb_int_format_trans:NN #1
+ {
+ \str_case:nn {#1}
+ {
+ { A } { \int_to_Alph:n }
+ { a } { \int_to_alph:n }
+ { 1 } { \int_to_arabic:n }
+ { I } { \int_to_Roman:n }
+ { i } { \int_to_roman:n }
+ { c } { \exp_args:NV \zhnumber }
+ }
+ }
+\cs_new_protected:Npn \eb_fnmark_normal_label_set:nn #1#2
+ {
+ \tl_set:Nn \l__eb_fnmark_number_type_tl {#1}
+ \cs_set:cpx {#2}
+ {
+ \str_case:VnT \l__eb_fnmark_number_type_tl
+ {
+ { plain }
+ { \exp_not:N \int_use:N }
+ { pifont }
+ { \exp_not:N \eb_fnmark_counter_pifont:N }
+ { pifont* }
+ { \exp_not:N \eb_fnmark_counter_pifont_neg:N }
+ { pifont-sans }
+ { \exp_not:N \eb_fnmark_counter_pifont_sans:N }
+ { pifont-sans* }
+ { \exp_not:N \eb_fnmark_counter_pifont_sans_neg:N }
+ }
+ { \exp_not:N \c@footnote }
+ }
+ }
+\cs_new_protected:Npn \eb_fnmark_shorter_label_set:nn #1#2
+ {
+ \tl_set:Nn \l__eb_fnmark_shorter_label_tl {#1}
+ \eb_clist_map_inline:nn
+ { A,a,1,I,i,c }
+ {
+ \tl_if_in:nnT {#1} {##1}
+ {
+ \tl_replace_once:Nnn \l__eb_fnmark_shorter_label_tl {##1}
+ { \eb_int_format_trans:NN ##1 \c@footnote }
+ \seq_map_break:
+ }
+ }
+ \cs_set_eq:cN {#2} \l__eb_fnmark_shorter_label_tl
+ }
+\bool_new:N \l__eb_fntext_bottom_bool
\ctex_define:nn { hdrset }
{
fnmargin .dim_set:N = \footnoteindent,
@@ -750,9 +814,9 @@
fnmark-pos .tl_set:N = \l__eb_fnmark_position_tl,
fnmark-pos .initial:n = super,
- afterfnmark .tl_set:N = \l__eb_fnmark_after_tl,
- afterfnmark .initial:n =
- { \tl_if_eq:NnF \l__eb_fnmark_position_tl { super } { \space } },
+ fnmark-code .code:n = \eb_assign_fnmark_code:n {#1},
+ fnmark-code .initial:n =
+ { ,\tl_if_eq:NnF \l__eb_fnmark_position_tl { super } { \space } },
fnmark-form .tl_set:N = \l__eb_fnmark_format_tl,
footnotetype .multichoices:nn =
@@ -767,8 +831,18 @@
fnmark-num .choices:nn =
{ plain,pifont,pifont*,pifont-sans,pifont-sans* }
- { \tl_set:Nn \l__eb_fnmark_number_choice_tl {#1} },
+ { \eb_fnmark_normal_label_set:nn {#1} { the@footnote } },
fnmark-num .value_required:n = true,
+ fnmark-num/unknown .code:n =
+ { \eb_fnmark_shorter_label_set:nn {#1} { the@footnote } },
+ fntext-num .choices:nn =
+ { plain,pifont,pifont*,pifont-sans,pifont-sans* }
+ { \eb_fnmark_normal_label_set:nn {#1} { thefootnote } },
+ fntext-num .value_required:n = true,
+ fntext-num/unknown .code:n =
+ { \eb_fnmark_shorter_label_set:nn {#1} { thefootnote } },
+ fnboth-num .meta:n = { fntext-num = #1,fnmark-num = #1 },
+ fnboth-num .initial:n = plain,
unknown .code:n = \eb_msg_unknown_option:n { hdrset }
}
@@ -882,20 +956,58 @@
}
\ProvideDocumentCommand{\super}{mo}{\textsuperscript{#1}}
\providecommand{\spb@textsuperscript@save}{\textsuperscript}
-\providecommand{\footref}[1]
+\cs_set_protected:Npn \footref #1
{
\group_begin:
- \unrestored@protected@xdef\@thefnmark{\ref{#1}}
+ \unrestored@protected@xdef\eb@thefnmark{\ref{#1}}
\group_end:
\@footnotemark
}
+\cs_set_protected:Npn \footnote
+ {
+ \@ifnextchar [
+ {\@xfootnote}
+ {
+ \exp_args:NV \stepcounter \@mpfn
+ \eb_current_label:n { @footnote }
+ \protected@xdef\@thefnmark{\thempfn}
+ \protected@xdef\eb@thefnmark{\the@footnote}
+ \@footnotemark
+ \@footnotetext
+ }
+ }
+\cs_set:Npn \footnotemark
+ {
+ \@ifnextchar [
+ {\@xfootnotemark}
+ {
+ \stepcounter{footnote}
+ \protected@xdef\eb@thefnmark{\the@footnote}
+ \@footnotemark
+ }
+ }
+\ctex_at_end_package:nn { hyperref }
+ {
+ \cs_set:Npn \@xfootnotemark [#1]
+ {
+ \group_begin:
+ \setcounter{footnote}{#1}
+ \unrestored@protected@xdef\eb@thefnmark{\the@footnote}
+ \group_end:
+ \@footnotemark
+ }
+ }
\cs_set:Npn \@makefnmark
{
\hbox:n
{
\tl_use:N \l__eb_subfont_footnote_tl
\tl_use:N \l__eb_fnmark_format_tl
- {\super{\@thefnmark}[0pt]}
+ {
+ \tl_if_eq:NnTF \@mpfn { footnote }
+ { \super{\eb@thefnmark}[0pt] }
+ { \super{\@thefnmark}[0pt] }
+ }
}
}
\cs_new:Npn \eb@makefnmark
@@ -906,8 +1018,12 @@
\tl_use:N \l__eb_fnmark_format_tl
{
\tl_if_eq:NnT \l__eb_fnmark_position_tl { super }
- { \spb@textsuperscript@save }{\@thefnmark}
- \tl_use:N \l__eb_fnmark_after_tl
+ { \spb@textsuperscript@save }
+ {
+ \tl_use:N \l__eb_fnmark_before_tl
+ \@thefnmark
+ \tl_use:N \l__eb_fnmark_after_tl
+ }
}
}
}
@@ -924,30 +1040,8 @@
\cs_new:Npn \Footnote #1 { \Footnotemark{#1}\@footnotetext }
\cs_new:Npn \Footnotemark #1 { \eb@@makefnmark{#1}\@footnotemark }
\cs_new:Npn \Footnotetext #1 { \eb@@makefnmark{#1}\@footnotetext }
-\cs_new:Npn \eb_fnmark_counter_pifont:N #1
- { \ding{\int_eval:n { 171 + #1 }} }
-\cs_new:Npn \eb_fnmark_counter_pifont_neg:N #1
- { \ding{\int_eval:n { 181 + #1 }} }
-\cs_new:Npn \eb_fnmark_counter_pifont_sans:N #1
- { \ding{\int_eval:n { 191 + #1 }} }
-\cs_new:Npn \eb_fnmark_counter_pifont_sans_neg:N #1
- { \ding{\int_eval:n { 201 + #1 }} }
-\cs_new:Npn \eb_footnote_counter:N #1
- {
- \str_case:VnF \l__eb_fnmark_number_choice_tl
- {
- { plain } { \int_use:N #1 }
- { pifont } { \eb_fnmark_counter_pifont:N #1 }
- { pifont* } { \eb_fnmark_counter_pifont_neg:N #1 }
- { pifont-sans } { \eb_fnmark_counter_pifont_sans:N #1 }
- { pifont-sans* } { \eb_fnmark_counter_pifont_sans_neg:N #1 }
- }
- { \int_use:N #1 }
- }
-\cs_new:Npn \eb_alph:n #1 { \int_to_alph:v { c@#1 } }
-\cs_set:Npn \thefootnote { \eb_footnote_counter:N \c@footnote }
-\cs_set:Npn \thempfootnote { \eb_alph:n { mpfootnote } }
\cs_new:Npn \eb@footmisc@ifvoid #1#2#3 { \ifvoid #1#2\else #3\fi }
+\cs_set:Npn \thempfootnote { \int_to_alph:n { \c@mpfootnote } }
\contentsuse{lstlisting}{lol}
\seq_put_left:Nn \c__ctex_headings_seq { chapter }
@@ -1191,11 +1285,10 @@
\tl_remove_once:cn { theeb@#4 } {#5}
\eb_current_label:n { eb@#4 }
}
-\cs_new:Npn \eb_arabic:n #1 { \int_to_arabic:v { c@#1 } }
\cs_new:Npn \eb_section_counter_prefix:n #1
{
\int_compare:nNnT { \c@chapter } > { 0 } { \use:c { the#1chapter }. }
- \eb_arabic:n { #1section }
+ \int_to_arabic:v { c@#1section }
}
\cs_set:Npn \thebichapter { \eb_arabic:n { bichapter } }
\cs_set:Npn \thebisection { \eb_section_counter_prefix:n { bi } }
@@ -2147,7 +2240,10 @@
\clist_map_inline:nn { page,none }
{
\tl_if_eq:NnT \l_keys_value_tl {##1}
- { \clist_map_break:n { \colorlet{ctex@toc@number}{black} } }
+ {
+ \colorlet{ctex@toc@number}{black}
+ \clist_map_break:
+ }
}
},
linktoc .default:n = all,
@@ -2256,7 +2352,7 @@
}
%</package>
%<*tcolorbox>
-\ProvidesExplFile{eb-tcolorbox.cfg}{2021/07/30}{1.28}
+\ProvidesExplFile{eb-tcolorbox.cfg}{2021/08/01}{1.28b}
{Customization of tcolorbox for easybook}
\tl_gset:Nn \eb@tc@line@skip { 0.5\baselineskip }
diff --git a/macros/latex/contrib/easybook/easybook.pdf b/macros/latex/contrib/easybook/easybook.pdf
index 1da8d293a7..e8f8782172 100644
--- a/macros/latex/contrib/easybook/easybook.pdf
+++ b/macros/latex/contrib/easybook/easybook.pdf
Binary files differ
diff --git a/macros/latex/contrib/easybook/easybook.tex b/macros/latex/contrib/easybook/easybook.tex
index 1f85ee17da..da6802b68f 100644
--- a/macros/latex/contrib/easybook/easybook.tex
+++ b/macros/latex/contrib/easybook/easybook.tex
@@ -3,15 +3,16 @@
\usepackage[fontset = fandol]{ctex}
\usepackage
{
- hologo,pifont,booktabs,enumitem,colortbl,
- fancyvrb-ex,geometry,indentfirst
+ booktabs,enumitem,newtxmath,indentfirst,
+ fancyvrb,geometry,colortbl,hologo,pifont
}
+\colorlet{cnltxred}{violet}
\setcnltx
{
name = easybook,
title = EASYBOOK 使用手册,
- version = v1.28,
- date = 2021/07/30,
+ version = v1.28b,
+ date = 2021/08/01,
authors = 瞿毅,
info = 排版简体中文学ä½è®ºæ–‡å’Œä¹¦ç±,
email = quee123@foxmail.com,
@@ -28,7 +29,7 @@
add-frame-options = {innerleftmargin = 2em},
listings-options = {numbers = none}
}
-\KOMAoptions{headsepline = 0.6pt}
+\KOMAoptions{headsepline = 0.6pt,numbers = {noenddot}}
\setfootnoterule[0.6pt]{0.4\columnwidth}
\addtokomafont{headsepline}{\color{cnltxblue}}
\addtokomafont{footnoterule}{\color{cnltxblue}}
@@ -39,7 +40,6 @@
\geometry{margin = 1in,marginparwidth = 0.65in}
\setlist{nosep,labelindent = \parindent,leftmargin = *,labelsep = 0.5em}
\setlist[itemize,1]{label = \small\color{cnltxblue}\textbullet}
-\newnote*{\change}[2][]{Introduced in #2\newline\ifblank{#1}{}{Changed in #1}}
\arrayrulecolor{cnltxblue}
\setcounter{tocdepth}{2}
@@ -171,17 +171,17 @@
\label{sec:document class options}
\begin{options}
\opt{draft}\Default!
- å¼€å¯è‰ç¨¿æ¨¡å¼ä¼šåŠ å¿«ç¼–译速度,表现有显示页é¢è¾¹æ¡†ã€è¡Œæº¢å‡ºçš„地方显示黑色方å—ã€å›¾ç‰‡å˜æˆå ä½æ–¹æ¡†ã€æ˜¾ç¤ºå½“å‰æ—¥æœŸå’Œå…³é—­è¶…链接渲染。ä¸è½½å…¥ \pkg*{tcolorbox} å®åŒ…使用盒å­çŽ¯å¢ƒä¹Ÿä¼šæ高编译速度,详情è§å°èŠ‚ \ref{subsec:box}。
+ å¼€å¯è‰ç¨¿æ¨¡å¼ä¼šåŠ å¿«ç¼–译速度,表现有显示页é¢è¾¹æ¡†ã€è¡Œæº¢å‡ºçš„地方显示黑色方å—ã€å›¾ç‰‡å˜æˆå ä½æ–¹æ¡†ã€æ˜¾ç¤ºå½“å‰æ—¥æœŸå’Œå…³é—­è¶…链接渲染。ä¸ä½¿ç”¨ç»˜å›¾å®åŒ…åŠä¾èµ–于 \pkg*{tcolorbox} å®åŒ…çš„ç›’å­çŽ¯å¢ƒä¹Ÿä¼šå¢žå¿«ç¼–译速度,详情è§å°èŠ‚ \ref{subsec:box}。
\opt{newline}\Default!
部分和章标题的样å¼ä¸ºå¦èµ·ä¸€è¡Œï¼Œç¬¦åˆä¸€èˆ¬è‹±æ–‡ä¹¦ç±çš„习惯。
\keychoice{scheme}{chinese,plain}\Default{chinese}
- \option{scheme} 代表文档的主题,扩展了此选项在 C\TeX 文档类中原有的作用范围,\option{plain} 选项å¯ä½¿å„类标题å˜ä¸ºè‹±æ–‡å½¢å¼ã€‚包括章节标题ã€å›¾è¡¨æ ‡é¢˜å’Œå®šç†æ ‡é¢˜ç­‰ã€‚
+ 文档主题方案选项 \option{scheme} 扩展了 C\TeX 文档类中åŒå选项原有的作用范围,\option{plain} 选项å¯ä½¿å„类标题å˜ä¸ºè‹±æ–‡å½¢å¼ã€‚包括章节标题ã€å›¾è¡¨æ ‡é¢˜å’Œå®šç†æ ‡é¢˜ç­‰ã€‚
\opt{enmode}\Default!
åŒæ—¶å¼€å¯ \option{newline} å’Œ \keyis-{scheme}{plain} 选项以符åˆè‹±æ–‡åŽŸç”Ÿé£Žæ ¼ã€‚
\keychoice{scheme}{a4paper,b5paper,c5paper,letterpaper,其它纸张}\Default{a4paper}
- 设置页é¢å¤§å°ï¼Œäº¤ç»™ \pkg*{geometry} å®åŒ…处ç†ï¼Œå¯ä½¿ç”¨å®ƒæ”¯æŒçš„所有规格。建议选项 \option*{b5paper} å’Œ \keyis*-{zihao}{5},选项 \option*{a4paper} å’Œ \keyis*-{zihao}{-4} é…åˆã€‚
+ 页眉尺寸选项将å‚数交给 \pkg*{geometry} å®åŒ…处ç†ï¼Œå¯ä½¿ç”¨å®ƒæ”¯æŒçš„所有纸张规格。建议选项 \option*{b5paper} å’Œ \keyis*-{zihao}{5},选项 \option*{a4paper} å’Œ \keyis*-{zihao}{-4} é…åˆã€‚
\keyval-{config}{é…置文件å}
- \option{config} 为载入用户é…置选项,é…置文件åä¸éœ€åŠ æ‹¬å·ä½†éœ€å¸¦æœ‰åŽç¼€å如 \code{tex}ã€\code{def} å’Œ \code{cfg}。
+ 选项 \option{config} 载入用户é…置文件,最好放在当å‰è·¯å¾„且需带有文件扩展å如 \code{tex}ã€\code{def} å’Œ \code{cfg}。
\keybool{floatpage}\Default{true}
å¼€å¯è¿™ä¸ªé€‰é¡¹åŽæµ®åŠ¨çŽ¯å¢ƒ \env*{table} å’Œ \env*{figure} 的比例å‚数会使用默认值,关闭它则尽å¯èƒ½é¿å…出现浮动页,使图表环境与正文段è½æ›´åŠ ç´§å‡‘,å‡å°‘多余的空白版é¢ã€‚
\end{options}
@@ -190,15 +190,15 @@
\begin{options}
\keychoice{cjkfont}{adobe,fandol,founder,mac,macnew,macold,ubuntu,windows,none}\Default
中文字体采用 C\TeX å®é›†åŒ…å«çš„字库并与其一致,具体é…置方案å¯ä»¥æŸ¥çœ‹ C\TeX 使用手册。它与 \option*{fontset} 选项是等效的,如果没有指定 \option{cjkfont} 的值,将会自动检测æ“作系统并选择相应的字体。
-\end{options}
-如果需è¦ä½¿ç”¨å…¶å®ƒä¸­æ–‡å­—体,å¯ä»¥åœ¨å¯ç”¨é€‰é¡¹ \keyis-{cjkfont}{none} åŽï¼Œå†ä½¿ç”¨ \pkg*{xeCJK} å®åŒ…的相关命令设置字体以åŠå£°æ˜Žå­—体æ—:
-\begin{ctexexam}
+ 如果需è¦ä½¿ç”¨å…¶å®ƒä¸­æ–‡å­—体,å¯ä»¥åœ¨å¯ç”¨é€‰é¡¹ \keyis-{cjkfont}{none} åŽï¼Œå†ä½¿ç”¨ \pkg*{xeCJK} å®åŒ…的相关命令设置字体以åŠå£°æ˜Žå­—体æ—:
+ \begin{ctexexam}
\setCJKmainfont{SimSun}[BoldFont = SimHei,ItalicFont = KaiTi]
\setCJKsansfont{SimHei}
\setCJKmonofont{FangSong}
\newCJKfontfamily[song]\songti{SimSun}
-\end{ctexexam}
+ \end{ctexexam}
+\end{options}
\subsection{英文字体}
\begin{options}
@@ -207,7 +207,7 @@
\begin{center}
\begin{tabular}{cccc}
\toprule
- & \sffamily{正文字体} & \sffamily{无衬线字体} & \sffamily{等宽字体} \\
+ & \textsf{正文字体} & \textsf{无衬线字体} & \textsf{等宽字体} \\
\midrule[0.6pt]
\code{noto} & Noto Serif & Noto Sans & Noto Sans Mono \\
\code{garamond} & EB Garamond & Libertinus Sans & LM Mono \\
@@ -237,12 +237,12 @@
\command{frontmatter}[\sarg\oarg{ç¼–å·æ ¼å¼}]\Default{Roman}
å‰è¨€åŒºå‘½ä»¤ï¼Œä½¿éƒ¨åˆ†å’Œç« æ ‡é¢˜ä¸ç¼–å·ï¼Œå¸¦æœ‰æ˜Ÿå·çš„å˜ä½“命令ä¸ä½¿ç”¨ \cs{cleardoublepage} å‘½ä»¤ã€‚é¡µç  \meta{ç¼–å·æ ¼å¼} å¯è®¾ç½®ä¸ºä¾‹å¦‚ \code{roman}ã€\code{Alph} 等格å¼ã€‚
\command{mainmatter}[\sarg]
- 文区命令,章标题正常编å·ä¸”页ç ä¸ºä»Ž 1 开始计数的阿拉伯数字,带有星å·çš„å˜ä½“命令ä¸ä½¿ç”¨ \cs{cleardoublepage} 清åŒé¡µå‘½ä»¤ã€‚
+ 主文区命令,章标题正常编å·ä¸”页ç ä¸ºä»Ž 1 开始计数的阿拉伯数字,带有星å·çš„å˜ä½“命令ä¸ä½¿ç”¨ \cs{cleardoublepage} 清åŒé¡µå‘½ä»¤ã€‚
\command{backmatter} åŽè®°åŒºå‘½ä»¤ï¼Œé¡µç æ ¼å¼ä¸Žç¼–å·ä¿æŒä¸å˜ï¼Œç« æ ‡é¢˜ä¸ç¼–å·ã€‚
\command{cleardoublepage}[\oarg{页é¢é£Žæ ¼}]\Default{empty}
清åŒé¡µå‘½ä»¤å¯ä»¥ç¡®ä¿ä¸‹ä¸€é¡µæ–‡æœ¬æ€»åœ¨å¥‡æ•°é¡µå¼€å§‹ï¼Œåœ¨å¥‡æ•°é¡µä½¿ç”¨å®ƒä¼šäº§ç”Ÿç©ºç™½å¶æ•°é¡µã€‚文区命令 \cs{frontmatter} å’Œ \cs{mainmatter} 会用到清åŒé¡µå‘½ä»¤ï¼Œåœ¨å¯ç”¨æ–‡ç±»é€‰é¡¹ \option*{openright} 时标题命令 \cs*{part} å’Œ \cs*{chapter} 也会用到清åŒé¡µå‘½ä»¤ã€‚
\command{blankpagestyle}[\marg{页é¢é£Žæ ¼}]
- 空白页é¢é£Žæ ¼å‘½ä»¤å…¨å±€æŒ‡å®šå¤šå‡ºç©ºç™½é¡µçš„默认页é¢é£Žæ ¼ï¼Œæˆ–使用å¯é€‰å‚数局部指定。默认的风格为 \code{empty},å³ç©ºçš„页眉页脚。
+ 多出空白页的默认页é¢é£Žæ ¼ç”¨ç©ºç™½é¡µé¢é£Žæ ¼å‘½ä»¤ \cs{blankpagestyle} 全局指定,或使用å¯é€‰å‚数局部指定。默认的风格为 \code{empty},å³ç©ºçš„页眉页脚。
\end{commands}
\subsection{目录命令}
@@ -250,11 +250,11 @@
\command{tableofcontents}[\parg\oarg{键值列表}\darg{附加代ç }]
主文档目录命令。带有 \parg{} å·å‚数的命令输出åŒè¯­ç›®å½•ï¼Œéœ€è¦ä¸ŽåŒè¯­ç›®å½•æ ‡é¢˜å‘½ä»¤ \cs{bichapter} 等或设置图片ã€è¡¨æ ¼å’Œä»£ç ç­‰è‹±æ–‡ç›®å½•çš„标题é…åˆä½¿ç”¨ï¼Œé™„加代ç æ˜¯ä¸­æ–‡ä¸Žè‹±æ–‡ç›®å½•ä¹‹é—´çš„代ç ï¼Œå¯ä»¥æ’入目录样å¼å’Œæ¢é¡µç­‰å‘½ä»¤
\command{listoffigures}[\sarg\parg\oarg{键值列表}]
- 输出图片目录命令。带有星å·çš„目录命令ä¸å°†æ ‡é¢˜æ·»åŠ è¿›ä¸»æ–‡æ¡£ç›®å½•ï¼Œå¸¦æœ‰ \parg{} å·çš„目录命令å¯ä»¥ä½¿å½“å‰æ ‡é¢˜ç¼–å·ã€‚
+ 输出图片目录命令。带有星å·çš„目录命令ä¸å°†ç›®å½•æ ‡é¢˜æ·»åŠ è¿›ä¸»æ–‡æ¡£ç›®å½•ï¼Œå¸¦æœ‰ \parg{} å·çš„目录命令å¯ä»¥ä½¿å½“å‰æ ‡é¢˜ç¼–å·ã€‚
\command{listoftables}[\sarg\parg\oarg{键值列表}]
- 输出表格目录命令。带有星å·çš„目录命令ä¸å°†æ ‡é¢˜æ·»åŠ è¿›ä¸»æ–‡æ¡£ç›®å½•ï¼Œå¸¦æœ‰ \parg{} å·çš„目录命令å¯ä»¥ä½¿å½“å‰æ ‡é¢˜ç¼–å·ã€‚
+ 输出表格目录命令。带有星å·çš„目录命令ä¸å°†ç›®å½•æ ‡é¢˜æ·»åŠ è¿›ä¸»æ–‡æ¡£ç›®å½•ï¼Œå¸¦æœ‰ \parg{} å·çš„目录命令å¯ä»¥ä½¿å½“å‰æ ‡é¢˜ç¼–å·ã€‚
\command{listoflstlistings}[\sarg\parg\oarg{键值列表}]
- 输出代ç ç›®å½•å‘½ä»¤ã€‚带有星å·çš„目录命令ä¸å°†æ ‡é¢˜æ·»åŠ è¿›ä¸»æ–‡æ¡£ç›®å½•ï¼Œå¸¦æœ‰ \parg{} å·çš„目录命令å¯ä»¥ä½¿å½“å‰æ ‡é¢˜ç¼–å·ã€‚以上命令å¯é€‰å‚æ•°çš„ \meta{键值列表} 如下:
+ 输出代ç ç›®å½•å‘½ä»¤ã€‚带有星å·çš„目录命令ä¸å°†ç›®å½•æ ‡é¢˜æ·»åŠ è¿›ä¸»æ–‡æ¡£ç›®å½•ï¼Œå¸¦æœ‰ \parg{} å·çš„目录命令å¯ä»¥ä½¿å½“å‰æ ‡é¢˜ç¼–å·ã€‚以上命令å¯é€‰å‚æ•°çš„ \meta{键值列表} 如下:
\end{commands}
\begin{options}
@@ -277,7 +277,6 @@
\end{options}
\subsection{标题命令}
-\change[2021-06-13]{2021-05-05}
åŒè¯­ç›®å½•æ ‡é¢˜å‘½ä»¤ç›®å‰è®¾ç½®äº†å¸¸ç”¨çš„三个级别,它们将中文标题正常输出,并使中英文标题加入åŒè¯­ç›®å½•ã€‚类似于标准文档类,这三个标题命令分别具有独立的计数器\footnote{默认情况下与普通标题命令共享使用计数器。},并对应 \cs*{the}\meta{计数器} 的值,å¯ä»¥ç”¨äºŽ \option{binumber} 选项更改英文目录中的编å·ã€‚这个功能是为国内一些高校的学ä½è®ºæ–‡æ¨¡æ¿çš„è¦æ±‚设计,在一般情况和英文模å¼ä¸‹\textbf{ä¸éœ€è¦ä½¿ç”¨}。
\begin{commands}
\command{bichapter}[\sarg\oarg{目录中文标题}\marg{中文标题}\marg{目录英文标题}]
@@ -288,17 +287,16 @@
\code{subsection} 级别的åŒè¯­ç›®å½•æ ‡é¢˜å‘½ä»¤ï¼Œå…·æœ‰ç‹¬ç«‹çš„ \code{bisubsection} 计数器。
\end{commands}
-它们的星å·å˜ä½“命令使文中标题ä¸ç¼–å·ï¼Œä½†æ˜¯ä»ç„¶åŠ å…¥åŒè¯­ç›®å½•ï¼Œè‹¥è‹±æ–‡æ ‡é¢˜å‚数空置那么仅加入中文目录而ä¸åŠ å…¥è‹±æ–‡ç›®å½•ï¼Œè¿™ä¸€ç‰¹ç‚¹ä¸Ž \cs{chapter*} 等命令的行为ä¸å¤ªä¸€æ ·ï¼Œåœ¨ä¸€äº›æƒ…况下会用到。å¯é€‰å‚数是目录中的中文标题,默认与中文标题一致,正文标题过长时å¯ç”¨å®ƒè®¾ç½®åœ¨ç›®å½•ä¸­æ˜¾ç¤ºçš„标题。默认情况下åŒè¯­ç›®å½•çš„æ ¼å¼æ˜¯ä¸€è‡´çš„,共享使用 \cs*{tocset} 的设置,英文目录的章级别标题ååŠç¼–å·çš„修改方å¼å¦‚下:
+它们的星å·å˜ä½“命令使文中标题ä¸ç¼–å·ï¼Œä½†æ˜¯ä»ç„¶åŠ å…¥åŒè¯­ç›®å½•ï¼Œè‹¥è‹±æ–‡æ ‡é¢˜å‚数空置那么仅加入中文目录而ä¸åŠ å…¥è‹±æ–‡ç›®å½•ï¼Œè¿™ä¸€ç‰¹ç‚¹ä¸Ž \cs{chapter*} 等命令的行为ä¸å¤ªä¸€æ ·ï¼Œåœ¨ä¸€äº›æƒ…况下会用到。å¯é€‰å‚数是目录中的中文标题,默认与中文标题一致,正文标题过长时å¯ç”¨å®ƒè®¾ç½®åœ¨ç›®å½•ä¸­æ˜¾ç¤ºçš„标题。默认情况下åŒè¯­ç›®å½•çš„æ ¼å¼æ˜¯ä¸€è‡´çš„,共享使用 \module*{tocset} 的设置,英文目录的章级别标题ååŠç¼–å·çš„修改方å¼å¦‚下:
\begin{options}
\kvsplit{biname}{英文目录å‰åå­—,英文目录åŽåå­—}\Module{chapter}\Default{Chapter\cs*{space}}
更改英文目录 \code{chapter} 级别的标题编å·å‰åŽå字,类似 C\TeX çš„ \option*{name} 选项。
\keyval-{binmuber}{英文目录数字输出命令}\Module{chapter}\Default{\cs*{arabic}\Marg{chapter}}
- 更改英文目录 \code{chapter} 级别的标题编å·è¾“出格å¼ï¼Œç±»ä¼¼ C\TeX çš„ \option*{nuber} 选项。
+ 更改英文目录 \code{chapter} 级别的标题编å·è¾“出格å¼ï¼Œç±»ä¼¼ C\TeX çš„ \option*{number} 选项。
\end{options}
\begin{commands}
\command{appendix}[\splitoarg{å‰åå­—,åŽåå­—}\darg{数字输出命令}]
- \change[2021-06-13]{2021-05-05}
附录开始命令,其åŽçš„章节标题å˜ä¸ºé™„录形å¼ã€‚英文目录中附录标题的 \meta{å‰åå­—} 为英文附录目录å‰å字,\meta{åŽåå­—} 为英文附录目录åŽå字。å‰åŽå字之间用一个åŠè§’逗å·åˆ†å¼€ï¼Œä¹Ÿå¯ä»¥åªæœ‰ä¸€éƒ¨åˆ†ï¼Œè¡¨ç¤ºè‹±æ–‡é™„录目录å‰å字。\meta{数字输出命令} 为附录标题在英文目录中的编å·å‘½ä»¤ã€‚
\command{BeforeAddBitoc}[\sarg\marg{加入目录英文标题å‰çš„代ç }]
作用于局部范围的英文目录钩å­ï¼Œå¯ä»¥æ’入标题或目录设置的命令改å˜è‹±æ–‡ç›®å½•ä¸­æ ‡é¢˜çš„显示格å¼ï¼Œä¹Ÿå¯ä»¥è¦†ç›–上述的目录å‰åŽå字和编å·ç­‰è®¾ç½®ï¼Œå¸¦æœ‰æ˜Ÿå·çš„命令会é‡ç½®ä¹‹å‰çš„代ç ï¼Œæ”¾ç½®åœ¨å¯¼è¨€åŒºæˆ– \cs{bichapter} 等命令å‰ç”Ÿæ•ˆã€‚
@@ -312,7 +310,7 @@
\command{sub}[\sarg\oarg{åž‚ç›´å移}\splitoarg{高度,深度}\darg{æ ¼å¼ä»£ç }\marg{内容}\oarg{æ°´å¹³å移}]
下标命令,与简短命令 \cs{sp} 等效。水平和垂直å移为正值时代表å‘下或å‘å³ç§»åŠ¨ï¼Œå¦åˆ™ç›¸å。其它用法和å‚数与上标命令 \cs{super} 类似。
\command{supersub}[\sarg\oarg{é—´è·}\darg{对é½æ–¹å¼}\marg{上标内容}\marg{下标内容}\oarg{æ°´å¹³å移}\splitdarg{上标代ç ,下标代ç }]
- åŒæ—¶è¾“出上标和下标的命令。\meta{é—´è·} 为上下标的垂直间è·ï¼Œ\meta{对é½æ–¹å¼} 是下标的水平对é½æ–¹å¼ï¼Œå‚数与 \option{supersubalign} 相åŒï¼Œ\meta{æ°´å¹³å移} 默认为 \code{0pt}。
+ åŒæ—¶è¾“出上标和下标的命令,与简短命令 \cs{spb} 等效。\meta{é—´è·} 为上下标的垂直间è·ï¼Œ\meta{对é½æ–¹å¼} 是下标的水平对é½æ–¹å¼ï¼Œå‚数与 \module*{style/}\option{supersubalign} 相åŒï¼Œ\meta{æ°´å¹³å移} 默认为 \code{0pt}。
\end{commands}
\section{接å£é€‰é¡¹}
@@ -324,31 +322,46 @@
\begin{tabular}{*{5}{c}}
\toprule
\hyperref[subsec:style]{风格} & \hyperref[subsec:other font]{其它字体} & \hyperref[subsec:spacing]{è¡Œè·} & \hyperref[subsec:hyperlinks]{超链接} & \hyperref[subsec:reference]{å‚考文献} \\
- style & subfont & spread & refset & bibset \\
+ \module*{style} & \module*{subfont} & \module*{spread} & \module*{refset} & \module*{bibset} \\
\midrule[0.6pt]
\hyperref[subsec:theorem of style]{定ç†æ ·å¼} & \hyperref[subsec:page margins]{页é¢å°ºå¯¸} & \hyperref[subsec:header and footer]{页眉页脚} & \hyperref[subsec:catalog style]{目录样å¼} & \\
- thmset & geoset & hdrset & tocset & \\
+ \module*{thmset} & \module*{geoset} & \module*{hdrset} & \module*{tocset} & \\
\bottomrule
\end{tabular}
\end{center}
+
+ 例如使用下é¢å°èŠ‚ \ref{subsec:style} 介ç»çš„风格 \module*{style} 模å—,路径å与所属下级选项之间å¯ä»¥ \code{/} 或 \code{=} å·åˆ†å¼€ï¼Œç¬¦å·åŽä¸èƒ½æœ‰ç©ºæ ¼æˆ–者æ¢è¡Œï¼š
+ \begin{ctexexam}
+ \ctexset
+ {
+ style/color = seaside,
+ style =
+ {
+ rulewidth = 0.5pt,
+ uppercase = false
+ }
+ }
+ \style{figure-con = {-}}
+ \end{ctexexam}
+
+ 文档类有三ç§é€‰é¡¹ï¼šå¸ƒå°”åž‹ \boolkey*{key},选项的值为 \code{true} 或 \code{false},如果ä¸æŒ‡å®šé»˜è®¤ä¸ºçœŸã€‚键值型 \key*-{key}{value} 需è¦ä¸ºé€‰é¡¹æŒ‡å®šå€¼ï¼ŒåŽé¢ \code{=} å·ä¸èƒ½çœç•¥ã€‚选择型 \choicekey*{key}{one,\default{two},three} æ ¹æ®æ供的å¯é€‰å€¼è¿›è¡Œè®¾å®šã€‚
\end{commands}
\subsection{风格}
\label{subsec:style}
\begin{options}
\keychoice{color}{none,seaside,energy,cyberpunk}\Module{style}\Default{none}
- \change[2021-07-03]{2021-01-05}
- 预置了四ç§ä¸»é¢˜é¢œè‰²ï¼Œé»˜è®¤ä¸»é¢˜ \code{none} 为黑白页é¢ï¼Œä¸»é¢˜é¢œè‰²ä¸åŒ…括超链接。
+ 预置了四ç§é¢œè‰²ä¸»é¢˜ï¼Œé»˜è®¤ä¸»é¢˜ \code{none} 为黑白页é¢ï¼Œé¢œè‰²ä¸»é¢˜ä¸åŒ…括超链接。
\begin{commands}
\command{DeclareThemeColor}[\splitmarg{风格å称,ctex@frame,ctex@emph,ctex@verb}]
- å¯ä»¥ä½¿ç”¨ \cs{DeclareThemeColor} 命令声明新的主题颜色,它的å‚数以英文逗å·åˆ†éš”,第一部分为颜色风格å称,åŽé¢ä¸‰éƒ¨åˆ†ä¸º HTML 颜色代ç ï¼Œæž„æˆä¸»é¢˜é¢œè‰²ã€‚类似地更改超链接颜色è§å°èŠ‚ \ref{subsec:hyperlinks}。
+ å¯ä»¥ä½¿ç”¨ \cs{DeclareThemeColor} 命令声明新的颜色主题,它的å‚数以英文逗å·åˆ†éš”,第一部分为颜色风格å称,åŽé¢ä¸‰éƒ¨åˆ†ä¸º \code{HTML} 颜色代ç ï¼Œæž„æˆé¢œè‰²ä¸»é¢˜ã€‚类似地更改超链接颜色è§å°èŠ‚ \ref{subsec:hyperlinks}。
\end{commands}
\keyval-{color-all}{HTML颜色代ç }\Default
- 统一设置主题的å„部分颜色,å‚数是 6 个å六进制数字组æˆçš„ HTML 颜色代ç ï¼Œä»»æ„颜色的代ç å¯ä»¥åœ¨å¸¸è§çš„图片处ç†å·¥å…·æ‹¾è‰²å™¨ä¸­æŸ¥çœ‹ã€‚
+ 统一设置主题的å„部分颜色,å‚数是 6 个å六进制数字组æˆçš„ \code{HTML} 颜色代ç ï¼Œä»»æ„颜色的代ç å¯ä»¥åœ¨å¸¸è§çš„图片处ç†å·¥å…·æ‹¾è‰²å™¨ä¸­æŸ¥çœ‹ã€‚
\keybool{multoc}\Default{false}
å¼€å¯å¤šæ ç›®å½•ï¼Œä¸ŽèŠ‚ \ref{sec:document command} 中目录命令的åŒå选项有相åŒæ•ˆæžœã€‚
\keybool{withpart}\Default{false}
- 使章跟éšæ¯ä¸€éƒ¨åˆ†ç¼–å·ï¼Œé»˜è®¤ä¸è·Ÿéšã€‚
+ 使章标题跟éšæ¯ä¸€éƒ¨åˆ†ç¼–å·ï¼Œå¼€å¯æ–°çš„一部分时章编å·ä»Ž 1 开始,默认ä¸è·Ÿéšã€‚
\keychoice{footwith}{part,chapter,page}\Default{chapter}
使脚注跟éšç¼–å·çš„计数器,默认跟éšç« ï¼Œå½“å¼€å¯æ–°çš„一章时脚注编å·ä»Ž 1 开始。
\keyval-{rulewidth}{线宽}\Default{0.75pt}
@@ -362,7 +375,6 @@
\subsubsection{连接符}
\begin{options}
\keyval-{figure-con}{图片连接符}\Module{style}\Default{\Marg{.}}
- \change[2021-07-02]{2021-01-05}
设置图片题注编å·çš„连接符。
\keyval-{table-con}{表格连接符}\Default{\Marg{.}}
设置表格题注编å·çš„连接符。
@@ -401,19 +413,18 @@
\subsection{超链接}
\label{subsec:hyperlinks}
-\module*{refset} 将超链接选项(包括以上选项)交给 \pkg*{hyperref} 处ç†ï¼Œé™¤äº†ä¸€äº›å…³äºŽ pdf 书签的选项å¯èƒ½ä¼šå¤±æ•ˆï¼Œå…¶å®ƒç”±é”®å€¼é€‰é¡¹å‘½ä»¤ \cs*{hypersetup} 支æŒçš„多数选项å¯ç”¨ã€‚
+\module*{refset} 将超链接选项(包括以上选项)交给 \pkg*{hyperref} 处ç†ï¼Œé™¤äº†ä¸€äº›å…³äºŽ \code{pdf} 书签的选项å¯èƒ½ä¼šå¤±æ•ˆï¼Œå…¶å®ƒç”±é”®å€¼é€‰é¡¹å‘½ä»¤ \cs*{hypersetup} 支æŒçš„多数选项å¯ç”¨ã€‚
\begin{options}
\keychoice{linktype}{edge,colors,none}\Module{refset}\Default{edge}
- \change[2021-07-03]{2021-01-05}
使超链接为边框形å¼ï¼Œ\option{various} 使超链接å˜ä¸ºå½©è‰²ï¼Œé¢„置了四ç§é¢œè‰²æ ·å¼ã€‚\code{none} 关闭超链接边框与颜色,此时 \option{linkcolor} 选项无效。
\keychoice{linkcolor}{fresh,cutepink,navyblue,crimson}\Default{navyblue}
超链接颜色样å¼ï¼Œé¢„置了四ç§è¶…链接颜色风格。
\begin{commands}
\command{DeclareLinkColor}[\splitmarg{风格å称,ctex@link,ctex@url,ctex@cite}]
- å¯ä»¥ä½¿ç”¨ \cs{DeclareLinkColor} 命令声明新的超链接颜色样å¼ï¼Œå®ƒçš„å‚数以英文逗å·åˆ†éš”,第一部分为颜色风格å称,åŽé¢ä¸‰éƒ¨åˆ†ä¸º HTML 颜色代ç ï¼Œæž„æˆè¶…链接颜色。
+ å¯ä»¥ä½¿ç”¨ \cs{DeclareLinkColor} 命令声明新的超链接颜色样å¼ï¼Œå®ƒçš„å‚数以英文逗å·åˆ†éš”,第一部分为颜色风格å称,åŽé¢ä¸‰éƒ¨åˆ†ä¸º \code{HTML} 颜色代ç ï¼Œæž„æˆè¶…链接颜色。
\end{commands}
\keyval-{linkcol-all}{HTML颜色代ç }\Default
- 统一设置超链接的å„部分颜色,å‚数是 6 个å六进制数字组æˆçš„ HTML 颜色代ç ï¼Œä»»æ„颜色的代ç å¯ä»¥åœ¨å¸¸è§çš„图片处ç†å·¥å…·æ‹¾è‰²å™¨ä¸­æŸ¥çœ‹ã€‚
+ 统一设置超链接的å„部分颜色,å‚数是 6 个å六进制数字组æˆçš„ \code{HTML} 颜色代ç ï¼Œä»»æ„颜色的代ç å¯ä»¥åœ¨å¸¸è§çš„图片处ç†å·¥å…·æ‹¾è‰²å™¨ä¸­æŸ¥çœ‹ã€‚
\keychoice{linktoc}{none,section,page,all}\Default{all}
将目录中的超链接å–消ã€ç½®äºŽæ ‡é¢˜ä¸Šã€ç½®äºŽé¡µç ä¸Šæˆ–置于标题和页ç ä¸Šã€‚
\end{options}
@@ -423,7 +434,6 @@
è¡Œè·å› å­ç”¨äºŽè®¾ç½®å„ç§è¡Œè·å€æ•°ï¼Œåªèƒ½æ˜¯æµ®ç‚¹æ•°ï¼Œä¸èƒ½å¸¦æœ‰é•¿åº¦å•ä½ã€‚å„è¡Œè·æ—¢å¯åœ¨å¯¼è¨€åŒºå…¨å±€è®¾ç½®ä¹Ÿå¯æ­£æ–‡ä¸­è®¾ç½®å¯¹åŽé¢ç”Ÿæ•ˆã€‚
\begin{options}
\keyval-{line}{数值}\Module{spread}\Default{1.3}
- \change[2021-05-17]{2021-01-05}
正文行è·ï¼ŒC\TeX 原有的行è·é€‰é¡¹ \option*{linespread} 失效。
\keyval-{table}{数值}\Default{1.05}
表格行è·ï¼Œå¯¹ä¼ ç»Ÿè¡¨æ ¼çŽ¯å¢ƒ \env*{tabular}ã€\env*{tabularx} ä»¥åŠ \pkg*{tabularray} å®åŒ…çš„ \env{tblr} 环境生效,åŒæ—¶ \env{tblr} 也自带有 \option*{stretch} 选项设置行è·ã€‚
@@ -445,7 +455,6 @@
\label{subsec:other font}
\begin{options}
\keyval-{table-cap}{字体命令}\Module{subfont}\Default{\cs*{sffamily}\cs*{small}}
- \change[2021-05-19]{2021-01-08}
表格标题的字体设置,包括字体æ—ã€å­—体系列ã€å­—体尺寸和字体形状命令。
\keyval-{figure-cap}{字体命令}\Default{\cs*{sffamily}\cs*{small}}
图片标题的字体设置,包括字体æ—ã€å­—体系列ã€å­—体尺寸和字体形状命令。
@@ -463,7 +472,6 @@
\label{subsec:reference}
\begin{options}
\keychoice{backend}{bibtex,biblatex}\Module{bibset}\Default{bibtex}
- \change[2021-06-13]{2021-01-11}
å‚考文献处ç†åŽç«¯ï¼Œé»˜è®¤ç”¨ä¼ ç»Ÿçš„ \hologo{BibTeX} 处ç†å‚考文献\footnote{使用 \hologo{BibTeX} 引擎时加载 \pkg*{natbib} å®åŒ…,使用 \hologo{biber} 时将加载 \pkg*{biblatex} å®åŒ…。}。
\keychoice{bib-style}{numerical,authoryear,其它格å¼}\Default{numerical}
å‚考文献格å¼ä¸ºä¸­å›½çš„å‚考文献推è标准 GB/T 7714-2015,有顺åºç¼–ç åˆ¶å’Œè‘—者-出版年制两ç§é£Žæ ¼ï¼Œç†å·¥ç§‘类一般使用顺åºç¼–ç åˆ¶ï¼Œæ–‡ç§‘类一般使用著者-出版年制。若使用其它格å¼ï¼Œä½¿ç”¨ \hologo{BibTeX} 处ç†æ—¶éœ€ç¡®ä¿æ­£ç¡®çš„ \code{bst} 文件,使用 \hologo{biber} 处ç†å¯ä½¿ç”¨ \pkg*{biblatex} å®åŒ…支æŒçš„å‚考文献风格å称。
@@ -476,11 +484,8 @@
\subsubsection{é…ç½®å‚考文献}
\begin{commands}
\command{printbibliography}[\oarg{键值列表}]
- \change[2021-04-09]{2021-01-11}
两ç§æ–¹å¼\textbf{å‡ä½¿ç”¨}此命令打å°å‚考文献,ä¸åŒå¤„ç†åŽç«¯æ­¤å‘½ä»¤çš„ \meta{键值列表} ä¸åŒã€‚使用 \hologo{BibTeX} 处ç†æ—¶é€‰é¡¹ä¸ŽèŠ‚ \ref{sec:document command} 目录的选项相åŒï¼Œä½¿ç”¨ \hologo{biber} 处ç†æ—¶å¸¸ç”¨çš„选项如下:
-\end{commands}
-
-\begin{options}
+ \begin{options}
\keychoice*{heading}{bibliography,subbibliography,bibintoc,subbibintoc}\Default{bibintoc}
å‚考文献通常有一个章标题或者节标题,该选项选择由 \cs*{defbibheading} 定义的标题å。
\keyval*-{title}{å‚考文献标题å}\Default
@@ -493,7 +498,8 @@
指定æ¡ç›®çš„打å°ç±»åž‹ã€‚
\keyval*-{filter}{过滤器å}\Default
使用由 \cs*{defbibfilter} 定义的 \option*{filter} æ¥è¿‡æ»¤æ¡ç›®ã€‚
-\end{options}
+ \end{options}
+\end{commands}
å¯èƒ½ä¸€äº›æƒ…况下您希望更加çµæ´»åœ°è®¾ç½®å‚考文献或有更多需求,下é¢ä¸¾ä¸€ä¸ªåœ¨å¯¼è¨€åŒºæ‰‹åŠ¨é…ç½® \pkg*{biblatex} å®åŒ…的例å­ï¼š
\begin{ctexexam}
@@ -507,12 +513,11 @@
\label{subsec:theorem of style}
\begin{options}
\keybool{thmbox}\Module{thmset}\Default{false}
- \change[2021-07-01]{2021-01-12}
å¼€å¯å®šç†çŽ¯å¢ƒç›’å­çš„边框,需载入 \pkg*{tcolorbox} å®åŒ…æ‰ç”Ÿæ•ˆã€‚这个选项与 \pkg*{thmtools} 中并ä¸ä¸€è‡´ï¼Œ\pkg*{thmtools} çš„åŒå选项包括 \code{L}ã€\code{M} å’Œ \code{S} 三个å‚数。
\keychoice{within}{chapter,section,其它环境,空置}\Default{chapter}
- 定ç†ç¼–å·è·Ÿéšçš„计数器,默认跟éšç« çš„ç¼–å·ï¼Œä¹Ÿå¯ä»¥è·Ÿéšå…¶å®ƒå®šç†çŽ¯å¢ƒçš„ç¼–å·ï¼Œå½“计数器增加时定ç†ç¼–å·ä¼šä»Žé›¶å¼€å§‹ï¼Œç©ºç½®æ—¶ä¸è·Ÿéšå…¶å®ƒè®¡æ•°å™¨ã€‚
+ 定ç†ç¼–å·è·Ÿéšçš„计数器,默认跟éšç« çš„ç¼–å·ï¼Œä¹Ÿå¯ä»¥è·Ÿéšå…¶å®ƒå®šç†çŽ¯å¢ƒçš„ç¼–å·ï¼Œå½“计数器增加时定ç†ç¼–å·ä¼šä»Žé›¶å¼€å§‹ï¼Œç©ºç½®æ—¶ä¸è·Ÿéšå…¶å®ƒè®¡æ•°å™¨ç¼–å·ã€‚
\keyval-{headpunct}{字体命令}\Default{false}
- 定ç†æ ‡é¢˜æœ«å°¾åŽçš„标记,在æ¢è¡Œç¬¦æˆ–第一段内容的间隔之å‰ã€‚
+ 定ç†æ ‡é¢˜æœ«å°¾åŽçš„标记,在æ¢è¡Œç¬¦æˆ–与第一段内容的间隔之å‰ã€‚
\keyval-{bodyfont}{字体命令}\Default{chapter}
定ç†å†…容部分的字体,包括字体æ—ã€å­—体系列ã€å­—体尺寸和字体形状命令。
\keyval-{notefont}{字体命令}\Default
@@ -537,37 +542,36 @@
文档类已预置 8 个定ç†çŽ¯å¢ƒï¼ŒçŽ¯å¢ƒååŠå¯¹åº”的定ç†æ ‡é¢˜åè§å°èŠ‚ \ref{subsec:theorem},如果需è¦æ–°çš„定ç†æ ‡é¢˜å或定ç†æ ·å¼å¯ä½¿ç”¨è¿™ä¸‰ä¸ªå‘½ä»¤ï¼Œç”± \pkg*{thmtools} æ供支æŒã€‚
\begin{commands}
\command{declaretheorem}[\oarg{键值列表1}\marg{定ç†çŽ¯å¢ƒå}\oarg{键值列表2}]
- \change[2021-07-13]{2021-01-12}
- 定义新的定ç†ç±»çŽ¯å¢ƒï¼Œ\cs{newtheorem} 命令与它等效。å¯é€‰å‚æ•°çš„ \meta{键值列表1} 与 \meta{键值列表2} 等效,用法与它们的åŒå命令一致。\meta{键值列表} 中常用的选项如下:
+ 声明新的定ç†çŽ¯å¢ƒå‘½ä»¤ï¼Œ\cs{newtheorem} 命令与它等效。å¯é€‰å‚æ•°çš„ \meta{键值列表1} 与 \meta{键值列表2} 等效,用法与它们的åŒå命令一致。\meta{键值列表} 中常用的选项如下:
\begin{options}
- \keyval*-{name}{定ç†çŽ¯å¢ƒæ ‡é¢˜}
+ \keyval*-{name}{定ç†çŽ¯å¢ƒæ ‡é¢˜}\Default
定ç†æ ‡é¢˜çš„默认值是环境的å称,并且首字æ¯å¤§å†™ï¼ˆè‹±æ–‡æ ‡é¢˜ï¼‰ã€‚
- \keychoice*{numbered}{no,yes,unless unique}
+ \keychoice*{numbered}{no,yes,unless unique}\Default
定ç†å¯ä»¥è¢«ç¼–å·ã€ä¸è¢«ç¼–å·æˆ–者åªæœ‰åœ¨æ–‡æ¡£ä¸­å¤šæ¬¡å‡ºçŽ°æ—¶æ‰è¢«ç¼–å·ã€‚
- \keyval*-{numberlike}{定ç†çŽ¯å¢ƒå}
+ \keyval*-{numberlike}{定ç†çŽ¯å¢ƒå}\Default
定ç†å°†ä½¿ç”¨æ­¤è®¡æ•°å™¨è¿›è¡Œç¼–å·ï¼Œé€šå¸¸è¿™æ˜¯å¦ä¸€ä¸ªå®šç†çŽ¯å¢ƒçš„å称。
- \keyval*-{style}{定ç†æ ·å¼å}
- 用 \cs{declaretheoremstyle} 定义的定ç†æ ·å¼çš„å称,定ç†å°†ä½¿ç”¨è¿™ç§æ ·å¼çš„设置。
+ \keyval*-{style}{定ç†æ ·å¼å}\Default
+ 选项的值为 \cs{declaretheoremstyle} 新定义的 \meta{定ç†æ ·å¼å} 或预置的 \code{easy-theorem} 定ç†æ ·å¼ï¼Œå®šç†å°†ä½¿ç”¨è¿™ç§æ ·å¼çš„设置。
\end{options}
- \command{DeclareTheorem}[\marg{定ç†çŽ¯å¢ƒå}\oarg{英文标题}\marg{中文标题}\darg{ç›’å­æ ·å¼}\oarg{键值列表}]
- \cs{DeclareTheorem} 是更便æ·çš„定ç†å‘½ä»¤ï¼Œå®ƒå®šä¹‰ä¸€ä¸ªæ–°çš„定ç†çŽ¯å¢ƒï¼Œä¸Ž \cs{declaretheorem} 命令 \meta{键值列表} 支æŒçš„选项相åŒï¼Œä½†å®ƒä»¬çš„区别有:
+ \command{DeclareTheorem}[\marg{环境å}\oarg{英文标题}\marg{中文标题}\darg{ç›’å­é£Žæ ¼}\oarg{键值列表}]
+ 定ç†å£°æ˜Žå‘½ä»¤ \cs{DeclareTheorem} 更加便æ·ï¼Œå®ƒå®šä¹‰ä¸€ä¸ªæ–°çš„定ç†çŽ¯å¢ƒï¼Œä¸Ž \cs{declaretheorem} 命令 \meta{键值列表} 支æŒçš„选项相åŒï¼Œä½†å®ƒä»¬çš„区别有:
\begin{itemize}
- \item 中英文模å¼ä¸‹æ ‡é¢˜ä¸åŒï¼Œè‹±æ–‡æ ‡é¢˜ä¸ºå¯é€‰é¡¹ï¼Œé»˜è®¤ä¸ºé¦–å­—æ¯å¤§å†™çš„环境å。
- \item 自动定义交å‰å¼•ç”¨çš„æ ¼å¼ï¼Œå¼•ç”¨æ ‡ç­¾å‰ç¼€ä¸ºå®šç†å称。
- \item 定ç†ç›’å­é€‰é¡¹ \option{thmbox} ä»ç„¶ç”Ÿæ•ˆï¼Œç›’å­æ ·å¼é€‰é¡¹æ˜¯ç”¨äºŽè®¾ç½®å®šç†ç›’å­æ ·å¼çš„åç§°ï¼Œå®ƒéœ€è¦ \pkg*{tcolorbox} çš„ \cs*{tcbset} 接å£å‘½ä»¤æˆ– \cs{tcbappstyle} 设定,默认为 \code{tc-theorem}。
+ \item 中英文模å¼ä¸‹æ ‡é¢˜ä¸åŒï¼Œè‹±æ–‡æ ‡é¢˜ä¸ºå¯é€‰é¡¹ï¼Œé»˜è®¤ä¸ºé¦–å­—æ¯å¤§å†™çš„ \meta{环境å}。
+ \item 自动定义交å‰å¼•ç”¨çš„æ ¼å¼ï¼Œå¼•ç”¨æ ‡ç­¾å‰ç¼€ä¸ºå®šç†æ ‡é¢˜å称。
+ \item 定ç†ç›’å­é€‰é¡¹ \keyis-{thmbox}{true} ä»ç„¶ç”Ÿæ•ˆï¼Œæ­¤æ—¶ \meta{ç›’å­é£Žæ ¼} 用于设置定ç†ç›’å­é£Žæ ¼çš„åç§°ï¼Œå®ƒéœ€è¦ \pkg*{tcolorbox} çš„ \cs*{tcbset} 接å£å‘½ä»¤æˆ– \cs{tcbappstyle} 设定,默认为 \code{tc-theorem}。
\item 默认使用 \code{easy-theorem} 定ç†æ ·å¼ï¼Œå¯åœ¨æœ€åŽä¸€ä¸ªé€‰é¡¹ä½¿ç”¨ \option*{style} 更改样å¼ã€‚
\end{itemize}
\command{declaretheoremstyle}[\oarg{键值列表1}\marg{定ç†æ ·å¼å}\oarg{键值列表2}]
定义新的定ç†æ ·å¼ï¼Œ\meta{键值列表} 中包括上述定ç†æ ·å¼ä»¥åŠ \cs{declaretheorem} 的所有选项。å¯é€‰å‚æ•°çš„ \meta{键值列表1} 与 \meta{键值列表2} 等效,用法与它们的åŒå命令一致。
\end{commands}
-下é¢ç®€å•åˆ—举定ç†å‘½ä»¤çš„用法,预置定ç†çš„æ ·å¼ä¸º \code{easy-theorem},上述定ç†æ ·å¼é€‰é¡¹å°†å¯¹è¿™ä¸ªå®šç†æ ·å¼ç”Ÿæ•ˆã€‚如果使用这个样å¼è€Œåªæ˜¯å¢žåŠ æ–°çš„定ç†å称,å¯ä»¥è¿™æ ·ï¼š
+下é¢ç®€å•åˆ—举定ç†å‘½ä»¤çš„用法,预置定ç†çš„æ ·å¼ä¸º \code{easy-theorem},上述定ç†æ ·å¼é€‰é¡¹å°†ä»…对这个定ç†æ ·å¼ç”Ÿæ•ˆã€‚如果使用这个样å¼å¢žåŠ æ–°çš„定ç†çŽ¯å¢ƒå¯ä»¥è¿™æ ·ï¼š
\begin{ctexexam}
\DeclareTheorem{定ç†çŽ¯å¢ƒå}{中文标题}[style = easy-theorem]
\declaretheorem[style = easy-theorem,name = 定ç†å]{定ç†çŽ¯å¢ƒå}
\end{ctexexam}
-\cs{declaretheorem} 定义的定ç†çŽ¯å¢ƒéœ€è¦æ‰‹åŠ¨å¢žåŠ ç›’å­è¾¹æ¡†ï¼š
+命令 \cs{declaretheorem} 定义的定ç†çŽ¯å¢ƒéœ€è¦æ‰‹åŠ¨å¢žåŠ ç›’å­è¾¹æ¡†ï¼š
\begin{ctexexam}
\tcolorboxenvironment{定ç†çŽ¯å¢ƒå}{tc-theorem}
\end{ctexexam}
@@ -588,7 +592,6 @@
\begin{options}\noitemsep
\keyval-{headruleskip}{页眉线间è·}\Module{geoset}\Default*
\keyval-{footruleskip}{页脚线间è·}\Default*
- \change[2021-06-02]{2021-01-13}
\keyval*-{left}{页é¢å·¦è¾¹è·}\Default*{3.17cm}
\keyval*-{top}{页é¢ä¸Šè¾¹è·}\Default*{2.54cm}
\keyval*-{hmargin}{左边è·,å³è¾¹è·}\Default*
@@ -609,30 +612,29 @@
\subsection{页眉页脚}
\label{subsec:header and footer}
-\module*{hdrset} 设置的命令由 \pkg*{fancyhdr} å®åŒ…æ供支æŒã€‚在 \cls*{book} 模å¼æ—¶ä½¿ç”¨ç« èŠ‚页眉标志内容选项 \option{chap-mark} å’Œ \option{sec-mark},在 \cls*{article} 模å¼æ—¶ä½¿ç”¨ \option{sec-mark} å’Œ \option{subsec-mark} 选项,这与标准文档类的行为一致,标志内容中å‚æ•° \code{\#1} 代表当å‰ç« ã€èŠ‚或å°èŠ‚的标题。也å¯ä»¥ç›´æŽ¥é‡æ–°å®šä¹‰è¿™äº›æ ‡å¿—命令,但此时 \module*{style/}\option{uppercase} 选项失效,这时å¯ä»¥ç”¨ä¾‹å¦‚ \cs*{MakeUppercase} 命令æ¥è®¾ç½®æ ‡å¿—内容的大å°å†™ã€‚
+æ¨¡å— \module*{hdrset} 设置的命令由 \pkg*{fancyhdr} å®åŒ…æ供支æŒã€‚在 \cls*{book} 模å¼æ—¶ä½¿ç”¨ç« èŠ‚页眉标志内容选项 \option{chap-mark} å’Œ \option{sec-mark},在 \cls*{article} 模å¼æ—¶ä½¿ç”¨ \option{sec-mark} å’Œ \option{subsec-mark} 选项,这与标准文档类的行为一致,标志内容中å‚æ•° \code{\#1} 代表当å‰ç« ã€èŠ‚或å°èŠ‚的标题。也å¯ä»¥ç›´æŽ¥é‡æ–°å®šä¹‰è¿™äº›é€‰é¡¹å¯¹åº”的标题标记命令,但此时 \module*{style/}\option{uppercase} 选项失效,这时å¯ä»¥ç”¨ä¾‹å¦‚ \cs*{MakeUppercase} 命令æ¥è®¾ç½®æ ‡å¿—内容的大å°å†™ã€‚
\begin{options}
\keyval-{head-foot}{页眉页脚代ç }\Module{hdrset}
- \change[2021-06-14]{2021-01-13}
设置页眉页脚的格å¼ï¼Œä½¿ç”¨ \pkg*{fancyhdr} 支æŒçš„ \cs*{fancyhead} å’Œ \cs*{fancyhead} 等命令,或在正文中使用这些命令改å˜å…¶åŽçš„页é¢é£Žæ ¼ã€‚
\keyval-{chap-mark}{标题标记}
- \cs*{chaptermark} 标题标记命令的内容,包括了标签选项 \option{chap-label} 的内容。
+ 标题标记命令 \cs*{chaptermark} 的内容,包括了标签选项 \option{chap-label} 的内容。
\keyval-{sec-mark}{标题标记}
- \cs*{sectionmark} 标题标记命令的内容,包括了标签选项 \option{sec-label} 的内容。
+ 标题标记命令 \cs*{sectionmark} 的内容,包括了标签选项 \option{sec-label} 的内容。
\keyval-{subsec-mark}{标题标记}
- \cs*{subsectionmark} 标题标记命令的内容,包括了标签选项 \option{subsec-label} 的内容。
+ 标题标记命令 \cs*{subsectionmark} 的内容,包括了标签选项 \option{subsec-label} 的内容。
\kvsplit-{chap-label}{\oarg{ç¼–å·}\marg{è·ç¦»å‘½ä»¤}}\Default{\cs*{hspace}\Marg{1em}}
- \cs*{chaptermark} 标题标记命令内容的标签,比标记命令内容选项更常用,å¯é€‰å‚数是页眉的标题编å·å½¢å¼ï¼Œå¿…选å‚数是编å·ä¸Žæ ‡é¢˜ä¹‹é—´çš„è·ç¦»å‘½ä»¤ï¼š
+ 标题标记命令 \cs*{chaptermark} 内容的标签,比标记命令内容选项更常用,å¯é€‰å‚数是页眉的标题编å·å½¢å¼ï¼Œå¿…选å‚数是编å·ä¸Žæ ‡é¢˜ä¹‹é—´çš„è·ç¦»å‘½ä»¤ï¼š
\begin{ctexexam}
\hdrset
{
chap-label = [\thechapter]{\hspace{1em}},
- sec-mark = C\TeXifname{C\TeXthesection——}{}#1
+ sec-mark = \CTEXifname{\CTEXthesection——}{}#1
}
\end{ctexexam}
\kvsplit-{sec-label}{\oarg{ç¼–å·}\marg{è·ç¦»å‘½ä»¤}}\Default{\cs*{hspace}\Marg{1em}}
- \cs*{sectionmark} 标题标记命令内容的标签,用法与 \option{chap-label} 类似。
+ 标题标记命令 \cs*{sectionmark} 内容的标签,用法与 \option{chap-label} 类似。
\kvsplit-{subsec-label}{\oarg{ç¼–å·}\marg{è·ç¦»å‘½ä»¤}}\Default{\cs*{hspace}\Marg{1em}}
- \cs*{subsectionmark} 标题标记命令内容的标签,用法与 \option{chap-label} 类似。
+ 标题标记命令内容 \cs*{subsectionmark} 的标签,用法与 \option{chap-label} 类似。
\keyval-{headrule}{横线命令}
绘制页眉横线的选项,å¯ä»¥ä½¿ç”¨ \cs*{hrule}ã€\cs*{rule} 或下述 \cs{markrule} 等画线命令æ¥ç»˜åˆ¶æ¨ªçº¿ã€‚手动绘制横线时线æ¡ç²—细选项 \code{style/rulewidth} 会失效。
\keyval-{footrule}{横线命令}\Default
@@ -643,7 +645,6 @@
\begin{commands}\noitemsep
\command{easyhead}[\oarg{ä½ç½®}\marg{内容}]\default{}
- \change[2021-07-25]{2021-01-13}
\command{easyfoot}[\oarg{ä½ç½®}\marg{内容}]
命令 \cs{easyhead} å’Œ \cs{easyfoot} 的使用方法与 \cs{fancyhead} å’Œ \cs{fancyfoot} 完全相åŒï¼Œå®ƒä»¬éœ€è¦åœ¨ \option{head-foot} 选项中使用,设置的是一个å为 \code{fancy} 的页é¢é£Žæ ¼ã€‚\pkg*{fancyhdr} 将页眉页脚分æˆäº†å·¦ä¸­å³å’Œå¥‡æ•°é¡µï¼ˆodd)ã€å¶æ•°é¡µï¼ˆeven)共 12 个部分,å¯é€‰å‚数中 \code{E} å’Œ \code{O} 代表å¶æ•°å’Œå¥‡æ•°ï¼Œ\code{L}ã€\code{C} å’Œ \code{R} 代表左ã€ä¸­å’Œå³éƒ¨åˆ†ã€‚å•é¢æ‰“å°æ—¶ï¼Œå«æœ‰å¶æ•°ä½ç½®çš„命令无效。
\end{commands}
@@ -651,12 +652,12 @@
\begin{commands}\noitemsep
\command*{markboth}[\marg{左页页眉内容}\marg{å³é¡µé¡µçœ‰å†…容}]\default{}
\command*{markright}[\marg{å³é¡µé¡µçœ‰å†…容}]
- \cs*{markboth} å’Œ \cs*{markright} 这两个命令用于手动设置页眉内容,一般紧éšæ ‡é¢˜å‘½ä»¤ï¼Œç‰¹æ®Šæƒ…况下å¯ä»¥ä½¿ç”¨å®ƒä»¬å¾—到需è¦çš„页眉标志。上述标志命令内容的选项便是基于这两个命令。如果是å•é¢æŽ’版,则 \meta{左页页眉内容} 无效。
+ 命令 \cs*{markboth} å’Œ \cs*{markright} 用于手动设置当å‰é¡µé¡µçœ‰æ ‡è®°ï¼Œä¸€èˆ¬ç´§éšæ ‡é¢˜å‘½ä»¤ï¼Œç‰¹æ®Šæƒ…况下å¯ä»¥ä½¿ç”¨å®ƒä»¬å¾—到需è¦çš„页眉标志。上述标记命令内容的选项便是基于这两个命令。如果是å•é¢æ‰“å°ï¼Œåˆ™ \meta{左页页眉内容} 无效。
\end{commands}
\begin{commands}
\command{markrule}[\oarg{长度}\darg{颜色å}\marg{线宽}\spemcoarg{上间è·,下间è·}]
- 命令 \cs{markrule} 用于绘制页眉页脚横线,\meta{长度} 默认为页é¢æ–‡æœ¬åŒºçš„宽度,上下间è·ä¸ºæ¨ªçº¿ä¸Žä¸Šä¸‹æ–¹éƒ¨ä»¶çš„é—´è·ï¼Œå¸¦æœ‰é•¿åº¦å•ä½ï¼Œé—´è·é•¿åº¦ä¹‹é—´ç”¨ \code{!} å·åˆ†å¼€ï¼Œè‹¥åªæœ‰ä¸€éƒ¨åˆ†åˆ™è¡¨ç¤º \meta{上间è·},这个命令也å¯ä»¥åœ¨æ­£æ–‡ä¸­ç»˜åˆ¶æ¨ªçº¿ã€‚下é¢ä¸¾ä¸€ä¸ªè®¾ç½®é¡µçœ‰å†…容的例å­ï¼š
+ 命令 \cs{markrule} æ—¢å¯åœ¨ \meta{横线命令} 中用于绘制页眉页脚横线,也å¯ä»¥åœ¨æ­£æ–‡ä¸­ä½¿ç”¨ã€‚\meta{长度} 默认为页é¢æ–‡æœ¬åŒºçš„宽度,上下间è·ä¸ºæ¨ªçº¿ä¸Žä¸Šä¸‹æ–¹éƒ¨ä»¶çš„é—´è·ï¼Œå¸¦æœ‰é•¿åº¦å•ä½ï¼Œé—´è·é•¿åº¦ä¹‹é—´ç”¨ \code{!} å·åˆ†å¼€ï¼Œè‹¥åªæœ‰ä¸€éƒ¨åˆ†åˆ™è¡¨ç¤º \meta{上间è·}。下é¢ä¸¾ä¸€ä¸ªè®¾ç½®é¡µçœ‰å†…容的例å­ï¼š
\begin{ctexexam}
\hdrset
{
@@ -674,7 +675,6 @@
\subsubsection{脚注格å¼}
\begin{options}
\keyval-{fnmargin}{刚性长度}\Module{hdrset}\Default{0.75em}
- \change[2021-07-14]{2021-05-12}\
脚注首段缩进è·ç¦»ï¼Œç­‰äºŽé•¿åº¦ \cs{footnoteindent} 的值.
\keyval-{fnparskip}{弹性长度}\Default{0ex}
脚注段è½é—´è·ï¼Œç­‰äºŽé•¿åº¦ \cs{footparskip} 的值。
@@ -688,39 +688,47 @@
\end{ctexexam}
\keychoice{fnmark-pos}{normal,super}\Default{super}
设置脚注编å·çš„ä½ç½®ï¼Œæ­£å¸¸æ–‡æœ¬æˆ–是上标形å¼ã€‚
- \keychoice{fnmark-num}{plain,pifont,pifont*,pifont-sans,pifont-sans*}\Default{plain}
- 脚注编å·çš„æ ¼å¼ï¼Œé»˜è®¤ä¸ºåŽŸç”Ÿæ ·å¼ \code{plain},还å¯ä»¥æ”¹ä¸º \code{pifont} çš„å„个版本,从左往å³ä¾æ¬¡ä¸ºæ™®é€šç‰ˆã€é˜´æ–‡è¡¬çº¿ç‰ˆã€é˜³æ–‡æ— è¡¬çº¿ç‰ˆå’Œé˜´æ–‡æ— è¡¬çº¿ç‰ˆï¼Œç¼ºç‚¹æ˜¯å®ƒä»¬çš„ç¼–å·ä»…包括 1-10。
- \keyval-{fnmark-form}{æ ¼å¼ä»£ç }\Default{æ ¼å¼ä»£ç }
+ \keychoice{fnmark-num}{plain,pifont,pifont*,pifont-sans,pifont-sans*,短编å·}\Default{plain}
+ 脚注正文标记编å·çš„æ ¼å¼ï¼Œé»˜è®¤ä¸ºåŽŸç”Ÿæ ·å¼ \code{plain},还å¯ä»¥æ”¹ä¸º \code{pifont} çš„å„个版本,从左往å³ä¾æ¬¡ä¸ºæ™®é€šç‰ˆã€é˜´æ–‡è¡¬çº¿ç‰ˆã€é˜³æ–‡æ— è¡¬çº¿ç‰ˆå’Œé˜´æ–‡æ— è¡¬çº¿ç‰ˆï¼Œç¼ºç‚¹æ˜¯å®ƒä»¬çš„ç¼–å·ä»…包括 1-10。
+
+ 短编å·çš„å½¢å¼ä¸Žåˆ—表环境类似,ä¸è¿‡å¢žåŠ äº†ä¸€ä¸ªä¸­æ–‡æ•°å­—æ ¼å¼å‚æ•° \code{c}ã€‚åŽŸç”Ÿæ ·å¼ \code{plain} ç­‰åŒäºŽå•ç‹¬ä½¿ç”¨æ•°å­— \code{1} å‚数。这个选项å¯ä»¥ç”¨åœ¨æ­£æ–‡ä¸­æ”¹å˜å…¶åŽè„šæ³¨ç¼–å·æ ¼å¼ã€‚
+ \begin{ctexexam}
+ \hdrset{fnmark-num = 1} % 等于编å·æ ¼å¼plain
+ \hdrset{fnmark-num = (a)}
+ \end{ctexexam}
+ \keychoice{fntext-num}{plain,pifont,pifont*,pifont-sans,pifont-sans*,短编å·}\Default{plain}
+ 脚注内容标记编å·çš„æ ¼å¼ï¼Œç”¨æ³•ä¸Ž \option{fnmark-num} 一样,所以脚注内容与正文标记编å·æ ¼å¼\textbf{å¯ä»¥ä¸åŒ}。
+ \keychoice{fnboth-num}{plain,pifont,pifont*,pifont-sans,pifont-sans*,短编å·}\Default{plain}
+ åŒæ—¶è®¾å®šè„šæ³¨æ­£æ–‡æ ‡è®°ç¼–å· \option{fnmark-num} ä¸Žè„šæ³¨å†…å®¹æ ‡è®°ç¼–å· \option{fntext-num} çš„æ ¼å¼ã€‚ç›®å‰è„šæ³¨ç¼–å·æ ¼å¼é€‰é¡¹å¯¹äºŽè¿·ä½ é¡µçŽ¯å¢ƒ \env*{minipage} 无效,其中的脚注ä¿æŒé»˜è®¤è‹±æ–‡å­—æ¯çš„ç¼–å·å½¢å¼ã€‚
+ \keyval-{fnmark-form}{æ ¼å¼ä»£ç }\Default
脚注标记的格å¼ï¼Œåœ¨æ­¤è®¾ç½®å­—体命令会覆盖 \module*{subfont/}\option{footnote} 的设置,最åŽä¸€ä¸ªæ ¼å¼å‘½ä»¤å¯ä»¥å¸¦æœ‰ä¸€ä¸ªå‚数,这个å‚数接å—脚注标记,一般é…åˆ \keyis-{fnmark-num}{plain} 使用。
- \keyval-{fntext-form}{æ ¼å¼ä»£ç }\Default{æ ¼å¼ä»£ç }
+ \keyval-{fntext-form}{æ ¼å¼ä»£ç }\Default
脚注内容的格å¼ï¼Œåœ¨æ­¤è®¾ç½®å­—体命令会覆盖 \module*{subfont/}\option{footnote} 的设置,最åŽä¸€ä¸ªæ ¼å¼å‘½ä»¤å¯ä»¥å¸¦æœ‰ä¸€ä¸ªå‚数,这个å‚数接å—脚注内容。
- \keyval-{afterfnmark}{æ ¼å¼ä»£ç }\Default{æ ¼å¼ä»£ç }
- 脚注标记åŽçš„代ç ï¼Œç”±äºŽè„šæ³¨æ ‡è®°å¤„于水平盒å­ä¸­ï¼Œå®ƒä¸€èˆ¬ç”¨äºŽè®¾ç½®æ ‡è®°ä¸Žæ–‡æœ¬é—´çš„è·ç¦»ã€‚
+ \kvsplit{fnmark-code}{å‰ä»£ç ,åŽä»£ç }\newline
+ 脚注内容标记å‰åŽå¢žåŠ ä»£ç å¯ä»¥ç”¨ \meta{å‰ä»£ç } 与 \meta{åŽä»£ç },也å¯ä»¥åªæœ‰å‰éƒ¨åˆ†ï¼Œè¿™ä¸¤éƒ¨åˆ†ä»£ç åªå¯¹é¡µé¢ä¸‹æ–¹çš„标记有效。由于脚注标记处于水平模å¼ï¼Œä¸€èˆ¬åœ¨è„šæ³¨ç±»åž‹ä¸º \keyis-{footnotetype}{default} 时在标记与其åŽè„šæ³¨æ®µè½é—´æ’å…¥è·ç¦»ä»£ç ï¼Œæˆ–与正文中的标记ç¨æœ‰ä¸åŒã€‚
\end{options}
\subsection{目录样å¼}
\label{subsec:catalog style}
-\module*{tocset} 将目录样å¼äº¤ç»™ \pkg*{titletoc} 处ç†ï¼Œ\code{level} 代表 \code{part}ã€\code{chapter}ã€\code{section}ã€\code{subsection}ã€\code{figure}ã€\code{table} å’Œ \code{lstlisting} 级别的目录,而使用 \code{list} 级别å¯ä»¥ç»Ÿä¸€è®¾ç½®å›¾ç‰‡ã€è¡¨æ ¼å’Œä»£ç ç›®å½•çš„æ ·å¼ã€‚
+æ¨¡å— \module*{tocset} 将目录样å¼äº¤ç»™ \pkg*{titletoc} 处ç†ï¼Œ\code{level} 代表 \code{part}ã€\code{chapter}ã€\code{section}ã€\code{subsection}ã€\code{figure}ã€\code{table} å’Œ \code{lstlisting} 级别的目录,而使用 \code{list} 级别å¯ä»¥ç»Ÿä¸€è®¾ç½®å›¾ç‰‡ã€è¡¨æ ¼å’Œä»£ç ç›®å½•çš„æ ·å¼ã€‚
\begin{options}
\keyval-{format}{目录标题格å¼}\Module{/(level)}
- \change[2021-05-14]{2021-01-13}
- 目录中标题的格å¼ï¼Œå¯ä»¥è®¾ç½®å­—体和加入垂直间è·ç­‰ï¼Œåž‚ç›´é—´è·æœ€å¥½ä½¿ç”¨æ— é—´è·é‡åˆçš„ \cs*{addvspace} 命令。
+ å„级别目录中标题的格å¼ï¼Œå¯ä»¥è®¾ç½®å­—体和加入垂直间è·ç­‰ï¼Œåž‚ç›´é—´è·æœ€å¥½ä½¿ç”¨é˜²æ­¢åž‚ç›´é—´è·é‡åˆçš„ \cs*{addvspace} 命令。
\keyval-{format+}{目录标题格å¼}
- 与 \option{format} 用法一样,在已有的格å¼å‘½ä»¤åŽé™„加内容。
+ 与 \option{format} 用法一样,åªæ˜¯åœ¨å·²æœ‰çš„æ ¼å¼å‘½ä»¤åŽé™„加代ç ã€‚
\keyval-{indent}{刚性长度}
- 目录中的标题左边缩进è·ç¦»ï¼Œé€šå¸¸æ ‡é¢˜çº§åˆ«è¶Šä½Žç¼©è¿›è¶Šå¤§ã€‚
+ å„级别目录中的标题左边缩进è·ç¦»ï¼Œé€šå¸¸æ ‡é¢˜çº§åˆ«è¶Šä½Žç¼©è¿›è¶Šå¤§ã€‚
\keyval-{rule}{目录引导线样å¼}
- \option{rule} 选项中一般应当使用 \cs{tocrule} 命令,将会在接下æ¥ä»‹ç»ã€‚
+ 引导线选项 \option{rule} 中一般应当使用 \cs{tocrule} 命令绘制引导线,将会在接下æ¥ä»‹ç»ã€‚
\keyval-{numsep}{刚性长度}\Default{1em}
- 有编å·çš„标题在目录中编å·ä¸Žæ ‡é¢˜çš„é—´è·ï¼Œé»˜è®¤è·ç¦»ç»Ÿä¸€ä¸º \code{1em}。
+ 有编å·çš„标题在å„级别目录中编å·ä¸Žæ ‡é¢˜çš„é—´è·ï¼Œé»˜è®¤è·ç¦»ç»Ÿä¸€ä¸º \code{1em}。
\end{options}
\begin{commands}
- \command{tocrule}[\sarg\oarg{引导点间è·}\parg{引导点大å°}\marg{引导点}\oarg{页ç æ ¼å¼}]
- \change[2021-06-11]{2021-01-13}
- \cs{tocrule} 命令生æˆç›®å½•å¼•å¯¼çº¿ï¼Œéœ€è¦åœ¨ \option{rule} 选项中使用。带有星å·çš„命令会使当å‰çº§åˆ«çš„目录引导线å³è¾¹ä¸Žé¡µç è¿žæŽ¥è€Œä¸æ˜¯å¯¹é½ã€‚引导点间è·éœ€å¸¦æœ‰é•¿åº¦å•ä½ï¼Œå¼•å¯¼ç‚¹å¤§å°ä¸å¸¦å•ä½ï¼Œä¸ºå¼•å¯¼ç‚¹ç¬¦å·æ­£å¸¸å¤§å°çš„å€æ•°ï¼Œå¼•å¯¼ç‚¹ä¸€èˆ¬ä¸ºè‹±æ–‡å¥å·æˆ– \cs*{cdot} 中心点符å·ã€‚页ç æ ¼å¼çš„内容ä½äºŽé¡µç å‰é¢ï¼Œå¯ä»¥è®¾ç½®é¡µç å­—体和è·ç¦»ç­‰ï¼Œæœ€åŽä¸€ä¸ªæ ¼å¼å‘½ä»¤å¯ä»¥å¸¦æœ‰ä¸€ä¸ªå‚数,这个å‚数接å—页ç ç¼–å·ã€‚
+ \command{tocrule}[\sarg\oarg{引导点间è·}\darg{引导点大å°}\marg{引导点}\oarg{页ç æ ¼å¼}]
+ 目录命令 \cs{tocrule} 生æˆç›®å½•å¼•å¯¼çº¿ï¼Œéœ€è¦åœ¨ \meta{目录引导线样å¼} 中使用。带有星å·çš„命令会使当å‰çº§åˆ«çš„目录引导线å³è¾¹ä¸Žé¡µç ç›¸è¿žè€Œä¸æ˜¯å¯¹é½ã€‚\meta{引导点间è·} 需带有长度å•ä½ï¼Œ\meta{引导点大å°} ä¸å¸¦å•ä½ï¼Œä¸º \meta{引导点} 的放大因å­ï¼Œ\meta{引导点} 一般为英文å¥å·æˆ– \cs*{cdot} 中心点符å·ã€‚\meta{页ç æ ¼å¼} 的代ç ä½äºŽé¡µç å‰é¢ï¼Œå¯ä»¥è®¾ç½®é¡µç å­—体和è·ç¦»ç­‰ï¼Œæœ€åŽä¸€ä¸ªå‘½ä»¤å¯ä»¥å¸¦æœ‰ä¸€ä¸ªå‚数,这个å‚数为页ç ç¼–å·ã€‚
\command*{CTEXnumberline}[\marg{ç¼–å·çº§åˆ«}]
- \cs*{CTEXnumberline} 命令用于在 C\TeX 文档类的 \option*{tocline} 选项中设置目录标签的编å·ï¼Œå®ƒå·²ç»è¢«é‡æ–°å®šä¹‰ï¼Œä½¿å¾—目录编å·åŽé—´è·é€‰é¡¹ \option{numsep} ä»ç„¶æœ‰æ•ˆã€‚\meta{ç¼–å·çº§åˆ«} 为 \code{chapter} å’Œ \code{section} 等,也å¯ç”¨å‚æ•° \code{\#1} 代替当å‰çº§åˆ«ç±»åž‹ï¼Œæ ‡é¢˜å用å‚æ•° \code{\#2} 代替一般ä¸å˜ã€‚
+ 目录命令 \cs*{CTEXnumberline} 用于在 C\TeX 文档类的 \option*{tocline} 选项中设置目录标签的编å·ï¼Œå®ƒå·²ç»è¢«é‡æ–°å®šä¹‰ï¼Œä½¿å¾—目录编å·åŽé—´è·é€‰é¡¹ \option{numsep} ä»ç„¶æœ‰æ•ˆã€‚\meta{ç¼–å·çº§åˆ«} 为 \code{chapter} å’Œ \code{section} 等,也å¯ç”¨å‚æ•° \code{\#1} 代替当å‰çº§åˆ«ç±»åž‹ï¼Œæ ‡é¢˜å用å‚æ•° \code{\#2} 代替一般ä¸å˜ã€‚
\begin{ctexexam}
\tocset
{
@@ -738,9 +746,8 @@
\keyval-{belowoffset}{长度}\Module{tocset}\Default{-1pc}
主文档目录标题下方的间è·è¡¥å¿ï¼Œä¸€èˆ¬ä¸ºè´Ÿå€¼ï¼Œç”¨äºŽæŠµæ¶ˆ \option{format} 中é¢å¤–çš„åž‚ç›´é—´è·ã€‚
\keyval-{belowoffset}{长度}\Module{/(level)}\Default{0pc}
- 与之上é¢é€‰é¡¹çš„æ„义类似,代表 \code{figure}ã€\code{table} å’Œ \code{lstlisting} 三个级别,也å¯ä»¥ä½¿ç”¨ \code{list} 统一设置,一般为正值。
+ \code{level} 代表 \code{figure}ã€\code{table} å’Œ \code{lstlisting} 三个级别目录标题下方间è·è¡¥å¿ï¼Œä¹Ÿå¯ä»¥ä½¿ç”¨ \code{list} 统一设置,一般为正值。这个è·ç¦»ä¹Ÿå¯ä»¥ç”¨ C\TeX 标题下方è·ç¦»é€‰é¡¹ä¿®æ”¹ã€‚
\keyval-{lolskip}{长度}\Module{tocset}\Default{0.8pc}
- \change[2021-05-14]{2021-01-13}
代ç ç›®å½•ä¸­ç« ä¹‹é—´çš„代ç æ ‡é¢˜çš„è·ç¦»ï¼Œä¸Ž C\TeX 的表格目录和图片目录中章之间的标题è·ç¦»é€‰é¡¹ \option*{lotskip} å’Œ \option*{lofskip} 类似,它们的值å‡é»˜è®¤ä¸º \code{0.8pc},在 \cls*{article} 模å¼ä¸­æ­¤é€‰é¡¹å¤±æ•ˆã€‚
\keyval-{tocline-fig}{图片目录标签}
图片目录标签,选项å‚数中 \code{\#1} 代表编å·ï¼Œè¿˜å¯åŒ…å«æ ‡ç­¾å称,默认标签å称与图片题注å称一致。
@@ -757,11 +764,11 @@
}
\end{ctexexam}
\keybool{line-align}\Default{true}
- \option{line-align} 选项å¯ä»¥ä½¿ç›®å½•å¼•å¯¼çº¿å³è¾¹å¯¹é½å¹¶ä¸Žé¡µç ä¿æŒä¸€å®šé—´éš™ï¼Œå¦åˆ™ä¼šä¸Žé¡µç è¿žæŽ¥ã€‚
+ 引导线选项 \option{line-align} å¯ä»¥ä½¿ç›®å½•å¼•å¯¼çº¿å³è¾¹å¯¹é½å¹¶ä¸Žé¡µç ä¿æŒä¸€å®šé—´éš™ï¼Œå¦åˆ™ä¼šä¸Žé¡µç ç›¸è¿žã€‚
\keybool{hang}\Default{false}
- \option{hang} 选项使目录标题为悬挂缩进形å¼ï¼Œç¼©è¿›è·ç¦»ä¸ºç¼–å·åŠå…¶ä¸Žæ ‡é¢˜é—´è·çš„长度,但此时目录编å·ä¼šå¤±åŽ»è¶…链接。
+ 悬挂缩进选项 \option{hang} 使目录标题为悬挂缩进形å¼ï¼Œç¼©è¿›è·ç¦»ä¸ºç¼–å·åŠå…¶ä¸Žæ ‡é¢˜é—´è·çš„长度,但此时目录编å·ä¼šå¤±åŽ»è¶…链接。
\keyval-{numsep-all}{刚性长度}\Default{1em}
- 统一设置所有有编å·çš„标题在目录中编å·ä¸Žæ ‡é¢˜çš„é—´è·ã€‚
+ 统一设置所有级别有编å·çš„标题在目录中编å·ä¸Žæ ‡é¢˜çš„é—´è·ã€‚
\keyval-{indent-all}{刚性长度}
统一设置所有级别的目录标题左边缩进。
\keyval-{rule-all}{目录引导线样å¼}
@@ -810,11 +817,12 @@
\environment*{enumerate}[\oarg{键值列表}]\default{}
\environment*{itemize}[\oarg{键值列表}]\default{}
\environment*{description}[\oarg{键值列表}]
- 已为三ç§åˆ—表预置了三个级别,åŒç§åˆ—表或ä¸åŒç§åˆ—表间的ä¸åŒçº§åˆ«å¯ç›¸äº’嵌套,å¯ä»¥ä½¿ç”¨çŸ­ç¼–å·çš„å½¢å¼ï¼Œå¸¦æœ‰æ˜Ÿå·çš„环境为行内列表。默认列表标签与标准文档类一致,下é¢ä¸¾å‡ ä¸ªæ›´æ”¹åˆ—表标签以åŠå…¶å®ƒæ ¼å¼çš„例å­ï¼š
+ 已为三ç§åˆ—表å„自预置了三个级别,åŒç§åˆ—表或ä¸åŒç§åˆ—表间的ä¸åŒçº§åˆ«å¯ç›¸äº’嵌套,å¯ä»¥ä½¿ç”¨çŸ­ç¼–å·çš„å½¢å¼ï¼Œå¸¦æœ‰æ˜Ÿå·çš„环境为行内列表。默认列表标签与标准文档类一致,下é¢ä¸¾å‡ ä¸ªæ›´æ”¹åˆ—表标签以åŠå…¶å®ƒæ ¼å¼çš„例å­ï¼š
\begin{ctexexam}
\setlist{nosep} % å–消所有列表é¢å¤–çš„åž‚ç›´é—´è·
\begin{enumerate}[label = \arabic*(a),leftmargin = 1cm,resume]
- \begin{itemize}[label = \textbullet]
+ \begin{enumerate}[(1)] % 短编å·å½¢å¼
+ \begin{itemize}[label = \textbullet,labelsep = *]
\begin{description}[font = \sffamily\bfseries,style = nextline]
\end{ctexexam}
\end{environments}
@@ -834,7 +842,7 @@
\begin{center}
\begin{tabular}{*{8}{c}}
\toprule
- theorem & definition & lemma & corollary & proposition & example & remark & proof \\
+ \env{theorem} & \env{definition} & \env{lemma} & \env{corollary} & \env{proposition} & \env{example} & \env{remark} & \env{proof} \\
å®šç† & 定义 & å¼•ç† & 推论& 性质 & 例 & 注 & è¯æ˜Ž \\
\bottomrule
\end{tabular}
@@ -842,11 +850,11 @@
\end{environments}
\subsection{悬挂缩进}
-\change{2021-07-11}
\begin{commands}
\command{hangpara}[\marg{缩进长度}\marg{缩进开始行数}]
悬挂缩进命令 \cs{hangpara} 使其åŽçš„一个段è½ä¿æŒæ‚¬æŒ‚缩进,å‚数与 \env{hangparas} 环境相åŒï¼Œä¸è¿‡åªæœ‰ä¸€ä¸ªæ®µè½ã€‚
\end{commands}
+
\begin{environments}
\environment{hangparas}[\marg{缩进长度}\marg{缩进开始行数}]
悬挂缩进环境 \env{hangparas} 有两个必选å‚数,使其中的段è½å‡ä¿æŒæ‚¬æŒ‚缩进。æ¯ä¸ªæ®µè½çš„缩进将以 \meta{缩进长度} 从 \meta{缩进开始行数} 开始。
@@ -858,21 +866,22 @@
\command{lstinline}[\oarg{键值列表}\marg{行内代ç }]
行内代ç æŠ„录命令,较 \cs*{verb} 命令有较大改进,具有代ç è¯­è¨€å’Œæ ·å¼æ”¯æŒã€‚
\end{commands}
+
\begin{environments}
\environment{lstlisting}[\oarg{键值列表}]
行间代ç æŠ„录环境,支æŒå¤šç§è¯­è¨€åº“,默认使用 \code{LaTeX} 代ç è¯­è¨€ï¼Œä½¿ç”¨å¯é€‰å‚数局部设置代ç æ ¼å¼ã€‚
\end{environments}
+
\begin{options}\noitemsep
\keyval-{lstlistlistingname}{代ç ç›®å½•æ ‡é¢˜å}\default{}
\keyval-{lstlistingname}{代ç é¢˜æ³¨æ ‡é¢˜å}
- \option*{lstlistlistingname} å’Œ \option*{lstlistingname} 分别是代ç ç›®å½•å与代ç çŽ¯å¢ƒé¢˜æ³¨å,与 C\TeX 使用手册标题汉化一节类似,å¯ä½¿ç”¨ \cs*{ctexset} 接å£å‘½ä»¤ç›´æŽ¥ä¿®æ”¹ã€‚
+ 代ç ç›®å½•å与代ç çŽ¯å¢ƒé¢˜æ³¨å选项 \option*{lstlistlistingname} å’Œ \option*{lstlistingname} 用法与 C\TeX 使用手册标题汉化一节类似,å¯ä»¥çœ‹ä½œå¯¹è¿™èŠ‚的扩展。
\end{options}
\subsection{习题}
\label{subsec:exercise}
\begin{environments}
\environment{exercise}[\sarg\parg\oarg{键值列表1}\darg{键值列表2}\oarg{键值列表3}]
- \change[2021-07-25]{2021-01-05}
习题环境的标题使用 \cs*{tcbox} 行内盒å­åŒ…装样å¼ï¼Œå†…容则使用 \env{enumerate} 列表环境。它有 5 个å¯é€‰å‚数,应当注æ„用法。当使用星å·å‚数时标题ä¸è¿›è¡Œç¼–å·ï¼Œä½¿ç”¨ \parg{} å·å‚æ•°æ—¶ä¸ä½¿ç”¨é¢„置标题,此时 \meta{键值列表1} 除了 \option{label} 选项失效。\par
\meta{键值列表2} 包括 \pkg*{tcolorbox} çš„ç›’å­æ ·å¼é€‰é¡¹ï¼Œä¾‹å¦‚ \option*{boxsep} å’Œ \option*{fontupper} 等,也å¯ä»¥ä½¿ç”¨ä¸‹è¿° \option{tcolorbox} 选项。在这里å¯ä»¥ä½¿ç”¨ \cs{tcbappstyle} 命令设置标题选项 \meta{键值列表2} 的值,第一个å‚数为 \code{exercise}。
@@ -889,14 +898,14 @@
\begin{commands}
\command{setexercise}[\marg{键值列表1}]
- \cs{setexercise} 命令用于全局设置上述习题环境 \env{exercise} 标题样å¼å¯é€‰å‚数中 \meta{键值列表1} 的默认值,包å«çš„选项如下:
+ é…置命令 \cs{setexercise} 用于全局设置上述习题环境 \env{exercise} 标题样å¼å¯é€‰å‚数中 \meta{键值列表1} 的默认值,包å«çš„选项如下:
\begin{options}
\keyval-{color}{标题背景颜色å}\Default{DeepSkyBlue}
习题标题盒å­èƒŒæ™¯é¢œè‰²ï¼Œå¯ä»¥ä½¿ç”¨ \pkg*{xcolor} 自定义颜色或使用色库。
\keyval-{title}{环境标题}\Default{习题}
习题的标题,å¯ä»¥åŒ¹é…中英文模å¼ï¼Œä¹ é¢˜çŽ¯å¢ƒä½¿ç”¨ \parg{} å‚数时无效。
\keyval-{number}{习题编å·æ ¼å¼}\Default{\Marg{1.}}
- 标题编å·è¾“出选项 \option{number} 为短编å·å½¢å¼ï¼Œåº”å½“åŒ…å« Aã€aã€Iã€iã€æˆ– 1 其中一个符å·ã€‚
+ 标题编å·è¾“出选项 \option{number} 为短编å·å½¢å¼ï¼Œåº”å½“åŒ…å« \code{A}ã€\code{a}ã€\code{I}ã€\code{i}ã€æˆ– \code{1} 其中一个符å·ã€‚
\keyval-{numsep}{ç¼–å·ä¸Žæ ‡é¢˜çš„é—´è·}\Default{0.5em}
习题标题编å·ä¸ŽåŽæ–¹æ ‡é¢˜æ–‡æœ¬çš„é—´è·ï¼Œä¹ é¢˜çŽ¯å¢ƒä½¿ç”¨æ˜Ÿå·å‚数时无效。
\keyval-{tcolorbox}{键值列表2}
@@ -912,7 +921,7 @@
\command{exerprologue}[\marg{åºè¨€å†…容}]
åºè¨€å‘½ä»¤ \cs{exerprologue} 在习题环境开始å‰æ’入一段内容,å¯ä»¥æ˜¯æ–‡æœ¬æˆ–者代ç ï¼Œéœ€è¦åœ¨æ¯ä¸€ä¸ªä¹ é¢˜çŽ¯å¢ƒå‰ä½¿ç”¨ã€‚
\command{tcphantomifname}[\marg{ç¼–å·ä»£ç }\marg{ä¸ç¼–å·ä»£ç }]
- \cs{tcphantomifname} æ ¹æ®ä½¿ç”¨ \pkg*{tcolorbox} 生æˆçš„习题标题是å¦ç¼–å·ï¼Œåœ¨è¶…链接锚点的ä½ç½®åŠ å…¥ä»£ç ï¼Œæ¯”如使用 \cs*{addcontentsline} 命令将习题标题加入目录。
+ 命令 \cs{tcphantomifname} æ ¹æ®ä½¿ç”¨ \pkg*{tcolorbox} 生æˆçš„习题标题是å¦ç¼–å·ï¼Œåœ¨è¶…链接锚点的ä½ç½®åŠ å…¥ä»£ç ï¼Œæ¯”如使用 \cs*{addcontentsline} 命令将习题标题加入目录。
\end{commands}
\subsection{ç›’å­}
@@ -921,7 +930,6 @@
\begin{commands}
\command{tcbappstyle}[\sarg\marg{风格å称}\marg{键值列表}]
- \change{2021-07-25}
这是一个 \pkg*{tcolorbox} å®åŒ…ç›’å­é£Žæ ¼å®šä¹‰å‘½ä»¤ï¼Œå¸¦æœ‰æ˜Ÿå·çš„命令å¯ä»¥\textbf{新建或é‡ç½®}一个å为 \code{tc-}\meta{风格å称} çš„ç›’å­é£Žæ ¼ï¼Œå¦åˆ™æ˜¯ä¿®æ”¹\textbf{已存在}的风格。这个命令å¯ä»¥è°ƒæ•´ä»¥ä¸‹å³å°†ä»‹ç»çš„预置盒å­é£Žæ ¼ï¼Œå¯¹äºŽé¢„置盒å­æ¥è¯´å‚æ•° \meta{风格å称} å³ä¸ºå®ƒä»¬å¯¹åº”的环境或命令å。
\begin{ctexexam}
\tcbappstyle*{mytcb} % 新建一个盒å­é£Žæ ¼tc-mytcb
@@ -946,6 +954,7 @@
\environment{outline}[\oarg{键值列表1}\darg{标题å称}\oarg{键值列表2}]
摘è¦ç›’å­ \env{outline} å¯ç”¨äºŽç« å‰æ‘˜è¦ï¼Œå®ƒçš„标题是å¯é€‰å‚数,默认标题是摘è¦ã€‚\meta{键值列表2} 是摘è¦ç›’å­æ ·å¼é€‰é¡¹ï¼Œå¯ä»¥ä½¿ç”¨ \cs{tcbappstyle} 命令对它进行全局设置,命令第一个å‚数为 \code{outline}。
\end{environments}
+
\begin{commands}
\command{setoutlinelist}[\marg{键值列表1}]
\meta{键值列表1} 与 \pkg*{enumitem} å®åŒ…中列表é…置选项相åŒï¼Œå¯ä»¥è®¾ç½®æ‘˜è¦æ¡ç›®çš„å„ç§è·ç¦»ï¼Œè¦å¯¹å®ƒè¿›è¡Œå…¨å±€è®¾ç½®å¯ä»¥ä½¿ç”¨ \cs{setoutlinelist} 命令。
@@ -992,9 +1001,9 @@
\command*{unit}[\oarg{键值列表}\marg{å•ä½}]
å•ä½æ ¼å¼åŒ–命令 \cs*{unit} 包å«æ–‡å­—元素(例如字æ¯æˆ–数字)时,使用 \Marg{.} å’Œ \code{\~{}} 放置在å•å…ƒä¹˜ç§¯ä¸­é—´ï¼Œå¹¶ä½¿ç”¨ \code{\_} å’Œ \code{\^{}} 正确放置指定的下标和上标。格å¼åŒ–方法å¯åœ¨æ•°å­¦å’Œæ–‡æœ¬æ¨¡å¼ä¸‹ä½¿ç”¨ã€‚
\command*{qty}[\oarg{键值列表}\marg{æ•°å­—}\oarg{å‰ç¼€}\marg{å•ä½}]
- \cs*{qty} 命令å¯ç”¨æ¥è¾“出带有å•ä½çš„é‡ã€‚
+ 命令 \cs*{qty} å¯ç”¨æ¥è¾“出带有å•ä½çš„é‡ã€‚
\command*{qtyrange}[\oarg{键值列表}\marg{æ•°å­—1}\marg{æ•°å­—2}\marg{å•ä½}]
- \cs*{qtyrange} å¯ä»¥è¾“出带有范围和å•ä½çš„é‡ã€‚
+ 命令 \cs*{qtyrange} å¯ä»¥è¾“出带有范围和å•ä½çš„é‡ã€‚
\begin{ctexexam}
\numproduct{-21x3e5}
\unit{mL~min^{-1}}
@@ -1007,17 +1016,16 @@
\begin{commands}\noitemsep
\command{newcounter}[\marg{计数器}\oarg{父计数器}]\default{}
\command{UseCounter}[\sarg\oarg{父计数器}\darg{ç¼–å·}\marg{计数器}\marg{内容}\oarg{分隔符}]
- \cs{newcounter} 是 \LaTeX 自带的创建计数器命令,\cs{UseCounter} 将会以一定的格å¼ä½¿ç”¨ç”±å®ƒåˆ›å»ºçš„计数器,将会以 \cs*{the}\meta{父计数器}\meta{分隔符}\cs*{the}\meta{计数器}\meta{内容} 输出当å‰å†…容。
- 需è¦æ³¨æ„的是 \cs{UseCounter} 仅具有\textbf{输出功能},并ä¸ä¼šæ”¹å˜è®¡æ•°å™¨åŽŸæœ‰çš„绑定关系。默认æ¯ä½¿ç”¨ä¸€æ¬¡å‘½ä»¤ \meta{计数器} 的值增加 1,带有星å·çš„命令使 \meta{计数器} ä¿æŒå½“å‰å€¼ï¼Œ\meta{ç¼–å·} 为 \code{arabic} å’Œ \code{alpha} 等格å¼ï¼Œ\meta{数值} å¯ä»¥æ‰‹åŠ¨å°† \meta{计数器} 设为指定值。
-\end{commands}
+ 命令 \cs{newcounter} 是 \LaTeX 自带的创建计数器命令,命令 \cs{UseCounter} 以一定的格å¼ä½¿ç”¨ç”±å®ƒåˆ›å»ºçš„计数器,将会以 \cs*{the}\meta{父计数器}\meta{分隔符}\cs*{the}\meta{计数器}\meta{内容} 输出当å‰å†…å®¹ã€‚æ³¨æ„ \cs{UseCounter} 仅具有\textbf{输出功能},并ä¸ä¼šæ”¹å˜è®¡æ•°å™¨åŽŸæœ‰çš„绑定关系。默认æ¯ä½¿ç”¨ä¸€æ¬¡å‘½ä»¤ \meta{计数器} 的值增加 1,带有星å·çš„命令使 \meta{计数器} 值ä¿æŒä¸å˜ï¼Œ\meta{ç¼–å·} 为 \code{arabic} å’Œ \code{alpha} 等格å¼ï¼Œ\meta{数值} å¯ä»¥æ‰‹åŠ¨å°† \meta{计数器} 设为指定值。
-在一定的场åˆä¸‹å¯èƒ½ç”¨åˆ° \cs{UseCounter} 命令,比如通过新建快æ·å‘½ä»¤åœ¨ä¸€äº›ä½ç½®ä½¿ç”¨å®šç†çŽ¯å¢ƒçš„计数器,使用 \cs{labelformat} 设置计数器的引用标签需添加 \code{eb@}:
-\begin{ctexexam}
+ 在一定的场åˆä¸‹å¯èƒ½ç”¨åˆ° \cs{UseCounter} 命令,比如通过新建快æ·å‘½ä»¤åœ¨ä¸€äº›ä½ç½®ä½¿ç”¨å®šç†çŽ¯å¢ƒçš„计数器,使用 \cs{labelformat} 设置计数器的引用标签需添加 \code{eb@}:
+ \begin{ctexexam}
\labelformat{eb@theorem}{å®šç† #1}
\newcommand{\theoremhead}[1]
{å®šç† \UseCounter[chapter]{theorem}{\hspace{1em}#1}}
\theoremhead{定ç†æ ‡é¢˜}\label{thm:theorem}
-\end{ctexexam}
+ \end{ctexexam}
+\end{commands}
\subsection{图表题注}
\begin{commands}\noitemsep
@@ -1035,7 +1043,6 @@
\end{commands}
\subsection{å…¬å¼ç¬¦å·å¯¹ç…§}
-\change{2021-07-22}
\begin{environments}
\environment{eqcomp}[\oarg{键值列表1}\darg{键值列表2}]
一些公å¼ä¹‹åŽå¯ä»¥ä½¿ç”¨åŸºäºŽåˆ—表环境的 \env{eqcomp} 进行符å·å¯¹ç…§ã€‚对照列表的 \meta{键值列表2} 与 \pkg*{enumitem} 的选项相åŒï¼Œä¸€èˆ¬è¾ƒå°‘用到,å¯ä»¥ç”¨äºŽè®¾ç½®åž‚ç›´é—´è·ç­‰ã€‚
@@ -1049,35 +1056,35 @@
\command{seteqcomp}[\marg{键值列表1}]
对照环境的 \meta{键值列表1} å¯ä»¥ä½¿ç”¨ \cs{seteqcomp} 全局设置,它的选项如下:
\begin{options}
- \keyval-{width}{符å·å®½åº¦}\Default{2em}
- 设置适当的符å·å®½åº¦å¯ä»¥é˜²æ­¢æ–‡å­—é‡å å’Œè¾¹ç•Œæº¢å‡ºç­‰é—®é¢˜ã€‚
- \keyval-{delim}{引导符}\Default{——}
- 符å·å¯¹ç…§çš„引导符,\cs{symb} çš„ \meta{引导符} 和对é½æ–¹å¼æ˜¯åŸºäºŽè¿™ä¸ªç¬¦å·çš„宽度。
- \keyval-{space}{符å·é—´éš™}\Default{0.25em}
- 符å·é—´éš™ä¸ºå¼•å¯¼ç¬¦ä¸¤ä¾§ä¸Žç¬¦å·å’Œè¯´æ˜Žæ–‡å­—é—´çš„è·ç¦»ã€‚
- \keychoice{item-align}{l,c,r}\Default{r}
- 符å·çš„对é½æ–¹å¼ï¼Œåˆ†ä¸ºå·¦ï¼ˆ\code{l})ã€ä¸­ï¼ˆ\code{c})和å³ï¼ˆ\code{r})三ç§å¯¹é½æ–¹å¼ã€‚
- \keychoice{delim-align}{l,c,r}\Default{c}
- 引导符的对é½æ–¹å¼ï¼Œåˆ†ä¸ºå·¦ï¼ˆ\code{l})ã€ä¸­ï¼ˆ\code{c})和å³ï¼ˆ\code{r})三ç§å¯¹é½æ–¹å¼ã€‚
- \keyval-{enumitem}{键值列表2}
- å¯ä»¥ä½¿ç”¨é€‰é¡¹ \option{enumitem} 或命令 \cs{seteqcomplist} 调整对照列表的水平垂直间è·ã€‚
- \keyval-{intro}{首行文字}\Default
- 符å·å¯¹ç…§çš„说明文字,应当为简短的几个字,åªæ˜¾ç¤ºåœ¨ç¬¬ä¸€è¡Œï¼Œå…¶åŽä¸ºæ‚¬æŒ‚缩进的对照列表。
- \keyval-{font}{符å·å­—体}\Default
- 符å·çš„字体,数学和文本符å·æ¨¡å¼åº”采用ä¸åŒçš„字体命令,最åŽä¸€ä¸ªå‘½ä»¤å¯ä»¥æŽ¥å—一个å‚数,这个å‚数为符å·ã€‚
- \keychoice{mode}{math,text}\Default{math}
- 符å·å­—体模å¼ï¼Œå¯ä»¥ä¸ºæ•°å­¦å­—体或者文本字体。
+ \keyval-{width}{符å·å®½åº¦}\Default{2em}
+ 设置适当的符å·å®½åº¦å¯ä»¥é˜²æ­¢æ–‡å­—é‡å å’Œè¾¹ç•Œæº¢å‡ºç­‰é—®é¢˜ã€‚
+ \keyval-{delim}{引导符}\Default{——}
+ 符å·å¯¹ç…§çš„引导符,\cs{symb} çš„ \meta{引导符} 和对é½æ–¹å¼æ˜¯åŸºäºŽè¿™ä¸ªç¬¦å·çš„宽度。
+ \keyval-{space}{符å·é—´éš™}\Default{0.25em}
+ 符å·é—´éš™ä¸ºå¼•å¯¼ç¬¦ä¸¤ä¾§ä¸Žç¬¦å·å’Œè¯´æ˜Žæ–‡å­—é—´çš„è·ç¦»ã€‚
+ \keychoice{item-align}{l,c,r}\Default{r}
+ 符å·çš„对é½æ–¹å¼ï¼Œåˆ†ä¸ºå·¦ï¼ˆ\code{l})ã€ä¸­ï¼ˆ\code{c})和å³ï¼ˆ\code{r})三ç§å¯¹é½æ–¹å¼ã€‚
+ \keychoice{delim-align}{l,c,r}\Default{c}
+ 引导符的对é½æ–¹å¼ï¼Œåˆ†ä¸ºå·¦ï¼ˆ\code{l})ã€ä¸­ï¼ˆ\code{c})和å³ï¼ˆ\code{r})三ç§å¯¹é½æ–¹å¼ã€‚
+ \keyval-{enumitem}{键值列表2}
+ å¯ä»¥ä½¿ç”¨é€‰é¡¹ \option{enumitem} 或命令 \cs{seteqcomplist} 调整对照列表的水平垂直间è·ã€‚
+ \keyval-{intro}{首行文字}\Default
+ 符å·å¯¹ç…§çš„说明文字,应当为简短的几个字,åªæ˜¾ç¤ºåœ¨ç¬¬ä¸€è¡Œï¼Œå…¶åŽä¸ºæ‚¬æŒ‚缩进的对照列表。
+ \keyval-{font}{符å·å­—体}\Default
+ 符å·çš„字体,数学和文本符å·æ¨¡å¼åº”采用ä¸åŒçš„字体命令,最åŽä¸€ä¸ªå‘½ä»¤å¯ä»¥æŽ¥å—一个å‚数,这个å‚数为符å·ã€‚
+ \keychoice{mode}{math,text}\Default{math}
+ 符å·å­—体模å¼ï¼Œå¯ä»¥ä¸ºæ•°å­¦å­—体或者文本字体。
\end{options}
\end{commands}
-\subsection{引用}
+\subsection{交å‰å¼•ç”¨}
\begin{commands}
- \command{ref}[\marg{标签}]
- 使用 \cs*{ref} 命令引用 \cs*{label} 设置的标签,将会检测临近计数器并添加相应的å‰ç¼€ï¼Œæ¯”如图表ã€ç« èŠ‚标题和定ç†ç­‰ã€‚
- \command{footref}[\marg{脚注标签}]
- \cs{footref} 对自动编å·çš„脚注进行引用,为上标形å¼ä¸Žè„šæ³¨æ ‡è®°ä¸€è‡´ã€‚
+ \command*{ref}[\marg{标签å}]
+ 使用 \cs*{ref} 命令引用 \cs*{label} 设置的 \meta{标签å},将会检测临近计数器并添加相应的å‰ç¼€ï¼Œæ¯”如图表ã€ç« èŠ‚标题和定ç†ç­‰ã€‚
+ \command{footref}[\marg{脚注标签å}]
+ 对自动编å·çš„脚注进行引用å¯ä½¿ç”¨ \cs{footref} 命令,与引用的标记共享一个编å·ä¸Žæ ¼å¼ã€‚
\command{labelformat}[\marg{计数器}\marg{标签引用格å¼}]
- \cs{labelformat} å¯ä»¥è®¾ç½®æ ‡ç­¾å¼•ç”¨æ ¼å¼ï¼Œç¬¬äºŒä¸ªå‚数中 \code{\#1} 代表 \cs*{the}\meta{计数器},å¯ä»¥è®¾ç½®å¼•ç”¨åºå·çš„å‰ç¼€å’ŒåŽç¼€ã€‚
+ 标签格å¼å‘½ä»¤ \cs{labelformat} å¯ä»¥è®¾ç½®å¼•ç”¨æ ‡ç­¾æ ¼å¼ï¼Œ\meta{标签引用格å¼} 中 \code{\#1} 代表 \cs*{the}\meta{计数器},å¯ä»¥è®¾ç½®å¼•ç”¨åºå·çš„å‰ç¼€å’ŒåŽç¼€ã€‚
\end{commands}
\subsubsection{索引}
@@ -1107,6 +1114,8 @@
命令 \cs{marginnote} å¯ä»¥ç”Ÿæˆç®€å•çš„边注,如果åªç»™å®šäº† \meta{å³æ–‡æœ¬},那么边注在奇å¶æ•°é¡µæ–‡å­—相åŒã€‚如果åŒæ—¶ç»™å®šäº† \meta{左文本},则å¶æ•°é¡µä½¿ç”¨ \meta{左文本} 的文字。
\end{commands}
+\appendix
+
\section{ä¾èµ–çš„å®åŒ…}
以下为 \pkg*{easybase} 直接调用的关键å®åŒ…,方括å·å†…为å®åŒ…已使用的选项。è“色的å®åŒ…表示截至当å‰åœ¨ \TeX~Live 2021 中存在更新,旧版本并ä¸å½±å“使用。带有 \ding{81} 符å·çš„å®åŒ…并未载入它们,仅åšäº†ä¸€äº›é¢„é…置,å¯åœ¨å¯¼è¨€åŒºæ‰‹åŠ¨è½½å…¥ä»¥å®žçŽ°ç›¸å…³çš„功能。
\begin{description}[font = \normalfont\sffamily]
diff --git a/macros/latex/contrib/elpres/README.md b/macros/latex/contrib/elpres/README.md
index d2538d778c..36346c4764 100644
--- a/macros/latex/contrib/elpres/README.md
+++ b/macros/latex/contrib/elpres/README.md
@@ -1,4 +1,4 @@
-Elpres v0.8 2021-02-20
+Elpres v0.8 2021-08-01
# Short description
@@ -18,15 +18,11 @@ For enhanced features the packages `ragged2e`, `overlays`, `wallpaper`,
A homepage for the elpres project: http://vkiefel.de/elpres.html with
additional material.
-# Changes in v0.8
+# Changes in v0.9
-* A bug fixed in the `elpres...scheme.sty` files (incorrect value for
- `\labelitemiv`)
-* Installation instructions in the manual completed
-* Detailed installation instructions added to this file (`README.md`).
-* Manual: a description of the new commands `\overlaysoff` and `\alertsoff`
- of the `overlays` package (introduced in version 2.12 of `overlays`)
- included
+* A new class option `bulletsymb` was added
+* A `TDS` archive file `elpres.tds.zip` for added for the upolad on `ctan.org`
+* Detailed installation instructions were updated in this file (`README.md`).
# Installation
@@ -52,8 +48,8 @@ following files:
ep-ball-04.eps,
ep-ball-05.eps
-(in short: `elpres.cls` and all `*.sty`, `*.png` and `*.eps` files) should
-be copied into a directory in the `.../tex/...`-branch of a `texmf`-tree
+(in short: `elpres.cls` and all `*.sty`, `*.png` and `*.eps` files) are
+copied into a directory in the `.../tex/...`-branch of a `texmf`-tree
like `../texmf/tex/latex/elpres`, where `texmf` may be `texmf-dist` or
`texmf-local` or an analogous directory.
@@ -64,18 +60,23 @@ The manual and the example file:
elpres-example.pdf,
elpres-example.tex
-should be copied into a directory of the `.../doc/...`-branch of a
+are to be copied into a directory of the `.../doc/...`-branch of a
`texmf`-tree like `../texmf/doc/latex/elpres`, where `texmf` may be
`texmf-dist` or `texmf-local` or an analogous directory. Finally the file
location database (e.g. `ls-R`) should be updated. More details can be found
in the manual.
+# Support
+
+The project web page is found on
+[http://vkiefel.de/elpres.html](http://vkiefel.de/elpres.html)
+
# License
This work may be distributed and/or modified under the conditions of the
LaTeX Project Public License (LPPL). The latest version of this license is
available in the file:
+[http://www.latex-project.org/lppl.txt](http://www.latex-project.org/lppl.txt)
- http://www.latex-project.org/lppl.txt
-Current maintainer is Volker Kiefel.
+Current maintainer of `elpres` is Volker Kiefel.
diff --git a/macros/latex/contrib/elpres/doc/elpres-example.pdf b/macros/latex/contrib/elpres/doc/elpres-example.pdf
index e822d13da0..bbd2597b3c 100644
--- a/macros/latex/contrib/elpres/doc/elpres-example.pdf
+++ b/macros/latex/contrib/elpres/doc/elpres-example.pdf
Binary files differ
diff --git a/macros/latex/contrib/elpres/doc/elpres-manual.pdf b/macros/latex/contrib/elpres/doc/elpres-manual.pdf
index 65f8c02150..8ff9be4792 100644
--- a/macros/latex/contrib/elpres/doc/elpres-manual.pdf
+++ b/macros/latex/contrib/elpres/doc/elpres-manual.pdf
Binary files differ
diff --git a/macros/latex/contrib/elpres/doc/elpres-manual.tex b/macros/latex/contrib/elpres/doc/elpres-manual.tex
index 1e25345afa..b4b00a808b 100644
--- a/macros/latex/contrib/elpres/doc/elpres-manual.tex
+++ b/macros/latex/contrib/elpres/doc/elpres-manual.tex
@@ -39,8 +39,8 @@
\title{\textsf{elpres} --- electronic presentations \\ with (pdf/Lua)\LaTeX}
\author{Volker Kiefel\thanks{volker dot kiefel at freenet dot de,
\url{http://vkiefel.de/elpres.html}}}
-\date{v0.8\\[1.8ex]
- February 28, 2021%
+\date{v0.9\\[1.8ex]
+ Ausgust 01, 2021%
% --- \textcolor{DarkGreen}{update of this manual:
% September 27, 2020}
}
@@ -175,7 +175,12 @@ is intended for use of \texttt{elpres} with Lua\LaTeX\
\index{Lualatex@Lua\LaTeX}
with its own font selection mechanisms.
Options for different screen aspect ratios: \texttt{4x3}
-(default), \texttt{16x9}, \texttt{16x10}. The option \texttt{navisymb}
+(default), \texttt{16x9}, \texttt{16x10}.
+\index{bulletsymb class option@\texttt{bulletsymb} class option}
+The option \texttt{bulletsymb} selects \verb+$\bullet$+ symbols
+instead of the default \texttt{itemize}-environment
+\verb+\item+ symbols in all four levels.
+The option \texttt{navisymb}
adds symbols for navigation to the presentation.
Options of the \texttt{article} class are also available for
\texttt{elpres} presentations,
@@ -1415,6 +1420,8 @@ been updated in section \ref{sec:Introduction} and detailed instructions were
added to \texttt{README.md}. Section \ref{sec:inact-overl-comm} was updated. A
bug in the \texttt{elpres...scheme.sty} files was fixed (incorrect value for
\verb+\labelitemiv+).
+\textbf{v0.9} (01.08.2021): New class option \texttt{bulletsymb} added, an
+archive \texttt{elpres.tds.zip} is added for \texttt{ctan.org} upload.
\printindex
diff --git a/macros/latex/contrib/elpres/tex/elpres.cls b/macros/latex/contrib/elpres/tex/elpres.cls
index 29f9df9a88..36aa7c7171 100644
--- a/macros/latex/contrib/elpres/tex/elpres.cls
+++ b/macros/latex/contrib/elpres/tex/elpres.cls
@@ -1,5 +1,5 @@
\NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{elpres}[2021/02/28 class for plain electronic presentations]
+\ProvidesClass{elpres}[2021/08/01 class for plain electronic presentations]
%
% 2004/06/19 v0.1 - initial version
%
@@ -32,7 +32,12 @@
%
% 2021/02/28 v0.8 - bug in elpres...scheme.sty files fixed, manual updated
%
+% 2021/08/01 v0.9 - new class option `bulletsymb' added, elpres.tds.zip
+% archive added to ctan.org upload
%
+%
+
+
% Options: select fonts
\newcommand{\fontna}{initialisiert}
\DeclareOption{nofonts}{%
@@ -70,13 +75,21 @@
\renewcommand{\screenformat}{scr16x10}%
}
-
% Option: navigation symbols
\newcommand{\navigation}{withoutnavigationsymb}
\DeclareOption{navisymb}{%
\renewcommand{\navigation}{withnavi}%
}
+% begin neu 1.8.21
+% Option: itemize symbols Option: select $\bullet$ instead of default
+% itemize symbols
+\newcommand{\itemize@elsymbols}{default@symbols}
+\DeclareOption{bulletsymb}{%
+ \renewcommand{\itemize@elsymbols}{bullet@symbols}%
+}
+% end neu 1.8.21
+
\DeclareOption*{\PassOptionsToClass{\CurrentOption}{article}}
\ProcessOptions\relax
\LoadClass{article}
@@ -223,6 +236,18 @@
\newcommand{\pagenrconst}{\addtocounter{page}{-1}}
+%% begin geaendert 1.8.21
+
+\ifthenelse{\equal{\itemize@elsymbols}{bullet@symbols}}{%
+\renewcommand{\labelitemi}{\large\ensuremath{\bullet}}%
+\renewcommand{\labelitemii}{\ensuremath{\bullet}}%
+\renewcommand{\labelitemiii}{\small\ensuremath{\bullet}}%
+\renewcommand{\labelitemiv}{\footnotesize\ensuremath{\bullet}}%
+}{}
+
+%% end geaendert 1.8.21
+
+
%% (External): Default colors for defined slide elements, they are modified in
%% style files -- these color names may be used externally by authors of
%% presentations
diff --git a/macros/latex/contrib/elpres/tex/elpresbluelightgrayscheme.sty b/macros/latex/contrib/elpres/tex/elpresbluelightgrayscheme.sty
index 719bcbd676..daac18a441 100644
--- a/macros/latex/contrib/elpres/tex/elpresbluelightgrayscheme.sty
+++ b/macros/latex/contrib/elpres/tex/elpresbluelightgrayscheme.sty
@@ -1,5 +1,5 @@
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{elpresbluelightgrayscheme}[2020/08/15 elpres layout scheme blue lightgray]
+\ProvidesPackage{elpresbluelightgrayscheme}[2021/08/01 elpres layout scheme blue lightgray]
\definecolor{epturquoise}{rgb}{0.1,0.83,0.8}
\definecolor{eplistheadcolor}{rgb}{0.75,0.8,1} % color for list heads
@@ -29,10 +29,22 @@
\definecolor{eptextcolor}{rgb}{0.7,0.7,0.75} % Ext: normal text color
\color{eptextcolor} % Ext: normal text color
-\renewcommand{\labelitemi}{\includegraphics[scale=0.06]{ep-ball-01}}
-\renewcommand{\labelitemii}{\includegraphics[scale=0.055]{ep-ball-01}}
-\renewcommand{\labelitemiii}{\includegraphics[scale=0.05]{ep-ball-01}}
-\renewcommand{\labelitemiv}{\includegraphics[scale=0.045]{ep-ball-01}}
+%% begin geaendert 1.8.21
+\ifthenelse{\equal{\itemize@elsymbols}{default@symbols}}{%
+\renewcommand{\labelitemi}{\includegraphics[scale=0.06]{ep-ball-01}}%
+\renewcommand{\labelitemii}{\includegraphics[scale=0.055]{ep-ball-01}}%
+\renewcommand{\labelitemiii}{\includegraphics[scale=0.05]{ep-ball-01}}%
+\renewcommand{\labelitemiv}{\includegraphics[scale=0.045]{ep-ball-01}}%
+}{}
+
+\ifthenelse{\equal{\itemize@elsymbols}{bullet@symbols}}{%
+\renewcommand{\labelitemi}{\large\textcolor{eplistheadcolor}{\ensuremath{\bullet}}}%
+\renewcommand{\labelitemii}{\textcolor{eplistheadcolor}{\ensuremath{\bullet}}}%
+\renewcommand{\labelitemiii}{\small\textcolor{eplistheadcolor}{\ensuremath{\bullet}}}%
+\renewcommand{\labelitemiv}{\footnotesize\textcolor{eplistheadcolor}{\ensuremath{\bullet}}}%
+}{}
+%% end geaendert 1.8.21
+
\renewcommand{\labelenumi}{\textcolor{eplistheadcolor}{\textbf{\theenumi.}}}
\renewcommand{\labelenumii}{\textcolor{eplistheadcolor}{\textbf{\theenumii.}}}
@@ -43,3 +55,5 @@
\textcolor{eplistheadcolor}{\textbf{#1}}}
\endinput
+
+% vim: syntax=tex tw=2048 ai
diff --git a/macros/latex/contrib/elpres/tex/elpresgrayscheme.sty b/macros/latex/contrib/elpres/tex/elpresgrayscheme.sty
index a33c41a7ab..42cf019183 100644
--- a/macros/latex/contrib/elpres/tex/elpresgrayscheme.sty
+++ b/macros/latex/contrib/elpres/tex/elpresgrayscheme.sty
@@ -1,5 +1,5 @@
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{elpresgrayscheme}[2020/08/15 elpres layout scheme gray]
+\ProvidesPackage{elpresgrayscheme}[2021/08/01 elpres layout scheme gray]
\definecolor{epgreen}{rgb}{0.11,0.34,0.3}
\definecolor{eplistheadcolor}{named}{epgreen} % color for list heads
@@ -28,11 +28,23 @@
\definecolor{eptextcolor}{rgb}{0.16,0.16,0.16} % Ext: normal text color
\color{eptextcolor} % Ext: normal text color
+%% begin geaendert 1.8.21
+\ifthenelse{\equal{\itemize@elsymbols}{default@symbols}}{%
+\renewcommand{\labelitemi}{\includegraphics[scale=0.06]{ep-ball-03}}%
+\renewcommand{\labelitemii}{\includegraphics[scale=0.055]{ep-ball-03}}%
+\renewcommand{\labelitemiii}{\includegraphics[scale=0.05]{ep-ball-03}}%
+\renewcommand{\labelitemiv}{\includegraphics[scale=0.045]{ep-ball-03}}%
+}{}
+
+\ifthenelse{\equal{\itemize@elsymbols}{bullet@symbols}}{%
+\renewcommand{\labelitemi}{\large\textcolor{eplistheadcolor}{\ensuremath{\bullet}}}%
+\renewcommand{\labelitemii}{\textcolor{eplistheadcolor}{\ensuremath{\bullet}}}%
+\renewcommand{\labelitemiii}{\small\textcolor{eplistheadcolor}{\ensuremath{\bullet}}}%
+\renewcommand{\labelitemiv}{\footnotesize\textcolor{eplistheadcolor}{\ensuremath{\bullet}}}%
+}{}
+%% end geaendert 1.8.21
+
-\renewcommand{\labelitemi}{\includegraphics[scale=0.065]{ep-ball-03}}
-\renewcommand{\labelitemii}{\includegraphics[scale=0.055]{ep-ball-03}}
-\renewcommand{\labelitemiii}{\includegraphics[scale=0.05]{ep-ball-03}}
-\renewcommand{\labelitemiv}{\includegraphics[scale=0.045]{ep-ball-03}}
\renewcommand{\labelenumi}{\textcolor{eplistheadcolor}{\textbf{\theenumi.}}}
\renewcommand{\labelenumii}{\textcolor{eplistheadcolor}{\textbf{\theenumii.}}}
@@ -43,3 +55,5 @@
\textcolor{epgreen}{\textbf{#1}}}
\endinput
+
+% vim: syntax=tex tw=2048 ai
diff --git a/macros/latex/contrib/elpres/tex/elpreswhitebluescheme.sty b/macros/latex/contrib/elpres/tex/elpreswhitebluescheme.sty
index 06449fd3d5..f469c2ebc9 100644
--- a/macros/latex/contrib/elpres/tex/elpreswhitebluescheme.sty
+++ b/macros/latex/contrib/elpres/tex/elpreswhitebluescheme.sty
@@ -1,5 +1,5 @@
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{elpreswhitebluescheme}[2020/08/15 elpres layout scheme white blue]
+\ProvidesPackage{elpreswhitebluescheme}[2021/08/01 elpres layout scheme white blue]
\definecolor{epdarkblue}{rgb}{0.12,0.09,0.65}
\definecolor{eplistheadcolor}{named}{epdarkblue} % color for list heads
@@ -29,10 +29,22 @@
\definecolor{eptextcolor}{rgb}{0.2,0.16,0.16} % Ext: normal text color
\color{eptextcolor} % Ext: normal text color
-\renewcommand{\labelitemi}{\includegraphics[scale=0.06]{ep-ball-05}}
-\renewcommand{\labelitemii}{\includegraphics[scale=0.055]{ep-ball-05}}
-\renewcommand{\labelitemiii}{\includegraphics[scale=0.05]{ep-ball-05}}
-\renewcommand{\labelitemiv}{\includegraphics[scale=0.045]{ep-ball-05}}
+%% begin geaendert 1.8.21
+\ifthenelse{\equal{\itemize@elsymbols}{default@symbols}}{%
+\renewcommand{\labelitemi}{\includegraphics[scale=0.06]{ep-ball-05}}%
+\renewcommand{\labelitemii}{\includegraphics[scale=0.055]{ep-ball-05}}%
+\renewcommand{\labelitemiii}{\includegraphics[scale=0.05]{ep-ball-05}}%
+\renewcommand{\labelitemiv}{\includegraphics[scale=0.045]{ep-ball-05}}%
+}{}
+
+\ifthenelse{\equal{\itemize@elsymbols}{bullet@symbols}}{%
+\renewcommand{\labelitemi}{\large\textcolor{eplistheadcolor}{\ensuremath{\bullet}}}%
+\renewcommand{\labelitemii}{\textcolor{eplistheadcolor}{\ensuremath{\bullet}}}%
+\renewcommand{\labelitemiii}{\small\textcolor{eplistheadcolor}{\ensuremath{\bullet}}}%
+\renewcommand{\labelitemiv}{\footnotesize\textcolor{eplistheadcolor}{\ensuremath{\bullet}}}%
+}{}
+%% end geaendert 1.8.21
+
\renewcommand{\labelenumi}{\textcolor{eplistheadcolor}{\textbf{\theenumi.}}}
\renewcommand{\labelenumii}{\textcolor{eplistheadcolor}{\textbf{\theenumii.}}}
@@ -46,3 +58,5 @@
\color{epverydarkblue}
\endinput
+
+% vim: syntax=tex tw=2048 ai
diff --git a/macros/latex/contrib/elpres/tex/elpreswhiteredscheme.sty b/macros/latex/contrib/elpres/tex/elpreswhiteredscheme.sty
index 1c7255e668..9860cec48b 100644
--- a/macros/latex/contrib/elpres/tex/elpreswhiteredscheme.sty
+++ b/macros/latex/contrib/elpres/tex/elpreswhiteredscheme.sty
@@ -1,5 +1,5 @@
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{elpreswhiteredscheme}[2020/08/15 elpres layout white red]
+\ProvidesPackage{elpreswhiteredscheme}[2021/08/01 elpres layout white red]
\definecolor{epdarkred}{rgb}{0.6,0.09,0.1}
\definecolor{eplistheadcolor}{named}{epdarkred} % color for list heads
@@ -29,10 +29,21 @@
\definecolor{eptextcolor}{rgb}{0.2,0.16,0.16} % Ext: normal text color
\color{eptextcolor} % Ext: normal text color
-\renewcommand{\labelitemi}{\includegraphics[scale=0.06]{ep-ball-02}}
-\renewcommand{\labelitemii}{\includegraphics[scale=0.055]{ep-ball-02}}
-\renewcommand{\labelitemiii}{\includegraphics[scale=0.05]{ep-ball-02}}
-\renewcommand{\labelitemiv}{\includegraphics[scale=0.045]{ep-ball-02}}
+%% begin geaendert 1.8.21
+\ifthenelse{\equal{\itemize@elsymbols}{default@symbols}}{%
+\renewcommand{\labelitemi}{\includegraphics[scale=0.06]{ep-ball-02}}%
+\renewcommand{\labelitemii}{\includegraphics[scale=0.055]{ep-ball-02}}%
+\renewcommand{\labelitemiii}{\includegraphics[scale=0.05]{ep-ball-02}}%
+\renewcommand{\labelitemiv}{\includegraphics[scale=0.045]{ep-ball-02}}%
+}{}
+
+\ifthenelse{\equal{\itemize@elsymbols}{bullet@symbols}}{%
+\renewcommand{\labelitemi}{\large\textcolor{eplistheadcolor}{\ensuremath{\bullet}}}%
+\renewcommand{\labelitemii}{\textcolor{eplistheadcolor}{\ensuremath{\bullet}}}%
+\renewcommand{\labelitemiii}{\small\textcolor{eplistheadcolor}{\ensuremath{\bullet}}}%
+\renewcommand{\labelitemiv}{\footnotesize\textcolor{eplistheadcolor}{\ensuremath{\bullet}}}%
+}{}
+%% end geaendert 1.8.21
\renewcommand{\labelenumi}{\textcolor{eplistheadcolor}{\textbf{\theenumi.}}}
\renewcommand{\labelenumii}{\textcolor{eplistheadcolor}{\textbf{\theenumii.}}}
@@ -46,3 +57,5 @@
\color{epverydarkred}
\endinput
+% vim: syntax=tex tw=2048 ai
+
diff --git a/macros/latex/contrib/elpres/tex/elpreswhitetealscheme.sty b/macros/latex/contrib/elpres/tex/elpreswhitetealscheme.sty
index ff71fb1935..9df8c25007 100644
--- a/macros/latex/contrib/elpres/tex/elpreswhitetealscheme.sty
+++ b/macros/latex/contrib/elpres/tex/elpreswhitetealscheme.sty
@@ -1,5 +1,5 @@
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{elpreswhitetealscheme}[2020/08/15 elpres layout scheme white teal]
+\ProvidesPackage{elpreswhitetealscheme}[2021/08/01 elpres layout scheme white teal]
\definecolor{epdarkteal}{rgb}{0.02,0.35,0.38}
\definecolor{eplistheadcolor}{named}{epdarkteal} % color for list heads
@@ -29,10 +29,22 @@
\definecolor{eptextcolor}{rgb}{0.2,0.16,0.16} % Ext: normal text color
\color{eptextcolor} % Ext: normal text color
-\renewcommand{\labelitemi}{\includegraphics[scale=0.06]{ep-ball-04}}
-\renewcommand{\labelitemii}{\includegraphics[scale=0.055]{ep-ball-04}}
-\renewcommand{\labelitemiii}{\includegraphics[scale=0.05]{ep-ball-04}}
-\renewcommand{\labelitemiv}{\includegraphics[scale=0.045]{ep-ball-04}}
+
+%% begin geaendert 1.8.21
+\ifthenelse{\equal{\itemize@elsymbols}{default@symbols}}{%
+\renewcommand{\labelitemi}{\includegraphics[scale=0.06]{ep-ball-04}}%
+\renewcommand{\labelitemii}{\includegraphics[scale=0.055]{ep-ball-04}}%
+\renewcommand{\labelitemiii}{\includegraphics[scale=0.05]{ep-ball-04}}%
+\renewcommand{\labelitemiv}{\includegraphics[scale=0.045]{ep-ball-04}}%
+}{}
+
+\ifthenelse{\equal{\itemize@elsymbols}{bullet@symbols}}{%
+\renewcommand{\labelitemi}{\large\textcolor{eplistheadcolor}{\ensuremath{\bullet}}}%
+\renewcommand{\labelitemii}{\textcolor{eplistheadcolor}{\ensuremath{\bullet}}}%
+\renewcommand{\labelitemiii}{\small\textcolor{eplistheadcolor}{\ensuremath{\bullet}}}%
+\renewcommand{\labelitemiv}{\footnotesize\textcolor{eplistheadcolor}{\ensuremath{\bullet}}}%
+}{}
+%% end geaendert 1.8.21
\renewcommand{\labelenumi}{\textcolor{eplistheadcolor}{\textbf{\theenumi.}}}
\renewcommand{\labelenumii}{\textcolor{eplistheadcolor}{\textbf{\theenumii.}}}
@@ -46,3 +58,6 @@
\color{epverydarkteal}
\endinput
+
+% vim: syntax=tex tw=2048 ai
+
diff --git a/macros/latex/contrib/iexec/README.md b/macros/latex/contrib/iexec/README.md
index 226069a29f..b147ac146c 100644
--- a/macros/latex/contrib/iexec/README.md
+++ b/macros/latex/contrib/iexec/README.md
@@ -13,7 +13,7 @@ and then use in the preamble:
\documentclass{article}
\usepackage{iexec}
\begin{document}
-Today is \iexec{date +\%e-\%b-\%Y}.
+Today is \iexec{date +\%e-\%b-\%Y | tr -d '\\n'}.
\end{document}
```
diff --git a/macros/latex/contrib/iexec/iexec.pdf b/macros/latex/contrib/iexec/iexec.pdf
index a47a9869fd..ad364b67de 100644
--- a/macros/latex/contrib/iexec/iexec.pdf
+++ b/macros/latex/contrib/iexec/iexec.pdf
Binary files differ
diff --git a/macros/latex/contrib/iexec/iexec.sty b/macros/latex/contrib/iexec/iexec.sty
index 34898e324c..2f8cd15bb0 100644
--- a/macros/latex/contrib/iexec/iexec.sty
+++ b/macros/latex/contrib/iexec/iexec.sty
@@ -21,7 +21,7 @@
% SOFTWARE.
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{iexec}[2021/07/12 0.3.1 Inputable Shell Executions]
+\ProvidesPackage{iexec}[2021/08/01 0.4.0 Inputable Shell Executions]
\RequirePackage{shellesc}
@@ -30,7 +30,10 @@
\DeclareOptionX{trace}{\tracetrue}
\ProcessOptionsX\relax
-\makeatletter\newcommand\iexec[2][iexec.tmp]{%
+\newcommand\iexec[2][iexec.tmp]{%
+ \ifnum\pdfshellescape=1\else
+ \PackageError{iexec}{You must run latex with --shell-escape option}{}
+ \fi
\begingroup%
\let\%\@percentchar%
\let\\\@backslashchar%
@@ -41,6 +44,6 @@
\endgroup%
\input{#1}%
\iftrace\else\ShellEscape{rm #1}\fi%
-}\makeatother
+}
\endinput
diff --git a/macros/latex/contrib/iexec/iexec.tex b/macros/latex/contrib/iexec/iexec.tex
index 098a297045..4929b99631 100644
--- a/macros/latex/contrib/iexec/iexec.tex
+++ b/macros/latex/contrib/iexec/iexec.tex
@@ -27,7 +27,7 @@
\usepackage{ffcode}
\title{\ff{iexec}: \LaTeX{} Package \\ for Inputable Shell Executions}
\author{Yegor Bugayenko}
-\date{0.3.1 2021/07/12}
+\date{0.4.0 2021/08/01}
\begin{document}
\pagenumbering{gobble}
\raggedbottom
diff --git a/macros/latex/contrib/scrambledenvs/README.md b/macros/latex/contrib/scrambledenvs/README.md
new file mode 100644
index 0000000000..cab73c508e
--- /dev/null
+++ b/macros/latex/contrib/scrambledenvs/README.md
@@ -0,0 +1,15 @@
+# The LaTeX package scrambledenvs - version 1.0.0 (2021/07/31)
+
+**scrambledenvs** allows you to arbitrarily create and print scrambled environments (like scrambled hints in a book) and customize the output.
+
+## Installation instructions
+
+A working TeX installation is required.
+
+This is a self-extracting dtx file, so run
+
+ pdflatex scrambledenvs.dtx
+
+to generate the README, documentation, and packages.
+
+
diff --git a/macros/latex/contrib/scrambledenvs/scrambledenvs.dtx b/macros/latex/contrib/scrambledenvs/scrambledenvs.dtx
new file mode 100644
index 0000000000..d83f1cfffd
--- /dev/null
+++ b/macros/latex/contrib/scrambledenvs/scrambledenvs.dtx
@@ -0,0 +1,472 @@
+% \iffalse meta-comment
+%
+% Copyright (C) 2021 Dennis Chen <proofprogram@gmail.com>
+%
+% This work may be distributed and/or modified under
+% the conditions the LaTeX Project Public License (LPPL),
+% either version 1.3 of this license or (at your option)
+% any later version. The latest version of this license
+% can be found in
+% http://www.latex-project.org/lppl.txt
+% and version 1.3 or later is part of all distributions of LaTeX
+% version 2005/12/01 or later.
+%
+%<*internal>
+\iffalse
+%</internal>
+%<*readme>
+# The LaTeX package scrambledenvs - version 1.0.0 (2021/07/31)
+
+**scrambledenvs** allows you to arbitrarily create and print scrambled environments (like scrambled hints in a book) and customize the output.
+
+## Installation instructions
+
+A working TeX installation is required.
+
+This is a self-extracting dtx file, so run
+
+ pdflatex scrambledenvs.dtx
+
+to generate the README, documentation, and packages.
+%</readme>
+% \fi
+
+% \iffalse
+
+%<*internal>
+\fi
+\def\nameofplainTeX{plain}
+\ifx\fmtname\nameofplainTeX\else
+ \expandafter\begingroup
+\fi
+%</internal>
+%<*install>
+
+\input docstrip.tex
+\keepsilent
+\askforoverwritefalse
+\preamble
+
+This is a generated file.
+
+Copyright (C) 2021 Dennis Chen <proofprogram@gmail.com>
+
+This work may be distributed and/or modified under
+the conditions the LaTeX Project Public License (LPPL),
+either version 1.3 of this license or (at your option)
+any later version. The latest version of this license
+can be found in
+
+ http://www.latex-project.org/lppl.txt
+
+and version 1.3 or later is part of all distributions of LaTeX
+version 2005/12/01 or later.
+
+To produce the documentation, run palette.dtx through pdflatex.
+
+\endpreamble
+\postamble
+
+This package consists of the file scrambledenvs.dtx,
+ and the generated files scrambledenvs.sty,
+ scrambledenvs.pdf.
+\endpostamble
+
+\usedir{tex/latex/scrambledenvs}
+\generate{
+ \file{scrambledenvs.sty}{\from{\jobname.dtx}{main}\from{\jobname.dtx}{helper}}
+}
+
+\obeyspaces
+\Msg{*************************************************************}
+\Msg{* *}
+\Msg{* To finish the installation you have to move the following *}
+\Msg{* files into a directory searched by TeX: *}
+\Msg{* *}
+\Msg{* scrambledenvs.sty *}
+\Msg{* *}
+\Msg{* To produce the documentation, run the file *}
+\Msg{* scrambledenvs.dtx through LaTeX. *}
+\Msg{* *}
+\Msg{* Happy TeXing! *}
+\Msg{* *}
+\Msg{*************************************************************}
+
+%</install>
+%<install>\endbatchfile
+%<*internal>
+
+\usedir{source/latex/scrambledenvs}
+\generate{
+ \file{\jobname.ins}{\from{\jobname.dtx}{install}}
+}
+\nopreamble\nopostamble
+
+\usedir{doc/latex/scrambledenvs}
+\generate{
+ \file{README.md}{\from{\jobname.dtx}{readme}}
+}
+
+\ifx\fmtname\nameofplainTeX
+ \expandafter\endbatchfile
+\else
+ \expandafter\endgroup
+\fi
+%</internal>
+%<*main>
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesPackage{scrambledenvs}[2021/07/31 v1.0.0 Create and print scrambled environments]
+\RequirePackage{forloop}
+\RequirePackage{pgfmath}
+\pgfmathsetseed{2407}
+%</main>
+%<*driver>
+\ProvidesFile{\jobname.dtx}[2021/07/31 v1.0.0 Create and print scrambled environments]
+\documentclass{ltxdoc}
+
+\EnableCrossrefs
+\CodelineIndex
+\RecordChanges
+
+\begin{document}
+ \DocInput{\jobname.dtx}
+ \PrintIndex
+ \PrintChanges
+\end{document}
+%</driver>
+% \fi
+% \GetFileInfo{\jobname.dtx}
+% \changes{v1.0.0}{2021/07/31}{Initial version}
+%
+% \renewcommand{\emph}[1]{\textbf{#1}}
+%
+% \title{\textsf{scrambledenvs} -- Create and print scrambled environments}
+% \author{Dennis Chen \\ proofprogram@gmail.com}
+% \date{\fileversion{} (\filedate)}
+%
+% \maketitle
+%
+% \begin{abstract}
+% The \textsf{scrambledenvs} package allows you to create scrambled environments and print them out later, such as scrambled hints or solutions.
+% \end{abstract}
+%
+% \section{Overview}
+%
+% This package was designed to mark hints at a location\footnote{It can generalize beyond hints, but I thought it best to start off with a specific example..} and print them out later in a random order.\footnote{Though you do have the ability to make the order not random: pass in |noscramble| to the package.}
+%
+% There is an outer environment which typesets the label. Inside it you should place the inner environment \emph{and only the inner environment}. Inside this inner environment, you write the contents of your hint. This will typeset the hint number. Finally, you may print the hints at some later location in a randomized order.
+%
+% \section{Usage}
+%
+% If you want your solutions to be scrambled, call
+% \begin{verbatim}
+%\usepackage{scrambledenvs}
+% \end{verbatim}
+%
+% If you want to disable all scrambling for any reason, call
+% \begin{verbatim}
+%\usepackage[noscramble]{scrambledenvs}
+% \end{verbatim}
+% \iffalse
+%<*main>
+\newif\ifscrambledenvs@scramble\scrambledenvs@scrambletrue
+\DeclareOption{noscramble}{\scrambledenvs@scramblefalse}
+\ProcessOptions\relax
+%</main>
+% \fi
+%
+% \DescribeMacro{\newscrambledenv}
+% In order to create a new scrambled environment, one should call |\newscrambledenv{envname}|. This requires that the macros |\envname| and |\envname|s be undefined, as well as the counters \textsf{envname}count and \textsf{envname}tempcount be undefined, as |\newscrambledenv| will define these.
+%
+% This defines the environments |`envname`s| and |`envname`|, and the macro |\print`envname`|, where |`envname'| denotes the value passed in to |\newscrambledenv|. Because this will get confusing fast, we will just assume that |`envname'| is |hint|, since this generalizes quite easily.
+%
+% Thus in this example, the environments |hints| and |hint| are defined, and the macro |\printhint| is defined.
+%
+% If any of these macros or counters are defined, the package will throw a custom error.
+%
+% ^^A At the start, surround everything in newscrambledenv (since everything in main goes there)
+% \iffalse
+%<*main>
+\newcommand\newscrambledenv[1]{
+ \scrambledenvs@check@macrodefined{print#1}
+ \scrambledenvs@check@envdefined{#1s}
+ \scrambledenvs@check@envdefined{#1}
+ \newcounter{scrambledenvs@#1@count}
+ \newcounter{scrambledenvs@#1@tempcount}
+%</main>
+%<*helper>
+\newcommand\scrambledenvs@check@macrodefined[1]{%
+ \ifcsname #1\endcsname
+ \PackageError{scrambledenvs}{The macro \@backslashchar #1\space cannot be defined,\MessageBreak
+ as the macro \@backslashchar #1 is already defined}{Remove any packages that define \@backslashchar #1,\MessageBreak
+ or choose a different name for your scrambled environment.}%
+ \fi
+}
+\newcommand\scrambledenvs@check@envdefined[1]{%
+ \ifcsname #1\endcsname
+ \PackageError{scrambledenvs}{The environment `#1' cannot be defined,\MessageBreak
+ as the macro \@backslashchar #1 is already defined}{Remove any packages that define `#1',\MessageBreak
+ or choose a different name for your scrambled environment.}%
+ \fi
+}
+%</helper>
+% \fi
+% \DescribeEnv{hints}
+% This is the outer environment. Depending on how many |hint| environments are put inside it, it will either typeset \emph{Hints:} or \emph{Hint:} with the numerical labels of the passed in hints following it.
+% You should put in nothing but the inner environment |hint|. (See the examples for a correct usage.)
+% \iffalse
+%<*helper>
+\def\scrambledenvs@active{}
+%</helper>
+%<*main>
+\newenvironment{#1s}{%
+ \setcounter{scrambledenvs@#1@tempcount}{0}%
+ \def\scrambledenvs@active{#1}%
+ \unskip\ignorespaces%
+}
+{
+\ifnum\value{scrambledenvs@#1@tempcount}=0\relax
+\else
+ \ifnum\value{scrambledenvs@#1@tempcount}=1\relax
+ {\csname scrambledenvs@#1@labelfont\endcsname\csname scrambledenvs@#1@label\endcsname :}
+ {\csname scrambledenvs@#1@reffont\endcsname\ref{#1:\value{scrambledenvs@#1@count}}}%
+ \else
+ {\csname scrambledenvs@#1@labelfont\endcsname\csname scrambledenvs@#1@label\endcsname s:}%
+ \forloop{scrambledenvs@loopcount}{\the\numexpr\value{scrambledenvs@#1@count}-\value{scrambledenvs@#1@tempcount}+1\relax}{\value{scrambledenvs@loopcount}<\the\numexpr\value{scrambledenvs@#1@count}+1\relax} {
+ {\csname scrambledenvs@#1@reffont\endcsname\ref{#1:\thescrambledenvs@loopcount}}%
+ }
+ \fi
+\fi
+\setcounter{scrambledenvs@#1@tempcount}{0}%
+}
+%</main>
+% \fi
+%
+% \DescribeEnv{hint}
+% This is the inner environment. The inner environment |hint| \emph{must} be inside the outer environment |hints|.
+% \iffalse
+%<*main>
+\newenvironment{#1}{%
+ \stepcounter{scrambledenvs@#1@tempcount}%
+ \stepcounter{scrambledenvs@#1@count}%
+ \ifnum\pdfstrcmp{#1}{\scrambledenvs@active}=0\relax
+ \else
+ \PackageError{scrambledenvs}{The inner environment `#1' must be inside the outer environment `#1s'}{}
+ \fi
+ \unskip%
+ \filecontents[overwrite]{\jobname-\the\value{scrambledenvs@#1@count}.#1}%
+}
+{%
+ \endfilecontents
+}
+%</main>
+% \fi
+%
+% \DescribeMacro{\printhint}
+%
+% To print out the hints (either in a random or fixed order, depending on whether the option |noscramble| is passed in), just write |\printhint|.
+%
+% \iffalse
+%<*helper>
+\newcounter{scrambledenvs@loopcount}
+\newcounter{scrambledenvs@innerloopcount}
+%</helper>
+%<*main>
+\expandafter\newcommand\csname print#1\endcsname{%
+ \ifscrambledenvs@scramble %\if
+ \ifcsname thescrambledenvs@#1@count\endcsname
+ \ifnum\value{scrambledenvs@#1@count}>0\relax
+ \expandafter\edef\csname pgfmath@randomlist@#1\endcsname{\value{scrambledenvs@#1@count}}%
+ \forloop{scrambledenvs@loopcount}{1}{\value{scrambledenvs@loopcount}<\the\numexpr\value{scrambledenvs@#1@count}+1\relax}{\expandafter\edef\csname pgfmath@randomlist@#1@\thescrambledenvs@loopcount\endcsname{\thescrambledenvs@loopcount}}%
+ \begin{scrambledenvs@#1@printenv}%
+ \forloop{scrambledenvs@loopcount}{0}{\value{scrambledenvs@loopcount}<\value{scrambledenvs@#1@count}}{%
+ \pgfmathrandomitem\scrambledenvs@tempindex{#1}%
+ \csname scrambledenvs@#1@printitem\endcsname\label{#1:\scrambledenvs@tempindex}%
+ \input{\jobname-\scrambledenvs@tempindex.#1}%
+ \forloop{scrambledenvs@innerloopcount}{\scrambledenvs@tempindex}{\value{scrambledenvs@innerloopcount}<\csname pgfmath@randomlist@#1\endcsname}{%
+ \global\expandafter\let\csname pgfmath@randomlist@#1@\thescrambledenvs@innerloopcount\expandafter\endcsname\csname pgfmath@randomlist@#1@\the\numexpr\thescrambledenvs@innerloopcount+1\relax\endcsname%
+ }%
+ \expandafter\xdef\csname pgfmath@randomlist@#1\endcsname{\the\numexpr\csname pgfmath@randomlist@#1\endcsname-1\relax}%
+ }%
+ \end{scrambledenvs@#1@printenv}
+ \fi
+ \fi
+ \else
+ \ifcsname thescrambledenvs@#1@count\endcsname
+ \ifnum\value{scrambledenvs@#1@count}>0\relax
+ \begin{scrambledenvs@#1@printenv}%
+ \forloop{scrambledenvs@loopcount}{1}{\value{scrambledenvs@loopcount}<\the\numexpr\value{scrambledenvs@#1@count}+1\relax}{\csname scrambledenvs@#1@printitem\endcsname\label{#1:\thescrambledenvs@loopcount}\input{\jobname-\thescrambledenvs@loopcount.#1}}%
+ \end{scrambledenvs@#1@printenv}
+ \fi
+ \fi
+ \fi
+}
+%</main>
+% \fi
+%
+% \subsection{Formatting}
+%
+% There are five pieces of configurable formatting. They are roughly ordered by the order they would appear in a document.
+%
+% \DescribeMacro{\hintlabel}
+% First is the label ``Hint(s)'' which gets printed by the outer environment |hints|. Capitalization and singular/plural form is automatically taken care of. To change it, write |\hintlabel{new label}| to get ``New label(s)'' as the new label.
+%
+% By default the label is the environment name capitalized. This may be useful if your environment names are shortened: for instance, you could change the label of |solu| to ``Solution(s)'' instead.
+%
+% \iffalse
+%<*main>
+\expandafter\def\csname scrambledenvs@#1@label\endcsname{\MakeUppercase #1}
+\scrambledenvs@check@macrodefined{#1label}
+\expandafter\newcommand\csname #1label\endcsname[1]{\expandafter\def\csname scrambledenvs@#1@label\endcsname{\MakeUppercase ##1}}
+%</main>
+% \fi
+%
+% \DescribeMacro{\hintlabelfont}
+% Second is the font of the label. To change it, write |\hintlabelfont{new label font}| to apply the new font. By default the font applied is |\bfseries|.
+%
+% Because this macro only takes in one argument, it is advisable to use |\bfseries| instead of |\textbf|, for instance.
+%
+% \iffalse
+%<*main>
+\expandafter\def\csname scrambledenvs@#1@labelfont\endcsname{\scrambledenvs@labelfont}
+\scrambledenvs@check@macrodefined{#1labelfont}
+\expandafter\newcommand\csname #1labelfont\endcsname[1]{\expandafter\def\csname scrambledenvs@#1@labelfont\endcsname{##1}}
+%</main>
+% \fi
+%
+% \DescribeMacro{\hintreffont}
+% Sets the font of the numerical references the follows the label.
+%
+% If you are using hyperref and you are using the |colorlinks| option: because the references are generated with |\ref|, you must change hyperref colors in order to change the color. |\color| will not work. Otherwise |\color| will work.
+%
+% \iffalse
+%<*main>
+\expandafter\def\csname scrambledenvs@#1@reffont\endcsname{\scrambledenvs@reffont}
+\scrambledenvs@check@macrodefined{#1reffont}
+\expandafter\newcommand\csname #1reffont\endcsname[1]{\expandafter\def\csname scrambledenvs@#1@reffont\endcsname{##1}}
+%</main>
+% \fi
+%
+% \DescribeMacro{\hintprintenv}
+% When the randomized hints are printed at the end, the actual printed contents are wrapped around an environment. By default the beginning of the environment is |\begin{enumerate}| and the end is |\end{enumerate}|.
+%
+% To change these, write |\hintprintenv{new env beginning}{new env ending}|.
+%
+% \iffalse
+%<*main>
+\newenvironment{scrambledenvs@#1@printenv}{\begin{scrambledenvs@printenv}}{\end{scrambledenvs@printenv}}
+\scrambledenvs@check@envdefined{#1printenv}
+\expandafter\newcommand\csname #1printenv\endcsname[2]{\renewenvironment{scrambledenvs@#1@printenv}{##1}{##2}}
+%</main>
+% \fi
+%
+% \DescribeMacro{\hintprintitem}
+% Each item of the randomized hints is printed with |\hintprintitem| at the beginning. By default it is |\item|.
+%
+% The way this is defined also allows for changing the font of the output. So if you want to bold the hint text, you could write |\hintprintitem{\bfseries\item}|.
+% \iffalse
+%<*main>
+\expandafter\def\csname scrambledenvs@#1@printitem\endcsname{\scrambledenvs@printitem}
+\scrambledenvs@check@macrodefined{#1printitem}
+\expandafter\newcommand\csname #1printitem\endcsname[1]{\expandafter\def\csname scrambledenvs@#1@printitem\endcsname{##1}}
+%</main>
+% \fi
+%
+% You may also change the defaults of all these pieces \emph{except the label} with the following macros. (The names of these macros make it impossible to pass in |\newscrambledenv{default}|, but there is no reason to do such a thing anyway.)
+%
+% If, at any point, you change the defaults, \emph{all} fonts/formats that have not been custom-set will be changed, including those of previously defined scrambled environments.
+%
+% Usage is identical to configuring formatting for specific scrambled environments.
+%
+% \DescribeMacro{\defaultlabelfont}
+% Changes the default label font.
+% \iffalse
+%<*helper>
+\def\scrambledenvs@labelfont{\bfseries}
+\def\defaultlabelfont#1{\def\scrambledenvs@lineformat{#1}}
+%</helper>
+% \fi
+%
+% \DescribeMacro{\defaultreffont}
+% Changes the default reference font.
+% \iffalse
+%<*helper>
+\def\scrambledenvs@reffont{}
+\def\defaultreffont#1{\def\scrambledenvs@reffont{#1}}
+%</helper>
+% \fi
+%
+% \DescribeMacro{\defaultprintenv}
+% Changes the default print environment.
+% \iffalse
+%<*helper>
+\newenvironment{scrambledenvs@printenv}{\begin{enumerate}}{\end{enumerate}}
+\def\defaultprintenv#1#2{\renewenvironment{scrambledenvs@printenv}{#1}{#2}}
+%</helper>
+%\fi
+%
+% \DescribeMacro{\defaultprintitem}
+% Changes the formatting of the default print item.
+% \iffalse
+%<*helper>
+\def\scrambledenvs@printitem{\item}
+\def\defaultprintitem#1{\def\scrambledenvs@printitem{#1}}
+%</helper>
+% \fi
+%
+% \section{Examples}
+% In all of the examples, we use |hint| as our generic scrambled environment.
+% \subsection{A barebones example}
+%\begin{verbatim}
+%\documentclass{article}
+%\usepackage{scrambledenvs}
+%\newscrambledenv{hint}
+%
+%\begin{document}
+%This is a really hard problem, so we provide hints.\begin{hints}
+%\begin{addhint}
+%This is a helpful hint.
+%\end{addhint}
+%\begin{addhint}
+%And another one!
+%\end{addhint}
+%\end{hints}
+%
+%\section{Hints printed}
+%
+%\printhint
+%
+%\end{document}
+%\end{verbatim}
+% \subsection{Changing hint formatting}
+% Changing default formatting is identical, except there is no way to change the label. (We do not include the document body since we have already shown how that works.)
+%\begin{verbatim}
+%\documentclass{article}
+%\usepackage{scrambledenvs}
+%\usepackage{xcolor}
+%\newscrambledenv{hint}
+%\hintlabel{tip}
+%\hintlabelfont{\textit}
+%\hintreffont{\color{blue}\bfseries}
+%\hintprintenv{\begin{enumerate}\small}{\end{enumerate}}
+%\hintprintitem{\bfseries\item}
+%\end{verbatim}
+% \subsection{Changing hintreffont color: hpyerrefs colorlink}
+% Since we are using |\ref| to typeset labels (which are set with |\label|), if we use |colorlinks| from package |hyperref| we must locally change the linkcolor in order to change the color the numbers are typeset in.
+%\begin{verbatim}
+%\documentclass{article}
+%\usepackage{scrambledenvs}
+%\usepackage{xcolor}
+%\usepackage{hyperref}
+%\hypersetup{colorlinks}
+%\newscrambledenv{hint}
+%\hintreffont{\hypersetup{linkcolor=blue}}
+%\end{verbatim}
+% ^^A At the end, close brace
+%\iffalse
+%<*main>
+}
+%</main>
+%\fi
+% \Finale
+\endinput \ No newline at end of file
diff --git a/macros/latex/contrib/scrambledenvs/scrambledenvs.pdf b/macros/latex/contrib/scrambledenvs/scrambledenvs.pdf
new file mode 100644
index 0000000000..079d211a9f
--- /dev/null
+++ b/macros/latex/contrib/scrambledenvs/scrambledenvs.pdf
Binary files differ
diff --git a/macros/latex/contrib/tabularray/tabularray.pdf b/macros/latex/contrib/tabularray/tabularray.pdf
index ba8b283884..c7b3de29ca 100644
--- a/macros/latex/contrib/tabularray/tabularray.pdf
+++ b/macros/latex/contrib/tabularray/tabularray.pdf
Binary files differ
diff --git a/macros/latex/contrib/tabularray/tabularray.sty b/macros/latex/contrib/tabularray/tabularray.sty
index 0a12e61ba5..4717992539 100644
--- a/macros/latex/contrib/tabularray/tabularray.sty
+++ b/macros/latex/contrib/tabularray/tabularray.sty
@@ -12,7 +12,7 @@
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\ProvidesExplPackage{tabularray}{2021-07-01}{2021L}
+\ProvidesExplPackage{tabularray}{2021-08-01}{2021M}
{Typeset tabulars and arrays with LaTeX3}
\RequirePackage{xparse}
@@ -359,6 +359,7 @@
\__tblr_data_new_key:nnn { row } { @row-foot } { dim }
\__tblr_data_new_key:nnn { row } { @row-upper } { dim }
\__tblr_data_new_key:nnn { row } { @row-lower } { dim }
+\__tblr_data_new_key:nnn { row } { break } { int }
\int_new:N \g__tblr_data_column_key_count_int
\__tblr_data_new_key:nnn { column } { width } { dim }
@@ -858,12 +859,30 @@
}
}
+\tl_new:N \l__tblr_child_from_tl
+\tl_new:N \l__tblr_child_to_tl
+
\cs_new_protected_nopar:Npn \__tblr_get_childs_normal_aux:w #1 - #2 \scan_stop
{
- \int_step_inline:nnn {#1} {#2}
+ \__tblr_child_name_to_index:nN {#1} \l__tblr_child_from_tl
+ \__tblr_child_name_to_index:nN {#2} \l__tblr_child_to_tl
+ \int_step_inline:nnn { \l__tblr_child_from_tl } { \l__tblr_child_to_tl }
{ \clist_put_right:Nn \l_tblr_childs_clist {##1} }
}
+\regex_const:Nn \c__tblr_child_name_regex { ^ [X-Z] $ }
+
+%% Convert X, Y, Z to the indexes of the last three childs, respectively
+\cs_new_protected_nopar:Npn \__tblr_child_name_to_index:nN #1 #2
+ {
+ \regex_match:NnTF \c__tblr_child_name_regex {#1}
+ {
+ \tl_set:Nx #2
+ { \int_eval:n { \l_tblr_childs_total_tl + \int_from_alph:n {#1} - 26 } }
+ }
+ { \tl_set:Nx #2 { #1 } }
+ }
+
%%% --------------------------------------------------------
%% \section{New Table Commands}
%%% --------------------------------------------------------
@@ -929,6 +948,20 @@
\int_set:Nn \c@colnum {#2}
}
+%% Table commands are defined only inside tblr environments,
+%% but some packages such as csvsimple need to use them outside tblr environments,
+%% therefore we define some of them first here.
+\ProvideDocumentCommand \SetHlines { o m m } {}
+\ProvideDocumentCommand \SetHline { o m m } {}
+\ProvideDocumentCommand \SetVlines { o m m } {}
+\ProvideDocumentCommand \SetVline { o m m } {}
+\ProvideDocumentCommand \SetCells { o m } {}
+\ProvideDocumentCommand \SetCell { o m } {}
+\ProvideDocumentCommand \SetRows { o m } {}
+\ProvideDocumentCommand \SetRow { o m } {}
+\ProvideDocumentCommand \SetColumns { o m } {}
+\ProvideDocumentCommand \SetColumn { o m } {}
+
%%% --------------------------------------------------------
%%> \section{New Content Commands}
%%% --------------------------------------------------------
@@ -1958,8 +1991,9 @@
abovesep+ .code:n = \__tblr_row_gadd_dimen:ne { abovesep } { \dim_eval:n {#1} },
belowsep+ .code:n = \__tblr_row_gadd_dimen:ne { belowsep } { \dim_eval:n {#1} },
rowsep+ .meta:n = { abovesep+ = #1, belowsep+ = #1},
- nobreak .code:n = \__tblr_prop_gput:nxx { row }
- { [\int_eval:n {\c@rownum - 1}] / nobreak } { true },
+ break .code:n = \__tblr_row_gput:nn { break } {#1},
+ pagebreak .meta:n = { break = 1 },
+ nopagebreak .meta:n = { break = -1 },
unknown .code:n = \__tblr_row_unknown_key:V \l_keys_key_str,
}
@@ -2028,6 +2062,16 @@
}
\cs_generate_variant:Nn \__tblr_row_unknown_key:n { V }
+\NewTableCommand \pagebreak
+ {
+ \tblr_set_row:nn {} { break = 1 }
+ }
+
+\NewTableCommand \nopagebreak
+ {
+ \tblr_set_row:nn {} { break = -1 }
+ }
+
%%% --------------------------------------------------------
%% \section{Column Types and Row Types}
%%% --------------------------------------------------------
@@ -2357,6 +2401,8 @@
\NewTblrEnviron { tblr }
\NewTblrEnviron { longtblr }
\SetTblrOuter [ longtblr ] { long }
+\NewTblrEnviron { talltblr }
+\SetTblrOuter [ talltblr ] { tall }
\tl_new:N \l__tblr_env_name_tl
\bool_new:N \l__tblr_math_mode_bool
@@ -2378,16 +2424,16 @@
\int_gincr:N \g_tblr_level_int
\__tblr_clear_prop_lists:
\__tblr_clear_spec_lists:
- \__tblr_enable_table_commands:
- \LogTblrTracing { step = split ~ table}
- \__tblr_split_table:n {#3}
- \LogTblrTracing { command }
\LogTblrTracing { step = init ~ table ~ outer ~ spec}
\__tblr_init_table_outer_spec:
- \LogTblrTracing { outer }
\LogTblrTracing { step = parse ~ table ~ options }
\__tblr_parse_table_option:n {#1}
+ \LogTblrTracing { outer }
\LogTblrTracing { option }
+ \__tblr_enable_table_commands:
+ \LogTblrTracing { step = split ~ table}
+ \__tblr_split_table:n {#3}
+ \LogTblrTracing { command }
\bool_if:NT \g__tblr_use_intarray_bool { \__tblr_init_table_data: }
\LogTblrTracing { step = init ~ table ~ inner ~ spec}
\__tblr_init_table_inner_spec:
@@ -2439,35 +2485,54 @@
\regex_replace_all:NVN \c__tblr_remove_braces_regex \c__tblr_remove_braces_tl #1
}
-%% Split table content to cells and store them
-%% #1: table content
+\tl_new:N \l__tblr_body_tl
+\tl_new:N \l__tblr_expand_tl
+\seq_new:N \l__tblr_lines_seq
-\seq_new:N \l_tblr_lines_seq
+%% Expand every occurrence of the specified macro once
+%% #1: table content; #2: macro to be expanded
+\cs_new_protected:Npn \__tblr_expand_table_body:nN #1 #2
+ {
+ \tl_clear:N \l__tblr_body_tl
+ \cs_set_protected:Npn \__tblr_expand_table_body_aux:w ##1 #2
+ {
+ \tl_put_right:Nn \l__tblr_body_tl {##1}
+ \peek_meaning:NTF \q_stop
+ { \use_none:n }
+ { \exp_last_unbraced:NV \__tblr_expand_table_body_aux:w #2 }
+ }
+ \__tblr_expand_table_body_aux:w #1 #2 \q_stop
+ }
+%% Split table content to cells and store them
+%% #1: table content
\cs_new_protected:Npn \__tblr_split_table:n #1
{
+ \tl_set:Nx \l__tblr_expand_tl { \__tblr_spec_item:nn { outer } { expand } }
+ \tl_set:Nx \l__tblr_expand_tl { \tl_head:N \l__tblr_expand_tl }
+ \tl_if_empty:NTF \l__tblr_expand_tl
+ { \tl_set:Nn \l__tblr_body_tl {#1} }
+ { \exp_args:NnV \__tblr_expand_table_body:nN {#1} \l__tblr_expand_tl }
\int_zero:N \c@rowcount
\int_zero:N \c@colcount
- \__tblr_split_table_to_lines:nN { #1 } \l_tblr_lines_seq
- \__tblr_split_lines_to_cells:N \l_tblr_lines_seq
+ \__tblr_split_table_to_lines:NN \l__tblr_body_tl \l__tblr_lines_seq
+ \__tblr_split_lines_to_cells:N \l__tblr_lines_seq
}
%% Split table content to a sequence of lines
-%% #1: table content, #2: resulting sequence of lines
-\cs_new_protected:Npn \__tblr_split_table_to_lines:nN #1 #2
+%% #1: tl with table contents, #2: resulting sequence of lines
+\cs_new_protected:Npn \__tblr_split_table_to_lines:NN #1 #2
{
- \tl_set:Nn \l_tmpa_tl { #1 }
- \__tblr_insert_braces:N \l_tmpa_tl
- \seq_set_split:NnV \l_tmpa_seq { \\ } \l_tmpa_tl
+ \__tblr_insert_braces:N #1
+ \seq_set_split:NnV \l_tmpa_seq { \\ } #1
\seq_clear:N #2
\seq_map_inline:Nn \l_tmpa_seq
{
\tl_if_head_eq_meaning:nNTF {##1} *
{
- \tl_set:Nn \l__tblr_b_tl { \SetRow{nobreak} }
+ \tl_set:Nn \l__tblr_b_tl { \SetRow { break = -1 } }
\tl_set:Nx \l__tblr_c_tl { \tl_tail:n {##1} }
\tl_trim_spaces:N \l__tblr_c_tl %% Ignore spaces between * and [dimen]
- \tl_log:N \l__tblr_c_tl
\tl_if_head_eq_meaning:VNT \l__tblr_c_tl [
{
\tl_put_right:Nn \l__tblr_b_tl { \RowBefore@AddBelowSep }
@@ -2699,6 +2764,8 @@
@vline-count = 0,
}
+\tl_new:N \l__tblr_inner_spec_verb_tl
+
\cs_new_protected:Npn \__tblr_init_table_inner_spec:
{
\prop_map_inline:Nn \g__tblr_initial_table_prop
@@ -2745,6 +2812,7 @@
\__tblr_spec_gput:nen { vline }
{ [\int_eval:n { \c@colcount + 1}] / ##1 } {##2}
}
+ \tl_clear:N \l__tblr_inner_spec_verb_tl
\keys_set:nv { tblr } { l__tblr_default_ \l__tblr_env_name_tl _inner_tl }
}
@@ -2755,7 +2823,7 @@
\clist_new:N \g__tblr_table_known_keys_clist
\clist_gset:Nn \g__tblr_table_known_keys_clist
{
- colspec, rowspec, width, hspan, vspan, stretch,
+ colspec, rowspec, width, hspan, vspan, stretch, verb,
column, row, cell, vline, hline, columns, rows, cells, vlines, hlines,
leftsep, rightsep, colsep, abovesep, belowsep, rowsep, rulesep,
rowhead, rowfoot,
@@ -2769,6 +2837,8 @@
hspan .code:n = \__tblr_keys_gput:nn { hspan } {#1},
vspan .code:n = \__tblr_keys_gput:nn { vspan } {#1},
stretch .code:n = \__tblr_keys_gput:nn { stretch } {#1},
+ verb .tl_set:N = \l__tblr_inner_spec_verb_tl,
+ verb .default:n = lite,
columns .code:n = \__tblr_set_every_column_aux:n {#1},
rows .code:n = \__tblr_set_every_row_aux:n {#1},
cells .code:n = \__tblr_set_every_cell_aux:n {#1},
@@ -2851,7 +2921,8 @@
\keys_define:nn { tblr-outer }
{
- long .code:n = \__tblr_outer_gput_spec:nn { long } {true},
+ long .code:n = \__tblr_outer_gput_spec:nn { long } { true },
+ tall .code:n = \__tblr_outer_gput_spec:nn { tall } { true },
halign .code:n = \__tblr_outer_gput_spec:nn { halign } {#1},
valign .code:n = \__tblr_outer_gput_spec:nn { valign } {#1},
l .meta:n = { halign = l },
@@ -2860,6 +2931,7 @@
t .meta:n = { valign = t },
m .meta:n = { valign = m },
b .meta:n = { valign = b },
+ expand .code:n = \__tblr_outer_gput_spec:nn { expand } {#1},
headsep .code:n = \__tblr_outer_gput_spec:nn { headsep } {#1},
footsep .code:n = \__tblr_outer_gput_spec:nn { footsep } {#1},
presep .code:n = \__tblr_outer_gput_spec:nn { presep } {#1},
@@ -3252,7 +3324,11 @@
\seq_map_variable:NNn \l_tmpa_seq \l_tmpa_tl
{
\__tblr_remove_braces:N \l_tmpa_tl
- \hbox_set:Nn \l_tmpa_box { \l__tblr_f_tl \l_tmpa_tl }
+ \hbox_set:Nn \l_tmpa_box
+ {
+ \l__tblr_f_tl
+ \__tblr_rescan_cell_tokens:N \l_tmpa_tl
+ }
\tl_set:Nx \l__tblr_w_tl
{ \dim_max:nn { \l__tblr_w_tl } { \box_wd:N \l_tmpa_box } }
}
@@ -3267,8 +3343,8 @@
\cs_new_protected:Npn \__tblr_get_vcell_and_sizes:NN #1 #2
{
\group_begin:
- \vbox_set_top:Nn \l_tmpa_box { \__tblr_make_vcell_text:nN #1 #2 }
- \vbox_set:Nn \l_tmpb_box { \__tblr_make_vcell_text:nN #1 #2 }
+ \vbox_set_top:Nn \l_tmpa_box { \__tblr_make_vcell_text:NN #1 #2 }
+ \vbox_set:Nn \l_tmpb_box { \__tblr_make_vcell_text:NN #1 #2 }
\dim_gset:Nn \g__tblr_cell_wd_dim { \box_wd:N \l_tmpb_box }
\dim_gset:Nn \g__tblr_cell_ht_dim
{ \box_ht:N \l_tmpb_box + \box_dp:N \l_tmpb_box }
@@ -3312,17 +3388,30 @@
%% #1: cell text; #2: box width
%% All halign commands are defined at the beginning of the file
-\cs_new_protected:Npn \__tblr_make_vcell_text:nN #1 #2
+\cs_new_protected:Npn \__tblr_make_vcell_text:NN #1 #2
{
\dim_set:Nn \tex_hsize:D { #2 }
\@arrayparboxrestore
\cs:w __tblr_halign_command_ \g__tblr_cell_halign_tl : \cs_end:
\mode_leave_vertical:
\box_use:N \l__tblr_strut_ht_box
- \bool_if:NTF \l__tblr_math_mode_bool { $#1$ } { #1 }
+ \bool_if:NTF \l__tblr_math_mode_bool
+ { $#1$ }
+ { \__tblr_rescan_cell_tokens:N #1 }
\box_use:N \l__tblr_strut_dp_box
}
+\cs_new_protected:Npn \__tblr_rescan_cell_tokens:N #1
+ {
+ \tl_if_empty:NTF \l__tblr_inner_spec_verb_tl
+ { #1 }
+ {
+ \regex_replace_all:nnN { . } { \c{string} \0 } #1
+ \tl_set:Nx #1 { #1 }
+ \exp_args:NV \tex_scantokens:D #1
+ }
+ }
+
%% #1: total height dimension; #2: head dimension; #3: foot dimension;
%% #4: tl for resulting upper size; #5: tl for resulting lower size
@@ -4315,6 +4404,7 @@
\DefTblrTemplate { contfoot-text } { normal } { Continued ~ on ~ next ~ page }
\SetTblrTemplate { contfoot-text } { normal }
+\DefTblrTemplate { contfoot } { empty } { }
\DefTblrTemplate { contfoot } { plain }
{
\noindent
@@ -4338,6 +4428,7 @@
\DefTblrTemplate { conthead-text } { normal } { ( Continued ) }
\SetTblrTemplate { conthead-text } { normal }
+\DefTblrTemplate { conthead } { empty } { }
\DefTblrTemplate { conthead } { plain }
{
\noindent
@@ -4364,6 +4455,7 @@
\tl_new:N \l__tblr_caption_short_tl
+\DefTblrTemplate { caption-lot } { empty } { }
\DefTblrTemplate { caption-lot } { normal }
{
\tl_set:Nx \l__tblr_caption_short_tl { \InsertTblrText { entry } }
@@ -4377,18 +4469,22 @@
%% We need to use \hspace and \enskip, but not ~ or \space,
%% since we want a correct hangindent caption paragraph.
+\DefTblrTemplate { caption-tag } { empty } { }
\DefTblrTemplate { caption-tag } { normal } { Table \hspace{0.25em} \thetable }
\SetTblrTemplate { caption-tag } { normal }
+\DefTblrTemplate { caption-sep } { empty } { }
\DefTblrTemplate { caption-sep } { normal } { : \enskip }
\SetTblrTemplate { caption-sep } { normal }
+\DefTblrTemplate { caption-text } { empty } { }
\DefTblrTemplate { caption-text } { normal } { \InsertTblrText { caption } }
\SetTblrTemplate { caption-text } { normal }
\box_new:N \l__tblr_caption_box
\box_new:N \l__tblr_caption_left_box
+\DefTblrTemplate { caption } { empty } { }
\DefTblrTemplate { caption } { plain }
{
\hbox_set:Nn \l__tblr_caption_box
@@ -4441,6 +4537,7 @@
}
\SetTblrTemplate { caption } { normal }
+\DefTblrTemplate { capcont } { empty } { }
\DefTblrTemplate { capcont } { plain }
{
\hbox_set:Nn \l__tblr_caption_box
@@ -4536,6 +4633,7 @@
{ \textsuperscript { \sffamily \UseTblrFont { note-tag } #1 } }
}
+\DefTblrTemplate { note-tag } { empty } { }
\DefTblrTemplate { note-tag } { normal }
{
\textsuperscript { \sffamily \UseTblrFont { note-tag } \InsertTblrNoteTag }
@@ -4548,12 +4646,15 @@
}
\SetTblrTemplate { note-target } { normal }
+\DefTblrTemplate { note-sep } { empty } { }
\DefTblrTemplate { note-sep } { normal } { \space }
\SetTblrTemplate { note-sep } { normal }
+\DefTblrTemplate { note-text } { empty } { }
\DefTblrTemplate { note-text } { normal } { \InsertTblrNoteText }
\SetTblrTemplate { note-text } { normal }
+\DefTblrTemplate { note } { empty } { }
\DefTblrTemplate { note } { plain }
{
\MapTblrNotes
@@ -4608,18 +4709,22 @@
%%> \section{Table Remarks Templates}
%%% --------------------------------------------------------
+\DefTblrTemplate { remark-tag } { empty } { }
\DefTblrTemplate { remark-tag } { normal }
{
\itshape \UseTblrFont { remark-tag } \InsertTblrRemarkTag
}
\SetTblrTemplate { remark-tag } { normal }
+\DefTblrTemplate { remark-sep } { empty } { }
\DefTblrTemplate { remark-sep } { normal } { : \space }
\SetTblrTemplate { remark-sep } { normal }
+\DefTblrTemplate { remark-text } { empty } { }
\DefTblrTemplate { remark-text } { normal } { \InsertTblrRemarkText }
\SetTblrTemplate { remark-text } { normal }
+\DefTblrTemplate { remark } { empty } { }
\DefTblrTemplate { remark } { plain }
{
\MapTblrRemarks
@@ -4687,10 +4792,12 @@
foot .meta:n = { firstfoot, middlefoot, lastfoot },
}
+\DefTblrTemplate { head } { empty } { }
+\DefTblrTemplate { foot } { empty } { }
+
\DefTblrTemplate { firsthead } { normal }
{
\UseTblrTemplate { caption } { default }
- \UseTblrTemplate { caption-lot } { default }
}
\DefTblrTemplate { middlehead, lasthead } { normal }
@@ -4793,8 +4900,7 @@
\__tblr_get_table_width:
\__tblr_build_table_head_aux:Nn \l__tblr_table_firsthead_box
{
- \tl_set:Nn \l_tmpa_tl { \InsertTblrText { label } }
- \tl_if_empty:NF \l_tmpa_tl { \exp_args:NV \label \l_tmpa_tl }
+ \__tblr_build_table_label_entry:
\UseTblrTemplate { firsthead } { default }
}
\__tblr_build_table_head_aux:Nn
@@ -4809,6 +4915,35 @@
\l__tblr_table_lastfoot_box { \UseTblrTemplate { lastfoot } { default } }
}
+\cs_new_protected:Npn \__tblr_build_tall_table_head_foot:
+ {
+ \__tblr_get_table_width:
+ \__tblr_build_table_head_aux:Nn \l__tblr_table_firsthead_box
+ {
+ \__tblr_build_table_label_entry:
+ \UseTblrTemplate { firsthead } { default }
+ }
+ \__tblr_build_table_foot_aux:Nn
+ \l__tblr_table_lastfoot_box { \UseTblrTemplate { lastfoot } { default } }
+ }
+
+\cs_new_protected:Npn \__tblr_build_table_label_entry:
+ {
+ \tl_set:Nx \l_tmpa_tl { \InsertTblrText { label } }
+ \tl_if_eq:NnTF \l_tmpa_tl { none }
+ {
+ \SetTblrTemplate { caption-tag }{ empty }
+ \SetTblrTemplate { caption-sep }{ empty }
+ }
+ {
+ \refstepcounter { table }
+ \tl_if_empty:NF \l_tmpa_tl { \exp_args:NV \label \l_tmpa_tl }
+ }
+ \tl_set:Nx \l_tmpb_tl { \InsertTblrText { entry } }
+ \tl_if_eq:NnF \l_tmpb_tl { none }
+ { \UseTblrTemplate { caption-lot } { default } }
+ }
+
\cs_new_protected:Npn \__tblr_build_table_head_aux:Nn #1 #2
{
\vbox_set:Nn #1
@@ -4835,14 +4970,27 @@
{
\tl_if_eq:enTF { \__tblr_spec_item:nn { outer } { long } } { true }
{ \__tblr_build_long_table:e { \__tblr_spec_item:nn { outer } { halign } } }
- { \__tblr_build_short_table:e { \__tblr_spec_item:nn { outer } { valign } } }
+ {
+ \tl_if_eq:enTF { \__tblr_spec_item:nn { outer } { tall } } { true }
+ {
+ \__tblr_build_tall_table:e
+ { \__tblr_spec_item:nn { outer } { valign } }
+ }
+ {
+ \__tblr_build_short_table:e
+ { \__tblr_spec_item:nn { outer } { valign } }
+ }
+ }
}
\dim_new:N \l__tblr_remain_height_dim
-\tl_new:N \l__tblr_long_from_tl
-\tl_new:N \l__tblr_long_to_tl
+\int_new:N \l__tblr_long_from_int
+\int_new:N \l__tblr_long_to_int
+\int_new:N \l__tblr_curr_i_int
+\int_new:N \l__tblr_prev_i_int
\int_new:N \l__tblr_table_page_int
-\bool_new:N \l__tblr_table_page_break_bool
+\bool_new:N \l__tblr_page_break_curr_bool
+\bool_new:N \l__tblr_page_break_prev_bool
%% #1: table alignment
%% For long table, we need to leave hmode first to get correct \pagetotal
@@ -4862,37 +5010,29 @@
\hrule height ~ 0pt
\LogTblrTracing { page }
\int_set:Nn \l__tblr_table_page_int {1}
- \refstepcounter { table }
\__tblr_build_head_foot:
\dim_set:Nn \l__tblr_remain_height_dim
{ \pagegoal - \pagetotal - \l__tblr_row_head_foot_dim }
- \tl_set:Nx \l__tblr_long_from_tl { \int_eval:n { \l__tblr_row_head_tl + 1 } }
- \tl_set:Nx \l__tblr_long_to_tl
- { \int_eval:n { \c@rowcount - ( \l__tblr_row_foot_tl + 0 ) } }
- \int_step_variable:nnNn
- { \l__tblr_long_from_tl } { \l__tblr_long_to_tl } \l__tblr_i_tl
- {
- \dim_set:Nn \l_tmpa_dim
- {
- \__tblr_data_item:nen { row } { \l__tblr_i_tl } { abovesep }
- +
- \__tblr_data_item:nen { row } { \l__tblr_i_tl } { @row-height }
- +
- \__tblr_data_item:nen { row } { \l__tblr_i_tl } { belowsep }
- +
- \__tblr_spec_item:ne { hline }
- { [ \int_eval:n { \l__tblr_i_tl + 1} ] / @hline-height }
- }
+ \int_set:Nn \l__tblr_long_from_int { \l__tblr_row_head_tl + 1 }
+ \int_set:Nn \l__tblr_long_to_int { \c@rowcount - ( \l__tblr_row_foot_tl + 0 ) }
+ \int_set:Nn \l__tblr_curr_i_int { \l__tblr_long_from_int - 1 }
+ \int_do_while:nNnn { \l__tblr_curr_i_int } < { \l__tblr_long_to_int }
+ {
+ \int_set_eq:NN \l__tblr_prev_i_int \l__tblr_curr_i_int
+ \__tblr_get_next_table_rows:NNNN
+ \l__tblr_long_to_int \l__tblr_curr_i_int
+ \l_tmpa_dim \l__tblr_page_break_curr_bool
\__tblr_check_table_page_break:NNN
- \l__tblr_remain_height_dim \l_tmpa_dim \l__tblr_table_page_break_bool
- \bool_if:NTF \l__tblr_table_page_break_bool
+ \l__tblr_remain_height_dim \l_tmpa_dim \l__tblr_page_break_prev_bool
+ \bool_if:NTF \l__tblr_page_break_prev_bool
{
- \__tblr_do_if_tracing:nn { page } { \tl_log:N \l__tblr_i_tl }
- \int_compare:nNnT
- { \l__tblr_i_tl - \l__tblr_long_from_tl } > {1}
+ \__tblr_do_if_tracing:nn { page } { \int_log:N \l__tblr_curr_i_int }
+ \int_compare:nNnF
+ { \l__tblr_prev_i_int - \l__tblr_long_from_int } < {0}
{
\__tblr_build_page_table:nnx {#1}
- { \l__tblr_long_from_tl } { \int_eval:n { \l__tblr_i_tl - 1 } }
+ { \int_use:N \l__tblr_long_from_int }
+ { \int_use:N \l__tblr_prev_i_int }
\int_incr:N \l__tblr_table_page_int
}
\newpage
@@ -4901,10 +5041,24 @@
\LogTblrTracing { page }
\dim_set:Nn \l__tblr_remain_height_dim
{ \pagegoal - \pagetotal - \l__tblr_row_head_foot_dim - \l_tmpa_dim }
- \tl_set_eq:NN \l__tblr_long_from_tl \l__tblr_i_tl
+ \int_set:Nn \l__tblr_long_from_int { \l__tblr_prev_i_int + 1 }
}
{
- \dim_add:Nn \l__tblr_remain_height_dim { -\l_tmpa_dim }
+ \bool_if:NTF \l__tblr_page_break_curr_bool
+ {
+ \__tblr_build_page_table:nnx {#1}
+ { \int_use:N \l__tblr_long_from_int }
+ { \int_use:N \l__tblr_curr_i_int }
+ \int_incr:N \l__tblr_table_page_int
+ \newpage
+ \hbox{}\kern-\topskip\nobreak
+ \noindent
+ \LogTblrTracing { page }
+ \dim_set:Nn \l__tblr_remain_height_dim
+ { \pagegoal - \pagetotal - \l__tblr_row_head_foot_dim }
+ \int_set:Nn \l__tblr_long_from_int { \l__tblr_curr_i_int + 1 }
+ }
+ { \dim_add:Nn \l__tblr_remain_height_dim { -\l_tmpa_dim } }
}
}
\int_compare:nNnTF { \l__tblr_table_page_int } = {1}
@@ -4916,13 +5070,49 @@
\box_set_eq:NN \l__tblr_table_head_box \l__tblr_table_lasthead_box
\box_set_eq:NN \l__tblr_table_foot_box \l__tblr_table_lastfoot_box
}
- \__tblr_build_page_table:nnn
- {#1} { \l__tblr_long_from_tl } { \l__tblr_long_to_tl }
+ \__tblr_build_page_table:nnn {#1}
+ { \int_use:N \l__tblr_long_from_int } { \int_use:N \l__tblr_long_to_int }
\skip_vertical:n { \__tblr_spec_item:nn { outer } { postsep } }
\hrule height ~ 0pt
}
\cs_generate_variant:Nn \__tblr_build_long_table:n { e }
+%% #1: int with index of the last row; #2: int with index of current row;
+%% #3: row dimension; #4: break page or not.
+\cs_new_protected:Npn \__tblr_get_next_table_rows:NNNN #1 #2 #3 #4
+ {
+ \bool_set_true:N \l_tmpa_bool
+ \dim_zero:N #3
+ \bool_set_false:N #4
+ \bool_while_do:Nn \l_tmpa_bool
+ {
+ \int_incr:N #2
+ \dim_add:Nn #3
+ {
+ \__tblr_data_item:nen { row } { \int_use:N #2 } { abovesep }
+ +
+ \__tblr_data_item:nen { row } { \int_use:N #2 } { @row-height }
+ +
+ \__tblr_data_item:nen { row } { \int_use:N #2 } { belowsep }
+ +
+ \__tblr_spec_item:ne { hline }
+ { [ \int_eval:n { #2 + 1 } ] / @hline-height }
+ }
+ \int_compare:nNnTF {#2} < {#1}
+ {
+ \tl_set:Nx \l__tblr_b_tl
+ { \__tblr_data_item:nen { row } { \int_eval:n { #2 + 1 } } { break } }
+ \int_compare:nNnTF { \l__tblr_b_tl } < { 0 }
+ { \bool_set_true:N \l_tmpa_bool }
+ {
+ \bool_set_false:N \l_tmpa_bool
+ \int_compare:nNnT { \l__tblr_b_tl } > { 0 } { \bool_set_true:N #4 }
+ }
+ }
+ { \bool_set_false:N \l_tmpa_bool }
+ }
+ }
+
\box_new:N \l__tblr_table_head_box
\box_new:N \l__tblr_table_foot_box
\dim_new:N \l__tblr_table_head_foot_dim
@@ -5000,6 +5190,28 @@
}
%% #1: table alignment
+%% For tall table, we need to leave vmode first.
+%% Since there may be \centering in table environment,
+%% We use \raggedright to reset alignement for table head/foot.
+\cs_new_protected:Npn \__tblr_build_tall_table:n #1
+ {
+ \mode_leave_vertical:
+ \raggedright
+ \__tblr_build_tall_table_head_foot:
+ \__tblr_build_one_table:nn {1} {\c@rowcount}
+ \vbox_set:Nn \l__tblr_table_box
+ {
+ \box_use:N \l__tblr_table_firsthead_box
+ \hrule height ~ 0pt
+ \box_use:N \l__tblr_table_box
+ \hrule height ~ 0pt
+ \box_use:N \l__tblr_table_lastfoot_box
+ }
+ \__tblr_valign_whole:Nn \l__tblr_table_box #1
+ }
+\cs_generate_variant:Nn \__tblr_build_tall_table:n { e }
+
+%% #1: table alignment
%% For short table, we need to leave vmode first
\cs_new_protected:Npn \__tblr_build_short_table:n #1
{
@@ -5886,7 +6098,8 @@
\NewTblrLibrary { siunitx }
{
\RequirePackage { siunitx }
- \NewColumnType { S } [1] [] { Q[si = {##1}] }
+ \NewColumnType { S } [1] [] { Q[si = {##1}, c] }
+ \NewColumnType { s } [1] [] { Q[si = {##1}, c, cmd = \TblrUnit] }
\__tblr_data_new_key:nnn { cell } { si } { str }
\keys_define:nn { tblr-column }
{
@@ -5895,12 +6108,20 @@
\cs_new_protected:Npn \__tblr_siunitx_setcolumn:n ##1
{
\__tblr_column_gput_cell:nn { si } {##1}
- \__tblr_process_text_for_every_column_cell:n { \__tblr_siunitx_tablenum:n }
+ \__tblr_process_text_for_every_column_cell:n { \TblrNum }
+ }
+ \NewDocumentCommand \TblrNum { m }
+ {
+ \__tblr_siunitx_process:Nn \tablenum {##1}
+ }
+ \NewDocumentCommand \TblrUnit { m }
+ {
+ \__tblr_siunitx_process:Nn \si {##1}
}
- \cs_new_protected:Npn \__tblr_siunitx_tablenum:n ##1
+ \cs_new_protected:Npn \__tblr_siunitx_process:Nn ##1 ##2
{
- \tl_if_head_is_group:nTF {##1}
- { ##1 }
+ \tl_if_head_is_group:nTF {##2}
+ { ##2 }
{
\group_begin:
\tl_set:Nx \l_tmpa_tl
@@ -5909,7 +6130,7 @@
{ \int_use:N \c@rownum } { \int_use:N \c@colnum } { si }
}
\exp_args:NV \sisetup \l_tmpa_tl
- \tablenum {##1}
+ ##1 {##2}
\group_end:
}
}
diff --git a/macros/latex/contrib/tabularray/tabularray.tex b/macros/latex/contrib/tabularray/tabularray.tex
index 45d486d995..1e5b4a104e 100644
--- a/macros/latex/contrib/tabularray/tabularray.tex
+++ b/macros/latex/contrib/tabularray/tabularray.tex
@@ -6,7 +6,10 @@
\usepackage{codehigh} % https://ctan.org/pkg/codehigh
\usepackage{tabularray}
\usepackage{array,multirow,amsmath}
-\usepackage{chemmacros}
+\usepackage{chemmacros,environ}
+
+\usepackage[firstpage=true]{background}
+\backgroundsetup{contents={}}
\UseTblrLibrary{booktabs,diagbox,siunitx}
@@ -14,7 +17,7 @@
\hypersetup{
colorlinks=true,
urlcolor=blue3,
- linkcolor=red3,
+ linkcolor=blue3,
}
\usepackage{tcolorbox}
@@ -26,13 +29,22 @@
\newcommand*{\K}[1]{\texttt{#1}}
\newcommand*{\V}[1]{\texttt{#1}}
+\newcommand*{\None}{$\times$}
+
+\NewTblrEnviron{newtblr}
+\SetTblrOuter[newtblr]{long}
+\SetTblrInner[newtblr]{
+ hlines = {white}, column{1,2} = {co=1}, colsep = 5pt,
+ row{odd} = {brown8}, row{even} = {gray8},
+ row{1} = {fg=white, bg=purple2, font=\bfseries\sffamily},
+}
\NewTblrEnviron{spectblr}
\SetTblrOuter[spectblr]{long}
\SetTblrInner[spectblr]{
- hlines = {white},
- row{odd}={brown8},row{even}={gray8},row{1}={fg=white,bg=purple2,font=\bfseries\sffamily},
- column{2} = {co=1},
+ hlines = {white}, column{2} = {co=1}, colsep = 5pt,
+ row{odd} = {brown8}, row{even} = {gray8},
+ row{1} = {fg=white, bg=purple2, font=\bfseries\sffamily},
rowhead = 1,
}
@@ -47,12 +59,10 @@
\renewcommand*{\thefootnote}{*}
-\newcommand*{\myversion}{2021L}
-\newcommand*{\mydate}{Version \myversion\ (\the\year-\mylpad\month-\mylpad\day)\\\myrepo}
-\newcommand*{\myrepo}{\url{https://github.com/lvjr/tabularray}}
+\newcommand*{\myversion}{2021M}
\newcommand*{\mylpad}[1]{\ifnum#1<10 0\the#1\else\the#1\fi}
-\colorlet{highback}{\ifodd\month azure9\else blue9\fi}
+\colorlet{highback}{azure9}
\CodeHigh{language=latex/table,style/main=highback,style/code=highback}
\NewCodeHighEnv{code}{style/main=gray9,style/code=gray9}
\NewCodeHighEnv{demo}{style/main=gray9,style/code=gray9,demo}
@@ -61,10 +71,81 @@
\begin{document}
-\title{\sffamily\color{red3}Tabularray: Typeset Tabulars and Arrays with \LaTeX3}
-\author{Jianrui Lyu (tolvjr@163.com)}
-\date{\mydate}
-\maketitle
+\savegeometry{standard}
+\newgeometry{left=0pt,right=0pt}
+
+\begin{titlepage}
+
+\backgroundsetup{
+ scale = 1,
+ angle = 0,
+ opacity = 1,
+ %color = black,
+ contents = {
+ \begin{tblr}{
+ width = \paperwidth, columns = {1}, rows= {4em},
+ cell{odd}{odd} = {gray9}, cell{even}{even} = {gray9},
+ }
+ & & & & & & & & & & & & & & \\
+ & & & & & & & & & & & & & & \\
+ & & & & & & & & & & & & & & \\
+ & & & & & & & & & & & & & & \\
+ & & & & & & & & & & & & & & \\
+ & & & & & & & & & & & & & & \\
+ & & & & & & & & & & & & & & \\
+ & & & & & & & & & & & & & & \\
+ & & & & & & & & & & & & & & \\
+ & & & & & & & & & & & & & & \\
+ & & & & & & & & & & & & & & \\
+ & & & & & & & & & & & & & & \\
+ & & & & & & & & & & & & & & \\
+ & & & & & & & & & & & & & & \\
+ & & & & & & & & & & & & & & \\
+ & & & & & & & & & & & & & & \\
+ & & & & & & & & & & & & & & \\
+ & & & & & & & & & & & & & & \\
+ & & & & & & & & & & & & & & \\
+ & & & & & & & & & & & & & & \\
+ \end{tblr}
+ }
+}
+
+\noindent
+\begin{tblr}{
+ colspec = {lX}, colsep = 12mm, hlines = {2pt, white},
+ row{odd} = {azure8}, row{even} = {gray8},
+ row{1} = {6em,azure2,fg=white,font=\LARGE\bfseries\sffamily},
+ row{2-Z} = {3em,font=\Large},
+}
+ Tabularray & Typeset Tabulars and Arrays with \LaTeX3 \\
+ Author & Jianrui Lyu (tolvjr@163.com) \\
+ Version & \myversion\ (\the\year-\mylpad\month-\mylpad\day) \\
+ Code & \url{https://github.com/lvjr/tabularray} \\
+ Code & \url{https://bitbucket.org/lvjr/tabularray} \\
+ Issue & \url{https://github.com/lvjr/tabularray/issues} \\
+ Forum & \url{https://github.com/lvjr/tabularray/discussions} \\
+\end{tblr}
+
+\begin{codehigh}[boxsep=6mm]
+\begin{tblr}{
+ colspec = {lX}, colsep = 12mm, hlines = {2pt, white},
+ row{odd} = {azure8}, row{even} = {gray8},
+ row{1} = {6em,azure2,fg=white,font=\LARGE\bfseries\sffamily},
+ row{2-Z} = {3em,font=\Large},
+}
+ Tabularray & Typeset Tabulars and Arrays with \LaTeX3 \\
+ Author & Jianrui Lyu (tolvjr@163.com) \\
+ Version & \myversion\ (\the\year-\mylpad\month-\mylpad\day) \\
+ Code & \url{https://github.com/lvjr/tabularray} \\
+ Code & \url{https://bitbucket.org/lvjr/tabularray} \\
+ Issue & \url{https://github.com/lvjr/tabularray/issues} \\
+ Forum & \url{https://github.com/lvjr/tabularray/discussions} \\
+\end{tblr}
+\end{codehigh}
+
+\end{titlepage}
+
+\loadgeometry{standard}
\tableofcontents
@@ -177,7 +258,7 @@ Note that you can use more meaningful \verb!t! instead of \verb!p! for top basel
For some users who are familiar with word processors,
these \verb!t! and \verb!b! columns are counter-intuitive.
In \verb!tabularray! package, there are another two column types \verb!h! and \verb!f!,
-which will align cell text at row head and row foot, respectively:
+which will align cell text at the head and the foot, respectively:
\begin{demohigh}
\begin{tblr}{Q[h,4em]Q[t,4em]Q[m,4em]Q[b,4em]Q[f,4em]}
@@ -191,9 +272,8 @@ which will align cell text at row head and row foot, respectively:
\section{Multirow Cells}
-The above \verb!h! and \verb!f! columns are necessary for multirow cells.
-In \verb!tabularray!, the \verb!t! and \verb!b! in the optional argument of \verb!\multirow! commands
-will be treated as \verb!h! and \verb!f!, respectively:
+The above \verb!h! and \verb!f! alignments are necessary
+when we write multirow cells with \verb!\SetCell! command in \verb!tabularray!.
\begin{demo}
\begin{tabular}{|l|l|l|l|}
@@ -210,8 +290,8 @@ will be treated as \verb!h! and \verb!f!, respectively:
\begin{demohigh}
\begin{tblr}{|l|l|l|l|}
\hline
- \multirow[t]{4}{1.5cm}{Multirow Cell One} & Alpha &
- \multirow[b]{4}{1.5cm}{Multirow Cell Two} & Alpha \\
+ \SetCell[r=4]{h,1.5cm} Multirow Cell One & Alpha &
+ \SetCell[r=4]{f,1.5cm} Multirow Cell Two & Alpha \\
& Beta & & Beta \\
& Gamma & & Gamma \\
& Delta & & Delta \\
@@ -222,7 +302,7 @@ will be treated as \verb!h! and \verb!f!, respectively:
Note that you don't need to load \verb!multirow! package first,
since \verb!tabularray! doesn't depend on it.
Furthermore, \verb!tabularray! will always typeset decent multirow cells.
-First, it will set correct vertical \verb!c! alignment,
+First, it will set correct vertical middle alignment,
even though some rows have large height:
\begin{demo}
@@ -239,7 +319,7 @@ even though some rows have large height:
\begin{demohigh}
\begin{tblr}{|l|m{4em}|}
\hline
- \multirow[c]{4}{1.5cm}{Multirow} & Alpha \\
+ \SetCell[r=4]{m,1.5cm} Multirow & Alpha \\
& Beta \\
& Gamma \\
& Delta Delta Delta \\
@@ -263,7 +343,7 @@ therefore it always avoids vertical overflow:
\begin{demohigh}
\begin{tblr}{|l|m{4em}|}
\hline
- \multirow[c]{2}{1cm}{Line \\ Line \\ Line \\ Line} & Alpha \\
+ \SetCell[r=2]{m,1cm} {Line \\ Line \\ Line \\ Line} & Alpha \\
\cline{2}
& Beta \\
\hline
@@ -477,190 +557,36 @@ Hlines and vlines can also have colors:
\end{tblr}
\end{demohigh}
-\section{New Table Commands}
-
-All commands which change the specifications of tables \textcolor{red3}{must} be defined with \verb!\NewTableCommand!.
-The following example demonstrates how to define similar rules as in \verb!booktabs! package:
+\chapter{Basic Interfaces}
-\begin{codehigh}
-\NewTableCommand\toprule{\hline[0.08em]}
-\NewTableCommand\midrule{\hline[0.05em]}
-\NewTableCommand\bottomrule{\hline[0.08em]}
-\begin{tblr}{llll}
-\toprule
- Alpha & Beta & Gamma & Delta \\
-\midrule
- Epsilon & Zeta & Eta & Theta \\
- Iota & Kappa & Lambda & Mu \\
- Nu & Xi & Omicron & Pi \\
-\bottomrule
-\end{tblr}
-\end{codehigh}
+\section{Old and New Interfaces}
-\chapter{The Old Interfaces}
+With \verb!tabularray! package, you can change the styles of tables via old interfaces or new interfaces.
-With tabularray package, you can still use improved table commands to change the styles of tables.
+The old interfaces consist of some table commands inside the table contents.
Same as \verb!tabular! and \verb!array! environments,
all table commands \textcolor{red3}{must} be put at the beginning ot the cell text.
Also, new table commands \textcolor{red3}{must} be defined with \verb!\NewTableCommand!.
-\section{Hline Commands}
-
-The \verb!\hline! command has an optional argument which accepts key-value options.
-The available keys are described in Table \ref{key:hvline}.
-
-\begin{demohigh}
-\begin{tblr}{llll}
-\hline
- Alpha & Beta & Gamma & Delta \\
-\hline[dashed]
- Epsilon & Zeta & Eta & Theta \\
-\hline[dotted]
- Iota & Kappa & Lambda & Mu \\
-\hline[2pt,blue5]
-\end{tblr}
-\end{demohigh}
-
-The \verb!\cline! command also has an optional argument which is the same as \verb!\hline!.
-
-\begin{demohigh}
-\begin{tblr}{llll}
-\cline{1-4}
- Alpha & Beta & Gamma & Delta \\
-\cline[dashed]{1,3}
- Epsilon & Zeta & Eta & Theta \\
-\cline[dashed]{2,4}
- Iota & Kappa & Lambda & Mu \\
-\cline[2pt,blue5]{-}
-\end{tblr}
-\end{demohigh}
-
-You can use child selectors in the mandatory argument of \verb!\cline!.
-
-\begin{demohigh}
-\begin{tblr}{llll}
-\cline{1-4}
- Alpha & Beta & Gamma & Delta \\
-\cline[dashed]{odd}
- Epsilon & Zeta & Eta & Theta \\
-\cline[dashed]{even}
- Iota & Kappa & Lambda & Mu \\
-\cline[2pt,blue5]{-}
-\end{tblr}
-\end{demohigh}
-
-\section{Cell Commands}
-
-The \verb!\SetCell! command has a mandatory argument for setting the styles of current cell.
-The available keys are described in Table \ref{key:cell}.
-
-\begin{demohigh}
-\begin{tblr}{llll}
-\hline[1pt]
- Alpha & \SetCell{bg=teal2,fg=white} Beta & Gamma & Delta \\
-\hline
- Epsilon & Zeta & \SetCell{r,font=\scshape} Eta & Theta \\
-\hline
- Iota & Kappa & Lambda & Mu \\
-\hline[1pt]
-\end{tblr}
-\end{demohigh}
-
-The \verb!\SetCell! command also has an optional argument for setting the multispan of current cell.
-The available keys are described in Table \ref{key:cellspan}.
-
-\begin{demohigh}
-\begin{tblr}{|X|X|X|X|X|X|}
-\hline
- Alpha & Beta & Gamma & Delta & Epsilon & Zeta \\
-\hline
- \SetCell[c=2]{c} Eta & 2-2
- & \SetCell[c=2]{c} Iota & 2-4
- & \SetCell[c=2]{c} Lambda & 2-6 \\
-\hline
- \SetCell[c=3]{l} Nu & 3-2 & 3-3
- & \SetCell[c=3]{l} Pi & 3-5 & 3-6 \\
-\hline
- \SetCell[c=6]{r} Tau & 4-2 & 4-3 & 4-4 & 4-5 & 4-6 \\
-\hline
-\end{tblr}
-\end{demohigh}
-
-\section{Row Commands}
-
-The \verb!\SetRow! command has a mandatory argument for setting the styles of current row.
-The available keys are described in Table \ref{key:row}.
-
-\begin{demohigh}
-\begin{tblr}{llll}
-\hline[1pt]
- \SetRow{azure8} Alpha & Beta & Gamma & Delta \\
-\hline
- \SetRow{blue8,c} Epsilon & Zeta & Eta & Theta \\
-\hline
- \SetRow{violet8} Iota & Kappa & Lambda & Mu \\
-\hline[1pt]
-\end{tblr}
-\end{demohigh}
-
-\section{Column Types}
-
-The \verb!tabularray! package has only one type of primitive column: the \verb!Q! column.
-Other types of columns are defined as \verb!Q! columns with some keys.
-
-\begin{codehigh}
-\NewColumnType{l}{Q[l]}
-\NewColumnType{c}{Q[c]}
-\NewColumnType{r}{Q[r]}
-\NewColumnType{t}[1]{Q[t,wd=#1]}
-\NewColumnType{m}[1]{Q[m,wd=#1]}
-\NewColumnType{b}[1]{Q[b,wd=#1]}
-\NewColumnType{h}[1]{Q[h,wd=#1]}
-\NewColumnType{f}[1]{Q[f,wd=#1]}
-\NewColumnType{X}[1][]{Q[co=1,#1]}
-\end{codehigh}
-
-\begin{demohigh}
-\begin{tblr}{|t{15mm}|m{15mm}|b{20mm}|}
- Alpha & Beta & {Gamma\\Gamma} \\
- Epsilon & Zeta & {Eta\\Eta} \\
- Iota & Kappa & {Lambda\\Lambda} \\
-\end{tblr}
-\end{demohigh}
-
-Any new column type must be defined with \verb!\NewColumnType! command.
-It can have an optional argument when it's defined.
-
-\section{Row Types}
-
-The \verb!tabularray! package has only one type of primitive row: the \verb!Q! row.
-Other types of rows are defined as \verb!Q! rows with some keys.
-
-\begin{codehigh}
-\NewRowType{l}{Q[l]}
-\NewRowType{c}{Q[c]}
-\NewRowType{r}{Q[r]}
-\NewRowType{t}[1]{Q[t,ht=#1]}
-\NewRowType{m}[1]{Q[m,ht=#1]}
-\NewRowType{b}[1]{Q[b,ht=#1]}
-\NewRowType{h}[1]{Q[h,ht=#1]}
-\NewRowType{f}[1]{Q[f,ht=#1]}
-\end{codehigh}
-
-\begin{demohigh}
-\begin{tblr}{rowspec={|t{12mm}|m{10mm}|b{10mm}|}}
- Alpha & Beta & {Gamma\\Gamma} \\
- Epsilon & Zeta & {Eta\\Eta} \\
- Iota & Kappa & {Lambda\\Lambda} \\
-\end{tblr}
-\end{demohigh}
-
-Any new row type must be defined with \verb!\NewRowType! command.
-It can have an optional argument when it's defined.
-
-\chapter{The New Interfaces}
-
-With \verb!tabularray! package, you can separate style and content totally in tables.
+The new interfaces consist of some options inside the mandatory argument,
+hence totally separating the styles and the contents of tables.
+
+\begin{newtblr}[
+ caption = {Old Interfaces and New Interfaces},
+ label = {key:interface},
+]{verb}
+ Old Interfaces & New Interfaces \\
+ \verb!\SetHlines! & \K{hlines} \\
+ \verb!\SetHline!, \verb!\hline!, \verb!\cline! & \K{hline}, \K{rowspec} \\
+ \verb!\SetVlines! & \K{vlines} \\
+ \verb!\SetVline!, \verb!\vline!, \verb!\rline! & \K{vline}, \K{colspec} \\
+ \verb!\SetCells! & \K{cells} \\
+ \verb!\SetCell! & \K{cell} \\
+ \verb!\SetRows! & \K{rows} \\
+ \verb!\SetRow! & \K{row}, \K{rowspec} \\
+ \verb!\SetColumns! & \K{columns} \\
+ \verb!\SetColumn! & \K{column}, \K{colspec} \\
+\end{newtblr}
\section{Hlines and Vlines}
@@ -673,11 +599,13 @@ All available keys for hlines and vlines are described in Table \ref{key:hvline}
]{}
Key & Description and Values & Initial Value \\
\underline{\K{dash}} & dash style: \V{solid}, \V{dashed} or \V{dotted} & \V{solid} \\
- \K{text} & replace hline/vline with text (like \V{!} specifier in \K{colspec}) & None \\
- \underline{\K{wd}} & rule width dimension & None \\
- \underline{\K{fg}} & rule color name & None \\
+ \K{text} & replace hline/vline with text (like \V{!} specifier in \K{colspec}) & \None \\
+ \underline{\K{wd}} & rule width dimension & \None \\
+ \underline{\K{fg}} & rule color name & \None \\
\end{spectblr}
+\subsection{Hlines and Vlines in New Interfaces}
+
Options \verb!hlines! and \verb!vlines! are for setting all hlines and vlines, respectively.
With empty value, all hlines/vlines will be solid.
@@ -686,9 +614,6 @@ With empty value, all hlines/vlines will be solid.
Alpha & Beta & Gamma & Delta \\
Epsilon & Zeta & Eta & Theta \\
Iota & Kappa & Lambda & Mu \\
- Nu & Xi & Omicron & Pi \\
- Rho & Sigma & Tau & Upsilon \\
- Phi & Chi & Psi & Omega \\
\end{tblr}
\end{demohigh}
@@ -696,15 +621,11 @@ With values inside one pair of braces, all hlines/vlines will be styled.
\begin{demohigh}
\begin{tblr}{
- hlines = {1pt,solid},
- vlines = {red3,dashed},
+ hlines = {1pt,solid}, vlines = {red3,dashed},
}
Alpha & Beta & Gamma & Delta \\
Epsilon & Zeta & Eta & Theta \\
Iota & Kappa & Lambda & Mu \\
- Nu & Xi & Omicron & Pi \\
- Rho & Sigma & Tau & Upsilon \\
- Phi & Chi & Psi & Omega \\
\end{tblr}
\end{demohigh}
@@ -746,19 +667,16 @@ Another pair of braces before will draw more hlines/vlines (in which \verb!-! st
\begin{demohigh}
\begin{tblr}{
- hlines = {1}{-}{dashed},
- hlines = {2}{-}{solid},
+ hlines = {1}{-}{dashed}, hlines = {2}{-}{solid},
}
Alpha & Beta & Gamma & Delta \\
Epsilon & Zeta & Eta & Theta \\
Iota & Kappa & Lambda & Mu \\
- Nu & Xi & Omicron & Pi \\
- Rho & Sigma & Tau & Upsilon \\
- Phi & Chi & Psi & Omega \\
\end{tblr}
\end{demohigh}
Options \verb!hline{i}! and \verb!vline{j}! are for setting some hlines and vlines, respectively.
+Their values are the same as options \verb!hliness! and \verb!vlines!:
\begin{demohigh}
\begin{tblr}{
@@ -775,7 +693,25 @@ Options \verb!hline{i}! and \verb!vline{j}! are for setting some hlines and vlin
\end{tblr}
\end{demohigh}
-At last we show the usage of \verb!text! key by the following example%
+You can use \verb!X!, \verb!Y!, \verb!Z! to denote the last three childs, respectively.
+It is especially useful when you are writing long tables:
+
+\begin{demohigh}
+\begin{tblr}{
+ hline{1,Z} = {2pt},
+ hline{2,Y} = {1pt},
+ hline{3-X} = {dashed},
+}
+ Alpha & Beta & Gamma & Delta \\
+ Epsilon & Zeta & Eta & Theta \\
+ Iota & Kappa & Lambda & Mu \\
+ Nu & Xi & Omicron & Pi \\
+ Rho & Sigma & Tau & Upsilon \\
+ Phi & Chi & Psi & Omega \\
+\end{tblr}
+\end{demohigh}
+
+Now we show the usage of \verb!text! key by the following example%
\footnote{Code from \url{https://tex.stackexchange.com/questions/603023/tabularray-and-tabularx-column-separator}.}:
\begin{demohigh}
@@ -795,10 +731,89 @@ At last we show the usage of \verb!text! key by the following example%
You need to load \verb!chemmacros! package for the \verb!\ch! command.
+\subsection{Hlines and Vlines in Old Interfaces}
+
+The \verb!\hline! command has an optional argument which accepts key-value options.
+The available keys are described in Table \ref{key:hvline}.
+
+\begin{demohigh}
+\begin{tblr}{llll}
+\hline
+ Alpha & Beta & Gamma & Delta \\
+\hline[dashed]
+ Epsilon & Zeta & Eta & Theta \\
+\hline[dotted]
+ Iota & Kappa & Lambda & Mu \\
+\hline[2pt,blue5]
+\end{tblr}
+\end{demohigh}
+
+The \verb!\cline! command also has an optional argument which is the same as \verb!\hline!.
+
+\begin{demohigh}
+\begin{tblr}{llll}
+\cline{1-4}
+ Alpha & Beta & Gamma & Delta \\
+\cline[dashed]{1,3}
+ Epsilon & Zeta & Eta & Theta \\
+\cline[dashed]{2,4}
+ Iota & Kappa & Lambda & Mu \\
+\cline[2pt,blue5]{-}
+\end{tblr}
+\end{demohigh}
+
+You can use child selectors in the mandatory argument of \verb!\cline!.
+
+\begin{demohigh}
+\begin{tblr}{llll}
+\cline{1-4}
+ Alpha & Beta & Gamma & Delta \\
+\cline[dashed]{odd}
+ Epsilon & Zeta & Eta & Theta \\
+\cline[dashed]{even}
+ Iota & Kappa & Lambda & Mu \\
+\cline[2pt,blue5]{-}
+\end{tblr}
+\end{demohigh}
+
+Commands \verb!\SetHline! combines the usages of \verb!\hline! and \verb!\cline!:
+
+\begin{demohigh}
+\begin{tblr}{llll}
+\SetHline{1-3}{blue5,1pt}
+ Alpha & Beta & Gamma & Delta \\
+ Epsilon & Zeta & Eta & Theta \\
+ Iota & Kappa & Lambda & Mu \\
+\SetHline{2-4}{teal5,1pt}
+\end{tblr}
+\end{demohigh}
+
+\begin{demohigh}
+\begin{tblr}{llll}
+\SetHline[1]{1-3}{blue5,1pt}
+\SetHline[2]{1-3}{azure5,1pt}
+ Alpha & Beta & Gamma & Delta \\
+ Epsilon & Zeta & Eta & Theta \\
+ Iota & Kappa & Lambda & Mu \\
+\SetHline[1]{2-4}{teal5,1pt}
+\SetHline[2]{2-4}{green5,1pt}
+\end{tblr}
+\end{demohigh}
+
+In fact, table command \verb!\SetHline[<index>]{<columns>}{<styles>}! at the beginning of row \verb!i!
+is the same as table option \verb!hline{i}={<index>}{<columns>}{<styles>}!.
+
+Also, table command \verb!\SetHlines[<index>]{<columns>}{<styles>}! at the beginning of some row
+is the same as table option \verb!hlines={<index>}{<columns>}{<styles>}!.
+
+The usages of table commands \verb!\vline!, \verb!\rline!, \verb!\SetVline!, \verb!\SetVlines!
+are similar to those of \verb!\hline!, \verb!\cline!, \verb!\SetHline!, \verb!\SetHlines!, respectively.
+But normally you don't need to use them.
+
\section{Cells and Spancells}
All available keys for cells are described in Table \ref{key:cell} and Table \ref{key:cellspan}.
-\nopagebreak
+
\begin{spectblr}[
caption = {Keys for the Content of Cells},
label = {key:cell},
@@ -812,13 +827,13 @@ All available keys for cells are described in Table \ref{key:cell} and Table \re
& vertical alignment: \V{t} (top), \V{m} (middle), \V{b} (bottom),
\V{h} (head) or \V{f} (foot)
& \V{t} \\
- \underline{\K{wd}} & width dimension & None \\
- \underline{\K{bg}} & background color name & None \\
- \K{fg} & foreground color name & None \\
- \K{font} & font commands & None \\
- \K{preto} & prepend text to the cell & None \\
- \K{appto} & append text to the cell & None \\
- \K{cmd} & execute command for the cell text & None \\
+ \underline{\K{wd}} & width dimension & \None \\
+ \underline{\K{bg}} & background color name & \None \\
+ \K{fg} & foreground color name & \None \\
+ \K{font} & font commands & \None \\
+ \K{preto} & prepend text to the cell & \None \\
+ \K{appto} & append text to the cell & \None \\
+ \K{cmd} & execute command for the cell text & \None \\
\end{spectblr}
\vspace{-2em}
\begin{spectblr}[
@@ -830,6 +845,8 @@ All available keys for cells are described in Table \ref{key:cell} and Table \re
\K{c} & number of columns the cell spans & 1 \\
\end{spectblr}
+\subsection{Cells and Spancells in New Interfaces}
+
Option \verb!cells! is for setting all cells.
\nopagebreak
\begin{demohigh}
@@ -862,6 +879,62 @@ Option \verb!cell{i}{j}! is for setting some cells.
\end{tblr}
\end{demohigh}
+\subsection{Cells and Spancells in Old Interfaces}
+
+The \verb!\SetCell! command has a mandatory argument for setting the styles of current cell.
+The available keys are described in Table \ref{key:cell}.
+
+\begin{demohigh}
+\begin{tblr}{llll}
+\hline[1pt]
+ Alpha & \SetCell{bg=teal2,fg=white} Beta & Gamma \\
+\hline
+ Epsilon & Zeta & \SetCell{r,font=\scshape} Eta \\
+\hline
+ Iota & Kappa & Lambda \\
+\hline[1pt]
+\end{tblr}
+\end{demohigh}
+
+The \verb!\SetCell! command also has an optional argument for setting the multispan of current cell.
+The available keys are described in Table \ref{key:cellspan}.
+
+\begin{demohigh}
+\begin{tblr}{|X|X|X|X|X|X|}
+\hline
+ Alpha & Beta & Gamma & Delta & Epsilon & Zeta \\
+\hline
+ \SetCell[c=2]{c} Eta & 2-2
+ & \SetCell[c=2]{c} Iota & 2-4
+ & \SetCell[c=2]{c} Lambda & 2-6 \\
+\hline
+ \SetCell[c=3]{c} Nu & 3-2 & 3-3
+ & \SetCell[c=3]{c} Pi & 3-5 & 3-6 \\
+\hline
+ \SetCell[c=6]{c} Tau & 4-2 & 4-3 & 4-4 & 4-5 & 4-6 \\
+\hline
+\end{tblr}
+\end{demohigh}
+
+\begin{demohigh}
+\begin{tblr}{|X|X|X|X|X|X|}
+\hline
+ Alpha & Beta & Gamma & Delta & Epsilon & Zeta \\
+\hline
+ \SetCell[r=2]{m} Eta
+ & Theta & Iota & Kappa & Lambda & \SetCell[r=2]{m} Mu \\
+\hline
+ Nu & Xi & Omicron & Pi & Rho & Sigma \\
+\hline
+\end{tblr}
+\end{demohigh}
+
+In fact, table command \verb!\SetCell[<span>]{<styles>}! at the beginning of cell at row \verb!i!
+and column \verb!j! is the same as table option \verb!cell{i}{j}={<span>}{<styles>}!.
+
+Also, table command \verb!\SetCells[<span>]{<styles>}! at the beginning of some cell
+is the same as table option \verb!cells={<span>}{<styles>}!.
+
\section{Rows and Columns}
All available keys for rows and columns are described in Table \ref{key:row} and Table \ref{key:column}.
@@ -879,19 +952,19 @@ All available keys for rows and columns are described in Table \ref{key:row} and
& vertical alignment: \V{t} (top), \V{m} (middle), \V{b} (bottom),
\V{h} (head) or \V{f} (foot)
& \V{t} \\
- \underline{\K{ht}} & height dimension & None \\
- \underline{\K{bg}} & background color name & None \\
- \K{fg} & foreground color name & None \\
- \K{font} & font commands & None \\
+ \underline{\K{ht}} & height dimension & \None \\
+ \underline{\K{bg}} & background color name & \None \\
+ \K{fg} & foreground color name & \None \\
+ \K{font} & font commands & \None \\
\K{abovesep} & set vertical space above the row & \V{2pt} \\
- \K{abovesep+} & increase vertical space above the row & None \\
+ \K{abovesep+} & increase vertical space above the row & \None \\
\K{belowsep} & set vertical space below the row & \V{2pt} \\
- \K{belowsep+} & increase vertical space below the row & None \\
+ \K{belowsep+} & increase vertical space below the row & \None \\
\K{rowsep} & set vertical space above and below the row & \V{2pt} \\
- \K{rowsep+} & increase vertical space above and below the row & None \\
- \K{preto} & prepend text to every cell (like \V{>} specifier in \K{rowspec}) & None \\
- \K{appto} & append text to every cell (like \V{<} specifier in \K{rowspec}) & None \\
- \K{cmd} & execute command for every cell text & None \\
+ \K{rowsep+} & increase vertical space above and below the row & \None \\
+ \K{preto} & prepend text to every cell (like \V{>} specifier in \K{rowspec}) & \None \\
+ \K{appto} & append text to every cell (like \V{<} specifier in \K{rowspec}) & \None \\
+ \K{cmd} & execute command for every cell text & \None \\
\end{spectblr}
\vspace{-2em}
\begin{spectblr}[
@@ -907,30 +980,30 @@ All available keys for rows and columns are described in Table \ref{key:row} and
& vertical alignment: \V{t} (top), \V{m} (middle), \V{b} (bottom),
\V{h} (head) or \V{f} (foot)
& \V{t} \\
- \underline{\K{wd}} & width dimension & None \\
- \underline{\K{co}} & coefficient for the extendable column (\V{X} column) & None \\
- \underline{\K{bg}} & background color name & None \\
- \K{fg} & foreground color name & None \\
- \K{font} & font commands & None \\
+ \underline{\K{wd}} & width dimension & \None \\
+ \underline{\K{co}} & coefficient for the extendable column (\V{X} column) & \None \\
+ \underline{\K{bg}} & background color name & \None \\
+ \K{fg} & foreground color name & \None \\
+ \K{font} & font commands & \None \\
\K{leftsep} & set horizontal space to the left of the column & \V{6pt} \\
- \K{leftsep+} & increase horizontal space to the left of the column & None \\
+ \K{leftsep+} & increase horizontal space to the left of the column & \None \\
\K{rightsep} & set horizontal space to the right of the column & \V{6pt} \\
- \K{rightsep+} & increase horizontal space to the right of the column & None \\
+ \K{rightsep+} & increase horizontal space to the right of the column & \None \\
\K{colsep} & set horizontal space to both sides of the column & \V{6pt} \\
- \K{colsep+} & increase horizontal space to both sides of the column & None \\
- \K{preto} & prepend text to every cell (like \V{>} specifier in \K{colspec}) & None \\
- \K{appto} & append text to every cell (like \V{<} specifier in \K{colspec}) & None \\
- \K{cmd} & execute command for every cell text & None \\
+ \K{colsep+} & increase horizontal space to both sides of the column & \None \\
+ \K{preto} & prepend text to every cell (like \V{>} specifier in \K{colspec}) & \None \\
+ \K{appto} & append text to every cell (like \V{<} specifier in \K{colspec}) & \None \\
+ \K{cmd} & execute command for every cell text & \None \\
\end{spectblr}
+\subsection{Rows and Columns in New Interfaces}
+
Options \verb!rows! and \verb!columns! are for setting all rows and columns, respectively.
\nopagebreak
\begin{demohigh}
\begin{tblr}{
- hlines,
- vlines,
- rows = {7mm},
- columns = {15mm,c},
+ hlines, vlines,
+ rows = {7mm}, columns = {15mm,c},
}
Alpha & Beta & Gamma & Delta \\
Epsilon & Zeta & Eta & Theta \\
@@ -967,17 +1040,16 @@ The following example demonstrates the usages of \verb!bg!, \verb!fg! and \verb!
Delta & Epsilon & Zeta \\
Eta & Theta & Iota \\
Kappa & Lambda & Mu \\
- Nu Xi Omikron & Pi Rho Sigma & Tau Upsilon Phi \\
+ Nu Xi Omicron & Pi Rho Sigma & Tau Upsilon Phi \\
\end{tblr}
\end{demohigh}
The following example demonstrates the usages of
\verb!abovesep!, \verb!belowsep!, \verb!leftsep!, \verb!rightsep! keys.
-\nopagebreak
+%\nopagebreak
\begin{demohigh}
\begin{tblr}{
- hlines,
- vlines,
+ hlines, vlines,
rows = {abovesep=1pt,belowsep=5pt},
columns = {leftsep=1pt,rightsep=5pt},
}
@@ -999,7 +1071,109 @@ The following example shows that we can replace \verb!\\[dimen]! with \verb!belo
\end{tblr}
\end{demohigh}
-\section{The Whole Table}
+\subsection{Rows and Columns in Old Interfaces}
+
+The \verb!\SetRow! command has a mandatory argument for setting the styles of current row.
+The available keys are described in Table \ref{key:row}.
+
+\begin{demohigh}
+\begin{tblr}{llll}
+\hline[1pt]
+ \SetRow{azure8} Alpha & Beta & Gamma & Delta \\
+\hline
+ \SetRow{blue8,c} Epsilon & Zeta & Eta & Theta \\
+\hline
+ \SetRow{violet8} Iota & Kappa & Lambda & Mu \\
+\hline[1pt]
+\end{tblr}
+\end{demohigh}
+
+In fact, table command \verb!\SetRow{<styles>}! at the beginning of row \verb!i!
+is the same as table option \verb!row{i}={<styles>}!.
+
+Also, table command \verb!\SetRows{<styles>}! at the beginning of some row
+is the same as table option \verb!rows={<styles>}!.
+
+The usages of table commands \verb!\SetColumn! and \verb!\SetColumns!
+are similar to those of \verb!\SetRow! and \verb!\SetRows!, respectively.
+But normally you don't need to use them.
+
+\section{Colspec and Rowspec}
+
+Options \verb!colspec!/\verb!rowspec! are for setting column/row specifications
+with column/row type specifiers.
+
+\subsection{Colspec and Width}
+
+Option \verb!width! are for setting the width of the table with extendable columns.
+The following example demonstrates the usage of \verb!width! option.
+\nopagebreak
+\begin{demohigh}
+\begin{tblr}{width=0.8\textwidth, colspec={|l|X[2]|X[3]|X[-1]|}}
+ Alpha & Beta & Gamma & Delta \\
+ Epsilon & Zeta & Eta & Theta \\
+ Iota & Kappa & Lambda & Mu \\
+\end{tblr}
+\end{demohigh}
+
+\subsection{Column Types}
+
+The \verb!tabularray! package has only one type of primitive column: the \verb!Q! column.
+Other types of columns are defined as \verb!Q! columns with some keys.
+
+\begin{codehigh}
+\NewColumnType{l}{Q[l]}
+\NewColumnType{c}{Q[c]}
+\NewColumnType{r}{Q[r]}
+\NewColumnType{t}[1]{Q[t,wd=#1]}
+\NewColumnType{m}[1]{Q[m,wd=#1]}
+\NewColumnType{b}[1]{Q[b,wd=#1]}
+\NewColumnType{h}[1]{Q[h,wd=#1]}
+\NewColumnType{f}[1]{Q[f,wd=#1]}
+\NewColumnType{X}[1][]{Q[co=1,#1]}
+\end{codehigh}
+
+\begin{demohigh}
+\begin{tblr}{|t{15mm}|m{15mm}|b{20mm}|}
+ Alpha & Beta & {Gamma\\Gamma} \\
+ Epsilon & Zeta & {Eta\\Eta} \\
+ Iota & Kappa & {Lambda\\Lambda} \\
+\end{tblr}
+\end{demohigh}
+
+Any new column type must be defined with \verb!\NewColumnType! command.
+It can have an optional argument when it's defined.
+
+\subsection{Row Types}
+
+The \verb!tabularray! package has only one type of primitive row: the \verb!Q! row.
+Other types of rows are defined as \verb!Q! rows with some keys.
+
+\begin{codehigh}
+\NewRowType{l}{Q[l]}
+\NewRowType{c}{Q[c]}
+\NewRowType{r}{Q[r]}
+\NewRowType{t}[1]{Q[t,ht=#1]}
+\NewRowType{m}[1]{Q[m,ht=#1]}
+\NewRowType{b}[1]{Q[b,ht=#1]}
+\NewRowType{h}[1]{Q[h,ht=#1]}
+\NewRowType{f}[1]{Q[f,ht=#1]}
+\end{codehigh}
+
+\begin{demohigh}
+\begin{tblr}{rowspec={|t{12mm}|m{10mm}|b{10mm}|}}
+ Alpha & Beta & {Gamma\\Gamma} \\
+ Epsilon & Zeta & {Eta\\Eta} \\
+ Iota & Kappa & {Lambda\\Lambda} \\
+\end{tblr}
+\end{demohigh}
+
+Any new row type must be defined with \verb!\NewRowType! command.
+It can have an optional argument when it's defined.
+
+\chapter{Extra Interfaces}
+
+\section{Table Specifications}
All available keys for the whole table are described in Table \ref{key:table}.
@@ -1008,9 +1182,6 @@ All available keys for the whole table are described in Table \ref{key:table}.
label = {key:table},
]{}
Key & Description and Values & Initial Value \\
- \K{rowspec} & set row specifications with row type specifiers & None \\
- \K{colspec} & set column specifications with column type specifiers & None \\
- \K{width} & width of the table with extendable columns & None \\
\K{rulesep} & space between two hlines or vlines & \V{2pt} \\
\K{stretch} & stretch ratio for struts added to cell text & \V{1} \\
\K{abovesep} & set vertical space above every row & \V{2pt} \\
@@ -1023,16 +1194,6 @@ All available keys for the whole table are described in Table \ref{key:table}.
\K{vspan} & vertical span algorithm: \V{default} or \V{even} & \V{default} \\
\end{spectblr}
-The following example demonstrates the usage of \verb!width! key.
-\nopagebreak
-\begin{demohigh}
-\begin{tblr}{width=0.8\textwidth, colspec={|l|X[2]|X[3]|X[-1]|}}
- Alpha & Beta & Gamma & Delta \\
- Epsilon & Zeta & Eta & Theta \\
- Iota & Kappa & Lambda & Mu \\
-\end{tblr}
-\end{demohigh}
-
The following example shows that we can replace \verb!\doublerulesep! parameter with \verb!rulesep! key.
\nopagebreak
\begin{demohigh}
@@ -1158,6 +1319,80 @@ Text \begin{mytblr}{cccc}
\end{mytblr} Text
\end{demohigh}
+If not giving the optional argument to \verb!\SetTblrInner! or \verb!\SetTblrOuter! command,
+we set the default specifications for \verb!tblr! environment.
+And different tabularray environments could have different default specifications.
+
+\section{New Table Commands}
+
+All commands which change the specifications of tables \textcolor{red3}{must} be defined with \verb!\NewTableCommand!.
+The following example demonstrates how to define a new table command:
+
+\begin{demohigh}
+\NewTableCommand\myhline{\hline[0.1em,red5]}
+\begin{tblr}{llll}
+\myhline
+ Alpha & Beta & Gamma & Delta \\
+ Epsilon & Zeta & Eta & Theta \\
+ Iota & Kappa & Lambda & Mu \\
+\myhline
+\end{tblr}
+\end{demohigh}
+
+\section{Expand Macros First}
+
+\verb!Tabularray! need to see every \verb!&! and \verb!\\! when splitting the table body
+with \verb!l3regex!. And you can not put cell text inside any table command defined with
+\verb!\NewTableCommand!. But you could use outer specification \verb!expand! to make \verb!tabularray!
+expand every occurrence of a specified macro \underline{once} before splitting the table body:
+
+\begin{demohigh}
+\def\tblrbody{
+ \hline
+ 20 & 30 & 40 \\
+ 50 & 60 & 70 \\
+ \hline
+}
+\begin{tblr}[expand=\tblrbody]{ccc}
+ \hline
+ AA & BB & CC \\
+ \tblrbody
+ DD & EE & FF \\
+ \tblrbody
+ GG & HH & II \\
+ \hline
+\end{tblr}
+\end{demohigh}
+
+With this \verb!expand! option, you can also use \verb!environ! package
+to define a new environment based on \verb!tblr! environment:
+
+\begin{demohigh}
+\NewEnviron{fancytblr}{
+ Before Text
+ \begin{tblr}[expand=\BODY]{hlines}
+ \BODY
+ \end{tblr}
+ After Text
+}
+\begin{fancytblr}
+ One & Two & Three \\
+ Four & Five & Six \\
+ Seven & Eight & Nine \\
+\end{fancytblr}
+\end{demohigh}
+
+\section{Use Verbatim Commands}
+
+With inner specification \verb!verb!, you can write \verb!\verb! commands in the cell text:
+
+\begin{demohigh}
+\begin{tblr}{hlines,verb}
+ 20 & 30 & \verb!\hello{world}!40 \\
+ 50 & \verb!\hello!60 & 70 \\
+\end{tblr}
+\end{demohigh}
+
\section{Counters and Lengths}
Counters \verb!rownum!, \verb!colnum!, \verb!rowcount!, \verb!colcount! can be used in cell text:
@@ -1214,16 +1449,18 @@ By this approach, alternating row colors should work as expected.
remark{Source} = {Made up by myself. Made up by myself. Made up by myself.},
]{
colspec = {XXX}, width = 0.85\linewidth,
- row{odd} = {gray9}, row{even} = {brown9}, rowhead = 2, rowfoot = 1,
+ rowhead = 2, rowfoot = 1,
+ row{odd} = {gray9}, row{even} = {brown9},
+ row{1-2} = {purple7}, row{Z} = {blue7},
}
\hline
- \SetRow{purple7} Head & Head & Head \\
+ Head & Head & Head \\
\hline
- \SetRow{purple7} Head & Head & Head \\
+ Head & Head & Head \\
\hline
Alpha & Beta & Gamma \\
\hline
- Epsilon & Zeta\TblrNote{a} & Eta \\
+ Epsilon & Zeta\TblrNote{a} & Eta \\
\hline
Iota & Kappa\TblrNote{$\dag$} & Lambda \\
\hline
@@ -1365,7 +1602,7 @@ Alpha & Beta & Gamma \\
\hline
Phi & Chi & Psi \\
\hline
- Alpha & Beta & Gamma\footnote{Hello} \\
+ Alpha & Beta & Gamma \\
\hline
Epsilon & Zeta & Eta \\
\hline
@@ -1401,7 +1638,7 @@ Alpha & Beta & Gamma \\
%\hline
% Phi & Chi & Psi \\
\hline
- \SetRow{blue7} Foot & Foot & Foot \\
+ Foot & Foot & Foot \\
\hline
\end{longtblr}
@@ -1431,16 +1668,18 @@ The source code for the above long table is shown below. It is mainly self-expla
remark{Source} = {Made up by myself. Made up by myself. Made up by myself.},
]{
colspec = {XXX}, width = 0.85\linewidth,
- row{odd} = {gray9}, row{even} = {brown9}, rowhead = 2, rowfoot = 1,
+ rowhead = 2, rowfoot = 1,
+ row{odd} = {gray9}, row{even} = {brown9},
+ row{1-2} = {purple7}, row{Z} = {blue7},
}
\hline
- \SetRow{purple7} Head & Head & Head \\
+ Head & Head & Head \\
\hline
- \SetRow{purple7} Head & Head & Head \\
+ Head & Head & Head \\
\hline
Alpha & Beta & Gamma \\
\hline
- Epsilon & Zeta\TblrNote{a} & Eta \\
+ Epsilon & Zeta\TblrNote{a} & Eta \\
\hline
Iota & Kappa\TblrNote{$\dag$} & Lambda \\
\hline
@@ -1464,7 +1703,7 @@ The source code for the above long table is shown below. It is mainly self-expla
\hline
Phi & Chi & Psi \\
\hline
- \SetRow{blue7} Foot & Foot & Foot \\
+ Foot & Foot & Foot \\
\hline
\end{longtblr}
\end{codehigh}
@@ -1489,33 +1728,43 @@ Their options are outer specifications and should be put in the optional argumen
\begin{spectblr}[
caption = {Outer Specifications for Table Heads and Table Foots}
-]{}
+]{verb}
Key Nama & Key Description & Initial Value \\
\V{headsep} & vertical space between table head and table body & \V{6pt} \\
\V{footsep} & vertical space between table foot and table body & \V{6pt} \\
- \V{presep} & vertical space between table head and the above text & \texttt{1.5\string\bigskipamount} \\
- \V{postsep} & vertical space between table foot and the below text & \texttt{1.5\string\bigskipamount} \\
- \V{theme} & table theme (including settings for templates and styles) & None \\
- \V{caption} & table caption & None \\
- \V{entry} & short table caption to be put in List of Tables & None \\
- \V{label} & table label & None \\
- \V{note\{<name>\}} & table note with \V{<name>} as tag & None \\
- \V{remark\{<name>\}} & table remark with \V{<name>} as tag & None \\
+ \V{presep} & vertical space between table head and the above text & \verb!1.5\bigskipamount! \\
+ \V{postsep} & vertical space between table foot and the below text & \verb!1.5\bigskipamount! \\
+ \V{theme} & table theme (including settings for templates and styles) & \None \\
+ \V{caption} & table caption & \None \\
+ \V{entry} & short table caption to be put in List of Tables & \None \\
+ \V{label} & table label & \None \\
+ \V{note\{<name>\}} & table note with \V{<name>} as tag & \None \\
+ \V{remark\{<name>\}} & table remark with \V{<name>} as tag & \None \\
\end{spectblr}
+If you write \verb!entry=none!, \verb!tabularray! package will not add an entry in List of Tables.
+Therefore \verb!caption=text,entry=none! is similar to \verb!\caption[]{text}! in \verb!longtable!.
+
+If you write \verb!label=none!, \verb!tabularray! package will not step \verb!table! counter,
+and set the \verb!caption-tag! and \verb!caption-sep! elements (see below) to empty.
+Therefore \verb!caption=text,entry=none,label=none! is similar to \verb!\caption*{text}!
+in \verb!longtable!, except for the counter.
+
\section{Customize Templates}
\subsection{Overview of Templates}
-The template system for table heads and table foots in \verb!tabularray! is largely inspired by \verb!beamer!,
-\verb!caption! and \verb!longtable! packages. You can use \verb!\DefTblrTemplate! command to define and
-modify templates, and \verb!\SetTblrTemplate! command to choose default templates. In defining templates,
+The template system for table heads and table foots in \verb!tabularray! is largely inspired
+by \verb!beamer!, \verb!caption! and \verb!longtable! packages. For elements in Table \ref{tblr:element},
+you can use \verb!\DefTblrTemplate! to define and modify templates,
+and use \verb!\SetTblrTemplate! to choose default templates. In defining templates,
you can include other templates with \verb!\UseTblrTemplate! and \verb!\ExpTblrTemplate! commands.
\begin{spectblr}[
- caption = {Templates for Table Heads and Table Foots}
+ caption = {Elements for Table Heads and Table Foots},
+ label = {tblr:element},
]{}
- Template Name & Template Description \\
+ Element Name & Element Description and Default Template \\
\V{contfoot-text}& continuation text in the foot, normally ``Continued on next page'' \\
\V{contfoot} & continuation paragraph in the foot, normally including \V{contfoot-text} template \\
\V{conthead-text}& continuation text in the head, normally ``(Continued)'' \\
@@ -1542,10 +1791,13 @@ you can include other templates with \verb!\UseTblrTemplate! and \verb!\ExpTblrT
\V{foot} & setting all of \V{firstfoot}, \V{middlefoot} and \V{lastfoot} \\
\end{spectblr}
-A template which only includes short text is called a \underline{sub template}.
-Normally there is one \verb!-! in the name of a sub template.
-A template which includes one or more paragraphs is called a \underline{main template}.
-Normally there isn't any \verb!-! in the name of a main template.
+An element which only includes short text is called a \underline{sub element}.
+Normally there is one \verb!-! in the name of a sub element.
+An element which includes one or more paragraphs is called a \underline{main element}.
+Normally there isn't any \verb!-! in the name of a main element.
+
+For each of the above elements, two templates \verb!normal! and \verb!empty! are always defined.
+You can select one of them with \verb!\SetTblrTemplate! command.
\subsection{Continuation Templates}
@@ -1560,7 +1812,7 @@ Let us have a look at the code for defining templates of continuation text first
In the above code, command \verb!\DefTblrTemplate! defines the templates with name \verb!normal!,
and then command \verb!\SetTblrTemplate! sets the templates with name \verb!normal! as default.
-The \verb!normal! template is always defined and set as default for any template element in \verb!tabularray!.
+The \verb!normal! template is always defined and set as default for any element in \verb!tabularray!.
Therefore you had better use another name when defining new templates.
If you use \verb!default! as template name in \verb!\DefTblrTemplate!,
@@ -1574,8 +1826,8 @@ Therefore the above code can be written in another way:
You may modify the code to customize continuation text to fit your needs.
-The \verb!contfoot! and \verb!conthead! templates normally
-include their sub templates with \verb!\UseTblrTemplate! commands.
+The templates for \verb!contfoot! and \verb!conthead! normally
+include the templates of their sub elements with \verb!\UseTblrTemplate! commands.
But you can also handle user settings such as horizontal alignment here.
\begin{codehigh}
@@ -1688,19 +1940,10 @@ Note that you can define the same template for multiple elements in \verb!\DefTb
\section{Change Styles}
-You may change the styles of template elements.
-
-\begin{codehigh}
-\SetTblrStyle{firsthead}{font=\bfseries}
-\SetTblrStyle{firstfoot}{fg=blue2}
-\SetTblrStyle{middlefoot}{\itshape}
-\SetTblrStyle{caption-tag}{red2}
-\end{codehigh}
-
All available keys for template elements are described in Table \ref{key:element}.
\begin{spectblr}[
- caption = {Keys for the Styles of Template Elements},
+ caption = {Keys for the Styles of Elements},
label = {key:element},
remark{Note} = {In most cases, you can omit the underlined key names and write only their values.
The keys \K{halign}, \K{indent} and \K{hang} are only for main templates.}
@@ -1713,9 +1956,18 @@ All available keys for template elements are described in Table \ref{key:element
\K{hang} & hangindent value \\
\end{spectblr}
+You may change the styles of elements with \verb!\SetTblrStyle! command:
+
+\begin{codehigh}
+\SetTblrStyle{firsthead}{font=\bfseries}
+\SetTblrStyle{firstfoot}{fg=blue2}
+\SetTblrStyle{middlefoot}{\itshape}
+\SetTblrStyle{caption-tag}{red2}
+\end{codehigh}
+
When you write \verb!\UseTblrTemplate{element}{default}! in defining a template,
-beside including the code of template \verb!element!, the foreground color and font commands
-of the template \verb!element! will be set up automatically.
+beside including template code of the \verb!element!, the foreground color and font commands
+of the \verb!element! will be set up automatically.
In contrast, \verb!\ExpTblrTemplate{element}{default}! will only include template code.
\section{Define Themes}
@@ -1736,14 +1988,39 @@ a theme consists of some template and style settings. For example:
After defining the theme \verb!fancy!, you can use it
by writing \verb!theme=fancy! in the optional argument of \verb!longtblr! environment.
-\chapter{Use Some Libraries}
+\section{Control Page Breaks}
-\mywarning{chapter}
+Just like \verb!longtable! package, inside \verb!longtblr! environment,
+you can use \verb!\\*! or \verb!\nopagebreak! to prohibit a page break,
+and use \verb!\pagebreak! to force a page break.
+
+\section{Floatable Tall Tables}
+
+There is also a \verb!talltblr! environment as an alternative to \verb!threeparttable! environment.
+It can not cross multiple pages, but it can be put inside \verb!table! environment.
+
+\begin{demohigh}
+TEXT\begin{talltblr}[
+ caption = {Long Long Long Long Tabular},
+ entry = {Short Caption},
+ label = {tblr:tall},
+ note{a} = {It is the first footnote.},
+ note{$\dag$} = {It is the second long long long long long long footnote.},
+]{
+ colspec = {XXX}, width = 0.5\linewidth, hlines,
+}
+ Alpha & Beta & Gamma \\
+ Epsilon & Zeta & Eta\TblrNote{a} \\
+ Iota & Kappa & Lambda\TblrNote{$\dag$} \\
+\end{talltblr}TEXT
+\end{demohigh}
+
+\chapter{Use Some Libraries}
The \verb!tabularray! package emulates or fixes some commands in other packages.
To avoid potential conflict, you need to enable them with \verb!\UseTblrLibrary! command.
-\section{Library \V{booktabs}}
+\section{Library \texttt{booktabs}}
When you write \verb!\UseTblrLibrary{booktabs}!,
\verb!tabularray! package will define commands \verb!\toprule!, \verb!\midrule!,
@@ -1764,6 +2041,7 @@ When you write \verb!\UseTblrLibrary{booktabs}!,
\end{demohigh}
At this moment, \verb!trim! options for \verb!\cmidrule! command are not supported.
+(As a workaround, you may insert an empty column to separate two \verb!\cmidrule!'s.)
But rule colors are possible just like \verb!\hline! and \verb!\cline! commands.
\begin{demohigh}
@@ -1780,7 +2058,7 @@ But rule colors are possible just like \verb!\hline! and \verb!\cline! commands.
\end{tblr}
\end{demohigh}
-\section{Library \V{diagbox}}
+\section{Library \texttt{diagbox}}
When writing \verb!\UseTblrLibrary{diagbox}! in the preamble of the document,
\verb!tabularray! package loads \verb!diagbox! package,
@@ -1815,48 +2093,70 @@ $\begin{tblr}{|c|cc|}
\end{tblr}$
\end{demohigh}
-\section{Library \V{siunitx}}
+\section{Library \texttt{siunitx}}
When writing \verb!\UseTblrLibrary{siunitx}! in the preamble of the document,
\verb!tabularray! package loads \verb!siunitx! package,
-and defines \verb!S! column for \verb!tblr! environment.
+and defines \verb!S! column as \verb!Q! column with \verb!si! key.
+
+\begin{demohigh}
+\begin{tblr}{
+ hlines, vlines,
+ colspec={
+ S[table-format=3.2]
+ S[table-format=3.2]
+ S[table-format=3.2]
+ }
+}
+ {{{Head}}} & {{{Head}}} & {{{Head}}} \\
+ 111 & 111 & 111 \\
+ 2.1 & 2.2 & 2.3 \\
+ 33.11 & 33.22 & 33.33 \\
+\end{tblr}
+\end{demohigh}
\begin{demohigh}
\begin{tblr}{
hlines, vlines,
colspec={
- S[table-format=2.2]
- S[table-format=2.2]
- S[table-format=2.2]
+ Q[si={table-format=3.2},c]
+ Q[si={table-format=3.2},c]
+ Q[si={table-format=3.2},c]
}
}
{{{Head}}} & {{{Head}}} & {{{Head}}} \\
- 11 & 11 & 11 \\
+ 111 & 111 & 111 \\
2.1 & 2.2 & 2.3 \\
33.11 & 33.22 & 33.33 \\
\end{tblr}
\end{demohigh}
Note that you need to use \underline{triple} pairs of braces to guard non-numeric cells.
-If you need to apply other specifications for the \verb!S! columns,
-you need to move \verb!siunitx! options into \verb!si! keys of the \verb!Q! columns.
+
+Also you must use \verb!l!, \verb!c! or \verb!r! to set horizontal alignment for non-numeric cells:
\begin{demohigh}
\begin{tblr}{
- hlines, vlines,
+ hlines, vlines, columns={6em},
colspec={
- Q[si={table-format=2.2},blue7]
- Q[si={table-format=2.2},teal7]
- Q[si={table-format=2.2},purple7]
+ Q[si={table-format=3.2,table-number-alignment=left},l,blue7]
+ Q[si={table-format=3.2,table-number-alignment=center},c,teal7]
+ Q[si={table-format=3.2,table-number-alignment=right},r,purple7]
}
}
{{{Head}}} & {{{Head}}} & {{{Head}}} \\
- 11 & 11 & 11 \\
+ 111 & 111 & 111 \\
2.1 & 2.2 & 2.3 \\
33.11 & 33.22 & 33.33 \\
\end{tblr}
\end{demohigh}
+Both \verb!S! and \verb!s! columns are supported. In fact, These two columns are defined as follows:
+\begin{codehigh}
+\NewColumnType{S}[1][]{Q[si={##1},c]}
+\NewColumnType{s}[1][]{Q[si={##1},c,cmd=\TblrUnit]}
+\end{codehigh}
+
\chapter{The Source Code}
%\CodeHigh{lite}
diff --git a/support/wp2latex/html2latex.htm b/support/wp2latex/html2latex.htm
index bbe4cd7c1b..2f35ca22a3 100644
--- a/support/wp2latex/html2latex.htm
+++ b/support/wp2latex/html2latex.htm
@@ -3,7 +3,7 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
<meta name="GENERATOR" content="Mozilla/4.7 [en] (X11; I; Linux 2.0.36 i586) [Netscape]">
- <title>WP2LaTeX 2.52</title>
+ <title>WP2LaTeX 3.81</title>
</head>
<body>
diff --git a/support/wp2latex/readme.txt b/support/wp2latex/readme.txt
index 2cc550d13e..f970b0c45c 100644
--- a/support/wp2latex/readme.txt
+++ b/support/wp2latex/readme.txt
@@ -1,4 +1,4 @@
-Introduction to version 3.56 of WP2LaTeX.
+Introduction to version 3.81 of WP2LaTeX.
INTRODUCTION
------------
diff --git a/support/wp2latex/wp2latex.lsm b/support/wp2latex/wp2latex.lsm
index f590a07593..706a748b98 100644
--- a/support/wp2latex/wp2latex.lsm
+++ b/support/wp2latex/wp2latex.lsm
@@ -1,7 +1,7 @@
Begin3
Title: wp2latex
-Version: 3.37
- Entered-date: 2007-07-22
+Version: 3.81
+ Entered-date: 2019-04-17
Description: WP2LaTeX is a program for conversion WordPerfect documents to LaTeX.
All known WP fileformats are supported: MAC WP1.x, WP2,3,4.x,
PC WP WP3.x, WP4.x, WP5.x and WP6,7,8,9,10.x.
diff --git a/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl b/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
index 79157b851e..0e6f2b39f2 100644
--- a/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
+++ b/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
@@ -1,8 +1,5 @@
$mirrors = {
'Africa' => {
- 'Algeria' => {
- 'http://ctan.epst-tlemcen.dz/tex-archive/' => 1,
- },
'Morocco' => {
'https://mirror.marwan.ma/ctan/' => 1,
},
@@ -18,6 +15,7 @@ $mirrors = {
'https://mirrors.aliyun.com/CTAN/' => 1,
'https://mirrors.bfsu.edu.cn/CTAN/' => 1,
'https://mirrors.cqu.edu.cn/CTAN/' => 1,
+ 'https://mirrors.dgut.edu.cn/CTAN/' => 1,
'https://mirrors.hit.edu.cn/CTAN/' => 1,
'https://mirrors.nju.edu.cn/CTAN/' => 1,
'https://mirrors.sjtug.sjtu.edu.cn/ctan/' => 1,
@@ -47,8 +45,8 @@ $mirrors = {
'Korea' => {
'http://ftp.ktug.org/tex-archive/' => 1,
'https://cran.asia/tex/' => 1,
+ 'https://ftp.harukasan.org/CTAN/' => 1,
'https://ftp.kaist.ac.kr/pub/tex-archive/' => 1,
- 'https://mirror.kakao.com/CTAN/' => 1,
'https://mirror.navercorp.com/CTAN/' => 1,
'https://mirror.yongbok.net/ctan/' => 1,
},
@@ -99,6 +97,7 @@ $mirrors = {
'https://ctan.mc1.root.project-creative.net/' => 1,
'https://ctan.mirror.norbert-ruehl.de/' => 1,
'https://ctan.net/' => 1,
+ 'https://ctan.space-pro.be/tex-archive/' => 1,
'https://ftp.agdsn.de/pub/mirrors/latex/dante/' => 1,
'https://ftp.fau.de/ctan/' => 1,
'https://ftp.gwdg.de/pub/ctan/' => 1,
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb b/systems/texlive/tlnet/tlpkg/texlive.tlpdb
index 269b8680e4..822b15d66e 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb
@@ -26,11 +26,11 @@ depend container_split_src_files/1
depend frozen/0
depend minrelease/2016
depend release/2021
-depend revision/60111
+depend revision/60141
name 00texlive.image
category TLCore
-revision 60104
+revision 60141
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
@@ -2083,6 +2083,7 @@ runfiles size=13898
tlpkg/tlpsrc/hvarabic.tlpsrc
tlpkg/tlpsrc/hvfloat.tlpsrc
tlpkg/tlpsrc/hvindex.tlpsrc
+ tlpkg/tlpsrc/hvlogos.tlpsrc
tlpkg/tlpsrc/hvqrurl.tlpsrc
tlpkg/tlpsrc/hycolor.tlpsrc
tlpkg/tlpsrc/hypdestopt.tlpsrc
@@ -3547,6 +3548,7 @@ runfiles size=13898
tlpkg/tlpsrc/sciposter.tlpsrc
tlpkg/tlpsrc/sclang-prettifier.tlpsrc
tlpkg/tlpsrc/scontents.tlpsrc
+ tlpkg/tlpsrc/scrambledenvs.tlpsrc
tlpkg/tlpsrc/scratch.tlpsrc
tlpkg/tlpsrc/scratch3.tlpsrc
tlpkg/tlpsrc/scratchx.tlpsrc
@@ -4434,7 +4436,7 @@ depend setting_available_architectures:aarch64-linux amd64-freebsd amd64-netbsd
name 00texlive.installer
category TLCore
-revision 60108
+revision 60131
shortdesc TeX Live standalone installer package
longdesc This package defines the files to go into the installer
longdesc archives (install-tl-unx.tar.gz, install-tl.zip) built by the
@@ -33948,7 +33950,7 @@ catalogue-version 0.2
name beaulivre
category Package
-revision 60090
+revision 60121
shortdesc Write your books in a colorful way
relocated 1
longdesc This package provides a LaTeX class for typesetting books with
@@ -33961,11 +33963,11 @@ longdesc on colorist.sty from the colorist package. The package name
longdesc "beaulivre" is taken from the French words "beau" (=
longdesc "beautiful") and "livre" (= "book").
depend colorist
-containersize 3372
-containerchecksum 44f045a21b59748e3ff3e925a324b8e7d2972b30b534be4d7ed71932d5e435ef4c3ac501e3ce5a5541ef811c3df55e1c2f50f7dd29ae1860f394500e333bbb30
-doccontainersize 695532
-doccontainerchecksum 5b8e68e611477d5eacbf6c4b1d6f1bbea8ce64c5879731a8aba37f9f5d963ec8b0d41f6bf21df6396aaf94f49f1af11360a1edd291629596d2f96550ac80b637
-docfiles size=203
+containersize 3416
+containerchecksum eba792682b35d46a5d359110d95725aedc8392ee8f45759454d82a215554e30c94f26c020b2a6de316e57099778f24881befcdbca01fc0c389a381168382d9d1
+doccontainersize 703232
+doccontainerchecksum 79cedb93e35f5057346a1155d48615df472f1cc21463a91f355edd12114e6c279d62797d13e339078ec9501b9f7718270ca54b3fa583b6483716ab1f88976f5f
+docfiles size=204
RELOC/doc/latex/beaulivre/LICENSE
RELOC/doc/latex/beaulivre/README.md details="Readme"
RELOC/doc/latex/beaulivre/beaulivre-doc-cn.pdf details="Package documentation (Chinese)" language="zh"
@@ -53378,7 +53380,7 @@ catalogue-version 1.0
name chemfig
category Package
-revision 58014
+revision 60135
shortdesc Draw molecules with easy syntax
relocated 1
longdesc The package provides the command \chemfig{<code>}, which draws
@@ -53388,11 +53390,11 @@ longdesc produced are essentially 2-dimensional, the package supports
longdesc many of the conventional notations for illustrating the
longdesc 3-dimensional layout of a molecule. The package uses TikZ for
longdesc its actual drawing operations.
-containersize 26356
-containerchecksum ac0f3fff6f24fe83c3a1cd7bfd456cf187c57ae66776c672aab980d267d9552b7b480b0244e3d2e1c8d9f39f1d6524f9e882fc8a71be9fc8a5c0263d4899f718
-doccontainersize 2050380
-doccontainerchecksum c8721852c551909c7ded202793a5c1c999d522f3217e9c4fe7a9c4307b7ee054ca360ae72d0d12ea09ac3b538445d79a5d103493c7e14f669762debd2eb92536
-docfiles size=637
+containersize 26480
+containerchecksum 95a57f962e6f15d5e2bebc00491c60ab904afb739a0ae438346c57ffc47ed23109d436ff0f1f0ec2226d6e215d185a39e014ed24413066157c2830a1fabcee2c
+doccontainersize 2074452
+doccontainerchecksum f94ed7e4133a3c7122580f01a415922480257110e6c675ea816c15eebb3efe0ce40675bc6d6c99f02d3605dcb53c63426c6fbe23373336aeb29979a75f323e31
+docfiles size=653
RELOC/doc/generic/chemfig/README details="Readme"
RELOC/doc/generic/chemfig/chemfig-en.pdf details="Package documentation (English)" language="en"
RELOC/doc/generic/chemfig/chemfig-en.tex
@@ -53407,7 +53409,7 @@ catalogue-contact-repository https://framagit.org/unbonpetit/chemfig/tree/master
catalogue-ctan /macros/generic/chemfig
catalogue-license lppl1.3c
catalogue-topics graphics diagram chemistry pgf-tikz macro-gen etex
-catalogue-version 1.6a
+catalogue-version 1.6b
name chemformula
category Package
@@ -67343,7 +67345,7 @@ containerchecksum 0568a3251d71fb3106fbb3961427200419ae1df22d39b5e72c608e2d94fc35
name collection-latexextra
category Collection
-revision 60104
+revision 60141
shortdesc LaTeX additional packages
relocated 1
longdesc A very large collection of add-on packages for LaTeX.
@@ -67955,6 +67957,7 @@ depend href-ul
depend hrefhide
depend huawei
depend hvindex
+depend hvlogos
depend hvqrurl
depend hypdestopt
depend hypdvips
@@ -68424,6 +68427,7 @@ depend scanpages
depend schedule
depend schooldocs
depend scontents
+depend scrambledenvs
depend scrlayer-fancyhdr
depend scrlttr2copy
depend sdaps
@@ -68730,8 +68734,8 @@ depend ziffer
depend zref
depend zwgetfdate
depend zwpagelayout
-containersize 6392
-containerchecksum ce19662978f47ddd7fd7aadd45cc30d75a4bb1fed8136b2ee74d8e6523603207f28ec02c89448c1bb8c021ba0523188cc85c1953f7fcf864a5a6a5cad90d2f64
+containersize 6408
+containerchecksum 86f7d4f0d85a417ac350fdf507f27e4353d9b318027693a7a9fd9ea476c38b4a880f97a014361ccf9419eaa15bfbc04d264410bd3f3d802346c08f5a78f3348f
name collection-latexrecommended
category Collection
@@ -70193,7 +70197,7 @@ catalogue-version 0.2
name colorist
category Package
-revision 60090
+revision 60121
shortdesc Write your articles or books in a colorful way
relocated 1
longdesc This package offers you a LaTeX style file and two classes to
@@ -70208,11 +70212,11 @@ longdesc LuaLaTeX. Currently they have native support for Chinese (both
longdesc simplified and traditional), English, French, German, Italian,
longdesc Japanese, Portuguese (European and Brazilian), Russian and
longdesc Spanish typesetting, and also use more beautiful fonts.
-containersize 9604
-containerchecksum e54ada282c36daf5279a92726c7ab4050a6c7ea98708ec76add5ae5bb4507a4d83a29cf75d794dffec022152b0597630f39b29b63564a147fdf90d048eb75671
-doccontainersize 105220
-doccontainerchecksum 03b127046d362bf3d6eb42f68422230bd45edbb7500566590d3c602debb99eb7c8504fe794fdb0507fc31566d87019525a1be8c57741cc8e3edf0dfa85dec93c
-docfiles size=36
+containersize 9728
+containerchecksum 5f24c24d8d84f2637e03f7dffecf7d1d4ad51a41dda27cf017b2f2bd2494bc406f77267923365ce03556e0285c0f6378b561c61538c6f9816aa0916e65af27a8
+doccontainersize 106812
+doccontainerchecksum a7d977c4f3f4f91b1196c1b98b613847059f8f8d514c1c937e1be5c55185a9e3b1f0421a1301d1877040bedea60e1f0f97139a0212a5a49cddb2046ecb873b6b
+docfiles size=37
RELOC/doc/latex/colorist/LICENSE
RELOC/doc/latex/colorist/README.md details="Readme"
RELOC/doc/latex/colorist/colorist-doc.pdf details="Package documentation"
@@ -99039,21 +99043,22 @@ catalogue-topics notes editorial
name easybook
category Package
-revision 60091
+revision 60136
shortdesc Typeset Chinese theses or books
relocated 1
longdesc Easybook is a minimalist style template based on the ctexbook
longdesc book document class.
-containersize 16496
-containerchecksum bcd7e55fe6d075d5cded1b35a18ba9e45eeae292c674515f0f81618e382d652e104bffbcb2ffd17c308b06f74f30febb9522cde788add462e001d0cd7766a33d
-doccontainersize 596404
-doccontainerchecksum f8f4148192aaa71b8e16b4409a75df4545cfbcd06fb5a2d80b8f015638f78fb7b3cac14ae7bc5904c82c05d3ab4a017137e101701942225354458bee42279fcb
-docfiles size=147
+containersize 16872
+containerchecksum a94d28f0c5fc859c0dc2ef0f13d89c67fe0dd553476ed6c34fd05026a26e79334d2fc82607b00e640544775699b310df917b25f3f2d2f9c6677d84bc5d54e81a
+doccontainersize 591432
+doccontainerchecksum 29428afe49105e3895aa163501f59ad97c33d10f1561cb655c276a72bf175195088ed15280a3b9b89c4494b78e8ed3961c0be3d7b7e1662bfc6bdaf871f035f0
+docfiles size=160
RELOC/doc/latex/easybook/README.md details="Readme"
RELOC/doc/latex/easybook/easybook.pdf details="Package documentation" language="zh"
-srccontainersize 38108
-srccontainerchecksum fb6d21d32f8d57425bd7f47b011f087e26fe98f3d41e458bac1d59896dfdfb3483ca59fe3e90e5a2d7872f7a33c31d14e7c42ec69afebd990f380c3f9ffd3e32
-srcfiles size=40
+ RELOC/doc/latex/easybook/easybook.tex
+srccontainersize 16920
+srccontainerchecksum f1e527d0c95732ac4001a302c02255fa1c71f00bc219cde205b0f8242576246a40ae212aa8c22ef4ddf3d72bbfbe3c20d79dfcd5ba37478b826b24bf5985eafd
+srcfiles size=21
RELOC/source/latex/easybook/easybook.dtx
RELOC/source/latex/easybook/easybook.ins
runfiles size=21
@@ -99065,7 +99070,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.27R
+catalogue-version 1.28
name easyfig
category Package
@@ -103744,7 +103749,7 @@ catalogue-topics collection
name einfart
category Package
-revision 60090
+revision 60121
shortdesc Write your articles in a simple and clear way
relocated 1
longdesc This package provides a LaTeX class for typesetting articles
@@ -103758,11 +103763,11 @@ longdesc package. The package name "einfart" is taken from the German
longdesc word "einfach" ("simple"), combined with the first three
longdesc letters of "Artikel" ("article").
depend minimalist
-containersize 3524
-containerchecksum 39c6fa2df0a5409f78437715f581313df9ce506beff552d053459facc9d3b9ef35ef5670ec53b5e34f6e67dd2ca1899ab4f22007694ec86de01b32f529495d2f
-doccontainersize 568524
-doccontainerchecksum 89552cc996918b43619b52ca3fd6be6d1065e17e25d3f4d6dcd7e2256524b7210460a50f955658a6feb8837584b66a799dc92bbb4d3857c9b0979f332caf01a0
-docfiles size=169
+containersize 3564
+containerchecksum f202784adcd3cbb1dfebf6d9569d62ce69df2ff5cbce894d45faa65a54bcd4e05390166367a15036691db2b9551d4ff55331ff09ed9ff9c975799f47c2194945
+doccontainersize 575856
+doccontainerchecksum d8708ae2c8d35210959b3332ed4aa3e637b2c7344dc0859f510418d5aa4ecb46f9feeae54923aec2a15310c0598c3ae67a2a6de79cbb064b3b6a8ebd1285e420
+docfiles size=173
RELOC/doc/latex/einfart/LICENSE
RELOC/doc/latex/einfart/README.md details="Readme"
RELOC/doc/latex/einfart/einfart-doc-cn.pdf details="Package documentation (Chinese)" language="zh"
@@ -104676,21 +104681,21 @@ catalogue-version 0.03
name elpres
category Package
-revision 58015
+revision 60137
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, 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 3512
-containerchecksum eb8a18c29e137e4a11ef1a60e43533fbfdaad0872d0681e301a79cbc2fb7d11e7ecd0661b675aa299ce3439f8a238bf3d233fb60fe978eca9f05dc6f916596af
-doccontainersize 469012
-doccontainerchecksum d3720f6be437348f1d556e62948a0326a066b3e865edd07a439e641eb75924ff646793171116fa174bf0d1b61ceb7d8b60639a31ed42150039053b8cedda4f0e
-docfiles size=150
+longdesc The elpres class is intended to be used for presentations on a
+longdesc screen or with a beamer/projector. It is derived from LaTeX's
+longdesc article class and can be used with with LaTeX, pdfLaTeX and
+longdesc LuaLaTeX. The default "virtual paper size" of presentations
+longdesc generated by this class corresponds to a 4:3 (width:height)
+longdesc aspect ratio. Other aspect ratios for widescreen monitors
+longdesc (16:9, 16x:10) may be selected.
+containersize 3736
+containerchecksum f9875efc627dcdf12afd1cddbcbd56af0523d571b0d1fa9407d4fca1f48391ffe4d5dddf6945f662574a67cb7cdf5e478c702bc43ffd4ab660bf9a715532d287
+doccontainersize 461228
+doccontainerchecksum 0cffc84cdc39280540cb373a433544dd26f84ffe93416c5a15b8c8fd34f6ffe9afe83380bb63cc051f569c52fdbe9eb71fc5d502b18f93e9a90b289545ab46a0
+docfiles size=149
RELOC/doc/latex/elpres/README.md details="Readme"
RELOC/doc/latex/elpres/ctan-lion.png
RELOC/doc/latex/elpres/elpres-example.pdf details="Example of use"
@@ -104718,7 +104723,7 @@ catalogue-contact-home http://vkiefel.de/elpres.html
catalogue-ctan /macros/latex/contrib/elpres
catalogue-license lppl
catalogue-topics presentation class electronic
-catalogue-version 0.8
+catalogue-version 0.9
name els-cas-templates
category Package
@@ -111376,7 +111381,7 @@ catalogue-version 1.1.4
name exam-randomizechoices
category Package
-revision 49662
+revision 60125
shortdesc Randomize mc choices using the exam class
relocated 1
longdesc This package is an extension to the exam document class. It
@@ -111388,25 +111393,25 @@ longdesc questions. The questions themselves cannot be randomized with
longdesc this package. Furthermore, the package provides a simple answer
longdesc key table typesetter and has a command for writing the answer
longdesc keys to an external file.
-containersize 5352
-containerchecksum 0cb93637dda7a7813f8f89dba62db03cb1c1c6da5ce5dae596a14321fab8c46a5c6d67432c31855b66b37b0eb9086d23b5bf2881bf8fa41e410ed7a4724d84bc
-doccontainersize 278136
-doccontainerchecksum 74daa43aa020898bf2a969e5f6fa09aea190209dd71eab222dde2b30cf2f6e12936b454a62b328aee59f6c3ae13bf5f7005ec3aba66766ade77672f74bb3ee8b
-docfiles size=82
+containersize 5620
+containerchecksum b6650105435a758ab59d705f1b7ec691c56549376f914efae023db2b40bcc290cd080db81a0ab2a304195774b8c6685ca6e78b95519590984ac7d82ea62f3fbc
+doccontainersize 313716
+doccontainerchecksum 898a7ed9df2238b59e956f115b969e74f29649086ca4801e35ab3752c68a9b21b2757d712c75161e5092002dd4b30f0a1f294b86e100b579c0112de547c3b5b8
+docfiles size=95
RELOC/doc/latex/exam-randomizechoices/README.md details="Package Readme"
RELOC/doc/latex/exam-randomizechoices/exam-randomizechoices-doc.pdf details="Package documentation"
RELOC/doc/latex/exam-randomizechoices/exam-randomizechoices-doc.tex
- RELOC/doc/latex/exam-randomizechoices/exam-randomizechoices.pdf
+ RELOC/doc/latex/exam-randomizechoices/exam-randomizechoices.pdf details="Example of use"
RELOC/doc/latex/exam-randomizechoices/exam-randomizechoices.tex
runfiles size=6
RELOC/tex/latex/exam-randomizechoices/exam-randomizechoices.sty
catalogue-also exam
-catalogue-contact-repository https://bitbucket.org/jesseopdenbrouw/exam-randomizechoices
+catalogue-contact-repository https://github.com/jesseopdenbrouw/exam-randomizechoices
catalogue-contact-support mailto:J.E.J.opdenBrouw@hhs.nl
catalogue-ctan /macros/latex/contrib/exam-randomizechoices
catalogue-license lppl1.3
catalogue-topics exam
-catalogue-version 0.1
+catalogue-version 0.2
name examdesign
category Package
@@ -138275,6 +138280,30 @@ catalogue-license lppl
catalogue-topics index
catalogue-version 0.04
+name hvlogos
+category Package
+revision 60126
+shortdesc Print TeX-related names as logo
+relocated 1
+longdesc This package is more or less an extension to Heiko Oberdiek's
+longdesc package hologo. It prints TeX-related names as logos. The
+longdesc package requires fetamont, hologo, dantelogo, and xspace.
+containersize 2332
+containerchecksum 3074684e379ccdc6b85225673db237b10725eef3ea4c2e6b69c0748976d29b1ecc4d2359ab21d9b1a4a00b5fb8524f8c0eaf9fe2f4e084ce7250e2552f599511
+doccontainersize 75544
+doccontainerchecksum 7aa41d28e21347e4a01e455e2432ff449b4a8c5e69da01eeabdee33687aa5decaf130b0847335feabc1aa1ed15e56895ebf25ab4ad9b02ef412087ed08a2e69b
+docfiles size=22
+ RELOC/doc/latex/hvlogos/Changes
+ RELOC/doc/latex/hvlogos/README details="Readme"
+ RELOC/doc/latex/hvlogos/hvlogos-doc.pdf details="Package documentation"
+ RELOC/doc/latex/hvlogos/hvlogos-doc.tex
+runfiles size=2
+ RELOC/tex/latex/hvlogos/hvlogos.sty
+catalogue-ctan /macros/latex/contrib/hvlogos
+catalogue-license lppl
+catalogue-topics logo
+catalogue-version 0.01
+
name hvqrurl
category Package
revision 59256
@@ -141136,7 +141165,7 @@ catalogue-version 1.0.0
name iexec
category Package
-revision 59909
+revision 60138
shortdesc Execute shell commands and input their output
relocated 1
longdesc With the help of the \iexec command, you can execute a shell
@@ -141145,10 +141174,10 @@ longdesc package also lets you use any special symbols inside your
longdesc command.
depend tools
depend xkeyval
-containersize 1480
-containerchecksum 7d68a8f0e25f740dfb2443f2407719bb92eb63cfdfe624d87c7162a9f5c68cf48640dd0c8cf0e31c244351da910bd46914e25d85fba54f41f1f27b29c7fe905f
-doccontainersize 111352
-doccontainerchecksum 317387986226387a633d1027965038e88cf071058e41fe75e255c39efa6b633ff88775fbaf82e939cd3db6a82e7aec6ff07b781f0e1c81c0bcd9daf71bb14903
+containersize 1520
+containerchecksum a00220e8b516556e3db1a676fab6e72f6800bce5e68ef3c6b3c57d99d62285b86df02a7a488713a64e23d63cd7457d277510ee77b3587edc065f5458b1396af9
+doccontainersize 111152
+doccontainerchecksum 56c204e92d1539d6f599de728c05c6f8857393c9e8d577f36ad5f21fa3c64f73e226fad5606272fc00eacd352f9db56984acd115b0ba0f4517196da65e93a4dc
docfiles size=30
RELOC/doc/latex/iexec/DEPENDS.txt
RELOC/doc/latex/iexec/README.md details="Readme"
@@ -141161,7 +141190,7 @@ catalogue-contact-repository https://github.com/yegor256/iexec
catalogue-ctan /macros/latex/contrib/iexec
catalogue-license mit
catalogue-topics sys-supp
-catalogue-version 0.3.1
+catalogue-version 0.4.0
name ifallfalse
category Package
@@ -143929,7 +143958,7 @@ catalogue-version 2.2
name install-latex-guide-zh-cn
category Package
-revision 59819
+revision 60134
shortdesc A short introduction to LaTeX installation written in Chinese
relocated 1
longdesc This package will introduce the operations related to
@@ -143938,10 +143967,10 @@ longdesc macro packages, and compiling simple documents on Windows 10,
longdesc Ubuntu 20.04, and macOS systems, and mainly introducing command
longdesc line operations.
containersize 568
-containerchecksum 6f139a2fa51a5eb7feab49eace802e5f20f2a1dfca48baa0f37e253fffee08053f40d6b35fdd3c563bc40875ed5cff5bb983954da2caa113118dc9021b6688a4
-doccontainersize 767420
-doccontainerchecksum 9ef0e733c8142fff6d5f14b9230f526485724e02a58d0c7113014a055509ee170450ecbd4fb5e048450d190978b918bb9a1d1a104693728b2c7a29c5b1e152f0
-docfiles size=219
+containerchecksum 249765a02f1f575578406c8e46aea25d5866d55ffd739958803d34344d10a87190db42415149154e54ce756c0fb3a31325979e04095923b9381a6149675fa813
+doccontainersize 769484
+doccontainerchecksum 28bad95a2ca0e7f23e458d2abcb03da2394d0313db4e3ebe2f6c1501ca34a6105310768c9972977974298a06e3ba074925a03666ec2c3ebfd515cc2cf1e8d2f4
+docfiles size=220
RELOC/doc/latex/install-latex-guide-zh-cn/LICENSE
RELOC/doc/latex/install-latex-guide-zh-cn/README.md details="Readme"
RELOC/doc/latex/install-latex-guide-zh-cn/appendix/mirror.tex
@@ -143963,7 +143992,7 @@ catalogue-contact-repository https://github.com/OsbertWang/install-latex-guide-z
catalogue-ctan /info/install-latex-guide-zh-cn
catalogue-license lppl1.3c
catalogue-topics chinese-doc tutorial
-catalogue-version 2021.7.3
+catalogue-version 2021.8.1
name installfont
category Package
@@ -168212,17 +168241,17 @@ catalogue-topics version-control doc-mgmt
name latexindent
category Package
-revision 60045
+revision 60132
shortdesc Indent a LaTeX document, highlighting the programming structure
longdesc The Perl script (also available as a windows executable)
longdesc processes a LaTeX file, indenting parts so as to highlight the
longdesc structure for the reader.
depend latexindent.ARCH
-containersize 63476
-containerchecksum 8011f24a50449721255b09737e9fb7cbf0560eecf6556676289ccaccaff4d003db6b4256597ce1a59a826222b6a6d9bc21ea509611214eba655283ddd4bf332f
-doccontainersize 1030844
-doccontainerchecksum f2ebb0c49974957d8855620a8746a308cbb30f6bdd2fec3c9c25c897ecd228f6daa064a1c43e089eaff6efc01d823e665c65766d8a54dfd349fcce44772ebf9b
-docfiles size=350
+containersize 64260
+containerchecksum d86df485963a13a40bc9070d204ff37750b6390e25d9fe6171777d4392f562eb3c0f1f2524dd09b880dfa1be5bd1e9bf37e4d95429b875a91616a06d542f9351
+doccontainersize 1034864
+doccontainerchecksum 9dc6ae1c8b9fc4e15d3907c64bf437c5174dc32961240138d9371c96fed35e95698712d800804bf8649fbce8b4819ba3808fc4c3749d55fbccf6b430bb075861
+docfiles size=355
texmf-dist/doc/support/latexindent/README details="Readme"
texmf-dist/doc/support/latexindent/appendices.tex
texmf-dist/doc/support/latexindent/cmhlistings.tex
@@ -168243,10 +168272,14 @@ docfiles size=350
texmf-dist/doc/support/latexindent/sec-introduction.tex
texmf-dist/doc/support/latexindent/sec-replacements.tex
texmf-dist/doc/support/latexindent/sec-the-m-switch.tex
+ texmf-dist/doc/support/latexindent/subsec-combine-text-wrap-para-line-breaks.tex
texmf-dist/doc/support/latexindent/subsec-commands-and-their-options.tex
- texmf-dist/doc/support/latexindent/subsec-conflicting-poly-switches.tex
texmf-dist/doc/support/latexindent/subsec-noAdditionalIndent-indentRules.tex
- texmf-dist/doc/support/latexindent/subsec-partnering-poly-switches.tex
+ texmf-dist/doc/support/latexindent/subsec-one-sentence-per-line.tex
+ texmf-dist/doc/support/latexindent/subsec-poly-switches.tex
+ texmf-dist/doc/support/latexindent/subsec-remove-para-line-breaks.tex
+ texmf-dist/doc/support/latexindent/subsec-text-wrap-summary.tex
+ texmf-dist/doc/support/latexindent/subsec-text-wrap.tex
texmf-dist/doc/support/latexindent/subsubsec-commands-with-arguments.tex
texmf-dist/doc/support/latexindent/subsubsec-environments-and-their-arguments.tex
texmf-dist/doc/support/latexindent/subsubsec-environments-with-items.tex
@@ -168255,7 +168288,7 @@ docfiles size=350
texmf-dist/doc/support/latexindent/subsubsec-no-add-remaining-code-blocks.tex
texmf-dist/doc/support/latexindent/subsubsec-special.tex
texmf-dist/doc/support/latexindent/title.tex
-runfiles size=129
+runfiles size=130
texmf-dist/scripts/latexindent/LatexIndent/AlignmentAtAmpersand.pm
texmf-dist/scripts/latexindent/LatexIndent/Arguments.pm
texmf-dist/scripts/latexindent/LatexIndent/BackUpFileProcedure.pm
@@ -168301,7 +168334,7 @@ catalogue-contact-repository https://github.com/cmhughes/latexindent.pl
catalogue-ctan /support/latexindent
catalogue-license gpl3
catalogue-topics code-layout
-catalogue-version 3.10.1
+catalogue-version 3.11
name latexindent.aarch64-linux
category Package
@@ -168395,11 +168428,11 @@ binfiles arch=universal-darwin size=1
name latexindent.win32
category Package
-revision 60045
+revision 60132
shortdesc win32 files of latexindent
-containersize 3062052
-containerchecksum d3b9abae4ccf39e36ecb1b20fdcc451615664267884f870abc958234e5f8c7d06c92eabac70590d1ac850d6079cec7ea43a3a03b4d76d05cfad77b40a1b1b0b3
-binfiles arch=win32 size=1557
+containersize 4054156
+containerchecksum b423291bdd571d1420d18690b627c05f98649d90a09ae8f80f3adc91f47267b37e04f5ef73a44a19cc9cff0c8c81693db00b9c6c5cca7352f4216d00ca664021
+binfiles arch=win32 size=2394
bin/win32/latexindent.exe
name latexindent.x86_64-cygwin
@@ -171436,7 +171469,7 @@ catalogue-version 2.1a
name lebhart
category Package
-revision 60090
+revision 60121
shortdesc Write your articles in a colorful way
relocated 1
longdesc This package provides a LaTeX class for typesetting articles
@@ -171449,11 +171482,11 @@ longdesc on colorist.sty from the colorist package. The package name
longdesc "lebhart" is taken from the German word "lebhaft" ("vivid"),
longdesc combined with the first three letters of "Artikel" ("article").
depend colorist
-containersize 3380
-containerchecksum cca6fdee8365b71c9fa3bf14bfd14467e6193698a4c2be366a5284df4dd1cdd54662d650e92df38211851f9237f0a6ff3c5cfe92230e9e315c95550f17bccdab
-doccontainersize 614436
-doccontainerchecksum 7ae472b5062d2c5e5ec1cee508a68fe92276f2ddf9975a064226f1931432d3c0e486e3ed7af11fb1cd0d97b8c4179dbf9f974c1c6479ffc8220c31d43b9d42fa
-docfiles size=178
+containersize 3428
+containerchecksum d8eb99f3af5deb0f4fe7daf820076643bbc9504e05279010cbe49c23cc70a52c1b83a41b97610f0be5912fd74bfc11f75a689e2493aa2be702a56c5a4b0cf85e
+doccontainersize 621512
+doccontainerchecksum 43f82d377d22b63908677a7853536531b38e56dd579ccb7299ef164cac8fc712ab5a7a1f53812388bcc0b7a022278513fc59b617a077af19cb2f6e2defcd21fe
+docfiles size=181
RELOC/doc/latex/lebhart/LICENSE
RELOC/doc/latex/lebhart/README.md details="Readme"
RELOC/doc/latex/lebhart/lebhart-doc-cn.pdf details="Package documentation (Chinese)" language="zh"
@@ -188357,35 +188390,35 @@ binfiles arch=x86_64-solaris size=35
name macrolist
category Package
-revision 60081
+revision 60139
shortdesc List operations for LaTeX2e
relocated 1
longdesc This package provides a list data structure and common list
-longdesc functions such as \listadd, \listremove, \listforeach, as well
-longdesc as \listremovelast (similar to C++'s pop_back) and \listjoin
-longdesc (similar to Javascript's arr.join). Unlike most programming
-longdesc languages, the lists in this package are 1-indexed, meaning the
-longdesc first element is numbered 1, the second element numbered 2, and
-longdesc so on.
-containersize 2316
-containerchecksum 5e875e64117d91b00adb18ffb9efcf7a55d16f22bbf064012120761e7450437bc444f9583f470591049053a9dda3791fcc0b2663713e07ade6b4beb79772ad96
-doccontainersize 189292
-doccontainerchecksum 54bf5f938c0a345ddcff2127302d38c40c922f37c9d49e666a41b137f2d0913c914813fc84e9176314cf1bfc037ea9241b8b41ae215f1b9079f4a970682f1406
+longdesc functions such as \macrolistadd, \macrolistremove,
+longdesc \macrolistforeach, as well as \macrolistremovelast (similar to
+longdesc C++'s pop_back) and \macrolistjoin (similar to Javascript's
+longdesc arr.join). Unlike most programming languages, the lists in this
+longdesc package are 1-indexed, meaning the first element is numbered 1,
+longdesc the second element numbered 2, and so on.
+containersize 2340
+containerchecksum d722a58921aa7f6c5a887c022027df5d04c905f9c1cd7a95df31e1e3d9ad8c583028436eeb35217cb186aee6ea21efff09d3f52fa5284963789ccaeedc3342e7
+doccontainersize 190676
+doccontainerchecksum 21893f581ee47e136a47c56deaee6f9c4e6c5e4380027e22bfb62cf6258502ecb1a647f11dd5468b8687c033e0cc708397efc2499307db320963598228dd3b4b
docfiles size=49
RELOC/doc/latex/macrolist/README.md details="Readme"
RELOC/doc/latex/macrolist/macrolist.pdf details="Package documentation"
-srccontainersize 4336
-srccontainerchecksum 2997f3f7decb6dc4aa6ea3d84308da6b8f1237702a5826cbd73a3b88e7be27a1c71618463009c3ad637f671b3a40e90a18bc9c9275bcc634ca8290fc37251c1d
+srccontainersize 4528
+srccontainerchecksum ee930f3a9d8a909c9c139f47b9022badf50ead0fb95a87a38dc2850e1bf7ea38d346ac362e1aeeb8c2dfb661ce5dca0c3cb78fadaadc0524b080d73d3241d0fd
srcfiles size=5
RELOC/source/latex/macrolist/macrolist.dtx
RELOC/source/latex/macrolist/macrolist.ins
-runfiles size=2
+runfiles size=3
RELOC/tex/latex/macrolist/macrolist.sty
catalogue-contact-repository https://github.com/chennisden/macrolist
catalogue-ctan /macros/latex/contrib/macrolist
catalogue-license lppl1.3
catalogue-topics list macro-supp
-catalogue-version 1.2.1
+catalogue-version 2.1.0
name macros2e
category Package
@@ -192995,17 +193028,17 @@ catalogue-version 0.4
name mcf2graph
category Package
-revision 59974
+revision 60133
shortdesc Draw chemical structure diagrams with Metafont/MetaPost
relocated 1
longdesc The Molecular Coding Format (MCF) is a linear notation for
longdesc describing chemical structure diagrams. This package converts
longdesc MCF to graphic files using Metafont / MetaPost.
-containersize 23868
-containerchecksum 6518325aeb9b68284c31c66323a1ed9846d04dc108071cc2a2ddd805c70e4ca4e09cb1d67c0467048bfa486875e0094825fa729fc85cae9703390abd0f1c37d3
-doccontainersize 923332
-doccontainerchecksum 0a85a8e270c6ee1fc271d12c08838e90c8465d8295aa95b09865b4c1e0f531670a220dcb466dabfd24ed1ff1003027d7c41a0c8aa06e60fdaa54b3926ae86cd2
-docfiles size=283
+containersize 24104
+containerchecksum 9f6b771c38d3d5f3cf4876df57d5a0017eca56f1703e8a43fd00dc7a30751d8d0e783a86b41fd517af36433bca8883259e142dd357ebafbf31f8e4899d46c5bb
+doccontainersize 910060
+doccontainerchecksum 6cc32d167df4c5e585b75b04d954231c5bb0bb7f043f4649e9fadea33b9855b384cda19520d94887e80d26cc46db41b4101f231b04436f2acea7a6f825b512d2
+docfiles size=277
RELOC/doc/metapost/mcf2graph/CHANGELOG
RELOC/doc/metapost/mcf2graph/README details="Readme"
RELOC/doc/metapost/mcf2graph/mcf_data_base.mcf
@@ -193023,7 +193056,7 @@ runfiles size=28
catalogue-ctan /graphics/mcf2graph
catalogue-license mit
catalogue-topics graphics graphics-mpost chemistry
-catalogue-version 4.69
+catalogue-version 4.70
name mcite
category Package
@@ -198496,7 +198529,7 @@ catalogue-version 2021/1.0
name minimalist
category Package
-revision 60090
+revision 60121
shortdesc Write your articles or books in a simple and clear way
relocated 1
longdesc This package offers you a LaTeX style file and two classes to
@@ -198512,11 +198545,11 @@ longdesc for Chinese (both simplified and traditional), English, French,
longdesc German, Italian, Japanese, Portuguese (European and Brazilian),
longdesc Russian and Spanish typesetting, and also use more beautiful
longdesc fonts.
-containersize 7040
-containerchecksum 90cfbeb4ed6468aa6399f6135b0610650602d8f7edc657763f49a7f7e59e6fc97cf849fd84046a50c095475e2f75c288c5ffcb9ae47c8ad726c3e1003687b318
-doccontainersize 107796
-doccontainerchecksum 793ebedf77fcc88aa0dce9fcaaa8bfb9f3eff59a7a06d32816b7f3e35be9d73d16880c04e1182850a9a0c4da8b9698fa8b3a3f728e6cc3c5f9884fbdab7e749a
-docfiles size=37
+containersize 7152
+containerchecksum c1772525d0c9a38e5aab8740d58abe9c4ae2a49d6201556bc779ca5a88168d326665fd6219168d8f1a12925a5f6af44ba019a538b6feef91ef8bc422f0de625f
+doccontainersize 109624
+doccontainerchecksum 46943eb26d467461859b5a0fce8a0670812622564c164760928e3f03b69ac52db88588e1c0994fb7b15602eb1cdf83e4c42aec51cb4549867b09f9f966664a97
+docfiles size=39
RELOC/doc/latex/minimalist/LICENSE
RELOC/doc/latex/minimalist/README.md details="Readme"
RELOC/doc/latex/minimalist/minimalist-doc.pdf details="Package documentation"
@@ -236157,27 +236190,27 @@ catalogue-topics font font-type1 font-collection
name palette
category Package
-revision 60104
+revision 60119
shortdesc Create palettes for colors and symbols that can be swapped in
relocated 1
longdesc The package `palette` contains two files: `colorpalette.sty`
-longdesc and `symbolsuite.sty`. One deals with colors and the other
-longdesc deals with symbols; the implementation is quite similar. With
-longdesc this package you can create themes. Each of these themes have a
-longdesc set of colors, and you can create palettes based on this theme
-longdesc with specific color values for each of the theme's color slots.
-longdesc The active palette for each theme can be swapped in to make
+longdesc and `symbolpalette`. One deals with colors and the other deals
+longdesc with symbols; the implementation is quite similar. With this
+longdesc package you can create themes. Each of these themes have a set
+longdesc of colors, and you can create palettes based on this theme with
+longdesc specific color values for each of the theme's color slots. The
+longdesc active palette for each theme can be swapped in to make
longdesc experimenting with colors easier or give users choices as to
longdesc which theme they pick.
-containersize 1760
-containerchecksum 6239fe3b9daee5f89b617d5410eeab5d48a1da587f59034add324986d9adee4c01a2724cefb0ad251f4df8ece5a99bbe6a3e2eab86a87a36577b824db08aad69
-doccontainersize 178100
-doccontainerchecksum a1c0f742bc98253ee87c75a2c0a2da8f2a57d348fdfaecb9b45af915c2ca5862c8da16bbc17151ea75d6bee7e5b6ac0d3c316aff48f283528e5757e3a0a5affe
+containersize 1768
+containerchecksum 0583223e81139040de67fa9a1fd93479dd2024c19d34e775a71b9fc03d7b01799c2dd58736d431307cb067d2d3130fb495aaa002425a8c0c80ddbc3e33679693
+doccontainersize 179788
+doccontainerchecksum 16934d0cdc60fe7c1d6d2cbd0dfb640a13d8282d98e322c98853b71ab7fe38a33241857ae98fd8ffd9f2e5c009327889f4c42a89af4370fc7d4608b457b1cb4c
docfiles size=46
RELOC/doc/latex/palette/README.md details="Readme"
RELOC/doc/latex/palette/palette.pdf details="Package documentation"
-srccontainersize 3776
-srccontainerchecksum a21cfa0d5f8004bf5f0568b7f5853574e9101d6419d8b16bb5b4ed7d356c9db951df087a1c13a31441607884d0a14563a5b452ac9a87d00b6007ee91b5d8bb5b
+srccontainersize 3848
+srccontainerchecksum ea0e817ec066450c3bceae8ff9859f9b4934dba86f1ef850bfe8d566ac1da8296d780313962ab63babdfb822d1c72e686dca2925f809baa3a62eb2d744e8e6f8
srcfiles size=4
RELOC/source/latex/palette/palette.dtx
runfiles size=2
@@ -236186,7 +236219,7 @@ runfiles size=2
catalogue-ctan /macros/latex/contrib/palette
catalogue-license lppl1.3
catalogue-topics colour
-catalogue-version 1.0.0
+catalogue-version 1.1.0
name paper
category Package
@@ -239269,7 +239302,7 @@ catalogue-version 0.12
name pdfmanagement-testphase
category Package
-revision 60016
+revision 60127
shortdesc LaTeX PDF management testphase bundle
relocated 1
longdesc This is a temporary package, which is used during a test phase
@@ -239282,11 +239315,11 @@ longdesc allow users and package authors to safely test the code. At a
longdesc later stage it will be integrated into the LaTeX kernel (or in
longdesc parts into permanent support packages), and the current
longdesc testphase bundle will be removed.
-containersize 47336
-containerchecksum 7b2520de8c7ef0701867e8a8d856906d1685027c983ab5f78de76c7db5ab838d1edea7b3fcf84b85f9aa0c942428bcd64736ff588f916dc98c74dc8dfe00307c
-doccontainersize 8181364
-doccontainerchecksum cd3539cb567e26a8683472c6fbbbaf34fd937e6ec072d7b67c0e186c1e4882152605221c2c93eff8838ada65673ce9d1d6cda6779ba5b91aa50e9bdc619fb811
-docfiles size=2655
+containersize 47796
+containerchecksum 615ef4433046a78fccca48ec9f99450a47efe0b56f078416245fb1787280dbb966b8098467e0ffdd9685a2a8063d1a7e9a10eadebaea67924e12eff3106aefdc
+doccontainersize 8181744
+doccontainerchecksum a3ccb9edeef311fae7ea17b5df82366bb013ac14ea24c77cb75d2af873434859efd4e96876ba7850d11c35713a30c5c9ed120d9e45e5222cfe6de740b3ddcd20
+docfiles size=2658
RELOC/doc/latex/pdfmanagement-testphase/CHANGELOG.md
RELOC/doc/latex/pdfmanagement-testphase/README.md details="Readme"
RELOC/doc/latex/pdfmanagement-testphase/hyperref-generic.pdf
@@ -239308,9 +239341,9 @@ docfiles size=2655
RELOC/doc/latex/pdfmanagement-testphase/ltdocinit.pdf
RELOC/doc/latex/pdfmanagement-testphase/pdfmanagement-firstaid.pdf
RELOC/doc/latex/pdfmanagement-testphase/pdfmanagement-testphase.pdf details="Package documentation"
-srccontainersize 118668
-srccontainerchecksum 59a2fad14fc88c457a954572c17b1e9c718343b5dd0a0849279a76c0f43968bdf1f747bf7bb574aa86a05d0737ccb282b8ddd338c81ead5464d45df9f35a9e8c
-srcfiles size=173
+srccontainersize 120008
+srccontainerchecksum be12a864a3fd19fe40effb8d6063a720fc13b2770a3fdca730cdaf6ffa758c526f09a44f79d19188b7d46dfa9c133fca9ad708009b42960ee8017a4adf7b67f8
+srcfiles size=175
RELOC/source/latex/pdfmanagement-testphase/hyperref-generic.dtx
RELOC/source/latex/pdfmanagement-testphase/l3backend-testphase.dtx
RELOC/source/latex/pdfmanagement-testphase/l3pdfannot.dtx
@@ -239331,7 +239364,7 @@ srcfiles size=173
RELOC/source/latex/pdfmanagement-testphase/pdfmanagement-firstaid.dtx
RELOC/source/latex/pdfmanagement-testphase/pdfmanagement-testphase.dtx
RELOC/source/latex/pdfmanagement-testphase/pdfmanagement-testphase.ins
-runfiles size=92
+runfiles size=91
RELOC/tex/latex/pdfmanagement-testphase/color-ltx.sty
RELOC/tex/latex/pdfmanagement-testphase/hgeneric-testphase.def
RELOC/tex/latex/pdfmanagement-testphase/hyperref-colorschemes.def
@@ -239356,7 +239389,7 @@ catalogue-contact-repository https://github.com/latex3/pdfresources
catalogue-ctan /macros/latex/contrib/pdfmanagement-testphase
catalogue-license lppl1.3c
catalogue-topics latex-devel pdf-feat
-catalogue-version 0.95g
+catalogue-version 0.95h
name pdfmarginpar
category Package
@@ -242786,7 +242819,7 @@ catalogue-version 1.2
name pgf-pie
category Package
-revision 59075
+revision 60115
shortdesc Draw pie charts, using PGF
relocated 1
longdesc The package provides the means to draw pie (and variant)
@@ -242795,11 +242828,11 @@ longdesc mentioned here: https://code.google.com/archive/p/pgf-pie/.
depend carlisle
depend latex
depend pgf
-containersize 3632
-containerchecksum 33247855b63c60b626fe1ec6ac1bf083e7b235a4a575a4376fba14ab611dc4dc7f52564dbaf55a9aa94bae6465a0560516ee958617c77e824e6e2870d4534604
-doccontainersize 212708
-doccontainerchecksum 85fc137d549c55fc3b8898985f2c699dcdaa71d177b4f496062827d94ceb568c5301d1112a072a6964ad207a59aed00aab9807a88e4218738c091cc0b92479fd
-docfiles size=99
+containersize 3732
+containerchecksum e6ba22a3cb4b053cfd77c190abf82f71feb47fd172701b91db1590ceab6fbf926ece08af960426ea1d523237468c40d1d0c8518938d1de9461750ed2e3b207c3
+doccontainersize 220184
+doccontainerchecksum f9b14bf6474c035810c91d7e39932a5a35d011ade63cf1c65699a3466ec0878aefafdf17d51a16242fbfa0731ae8013d86e625904a7f14cc2ecf7e0af8409d04
+docfiles size=102
RELOC/doc/latex/pgf-pie/COPYING
RELOC/doc/latex/pgf-pie/LICENSE-GPL2.txt
RELOC/doc/latex/pgf-pie/LICENSE-LPPL1.3c.txt
@@ -242839,7 +242872,7 @@ catalogue-contact-support https://tug.org/mailman/listinfo/pgf-tikz
catalogue-ctan /graphics/pgf/contrib/pgf-pie
catalogue-license gpl2 lppl1.3c
catalogue-topics genchart pgf-tikz
-catalogue-version 0.5
+catalogue-version 0.6
name pgf-soroban
category Package
@@ -251645,7 +251678,7 @@ catalogue-version 1.0b~4
name projlib
category Package
-revision 60092
+revision 60118
shortdesc A series of tools to simplify your workflow
relocated 1
longdesc ProjLib is a collection of tools to help you write LaTeX
@@ -251653,11 +251686,11 @@ longdesc documents. With the main package ProjLib loaded, you no longer
longdesc need to set up the theorem-like environments, nor to manually
longdesc configure the appropriate multilingual settings. In addition, a
longdesc series of auxiliary functionalities are introduced.
-containersize 11912
-containerchecksum fe34264c2ee10a1b21735ae090aa6739ac4f509310048aa2e61cb9d61249d1ca3c5c0d932260dc05c419a2d99f24cfd77484343f1a947be310f8e564ad67e58a
-doccontainersize 678536
-doccontainerchecksum cc0b010f137563a7433bc50ffde5619879f4e1d23bd901fdd94cd09efc9f1e12f5a9b006c34302eb21fd65b4f3b9fa7240dce32655b203b174334c7a007eb468
-docfiles size=209
+containersize 12028
+containerchecksum 88b724c778e3f0905aaea35999eb86de6dbbe180f70ceb412861becba2f642e32fc74257230e681f9af12deec26102f38cb03807796b9683bba696dec2938fe4
+doccontainersize 675096
+doccontainerchecksum 71c460d21add973906f08c430b3281254ed13e0d987134308eb733983d0a32aac49f66f3ad15edaa3b63723da82b8ebe2280dd00d441d75cc9a6eec76ffc51e9
+docfiles size=210
RELOC/doc/latex/projlib/LICENSE
RELOC/doc/latex/projlib/ProjLib-doc-cn.pdf details="Package documentation (Chinese)" language="zh"
RELOC/doc/latex/projlib/ProjLib-doc-cn.tex
@@ -251666,14 +251699,14 @@ docfiles size=209
RELOC/doc/latex/projlib/ProjLib-doc-fr.pdf details="Package documentation (French)" language="fr"
RELOC/doc/latex/projlib/ProjLib-doc-fr.tex
RELOC/doc/latex/projlib/README.md details="Readme"
-srccontainersize 34028
-srccontainerchecksum 718cb1c197a9e64327ef49c1835852d02820929925aa5df9d66ee289fd881c102a31293b1c510e5439e8ca009fda34fcddb089b062a3b0e5c548e102b2aff4ab
-srcfiles size=44
+srccontainersize 34860
+srccontainerchecksum e1c51ccac25c839fdb0d71f5f35f983f00205f2079cc60bb170cbbecc062ab688b118e5cf0c36b15f02cb66bd69fd82a6509069970cd4976cbdbf6b189f79367
+srcfiles size=46
RELOC/source/latex/projlib/ProjLib-doc.dtx
RELOC/source/latex/projlib/ProjLib-doc.ins
RELOC/source/latex/projlib/ProjLib.dtx
RELOC/source/latex/projlib/ProjLib.ins
-runfiles size=22
+runfiles size=24
RELOC/tex/latex/projlib/PJLauthor.sty
RELOC/tex/latex/projlib/PJLdate.sty
RELOC/tex/latex/projlib/PJLdraft.sty
@@ -272088,6 +272121,38 @@ catalogue-license lppl1.3c
catalogue-topics file-mgmt expl3
catalogue-version 1.9
+name scrambledenvs
+category Package
+revision 60141
+shortdesc Create and print scrambled environments
+relocated 1
+longdesc This package allows you to create and print scrambled
+longdesc environments for purposes such as randomized hint environments.
+longdesc You can mark a location with a series of hints, and then print
+longdesc the hints at the end in a pseudo-random order. The general
+longdesc structure follows: there is an outer environment which creates
+longdesc the label, an inner environment that creates the references,
+longdesc and a print command that prints out all of the hints. This
+longdesc generalizes beyond hints; one can create scrambled solutions as
+longdesc well, etc.
+containersize 2276
+containerchecksum 0fbc41447ee734f17f207fcfb5a82526b0a298cda77b5f6e0dc1ca0962adc5943809c8841e3c3c4bd88b4381958499e162c6ef652124620f686b50de22b6a1fc
+doccontainersize 186332
+doccontainerchecksum fa403e2f6f9e83f44d6a31ceb7f62c30110b70ed047c606d560208355055bbb71ec7175070b7718e4e655aef94d4ae272dc97ee7cc0709400009f3ff83c18913
+docfiles size=48
+ RELOC/doc/latex/scrambledenvs/README.md details="Readme"
+ RELOC/doc/latex/scrambledenvs/scrambledenvs.pdf details="Package documentation"
+srccontainersize 5044
+srccontainerchecksum 8f2d424a0472158c951d7f88537cf4ce7d4218ce943582ed4e9b21eecf95191cedc7b15bcb12caa378b0dd898a530d0e4883b28522dc41428fcec2651475cb86
+srcfiles size=5
+ RELOC/source/latex/scrambledenvs/scrambledenvs.dtx
+runfiles size=2
+ RELOC/tex/latex/scrambledenvs/scrambledenvs.sty
+catalogue-ctan /macros/latex/contrib/scrambledenvs
+catalogue-license lppl1.3
+catalogue-topics notes random
+catalogue-version 1.0.0
+
name scratch
category Package
revision 50073
@@ -275242,7 +275307,7 @@ catalogue-topics tut-latex
name simplivre
category Package
-revision 60090
+revision 60121
shortdesc Write your books in a simple and clear way
relocated 1
longdesc This package provides a LaTeX class for typesetting books with
@@ -275255,11 +275320,11 @@ longdesc depends on minimalist.sty from the minimalist package. The
longdesc package name "simplivre" is taken from the French words
longdesc "simple" and "livre" (= "book").
depend minimalist
-containersize 3496
-containerchecksum a8b0b30c572364df2e10a34946324e7f497df86539243833202b26a2e211d17b3a8c661eba37dc8fed96e25bd674a3b5fbfdbc18184c15f06341a200f5c4bcd4
-doccontainersize 611492
-doccontainerchecksum fe2825a204e5a668aaa60d4f4989417e496d3452ab1c448cb95753c8b01270548073f61ef3e6e228b2249d631c3f56d9063d539137683cfbac07017299fe5e1b
-docfiles size=189
+containersize 3536
+containerchecksum ba93744469958bc75184c11287da2904a8174d768cfa3d09b240b7ba51aa6d9a36b17c93a7f77da07d20702d8a6c428a3f1d3129ba071ec1d12eb66223f7eb1f
+doccontainersize 638664
+doccontainerchecksum 43d63d771cb9cb55de3dca3fae7b0da275efa384d4651726a0da0b95e6e78632a1b15343a08834a0dac3772bcda8bc0fedf4bc935cfa5efd16c653b8c6bd1020
+docfiles size=192
RELOC/doc/latex/simplivre/LICENSE
RELOC/doc/latex/simplivre/README.md details="Readme"
RELOC/doc/latex/simplivre/simplivre-doc-cn.pdf details="Package documentation (Chinese)" language="zh"
@@ -280196,17 +280261,17 @@ catalogue-version 2.4
name spbmark
category Package
-revision 60111
+revision 60120
shortdesc Customize superscripts and subscripts
relocated 1
longdesc This package provides three commands \super, \sub and \supersub
longdesc to improve the layout of superscripts and subscripts which can
longdesc be adjusted with respect to relative position and format, and
longdesc can be used in text and math mode.
-containersize 2456
-containerchecksum 55bbe5cf347f83a627e1d72444058afed5499622e42e79114e04d43c2b22cf504edaa48d95816ffd3fbd7e24f62895735079e98181e187af0e7069428869f66e
-doccontainersize 67488
-doccontainerchecksum 8b57dae2b133ec664fc043daae944761ba1daa916ccb0b9463fae8c2effbdeda8886a91a8be1dc5f6c65aea0529f93b716f333d5d1da44653351cf14a7cf64a5
+containersize 2460
+containerchecksum 15e00f939675786802ff93a099b767278a658449cf73f07ae38faf607e0e76d1e6fd5ff76040a965ff47714c234fb123f589546b6a28de11b3e0f82aed1da65a
+doccontainersize 67312
+doccontainerchecksum c65dceb4dcc1b3ba1b4d224a47f25de01a3c0ceb962574565474560f31db8c6b600a65d4a76b70ccde453c1393783773fa04a8042d2f41dc06dde1f40a418740
docfiles size=20
RELOC/doc/latex/spbmark/README.md details="Readme"
RELOC/doc/latex/spbmark/spbmark.pdf details="Package documentation"
@@ -280217,7 +280282,7 @@ catalogue-contact-repository https://github.com/texl3/spbmark
catalogue-ctan /macros/latex/contrib/spbmark
catalogue-license cc-by-4
catalogue-topics subsup-pos expl3
-catalogue-version 1.1
+catalogue-version 1.1a
name spectral
category Package
@@ -288348,7 +288413,7 @@ catalogue-version 0.1
name tabularray
category Package
-revision 59797
+revision 60140
shortdesc Typeset tabulars and arrays with LaTeX3
relocated 1
longdesc LaTeX tables are implemented using TeX commands such as
@@ -288363,15 +288428,15 @@ longdesc typeset the entire table. Under the premise of being compatible
longdesc with the basic syntax of LaTeX2 tables, this macro package will
longdesc completely separate the content and style of the table, and the
longdesc style of the table can be completely set in keyval way.
-containersize 28940
-containerchecksum 54443e7937cec9e2aa68977c7aa09a175dee4e1da5fba7afe69d14519b66798ed715985a9666e5cc3f655305616ed64ba3ba4f3f2410e3e488716045ccd84d5c
-doccontainersize 548052
-doccontainerchecksum 9f2caadb5721c797d8ecbf12b2b8e31579ae55a8d81e5f0b518fe55dc6807e1234f3220fd270bbaa1dd4a0cc064956e25f36a7b35315ba37823f1ab997e05ef3
-docfiles size=176
+containersize 30172
+containerchecksum aa402e878a350c197419b2cd77688a8d7d7342962b74be34ad7ce5023b309ba620443730e91873cdeed6eafc0c558b6ed14d0f1f2d58e6b77aa042020d243ba6
+doccontainersize 573668
+doccontainerchecksum 29223d5c5c5a83c6d68b2a7e384dbdb309b70dd95cd884f8a6cede0720a3596764e28406dc7fdeede2cfe8389a9d07b306af5204b240ead93e062196c8986607
+docfiles size=185
RELOC/doc/latex/tabularray/README details="Readme"
RELOC/doc/latex/tabularray/tabularray.pdf details="Package documentation"
RELOC/doc/latex/tabularray/tabularray.tex
-runfiles size=86
+runfiles size=87
RELOC/tex/latex/tabularray/tabularray-2021.sty
RELOC/tex/latex/tabularray/tabularray.sty
catalogue-contact-bugs https://github.com/lvjr/tabularray/issues
@@ -288381,7 +288446,7 @@ catalogue-contact-support https://github.com/lvjr/tabularray/discussions
catalogue-ctan /macros/latex/contrib/tabularray
catalogue-license lppl1.3
catalogue-topics table table-long expl3
-catalogue-version 2021L
+catalogue-version 2021M
name tabulary
category Package
@@ -301256,7 +301321,7 @@ docfiles size=376
name texlive-scripts
category TLCore
-revision 60108
+revision 60131
shortdesc TeX Live infrastructure programs
longdesc Includes install-tl, tl-portable, rungs, etc.; not needed for
longdesc tlmgr to run but still ours. Not included in tlcritical.
@@ -301264,10 +301329,10 @@ depend texlive-scripts.ARCH
depend texlive.infra
execute addMap mathpple.map
postaction shortcut type=menu name="TeX Live command-line" cmd=TEXDIR/tlpkg/installer/tl-cmd.bat
-containersize 108156
-containerchecksum e3970b7730c0981f5408a984c72423439866c96cea0178532a95c8fd514b907ea7283da7be75b6f97c6b8b3c0293ca27c07927208380b38fc97adcd09bd5b400
-doccontainersize 398876
-doccontainerchecksum f8e5c61b5e7febd881419747a5761dc38492543e934465c6cfc1af7962d208323e3c9f84d231f3528cd830be9de789908e8c7f9a4cb4960ce8ca90483ed3e5c3
+containersize 108148
+containerchecksum eb1e8cddb794458c7b4e9da6594dc0c23c6eda3720e0b1e5668dae7a7569f0c0e5d9b6b24a6d8f6e18aee0b69a37ad47128420fe87dfdd2d7592a509271e5abd
+doccontainersize 398960
+doccontainerchecksum 20b74b3bb7ca424b6f924a2a850c3013614f25c8f7c77c74aec4c44d545e1d89162689e69ef17ada57a772e5799d50f14fddc8e513f24d42831b2d3b967b2c3e
docfiles size=493
doc.html
texmf-dist/doc/man/man1/fmtutil-sys.1
@@ -308054,16 +308119,16 @@ catalogue-version 4.10c
name tikztosvg
category TLCore
-revision 58737
+revision 60114
shortdesc A utility for rendering TikZ diagrams to SVG
longdesc This package provides a shell script that calls XeTeX and
longdesc pdf2svg to convert TikZ environments to SVG files.
depend tikztosvg.ARCH
-containersize 2012
-containerchecksum 826b6cc6489db99d4b7651afdaf68117840e8aab4a19235110128af63cf26108fe409fba341acd26ef1ce2ba6276d368bd00e83c7b5954b1937d50b4d3c3fe8e
-doccontainersize 206532
-doccontainerchecksum 1418c505769ed1fe835f713cc546305a25b6a96a16a7e6dbf9938547824b59fbf4d638c9d40ec7ed1c23fb110ffb482062884eefdd432db1e57b9e567ac299a4
-docfiles size=66
+containersize 1996
+containerchecksum f309f12e9476df4641d9a00b25076e3f2d263ae361877270005c21bbfb4da7c99e7a6e957ae2834c72518c748b8403f7d38443a95c68ff00593570e1a8b4a703
+doccontainersize 210356
+doccontainerchecksum 910dd2bbe1cfbb00f523382ab6df2824de928f862f6c19f28308b1a942e239dadc8575cc4270400a523942eb256b5552b85fb4d243592ea5f83323c4f755de44
+docfiles size=67
texmf-dist/doc/man/man1/tikztosvg.1
texmf-dist/doc/man/man1/tikztosvg.man1.pdf
texmf-dist/doc/support/tikztosvg/CHANGELOG.md
@@ -308086,7 +308151,7 @@ catalogue-contact-support https://lists.sr.ht/~pablo-pie/tikztosvg
catalogue-ctan /support/tikztosvg
catalogue-license gpl3
catalogue-topics cvt-other graphics pgf-tikz
-catalogue-version 0.2.0
+catalogue-version 0.2.1
name tikztosvg.aarch64-linux
category TLCore
@@ -330183,7 +330248,7 @@ catalogue-version 0.1
name vhistory
category Package
-revision 30080
+revision 60124
shortdesc Support for creating a change log
relocated 1
longdesc Vhistory simplifies the creation of a history of versions of a
@@ -330193,14 +330258,14 @@ longdesc get consistent documents. The package sets, which is used by
longdesc vhistory, allows you to use sets containing text. You can use
longdesc the usual operations to create the union of sets or the
longdesc intersection of sets etc.
-containersize 8276
-containerchecksum f1747b1c112c69cdc506234c571335647b365eb92a4054c70cb08752dc1da92ac4e84d533083cdee76f6398f5f1bf04b20b94cf38ddf13947d4086c5599529fc
-doccontainersize 336696
-doccontainerchecksum 60a8100cc10df177b04eba8751208c515eee9601806324184f737491707e1e4d453a92b0d12a16d6cc1af319a55c79afc8922d1378f8714990c97b5779540763
-docfiles size=122
- RELOC/doc/latex/vhistory/CHANGES
- RELOC/doc/latex/vhistory/README details="Readme"
+containersize 8400
+containerchecksum 8581151902ec4954f09277c8d4485aa9b8e98f8bb34693a1e6e79f769e8a47e8a8a3f797f74e7b236b3c24cc3efcbca85adc538bd5509f17244de46f2d1ae1b1
+doccontainersize 347268
+doccontainerchecksum 5a253f13fd4ba05af75275a080545392d3b92dd63aa56b768a4eb20db062cfbc85472c8933e2528fcff8e7f01b233a4b61dc0c22487f790d2e09a16eb7450abc
+docfiles size=130
+ RELOC/doc/latex/vhistory/CHANGES.md
RELOC/doc/latex/vhistory/README.doc
+ RELOC/doc/latex/vhistory/README.md details="Readme"
RELOC/doc/latex/vhistory/de_beispiel.tex
RELOC/doc/latex/vhistory/de_einleitung.tex
RELOC/doc/latex/vhistory/de_sets.tex
@@ -330222,7 +330287,7 @@ runfiles size=9
catalogue-ctan /macros/latex/contrib/vhistory
catalogue-license lppl1.2
catalogue-topics version-control
-catalogue-version 1.6.1
+catalogue-version 1.8.0
name visualfaq
category Package
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
index 88d3b13e35..e32620c9e6 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
@@ -1 +1 @@
-dbd1dd428d64977dbb98b4555a07dbf3 texlive.tlpdb
+d180b259281fe94a5671bdcf3ef19fcc texlive.tlpdb
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
index 995a20e871..fc9242f40e 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
@@ -1 +1 @@
-8f6fcfa456ddd58f9426b4576bdca7d14df1b928d7551a3a311f3a07d9b338b52a737dd9d26a0a34a93bc6698b710bcfaed99f6d44be58e029b119fd4821cb8c texlive.tlpdb
+0e569fbb203e96f5053fa14043336a957fd7032721d9a3112ac3c23efd379311c46b77b6de56b0c6bbdbab22ad9602a69cc8ecf0449346dd0be773487dd68a1d texlive.tlpdb
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
index 65bfbfa19a..8988e52eba 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-----
-iQEcBAEBCgAGBQJhAz9iAAoJEEzhh34ZQ4xwH44IAJ76h8DbxrEVKeeP8Qg9ii+A
-1EhEfWd0zKZ5S7QHHO4oUFgdqeAm4FmA9dKsYhx9uKgSBb+WMjfhwKo8qoKREcXp
-NgIFCnb42w1uYm22Esk0aIrTjTd4x76RXxg9c5EcHIo41k2gWHP+YvEPgoJ7r/ZW
-Oy1vCuTFN8fKvfHujckQwGl+9SvvW0nN+ZGCBTMKqQb+a442j9xez9a66WR4ido+
-bk5WQH1gz1tmL7rw1AN6f2r0Dnpazwiqcn4OVDiUEEYAtJSqRPuLNt9FI/YUu0QU
-itkSqx0e2b+K4+v0tKvx35jOn1aeQLx2K5nxqBXtWV6cSb8HlP49T/OQpTAEJEU=
-=jsDi
+iQEcBAEBCgAGBQJhBzRgAAoJEEzhh34ZQ4xwW0oH/jw96M8xcpIc9MlTcJWJyWVz
+v7jt99tWYROQqYtYF00TL+9dWxK/6a3E1tYteP3LLSHD6dOMX2kDp0X/3zz4BAcy
+Mbl8SfC1aBLV/QRuqQbcKH5QHZfMeQBIzZ9liOxnyqv12dH54BTrQC3y7aw9+JrE
+pSEVzVDroFiVbLNQ0m87LU7TFsOAYTuuCEfFvTb4XKA4BJCF5I5EIxXg34S0n6K6
+BJ4uSI5bp8+j9HVSE1+6jnkuFwwT8qOioneb+6W7IHd152oL68+IjGxA/q9UxDJD
+kGozMSw0vlb+m+WDFsjOcJ0vzbSWLmdDzcx4SkEQHSQWZEu/LJu13XiRlvJZ+hY=
+=3ktH
-----END PGP SIGNATURE-----
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
index 6774cafc2f..73034e9fd1 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/files.csv.lzma b/systems/win32/miktex/tm/packages/files.csv.lzma
index aa95af7bcc..e1340046c1 100644
--- a/systems/win32/miktex/tm/packages/files.csv.lzma
+++ b/systems/win32/miktex/tm/packages/files.csv.lzma
Binary files differ
diff --git a/systems/win32/miktex/tm/packages/next/files.csv.lzma b/systems/win32/miktex/tm/packages/next/files.csv.lzma
index 87e41f5939..0c6919c977 100644
--- a/systems/win32/miktex/tm/packages/next/files.csv.lzma
+++ b/systems/win32/miktex/tm/packages/next/files.csv.lzma
Binary files differ
diff --git a/systems/win32/miktex/tm/packages/next/pr.ini b/systems/win32/miktex/tm/packages/next/pr.ini
index 63c883faaa..629e4d410b 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=1627762463
+date=1627848879
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=765ddc6669ade90d96c6e69f3a8f9e38
-numpkg=4598
+lstdigest=ac1642551e1a65c66271ae94f4519b13
+numpkg=4607
relstate=next
-version=7882
+version=7883
;;;;This configuration file is signed by a MiKTeX maintainer. The signature follows.
;;;;-----BEGIN MIKTEX SIGNATURE-----
-;;;; signature/miktex: RnNSn8+I9safHRUnxsafwvAyKPiusmoV/SD0F32Gmpbc/mQSseLomcr75UoTYCzN87s5DmPUSCTh1xRCboeufIQFiBtbx7CdCumq6wZBWtnJZCxuEhVQ5OTyXYg8hhrsR1ZvU7F7m71DXWmfbOvLDsvUcolkUDsWUZJtiRkTHmZr8jpBn7kxWYwdpnyxbopKReZsGOOvKmvpgTeKfL2LGCGj+2mIVaj61DEctbUt6mA2RYSm2EAYXwmWJj2raLiCMO2LIyBCAx0EEjHpBTU7Q1m86ZXwD8iCYzid5e/SVfNu1l7INt9u6J3rRT+V9JmuRyoKjhlpfyMN586V3QJNJg==
+;;;; signature/miktex: vVTU1bJ0J/rrgFd2PLBFLMCf4bB+kP7X9vStHFMIF7IAP+UTMovb0uzUXnvR9hh4fSyo/lzhQaG4VnqS4EVUuZzKRbEMqTbfJBqverXxPs84+0hSOoFtNLSH+/WM1deMt9vBjzN8Qas8mI/JOagerbJ4c04JYdKIZ43BTjjpEQ1sToiI9cx+WeWCJTMLAkXsIBZQKB5nqzfUlTjm9bTN7k69QqbqhyFjNV/g+nz/VAI6TIsAK8P0moCAF4S29LN74LAYTDKB1hSVrfH2m0N/UHNsJq6WPmRT8cpweT8mWZZIxD/w5fNneCPEjzInz9QQfGiW1W7rvcW0TJnVhSkDiw==
;;;;-----END MIKTEX SIGNATURE-----
diff --git a/systems/win32/miktex/tm/packages/pr.ini b/systems/win32/miktex/tm/packages/pr.ini
index 84cd04e788..3bcd86900a 100644
--- a/systems/win32/miktex/tm/packages/pr.ini
+++ b/systems/win32/miktex/tm/packages/pr.ini
@@ -1,13 +1,13 @@
[repository]
-date=1627762271
-lastupd=jlreq jlreq__doc media9 media9__doc spbmark spbmark__doc spbmark__source tikztosvg tikztosvg__doc tikztosvg__source lacheck__doc lacheck__source lipsum lipsum__doc lipsum__source logix logix__doc logix__source moderncv moderncv__doc
-lstdigest=82bc47cec90dfb9071b184b48f70b951
-numpkg=4598
+date=1627848664
+lastupd=beaulivre beaulivre__doc beaulivre__source colorist colorist__doc colorist__source einfart einfart__doc einfart__source exam-randomizechoices exam-randomizechoices__doc exam-randomizechoices__source hvlogos hvlogos__doc hvlogos__source latexindent latexindent__doc latexindent__source lebhart lebhart__doc
+lstdigest=8504cf334647a0040d94516f6c2bacef
+numpkg=4607
relstate=stable
-version=7882
+version=7883
;;;;This configuration file is signed by a MiKTeX maintainer. The signature follows.
;;;;-----BEGIN MIKTEX SIGNATURE-----
-;;;; signature/miktex: nWxB7nztAg9RZ9/tJKCASA4U/zkHtNvigx/yFAljQW7bsl/3ODIfMrOgzE3hj3X8kZ2ZnlL5RbjRLYx8rb1smDWP3QTZ2fylzZzzpf5TkDmS7Hs6RQUMBm8DuRt8dW6NRHPxmIjirex54oDqDvZqCcupbFLvMUSdYf40XAjRMnrfMfYVRNTW0JmdktQMPr1i4vVOrzCdYkEmlZTj/zuJlFWxV3IOK6yrv/L78YXa/U9yJFNkpHHIyDg4LTthpgVvoP5CTT2ShwZkNDKrdzbu04oVPY6jcGNj4hzDhBebKdje9Dopbh8BrsfX+EgX9JsR7tW09znwcg8N8MCUxIAzTA==
+;;;; signature/miktex: UVA5A5DsWBC1nJ9MuFsNrH3lhcxpXD8g6EYeG9qooeppcw7eiN76axHfKwjjCOoaucgD00AEhfFgTnC+et4P3n7qXyugv+VvU1Xo5csnwShlLTP/NfrkdxkTj7RVN71ZHGf+Ilev2KDtuljSW7myGt/vLT8dPyQ2K56tcqYoj3kOq9H2XhGPXCFL6/H/OA5h0lLm+dGOCtZcYyjHBJaunOJlwagFlr6xOUv87ULQ2TPOo24mr9V+F3uI+thMa35I0ow2FeqfH/6UJTXobdQ1GtUNqTrhRxukJHVjiDuCFMqK7DBZfCRmS2hNjJiYIzUo2L8s6WHL+6c9fB/hGMg27A==
;;;;-----END MIKTEX SIGNATURE-----
diff --git a/timestamp b/timestamp
index bb9d332823..e7c110e939 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-08-01-02-02
+2021-08-02-02-02