From adcdf254252f764d8969df03d013bf5da6333873 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Sun, 10 May 2020 03:02:26 +0000 Subject: CTAN sync 202005100302 --- FILES.byname | 667 +++-- FILES.byname.gz | Bin 2221031 -> 2221013 bytes FILES.last07days | 688 +++-- fonts/logix/CHANGELOG | 11 + fonts/logix/README | 23 +- fonts/logix/doc/logix.pdf | Bin 421600 -> 421596 bytes fonts/logix/doc/logix.tex | 6 +- fonts/logix/tex/logix.sty | 1464 +++++----- macros/generic/2up/2up-doc.pdf | Bin 63111 -> 0 bytes macros/generic/2up/2up-doc.tex | 502 ---- macros/generic/2up/2up.sty | 9 - macros/generic/2up/2up.tex | 363 --- macros/generic/2up/Changes | 9 +- macros/generic/2up/Makefile | 72 - macros/generic/2up/README | 12 +- macros/generic/2up/doc/2up-doc.pdf | Bin 0 -> 46721 bytes macros/generic/2up/doc/2up-doc.tex | 499 ++++ macros/generic/2up/latex/2up.sty | 9 + macros/generic/2up/tex/2up.tex | 363 +++ .../biblatex-contrib/biblatex-ext/CHANGES.md | 12 +- .../biblatex-ext/biblatex-ext-oa-doiapi.sty | 2 +- .../biblatex-ext/biblatex-ext-oa.sty | 2 +- .../biblatex-ext/biblatex-ext-oasymb-l3draw.sty | 2 +- .../biblatex-ext/biblatex-ext-oasymb-pict2e.sty | 2 +- .../biblatex-ext/biblatex-ext-oasymb-tikz.sty | 2 +- .../biblatex-ext/biblatex-ext-tabular.sty | 2 +- .../biblatex-contrib/biblatex-ext/biblatex-ext.pdf | Bin 551630 -> 551860 bytes .../biblatex-contrib/biblatex-ext/biblatex-ext.tex | 8 +- .../biblatex-contrib/biblatex-ext/blxextdoiapi.lua | 4 +- .../biblatex-ext/ext-alphabetic-verb.bbx | 2 +- .../biblatex-ext/ext-alphabetic-verb.cbx | 2 +- .../biblatex-ext/ext-alphabetic.bbx | 2 +- .../biblatex-ext/ext-alphabetic.cbx | 2 +- .../biblatex-ext/ext-authortitle-common.bbx | 2 +- .../biblatex-ext/ext-authortitle-comp.bbx | 2 +- .../biblatex-ext/ext-authortitle-comp.cbx | 2 +- .../biblatex-ext/ext-authortitle-ibid.bbx | 2 +- .../biblatex-ext/ext-authortitle-ibid.cbx | 5 +- .../biblatex-ext/ext-authortitle-icomp.bbx | 2 +- .../biblatex-ext/ext-authortitle-icomp.cbx | 2 +- .../biblatex-ext/ext-authortitle-tcomp.bbx | 2 +- .../biblatex-ext/ext-authortitle-tcomp.cbx | 2 +- .../biblatex-ext/ext-authortitle-terse.bbx | 2 +- .../biblatex-ext/ext-authortitle-terse.cbx | 2 +- .../biblatex-ext/ext-authortitle-ticomp.bbx | 2 +- .../biblatex-ext/ext-authortitle-ticomp.cbx | 2 +- .../biblatex-ext/ext-authortitle.bbx | 2 +- .../biblatex-ext/ext-authortitle.cbx | 5 +- .../biblatex-ext/ext-authoryear-common.bbx | 2 +- .../biblatex-ext/ext-authoryear-comp.bbx | 2 +- .../biblatex-ext/ext-authoryear-comp.cbx | 3 +- .../biblatex-ext/ext-authoryear-ecomp.bbx | 2 +- .../biblatex-ext/ext-authoryear-ecomp.cbx | 3 +- .../biblatex-ext/ext-authoryear-ibid.bbx | 2 +- .../biblatex-ext/ext-authoryear-ibid.cbx | 6 +- .../biblatex-ext/ext-authoryear-icomp.bbx | 2 +- .../biblatex-ext/ext-authoryear-icomp.cbx | 3 +- .../biblatex-ext/ext-authoryear-iecomp.bbx | 2 +- .../biblatex-ext/ext-authoryear-iecomp.cbx | 3 +- .../biblatex-ext/ext-authoryear-tcomp.bbx | 2 +- .../biblatex-ext/ext-authoryear-tcomp.cbx | 2 +- .../biblatex-ext/ext-authoryear-tecomp.bbx | 2 +- .../biblatex-ext/ext-authoryear-tecomp.cbx | 2 +- .../biblatex-ext/ext-authoryear-terse.bbx | 2 +- .../biblatex-ext/ext-authoryear-terse.cbx | 2 +- .../biblatex-ext/ext-authoryear-ticomp.bbx | 2 +- .../biblatex-ext/ext-authoryear-ticomp.cbx | 2 +- .../biblatex-ext/ext-authoryear-tiecomp.bbx | 2 +- .../biblatex-ext/ext-authoryear-tiecomp.cbx | 2 +- .../biblatex-ext/ext-authoryear.bbx | 2 +- .../biblatex-ext/ext-authoryear.cbx | 8 +- .../biblatex-ext/ext-biblatex-aux.def | 6 +- .../biblatex-ext/ext-dashed-common.bbx | 2 +- .../biblatex-ext/ext-numeric-comp.bbx | 2 +- .../biblatex-ext/ext-numeric-comp.cbx | 2 +- .../biblatex-ext/ext-numeric-verb.bbx | 2 +- .../biblatex-ext/ext-numeric-verb.cbx | 2 +- .../biblatex-contrib/biblatex-ext/ext-numeric.bbx | 2 +- .../biblatex-contrib/biblatex-ext/ext-numeric.cbx | 2 +- .../biblatex-contrib/biblatex-ext/ext-standard.bbx | 4 +- .../biblatex-ext/ext-verbose-ibid.bbx | 2 +- .../biblatex-ext/ext-verbose-ibid.cbx | 2 +- .../biblatex-ext/ext-verbose-inote.bbx | 2 +- .../biblatex-ext/ext-verbose-inote.cbx | 2 +- .../biblatex-ext/ext-verbose-note.bbx | 2 +- .../biblatex-ext/ext-verbose-note.cbx | 2 +- .../biblatex-ext/ext-verbose-trad1.bbx | 2 +- .../biblatex-ext/ext-verbose-trad1.cbx | 2 +- .../biblatex-ext/ext-verbose-trad2.bbx | 2 +- .../biblatex-ext/ext-verbose-trad2.cbx | 2 +- .../biblatex-ext/ext-verbose-trad3.bbx | 2 +- .../biblatex-ext/ext-verbose-trad3.cbx | 2 +- .../biblatex-contrib/biblatex-ext/ext-verbose.bbx | 2 +- .../biblatex-contrib/biblatex-ext/ext-verbose.cbx | 2 +- .../latex/contrib/nicematrix/nicematrix-french.pdf | Bin 343415 -> 349092 bytes .../latex/contrib/nicematrix/nicematrix-french.tex | 423 +-- macros/latex/contrib/nicematrix/nicematrix.dtx | 3090 ++++++++++++++------ macros/latex/contrib/nicematrix/nicematrix.pdf | Bin 814877 -> 845357 bytes .../texlive/tlnet/tlpkg/installer/ctan-mirrors.pl | 2 + systems/texlive/tlnet/tlpkg/texlive.tlpdb | 103 +- systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 | 2 +- systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 | 2 +- .../texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc | 14 +- systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz | Bin 2195984 -> 2196100 bytes systems/win32/miktex/tm/packages/next/pr.ini | 8 +- systems/win32/miktex/tm/packages/pr.ini | 8 +- systems/win32/w32tex/ChangeLog | 30 + timestamp | 2 +- 108 files changed, 4895 insertions(+), 3678 deletions(-) delete mode 100644 macros/generic/2up/2up-doc.pdf delete mode 100644 macros/generic/2up/2up-doc.tex delete mode 100644 macros/generic/2up/2up.sty delete mode 100644 macros/generic/2up/2up.tex delete mode 100644 macros/generic/2up/Makefile create mode 100644 macros/generic/2up/doc/2up-doc.pdf create mode 100644 macros/generic/2up/doc/2up-doc.tex create mode 100644 macros/generic/2up/latex/2up.sty create mode 100644 macros/generic/2up/tex/2up.tex diff --git a/FILES.byname b/FILES.byname index 99ef1d2425..31637171c4 100644 --- a/FILES.byname +++ b/FILES.byname @@ -5001,7 +5001,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 -2020/05/08 | 241868 | FILES.last07days +2020/05/09 | 204975 | FILES.last07days 2018/06/27 | 99883 | fonts/academicons/academicons.pdf 2018/06/27 | 10779 | fonts/academicons/academicons.sty 2018/06/27 | 5774 | fonts/academicons/academicons.tex @@ -65805,19 +65805,19 @@ 2010/10/14 | 229 | fonts/logic/milstd.sty 1991/03/08 | 1162 | fonts/logic/milstd.tex 2010/10/14 | 2256 | fonts/logic.zip -2020/01/04 | 867 | fonts/logix/CHANGELOG -2020/01/04 | 421600 | fonts/logix/doc/logix.pdf -2020/01/04 | 355920 | fonts/logix/doc/logix.tex +2020/03/07 | 1312 | fonts/logix/CHANGELOG +2020/03/07 | 421596 | fonts/logix/doc/logix.pdf +2020/03/07 | 355962 | fonts/logix/doc/logix.tex 2020/01/04 | 377422 | fonts/logix/fonts/logix.eot 2020/01/04 | 1053108 | fonts/logix/fonts/logix.ttf 2020/01/04 | 461176 | fonts/logix/fonts/logix.woff 2020/01/04 | 279660 | fonts/logix/fonts/logix.woff2 2020/01/04 | 429804 | fonts/logix/opentype/logix.otf -2020/01/04 | 6401 | fonts/logix/README +2020/03/07 | 5570 | fonts/logix/README 2020/01/04 | 242301 | fonts/logix/source/logix.math 2020/01/04 | 3599267 | fonts/logix/source/logix.vfc -2020/01/04 | 163740 | fonts/logix/tex/logix.sty -2020/01/04 | 3107139 | fonts/logix.zip +2020/03/07 | 167770 | fonts/logix/tex/logix.sty +2020/05/09 | 3107665 | fonts/logix.zip 2012/08/11 | 492 | fonts/lsabon/lsabon.bib 2015/08/22 | 13794 | fonts/lsabon/lsabon.dtx 2012/08/09 | 1913 | fonts/lsabon/lsabon.ins @@ -175862,14 +175862,13 @@ 1999/12/09 | 3275 | macros/fotex/mathml.ltx 1999/12/21 | 35 | macros/fotex/pdffotex.ini 2005/11/03 | 8878 | macros/fotex.zip -2010/05/15 | 63111 | macros/generic/2up/2up-doc.pdf -2010/05/15 | 16964 | macros/generic/2up/2up-doc.tex -2010/05/15 | 228 | macros/generic/2up/2up.sty -2010/05/15 | 12145 | macros/generic/2up/2up.tex -2010/05/15 | 214 | macros/generic/2up/Changes -2010/05/15 | 1867 | macros/generic/2up/Makefile -2010/05/16 | 367 | macros/generic/2up/README -2010/05/16 | 68150 | macros/generic/2up.zip +2020/05/09 | 281 | macros/generic/2up/Changes +2020/05/09 | 46721 | macros/generic/2up/doc/2up-doc.pdf +2020/05/09 | 16908 | macros/generic/2up/doc/2up-doc.tex +2020/05/09 | 229 | macros/generic/2up/latex/2up.sty +2020/05/09 | 162 | macros/generic/2up/README +2020/05/09 | 12180 | macros/generic/2up/tex/2up.tex +2020/05/09 | 57099 | macros/generic/2up.zip 2005/08/10 | 5742 | macros/generic/abbr/abbr.tex 2005/08/10 | 1062 | macros/generic/abbr/README 2005/08/10 | 3043 | macros/generic/abbr.zip @@ -181805,84 +181804,84 @@ 2017/06/17 | 9858 | macros/latex/contrib/biblatex-contrib/biblatex-enc/enc.cbx 2017/06/17 | 5005 | macros/latex/contrib/biblatex-contrib/biblatex-enc/README 2017/06/17 | 11479 | macros/latex/contrib/biblatex-contrib/biblatex-enc.zip -2020/05/05 | 1290 | macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-examples.bib -2020/05/05 | 3632 | macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oa-doiapi.sty -2020/05/05 | 15136 | macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oa.sty -2020/05/05 | 7668 | macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oasymb-l3draw.sty -2020/05/05 | 5586 | macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oasymb-pict2e.sty -2020/05/05 | 6074 | macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oasymb-tikz.sty -2020/05/05 | 551630 | macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext.pdf -2020/05/05 | 10623 | macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-tabular.sty -2020/05/05 | 133260 | macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext.tex -2020/05/05 | 9516 | macros/latex/contrib/biblatex-contrib/biblatex-ext/blxextdoiapi.lua -2020/05/05 | 10091 | macros/latex/contrib/biblatex-contrib/biblatex-ext/CHANGES.md -2020/05/05 | 628 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic.bbx -2020/05/05 | 3811 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic.cbx -2020/05/05 | 715 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic-verb.bbx -2020/05/05 | 3249 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic-verb.cbx -2020/05/05 | 684 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle.bbx -2020/05/05 | 4612 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle.cbx -2020/05/05 | 1391 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-common.bbx -2020/05/05 | 699 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-comp.bbx -2020/05/05 | 5833 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-comp.cbx -2020/05/05 | 699 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ibid.bbx -2020/05/05 | 4830 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ibid.cbx -2020/05/05 | 702 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-icomp.bbx -2020/05/05 | 6137 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-icomp.cbx -2020/05/05 | 702 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-tcomp.bbx -2020/05/05 | 3985 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-tcomp.cbx -2020/05/05 | 702 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-terse.bbx -2020/05/05 | 1848 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-terse.cbx -2020/05/05 | 705 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ticomp.bbx -2020/05/05 | 4576 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ticomp.cbx -2020/05/05 | 677 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear.bbx -2020/05/05 | 5257 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear.cbx -2020/05/05 | 4933 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-common.bbx -2020/05/05 | 695 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-comp.bbx -2020/05/05 | 8255 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-comp.cbx -2020/05/05 | 688 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ecomp.bbx -2020/05/05 | 11663 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ecomp.cbx -2020/05/05 | 695 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ibid.bbx -2020/05/05 | 5587 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ibid.cbx -2020/05/05 | 698 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-icomp.bbx -2020/05/05 | 8705 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-icomp.cbx -2020/05/05 | 691 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-iecomp.bbx -2020/05/05 | 12128 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-iecomp.cbx -2020/05/05 | 697 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tcomp.bbx -2020/05/05 | 5336 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tcomp.cbx -2020/05/05 | 699 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tecomp.bbx -2020/05/05 | 6171 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tecomp.cbx -2020/05/05 | 692 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-terse.bbx -2020/05/05 | 2086 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-terse.cbx -2020/05/05 | 700 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ticomp.bbx -2020/05/05 | 5773 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ticomp.cbx -2020/05/05 | 702 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tiecomp.bbx -2020/05/05 | 6671 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tiecomp.cbx -2020/05/05 | 11700 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-biblatex-aux.def -2020/05/05 | 2939 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-dashed-common.bbx -2020/05/05 | 619 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric.bbx -2020/05/05 | 4111 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric.cbx -2020/05/05 | 637 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-comp.bbx -2020/05/05 | 4578 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-comp.cbx -2020/05/05 | 637 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-verb.bbx -2020/05/05 | 3548 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-verb.cbx -2020/05/05 | 36731 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-standard.bbx -2020/05/05 | 622 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose.bbx -2020/05/05 | 2673 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose.cbx -2020/05/05 | 637 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-ibid.bbx -2020/05/05 | 2686 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-ibid.cbx -2020/05/05 | 640 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-inote.bbx -2020/05/05 | 2846 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-inote.cbx -2020/05/05 | 637 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-note.bbx -2020/05/05 | 2841 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-note.cbx -2020/05/05 | 640 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad1.bbx -2020/05/05 | 2691 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad1.cbx -2020/05/05 | 640 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad2.bbx -2020/05/05 | 2691 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad2.cbx -2020/05/05 | 640 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad3.bbx -2020/05/05 | 2689 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad3.cbx -2020/05/05 | 6067 | macros/latex/contrib/biblatex-contrib/biblatex-ext/README.md -2020/05/05 | 670100 | macros/latex/contrib/biblatex-contrib/biblatex-ext.zip +2020/05/09 | 1290 | macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-examples.bib +2020/05/09 | 3632 | macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oa-doiapi.sty +2020/05/09 | 15136 | macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oa.sty +2020/05/09 | 7668 | macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oasymb-l3draw.sty +2020/05/09 | 5586 | macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oasymb-pict2e.sty +2020/05/09 | 6074 | macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oasymb-tikz.sty +2020/05/09 | 551860 | macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext.pdf +2020/05/09 | 10623 | macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-tabular.sty +2020/05/09 | 133395 | macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext.tex +2020/05/09 | 9516 | macros/latex/contrib/biblatex-contrib/biblatex-ext/blxextdoiapi.lua +2020/05/09 | 10405 | macros/latex/contrib/biblatex-contrib/biblatex-ext/CHANGES.md +2020/05/09 | 628 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic.bbx +2020/05/09 | 3811 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic.cbx +2020/05/09 | 715 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic-verb.bbx +2020/05/09 | 3249 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic-verb.cbx +2020/05/09 | 684 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle.bbx +2020/05/09 | 4697 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle.cbx +2020/05/09 | 1391 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-common.bbx +2020/05/09 | 699 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-comp.bbx +2020/05/09 | 5833 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-comp.cbx +2020/05/09 | 699 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ibid.bbx +2020/05/09 | 4915 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ibid.cbx +2020/05/09 | 702 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-icomp.bbx +2020/05/09 | 6137 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-icomp.cbx +2020/05/09 | 702 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-tcomp.bbx +2020/05/09 | 3985 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-tcomp.cbx +2020/05/09 | 702 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-terse.bbx +2020/05/09 | 1848 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-terse.cbx +2020/05/09 | 705 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ticomp.bbx +2020/05/09 | 4576 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ticomp.cbx +2020/05/09 | 677 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear.bbx +2020/05/09 | 5504 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear.cbx +2020/05/09 | 4933 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-common.bbx +2020/05/09 | 695 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-comp.bbx +2020/05/09 | 8316 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-comp.cbx +2020/05/09 | 688 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ecomp.bbx +2020/05/09 | 11724 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ecomp.cbx +2020/05/09 | 695 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ibid.bbx +2020/05/09 | 5733 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ibid.cbx +2020/05/09 | 698 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-icomp.bbx +2020/05/09 | 8766 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-icomp.cbx +2020/05/09 | 691 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-iecomp.bbx +2020/05/09 | 12189 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-iecomp.cbx +2020/05/09 | 697 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tcomp.bbx +2020/05/09 | 5336 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tcomp.cbx +2020/05/09 | 699 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tecomp.bbx +2020/05/09 | 6171 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tecomp.cbx +2020/05/09 | 692 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-terse.bbx +2020/05/09 | 2086 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-terse.cbx +2020/05/09 | 700 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ticomp.bbx +2020/05/09 | 5773 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ticomp.cbx +2020/05/09 | 702 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tiecomp.bbx +2020/05/09 | 6671 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tiecomp.cbx +2020/05/09 | 11700 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-biblatex-aux.def +2020/05/09 | 2939 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-dashed-common.bbx +2020/05/09 | 619 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric.bbx +2020/05/09 | 4111 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric.cbx +2020/05/09 | 637 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-comp.bbx +2020/05/09 | 4578 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-comp.cbx +2020/05/09 | 637 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-verb.bbx +2020/05/09 | 3548 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-verb.cbx +2020/05/09 | 36731 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-standard.bbx +2020/05/09 | 622 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose.bbx +2020/05/09 | 2673 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose.cbx +2020/05/09 | 637 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-ibid.bbx +2020/05/09 | 2686 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-ibid.cbx +2020/05/09 | 640 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-inote.bbx +2020/05/09 | 2846 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-inote.cbx +2020/05/09 | 637 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-note.bbx +2020/05/09 | 2841 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-note.cbx +2020/05/09 | 640 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad1.bbx +2020/05/09 | 2691 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad1.cbx +2020/05/09 | 640 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad2.bbx +2020/05/09 | 2691 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad2.cbx +2020/05/09 | 640 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad3.bbx +2020/05/09 | 2689 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad3.cbx +2020/05/09 | 6067 | macros/latex/contrib/biblatex-contrib/biblatex-ext/README.md +2020/05/09 | 670669 | macros/latex/contrib/biblatex-contrib/biblatex-ext.zip 2017/11/21 | 241897 | macros/latex/contrib/biblatex-contrib/biblatex-fiwi/doc/biblatex-fiwi.pdf 2017/11/21 | 86976 | macros/latex/contrib/biblatex-contrib/biblatex-fiwi/doc/biblatex-fiwi.tex 2017/11/21 | 570 | macros/latex/contrib/biblatex-contrib/biblatex-fiwi/doc/dissff.xdy @@ -195556,13 +195555,13 @@ 1996/03/22 | 18862 | macros/latex/contrib/niceframe/umrandb.mf 2015/01/17 | 1370 | macros/latex/contrib/niceframe/umrand.mf 2015/01/17 | 287910 | macros/latex/contrib/niceframe.zip -2020/04/06 | 326699 | macros/latex/contrib/nicematrix/nicematrix.dtx -2020/04/06 | 343415 | macros/latex/contrib/nicematrix/nicematrix-french.pdf -2020/04/03 | 101455 | macros/latex/contrib/nicematrix/nicematrix-french.tex +2020/05/08 | 367797 | macros/latex/contrib/nicematrix/nicematrix.dtx +2020/05/08 | 349092 | macros/latex/contrib/nicematrix/nicematrix-french.pdf +2020/05/08 | 103567 | macros/latex/contrib/nicematrix/nicematrix-french.tex 2019/01/16 | 1423 | macros/latex/contrib/nicematrix/nicematrix.ins -2020/04/06 | 814877 | macros/latex/contrib/nicematrix/nicematrix.pdf +2020/05/08 | 845357 | macros/latex/contrib/nicematrix/nicematrix.pdf 2019/10/07 | 974 | macros/latex/contrib/nicematrix/README.md -2020/04/06 | 1209318 | macros/latex/contrib/nicematrix.zip +2020/05/09 | 1256317 | macros/latex/contrib/nicematrix.zip 2015/11/21 | 217 | macros/latex/contrib/nicetext/ANNOUNCE.txt 2012/03/18 | 254582 | macros/latex/contrib/nicetext/demo/arseneau.pdf 2011/09/14 | 10 | macros/latex/contrib/nicetext/demo/iso.txt @@ -211117,14 +211116,14 @@ 2007/07/13 | 9394 | macros/omega/latex/contrib/tamil-omega/yudit/Tamil2.my 2007/07/13 | 11462 | macros/omega/latex/contrib/tamil-omega/yudit/yudit.properties 2007/12/12 | 900761 | macros/omega/latex/contrib/tamil-omega.zip -2020/04/30 | 732 | macros/pdftex/mptopdf/doc/context/scripts/mkii/mptopdf.man -2020/04/30 | 4557 | macros/pdftex/mptopdf/scripts/context/perl/mptopdf.pl -2020/04/30 | 4608 | macros/pdftex/mptopdf/scripts/context/stubs/mswin/mptopdf.exe -2020/04/30 | 21474 | macros/pdftex/mptopdf/tex/context/base/mkii/supp-mis.mkii -2020/04/30 | 42831 | macros/pdftex/mptopdf/tex/context/base/mkii/supp-mpe.mkii -2020/04/30 | 71627 | macros/pdftex/mptopdf/tex/context/base/mkii/supp-pdf.mkii -2020/04/30 | 7856 | macros/pdftex/mptopdf/tex/context/base/mkii/syst-tex.mkii -2020/04/30 | 5322 | macros/pdftex/mptopdf/tex/generic/context/mptopdf/mptopdf.tex +2020/05/07 | 732 | macros/pdftex/mptopdf/doc/context/scripts/mkii/mptopdf.man +2020/05/07 | 4557 | macros/pdftex/mptopdf/scripts/context/perl/mptopdf.pl +2020/05/07 | 4608 | macros/pdftex/mptopdf/scripts/context/stubs/mswin/mptopdf.exe +2020/05/07 | 21474 | macros/pdftex/mptopdf/tex/context/base/mkii/supp-mis.mkii +2020/05/07 | 42831 | macros/pdftex/mptopdf/tex/context/base/mkii/supp-mpe.mkii +2020/05/07 | 71627 | macros/pdftex/mptopdf/tex/context/base/mkii/supp-pdf.mkii +2020/05/07 | 7856 | macros/pdftex/mptopdf/tex/context/base/mkii/syst-tex.mkii +2020/05/07 | 5322 | macros/pdftex/mptopdf/tex/generic/context/mptopdf/mptopdf.tex 1992/08/27 | 111203 | macros/physe/physe.doc 1992/08/27 | 71123 | macros/physe/physe.tex 1992/08/27 | 3024 | macros/physe/physupdt.tex @@ -260095,7 +260094,7 @@ 2020/03/14 | 1889948 | systems/texlive/tlnet/archive/luahbtex.i386-netbsd.r54285.tar.xz 2020/03/13 | 2021508 | systems/texlive/tlnet/archive/luahbtex.i386-solaris.r54263.tar.xz 2020/03/24 | 460 | systems/texlive/tlnet/archive/luahbtex.r54498.tar.xz -2020/03/13 | 1557040 | systems/texlive/tlnet/archive/luahbtex.win32.r54250.tar.xz +2020/05/09 | 1546416 | systems/texlive/tlnet/archive/luahbtex.win32.r55067.tar.xz 2020/03/14 | 2044244 | systems/texlive/tlnet/archive/luahbtex.x86_64-cygwin.r54274.tar.xz 2020/03/13 | 1872876 | systems/texlive/tlnet/archive/luahbtex.x86_64-darwinlegacy.r54263.tar.xz 2020/03/29 | 2151672 | systems/texlive/tlnet/archive/luahbtex.x86_64-darwin.r54608.tar.xz @@ -260125,7 +260124,7 @@ 2020/03/14 | 3309452 | systems/texlive/tlnet/archive/luajittex.i386-netbsd.r54285.tar.xz 2020/03/13 | 2404444 | systems/texlive/tlnet/archive/luajittex.i386-solaris.r54263.tar.xz 2020/03/24 | 484 | systems/texlive/tlnet/archive/luajittex.r54498.tar.xz -2020/03/13 | 2162376 | systems/texlive/tlnet/archive/luajittex.win32.r54250.tar.xz +2020/05/09 | 2158556 | systems/texlive/tlnet/archive/luajittex.win32.r55068.tar.xz 2020/03/14 | 2466692 | systems/texlive/tlnet/archive/luajittex.x86_64-cygwin.r54274.tar.xz 2020/03/13 | 2232616 | systems/texlive/tlnet/archive/luajittex.x86_64-darwinlegacy.r54263.tar.xz 2020/03/29 | 2620656 | systems/texlive/tlnet/archive/luajittex.x86_64-darwin.r54608.tar.xz @@ -260201,7 +260200,7 @@ 2019/02/28 | 317312 | systems/texlive/tlnet/archive/luatextra.doc.r20747.tar.xz 2019/02/28 | 1056 | systems/texlive/tlnet/archive/luatextra.r20747.tar.xz 2019/02/28 | 3492 | systems/texlive/tlnet/archive/luatextra.source.r20747.tar.xz -2020/03/13 | 1818820 | systems/texlive/tlnet/archive/luatex.win32.r54250.tar.xz +2020/05/09 | 1824220 | systems/texlive/tlnet/archive/luatex.win32.r55067.tar.xz 2020/03/14 | 1685584 | systems/texlive/tlnet/archive/luatex.x86_64-cygwin.r54274.tar.xz 2020/03/13 | 1591340 | systems/texlive/tlnet/archive/luatex.x86_64-darwinlegacy.r54263.tar.xz 2020/03/29 | 1817584 | systems/texlive/tlnet/archive/luatex.x86_64-darwin.r54608.tar.xz @@ -263772,11 +263771,11 @@ 2019/02/28 | 944 | systems/texlive/tlnet/archive/susy.r19440.tar.xz 2019/02/28 | 1380 | systems/texlive/tlnet/archive/svgcolor.doc.r15878.tar.xz 2019/02/28 | 3452 | systems/texlive/tlnet/archive/svgcolor.r15878.tar.xz -2020/01/14 | 1065576 | systems/texlive/tlnet/archive/svg.doc.r53389.tar.xz +2020/05/09 | 1077456 | systems/texlive/tlnet/archive/svg.doc.r55070.tar.xz 2019/02/28 | 197212 | systems/texlive/tlnet/archive/svg-inkscape.doc.r32199.tar.xz 2019/02/28 | 648 | systems/texlive/tlnet/archive/svg-inkscape.r32199.tar.xz -2020/01/14 | 13148 | systems/texlive/tlnet/archive/svg.r53389.tar.xz -2020/01/14 | 42224 | systems/texlive/tlnet/archive/svg.source.r53389.tar.xz +2020/05/09 | 13884 | systems/texlive/tlnet/archive/svg.r55070.tar.xz +2020/05/09 | 44084 | systems/texlive/tlnet/archive/svg.source.r55070.tar.xz 2019/02/28 | 441216 | systems/texlive/tlnet/archive/svn.doc.r15878.tar.xz 2019/02/28 | 258436 | systems/texlive/tlnet/archive/svninfo.doc.r17554.tar.xz 2019/02/28 | 3940 | systems/texlive/tlnet/archive/svninfo.r17554.tar.xz @@ -264198,7 +264197,7 @@ 2020/03/02 | 164272 | systems/texlive/tlnet/archive/tex.i386-solaris.r53999.tar.xz 2019/02/28 | 1956 | systems/texlive/tlnet/archive/texilikechaps.r28553.tar.xz 2019/02/28 | 956 | systems/texlive/tlnet/archive/texilikecover.r15878.tar.xz -2020/05/04 | 97988 | systems/texlive/tlnet/archive/texinfo.r54994.tar.xz +2020/05/09 | 98056 | systems/texlive/tlnet/archive/texinfo.r55066.tar.xz 2019/02/28 | 1336 | systems/texlive/tlnet/archive/tex-ini-files.doc.r40533.tar.xz 2019/02/28 | 3264 | systems/texlive/tlnet/archive/tex-ini-files.r40533.tar.xz 2019/02/28 | 36596 | systems/texlive/tlnet/archive/tex-label.doc.r16372.tar.xz @@ -264210,8 +264209,8 @@ 2020/03/24 | 280 | systems/texlive/tlnet/archive/texlive-cz.r54496.tar.xz 2020/03/29 | 1338300 | systems/texlive/tlnet/archive/texlive-de.doc.r54604.tar.xz 2020/03/29 | 272 | systems/texlive/tlnet/archive/texlive-de.r54604.tar.xz -2020/05/07 | 161672 | systems/texlive/tlnet/archive/texlive-docindex.doc.r55037.tar.xz -2020/05/07 | 388 | systems/texlive/tlnet/archive/texlive-docindex.r55037.tar.xz +2020/05/09 | 161724 | systems/texlive/tlnet/archive/texlive-docindex.doc.r55066.tar.xz +2020/05/09 | 388 | systems/texlive/tlnet/archive/texlive-docindex.r55066.tar.xz 2020/04/16 | 1891392 | systems/texlive/tlnet/archive/texlive-en.doc.r54755.tar.xz 2020/04/16 | 272 | systems/texlive/tlnet/archive/texlive-en.r54755.tar.xz 2020/03/22 | 3090144 | systems/texlive/tlnet/archive/texlive-es.doc.r54465.tar.xz @@ -265900,16 +265899,16 @@ 2020/01/24 | 138180 | systems/texlive/tlnet/archive/zxjatype.doc.r53500.tar.xz 2020/01/24 | 8760 | systems/texlive/tlnet/archive/zxjatype.r53500.tar.xz 2020/05/03 | 107750 | systems/texlive/tlnet/install-tl -2020/05/08 | 5500533 | systems/texlive/tlnet/install-tl-unx.tar.gz -2020/05/08 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512 -2020/05/08 | 455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc +2020/05/09 | 5500542 | systems/texlive/tlnet/install-tl-unx.tar.gz +2020/05/09 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512 +2020/05/09 | 455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc 2020/03/17 | 4641 | systems/texlive/tlnet/install-tl-windows.bat -2020/05/08 | 19381037 | systems/texlive/tlnet/install-tl-windows.exe -2020/05/08 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512 -2020/05/08 | 455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc -2020/05/08 | 24269447 | systems/texlive/tlnet/install-tl.zip -2020/05/08 | 145 | systems/texlive/tlnet/install-tl.zip.sha512 -2020/05/08 | 455 | systems/texlive/tlnet/install-tl.zip.sha512.asc +2020/05/09 | 19381061 | systems/texlive/tlnet/install-tl-windows.exe +2020/05/09 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512 +2020/05/09 | 455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc +2020/05/09 | 24269447 | systems/texlive/tlnet/install-tl.zip +2020/05/09 | 145 | systems/texlive/tlnet/install-tl.zip.sha512 +2020/05/09 | 455 | systems/texlive/tlnet/install-tl.zip.sha512.asc 2020/03/05 | 1215 | systems/texlive/tlnet/README.md 2020/04/06 | 5961 | systems/texlive/tlnet/tlpkg/gpg/pubring.gpg 2016/04/12 | 600 | systems/texlive/tlnet/tlpkg/gpg/random_seed @@ -265965,12 +265964,12 @@ 2020/03/04 | 20330 | systems/texlive/tlnet/tlpkg/TeXLive/TLCrypto.pm 2020/05/03 | 4786 | systems/texlive/tlnet/tlpkg/TeXLive/TLDownload.pm 2017/11/14 | 27560 | systems/texlive/tlnet/tlpkg/TeXLive/TLPaper.pm -2020/05/08 | 16417650 | systems/texlive/tlnet/tlpkg/texlive.tlpdb -2020/05/08 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 +2020/05/09 | 16417650 | systems/texlive/tlnet/tlpkg/texlive.tlpdb +2020/05/09 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 2020/05/03 | 86416 | systems/texlive/tlnet/tlpkg/TeXLive/TLPDB.pm -2020/05/08 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 -2020/05/08 | 455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc -2020/05/08 | 2196656 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz +2020/05/09 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 +2020/05/09 | 455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc +2020/05/09 | 2195984 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz 2020/04/15 | 58761 | systems/texlive/tlnet/tlpkg/TeXLive/TLPOBJ.pm 2020/03/20 | 41736 | systems/texlive/tlnet/tlpkg/TeXLive/TLPSRC.pm 2020/03/04 | 14970 | systems/texlive/tlnet/tlpkg/TeXLive/TLTREE.pm @@ -270376,7 +270375,7 @@ 2020/02/04 | 281488 | 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 -2020/05/08 | 536734 | systems/win32/miktex/tm/packages/files.csv.lzma +2020/05/09 | 536734 | 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 @@ -271518,9 +271517,9 @@ 2018/01/12 | 157226 | systems/win32/miktex/tm/packages/miktex-zip-bin-x64.tar.lzma 2020/04/19 | 39206 | systems/win32/miktex/tm/packages/miktex-zlib-bin-2.9.tar.lzma 2020/04/19 | 42920 | systems/win32/miktex/tm/packages/miktex-zlib-bin-x64-2.9.tar.lzma -2020/05/08 | 199307 | systems/win32/miktex/tm/packages/miktex-zzdb1-2.9.tar.lzma -2020/05/08 | 1193422 | systems/win32/miktex/tm/packages/miktex-zzdb2-2.9.tar.lzma -2020/05/08 | 1113614 | systems/win32/miktex/tm/packages/miktex-zzdb3-2.9.tar.lzma +2020/05/09 | 199292 | systems/win32/miktex/tm/packages/miktex-zzdb1-2.9.tar.lzma +2020/05/09 | 1192906 | systems/win32/miktex/tm/packages/miktex-zzdb2-2.9.tar.lzma +2020/05/09 | 1113587 | systems/win32/miktex/tm/packages/miktex-zzdb3-2.9.tar.lzma 2020/04/19 | 13027 | systems/win32/miktex/tm/packages/miktex-zzip-bin-2.9.tar.lzma 2020/04/19 | 14026 | 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 @@ -271672,183 +271671,183 @@ 2018/04/09 | 400132 | systems/win32/miktex/tm/packages/newunicodechar.tar.lzma 2011/09/19 | 101312 | systems/win32/miktex/tm/packages/newvbtm.tar.lzma 2019/09/11 | 231430 | systems/win32/miktex/tm/packages/newverbs.tar.lzma -2020/05/08 | 536866 | systems/win32/miktex/tm/packages/next/files.csv.lzma -2020/05/08 | 58441 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-2.9.tar.lzma -2020/05/08 | 66660 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-x64-2.9.tar.lzma -2020/05/08 | 940560 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-2.9.tar.lzma -2020/05/08 | 1049577 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-x64-2.9.tar.lzma -2020/05/08 | 28561 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-2.9.tar.lzma -2020/05/08 | 30828 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-x64-2.9.tar.lzma -2020/05/08 | 29385 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-2.9.tar.lzma -2020/05/08 | 34926 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-x64-2.9.tar.lzma -2020/05/08 | 49845 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-2.9.tar.lzma -2020/05/08 | 57349 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-x64-2.9.tar.lzma -2020/05/08 | 84583 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-2.9.tar.lzma -2020/05/08 | 94362 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-x64-2.9.tar.lzma -2020/05/08 | 63084 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-2.9.tar.lzma -2020/05/08 | 70824 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-x64-2.9.tar.lzma -2020/05/08 | 26651 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-2.9.tar.lzma -2020/05/08 | 30224 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-x64-2.9.tar.lzma -2020/05/08 | 328575 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-2.9.tar.lzma -2020/05/08 | 391630 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-x64-2.9.tar.lzma -2020/05/08 | 32341 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-2.9.tar.lzma -2020/05/08 | 36456 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-x64-2.9.tar.lzma -2020/05/08 | 71230 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-2.9.tar.lzma -2020/05/08 | 77892 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-x64-2.9.tar.lzma -2020/05/08 | 203032 | systems/win32/miktex/tm/packages/next/miktex-console-bin-2.9.tar.lzma -2020/05/08 | 222914 | systems/win32/miktex/tm/packages/next/miktex-console-bin-x64-2.9.tar.lzma -2020/05/08 | 169490 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-2.9.tar.lzma -2020/05/08 | 184205 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-x64-2.9.tar.lzma -2020/05/08 | 52156 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-2.9.tar.lzma -2020/05/08 | 58595 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-x64-2.9.tar.lzma -2020/05/08 | 20712 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-2.9.tar.lzma -2020/05/08 | 23030 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-x64-2.9.tar.lzma -2020/05/08 | 461342 | systems/win32/miktex/tm/packages/next/miktex-doc-2.9.tar.lzma -2020/05/08 | 41119 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-2.9.tar.lzma -2020/05/08 | 45991 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-x64-2.9.tar.lzma -2020/05/08 | 273337 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-2.9.tar.lzma -2020/05/08 | 310921 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-x64-2.9.tar.lzma -2020/05/08 | 40539 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-2.9.tar.lzma -2020/05/08 | 45022 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-x64-2.9.tar.lzma -2020/05/08 | 115768 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-2.9.tar.lzma -2020/05/08 | 130570 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-x64-2.9.tar.lzma -2020/05/08 | 1255816 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-2.9.tar.lzma -2020/05/08 | 1385226 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-x64-2.9.tar.lzma -2020/05/08 | 95169 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-2.9.tar.lzma -2020/05/08 | 109951 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-x64-2.9.tar.lzma -2020/05/08 | 43433 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-2.9.tar.lzma -2020/05/08 | 47994 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-x64-2.9.tar.lzma -2020/05/08 | 45737 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-2.9.tar.lzma -2020/05/08 | 50708 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-x64-2.9.tar.lzma -2020/05/08 | 56674 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-2.9.tar.lzma -2020/05/08 | 61742 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-x64-2.9.tar.lzma -2020/05/08 | 133326 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-2.9.tar.lzma -2020/05/08 | 152150 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-x64-2.9.tar.lzma -2020/05/08 | 69795 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-2.9.tar.lzma -2020/05/08 | 72917 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-x64-2.9.tar.lzma -2020/05/08 | 68620 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-2.9.tar.lzma -2020/05/08 | 77478 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-x64-2.9.tar.lzma -2020/05/08 | 246413 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-2.9.tar.lzma -2020/05/08 | 281591 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-x64-2.9.tar.lzma -2020/05/08 | 25396 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-2.9.tar.lzma -2020/05/08 | 28792 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-x64-2.9.tar.lzma -2020/05/08 | 100710 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-2.9.tar.lzma -2020/05/08 | 116776 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-x64-2.9.tar.lzma -2020/05/08 | 63272 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-2.9.tar.lzma -2020/05/08 | 72530 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-x64-2.9.tar.lzma -2020/05/08 | 94275 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-2.9.tar.lzma -2020/05/08 | 111262 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-x64-2.9.tar.lzma -2020/05/08 | 57867 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-2.9.tar.lzma -2020/05/08 | 64633 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-x64-2.9.tar.lzma -2020/05/08 | 457274 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-2.9.tar.lzma -2020/05/08 | 544364 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-x64-2.9.tar.lzma -2020/05/08 | 137140 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-2.9.tar.lzma -2020/05/08 | 149989 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-x64-2.9.tar.lzma -2020/05/08 | 92927 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-2.9.tar.lzma -2020/05/08 | 108912 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-x64-2.9.tar.lzma -2020/05/08 | 15968 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-2.9.tar.lzma -2020/05/08 | 17763 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-x64-2.9.tar.lzma -2020/05/08 | 27730 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-2.9.tar.lzma -2020/05/08 | 29736 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-x64-2.9.tar.lzma -2020/05/08 | 615566 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-2.9.tar.lzma -2020/05/08 | 670093 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-x64-2.9.tar.lzma -2020/05/08 | 498809 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-2.9.tar.lzma -2020/05/08 | 560801 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-x64-2.9.tar.lzma -2020/05/08 | 539552 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-2.9.tar.lzma -2020/05/08 | 576310 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-x64-2.9.tar.lzma -2020/05/08 | 93516 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-2.9.tar.lzma -2020/05/08 | 102587 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-x64-2.9.tar.lzma -2020/05/08 | 1702032 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-2.9.tar.lzma -2020/05/08 | 1969815 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-x64-2.9.tar.lzma -2020/05/08 | 67252 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-2.9.tar.lzma -2020/05/08 | 73637 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-x64-2.9.tar.lzma -2020/05/08 | 27041 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-2.9.tar.lzma -2020/05/08 | 31358 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-x64-2.9.tar.lzma -2020/05/08 | 7495 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-2.9.tar.lzma -2020/05/08 | 8481 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-x64-2.9.tar.lzma -2020/05/08 | 167639 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-2.9.tar.lzma -2020/05/08 | 182736 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-x64-2.9.tar.lzma -2020/05/08 | 247726 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-2.9.tar.lzma -2020/05/08 | 281374 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-x64-2.9.tar.lzma -2020/05/08 | 87021 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-2.9.tar.lzma -2020/05/08 | 92187 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-x64-2.9.tar.lzma -2020/05/08 | 78123 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-2.9.tar.lzma -2020/05/08 | 86868 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-x64-2.9.tar.lzma -2020/05/08 | 165201 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-2.9.tar.lzma -2020/05/08 | 185075 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-x64-2.9.tar.lzma -2020/05/08 | 148890 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-2.9.tar.lzma -2020/05/08 | 168073 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-x64-2.9.tar.lzma -2020/05/08 | 195071 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-2.9.tar.lzma -2020/05/08 | 177840 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-x64-2.9.tar.lzma -2020/05/08 | 81366 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-2.9.tar.lzma -2020/05/08 | 92856 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-x64-2.9.tar.lzma -2020/05/08 | 30990 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-2.9.tar.lzma -2020/05/08 | 34850 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-x64-2.9.tar.lzma -2020/05/08 | 55770 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-2.9.tar.lzma -2020/05/08 | 63028 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-x64-2.9.tar.lzma -2020/05/08 | 63139 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-2.9.tar.lzma -2020/05/08 | 69362 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-x64-2.9.tar.lzma -2020/05/08 | 45647 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-2.9.tar.lzma -2020/05/08 | 52226 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-x64-2.9.tar.lzma -2020/05/08 | 355479 | systems/win32/miktex/tm/packages/next/miktex-omega-bin-2.9.tar.lzma -2020/05/08 | 389067 | systems/win32/miktex/tm/packages/next/miktex-omega-bin-x64-2.9.tar.lzma -2020/05/08 | 321355 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-2.9.tar.lzma -2020/05/08 | 356141 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-x64-2.9.tar.lzma -2020/05/08 | 187110 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-2.9.tar.lzma -2020/05/08 | 193783 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-x64-2.9.tar.lzma -2020/05/08 | 206888 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-2.9.tar.lzma -2020/05/08 | 243116 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-x64-2.9.tar.lzma -2020/05/08 | 77985 | systems/win32/miktex/tm/packages/next/miktex-png-bin-2.9.tar.lzma -2020/05/08 | 87143 | systems/win32/miktex/tm/packages/next/miktex-png-bin-x64-2.9.tar.lzma -2020/05/08 | 932517 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-2.9.tar.lzma -2020/05/08 | 1042826 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-x64-2.9.tar.lzma -2020/05/08 | 19893 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-2.9.tar.lzma -2020/05/08 | 23497 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-x64-2.9.tar.lzma -2020/05/08 | 31156 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-2.9.tar.lzma -2020/05/08 | 36616 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-x64-2.9.tar.lzma -2020/05/08 | 63329 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-2.9.tar.lzma -2020/05/08 | 71762 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-x64-2.9.tar.lzma -2020/05/08 | 42631 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-2.9.tar.lzma -2020/05/08 | 50995 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-x64-2.9.tar.lzma -2020/05/08 | 1149787 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-2.9.tar.lzma -2020/05/08 | 1285259 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-x64-2.9.tar.lzma -2020/05/08 | 41991 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-2.9.tar.lzma -2020/05/08 | 50930 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-x64-2.9.tar.lzma -2020/05/08 | 74298 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-2.9.tar.lzma -2020/05/08 | 82330 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-x64-2.9.tar.lzma -2020/05/08 | 26852 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-2.9.tar.lzma -2020/05/08 | 29136 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-x64-2.9.tar.lzma -2020/05/08 | 16113 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-2.9.tar.lzma -2020/05/08 | 17839 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-x64-2.9.tar.lzma -2020/05/08 | 63137 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-2.9.tar.lzma -2020/05/08 | 69277 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-x64-2.9.tar.lzma -2020/05/08 | 148070 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-2.9.tar.lzma -2020/05/08 | 160684 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-x64-2.9.tar.lzma -2020/05/08 | 74854 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-2.9.tar.lzma -2020/05/08 | 85016 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-x64-2.9.tar.lzma -2020/05/08 | 91489 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-2.9.tar.lzma -2020/05/08 | 96647 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-x64-2.9.tar.lzma -2020/05/08 | 2557747 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-2.9.tar.lzma -2020/05/08 | 2686311 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-x64-2.9.tar.lzma -2020/05/08 | 55026 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-2.9.tar.lzma -2020/05/08 | 61216 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-x64-2.9.tar.lzma -2020/05/08 | 26497 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-2.9.tar.lzma -2020/05/08 | 32348 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-x64-2.9.tar.lzma -2020/05/08 | 61618 | systems/win32/miktex/tm/packages/next/miktex-web-bin-2.9.tar.lzma -2020/05/08 | 65260 | systems/win32/miktex/tm/packages/next/miktex-web-bin-x64-2.9.tar.lzma -2020/05/08 | 246973 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-2.9.tar.lzma -2020/05/08 | 276749 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-x64-2.9.tar.lzma -2020/05/08 | 590228 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-2.9.tar.lzma -2020/05/08 | 629418 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-x64-2.9.tar.lzma -2020/05/08 | 38798 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-2.9.tar.lzma -2020/05/08 | 42957 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-x64-2.9.tar.lzma -2020/05/08 | 199275 | systems/win32/miktex/tm/packages/next/miktex-zzdb1-2.9.tar.lzma -2020/05/08 | 1193367 | systems/win32/miktex/tm/packages/next/miktex-zzdb2-2.9.tar.lzma -2020/05/08 | 1113244 | systems/win32/miktex/tm/packages/next/miktex-zzdb3-2.9.tar.lzma -2020/05/08 | 13063 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-2.9.tar.lzma -2020/05/08 | 14048 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-x64-2.9.tar.lzma +2020/05/09 | 536866 | systems/win32/miktex/tm/packages/next/files.csv.lzma +2020/05/09 | 58440 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-2.9.tar.lzma +2020/05/09 | 66660 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-x64-2.9.tar.lzma +2020/05/09 | 940562 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-2.9.tar.lzma +2020/05/09 | 1049578 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-x64-2.9.tar.lzma +2020/05/09 | 28563 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-2.9.tar.lzma +2020/05/09 | 30829 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-x64-2.9.tar.lzma +2020/05/09 | 29385 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-2.9.tar.lzma +2020/05/09 | 34926 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-x64-2.9.tar.lzma +2020/05/09 | 49847 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-2.9.tar.lzma +2020/05/09 | 57349 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-x64-2.9.tar.lzma +2020/05/09 | 84580 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-2.9.tar.lzma +2020/05/09 | 94363 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-x64-2.9.tar.lzma +2020/05/09 | 63083 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-2.9.tar.lzma +2020/05/09 | 70824 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-x64-2.9.tar.lzma +2020/05/09 | 26652 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-2.9.tar.lzma +2020/05/09 | 30225 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-x64-2.9.tar.lzma +2020/05/09 | 328578 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-2.9.tar.lzma +2020/05/09 | 391631 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-x64-2.9.tar.lzma +2020/05/09 | 32342 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-2.9.tar.lzma +2020/05/09 | 36457 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-x64-2.9.tar.lzma +2020/05/09 | 71230 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-2.9.tar.lzma +2020/05/09 | 77891 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-x64-2.9.tar.lzma +2020/05/09 | 203030 | systems/win32/miktex/tm/packages/next/miktex-console-bin-2.9.tar.lzma +2020/05/09 | 222914 | systems/win32/miktex/tm/packages/next/miktex-console-bin-x64-2.9.tar.lzma +2020/05/09 | 169490 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-2.9.tar.lzma +2020/05/09 | 184205 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-x64-2.9.tar.lzma +2020/05/09 | 52160 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-2.9.tar.lzma +2020/05/09 | 58594 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-x64-2.9.tar.lzma +2020/05/09 | 20713 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-2.9.tar.lzma +2020/05/09 | 23030 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-x64-2.9.tar.lzma +2020/05/09 | 461340 | systems/win32/miktex/tm/packages/next/miktex-doc-2.9.tar.lzma +2020/05/09 | 41119 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-2.9.tar.lzma +2020/05/09 | 45991 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-x64-2.9.tar.lzma +2020/05/09 | 273338 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-2.9.tar.lzma +2020/05/09 | 310919 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-x64-2.9.tar.lzma +2020/05/09 | 40539 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-2.9.tar.lzma +2020/05/09 | 45022 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-x64-2.9.tar.lzma +2020/05/09 | 115768 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-2.9.tar.lzma +2020/05/09 | 130569 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-x64-2.9.tar.lzma +2020/05/09 | 1255816 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-2.9.tar.lzma +2020/05/09 | 1385225 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-x64-2.9.tar.lzma +2020/05/09 | 95170 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-2.9.tar.lzma +2020/05/09 | 109951 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-x64-2.9.tar.lzma +2020/05/09 | 43434 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-2.9.tar.lzma +2020/05/09 | 47993 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-x64-2.9.tar.lzma +2020/05/09 | 45738 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-2.9.tar.lzma +2020/05/09 | 50708 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-x64-2.9.tar.lzma +2020/05/09 | 56675 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-2.9.tar.lzma +2020/05/09 | 61742 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-x64-2.9.tar.lzma +2020/05/09 | 133328 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-2.9.tar.lzma +2020/05/09 | 152152 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-x64-2.9.tar.lzma +2020/05/09 | 69793 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-2.9.tar.lzma +2020/05/09 | 72918 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-x64-2.9.tar.lzma +2020/05/09 | 68619 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-2.9.tar.lzma +2020/05/09 | 77478 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-x64-2.9.tar.lzma +2020/05/09 | 246412 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-2.9.tar.lzma +2020/05/09 | 281590 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-x64-2.9.tar.lzma +2020/05/09 | 25396 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-2.9.tar.lzma +2020/05/09 | 28794 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-x64-2.9.tar.lzma +2020/05/09 | 100710 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-2.9.tar.lzma +2020/05/09 | 116778 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-x64-2.9.tar.lzma +2020/05/09 | 63272 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-2.9.tar.lzma +2020/05/09 | 72530 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-x64-2.9.tar.lzma +2020/05/09 | 94276 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-2.9.tar.lzma +2020/05/09 | 111263 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-x64-2.9.tar.lzma +2020/05/09 | 57867 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-2.9.tar.lzma +2020/05/09 | 64633 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-x64-2.9.tar.lzma +2020/05/09 | 457276 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-2.9.tar.lzma +2020/05/09 | 544366 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-x64-2.9.tar.lzma +2020/05/09 | 137142 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-2.9.tar.lzma +2020/05/09 | 149990 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-x64-2.9.tar.lzma +2020/05/09 | 92928 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-2.9.tar.lzma +2020/05/09 | 108912 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-x64-2.9.tar.lzma +2020/05/09 | 15966 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-2.9.tar.lzma +2020/05/09 | 17764 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-x64-2.9.tar.lzma +2020/05/09 | 27731 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-2.9.tar.lzma +2020/05/09 | 29737 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-x64-2.9.tar.lzma +2020/05/09 | 615567 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-2.9.tar.lzma +2020/05/09 | 670093 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-x64-2.9.tar.lzma +2020/05/09 | 498809 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-2.9.tar.lzma +2020/05/09 | 560801 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-x64-2.9.tar.lzma +2020/05/09 | 539552 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-2.9.tar.lzma +2020/05/09 | 576315 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-x64-2.9.tar.lzma +2020/05/09 | 93516 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-2.9.tar.lzma +2020/05/09 | 102588 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-x64-2.9.tar.lzma +2020/05/09 | 1702031 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-2.9.tar.lzma +2020/05/09 | 1969812 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-x64-2.9.tar.lzma +2020/05/09 | 67253 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-2.9.tar.lzma +2020/05/09 | 73636 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-x64-2.9.tar.lzma +2020/05/09 | 27042 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-2.9.tar.lzma +2020/05/09 | 31360 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-x64-2.9.tar.lzma +2020/05/09 | 7495 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-2.9.tar.lzma +2020/05/09 | 8482 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-x64-2.9.tar.lzma +2020/05/09 | 167638 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-2.9.tar.lzma +2020/05/09 | 182737 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-x64-2.9.tar.lzma +2020/05/09 | 247726 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-2.9.tar.lzma +2020/05/09 | 281374 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-x64-2.9.tar.lzma +2020/05/09 | 87022 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-2.9.tar.lzma +2020/05/09 | 92187 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-x64-2.9.tar.lzma +2020/05/09 | 78124 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-2.9.tar.lzma +2020/05/09 | 86868 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-x64-2.9.tar.lzma +2020/05/09 | 165202 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-2.9.tar.lzma +2020/05/09 | 185076 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-x64-2.9.tar.lzma +2020/05/09 | 148890 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-2.9.tar.lzma +2020/05/09 | 168073 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-x64-2.9.tar.lzma +2020/05/09 | 195071 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-2.9.tar.lzma +2020/05/09 | 177839 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-x64-2.9.tar.lzma +2020/05/09 | 81366 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-2.9.tar.lzma +2020/05/09 | 92856 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-x64-2.9.tar.lzma +2020/05/09 | 30991 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-2.9.tar.lzma +2020/05/09 | 34849 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-x64-2.9.tar.lzma +2020/05/09 | 55770 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-2.9.tar.lzma +2020/05/09 | 63028 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-x64-2.9.tar.lzma +2020/05/09 | 63140 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-2.9.tar.lzma +2020/05/09 | 69363 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-x64-2.9.tar.lzma +2020/05/09 | 45646 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-2.9.tar.lzma +2020/05/09 | 52226 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-x64-2.9.tar.lzma +2020/05/09 | 355479 | systems/win32/miktex/tm/packages/next/miktex-omega-bin-2.9.tar.lzma +2020/05/09 | 389067 | systems/win32/miktex/tm/packages/next/miktex-omega-bin-x64-2.9.tar.lzma +2020/05/09 | 321356 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-2.9.tar.lzma +2020/05/09 | 356140 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-x64-2.9.tar.lzma +2020/05/09 | 187107 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-2.9.tar.lzma +2020/05/09 | 193784 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-x64-2.9.tar.lzma +2020/05/09 | 206888 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-2.9.tar.lzma +2020/05/09 | 243120 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-x64-2.9.tar.lzma +2020/05/09 | 77985 | systems/win32/miktex/tm/packages/next/miktex-png-bin-2.9.tar.lzma +2020/05/09 | 87142 | systems/win32/miktex/tm/packages/next/miktex-png-bin-x64-2.9.tar.lzma +2020/05/09 | 932516 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-2.9.tar.lzma +2020/05/09 | 1042825 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-x64-2.9.tar.lzma +2020/05/09 | 19893 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-2.9.tar.lzma +2020/05/09 | 23499 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-x64-2.9.tar.lzma +2020/05/09 | 31154 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-2.9.tar.lzma +2020/05/09 | 36617 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-x64-2.9.tar.lzma +2020/05/09 | 63331 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-2.9.tar.lzma +2020/05/09 | 71763 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-x64-2.9.tar.lzma +2020/05/09 | 42631 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-2.9.tar.lzma +2020/05/09 | 50996 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-x64-2.9.tar.lzma +2020/05/09 | 1149788 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-2.9.tar.lzma +2020/05/09 | 1285261 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-x64-2.9.tar.lzma +2020/05/09 | 41993 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-2.9.tar.lzma +2020/05/09 | 50930 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-x64-2.9.tar.lzma +2020/05/09 | 74299 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-2.9.tar.lzma +2020/05/09 | 82331 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-x64-2.9.tar.lzma +2020/05/09 | 26854 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-2.9.tar.lzma +2020/05/09 | 29136 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-x64-2.9.tar.lzma +2020/05/09 | 16115 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-2.9.tar.lzma +2020/05/09 | 17839 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-x64-2.9.tar.lzma +2020/05/09 | 63137 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-2.9.tar.lzma +2020/05/09 | 69277 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-x64-2.9.tar.lzma +2020/05/09 | 148071 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-2.9.tar.lzma +2020/05/09 | 160685 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-x64-2.9.tar.lzma +2020/05/09 | 74853 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-2.9.tar.lzma +2020/05/09 | 85015 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-x64-2.9.tar.lzma +2020/05/09 | 91489 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-2.9.tar.lzma +2020/05/09 | 96649 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-x64-2.9.tar.lzma +2020/05/09 | 2557749 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-2.9.tar.lzma +2020/05/09 | 2686311 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-x64-2.9.tar.lzma +2020/05/09 | 55027 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-2.9.tar.lzma +2020/05/09 | 61217 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-x64-2.9.tar.lzma +2020/05/09 | 26494 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-2.9.tar.lzma +2020/05/09 | 32347 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-x64-2.9.tar.lzma +2020/05/09 | 61620 | systems/win32/miktex/tm/packages/next/miktex-web-bin-2.9.tar.lzma +2020/05/09 | 65260 | systems/win32/miktex/tm/packages/next/miktex-web-bin-x64-2.9.tar.lzma +2020/05/09 | 246974 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-2.9.tar.lzma +2020/05/09 | 276749 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-x64-2.9.tar.lzma +2020/05/09 | 590226 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-2.9.tar.lzma +2020/05/09 | 629416 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-x64-2.9.tar.lzma +2020/05/09 | 38799 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-2.9.tar.lzma +2020/05/09 | 42957 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-x64-2.9.tar.lzma +2020/05/09 | 199283 | systems/win32/miktex/tm/packages/next/miktex-zzdb1-2.9.tar.lzma +2020/05/09 | 1193335 | systems/win32/miktex/tm/packages/next/miktex-zzdb2-2.9.tar.lzma +2020/05/09 | 1115543 | systems/win32/miktex/tm/packages/next/miktex-zzdb3-2.9.tar.lzma +2020/05/09 | 13063 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-2.9.tar.lzma +2020/05/09 | 14048 | 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 -2020/05/08 | 1153 | systems/win32/miktex/tm/packages/next/pr.ini +2020/05/09 | 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 @@ -272164,7 +272163,7 @@ 2008/11/07 | 35981 | systems/win32/miktex/tm/packages/prettyref.tar.lzma 2017/07/26 | 201385 | systems/win32/miktex/tm/packages/preview.tar.lzma 2019/06/20 | 375963 | systems/win32/miktex/tm/packages/prftree.tar.lzma -2020/05/08 | 840 | systems/win32/miktex/tm/packages/pr.ini +2020/05/09 | 840 | 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 @@ -273296,10 +273295,10 @@ 2010/01/14 | 955365 | systems/win32/visualtex/vx-setup-399.exe 2019/08/12 | 14654 | systems/win32/w32tex/00FILES.euc 2019/08/12 | 14654 | systems/win32/w32tex/00FILES.sjis -2020/04/29 | 4920304 | systems/win32/w32tex/aleph-w32.tar.xz +2020/05/08 | 4914480 | systems/win32/w32tex/aleph-w32.tar.xz 2020/05/06 | 66192180 | systems/win32/w32tex/biblatex-biber.tar.xz 2016/12/13 | 65971452 | systems/win32/w32tex/cbfonts.tar.xz -2020/05/07 | 641925 | systems/win32/w32tex/ChangeLog +2020/05/08 | 643357 | systems/win32/w32tex/ChangeLog 2009/08/03 | 141221 | systems/win32/w32tex/ChangeLog.0 2009/08/03 | 221890 | systems/win32/w32tex/ChangeLog.1 2009/08/03 | 116462 | systems/win32/w32tex/ChangeLog.2 @@ -273319,18 +273318,18 @@ 2020/04/28 | 17345708 | systems/win32/w32tex/gregorio-w32.tar.xz 2009/08/03 | 1072620 | systems/win32/w32tex/gtftex.zip 2020/04/29 | 1833452 | systems/win32/w32tex/jtex-w32.tar.xz -2020/04/29 | 41437540 | systems/win32/w32tex/latex-dev.tar.xz +2020/05/08 | 41469864 | systems/win32/w32tex/latex-dev.tar.xz 2020/04/03 | 29248268 | systems/win32/w32tex/latex.tar.xz 2020/04/28 | 996756 | systems/win32/w32tex/lcdf-typetools-w32.tar.xz 2020/05/01 | 392696544 | systems/win32/w32tex/ltxpkgdocs.tar.xz -2020/05/07 | 34519520 | systems/win32/w32tex/ltxpkgs.tar.xz -2020/04/29 | 3867708 | systems/win32/w32tex/luajittex-dev-w32.tar.xz -2020/05/01 | 3862712 | systems/win32/w32tex/luajittex-exp-w32.tar.xz -2020/04/29 | 3863904 | systems/win32/w32tex/luajittex-w32.tar.xz -2020/05/02 | 18140260 | systems/win32/w32tex/luatex-dev-w32.tar.xz -2020/05/02 | 17916596 | systems/win32/w32tex/luatex-exp-w32.tar.xz +2020/05/08 | 34524736 | systems/win32/w32tex/ltxpkgs.tar.xz +2020/05/08 | 3859448 | systems/win32/w32tex/luajittex-dev-w32.tar.xz +2020/05/08 | 3872220 | systems/win32/w32tex/luajittex-exp-w32.tar.xz +2020/05/08 | 3862916 | systems/win32/w32tex/luajittex-w32.tar.xz +2020/05/08 | 17937552 | systems/win32/w32tex/luatex-dev-w32.tar.xz +2020/05/08 | 18177952 | systems/win32/w32tex/luatex-exp-w32.tar.xz 2020/04/19 | 69190432 | systems/win32/w32tex/luatexja.tar.xz -2020/05/02 | 18134328 | systems/win32/w32tex/luatex-w32.tar.xz +2020/05/08 | 18131900 | systems/win32/w32tex/luatex-w32.tar.xz 2020/05/01 | 1663184 | systems/win32/w32tex/makeindex-w32.tar.xz 2015/05/26 | 1542676 | systems/win32/w32tex/manual.tar.xz 2020/05/03 | 439176 | systems/win32/w32tex/mftools.tar.xz @@ -273340,7 +273339,7 @@ 2020/05/04 | 9708380 | systems/win32/w32tex/newtxpx-boondoxfonts.tar.xz 2020/04/28 | 1228212 | systems/win32/w32tex/omegaj-w32.tar.xz 2020/03/01 | 355876 | systems/win32/w32tex/otfbeta.tar.xz -2020/05/03 | 20690324 | systems/win32/w32tex/pdftex-w32.tar.xz +2020/05/08 | 20726508 | systems/win32/w32tex/pdftex-w32.tar.xz 2020/05/06 | 80609732 | systems/win32/w32tex/pgfcontrib.tar.xz 2015/01/26 | 189072 | systems/win32/w32tex/plain2-2.54-w32.tar.xz 2020/04/13 | 2820836 | systems/win32/w32tex/platex.tar.xz @@ -273348,20 +273347,20 @@ 2020/04/28 | 1169216 | systems/win32/w32tex/pstoedit-w32.tar.xz 2020/05/02 | 274450768 | systems/win32/w32tex/pstricks.tar.xz 2020/04/28 | 517756 | systems/win32/w32tex/psutils-w32.tar.xz -2020/05/07 | 6444200 | systems/win32/w32tex/ptex-ng-w32.tar.xz -2020/05/05 | 10469752 | systems/win32/w32tex/ptex-w32.tar.xz +2020/05/08 | 6444240 | systems/win32/w32tex/ptex-ng-w32.tar.xz +2020/05/08 | 10469408 | systems/win32/w32tex/ptex-w32.tar.xz 2020/04/10 | 1784316 | systems/win32/w32tex/qpdf-w32.tar.xz 2019/04/15 | 499188 | systems/win32/w32tex/sam2p-w32.tar.xz 2020/01/24 | 24929772 | systems/win32/w32tex/t1fonts.tar.xz 2020/01/19 | 135584 | systems/win32/w32tex/t1utils-w32.tar.xz 2020/04/28 | 2494736 | systems/win32/w32tex/tex4htk-w32.tar.xz 2018/06/20 | 15940044 | systems/win32/w32tex/tex-gyre.tar.xz -2020/05/05 | 4014200 | systems/win32/w32tex/texinfo-w32.tar.xz +2020/05/08 | 4014268 | systems/win32/w32tex/texinfo-w32.tar.xz 2020/04/20 | 2050855 | systems/win32/w32tex/texinstwin.zip 2020/01/19 | 97168 | systems/win32/w32tex/tiff2png-w32.tar.xz 2013/04/08 | 308444 | systems/win32/w32tex/timesnew.tar.xz 2020/03/16 | 2025 | systems/win32/w32tex/TLW64/00README.TLW64 -2020/03/21 | 93926058 | systems/win32/w32tex/TLW64/tl-win64.zip +2020/05/08 | 93906802 | systems/win32/w32tex/TLW64/tl-win64.zip 2020/04/28 | 818536 | systems/win32/w32tex/ttf2pk-w32.tar.xz 2020/04/28 | 830804 | systems/win32/w32tex/ttf2pt1-w32.tar.xz 2017/10/13 | 1773368 | systems/win32/w32tex/tuftelatex.tar.xz @@ -273369,7 +273368,7 @@ 2020/01/19 | 5856 | systems/win32/w32tex/txtutil.tar.xz 2013/04/08 | 71588 | systems/win32/w32tex/ums.tar.xz 2012/05/28 | 233472 | systems/win32/w32tex/unzip.exe -2020/05/05 | 8479848 | systems/win32/w32tex/uptex-w32.tar.xz +2020/05/08 | 8482276 | systems/win32/w32tex/uptex-w32.tar.xz 2013/04/08 | 722652 | systems/win32/w32tex/utf.tar.xz 2013/04/08 | 13748 | systems/win32/w32tex/vf-n2bk.tar.xz 2020/03/27 | 38319492 | systems/win32/w32tex/w32tex-src.tar.xz @@ -273389,12 +273388,12 @@ 2020/04/28 | 587640 | systems/win32/w32tex/win64/jtex-w64.tar.xz 2019/11/11 | 2568 | systems/win32/w32tex/win64/latex-dev-w64.tar.xz 2020/04/28 | 800220 | systems/win32/w32tex/win64/lcdf-typetools-w64.tar.xz -2020/04/28 | 3478432 | systems/win32/w32tex/win64/luajittex-dev-w64.tar.xz -2020/05/01 | 3465796 | systems/win32/w32tex/win64/luajittex-exp-w64.tar.xz -2020/04/28 | 3465712 | systems/win32/w32tex/win64/luajittex-w64.tar.xz -2020/04/28 | 3116240 | systems/win32/w32tex/win64/luatex-dev-w64.tar.xz -2020/05/01 | 3114132 | systems/win32/w32tex/win64/luatex-exp-w64.tar.xz -2020/04/28 | 3120292 | systems/win32/w32tex/win64/luatex-w64.tar.xz +2020/05/08 | 3476972 | systems/win32/w32tex/win64/luajittex-dev-w64.tar.xz +2020/05/08 | 3465652 | systems/win32/w32tex/win64/luajittex-exp-w64.tar.xz +2020/05/08 | 3476340 | systems/win32/w32tex/win64/luajittex-w64.tar.xz +2020/05/08 | 3117480 | systems/win32/w32tex/win64/luatex-dev-w64.tar.xz +2020/05/08 | 3106192 | systems/win32/w32tex/win64/luatex-exp-w64.tar.xz +2020/05/08 | 3119592 | systems/win32/w32tex/win64/luatex-w64.tar.xz 2020/05/01 | 1140496 | systems/win32/w32tex/win64/makeindex-w64.tar.xz 2020/04/28 | 431044 | systems/win32/w32tex/win64/mftools-w64.tar.xz 2020/04/28 | 376324 | systems/win32/w32tex/win64/mftrace-w64.tar.xz @@ -273416,7 +273415,7 @@ 2020/05/05 | 1806816 | systems/win32/w32tex/win64/uptex-w64.tar.xz 2020/05/01 | 3387544 | systems/win32/w32tex/win64/web2c-w64.tar.xz 2020/05/06 | 10952276 | systems/win32/w32tex/win64/xetex-w64.tar.xz -2020/05/06 | 49871960 | systems/win32/w32tex/xetex-w32.tar.xz +2020/05/08 | 49872216 | systems/win32/w32tex/xetex-w32.tar.xz 2019/10/03 | 2936880 | systems/win32/w32tex/xindy-w32.tar.xz 2013/11/19 | 11356248 | systems/win32/w32tex/xymtex.tar.xz 2016/09/09 | 4334636 | systems/win32/w32tex/xypic.tar.xz @@ -273513,7 +273512,7 @@ 2004/06/04 | 404 | tds/tds.sed 2004/06/23 | 65418 | tds/tds.tex 2019/05/29 | 304264 | tds.zip -2020/05/09 | 186 | timestamp +2020/05/10 | 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 4010ca093b..8b45e6e216 100644 Binary files a/FILES.byname.gz and b/FILES.byname.gz differ diff --git a/FILES.last07days b/FILES.last07days index e6424a96a7..29824b1f16 100644 --- a/FILES.last07days +++ b/FILES.last07days @@ -1,253 +1,376 @@ +2020/05/09 | 98056 | systems/texlive/tlnet/archive/texinfo.r55066.tar.xz +2020/05/09 | 96649 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-x64-2.9.tar.lzma +2020/05/09 | 95170 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-2.9.tar.lzma +2020/05/09 | 9516 | macros/latex/contrib/biblatex-contrib/biblatex-ext/blxextdoiapi.lua +2020/05/09 | 94363 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-x64-2.9.tar.lzma +2020/05/09 | 94276 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-2.9.tar.lzma +2020/05/09 | 940562 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-2.9.tar.lzma +2020/05/09 | 93516 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-2.9.tar.lzma +2020/05/09 | 932516 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-2.9.tar.lzma +2020/05/09 | 92928 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-2.9.tar.lzma +2020/05/09 | 92856 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-x64-2.9.tar.lzma +2020/05/09 | 92187 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-x64-2.9.tar.lzma +2020/05/09 | 91489 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-2.9.tar.lzma +2020/05/09 | 8766 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-icomp.cbx +2020/05/09 | 87142 | systems/win32/miktex/tm/packages/next/miktex-png-bin-x64-2.9.tar.lzma +2020/05/09 | 87022 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-2.9.tar.lzma +2020/05/09 | 86868 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-x64-2.9.tar.lzma +2020/05/09 | 85015 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-x64-2.9.tar.lzma +2020/05/09 | 8482 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-x64-2.9.tar.lzma +2020/05/09 | 84580 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-2.9.tar.lzma +2020/05/09 | 840 | systems/win32/miktex/tm/packages/pr.ini +2020/05/09 | 8316 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-comp.cbx +2020/05/09 | 82331 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-x64-2.9.tar.lzma +2020/05/09 | 81366 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-2.9.tar.lzma +2020/05/09 | 78124 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-2.9.tar.lzma +2020/05/09 | 77985 | systems/win32/miktex/tm/packages/next/miktex-png-bin-2.9.tar.lzma +2020/05/09 | 77891 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-x64-2.9.tar.lzma +2020/05/09 | 77478 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-x64-2.9.tar.lzma +2020/05/09 | 7668 | macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oasymb-l3draw.sty +2020/05/09 | 7495 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-2.9.tar.lzma +2020/05/09 | 74853 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-2.9.tar.lzma +2020/05/09 | 74299 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-2.9.tar.lzma +2020/05/09 | 73636 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-x64-2.9.tar.lzma +2020/05/09 | 72918 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-x64-2.9.tar.lzma +2020/05/09 | 72530 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-x64-2.9.tar.lzma +2020/05/09 | 71763 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-x64-2.9.tar.lzma +2020/05/09 | 715 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic-verb.bbx +2020/05/09 | 71230 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-2.9.tar.lzma +2020/05/09 | 70824 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-x64-2.9.tar.lzma +2020/05/09 | 705 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ticomp.bbx +2020/05/09 | 702 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tiecomp.bbx +2020/05/09 | 702 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-terse.bbx +2020/05/09 | 702 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-tcomp.bbx +2020/05/09 | 702 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-icomp.bbx +2020/05/09 | 700 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ticomp.bbx +2020/05/09 | 699 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tecomp.bbx +2020/05/09 | 699 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ibid.bbx +2020/05/09 | 699 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-comp.bbx +2020/05/09 | 698 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-icomp.bbx +2020/05/09 | 697 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tcomp.bbx +2020/05/09 | 69793 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-2.9.tar.lzma +2020/05/09 | 695 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ibid.bbx +2020/05/09 | 695 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-comp.bbx +2020/05/09 | 69363 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-x64-2.9.tar.lzma +2020/05/09 | 692 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-terse.bbx +2020/05/09 | 69277 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-x64-2.9.tar.lzma +2020/05/09 | 691 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-iecomp.bbx +2020/05/09 | 688 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ecomp.bbx +2020/05/09 | 68619 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-2.9.tar.lzma +2020/05/09 | 684 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle.bbx +2020/05/09 | 677 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear.bbx +2020/05/09 | 67253 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-2.9.tar.lzma +2020/05/09 | 670669 | macros/latex/contrib/biblatex-contrib/biblatex-ext.zip +2020/05/09 | 670093 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-x64-2.9.tar.lzma +2020/05/09 | 6671 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tiecomp.cbx +2020/05/09 | 66660 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-x64-2.9.tar.lzma +2020/05/09 | 65260 | systems/win32/miktex/tm/packages/next/miktex-web-bin-x64-2.9.tar.lzma +2020/05/09 | 64633 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-x64-2.9.tar.lzma +2020/05/09 | 640 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad3.bbx +2020/05/09 | 640 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad2.bbx +2020/05/09 | 640 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad1.bbx +2020/05/09 | 640 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-inote.bbx +2020/05/09 | 637 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-note.bbx +2020/05/09 | 637 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-ibid.bbx +2020/05/09 | 637 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-verb.bbx +2020/05/09 | 637 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-comp.bbx +2020/05/09 | 63331 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-2.9.tar.lzma +2020/05/09 | 63272 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-2.9.tar.lzma +2020/05/09 | 63140 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-2.9.tar.lzma +2020/05/09 | 63137 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-2.9.tar.lzma +2020/05/09 | 63083 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-2.9.tar.lzma +2020/05/09 | 63028 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-x64-2.9.tar.lzma +2020/05/09 | 629416 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-x64-2.9.tar.lzma +2020/05/09 | 628 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic.bbx +2020/05/09 | 622 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose.bbx +2020/05/09 | 619 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric.bbx +2020/05/09 | 61742 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-x64-2.9.tar.lzma +2020/05/09 | 6171 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tecomp.cbx +2020/05/09 | 61620 | systems/win32/miktex/tm/packages/next/miktex-web-bin-2.9.tar.lzma +2020/05/09 | 615567 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-2.9.tar.lzma +2020/05/09 | 6137 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-icomp.cbx +2020/05/09 | 61217 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-x64-2.9.tar.lzma +2020/05/09 | 6074 | macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oasymb-tikz.sty +2020/05/09 | 6067 | macros/latex/contrib/biblatex-contrib/biblatex-ext/README.md +2020/05/09 | 590226 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-2.9.tar.lzma +2020/05/09 | 58594 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-x64-2.9.tar.lzma +2020/05/09 | 58440 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-2.9.tar.lzma +2020/05/09 | 5833 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-comp.cbx +2020/05/09 | 57867 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-2.9.tar.lzma +2020/05/09 | 5773 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ticomp.cbx +2020/05/09 | 576315 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-x64-2.9.tar.lzma +2020/05/09 | 57349 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-x64-2.9.tar.lzma +2020/05/09 | 5733 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ibid.cbx +2020/05/09 | 57099 | macros/generic/2up.zip +2020/05/09 | 56675 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-2.9.tar.lzma +2020/05/09 | 560801 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-x64-2.9.tar.lzma +2020/05/09 | 5586 | macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oasymb-pict2e.sty +2020/05/09 | 55770 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-2.9.tar.lzma +2020/05/09 | 551860 | macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext.pdf +2020/05/09 | 5504 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear.cbx +2020/05/09 | 55027 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-2.9.tar.lzma +2020/05/09 | 5500542 | systems/texlive/tlnet/install-tl-unx.tar.gz +2020/05/09 | 544366 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-x64-2.9.tar.lzma +2020/05/09 | 539552 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-2.9.tar.lzma +2020/05/09 | 536866 | systems/win32/miktex/tm/packages/next/files.csv.lzma +2020/05/09 | 536734 | systems/win32/miktex/tm/packages/files.csv.lzma +2020/05/09 | 5336 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tcomp.cbx +2020/05/09 | 52226 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-x64-2.9.tar.lzma +2020/05/09 | 52160 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-2.9.tar.lzma +2020/05/09 | 50996 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-x64-2.9.tar.lzma +2020/05/09 | 50930 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-x64-2.9.tar.lzma +2020/05/09 | 50708 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-x64-2.9.tar.lzma +2020/05/09 | 498809 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-2.9.tar.lzma +2020/05/09 | 49847 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-2.9.tar.lzma +2020/05/09 | 4933 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-common.bbx +2020/05/09 | 4915 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ibid.cbx +2020/05/09 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 +2020/05/09 | 47993 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-x64-2.9.tar.lzma +2020/05/09 | 4697 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle.cbx +2020/05/09 | 46721 | macros/generic/2up/doc/2up-doc.pdf +2020/05/09 | 461340 | systems/win32/miktex/tm/packages/next/miktex-doc-2.9.tar.lzma +2020/05/09 | 45991 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-x64-2.9.tar.lzma +2020/05/09 | 4578 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-comp.cbx +2020/05/09 | 4576 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ticomp.cbx +2020/05/09 | 45738 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-2.9.tar.lzma +2020/05/09 | 457276 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-2.9.tar.lzma +2020/05/09 | 45646 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-2.9.tar.lzma +2020/05/09 | 455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc +2020/05/09 | 455 | systems/texlive/tlnet/install-tl.zip.sha512.asc +2020/05/09 | 455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc +2020/05/09 | 455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc +2020/05/09 | 45022 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-x64-2.9.tar.lzma +2020/05/09 | 44084 | systems/texlive/tlnet/archive/svg.source.r55070.tar.xz +2020/05/09 | 43434 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-2.9.tar.lzma +2020/05/09 | 42957 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-x64-2.9.tar.lzma +2020/05/09 | 42631 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-2.9.tar.lzma +2020/05/09 | 41993 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-2.9.tar.lzma +2020/05/09 | 4111 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric.cbx +2020/05/09 | 41119 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-2.9.tar.lzma +2020/05/09 | 40539 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-2.9.tar.lzma +2020/05/09 | 3985 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-tcomp.cbx +2020/05/09 | 391631 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-x64-2.9.tar.lzma +2020/05/09 | 389067 | systems/win32/miktex/tm/packages/next/miktex-omega-bin-x64-2.9.tar.lzma +2020/05/09 | 388 | systems/texlive/tlnet/archive/texlive-docindex.r55066.tar.xz +2020/05/09 | 38799 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-2.9.tar.lzma +2020/05/09 | 3811 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic.cbx +2020/05/09 | 36731 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-standard.bbx +2020/05/09 | 36617 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-x64-2.9.tar.lzma +2020/05/09 | 36457 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-x64-2.9.tar.lzma +2020/05/09 | 3632 | macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oa-doiapi.sty +2020/05/09 | 356140 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-x64-2.9.tar.lzma +2020/05/09 | 355479 | systems/win32/miktex/tm/packages/next/miktex-omega-bin-2.9.tar.lzma +2020/05/09 | 3548 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-verb.cbx +2020/05/09 | 34926 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-x64-2.9.tar.lzma +2020/05/09 | 34849 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-x64-2.9.tar.lzma +2020/05/09 | 328578 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-2.9.tar.lzma +2020/05/09 | 3249 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic-verb.cbx +2020/05/09 | 32347 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-x64-2.9.tar.lzma +2020/05/09 | 32342 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-2.9.tar.lzma +2020/05/09 | 321356 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-2.9.tar.lzma +2020/05/09 | 31360 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-x64-2.9.tar.lzma +2020/05/09 | 31154 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-2.9.tar.lzma +2020/05/09 | 310919 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-x64-2.9.tar.lzma +2020/05/09 | 3107665 | fonts/logix.zip +2020/05/09 | 30991 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-2.9.tar.lzma +2020/05/09 | 30829 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-x64-2.9.tar.lzma +2020/05/09 | 30225 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-x64-2.9.tar.lzma +2020/05/09 | 29737 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-x64-2.9.tar.lzma +2020/05/09 | 2939 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-dashed-common.bbx +2020/05/09 | 29385 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-2.9.tar.lzma +2020/05/09 | 29136 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-x64-2.9.tar.lzma +2020/05/09 | 28794 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-x64-2.9.tar.lzma +2020/05/09 | 28563 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-2.9.tar.lzma +2020/05/09 | 2846 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-inote.cbx +2020/05/09 | 2841 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-note.cbx +2020/05/09 | 281 | macros/generic/2up/Changes +2020/05/09 | 281590 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-x64-2.9.tar.lzma +2020/05/09 | 281374 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-x64-2.9.tar.lzma +2020/05/09 | 27731 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-2.9.tar.lzma +2020/05/09 | 276749 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-x64-2.9.tar.lzma +2020/05/09 | 273338 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-2.9.tar.lzma +2020/05/09 | 27042 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-2.9.tar.lzma +2020/05/09 | 2691 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad2.cbx +2020/05/09 | 2691 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad1.cbx +2020/05/09 | 2689 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad3.cbx +2020/05/09 | 2686 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-ibid.cbx +2020/05/09 | 2686311 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-x64-2.9.tar.lzma +2020/05/09 | 26854 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-2.9.tar.lzma +2020/05/09 | 2673 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose.cbx +2020/05/09 | 26652 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-2.9.tar.lzma +2020/05/09 | 26494 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-2.9.tar.lzma +2020/05/09 | 2557749 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-2.9.tar.lzma +2020/05/09 | 25396 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-2.9.tar.lzma +2020/05/09 | 247726 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-2.9.tar.lzma +2020/05/09 | 246974 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-2.9.tar.lzma +2020/05/09 | 246412 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-2.9.tar.lzma +2020/05/09 | 243120 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-x64-2.9.tar.lzma +2020/05/09 | 24269447 | systems/texlive/tlnet/install-tl.zip +2020/05/09 | 23499 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-x64-2.9.tar.lzma +2020/05/09 | 23030 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-x64-2.9.tar.lzma +2020/05/09 | 229 | macros/generic/2up/latex/2up.sty +2020/05/09 | 222914 | systems/win32/miktex/tm/packages/next/miktex-console-bin-x64-2.9.tar.lzma +2020/05/09 | 2195984 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz +2020/05/09 | 2158556 | systems/texlive/tlnet/archive/luajittex.win32.r55068.tar.xz +2020/05/09 | 2086 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-terse.cbx +2020/05/09 | 20713 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-2.9.tar.lzma +2020/05/09 | 206888 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-2.9.tar.lzma +2020/05/09 | 203030 | systems/win32/miktex/tm/packages/next/miktex-console-bin-2.9.tar.lzma +2020/05/09 | 199292 | systems/win32/miktex/tm/packages/miktex-zzdb1-2.9.tar.lzma +2020/05/09 | 199283 | systems/win32/miktex/tm/packages/next/miktex-zzdb1-2.9.tar.lzma +2020/05/09 | 19893 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-2.9.tar.lzma +2020/05/09 | 1969812 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-x64-2.9.tar.lzma +2020/05/09 | 195071 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-2.9.tar.lzma +2020/05/09 | 19381061 | systems/texlive/tlnet/install-tl-windows.exe +2020/05/09 | 193784 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-x64-2.9.tar.lzma +2020/05/09 | 187107 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-2.9.tar.lzma +2020/05/09 | 185076 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-x64-2.9.tar.lzma +2020/05/09 | 1848 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-terse.cbx +2020/05/09 | 184205 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-x64-2.9.tar.lzma +2020/05/09 | 182737 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-x64-2.9.tar.lzma +2020/05/09 | 1824220 | systems/texlive/tlnet/archive/luatex.win32.r55067.tar.xz +2020/05/09 | 17839 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-x64-2.9.tar.lzma +2020/05/09 | 177839 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-x64-2.9.tar.lzma +2020/05/09 | 17764 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-x64-2.9.tar.lzma +2020/05/09 | 1702031 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-2.9.tar.lzma +2020/05/09 | 169490 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-2.9.tar.lzma +2020/05/09 | 16908 | macros/generic/2up/doc/2up-doc.tex +2020/05/09 | 168073 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-x64-2.9.tar.lzma +2020/05/09 | 167638 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-2.9.tar.lzma +2020/05/09 | 165202 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-2.9.tar.lzma +2020/05/09 | 16417650 | systems/texlive/tlnet/tlpkg/texlive.tlpdb +2020/05/09 | 162 | macros/generic/2up/README +2020/05/09 | 161724 | systems/texlive/tlnet/archive/texlive-docindex.doc.r55066.tar.xz +2020/05/09 | 16115 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-2.9.tar.lzma +2020/05/09 | 160685 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-x64-2.9.tar.lzma +2020/05/09 | 15966 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-2.9.tar.lzma +2020/05/09 | 1546416 | systems/texlive/tlnet/archive/luahbtex.win32.r55067.tar.xz +2020/05/09 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512 +2020/05/09 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512 +2020/05/09 | 152152 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-x64-2.9.tar.lzma +2020/05/09 | 15136 | macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oa.sty +2020/05/09 | 149990 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-x64-2.9.tar.lzma +2020/05/09 | 148890 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-2.9.tar.lzma +2020/05/09 | 148071 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-2.9.tar.lzma +2020/05/09 | 145 | systems/texlive/tlnet/install-tl.zip.sha512 +2020/05/09 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 +2020/05/09 | 14048 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-x64-2.9.tar.lzma +2020/05/09 | 1391 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-common.bbx +2020/05/09 | 13884 | systems/texlive/tlnet/archive/svg.r55070.tar.xz +2020/05/09 | 1385225 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-x64-2.9.tar.lzma +2020/05/09 | 137142 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-2.9.tar.lzma +2020/05/09 | 133395 | macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext.tex +2020/05/09 | 133328 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-2.9.tar.lzma +2020/05/09 | 13063 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-2.9.tar.lzma +2020/05/09 | 130569 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-x64-2.9.tar.lzma +2020/05/09 | 1290 | macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-examples.bib +2020/05/09 | 1285261 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-x64-2.9.tar.lzma +2020/05/09 | 1256317 | macros/latex/contrib/nicematrix.zip +2020/05/09 | 1255816 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-2.9.tar.lzma +2020/05/09 | 12189 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-iecomp.cbx +2020/05/09 | 12180 | macros/generic/2up/tex/2up.tex +2020/05/09 | 1193335 | systems/win32/miktex/tm/packages/next/miktex-zzdb2-2.9.tar.lzma +2020/05/09 | 1192906 | systems/win32/miktex/tm/packages/miktex-zzdb2-2.9.tar.lzma +2020/05/09 | 11724 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ecomp.cbx +2020/05/09 | 11700 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-biblatex-aux.def +2020/05/09 | 116778 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-x64-2.9.tar.lzma +2020/05/09 | 115768 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-2.9.tar.lzma +2020/05/09 | 1153 | systems/win32/miktex/tm/packages/next/pr.ini +2020/05/09 | 1149788 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-2.9.tar.lzma +2020/05/09 | 1115543 | systems/win32/miktex/tm/packages/next/miktex-zzdb3-2.9.tar.lzma +2020/05/09 | 1113587 | systems/win32/miktex/tm/packages/miktex-zzdb3-2.9.tar.lzma +2020/05/09 | 111263 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-x64-2.9.tar.lzma +2020/05/09 | 109951 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-x64-2.9.tar.lzma +2020/05/09 | 108912 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-x64-2.9.tar.lzma +2020/05/09 | 1077456 | systems/texlive/tlnet/archive/svg.doc.r55070.tar.xz +2020/05/09 | 10623 | macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-tabular.sty +2020/05/09 | 1049578 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-x64-2.9.tar.lzma +2020/05/09 | 1042825 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-x64-2.9.tar.lzma +2020/05/09 | 10405 | macros/latex/contrib/biblatex-contrib/biblatex-ext/CHANGES.md +2020/05/09 | 102588 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-x64-2.9.tar.lzma +2020/05/09 | 100710 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-2.9.tar.lzma 2020/05/08 | 981 | graphics/svg/source/examples/root.C 2020/05/08 | 972 | systems/texlive/tlnet/archive/libertinus.r55064.tar.xz -2020/05/08 | 96647 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-x64-2.9.tar.lzma -2020/05/08 | 95169 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-2.9.tar.lzma -2020/05/08 | 94362 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-x64-2.9.tar.lzma -2020/05/08 | 94275 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-2.9.tar.lzma -2020/05/08 | 940560 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-2.9.tar.lzma -2020/05/08 | 93516 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-2.9.tar.lzma -2020/05/08 | 932517 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-2.9.tar.lzma -2020/05/08 | 92927 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-2.9.tar.lzma -2020/05/08 | 92856 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-x64-2.9.tar.lzma -2020/05/08 | 92187 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-x64-2.9.tar.lzma -2020/05/08 | 91489 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-2.9.tar.lzma -2020/05/08 | 87143 | systems/win32/miktex/tm/packages/next/miktex-png-bin-x64-2.9.tar.lzma -2020/05/08 | 87021 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-2.9.tar.lzma -2020/05/08 | 86868 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-x64-2.9.tar.lzma -2020/05/08 | 85016 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-x64-2.9.tar.lzma -2020/05/08 | 8481 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-x64-2.9.tar.lzma -2020/05/08 | 84583 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-2.9.tar.lzma -2020/05/08 | 840 | systems/win32/miktex/tm/packages/pr.ini -2020/05/08 | 82330 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-x64-2.9.tar.lzma -2020/05/08 | 81366 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-2.9.tar.lzma +2020/05/08 | 93906802 | systems/win32/w32tex/TLW64/tl-win64.zip +2020/05/08 | 8482276 | systems/win32/w32tex/uptex-w32.tar.xz +2020/05/08 | 845357 | macros/latex/contrib/nicematrix/nicematrix.pdf 2020/05/08 | 79028 | systems/texlive/tlnet/archive/bundledoc.doc.r55064.tar.xz -2020/05/08 | 78123 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-2.9.tar.lzma -2020/05/08 | 77985 | systems/win32/miktex/tm/packages/next/miktex-png-bin-2.9.tar.lzma -2020/05/08 | 77892 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-x64-2.9.tar.lzma -2020/05/08 | 77478 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-x64-2.9.tar.lzma -2020/05/08 | 7495 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-2.9.tar.lzma 2020/05/08 | 749100 | systems/texlive/tlnet/archive/optex.r55062.tar.xz -2020/05/08 | 74854 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-2.9.tar.lzma -2020/05/08 | 74298 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-2.9.tar.lzma -2020/05/08 | 73637 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-x64-2.9.tar.lzma -2020/05/08 | 72917 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-x64-2.9.tar.lzma 2020/05/08 | 728260 | systems/texlive/tlnet/archive/l3backend.doc.r55057.tar.xz -2020/05/08 | 72530 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-x64-2.9.tar.lzma 2020/05/08 | 723680 | systems/texlive/tlnet/archive/l3build.doc.r55064.tar.xz -2020/05/08 | 71762 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-x64-2.9.tar.lzma 2020/05/08 | 714868 | graphics/svg/source/examples/root.svg -2020/05/08 | 71230 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-2.9.tar.lzma -2020/05/08 | 70824 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-x64-2.9.tar.lzma -2020/05/08 | 69795 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-2.9.tar.lzma 2020/05/08 | 69364 | systems/texlive/tlnet/archive/unitconv.doc.r55060.tar.xz -2020/05/08 | 69362 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-x64-2.9.tar.lzma -2020/05/08 | 69277 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-x64-2.9.tar.lzma -2020/05/08 | 68620 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-2.9.tar.lzma -2020/05/08 | 67252 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-2.9.tar.lzma -2020/05/08 | 670093 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-x64-2.9.tar.lzma 2020/05/08 | 6680 | systems/texlive/tlnet/archive/luaotfload.source.r55064.tar.xz -2020/05/08 | 66660 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-x64-2.9.tar.lzma -2020/05/08 | 65260 | systems/win32/miktex/tm/packages/next/miktex-web-bin-x64-2.9.tar.lzma -2020/05/08 | 64633 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-x64-2.9.tar.lzma -2020/05/08 | 63329 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-2.9.tar.lzma -2020/05/08 | 63272 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-2.9.tar.lzma -2020/05/08 | 63139 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-2.9.tar.lzma -2020/05/08 | 63137 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-2.9.tar.lzma -2020/05/08 | 63084 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-2.9.tar.lzma -2020/05/08 | 63028 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-x64-2.9.tar.lzma -2020/05/08 | 629418 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-x64-2.9.tar.lzma -2020/05/08 | 61742 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-x64-2.9.tar.lzma -2020/05/08 | 61618 | systems/win32/miktex/tm/packages/next/miktex-web-bin-2.9.tar.lzma -2020/05/08 | 615566 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-2.9.tar.lzma -2020/05/08 | 61216 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-x64-2.9.tar.lzma +2020/05/08 | 6444240 | systems/win32/w32tex/ptex-ng-w32.tar.xz +2020/05/08 | 643357 | systems/win32/w32tex/ChangeLog 2020/05/08 | 6072 | systems/texlive/tlnet/archive/collection-latexextra.r55060.tar.xz -2020/05/08 | 590228 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-2.9.tar.lzma -2020/05/08 | 58595 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-x64-2.9.tar.lzma 2020/05/08 | 585496 | systems/texlive/tlnet/archive/luaotfload.r55064.tar.xz -2020/05/08 | 58441 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-2.9.tar.lzma -2020/05/08 | 57867 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-2.9.tar.lzma -2020/05/08 | 576310 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-x64-2.9.tar.lzma -2020/05/08 | 57349 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-x64-2.9.tar.lzma 2020/05/08 | 570832 | systems/texlive/tlnet/archive/luaotfload.doc.r55064.tar.xz -2020/05/08 | 56674 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-2.9.tar.lzma -2020/05/08 | 560801 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-x64-2.9.tar.lzma -2020/05/08 | 55770 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-2.9.tar.lzma -2020/05/08 | 55026 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-2.9.tar.lzma -2020/05/08 | 5500533 | systems/texlive/tlnet/install-tl-unx.tar.gz -2020/05/08 | 544364 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-x64-2.9.tar.lzma -2020/05/08 | 539552 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-2.9.tar.lzma 2020/05/08 | 5376 | systems/texlive/tlnet/archive/xepersian-hm.source.r55064.tar.xz -2020/05/08 | 536866 | systems/win32/miktex/tm/packages/next/files.csv.lzma -2020/05/08 | 536734 | systems/win32/miktex/tm/packages/files.csv.lzma 2020/05/08 | 534480 | systems/texlive/tlnet/archive/l3kernel.source.r55057.tar.xz -2020/05/08 | 52226 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-x64-2.9.tar.lzma -2020/05/08 | 52156 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-2.9.tar.lzma -2020/05/08 | 50995 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-x64-2.9.tar.lzma -2020/05/08 | 50930 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-x64-2.9.tar.lzma -2020/05/08 | 50708 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-x64-2.9.tar.lzma 2020/05/08 | 5028 | systems/texlive/tlnet/archive/snapshot.r55064.tar.xz -2020/05/08 | 498809 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-2.9.tar.lzma -2020/05/08 | 49845 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-2.9.tar.lzma -2020/05/08 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 +2020/05/08 | 49872216 | systems/win32/w32tex/xetex-w32.tar.xz +2020/05/08 | 4914480 | systems/win32/w32tex/aleph-w32.tar.xz 2020/05/08 | 4836 | systems/texlive/tlnet/archive/texdirflatten.r55064.tar.xz -2020/05/08 | 47994 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-x64-2.9.tar.lzma -2020/05/08 | 461342 | systems/win32/miktex/tm/packages/next/miktex-doc-2.9.tar.lzma -2020/05/08 | 45991 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-x64-2.9.tar.lzma -2020/05/08 | 45737 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-2.9.tar.lzma -2020/05/08 | 457274 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-2.9.tar.lzma -2020/05/08 | 45647 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-2.9.tar.lzma -2020/05/08 | 455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc -2020/05/08 | 455 | systems/texlive/tlnet/install-tl.zip.sha512.asc -2020/05/08 | 455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc -2020/05/08 | 455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc 2020/05/08 | 451004 | systems/texlive/tlnet/archive/xepersian-hm.doc.r55064.tar.xz -2020/05/08 | 45022 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-x64-2.9.tar.lzma 2020/05/08 | 443500 | systems/texlive/tlnet/archive/lengthconvert.doc.r55064.tar.xz 2020/05/08 | 4388 | systems/texlive/tlnet/archive/xepersian-hm.r55064.tar.xz -2020/05/08 | 43433 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-2.9.tar.lzma -2020/05/08 | 42957 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-x64-2.9.tar.lzma -2020/05/08 | 42631 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-2.9.tar.lzma -2020/05/08 | 41991 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-2.9.tar.lzma 2020/05/08 | 4160 | systems/texlive/tlnet/archive/lengthconvert.source.r55064.tar.xz -2020/05/08 | 41119 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-2.9.tar.lzma -2020/05/08 | 40539 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-2.9.tar.lzma +2020/05/08 | 41469864 | systems/win32/w32tex/latex-dev.tar.xz +2020/05/08 | 4014268 | systems/win32/w32tex/texinfo-w32.tar.xz 2020/05/08 | 3944 | graphics/svg/README.md -2020/05/08 | 391630 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-x64-2.9.tar.lzma -2020/05/08 | 389067 | systems/win32/miktex/tm/packages/next/miktex-omega-bin-x64-2.9.tar.lzma -2020/05/08 | 38798 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-2.9.tar.lzma +2020/05/08 | 3872220 | systems/win32/w32tex/luajittex-exp-w32.tar.xz +2020/05/08 | 3862916 | systems/win32/w32tex/luajittex-w32.tar.xz +2020/05/08 | 3859448 | systems/win32/w32tex/luajittex-dev-w32.tar.xz 2020/05/08 | 3752 | systems/texlive/tlnet/archive/marginfix.r55064.tar.xz 2020/05/08 | 3708536 | systems/texlive/tlnet/archive/media9.doc.r55064.tar.xz -2020/05/08 | 36616 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-x64-2.9.tar.lzma -2020/05/08 | 36456 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-x64-2.9.tar.lzma -2020/05/08 | 356141 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-x64-2.9.tar.lzma -2020/05/08 | 355479 | systems/win32/miktex/tm/packages/next/miktex-omega-bin-2.9.tar.lzma -2020/05/08 | 34926 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-x64-2.9.tar.lzma -2020/05/08 | 34850 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-x64-2.9.tar.lzma -2020/05/08 | 328575 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-2.9.tar.lzma -2020/05/08 | 32348 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-x64-2.9.tar.lzma -2020/05/08 | 32341 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-2.9.tar.lzma +2020/05/08 | 367797 | macros/latex/contrib/nicematrix/nicematrix.dtx +2020/05/08 | 349092 | macros/latex/contrib/nicematrix/nicematrix-french.pdf +2020/05/08 | 3476972 | systems/win32/w32tex/win64/luajittex-dev-w64.tar.xz +2020/05/08 | 3476340 | systems/win32/w32tex/win64/luajittex-w64.tar.xz +2020/05/08 | 3465652 | systems/win32/w32tex/win64/luajittex-exp-w64.tar.xz +2020/05/08 | 34524736 | systems/win32/w32tex/ltxpkgs.tar.xz 2020/05/08 | 32280 | systems/texlive/tlnet/archive/l3build.r55064.tar.xz -2020/05/08 | 321355 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-2.9.tar.lzma 2020/05/08 | 319668 | systems/texlive/tlnet/archive/erewhon.doc.r55064.tar.xz 2020/05/08 | 3147384 | systems/texlive/tlnet/archive/animate.doc.r55056.tar.xz -2020/05/08 | 31358 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-x64-2.9.tar.lzma -2020/05/08 | 31156 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-2.9.tar.lzma -2020/05/08 | 310921 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-x64-2.9.tar.lzma -2020/05/08 | 30990 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-2.9.tar.lzma -2020/05/08 | 30828 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-x64-2.9.tar.lzma -2020/05/08 | 30224 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-x64-2.9.tar.lzma +2020/05/08 | 3119592 | systems/win32/w32tex/win64/luatex-w64.tar.xz +2020/05/08 | 3117480 | systems/win32/w32tex/win64/luatex-dev-w64.tar.xz +2020/05/08 | 3106192 | systems/win32/w32tex/win64/luatex-exp-w64.tar.xz 2020/05/08 | 30164 | systems/texlive/tlnet/archive/animate.source.r55056.tar.xz -2020/05/08 | 29736 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-x64-2.9.tar.lzma 2020/05/08 | 29404 | systems/texlive/tlnet/archive/l3build.source.r55064.tar.xz -2020/05/08 | 29385 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-2.9.tar.lzma -2020/05/08 | 29136 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-x64-2.9.tar.lzma -2020/05/08 | 28792 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-x64-2.9.tar.lzma -2020/05/08 | 28561 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-2.9.tar.lzma 2020/05/08 | 28424 | graphics/svg/source/examples/svg-example.svg -2020/05/08 | 281591 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-x64-2.9.tar.lzma -2020/05/08 | 281374 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-x64-2.9.tar.lzma -2020/05/08 | 27730 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-2.9.tar.lzma -2020/05/08 | 276749 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-x64-2.9.tar.lzma -2020/05/08 | 273337 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-2.9.tar.lzma -2020/05/08 | 27041 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-2.9.tar.lzma -2020/05/08 | 2686311 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-x64-2.9.tar.lzma -2020/05/08 | 26852 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-2.9.tar.lzma -2020/05/08 | 26651 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-2.9.tar.lzma -2020/05/08 | 26497 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-2.9.tar.lzma 2020/05/08 | 26032 | systems/texlive/tlnet/archive/l3backend.source.r55057.tar.xz -2020/05/08 | 2557747 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-2.9.tar.lzma -2020/05/08 | 25396 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-2.9.tar.lzma -2020/05/08 | 247726 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-2.9.tar.lzma -2020/05/08 | 246973 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-2.9.tar.lzma -2020/05/08 | 246413 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-2.9.tar.lzma 2020/05/08 | 243144 | systems/texlive/tlnet/archive/marginfix.doc.r55064.tar.xz -2020/05/08 | 243116 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-x64-2.9.tar.lzma -2020/05/08 | 24269447 | systems/texlive/tlnet/install-tl.zip -2020/05/08 | 23497 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-x64-2.9.tar.lzma 2020/05/08 | 23496 | systems/texlive/tlnet/archive/animate.r55056.tar.xz 2020/05/08 | 2318568 | systems/texlive/tlnet/archive/erewhon.r55064.tar.xz -2020/05/08 | 23030 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-x64-2.9.tar.lzma 2020/05/08 | 228115 | graphics/svg/source/svg.dtx -2020/05/08 | 222914 | systems/win32/miktex/tm/packages/next/miktex-console-bin-x64-2.9.tar.lzma -2020/05/08 | 2196656 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz 2020/05/08 | 219376 | systems/texlive/tlnet/archive/texlive-scripts.doc.r55050.tar.xz -2020/05/08 | 20712 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-2.9.tar.lzma -2020/05/08 | 206888 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-2.9.tar.lzma -2020/05/08 | 203032 | systems/win32/miktex/tm/packages/next/miktex-console-bin-2.9.tar.lzma +2020/05/08 | 20726508 | systems/win32/w32tex/pdftex-w32.tar.xz 2020/05/08 | 2020 | systems/texlive/tlnet/archive/lengthconvert.r55064.tar.xz -2020/05/08 | 199307 | systems/win32/miktex/tm/packages/miktex-zzdb1-2.9.tar.lzma -2020/05/08 | 199275 | systems/win32/miktex/tm/packages/next/miktex-zzdb1-2.9.tar.lzma -2020/05/08 | 19893 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-2.9.tar.lzma -2020/05/08 | 1969815 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-x64-2.9.tar.lzma -2020/05/08 | 195071 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-2.9.tar.lzma -2020/05/08 | 19381037 | systems/texlive/tlnet/install-tl-windows.exe -2020/05/08 | 193783 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-x64-2.9.tar.lzma 2020/05/08 | 193656 | systems/texlive/tlnet/archive/snapshot.doc.r55064.tar.xz 2020/05/08 | 1894792 | systems/texlive/tlnet/archive/media9.r55064.tar.xz -2020/05/08 | 187110 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-2.9.tar.lzma -2020/05/08 | 185075 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-x64-2.9.tar.lzma -2020/05/08 | 184205 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-x64-2.9.tar.lzma -2020/05/08 | 182736 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-x64-2.9.tar.lzma 2020/05/08 | 18268 | systems/texlive/tlnet/archive/marginfix.source.r55064.tar.xz +2020/05/08 | 18177952 | systems/win32/w32tex/luatex-exp-w32.tar.xz +2020/05/08 | 18131900 | systems/win32/w32tex/luatex-w32.tar.xz +2020/05/08 | 17937552 | systems/win32/w32tex/luatex-dev-w32.tar.xz 2020/05/08 | 1792 | systems/texlive/tlnet/archive/unitconv.r55060.tar.xz -2020/05/08 | 17839 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-x64-2.9.tar.lzma -2020/05/08 | 177840 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-x64-2.9.tar.lzma 2020/05/08 | 1776720 | systems/texlive/tlnet/archive/media9.source.r55064.tar.xz -2020/05/08 | 17763 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-x64-2.9.tar.lzma -2020/05/08 | 1702032 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-2.9.tar.lzma -2020/05/08 | 169490 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-2.9.tar.lzma -2020/05/08 | 168073 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-x64-2.9.tar.lzma -2020/05/08 | 167639 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-2.9.tar.lzma -2020/05/08 | 165201 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-2.9.tar.lzma -2020/05/08 | 16417650 | systems/texlive/tlnet/tlpkg/texlive.tlpdb 2020/05/08 | 16240 | systems/texlive/tlnet/archive/libertinus.doc.r55064.tar.xz -2020/05/08 | 16113 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-2.9.tar.lzma -2020/05/08 | 160684 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-x64-2.9.tar.lzma -2020/05/08 | 15968 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-2.9.tar.lzma -2020/05/08 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512 -2020/05/08 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512 -2020/05/08 | 152150 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-x64-2.9.tar.lzma 2020/05/08 | 150776 | systems/texlive/tlnet/archive/l3kernel.r55057.tar.xz -2020/05/08 | 149989 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-x64-2.9.tar.lzma -2020/05/08 | 148890 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-2.9.tar.lzma -2020/05/08 | 148070 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-2.9.tar.lzma 2020/05/08 | 1461 | graphics/svg/doc/LICENSE.md -2020/05/08 | 145 | systems/texlive/tlnet/install-tl.zip.sha512 -2020/05/08 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 -2020/05/08 | 14048 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-x64-2.9.tar.lzma 2020/05/08 | 1388 | systems/texlive/tlnet/archive/endofproofwd.r55063.tar.xz -2020/05/08 | 1385226 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-x64-2.9.tar.lzma 2020/05/08 | 13744 | systems/texlive/tlnet/archive/snapshot.source.r55064.tar.xz -2020/05/08 | 137140 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-2.9.tar.lzma -2020/05/08 | 133326 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-2.9.tar.lzma 2020/05/08 | 132428 | systems/texlive/tlnet/archive/texlive-scripts.r55050.tar.xz -2020/05/08 | 13063 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-2.9.tar.lzma -2020/05/08 | 130570 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-x64-2.9.tar.lzma 2020/05/08 | 1292 | systems/texlive/tlnet/archive/endofproofwd.doc.r55063.tar.xz -2020/05/08 | 1285259 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-x64-2.9.tar.lzma 2020/05/08 | 12784 | systems/texlive/tlnet/archive/bundledoc.r55064.tar.xz -2020/05/08 | 1255816 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-2.9.tar.lzma 2020/05/08 | 12048 | systems/texlive/tlnet/archive/l3backend.r55057.tar.xz -2020/05/08 | 1193422 | systems/win32/miktex/tm/packages/miktex-zzdb2-2.9.tar.lzma -2020/05/08 | 1193367 | systems/win32/miktex/tm/packages/next/miktex-zzdb2-2.9.tar.lzma 2020/05/08 | 1182016 | systems/texlive/tlnet/archive/optex.doc.r55062.tar.xz -2020/05/08 | 116776 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-x64-2.9.tar.lzma 2020/05/08 | 1165118 | graphics/svg.zip -2020/05/08 | 115768 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-2.9.tar.lzma -2020/05/08 | 1153 | systems/win32/miktex/tm/packages/next/pr.ini -2020/05/08 | 1149787 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-2.9.tar.lzma -2020/05/08 | 1113614 | systems/win32/miktex/tm/packages/miktex-zzdb3-2.9.tar.lzma -2020/05/08 | 1113244 | systems/win32/miktex/tm/packages/next/miktex-zzdb3-2.9.tar.lzma -2020/05/08 | 111262 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-x64-2.9.tar.lzma 2020/05/08 | 110 | graphics/svg/source/examples/svg-preamble.tex 2020/05/08 | 11016 | systems/texlive/tlnet/archive/texdirflatten.doc.r55064.tar.xz -2020/05/08 | 109951 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-x64-2.9.tar.lzma -2020/05/08 | 108912 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-x64-2.9.tar.lzma -2020/05/08 | 1049577 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-x64-2.9.tar.lzma -2020/05/08 | 1042826 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-x64-2.9.tar.lzma +2020/05/08 | 10469408 | systems/win32/w32tex/ptex-w32.tar.xz 2020/05/08 | 1040831 | graphics/svg/doc/svg.pdf -2020/05/08 | 102587 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-x64-2.9.tar.lzma -2020/05/08 | 100710 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-2.9.tar.lzma +2020/05/08 | 103567 | macros/latex/contrib/nicematrix/nicematrix-french.tex 2020/05/08 | 10011612 | systems/texlive/tlnet/archive/l3kernel.doc.r55057.tar.xz 2020/05/07 | 9999 | macros/latex/contrib/l3kernel/l3news10.tex 2020/05/07 | 9904 | fonts/erewhon/tfm/Erewhon-RegularSlanted-osf-t2b.tfm @@ -384,6 +507,7 @@ 2020/05/07 | 7916 | fonts/erewhon/tfm/Erewhon-BoldSlanted-tlf-sc-t2c.tfm 2020/05/07 | 78687 | macros/xetex/latex/xepersian-hm/kashida-xep-XB-example.pdf 2020/05/07 | 786215 | install/macros/latex/contrib/l3backend.tds.zip +2020/05/07 | 7856 | macros/pdftex/mptopdf/tex/context/base/mkii/syst-tex.mkii 2020/05/07 | 7794 | fonts/erewhon/afm/erewBMI.afm 2020/05/07 | 77393 | macros/luatex/generic/luaotfload/luaotfload-conf.pdf 2020/05/07 | 772 | fonts/erewhon/vf/Erewhon-Regular-tosf-ts1.vf @@ -402,9 +526,11 @@ 2020/05/07 | 74349 | macros/latex/contrib/l3kernel/l3clist.dtx 2020/05/07 | 743243 | macros/latex/contrib/l3backend/l3backend-code.pdf 2020/05/07 | 73859 | macros/latex/contrib/l3kernel/l3fp-trig.dtx +2020/05/07 | 732 | macros/pdftex/mptopdf/doc/context/scripts/mkii/mptopdf.man 2020/05/07 | 72855 | macros/latex/contrib/l3kernel/l3str.dtx 2020/05/07 | 718451 | macros/xetex/latex/xepersian-hm.zip 2020/05/07 | 71688 | macros/latex/contrib/l3kernel/l3msg.dtx +2020/05/07 | 71627 | macros/pdftex/mptopdf/tex/context/base/mkii/supp-pdf.mkii 2020/05/07 | 70979 | macros/luatex/latex/unitconv.zip 2020/05/07 | 70325 | macros/latex/contrib/l3kernel/l3fp.dtx 2020/05/07 | 6970 | macros/latex/contrib/l3kernel/l3fp-assign.dtx @@ -455,10 +581,8 @@ 2020/05/07 | 6476 | fonts/erewhon/tfm/Erewhon-RegularSlanted-tosf-sc-t2b.tfm 2020/05/07 | 6476 | fonts/erewhon/tfm/Erewhon-RegularSlanted-tlf-sc-t2b.tfm 2020/05/07 | 64555 | macros/latex/contrib/marginfix/marginfix.dtx -2020/05/07 | 6444200 | systems/win32/w32tex/ptex-ng-w32.tar.xz 2020/05/07 | 6431 | macros/latex/contrib/l3kernel/l3news06.tex 2020/05/07 | 64264 | macros/latex/contrib/l3kernel/l3prg.dtx -2020/05/07 | 641925 | systems/win32/w32tex/ChangeLog 2020/05/07 | 6400 | fonts/erewhon/tfm/Erewhon-BoldItalic-osf-sc-t2b.tfm 2020/05/07 | 6396 | fonts/erewhon/tfm/Erewhon-BoldItalic-lf-sc-t2b.tfm 2020/05/07 | 6376 | fonts/erewhon/tfm/Erewhon-BoldItalic-tosf-sc-t2b.tfm @@ -536,6 +660,7 @@ 2020/05/07 | 540 | macros/luatex/latex/unitconv/README.md 2020/05/07 | 53432 | fonts/erewhon/map/erewhon.map 2020/05/07 | 5336 | fonts/erewhon/tfm/Erewhon-RegularSlanted-tlf-ot2.tfm +2020/05/07 | 5322 | macros/pdftex/mptopdf/tex/generic/context/mptopdf/mptopdf.tex 2020/05/07 | 51911 | macros/latex/contrib/l3kernel/l3text-case.dtx 2020/05/07 | 5112 | fonts/erewhon/tfm/Erewhon-Regular-tlf-ot2.tfm 2020/05/07 | 51073 | macros/latex/contrib/l3kernel/l3fp-extended.dtx @@ -561,6 +686,8 @@ 2020/05/07 | 47215 | macros/latex/contrib/l3kernel/l3fp-aux.dtx 2020/05/07 | 4716 | macros/latex/contrib/l3kernel/l3news05.tex 2020/05/07 | 4712 | fonts/erewhon/tfm/Erewhon-Bold-tlf-ot2.tfm +2020/05/07 | 4608 | macros/pdftex/mptopdf/scripts/context/stubs/mswin/mptopdf.exe +2020/05/07 | 4557 | macros/pdftex/mptopdf/scripts/context/perl/mptopdf.pl 2020/05/07 | 4520 | fonts/erewhon/tfm/Erewhon-BoldItalic-tlf-ot2.tfm 2020/05/07 | 4509 | fonts/erewhon/afm/erewMR.afm 2020/05/07 | 4504 | fonts/erewhon/tfm/Erewhon-Italic-lf-sc-t1.tfm @@ -573,6 +700,7 @@ 2020/05/07 | 4308 | fonts/erewhon/tfm/Erewhon-BoldItalic-lf-sc-t1.tfm 2020/05/07 | 4288 | fonts/erewhon/tfm/Erewhon-BoldItalic-tosf-sc-t1.tfm 2020/05/07 | 4288 | fonts/erewhon/tfm/Erewhon-BoldItalic-tlf-sc-t1.tfm +2020/05/07 | 42831 | macros/pdftex/mptopdf/tex/context/base/mkii/supp-mpe.mkii 2020/05/07 | 42710 | macros/latex/contrib/l3backend/l3backend-draw.dtx 2020/05/07 | 42147 | macros/latex/contrib/l3kernel/l3debug.dtx 2020/05/07 | 4164 | fonts/erewhon/tfm/Erewhon-Regular-osf-sc-ly1.tfm @@ -583,7 +711,6 @@ 2020/05/07 | 40709 | macros/latex/contrib/l3kernel/l3tl-analysis.dtx 2020/05/07 | 39 | macros/luatex/latex/unitconv/Changes 2020/05/07 | 39877 | macros/luatex/generic/luaotfload/filegraph.pdf -2020/05/07 | 388 | systems/texlive/tlnet/archive/texlive-docindex.r55037.tar.xz 2020/05/07 | 3887704 | macros/latex/contrib/animate/animate.pdf 2020/05/07 | 38861 | macros/latex/contrib/l3kernel/l3deprecation.dtx 2020/05/07 | 3848 | macros/luatex/latex/unitconv/latex/unitconv.sty @@ -701,7 +828,6 @@ 2020/05/07 | 3464 | fonts/erewhon/tfm/Erewhon-Italic-osf-sc-ly1.tfm 2020/05/07 | 3463 | fonts/erewhon/enc/zut1_uimsyn.enc 2020/05/07 | 3461 | fonts/erewhon/enc/zut1_cnetzv.enc -2020/05/07 | 34519520 | systems/win32/w32tex/ltxpkgs.tar.xz 2020/05/07 | 3450 | fonts/erewhon/enc/zut1_arprdz.enc 2020/05/07 | 3449 | fonts/erewhon/enc/zut1_ibngfe.enc 2020/05/07 | 3446 | fonts/erewhon/enc/zut1_3elzbu.enc @@ -790,6 +916,7 @@ 2020/05/07 | 217288 | fonts/erewhon/opentype/Erewhon-Bold.otf 2020/05/07 | 2153 | macros/latex/contrib/l3kernel/source3.tex 2020/05/07 | 21523 | macros/luatex/generic/luaotfload/scripts-demo.pdf +2020/05/07 | 21474 | macros/pdftex/mptopdf/tex/context/base/mkii/supp-mis.mkii 2020/05/07 | 2132 | fonts/erewhon/tfm/Erewhon-RegularSlanted-sup-t2a.tfm 2020/05/07 | 21209 | macros/latex/contrib/l3backend/l3backend-graphics.dtx 2020/05/07 | 21189 | macros/latex/contrib/l3kernel/source3body.tex @@ -1160,7 +1287,6 @@ 2020/05/07 | 1632 | fonts/erewhon/tfm/Erewhon-BoldItalic-tlf-ts1--base.tfm 2020/05/07 | 1628 | fonts/erewhon/tfm/Erewhon-Italic-tosf-ts1--base.tfm 2020/05/07 | 1628 | fonts/erewhon/tfm/Erewhon-Italic-tlf-ts1--base.tfm -2020/05/07 | 161672 | systems/texlive/tlnet/archive/texlive-docindex.doc.r55037.tar.xz 2020/05/07 | 159154 | macros/latex/contrib/l3kernel/l3news11.pdf 2020/05/07 | 15708 | macros/latex/contrib/l3kernel/l3final.dtx 2020/05/07 | 1544 | fonts/erewhon/tfm/Erewhon-Regular-osf-ts1.tfm @@ -1296,7 +1422,6 @@ 2020/05/06 | 514491 | macros/latex/contrib/achemso/achemso.pdf 2020/05/06 | 509988 | systems/texlive/tlnet/archive/biblatex-apa.doc.r55032.tar.xz 2020/05/06 | 50190 | macros/latex/contrib/media9/pdfbase.sty -2020/05/06 | 49871960 | systems/win32/w32tex/xetex-w32.tar.xz 2020/05/06 | 4948 | systems/texlive/tlnet/archive/tkz-fct.r55031.tar.xz 2020/05/06 | 489 | fonts/libertinus/README.md 2020/05/06 | 4732792 | systems/win32/miktex/tm/packages/tcolorbox.tar.lzma @@ -1420,7 +1545,6 @@ 2020/05/05 | 9542 | support/latexindent/LatexIndent/IfElseFi.pm 2020/05/05 | 9533071 | support/latexindent.zip 2020/05/05 | 9530 | macros/luatex/optex/base/hi-syntax.opm -2020/05/05 | 9516 | macros/latex/contrib/biblatex-contrib/biblatex-ext/blxextdoiapi.lua 2020/05/05 | 9488 | macros/latex/contrib/biblatex-contrib/biblatex-apa/french-apa.lbx 2020/05/05 | 937416 | systems/texlive/tlnet/archive/newtx.doc.r55012.tar.xz 2020/05/05 | 93610 | macros/latex/contrib/biblatex-contrib/biblatex-apa/biblatex-apa-test-references.bib @@ -1436,7 +1560,6 @@ 2020/05/05 | 9059 | support/latexindent/documentation/sec-indent-config-and-settings.tex 2020/05/05 | 8985 | support/latexindent/documentation/subsec-conflicting-poly-switches.tex 2020/05/05 | 873831 | support/latexindent/documentation/latexindent.pdf -2020/05/05 | 8705 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-icomp.cbx 2020/05/05 | 8624 | macros/luatex/optex/base/hyphen-lan.opm 2020/05/05 | 85992 | systems/texlive/tlnet/archive/garamond-libre.doc.r55011.tar.xz 2020/05/05 | 8587 | macros/luatex/optex/base/slides.opm @@ -1444,13 +1567,10 @@ 2020/05/05 | 85044 | systems/texlive/tlnet/archive/systeme.doc.r55015.tar.xz 2020/05/05 | 85028 | macros/luatex/optex/pkg/qrcode.opm 2020/05/05 | 84860 | systems/texlive/tlnet/archive/metanorma.doc.r55010.tar.xz -2020/05/05 | 8479848 | systems/win32/w32tex/uptex-w32.tar.xz 2020/05/05 | 834 | support/latexindent/LatexIndent/Version.pm -2020/05/05 | 8255 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-comp.cbx 2020/05/05 | 8162 | macros/luatex/optex/base/fnotes.opm 2020/05/05 | 79180 | macros/latex/contrib/mercatormap/mercatormap.sty 2020/05/05 | 7882 | support/latexindent/documentation/sec-introduction.tex -2020/05/05 | 7668 | macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oasymb-l3draw.sty 2020/05/05 | 763437 | macros/latex/contrib/tkz/tkz-fct.zip 2020/05/05 | 7536 | systems/texlive/tlnet/archive/metanorma.r55010.tar.xz 2020/05/05 | 7522 | support/latexindent/documentation/sec-fine-tuning.tex @@ -1458,57 +1578,21 @@ 2020/05/05 | 7368 | systems/texlive/tlnet/archive/systeme.r55015.tar.xz 2020/05/05 | 732338 | macros/latex/contrib/tkz/tkz-fct/doc/TKZdoc-fct-main.pdf 2020/05/05 | 720488 | systems/texlive/tlnet/archive/apa7.doc.r55007.tar.xz -2020/05/05 | 715 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic-verb.bbx 2020/05/05 | 7141708 | systems/texlive/tlnet/archive/garamond-libre.r55011.tar.xz 2020/05/05 | 7101 | support/latexindent/documentation/subsubsec-no-add-remaining-code-blocks.tex -2020/05/05 | 705 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ticomp.bbx -2020/05/05 | 702 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tiecomp.bbx -2020/05/05 | 702 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-terse.bbx -2020/05/05 | 702 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-tcomp.bbx -2020/05/05 | 702 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-icomp.bbx -2020/05/05 | 700 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ticomp.bbx -2020/05/05 | 699 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tecomp.bbx -2020/05/05 | 699 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ibid.bbx -2020/05/05 | 699 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-comp.bbx -2020/05/05 | 698 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-icomp.bbx -2020/05/05 | 697 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tcomp.bbx -2020/05/05 | 695 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ibid.bbx -2020/05/05 | 695 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-comp.bbx 2020/05/05 | 6959 | macros/luatex/optex/base/hyperlinks.opm -2020/05/05 | 692 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-terse.bbx -2020/05/05 | 691 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-iecomp.bbx -2020/05/05 | 688 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ecomp.bbx -2020/05/05 | 684 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle.bbx 2020/05/05 | 6793 | support/latexindent/LatexIndent/MandatoryArgument.pm -2020/05/05 | 677 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear.bbx 2020/05/05 | 6715 | macros/luatex/optex/base/fonts-opmac.opm -2020/05/05 | 670100 | macros/latex/contrib/biblatex-contrib/biblatex-ext.zip -2020/05/05 | 6671 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tiecomp.cbx 2020/05/05 | 66410 | macros/latex/contrib/biblatex-contrib/biblatex-apa/biblatex-apa.pdf 2020/05/05 | 6638 | macros/latex/contrib/biblatex-contrib/biblatex-apa/norsk-apa.lbx 2020/05/05 | 6628 | systems/texlive/tlnet/archive/babel-portuges.source.r55008.tar.xz 2020/05/05 | 6513 | support/latexindent/LatexIndent/FileExtension.pm 2020/05/05 | 6489 | macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-main.tex 2020/05/05 | 64374 | macros/latex/contrib/biblatex-contrib/biblatex-apa/apa.bbx -2020/05/05 | 640 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad3.bbx -2020/05/05 | 640 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad2.bbx -2020/05/05 | 640 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad1.bbx -2020/05/05 | 640 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-inote.bbx -2020/05/05 | 637 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-note.bbx -2020/05/05 | 637 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-ibid.bbx -2020/05/05 | 637 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-verb.bbx -2020/05/05 | 637 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-comp.bbx 2020/05/05 | 6367 | macros/latex/contrib/mercatormap/mercatormap.doc.orthodromes.tex 2020/05/05 | 6358 | support/latexindent/LatexIndent/Item.pm 2020/05/05 | 6353 | support/latexindent/LatexIndent/Environment.pm -2020/05/05 | 628 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic.bbx 2020/05/05 | 626826 | macros/latex/contrib/showexpl.zip -2020/05/05 | 622 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose.bbx -2020/05/05 | 619 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric.bbx -2020/05/05 | 6171 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tecomp.cbx -2020/05/05 | 6137 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-icomp.cbx -2020/05/05 | 6074 | macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oasymb-tikz.sty -2020/05/05 | 6067 | macros/latex/contrib/biblatex-contrib/biblatex-ext/README.md 2020/05/05 | 6062 | support/latexindent/LatexIndent/OptionalArgument.pm 2020/05/05 | 6042 | support/latexindent/LatexIndent/BackUpFileProcedure.pm 2020/05/05 | 6036 | support/latexindent/LatexIndent/TrailingComments.pm @@ -1516,37 +1600,25 @@ 2020/05/05 | 5937 | support/latexindent/LatexIndent/Else.pm 2020/05/05 | 5869 | support/latexindent/documentation/subsubsec-commands-with-arguments.tex 2020/05/05 | 5863 | macros/luatex/optex/base/alloc.opm -2020/05/05 | 5833 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-comp.cbx 2020/05/05 | 5777 | support/latexindent/LatexIndent/UnNamedGroupingBracesBrackets.pm -2020/05/05 | 5773 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ticomp.cbx 2020/05/05 | 5677 | macros/latex/contrib/mercatormap/mercatormap.doc.intro.tex 2020/05/05 | 5667 | macros/latex/contrib/univie-ling/README 2020/05/05 | 56398 | support/latexindent/documentation/sec-default-user-local.tex -2020/05/05 | 5587 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ibid.cbx -2020/05/05 | 5586 | macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oasymb-pict2e.sty 2020/05/05 | 5577664 | systems/texlive/tlnet/archive/newtx.r55012.tar.xz 2020/05/05 | 5574 | macros/luatex/optex/base/ref-file.opm -2020/05/05 | 551630 | macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext.pdf 2020/05/05 | 5482 | macros/luatex/optex/base/languages.opm 2020/05/05 | 5479 | fonts/erewhon/tex/erewhon.sty 2020/05/05 | 5435 | support/latexindent/LatexIndent/BlankLines.pm -2020/05/05 | 5336 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tcomp.cbx 2020/05/05 | 53340 | systems/texlive/tlnet/archive/reledmac.r55020.tar.xz 2020/05/05 | 5330 | support/latexindent/LatexIndent/KeyEqualsValuesBraces.pm -2020/05/05 | 5257 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear.cbx 2020/05/05 | 52324 | systems/texlive/tlnet/archive/acmart.source.r55004.tar.xz 2020/05/05 | 5214 | support/latexindent/documentation/subsubsec-headings.tex 2020/05/05 | 5154 | macros/luatex/optex/base/maketoc.opm 2020/05/05 | 51145 | support/latexindent/LatexIndent/AlignmentAtAmpersand.pm -2020/05/05 | 4933 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-common.bbx 2020/05/05 | 492 | support/latexindent/documentation/cmhlistings.tex 2020/05/05 | 4842 | macros/latex/contrib/mercatormap/mercatormap.doc.routes.tex -2020/05/05 | 4830 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ibid.cbx 2020/05/05 | 4799 | support/latexindent/documentation/subsubsec-ifelsefi.tex 2020/05/05 | 4658 | macros/latex/contrib/univie-ling/doc/templates/template-thesis-deutsch.tex -2020/05/05 | 4612 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle.cbx -2020/05/05 | 4578 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-comp.cbx -2020/05/05 | 4576 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ticomp.cbx 2020/05/05 | 45404 | systems/texlive/tlnet/archive/curve2e.source.r55009.tar.xz 2020/05/05 | 444376 | macros/latex/contrib/univie-ling/doc/univie-ling-expose.pdf 2020/05/05 | 442832 | macros/latex/contrib/univie-ling/doc/univie-ling-thesis.pdf @@ -1558,20 +1630,13 @@ 2020/05/05 | 4205 | macros/latex/contrib/univie-ling/doc/templates/template-thesis-english.tex 2020/05/05 | 41356 | systems/texlive/tlnet/archive/acro.r55016.tar.xz 2020/05/05 | 4116 | systems/texlive/tlnet/archive/psbao.r55013.tar.xz -2020/05/05 | 4111 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric.cbx 2020/05/05 | 4056 | systems/texlive/tlnet/archive/tikz-planets.r55002.tar.xz -2020/05/05 | 4014200 | systems/win32/w32tex/texinfo-w32.tar.xz -2020/05/05 | 3985 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-tcomp.cbx 2020/05/05 | 39842 | macros/latex/contrib/mercatormap/mercatormap.doc.maptiles.tex 2020/05/05 | 38129 | macros/luatex/optex/base/math-macros.opm -2020/05/05 | 3811 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic.cbx 2020/05/05 | 3775 | macros/latex/contrib/mercatormap/mercatormap.doc.abstract.tex 2020/05/05 | 37256 | systems/texlive/tlnet/archive/acmart.r55004.tar.xz 2020/05/05 | 3688 | support/latexindent/documentation/subsubsec-special.tex -2020/05/05 | 36731 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-standard.bbx 2020/05/05 | 3636 | support/latexindent/LatexIndent/Replacement.pm -2020/05/05 | 3632 | macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oa-doiapi.sty -2020/05/05 | 3548 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-verb.cbx 2020/05/05 | 3542 | macros/latex/contrib/mercatormap/mercatormap.doc.sty 2020/05/05 | 350530 | macros/latex/contrib/showexpl/doc/showexpl-test.pdf 2020/05/05 | 3491620 | systems/texlive/tlnet/archive/acmart.doc.r55004.tar.xz @@ -1583,7 +1648,6 @@ 2020/05/05 | 33057 | macros/latex/contrib/biblatex-contrib/biblatex-apa/biblatex-apa-test.tex 2020/05/05 | 329557 | macros/latex/contrib/univie-ling/doc/univie-ling-wlg.pdf 2020/05/05 | 3273 | support/latexindent/LatexIndent/Tokens.pm -2020/05/05 | 3249 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic-verb.cbx 2020/05/05 | 3176 | support/latexindent/LatexIndent/NamedGroupingBracesBrackets.pm 2020/05/05 | 31632 | systems/texlive/tlnet/archive/apa7.source.r55007.tar.xz 2020/05/05 | 3117 | macros/luatex/optex/base/others.opm @@ -1592,24 +1656,16 @@ 2020/05/05 | 3049 | macros/latex/contrib/mercatormap/mercatormap-example.tex 2020/05/05 | 3024 | macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-why.tex 2020/05/05 | 3014 | macros/luatex/optex/base/hisyntax-python.opm -2020/05/05 | 2939 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-dashed-common.bbx 2020/05/05 | 2912 | support/latexindent/latexindent.pl 2020/05/05 | 29045 | macros/latex/contrib/univie-ling/doc/univie-ling-thesis.tex 2020/05/05 | 2891788 | macros/latex/contrib/univie-ling.zip 2020/05/05 | 28728 | macros/luatex/optex/base/fonts-select.opm -2020/05/05 | 2846 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-inote.cbx -2020/05/05 | 2841 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-note.cbx 2020/05/05 | 281724 | systems/texlive/tlnet/archive/etbb.doc.r55005.tar.xz 2020/05/05 | 28040 | macros/latex/contrib/univie-ling/tex/univie-ling-wlg.cls 2020/05/05 | 2786 | support/latexindent/documentation/subsec-partnering-poly-switches.tex 2020/05/05 | 2776 | systems/texlive/tlnet/archive/babel-portuges.r55008.tar.xz 2020/05/05 | 2775 | macros/latex/contrib/biblatex-contrib/biblatex-apa/apa.dbx 2020/05/05 | 2761 | macros/luatex/optex/base/hisyntax-c.opm -2020/05/05 | 2691 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad2.cbx -2020/05/05 | 2691 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad1.cbx -2020/05/05 | 2689 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad3.cbx -2020/05/05 | 2686 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-ibid.cbx -2020/05/05 | 2673 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose.cbx 2020/05/05 | 26205 | macros/latex/contrib/univie-ling/doc/univie-ling-paper.tex 2020/05/05 | 26056519 | macros/latex/contrib/mercatormap/mercatormap.pdf 2020/05/05 | 25617242 | macros/latex/contrib/mercatormap.zip @@ -1634,7 +1690,6 @@ 2020/05/05 | 2118 | support/latexindent/documentation/sec-demonstration.tex 2020/05/05 | 21184 | systems/texlive/tlnet/archive/biblatex-apa6.r55017.tar.xz 2020/05/05 | 21098 | support/latexindent/LatexIndent/Verbatim.pm -2020/05/05 | 2086 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-terse.cbx 2020/05/05 | 20546 | macros/latex/contrib/biblatex-contrib/biblatex-apa/apa.cbx 2020/05/05 | 204324 | systems/texlive/tlnet/archive/reledmac.source.r55020.tar.xz 2020/05/05 | 20424 | support/latexindent/LatexIndent/ModifyLineBreaks.pm @@ -1650,7 +1705,6 @@ 2020/05/05 | 1879 | macros/latex/contrib/mercatormap/README 2020/05/05 | 1878452 | systems/win32/w32tex/win64/ptex-w64.tar.xz 2020/05/05 | 1875 | support/latexindent/README -2020/05/05 | 1848 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-terse.cbx 2020/05/05 | 18156 | support/latexindent/LatexIndent/Document.pm 2020/05/05 | 1806816 | systems/win32/w32tex/win64/uptex-w64.tar.xz 2020/05/05 | 1780 | macros/latex/contrib/tkz/tkz-fct/README.md @@ -1668,24 +1722,20 @@ 2020/05/05 | 15771 | macros/latex/contrib/mercatormap/mercatormap.doc.scales.tex 2020/05/05 | 15654 | macros/latex/contrib/mercatormap/mercatormap.doc.examples.tex 2020/05/05 | 1562 | macros/luatex/optex/base/hisyntax-tex.opm -2020/05/05 | 15136 | macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oa.sty 2020/05/05 | 1483 | support/latexindent/LatexIndent/DoubleBackSlash.pm 2020/05/05 | 1460 | support/latexindent/documentation/title.tex 2020/05/05 | 14602 | macros/latex/contrib/biblatex-contrib/biblatex-apa/american-apa.lbx 2020/05/05 | 145720 | systems/texlive/tlnet/archive/babel-portuges.doc.r55008.tar.xz 2020/05/05 | 1451 | macros/latex/contrib/mercatormap/mercatormap.bib 2020/05/05 | 14292 | systems/texlive/tlnet/archive/apa7.r55007.tar.xz -2020/05/05 | 1391 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-common.bbx 2020/05/05 | 13909 | macros/luatex/optex/base/usebib.opm 2020/05/05 | 13881 | macros/luatex/optex/base/fonts-resize.opm 2020/05/05 | 13839 | support/latexindent/documentation/subsec-commands-and-their-options.tex 2020/05/05 | 135936 | systems/texlive/tlnet/archive/gitver.doc.r55019.tar.xz 2020/05/05 | 134544 | systems/texlive/tlnet/archive/fancyvrb.doc.r55018.tar.xz 2020/05/05 | 13397 | macros/luatex/optex/base/plain-macros.opm -2020/05/05 | 133260 | macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext.tex 2020/05/05 | 13154 | support/latexindent/LatexIndent/Special.pm 2020/05/05 | 12946 | macros/latex/contrib/mercatormap/mercatormap.doc.limitations.tex -2020/05/05 | 1290 | macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-examples.bib 2020/05/05 | 12785 | macros/latex/contrib/biblatex-contrib/biblatex-apa/biblatex-apa-test-citations.bib 2020/05/05 | 12661 | support/latexindent/LatexIndent/Braces.pm 2020/05/05 | 12536 | systems/texlive/tlnet/archive/pxjodel.r55006.tar.xz @@ -1695,11 +1745,8 @@ 2020/05/05 | 12406 | macros/latex/contrib/biblatex-contrib/biblatex-apa/austrian-apa.lbx 2020/05/05 | 12394 | macros/latex/contrib/biblatex-contrib/biblatex-apa/nswissgerman-apa.lbx 2020/05/05 | 12379 | macros/latex/contrib/biblatex-contrib/biblatex-apa/german-apa.lbx -2020/05/05 | 12128 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-iecomp.cbx 2020/05/05 | 11862 | support/latexindent/LatexIndent/FileContents.pm 2020/05/05 | 11704 | systems/texlive/tlnet/archive/fancyvrb.r55018.tar.xz -2020/05/05 | 11700 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-biblatex-aux.def -2020/05/05 | 11663 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ecomp.cbx 2020/05/05 | 1164640 | systems/texlive/tlnet/archive/curve2e.doc.r55009.tar.xz 2020/05/05 | 11471754 | support/latexindent/latexindent.exe 2020/05/05 | 1139744 | systems/texlive/tlnet/archive/acro.doc.r55016.tar.xz @@ -1711,11 +1758,9 @@ 2020/05/05 | 1097 | macros/latex/contrib/mercatormap/mercatormap.doc.versionhistory.tex 2020/05/05 | 1094316 | systems/texlive/tlnet/archive/etbb.r55005.tar.xz 2020/05/05 | 10824 | support/latexindent/LatexIndent/Heading.pm -2020/05/05 | 10623 | macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-tabular.sty 2020/05/05 | 10594 | macros/latex/contrib/biblatex-contrib/biblatex-apa/greek-apa.lbx 2020/05/05 | 10567 | macros/luatex/optex/base/output.opm 2020/05/05 | 105568 | systems/texlive/tlnet/archive/newtxsf.r55014.tar.xz -2020/05/05 | 10469752 | systems/win32/w32tex/ptex-w32.tar.xz 2020/05/05 | 10429 | support/latexindent/documentation/appendices.tex 2020/05/05 | 10368 | macros/luatex/optex/base/table.opm 2020/05/05 | 10361 | support/latexindent/LatexIndent/Command.pm @@ -1723,11 +1768,9 @@ 2020/05/05 | 102265 | support/latexindent/documentation/sec-the-m-switch.tex 2020/05/05 | 10151 | macros/latex/contrib/biblatex-contrib/biblatex-apa/galician-apa.lbx 2020/05/05 | 10149 | macros/latex/contrib/biblatex-contrib/biblatex-apa/spanish-apa.lbx -2020/05/05 | 10091 | macros/latex/contrib/biblatex-contrib/biblatex-ext/CHANGES.md 2020/05/05 | 10056 | macros/latex/contrib/univie-ling/doc/univie-ling-wlg.tex 2020/05/04 | 999623 | macros/latex/contrib/acmart/samples/sample-sigconf.pdf 2020/05/04 | 9926 | language/japanese/pxjodel/pxjodel.tex -2020/05/04 | 97988 | systems/texlive/tlnet/archive/texinfo.r54994.tar.xz 2020/05/04 | 9708380 | systems/win32/w32tex/newtxpx-boondoxfonts.tar.xz 2020/05/04 | 96892 | systems/texlive/tlnet/archive/zhlipsum.source.r54994.tar.xz 2020/05/04 | 9292957 | macros/latex/contrib/acmart.zip @@ -2504,7 +2547,6 @@ 2020/05/03 | 37801 | macros/latex/contrib/reledmac/examples/3-reledpar_pages_different_languages_lualatex.pdf 2020/05/03 | 3635 | fonts/garamond-libre/README 2020/05/03 | 356785 | macros/latex/contrib/reledmac/migration.pdf -2020/05/03 | 3532 | fonts/minion2newtx/README 2020/05/03 | 348858 | fonts/etbb/afm/ETbb-BoldItalic.afm 2020/05/03 | 34825 | fonts/newtx/README 2020/05/03 | 33721 | macros/latex/contrib/acro/examples/acro.example.texsx-507726.pdf @@ -2531,9 +2573,7 @@ 2020/05/03 | 263410 | macros/latex/contrib/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.pdf 2020/05/03 | 2568 | macros/latex/contrib/reledmac/examples/1-verses-doublenumbering.tex 2020/05/03 | 25562 | macros/generic/systeme/systeme_fr.tex -2020/05/03 | 2476 | fonts/minion2newtx/tfm/zmnbmia.tfm 2020/05/03 | 24736 | macros/latex/contrib/metanorma/metanorma.xsl -2020/05/03 | 2456 | fonts/minion2newtx/tfm/zmnmia.tfm 2020/05/03 | 24477 | macros/latex/contrib/reledmac/examples/3-reledpar_columns_different_languages.pdf 2020/05/03 | 24446 | macros/latex/contrib/reledmac/doc-include/migrate-mac.dtx 2020/05/03 | 24224 | macros/latex/contrib/acro/examples/acro.example.issue-154.pdf @@ -2548,9 +2588,7 @@ 2020/05/03 | 2115 | macros/latex/contrib/acro/examples/acro.example.units.tex 2020/05/03 | 20922 | macros/latex/contrib/acro/examples/acro.example.acflike.pdf 2020/05/03 | 2086 | macros/latex/contrib/biblatex-contrib/biblatex-apa6/apa6.dbx -2020/05/03 | 20690324 | systems/win32/w32tex/pdftex-w32.tar.xz 2020/05/03 | 20332 | macros/latex/contrib/reledmac/examples/3-reledpar_same_page_number_in_both_side.tex -2020/05/03 | 2028 | fonts/minion2newtx/vf/zmnbmia.vf 2020/05/03 | 2027 | macros/latex/contrib/reledmac/examples/3-reledpar_pages_different_languages_lualatex.tex 2020/05/03 | 20198 | macros/latex/contrib/biblatex-contrib/biblatex-apa6/apa6.cbx 2020/05/03 | 201833 | macros/latex/contrib/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.pdf @@ -2558,7 +2596,6 @@ 2020/05/03 | 1986367 | macros/latex/contrib/reledmac/reledmac.pdf 2020/05/03 | 1982 | macros/latex/contrib/reledmac/examples/1-tabular.tex 2020/05/03 | 1981 | macros/latex/contrib/reledmac/examples/2-titles_not_in_line_numbering.tex -2020/05/03 | 1972 | fonts/minion2newtx/vf/zmnmia.vf 2020/05/03 | 1959 | macros/latex/contrib/reledmac/examples/1-criticalendnotes.tex 2020/05/03 | 1904 | macros/latex/contrib/acro/README 2020/05/03 | 190222 | macros/latex/contrib/reledmac/examples/2-titles_in_line_numbering_with_notes.pdf @@ -2646,76 +2683,3 @@ 2020/05/03 | 10285 | macros/latex/contrib/acmart/README 2020/05/03 | 10218510 | macros/latex/contrib/reledmac.zip 2020/05/03 | 10008 | macros/latex/contrib/reledmac/examples/4-reledpar_one_series_per_pstart.tex -2020/05/02 | 9483 | macros/luatex/generic/luaotfload/fontloader-basics-nod.lua -2020/05/02 | 88658 | macros/luatex/generic/luaotfload/fontloader-font-cff.lua -2020/05/02 | 88484 | systems/texlive/tlnet/archive/xecjk.source.r54961.tar.xz -2020/05/02 | 7872 | systems/texlive/tlnet/archive/zhnumber.r54960.tar.xz -2020/05/02 | 7780 | systems/texlive/tlnet/archive/jlreq.source.r54964.tar.xz -2020/05/02 | 7199 | fonts/minion2newtx/doc/minion2newtxdoc.tex -2020/05/02 | 7064 | systems/texlive/tlnet/archive/xcjk2uni.source.r54958.tar.xz -2020/05/02 | 67958 | systems/texlive/tlnet/tlpkg/installer/install-tl-gui.tcl -2020/05/02 | 65634 | macros/luatex/generic/luaotfload/fontloader-font-otj.lua -2020/05/02 | 6326 | macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-fonctions.tex -2020/05/02 | 63130 | macros/luatex/generic/luaotfload/fontloader-font-con.lua -2020/05/02 | 6180 | language/chinese/ctex/ctex-zhconv.lua -2020/05/02 | 6011 | language/chinese/ctex/README.md -2020/05/02 | 5894 | macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-point.tex -2020/05/02 | 53269 | macros/latex/contrib/acmart/samples/sample-base.bib -2020/05/02 | 500264 | systems/texlive/tlnet/archive/jlreq.doc.r54964.tar.xz -2020/05/02 | 45153 | macros/luatex/generic/luaotfload/fontloader-util-str.lua -2020/05/02 | 433446 | language/chinese/ctex/ctex.dtx -2020/05/02 | 41758 | macros/luatex/generic/luaotfload/fontloader-l-table.lua -2020/05/02 | 4099 | language/chinese/ctex/ctex-zhconv-make.lua -2020/05/02 | 4044 | macros/latex/contrib/tkz/tkz-fct/doc/latex/TKZdoc-fct-example.tex -2020/05/02 | 4044 | fonts/minion2newtx/type1/zmnr-xtras.pfb -2020/05/02 | 4016 | fonts/minion2newtx/type1/zmnb-xtras.pfb -2020/05/02 | 386908 | systems/texlive/tlnet/archive/lwarp.source.r54965.tar.xz -2020/05/02 | 382741 | fonts/minion2newtx/doc/minion2newtxdoc.pdf -2020/05/02 | 344 | graphics/pstricks/contrib/psbao/Changes -2020/05/02 | 33013 | macros/luatex/generic/luaotfload/fontloader-font-otl.lua -2020/05/02 | 3287334 | macros/luatex/generic/luaotfload/luaotfload-characters.lua -2020/05/02 | 30572 | macros/latex/contrib/acmart/samples/samples.dtx -2020/05/02 | 30000 | systems/texlive/tlnet/archive/pst-ovl.doc.r54963.tar.xz -2020/05/02 | 2894 | language/chinese/ctex/ctxdocstrip.tex -2020/05/02 | 28619 | language/chinese/ctex/ctxdoc.cls -2020/05/02 | 274450768 | systems/win32/w32tex/pstricks.tar.xz -2020/05/02 | 267108 | systems/texlive/tlnet/archive/zhnumber.doc.r54960.tar.xz -2020/05/02 | 265337 | macros/luatex/generic/lualibs.zip -2020/05/02 | 264 | fonts/minion2newtx/tfm/zmnb-xtras.tfm -2020/05/02 | 260 | fonts/minion2newtx/tfm/zmnr-xtras.tfm -2020/05/02 | 2592452 | systems/texlive/tlnet/archive/lwarp.doc.r54965.tar.xz -2020/05/02 | 24616 | macros/latex/contrib/tkz/tkz-fct/latex/tkz-fct.sty -2020/05/02 | 22152 | systems/texlive/tlnet/tlpkg/tltcl/tltcl.tcl -2020/05/02 | 219632 | systems/texlive/tlnet/archive/xecjk.r54961.tar.xz -2020/05/02 | 204180 | systems/texlive/tlnet/archive/xpinyin.doc.r54959.tar.xz -2020/05/02 | 200328 | systems/texlive/tlnet/archive/xpinyin.r54959.tar.xz -2020/05/02 | 200052 | systems/texlive/tlnet/archive/xcjk2uni.r54958.tar.xz -2020/05/02 | 19536 | macros/luatex/generic/luaotfload/fontloader-font-map.lua -2020/05/02 | 1932 | systems/texlive/tlnet/archive/pst-ovl.r54963.tar.xz -2020/05/02 | 18140260 | systems/win32/w32tex/luatex-dev-w32.tar.xz -2020/05/02 | 18134328 | systems/win32/w32tex/luatex-w32.tar.xz -2020/05/02 | 180366 | macros/luatex/generic/luaotfload/fontloader-font-ots.lua -2020/05/02 | 17916596 | systems/win32/w32tex/luatex-exp-w32.tar.xz -2020/05/02 | 17868 | graphics/pstricks/contrib/psbao/psbao.sty -2020/05/02 | 176372 | dviware/dvidvi.zip -2020/05/02 | 172796 | systems/texlive/tlnet/archive/lwarp.r54965.tar.xz -2020/05/02 | 16688 | macros/luatex/generic/luaotfload/luaotfload-latex.tex -2020/05/02 | 1555383 | install/language/chinese/ctex.tds.zip -2020/05/02 | 154107 | macros/luatex/generic/luaotfload/fontloader-font-dsp.lua -2020/05/02 | 1536496 | systems/texlive/tlnet/archive/xecjk.doc.r54961.tar.xz -2020/05/02 | 14578 | macros/luatex/generic/luaotfload/fontloader-font-ota.lua -2020/05/02 | 14372556 | fonts/thai/fonts-tlwg.zip -2020/05/02 | 13423 | macros/luatex/generic/luaotfload/fontloader-reference-load-order.lua -2020/05/02 | 13368 | systems/texlive/tlnet/archive/zhnumber.source.r54960.tar.xz -2020/05/02 | 131116 | systems/texlive/tlnet/archive/jlreq.r54964.tar.xz -2020/05/02 | 12699 | macros/luatex/generic/luaotfload/fontloader-basics-gen.lua -2020/05/02 | 124084 | systems/texlive/tlnet/archive/xcjk2uni.doc.r54958.tar.xz -2020/05/02 | 1228 | graphics/pstricks/contrib/psbao/README -2020/05/02 | 119010 | fonts/newtx/tex/newtxmath.sty -2020/05/02 | 117724 | macros/luatex/generic/luaotfload/fontloader-font-oup.lua -2020/05/02 | 1172692 | language/chinese/ctex.zip -2020/05/02 | 113338 | graphics/pstricks/contrib/psbao/psbaomanual.pdf -2020/05/02 | 1097692 | language/chinese/ctex/ctex.pdf -2020/05/02 | 10836 | systems/texlive/tlnet/archive/xpinyin.source.r54959.tar.xz -2020/05/02 | 107580 | macros/luatex/generic/luaotfload/fontloader-font-osd.lua -2020/05/02 | 102696 | graphics/pstricks/contrib/psbao.zip diff --git a/fonts/logix/CHANGELOG b/fonts/logix/CHANGELOG index 1680488869..503b45c287 100644 --- a/fonts/logix/CHANGELOG +++ b/fonts/logix/CHANGELOG @@ -1,3 +1,14 @@ +2020-03-07 v1.03 + + 1. Some macros were tweaked which were not expanding correctly in some circumstances. + + 2. The "bold-style=ISO" option is now used for unicode-math. This causes \symbf to + use italic bold, \mathbf remains non-italic. See the unicode-math package + documentation for more information. + + 3. LaTeX2e version 2020-02-02 patch level 5 is now required. Some updates prior to + patch level 5 were causing errors. + 2020-01-04 v1.02 1. Version number corrected in logix.sty. diff --git a/fonts/logix/README b/fonts/logix/README index 14c20bd620..aab910c6cb 100644 --- a/fonts/logix/README +++ b/fonts/logix/README @@ -1,27 +1,6 @@ The logix package. -This is the README for the logix package, version 2020-01-04 v1.02. - -*** Important! *** ******************************************************** - -Due to changes in a number of base packages, a number of other packages -have been broken. To the best of my knowledge (as of the date above) the -only remaining package that is broken and that affects using this package -is filehook-scrlfile. If you get an error message such as: - - LaTeX Warning: Command \InputIfFileExists has changed. - - Package filehook Error: Detected 'scrlfile' package with unknown definition of \InputIfFileExists. - -Then goto - - https://tex.stackexchange.com/a/515183/48973 - -and copy the code into a file named "filehook-scrlfile.sty" and place -it in your local directory. When filehook-scrlfile has been updated, this -local file should be removed. - -*************************************************************************** +This is the README for the logix package, version 2020-03-07 v1.03. This package provides supplemental symbols for use in logic and mathematics which are largely not present in Unicode. Some symbols are in Unicode but diff --git a/fonts/logix/doc/logix.pdf b/fonts/logix/doc/logix.pdf index 6f797d0f67..a70b343469 100644 Binary files a/fonts/logix/doc/logix.pdf and b/fonts/logix/doc/logix.pdf differ diff --git a/fonts/logix/doc/logix.tex b/fonts/logix/doc/logix.tex index 793bfe9264..432e3bad07 100644 --- a/fonts/logix/doc/logix.tex +++ b/fonts/logix/doc/logix.tex @@ -9,8 +9,8 @@ \usepackage{array} \usepackage{logix} - \setmainfont{STIX Two Text} - \setmathfont{STIX Two Math} + \setmainfont{STIX Two Text}[NFSSFamily=mainfont] + \setmathfont{STIX Two Math}[NFSSFamily=mathfont] \usepackage{scrextend} \usepackage{csquotes} @@ -85,7 +85,7 @@ \newgeometry{left=1.5in,right=1.5in,bottom=1.00in,top=0.75in} - \section{Introduction: logix 2020-01-04 v1.02} + \section{Introduction: logix 2020-03-07 v1.03} The logix package provides the logix Unicode font and, at this time, must be used either with \LuaLaTeX\ or \XeLaTeX. There are no available options. The logix font contains diff --git a/fonts/logix/tex/logix.sty b/fonts/logix/tex/logix.sty index bbb03f8300..10540b0b64 100644 --- a/fonts/logix/tex/logix.sty +++ b/fonts/logix/tex/logix.sty @@ -1,6 +1,6 @@ % Copyright (c) 2001..2020 by Michael Lee Finney. % -% logix.sty - 2020-01-04 v1.02 +% logix.sty - 2020-03-07 v1.03 % % This work may be distributed and/or modified under the conditions of the % LaTeX Project Public License, either version 1.3 of this license or (at your @@ -26,13 +26,13 @@ % symbols. Many other additional symbols are provided. % - \NeedsTeXFormat{LaTeX2e} + \NeedsTeXFormat{LaTeX2e}[2020/02/02] \ProvidesPackage{logix} - [2020-01-04 v1.02 (Michael Lee Finney) Supplemental logical and mathematical symbols for XeLaTex / LuaLaTeX.] + [2020-03-07 v1.03 (Michael Lee Finney) Supplemental logical and mathematical symbols for XeLaTex / LuaLaTeX.] \ProvidesFile{logix.otf} - [2020-01-04 v1.02 (Michael Lee Finney) OpenType Unicode font.] + [2020-03-07 v1.03 (Michael Lee Finney) OpenType Unicode font.] \RequirePackage{iftex} - \RequirePackage{unicode-math} + \RequirePackage[bold-style=ISO]{unicode-math} \RequirePackage{arydshln} % Checks for LuaTex or XeTex as engines. @@ -263,528 +263,528 @@ \newcommand \lgm[1] {\ensuremath{\Udelimiter 0 \symLogix "#1}} \newcommand \lgr[1] {\ensuremath{\Udelimiter 5 \symLogix "#1}} - \newcommand \OpnBar {\lgl{E300}} % Open Vertical Bar - \newcommand \OpnGrp {\lgl{E301}} % Open Group Brace - \newcommand \OpnParn {\lgl{E302}} % Open Parenthesis - \newcommand \OpnBrac {\lgl{E303}} % Open Curly Brace - \newcommand \OpnBrknBrac {\lgl{E304}} % Open Curly Broken Brace - \newcommand \OpnCircBrac {\lgl{E305}} % Open Curly Circle Brace - \newcommand \OpnArrwBrac {\lgl{E306}} % Open Arrow Brace - \newcommand \OpnBrkt {\lgl{E307}} % Open Square Bracket - \newcommand \OpnCrlyBrkt {\lgl{E308}} % Open Square Curly Bracket - \newcommand \OpnBrknBrkt {\lgl{E309}} % Open Square Broken Bracket - \newcommand \OpnCircBrkt {\lgl{E30A}} % Open Square Circle Bracket - \newcommand \OpnTortoise {\lgl{E30B}} % Open Tortoise Shell - \newcommand \OpnAngl {\lgl{E30C}} % Open Angle Bracket - \newcommand \OpnDblBrac {\lgl{E30D}} % Open Double Curly Brace - \newcommand \OpnDblAngl {\lgl{E30E}} % Open Double Angle Bracket - \newcommand \OpnSqrParn {\lgl{E30F}} % Open Square Parenthesis - \newcommand \OpnParnBar {\lgl{E310}} % Open Parenthesis with Bar - \newcommand \OpnBracBar {\lgl{E311}} % Open Brace with Bar - \newcommand \OpnBrknBracBar {\lgl{E312}} % Open Broken Brace with Bar - \newcommand \OpnCircBracBar {\lgl{E313}} % Open Circle Brace with Bar - \newcommand \OpnBrktBar {\lgl{E314}} % Open Bracket with Bar - \newcommand \OpnCrlyBrktBar {\lgl{E315}} % Open Curly Bracket with Bar - \newcommand \OpnBrknBrktBar {\lgl{E316}} % Open Broken Bracket with Bar - \newcommand \OpnCircBrktBar {\lgl{E317}} % Open Circle Bracket with Bar - \newcommand \OpnTortoiseBar {\lgl{E318}} % Open Tortoise Shell with Bar - \newcommand \OpnAnglBar {\lgl{E319}} % Open Angle Bracket with Bar - \newcommand \OpnCurvAngl {\lgl{E31A}} % Open Curved Angle Bracket - \newcommand \OpnDblParn {\lgl{E31B}} % Open Double Parenthesis - \newcommand \OpnCeil {\lgl{E31C}} % Open Ceiling - \newcommand \OpnFloor {\lgl{E31D}} % Open Floor - \newcommand \OpnTurn {\lgl{E31E}} % Open Turnstile - \newcommand \OpnCntx {\lgx{E31F}} % Open Context Quote - \newcommand \OpnDblGrp {\lgl{E320}} % Open Double Group Brace - \newcommand \OpnDblBar {\lgl{E321}} % Open Double Vertical Bar - - \newcommand \OpnBarS {\left\OpnBar} % Stretchy Open Vertical Bar - \newcommand \OpnGrpS {\left\OpnGrp} % Stretchy Open Group Brace - \newcommand \OpnParnS {\left\OpnParn} % Stretchy Open Parenthesis - \newcommand \OpnBracS {\left\OpnBrac} % Stretchy Open Curly Brace - \newcommand \OpnBrknBracS {\left\OpnBrknBrac} % Stretchy Open Curly Broken Brace - \newcommand \OpnCircBracS {\left\OpnCircBrac} % Stretchy Open Curly Circle Brace - \newcommand \OpnArrwBracS {\left\OpnArrwBrac} % Stretchy Open Arrow Brace - \newcommand \OpnBrktS {\left\OpnBrkt} % Stretchy Open Square Bracket - \newcommand \OpnCrlyBrktS {\left\OpnCrlyBrkt} % Stretchy Open Square Curly Bracket - \newcommand \OpnBrknBrktS {\left\OpnBrknBrkt} % Stretchy Open Square Broken Bracket - \newcommand \OpnCircBrktS {\left\OpnCircBrkt} % Stretchy Open Square Circle Bracket - \newcommand \OpnTortoiseS {\left\OpnTortoise} % Stretchy Open Tortoise Shell - \newcommand \OpnAnglS {\left\OpnAngl} % Stretchy Open Angle Bracket - \newcommand \OpnDblBracS {\left\OpnDblBrac} % Stretchy Open Double Curly Brace - \newcommand \OpnDblAnglS {\left\OpnDblAngl} % Stretchy Open Double Angle Bracket - \newcommand \OpnSqrParnS {\left\OpnSqrParn} % Stretchy Open Square Parenthesis - \newcommand \OpnParnBarS {\left\OpnParnBar} % Stretchy Open Parenthesis with Bar - \newcommand \OpnBracBarS {\left\OpnBracBar} % Stretchy Open Brace with Bar - \newcommand \OpnBrknBracBarS {\left\OpnBrknBracBar} % Stretchy Open Broken Brace with Bar - \newcommand \OpnCircBracBarS {\left\OpnCircBracBar} % Stretchy Open Circle Brace with Bar - \newcommand \OpnBrktBarS {\left\OpnBrktBar} % Stretchy Open Bracket with Bar - \newcommand \OpnCrlyBrktBarS {\left\OpnCrlyBrktBar} % Stretchy Open Curly Bracket with Bar - \newcommand \OpnBrknBrktBarS {\left\OpnBrknBrktBar} % Stretchy Open Broken Bracket with Bar - \newcommand \OpnCircBrktBarS {\left\OpnCircBrktBar} % Stretchy Open Circle Bracket with Bar - \newcommand \OpnTortoiseBarS {\left\OpnTortoiseBar} % Stretchy Open Tortoise Shell with Bar - \newcommand \OpnAnglBarS {\left\OpnAnglBar} % Stretchy Open Angle Bracket with Bar - \newcommand \OpnCurvAnglS {\left\OpnCurvAngl} % Stretchy Open Curved Angle Bracket - \newcommand \OpnDblParnS {\left\OpnDblParn} % Stretchy Open Double Parenthesis - \newcommand \OpnCeilS {\left\OpnCeil} % Stretchy Open Ceiling - \newcommand \OpnFloorS {\left\OpnFloor} % Stretchy Open Floor - \newcommand \OpnTurnS {\left\OpnTurn} % Stretchy Open Turnstile - \newcommand \OpnCntxS {\left\OpnCntx} % Stretchy Open Context Quote - \newcommand \OpnDblGrpS {\left\OpnDblGrp} % Stretchy Open Double Group Brace - \newcommand \OpnDblBarS {\left\OpnDblBar} % Stretchy Open Double Vertical Bar - - \newcommand \ClsBar {\lgr{E340}} % Close Bar - \newcommand \ClsGrp {\lgr{E341}} % Close Group Brace - \newcommand \ClsParn {\lgr{E342}} % Close Parenthesis - \newcommand \ClsBrac {\lgr{E343}} % Close Curly Brace - \newcommand \ClsBrknBrac {\lgr{E344}} % Close Curly Broken Brace - \newcommand \ClsCircBrac {\lgr{E345}} % Close Curly Circle Brace - \newcommand \ClsArrwBrac {\lgr{E346}} % Close Arrow Brace - \newcommand \ClsBrkt {\lgr{E347}} % Close Square Bracket - \newcommand \ClsCrlyBrkt {\lgr{E348}} % Close Square Curly Bracket - \newcommand \ClsBrknBrkt {\lgr{E349}} % Close Square Broken Bracket - \newcommand \ClsCircBrkt {\lgr{E34A}} % Close Square Circle Bracket - \newcommand \ClsTortoise {\lgr{E34B}} % Close Tortoise Shell - \newcommand \ClsAngl {\lgr{E34C}} % Close Angle Bracket - \newcommand \ClsDblBrac {\lgr{E34D}} % Close Double Curly Brace - \newcommand \ClsDblAngl {\lgr{E34E}} % Close Double Angle Bracket - \newcommand \ClsSqrParn {\lgr{E34F}} % Close Square Parenthesis - \newcommand \ClsParnBar {\lgr{E350}} % Close Parenthesis with Bar - \newcommand \ClsBracBar {\lgr{E351}} % Close Brace with Bar - \newcommand \ClsBrknBracBar {\lgr{E352}} % Close Broken Brace with Bar - \newcommand \ClsCircBracBar {\lgr{E353}} % Close Circle Brace with Bar - \newcommand \ClsBrktBar {\lgr{E354}} % Close Bracket with Bar - \newcommand \ClsCrlyBrktBar {\lgr{E355}} % Close Curly Bracket with Bar - \newcommand \ClsBrknBrktBar {\lgr{E356}} % Close Broken Bracket with Bar - \newcommand \ClsCircBrktBar {\lgr{E357}} % Close Circle Bracket with Bar - \newcommand \ClsTortoiseBar {\lgr{E358}} % Close Tortoise Shell with Bar - \newcommand \ClsAnglBar {\lgr{E359}} % Close Angle Bracket with Bar - \newcommand \ClsCurvAngl {\lgr{E35A}} % Close Curved Angle Bracket - \newcommand \ClsDblParn {\lgl{E35B}} % Close Double Parenthesis - \newcommand \ClsCeil {\lgr{E35C}} % Close Ceiling - \newcommand \ClsFloor {\lgr{E35D}} % Close Floor - \newcommand \ClsTurn {\lgr{E35E}} % Close Turnstile - \newcommand \ClsCntx {\lgx{E35F}} % Close Context Quote - \newcommand \ClsDblGrp {\lgr{E360}} % Close Double Group Brace - \newcommand \ClsDblBar {\lgr{E361}} % Close Double Vertical Bar - - \newcommand \ClsBarS {\right\ClsBar} % Stretchy Close Bar - \newcommand \ClsGrpS {\right\ClsGrp} % Stretchy Close Group Brace - \newcommand \ClsParnS {\right\ClsParn} % Stretchy Close Parenthesis - \newcommand \ClsBracS {\right\ClsBrac} % Stretchy Close Curly Brace - \newcommand \ClsBrknBracS {\right\ClsBrknBrac} % Stretchy Close Curly Broken Brace - \newcommand \ClsCircBracS {\right\ClsCircBrac} % Stretchy Close Curly Circle Brace - \newcommand \ClsArrwBracS {\right\ClsArrwBrac} % Stretchy Close Arrow Brace - \newcommand \ClsBrktS {\right\ClsBrkt} % Stretchy Close Square Bracket - \newcommand \ClsCrlyBrktS {\right\ClsCrlyBrkt} % Stretchy Close Square Curly Bracket - \newcommand \ClsBrknBrktS {\right\ClsBrknBrkt} % Stretchy Close Square Broken Bracket - \newcommand \ClsCircBrktS {\right\ClsCircBrkt} % Stretchy Close Square Circle Bracket - \newcommand \ClsTortoiseS {\right\ClsTortoise} % Stretchy Close Tortoise Shell - \newcommand \ClsAnglS {\right\ClsAngl} % Stretchy Close Angle Bracket - \newcommand \ClsDblBracS {\right\ClsDblBrac} % Stretchy Close Double Curly Brace - \newcommand \ClsDblAnglS {\right\ClsDblAngl} % Stretchy Close Double Angle Bracket - \newcommand \ClsSqrParnS {\right\ClsSqrParn} % Stretchy Close Square Parenthesis - \newcommand \ClsParnBarS {\right\ClsParnBar} % Stretchy Close Parenthesis with Bar - \newcommand \ClsBracBarS {\right\ClsBracBar} % Stretchy Close Brace with Bar - \newcommand \ClsBrknBracBarS {\right\ClsBrknBracBar} % Stretchy Close Broken Brace with Bar - \newcommand \ClsCircBracBarS {\right\ClsCircBracBar} % Stretchy Close Circle Brace with Bar - \newcommand \ClsBrktBarS {\right\ClsBrktBar} % Stretchy Close Bracket with Bar - \newcommand \ClsCrlyBrktBarS {\right\ClsCrlyBrktBar} % Stretchy Close Curly Bracket with Bar - \newcommand \ClsBrknBrktBarS {\right\ClsBrknBrktBar} % Stretchy Close Broken Bracket with Bar - \newcommand \ClsCircBrktBarS {\right\ClsCircBrktBar} % Stretchy Close Circle Bracket with Bar - \newcommand \ClsTortoiseBarS {\right\ClsTortoiseBar} % Stretchy Close Tortoise Shell with Bar - \newcommand \ClsAnglBarS {\right\ClsAnglBar} % Stretchy Close Angle Bracket with Bar - \newcommand \ClsCurvAnglS {\right\ClsCurvAngl} % Stretchy Close Curved Angle Bracket - \newcommand \ClsDblParnS {\right\ClsDblParn} % Stretchy Close Double Parenthesis - \newcommand \ClsCeilS {\right\ClsCeil} % Stretchy Close Ceiling - \newcommand \ClsFloorS {\right\ClsFloor} % Stretchy Close Floor - \newcommand \ClsTurnS {\right\ClsTurn} % Stretchy Close Turnstile - \newcommand \ClsCntxS {\right\ClsCntx} % Stretchy Close Context Quote - \newcommand \ClsDblGrpS {\right\ClsDblGrp} % Stretchy Close Double Group Brace - \newcommand \ClsDblBarS {\right\ClsDblBar} % Stretchy Close Vertical Double Bar - - \newcommand \MapParInMul {\lgx{EAA0}} % Continuous, Partial, Into Multi-Map - \newcommand \MapParInSng {\lgx{EAA1}} % Continuous, Partial, Into, Singleton Map - \newcommand \MapParInOne {\lgx{EAA2}} % Continuous, Partial, Into, One-To-One Map - \newcommand \MapParOnMul {\lgx{EAA8}} % Continuous, Partial, Onto Multi-Map - \newcommand \MapParOnSng {\lgx{EAA9}} % Continuous, Partial, Onto, Singleton Map - \newcommand \MapParOnOne {\lgx{EAAA}} % Continuous, Partial, Onto, One-To-One Map - \newcommand \MapParInGndMul {\lgx{EAB0}} % Continuous, Partial, Into, Grounded Multi-Map - \newcommand \MapParInGndSng {\lgx{EAB1}} % Continuous, Partial, Into, Grounded, Singleton Map - \newcommand \MapParInGndOne {\lgx{EAB2}} % Continuous, Partial, Into, Grounded, One-To-One Map - \newcommand \MapParOnGndMul {\lgx{EAB8}} % Continuous, Partial, Onto, Grounded Multi-Map - \newcommand \MapParOnGndSng {\lgx{EAB9}} % Continuous, Partial, Onto, Grounded, Singleton Map - \newcommand \MapParOnGndOne {\lgx{EABA}} % Continuous, Partial, Onto, Grounded, One-To-One Map - - \newcommand \MapTotInMul {\lgx{EA80}} % Continuous, Total, Into Multi-Map - \newcommand \MapTotInSng {\lgx{EA81}} % Continuous, Total, Into, Singleton Map - \newcommand \MapTotInOne {\lgx{EA82}} % Continuous, Total, Into, One-To-One Map - \newcommand \MapTotOnMul {\lgx{EA88}} % Continuous, Total, Onto Multi-Map - \newcommand \MapTotOnSng {\lgx{EA89}} % Continuous, Total, Onto, Singleton Map - \newcommand \MapTotOnOne {\lgx{EA8A}} % Continuous, Total, Onto, One-To-One Map - \newcommand \MapTotInGndMul {\lgx{EA90}} % Continuous, Total, Into, Grounded Multi-Map - \newcommand \MapTotInGndSng {\lgx{EA91}} % Continuous, Total, Into, Grounded, Singleton Map - \newcommand \MapTotInGndOne {\lgx{EA92}} % Continuous, Total, Into, Grounded, One-To-One Map - \newcommand \MapTotOnGndMul {\lgx{EA98}} % Continuous, Total, Onto, Grounded Multi-Map - \newcommand \MapTotOnGndSng {\lgx{EA99}} % Continuous, Total, Onto, Grounded, Singleton Map - \newcommand \MapTotOnGndOne {\lgx{EA9A}} % Continuous, Total, Onto, Grounded, One-To-One Map - - \newcommand \FunParInMul {\lgx{EAA4}} % Continuous, Partial, Into Multi-Function - \newcommand \FunParInSng {\lgx{EAA5}} % Continuous, Partial, Into, Singleton Function - \newcommand \FunParInOne {\lgx{EAA6}} % Continuous, Partial, Into, One-To-One Function - \newcommand \FunParOnMul {\lgx{EAAC}} % Continuous, Partial, Onto Multi-Function - \newcommand \FunParOnSng {\lgx{EAAD}} % Continuous, Partial, Onto, Singleton Function - \newcommand \FunParOnOne {\lgx{EAAE}} % Continuous, Partial, Onto, One-To-One Function - \newcommand \FunParInGndMul {\lgx{EAB4}} % Continuous, Partial, Into, Grounded Multi-Function - \newcommand \FunParInGndSng {\lgx{EAB5}} % Continuous, Partial, Into, Grounded, Singleton Function - \newcommand \FunParInGndOne {\lgx{EAB6}} % Continuous, Partial, Into, Grounded, One-To-One Function - \newcommand \FunParOnGndMul {\lgx{EABC}} % Continuous, Partial, Onto, Grounded Multi-Function - \newcommand \FunParOnGndSng {\lgx{EABD}} % Continuous, Partial, Onto, Grounded, Singleton Function - \newcommand \FunParOnGndOne {\lgx{EABE}} % Continuous, Partial, Onto, Grounded, One-To-One Function - - \newcommand \FunTotInMul {\lgx{EA84}} % Continuous, Total, Into Multi-Function - \newcommand \FunTotInSng {\lgx{EA85}} % Continuous, Total, Into, Singleton Function - \newcommand \FunTotInOne {\lgx{EA86}} % Continuous, Total, Into, One-To-One Function - \newcommand \FunTotOnMul {\lgx{EA8C}} % Continuous, Total, Onto Multi-Function - \newcommand \FunTotOnSng {\lgx{EA8D}} % Continuous, Total, Onto, Singleton Function - \newcommand \FunTotOnOne {\lgx{EA8E}} % Continuous, Total, Onto, One-To-One Function - \newcommand \FunTotInGndMul {\lgx{EA94}} % Continuous, Total, Into, Grounded Multi-Function - \newcommand \FunTotInGndSng {\lgx{EA95}} % Continuous, Total, Into, Grounded, Singleton Function - \newcommand \FunTotInGndOne {\lgx{EA96}} % Continuous, Total, Into, Grounded, One-To-One Function - \newcommand \FunTotOnGndMul {\lgx{EA9C}} % Continuous, Total, Onto, Grounded Multi-Function - \newcommand \FunTotOnGndSng {\lgx{EA9D}} % Continuous, Total, Onto, Grounded, Singleton Function - \newcommand \FunTotOnGndOne {\lgx{EA9E}} % Continuous, Total, Onto, Grounded, One-To-One Function - - \newcommand \MapComp {\lgx{E23C}} % Map Composition - \newcommand \FncComp {\lgx{E239}} % Function Composition - \newcommand \FncCnvrs {\lgx{E2C3}} % Function Converse - - \newcommand \SFunc {\lgx{E9DC}} % Short Function - \newcommand \Func {\lgx{E9DD}} % Function - \newcommand \LFunc {\lgx{E9DE}} % Long Function - \newcommand \XFunc {\lgx{E9DF}} % Extra Long Function - - \newcommand \ClsImpl {\lgx{E79E}} % Classical Implication - \newcommand \NotClsImpl {\lgx{E79F}} % Not Classical Implication - \newcommand \ClsEquv {\lgx{E666}} % Classical Equivalence - \newcommand \NotClsEquv {\lgx{E667}} % Not Classical Equivalence - - \newcommand \SWkMtImpl {\lgx{E810}} % Short Weak Material Implication - \newcommand \NotSWkMtImpl {\lgx{E811}} % Short Not Weak Material Implication - \newcommand \SWkMtEquv {\lgx{E812}} % Short Weak Material Equivalence - \newcommand \NotSWkMtEquv {\lgx{E813}} % Short Not Weak Material Equivalence - \newcommand \WkMtImpl {\lgx{E814}} % Weak Material Implication - \newcommand \NotWkMtImpl {\lgx{E815}} % Not Weak Material Implication - \newcommand \WkMtEquv {\lgx{E816}} % Weak Material Equivalence - \newcommand \NotWkMtEquv {\lgx{E817}} % Not Weak Material Equivalence - \newcommand \LWkMtImpl {\lgx{E818}} % Long Weak Material Implication - \newcommand \NotLWkMtImpl {\lgx{E819}} % Long Not Weak Material Implication - \newcommand \LWkMtEquv {\lgx{E81A}} % Long Weak Material Equivalence - \newcommand \NotLWkMtEquv {\lgx{E81B}} % Long Not Weak Material Equivalence - \newcommand \XWkMtImpl {\lgx{E81C}} % Extra Long Weak Material Implication - \newcommand \NotXWkMtImpl {\lgx{E81D}} % Extra Long Not Weak Material Implication - \newcommand \XWkMtEquv {\lgx{E81E}} % Extra Long Weak Material Equivalence - \newcommand \NotXWkMtEquv {\lgx{E81F}} % Extra Long Not Weak Material Equivalence - - \newcommand \SMtImpl {\lgx{E820}} % Short WMaterial Implication - \newcommand \NotSMtImpl {\lgx{E821}} % Short NNot Material Implication - \newcommand \SMtEquv {\lgx{E822}} % Short WMaterial Equivalence - \newcommand \NotSMtEquv {\lgx{E823}} % Short NNot Material Equivalence - \newcommand \MtImpl {\lgx{E824}} % Material Implication - \newcommand \NotMtImpl {\lgx{E825}} % Not Material Implication - \newcommand \MtEquv {\lgx{E826}} % Material Equivalence - \newcommand \NotMtEquv {\lgx{E827}} % Not Material Equivalence - \newcommand \LMtImpl {\lgx{E828}} % Long Material Implication - \newcommand \NotLMtImpl {\lgx{E829}} % Long Not Material Implication - \newcommand \LMtEquv {\lgx{E82A}} % Long Material Equivalence - \newcommand \NotLMtEquv {\lgx{E82B}} % Long Not Material Equivalence - \newcommand \XMtImpl {\lgx{E82C}} % Extra Long Material Implication - \newcommand \NotXMtImpl {\lgx{E82D}} % Extra Long Not Material Implication - \newcommand \XMtEquv {\lgx{E82E}} % Extra Long Material Equivalence - \newcommand \NotXMtEquv {\lgx{E82F}} % Extra Long Not Material Equivalence - - \newcommand \SInImpl {\lgx{E830}} % Short WIntuitionistic Implication - \newcommand \NotSInImpl {\lgx{E831}} % Short NNot Intuitionistic Implication - \newcommand \SInEquv {\lgx{E832}} % Short WIntuitionistic Equivalence - \newcommand \NotSInEquv {\lgx{E833}} % Short NNot Intuitionistic Equivalence - \newcommand \InImpl {\lgx{E834}} % Intuitionistic Implication - \newcommand \NotInImpl {\lgx{E835}} % Not Intuitionistic Implication - \newcommand \InEquv {\lgx{E836}} % Intuitionistic Equivalence - \newcommand \NotInEquv {\lgx{E837}} % Not Intuitionistic Equivalence - \newcommand \LInImpl {\lgx{E838}} % Long Intuitionistic Implication - \newcommand \NotLInImpl {\lgx{E839}} % Long Not Intuitionistic Implication - \newcommand \LInEquv {\lgx{E83A}} % Long Intuitionistic Equivalence - \newcommand \NotLInEquv {\lgx{E83B}} % Long Not Intuitionistic Equivalence - \newcommand \XInImpl {\lgx{E83C}} % Extra Long Intuitionistic Implication - \newcommand \NotXInImpl {\lgx{E83D}} % Extra Long Not Intuitionistic Implication - \newcommand \XInEquv {\lgx{E83E}} % Extra Long Intuitionistic Equivalence - \newcommand \NotXInEquv {\lgx{E83F}} % Extra Long Not Intuitionistic Equivalence - - \newcommand \SWkImpl {\lgx{E840}} % Short WWeak Implication - \newcommand \NotSWkImpl {\lgx{E841}} % Short NNot Weak Implication - \newcommand \SWkEquv {\lgx{E842}} % Short WWeak Implication Equivalence - \newcommand \NotSWkEquv {\lgx{E843}} % Short NNot Weak Implication Equivalence - \newcommand \WkImpl {\lgx{E844}} % Weak Implication - \newcommand \NotWkImpl {\lgx{E845}} % Not Weak Implication - \newcommand \WkEquv {\lgx{E846}} % Weak Implication Equivalence - \newcommand \NotWkEquv {\lgx{E847}} % Not Weak Implication Equivalence - \newcommand \LWkImpl {\lgx{E848}} % Long Weak Implication - \newcommand \NotLWkImpl {\lgx{E849}} % Long Not Weak Implication - \newcommand \LWkEquv {\lgx{E84A}} % Long Weak Implication Equivalence - \newcommand \NotLWkEquv {\lgx{E84B}} % Long Not Weak Implication Equivalence - \newcommand \XWkImpl {\lgx{E84C}} % Extra Long Weak Implication - \newcommand \NotXWkImpl {\lgx{E84D}} % Extra Long Not Weak Implication - \newcommand \XWkEquv {\lgx{E84E}} % Extra Long Weak Implication Equivalence - \newcommand \NotXWkEquv {\lgx{E84F}} % Extra Long Not Weak Implication Equivalence - - \newcommand \SImpl {\lgx{E850}} % Short WImplication - \newcommand \NotSImpl {\lgx{E851}} % Short NNot Implication - \newcommand \SEquv {\lgx{E852}} % Short WImplication Equivalence - \newcommand \NotSEquv {\lgx{E853}} % Short NNot Implication Equivalence - \newcommand \Impl {\lgx{E854}} % Implication - \newcommand \NotImpl {\lgx{E855}} % Not Implication - \newcommand \Equv {\lgx{E856}} % Implication Equivalence - \newcommand \NotEquv {\lgx{E857}} % Not Implication Equivalence - \newcommand \LImpl {\lgx{E858}} % Long Implication - \newcommand \NotLImpl {\lgx{E859}} % Long Not Implication - \newcommand \LEquv {\lgx{E85A}} % Long Implication Equivalence - \newcommand \NotLEquv {\lgx{E85B}} % Long Not Implication Equivalence - \newcommand \XImpl {\lgx{E85C}} % Extra Long Implication - \newcommand \NotXImpl {\lgx{E85D}} % Extra Long Not Implication - \newcommand \XEquv {\lgx{E85E}} % Extra Long Implication Equivalence - \newcommand \NotXEquv {\lgx{E85F}} % Extra Long Not Implication Equivalence - - \newcommand \SWkEntail {\lgx{E860}} % Short WWeak Entailment - \newcommand \NotSWkEntail {\lgx{E861}} % Short NNot Weak Entailment - \newcommand \SWkEntailEquv {\lgx{E862}} % Short WWeak Entailment Equivalence - \newcommand \NotSWkEntailEquv {\lgx{E863}} % Short NNot Weak Entailment Equivalence - \newcommand \WkEntail {\lgx{E864}} % Weak Entailment - \newcommand \NotWkEntail {\lgx{E865}} % Not Weak Entailment - \newcommand \WkEntailEquv {\lgx{E866}} % Weak Entailment Equivalence - \newcommand \NotWkEntailEquv {\lgx{E867}} % Not Weak Entailment Equivalence - \newcommand \LWkEntail {\lgx{E868}} % Long Weak Entailment - \newcommand \NotLWkEntail {\lgx{E869}} % Long Not Weak Entailment - \newcommand \LWkEntailEquv {\lgx{E86A}} % Long Weak Entailment Equivalence - \newcommand \NotLWkEntailEquv {\lgx{E86B}} % Long Not Weak Entailment Equivalence - \newcommand \XWkEntail {\lgx{E86C}} % Extra Long Weak Entailment - \newcommand \NotXWkEntail {\lgx{E86D}} % Extra Long Not Weak Entailment - \newcommand \XWkEntailEquv {\lgx{E86E}} % Extra Long Weak Entailment Equivalence - \newcommand \NotXWkEntailEquv {\lgx{E86F}} % Extra Long Not Weak Entailment Equivalence - - \newcommand \SEntail {\lgx{E870}} % Short WEntailment - \newcommand \NotSEntail {\lgx{E871}} % Short NNot Entailment - \newcommand \SEntailEquv {\lgx{E872}} % Short WEntailment Equivalence - \newcommand \NotSEntailEquv {\lgx{E873}} % Short NNot Entailment Equivalence - \newcommand \Entail {\lgx{E874}} % Entailment - \newcommand \NotEntail {\lgx{E875}} % Not Entailment - \newcommand \EntailEquv {\lgx{E876}} % Entailment Equivalence - \newcommand \NotEntailEquv {\lgx{E877}} % Not Entailment Equivalence - \newcommand \LEntail {\lgx{E878}} % Long Entailment - \newcommand \NotLEntail {\lgx{E879}} % Long Not Entailment - \newcommand \LEntailEquv {\lgx{E87A}} % Long Entailment Equivalence - \newcommand \NotLEntailEquv {\lgx{E87B}} % Long Not Entailment Equivalence - \newcommand \XEntail {\lgx{E87C}} % Extra Long Entailment - \newcommand \NotXEntail {\lgx{E87D}} % Extra Long Not Entailment - \newcommand \XEntailEquv {\lgx{E87E}} % Extra Long Entailment Equivalence - \newcommand \NotXEntailEquv {\lgx{E87F}} % Extra Long Not Entailment Equivalence - - \newcommand \Seq {\lgx{E94C}} % Sequent - \newcommand \NotSeq {\lgx{E96C}} % Sequent Denied - \newcommand \Rule {\lgx{E940}} % Assertion (Rule) - \newcommand \NotRule {\lgx{E960}} % Assertion (Rule) Denied - \newcommand \Model {\lgx{E942}} % Model - \newcommand \NotModel {\lgx{E962}} % Model Denied - \newcommand \Turn {\lgx{E944}} % Turnstile - \newcommand \NotTurn {\lgx{E964}} % Turnstile Denied - \newcommand \Conseq {\lgx{E946}} % Consequence Relation - \newcommand \NotConseq {\lgx{E966}} % Consequence Relation Denied - - \newcommand \Defn {\lgx{E60A}} % Defines - \newcommand \Qed {\lgx{E08F}} % Q.E.D. - - \newcommand \Nd {\lgx{E6A0}} % Bitwise AND operator / Logical Conjunction - \newcommand \Or {\lgx{E6A1}} % Bitwise OR operator / Logical Disjunction - \newcommand \Nt {\lgx{E0C0}} % Bitwise NOT operator / Logical Negation - \newcommand \Ng {\lgx{E64C}} % Classical Logical Negation - \newcommand \Nand {\lgx{E6A2}} % Bitwise NAND operator - \newcommand \Nor {\lgx{E6A3}} % Bitwise NOR operator - \newcommand \Xor {\lgx{E6A5}} % Bitwise XOR operator - - \newcommand \LcgCohrnc {\lgx{E068}} % Logical Coherence - \newcommand \BncCohrnc {\lgx{E078}} % Bunch Coherence - - \newcommand \True {\lgx{E012}} % True - \newcommand \False {\lgx{E014}} % False - \newcommand \Top {\lgx{E017}} % Lattice / type top - \newcommand \Bot {\lgx{E016}} % Lattice / type bottom - - \newcommand \QuantCon {\lgx{E891}} % Quantified Conjunction - \newcommand \QuantDis {\lgx{E890}} % Quantified Disjuntion - \newcommand \ForAll {\lgx{E8C0}} % Universal Individual Quantifier - \newcommand \Exists {\lgx{E8C1}} % Existential Individual Quantifier - \newcommand \Unique {\lgx{E8C2}} % Unique Existential Individual Quantifier - \newcommand \BnchForAll {\lgx{E8D0}} % Universal Bunch Quantifier - \newcommand \BnchExists {\lgx{E8D1}} % Existential Bunch Quantifier - \newcommand \BnchUnique {\lgx{E8D2}} % Unique Existential Bunch Quantifier - \newcommand \BndMap {\lgx{E030}} % Map Abstraction - - \newcommand \Dt {\lgx{E098}} % Dot - \newcommand \Comma {\lgx{E099}} % Comma - \newcommand \Semicln {\lgx{E09A}} % Semicolon - \newcommand \Cln {\lgx{E091}} % Colon - \newcommand \Thus {\lgx{E092}} % Thus - \newcommand \Since {\lgx{E093}} % Since - \newcommand \Dts {\lgx{E096}} % Dots (ellipsis) - \newcommand \BndDot {\lgx{E090}} % Binding Dot - \newcommand \BndBar {\lgm{E380}} % Binding Bar - \newcommand \BndBarS {\middle\BndBar} % Stretchy Binding Bar - \newcommand \LngVrtBar {\lgx{E0EC}} % Long Vertical Bar - \newcommand \Queston {\lgx{E02C}} % Question mark - \newcommand \Exclaim {\lgx{E02D}} % Exclamation point - \newcommand \Percent {\lgx{E03C}} % Percent sign - \newcommand \Ampersand {\lgx{E03D}} % Ampersand - \newcommand \Dollar {\lgx{E05F}} % Dollar sign - \newcommand \At {\lgx{E03E}} % At sign - \newcommand \Circumflex {\lgx{E03F}} % ASCII Circumflex - \newcommand \Number {\lgx{E04F}} % Number sign - \newcommand \Underscore {\lgx{E09E}} % Underscore - \newcommand \Tild {\lgx{007E}} % Tilde E64C - \newcommand \SingleQuote {\lgx{E09C}} % Single quote - \newcommand \DoubleQuote {\lgx{E09B}} % Double quote - \newcommand \BackQuote {\lgx{E09D}} % Back quote (grave) - \newcommand \LeftSlash {\lgx{E103}} % Left (back) slash - \newcommand \RightSlash {\lgx{E102}} % Right (forward) slash - - \newcommand \ShftSuper {\lgx{EAC3}} % Shift for superscripts - \newcommand \ShftSubscr {\lgx{EAC4}} % Shift for subscripts - \newcommand \ShftAccent {\lgx{EAC5}} % Shift for accents - - \newcommand \RplcAllBndRight {\lgx{E9D4}} % Replace All Bound Variables (right) - \newcommand \RplcAllBndLeft {\lgx{E9D5}} % Replace All Bound Variables (left) - \newcommand \RplcAllRight {\lgx{E9DA}} % Replace All (right) - \newcommand \RplcAllLeft {\lgx{E9DB}} % Replace All (left) - \newcommand \RplcFreeRight {\lgx{E9F0}} % Replace Any Free Variables (right) - \newcommand \RplcFreeLeft {\lgx{E9F1}} % Replace Any Free Variables (left) - \newcommand \RplcEquvRight {\lgx{E9F8}} % Replace Equivalent Expressions (right) - \newcommand \RplcEquvLeft {\lgx{E9F9}} % Replace Equivalent Expressions (left) - - \newcommand \LstFix {\lgx{E031}} % Least Fixed Point - \newcommand \GrtFix {\lgx{E032}} % Greatest Fixed Point - \newcommand \Choice {\lgx{E033}} % Choice - \newcommand \ExLstFix {\lgx{E034}} % Extended Least Fixed Point - \newcommand \ExGrtFix {\lgx{E035}} % Extended Greatest Fixed Point - \newcommand \FrstOrd {\lgx{E039}} % First Ordinal (omega) - - \newcommand \LogNec {\lgx{E230}} % Logical Necessity (temporal always or henceforth) - \newcommand \LogPos {\lgx{E232}} % Logical Possibility (temporal sometime or eventually) - \newcommand \LogNext {\lgx{E233}} % Logical Next (temporal next or nexttime) - \newcommand \LogFutr {\lgx{E234}} % Logical Future (temporal in the future) - \newcommand \LogPast {\lgx{E235}} % Logical Past (temporal in the past) - \newcommand \LogCont {\lgx{E236}} % Logical Contingency - \newcommand \LogNonCont {\lgx{E237}} % Logical Non-contingency - - \newcommand \Nec {\lgx{E270}} % Necessity (temporal always or henceforth) - \newcommand \Pos {\lgx{E272}} % Possibility (temporal sometime or eventually) - \newcommand \Next {\lgx{E273}} % Next (temporal next or nexttime) - \newcommand \Futr {\lgx{E274}} % Future (temporal in the future) - \newcommand \Past {\lgx{E275}} % Past (temporal in the past) - \newcommand \Cont {\lgx{E276}} % Contingency - \newcommand \NonCont {\lgx{E277}} % Non-contingency - - \newcommand \FacNec {\lgx{E220}} % Factual Necessity (temporal always or henceforth) - \newcommand \FacPos {\lgx{E222}} % Factual Possibility (temporal sometime or eventually) - \newcommand \FacNext {\lgx{E223}} % Factual Next (temporal next or nexttime) - \newcommand \FacFutr {\lgx{E224}} % Factual Future (temporal in the future) - \newcommand \FacPast {\lgx{E225}} % Factual Past (temporal in the past) - \newcommand \FacCont {\lgx{E226}} % Factual Contingency - \newcommand \FacNonCont {\lgx{E227}} % Factual Non-contingency - - \newcommand \Of {\lgx{E600}} % Bunch Inclusion - \newcommand \In {\lgx{E602}} % Set Membership - \newcommand \NotIn {\lgx{E603}} % Set Membership Negated - - \newcommand \EmptyBunch {\lgx{E054}} % Empty Bunch - \newcommand \NullSet {\lgx{E053}} % Null Set - - \newcommand \BnchMeet {\lgx{E710}} % Bunch Meet - \newcommand \BnchJoin {\lgx{E711}} % Bunch Join - - \newcommand \StrctSbnch {\lgx{E718}} % Strict Subbunch - \newcommand \NotStrctSbnch {\lgx{E719}} % Strict Subbunch Negated - \newcommand \Sbnch {\lgx{E71A}} % Subbunch - \newcommand \NotSbnch {\lgx{E71B}} % Subbunch Negated - - \newcommand \StrctWkSbnch {\lgx{E738}} % Strict Weak Subbunch - \newcommand \NotStrctWkSbnch {\lgx{E739}} % Strict Weak Subbunch Negated - \newcommand \WkSbnch {\lgx{E73A}} % Weak Subbunch - \newcommand \NotWkSbnch {\lgx{E73B}} % Weak Subbunch Negated - - \newcommand \MapMeet {\lgx{E760}} % Map Meet - \newcommand \MapJoin {\lgx{E761}} % Map Join - - \newcommand \StrctSbmap {\lgx{E768}} % Strict Submap - \newcommand \NotStrctSbmap {\lgx{E769}} % Strict Submap Negated - \newcommand \Sbmap {\lgx{E76A}} % Submap - \newcommand \NotSbmap {\lgx{E76B}} % Submap Negated - - \newcommand \SetMeet {\lgx{E790}} % Set Intersection - \newcommand \SetJoin {\lgx{E791}} % Set Union - \newcommand \Normal {\lgx{E2E5}} % Normal Subgroup - \newcommand \SetSymDiff {\lgx{E2E7}} % Set Symmetric Difference - - \newcommand \StrctSbset {\lgx{E798}} % Strict Subset - \newcommand \NotStrctSbset {\lgx{E799}} % Strict Subset Negated - \newcommand \Sbset {\lgx{E79A}} % Subset - \newcommand \NotSbset {\lgx{E79B}} % Subset Negated - - \newcommand \QuantBnchMeet {\lgx{E895}} % Bunch Meet Quantifier - \newcommand \QuantBnchJoin {\lgx{E894}} % Bunch Join Quantifier - \newcommand \QuantSetMeet {\lgx{E893}} % Set Intersection Quantifier - \newcommand \QuantSetJoin {\lgx{E892}} % Set Union Quantifier - - \newcommand \Ls {\lgx{E6A8}} % Less Than - \newcommand \Lse {\lgx{E6AA}} % Less Than or Equal - \newcommand \Eq {\lgx{E656}} % Equal - \newcommand \Sm {\lgx{E658}} % Similar - \newcommand \Gr {\lgx{E6AE}} % Greater Than - \newcommand \Gre {\lgx{E6AC}} % Greater Than or Equal - - \newcommand \NotLs {\lgx{E6A9}} % Not Less Than - \newcommand \NotLse {\lgx{E6AB}} % Not Less Than or Equal - \newcommand \NotEq {\lgx{E657}} % Not Equal - \newcommand \NotSm {\lgx{E659}} % Not Similar - \newcommand \NotGr {\lgx{E6AF}} % Not Greater Than - \newcommand \NotGre {\lgx{E6AD}} % Not Greater Than or Equal - - \newcommand \Pre {\lgx{E6C8}} % Precedes - \newcommand \Preq {\lgx{E6CA}} % Precedes or Equal - \newcommand \Suc {\lgx{E6CE}} % Succeeds - \newcommand \Sucq {\lgx{E6CC}} % Succeeds or Equal - - \newcommand \NotPre {\lgx{E6C9}} % Not Precedes - \newcommand \NotPreq {\lgx{E6CB}} % Not Precedes or Equal - \newcommand \NotSuc {\lgx{E6CF}} % Not Succeeds - \newcommand \NotSucq {\lgx{E6CD}} % Not Succeeds or Equal - - \newcommand \Minus {\lgx{E0C7}} % Minus - \newcommand \Plus {\lgx{E0C6}} % Plus - \newcommand \PlusMinus {\lgx{E0CE}} % Plus / Minus - \newcommand \MinusPlus {\lgx{E0CF}} % Minus / Plus - \newcommand \Asterick {\lgx{E0C4}} % Asterick - \newcommand \Divide {\lgx{E103}} % Divide - \newcommand \Times {\lgx{E0C5}} % Times - - \newcommand \Append {\lgx{E0CB}} % Append - \newcommand \Concat {\lgx{E0CD}} % Concatenation - - \newcommand \CircPlus {\lgx{E12B}} % Large Circled Plus - \newcommand \CircTimes {\lgx{E12C}} % Large Circled Times - \newcommand \CircStar {\lgx{E11D}} % Circled Star - - \newcommand \Dagger {\lgx{E05B}} % Single dagger - \newcommand \Ddagger {\lgx{E05C}} % Double horizontal dagger - \newcommand \Daggerr {\lgx{E05D}} % Double vertical dagger - \newcommand \Ddaggerr {\lgx{E05E}} % Double horizontal and vertical dagger + \newcommand \OpnBar {\lgl{E300}\relax} % Open Vertical Bar + \newcommand \OpnGrp {\lgl{E301}\relax} % Open Group Brace + \newcommand \OpnParn {\lgl{E302}\relax} % Open Parenthesis + \newcommand \OpnBrac {\lgl{E303}\relax} % Open Curly Brace + \newcommand \OpnBrknBrac {\lgl{E304}\relax} % Open Curly Broken Brace + \newcommand \OpnCircBrac {\lgl{E305}\relax} % Open Curly Circle Brace + \newcommand \OpnArrwBrac {\lgl{E306}\relax} % Open Arrow Brace + \newcommand \OpnBrkt {\lgl{E307}\relax} % Open Square Bracket + \newcommand \OpnCrlyBrkt {\lgl{E308}\relax} % Open Square Curly Bracket + \newcommand \OpnBrknBrkt {\lgl{E309}\relax} % Open Square Broken Bracket + \newcommand \OpnCircBrkt {\lgl{E30A}\relax} % Open Square Circle Bracket + \newcommand \OpnTortoise {\lgl{E30B}\relax} % Open Tortoise Shell + \newcommand \OpnAngl {\lgl{E30C}\relax} % Open Angle Bracket + \newcommand \OpnDblBrac {\lgl{E30D}\relax} % Open Double Curly Brace + \newcommand \OpnDblAngl {\lgl{E30E}\relax} % Open Double Angle Bracket + \newcommand \OpnSqrParn {\lgl{E30F}\relax} % Open Square Parenthesis + \newcommand \OpnParnBar {\lgl{E310}\relax} % Open Parenthesis with Bar + \newcommand \OpnBracBar {\lgl{E311}\relax} % Open Brace with Bar + \newcommand \OpnBrknBracBar {\lgl{E312}\relax} % Open Broken Brace with Bar + \newcommand \OpnCircBracBar {\lgl{E313}\relax} % Open Circle Brace with Bar + \newcommand \OpnBrktBar {\lgl{E314}\relax} % Open Bracket with Bar + \newcommand \OpnCrlyBrktBar {\lgl{E315}\relax} % Open Curly Bracket with Bar + \newcommand \OpnBrknBrktBar {\lgl{E316}\relax} % Open Broken Bracket with Bar + \newcommand \OpnCircBrktBar {\lgl{E317}\relax} % Open Circle Bracket with Bar + \newcommand \OpnTortoiseBar {\lgl{E318}\relax} % Open Tortoise Shell with Bar + \newcommand \OpnAnglBar {\lgl{E319}\relax} % Open Angle Bracket with Bar + \newcommand \OpnCurvAngl {\lgl{E31A}\relax} % Open Curved Angle Bracket + \newcommand \OpnDblParn {\lgl{E31B}\relax} % Open Double Parenthesis + \newcommand \OpnCeil {\lgl{E31C}\relax} % Open Ceiling + \newcommand \OpnFloor {\lgl{E31D}\relax} % Open Floor + \newcommand \OpnTurn {\lgl{E31E}\relax} % Open Turnstile + \newcommand \OpnCntx {\lgx{E31F}\relax} % Open Context Quote + \newcommand \OpnDblGrp {\lgl{E320}\relax} % Open Double Group Brace + \newcommand \OpnDblBar {\lgl{E321}\relax} % Open Double Vertical Bar + + \newcommand \OpnBarS {\left\OpnBar\relax} % Stretchy Open Vertical Bar + \newcommand \OpnGrpS {\left\OpnGrp\relax} % Stretchy Open Group Brace + \newcommand \OpnParnS {\left\OpnParn\relax} % Stretchy Open Parenthesis + \newcommand \OpnBracS {\left\OpnBrac\relax} % Stretchy Open Curly Brace + \newcommand \OpnBrknBracS {\left\OpnBrknBrac\relax} % Stretchy Open Curly Broken Brace + \newcommand \OpnCircBracS {\left\OpnCircBrac\relax} % Stretchy Open Curly Circle Brace + \newcommand \OpnArrwBracS {\left\OpnArrwBrac\relax} % Stretchy Open Arrow Brace + \newcommand \OpnBrktS {\left\OpnBrkt\relax} % Stretchy Open Square Bracket + \newcommand \OpnCrlyBrktS {\left\OpnCrlyBrkt\relax} % Stretchy Open Square Curly Bracket + \newcommand \OpnBrknBrktS {\left\OpnBrknBrkt\relax} % Stretchy Open Square Broken Bracket + \newcommand \OpnCircBrktS {\left\OpnCircBrkt\relax} % Stretchy Open Square Circle Bracket + \newcommand \OpnTortoiseS {\left\OpnTortoise\relax} % Stretchy Open Tortoise Shell + \newcommand \OpnAnglS {\left\OpnAngl\relax} % Stretchy Open Angle Bracket + \newcommand \OpnDblBracS {\left\OpnDblBrac\relax} % Stretchy Open Double Curly Brace + \newcommand \OpnDblAnglS {\left\OpnDblAngl\relax} % Stretchy Open Double Angle Bracket + \newcommand \OpnSqrParnS {\left\OpnSqrParn\relax} % Stretchy Open Square Parenthesis + \newcommand \OpnParnBarS {\left\OpnParnBar\relax} % Stretchy Open Parenthesis with Bar + \newcommand \OpnBracBarS {\left\OpnBracBar\relax} % Stretchy Open Brace with Bar + \newcommand \OpnBrknBracBarS {\left\OpnBrknBracBar\relax} % Stretchy Open Broken Brace with Bar + \newcommand \OpnCircBracBarS {\left\OpnCircBracBar\relax} % Stretchy Open Circle Brace with Bar + \newcommand \OpnBrktBarS {\left\OpnBrktBar\relax} % Stretchy Open Bracket with Bar + \newcommand \OpnCrlyBrktBarS {\left\OpnCrlyBrktBar\relax} % Stretchy Open Curly Bracket with Bar + \newcommand \OpnBrknBrktBarS {\left\OpnBrknBrktBar\relax} % Stretchy Open Broken Bracket with Bar + \newcommand \OpnCircBrktBarS {\left\OpnCircBrktBar\relax} % Stretchy Open Circle Bracket with Bar + \newcommand \OpnTortoiseBarS {\left\OpnTortoiseBar\relax} % Stretchy Open Tortoise Shell with Bar + \newcommand \OpnAnglBarS {\left\OpnAnglBar\relax} % Stretchy Open Angle Bracket with Bar + \newcommand \OpnCurvAnglS {\left\OpnCurvAngl\relax} % Stretchy Open Curved Angle Bracket + \newcommand \OpnDblParnS {\left\OpnDblParn\relax} % Stretchy Open Double Parenthesis + \newcommand \OpnCeilS {\left\OpnCeil\relax} % Stretchy Open Ceiling + \newcommand \OpnFloorS {\left\OpnFloor\relax} % Stretchy Open Floor + \newcommand \OpnTurnS {\left\OpnTurn\relax} % Stretchy Open Turnstile + \newcommand \OpnCntxS {\left\OpnCntx\relax} % Stretchy Open Context Quote + \newcommand \OpnDblGrpS {\left\OpnDblGrp\relax} % Stretchy Open Double Group Brace + \newcommand \OpnDblBarS {\left\OpnDblBar\relax} % Stretchy Open Double Vertical Bar + + \newcommand \ClsBar {\lgr{E340}\relax} % Close Bar + \newcommand \ClsGrp {\lgr{E341}\relax} % Close Group Brace + \newcommand \ClsParn {\lgr{E342}\relax} % Close Parenthesis + \newcommand \ClsBrac {\lgr{E343}\relax} % Close Curly Brace + \newcommand \ClsBrknBrac {\lgr{E344}\relax} % Close Curly Broken Brace + \newcommand \ClsCircBrac {\lgr{E345}\relax} % Close Curly Circle Brace + \newcommand \ClsArrwBrac {\lgr{E346}\relax} % Close Arrow Brace + \newcommand \ClsBrkt {\lgr{E347}\relax} % Close Square Bracket + \newcommand \ClsCrlyBrkt {\lgr{E348}\relax} % Close Square Curly Bracket + \newcommand \ClsBrknBrkt {\lgr{E349}\relax} % Close Square Broken Bracket + \newcommand \ClsCircBrkt {\lgr{E34A}\relax} % Close Square Circle Bracket + \newcommand \ClsTortoise {\lgr{E34B}\relax} % Close Tortoise Shell + \newcommand \ClsAngl {\lgr{E34C}\relax} % Close Angle Bracket + \newcommand \ClsDblBrac {\lgr{E34D}\relax} % Close Double Curly Brace + \newcommand \ClsDblAngl {\lgr{E34E}\relax} % Close Double Angle Bracket + \newcommand \ClsSqrParn {\lgr{E34F}\relax} % Close Square Parenthesis + \newcommand \ClsParnBar {\lgr{E350}\relax} % Close Parenthesis with Bar + \newcommand \ClsBracBar {\lgr{E351}\relax} % Close Brace with Bar + \newcommand \ClsBrknBracBar {\lgr{E352}\relax} % Close Broken Brace with Bar + \newcommand \ClsCircBracBar {\lgr{E353}\relax} % Close Circle Brace with Bar + \newcommand \ClsBrktBar {\lgr{E354}\relax} % Close Bracket with Bar + \newcommand \ClsCrlyBrktBar {\lgr{E355}\relax} % Close Curly Bracket with Bar + \newcommand \ClsBrknBrktBar {\lgr{E356}\relax} % Close Broken Bracket with Bar + \newcommand \ClsCircBrktBar {\lgr{E357}\relax} % Close Circle Bracket with Bar + \newcommand \ClsTortoiseBar {\lgr{E358}\relax} % Close Tortoise Shell with Bar + \newcommand \ClsAnglBar {\lgr{E359}\relax} % Close Angle Bracket with Bar + \newcommand \ClsCurvAngl {\lgr{E35A}\relax} % Close Curved Angle Bracket + \newcommand \ClsDblParn {\lgl{E35B}\relax} % Close Double Parenthesis + \newcommand \ClsCeil {\lgr{E35C}\relax} % Close Ceiling + \newcommand \ClsFloor {\lgr{E35D}\relax} % Close Floor + \newcommand \ClsTurn {\lgr{E35E}\relax} % Close Turnstile + \newcommand \ClsCntx {\lgx{E35F}\relax} % Close Context Quote + \newcommand \ClsDblGrp {\lgr{E360}\relax} % Close Double Group Brace + \newcommand \ClsDblBar {\lgr{E361}\relax} % Close Double Vertical Bar + + \newcommand \ClsBarS {\right\ClsBar\relax} % Stretchy Close Bar + \newcommand \ClsGrpS {\right\ClsGrp\relax} % Stretchy Close Group Brace + \newcommand \ClsParnS {\right\ClsParn\relax} % Stretchy Close Parenthesis + \newcommand \ClsBracS {\right\ClsBrac\relax} % Stretchy Close Curly Brace + \newcommand \ClsBrknBracS {\right\ClsBrknBrac\relax} % Stretchy Close Curly Broken Brace + \newcommand \ClsCircBracS {\right\ClsCircBrac\relax} % Stretchy Close Curly Circle Brace + \newcommand \ClsArrwBracS {\right\ClsArrwBrac\relax} % Stretchy Close Arrow Brace + \newcommand \ClsBrktS {\right\ClsBrkt\relax} % Stretchy Close Square Bracket + \newcommand \ClsCrlyBrktS {\right\ClsCrlyBrkt\relax} % Stretchy Close Square Curly Bracket + \newcommand \ClsBrknBrktS {\right\ClsBrknBrkt\relax} % Stretchy Close Square Broken Bracket + \newcommand \ClsCircBrktS {\right\ClsCircBrkt\relax} % Stretchy Close Square Circle Bracket + \newcommand \ClsTortoiseS {\right\ClsTortoise\relax} % Stretchy Close Tortoise Shell + \newcommand \ClsAnglS {\right\ClsAngl\relax} % Stretchy Close Angle Bracket + \newcommand \ClsDblBracS {\right\ClsDblBrac\relax} % Stretchy Close Double Curly Brace + \newcommand \ClsDblAnglS {\right\ClsDblAngl\relax} % Stretchy Close Double Angle Bracket + \newcommand \ClsSqrParnS {\right\ClsSqrParn\relax} % Stretchy Close Square Parenthesis + \newcommand \ClsParnBarS {\right\ClsParnBar\relax} % Stretchy Close Parenthesis with Bar + \newcommand \ClsBracBarS {\right\ClsBracBar\relax} % Stretchy Close Brace with Bar + \newcommand \ClsBrknBracBarS {\right\ClsBrknBracBar\relax} % Stretchy Close Broken Brace with Bar + \newcommand \ClsCircBracBarS {\right\ClsCircBracBar\relax} % Stretchy Close Circle Brace with Bar + \newcommand \ClsBrktBarS {\right\ClsBrktBar\relax} % Stretchy Close Bracket with Bar + \newcommand \ClsCrlyBrktBarS {\right\ClsCrlyBrktBar\relax} % Stretchy Close Curly Bracket with Bar + \newcommand \ClsBrknBrktBarS {\right\ClsBrknBrktBar\relax} % Stretchy Close Broken Bracket with Bar + \newcommand \ClsCircBrktBarS {\right\ClsCircBrktBar\relax} % Stretchy Close Circle Bracket with Bar + \newcommand \ClsTortoiseBarS {\right\ClsTortoiseBar\relax} % Stretchy Close Tortoise Shell with Bar + \newcommand \ClsAnglBarS {\right\ClsAnglBar\relax} % Stretchy Close Angle Bracket with Bar + \newcommand \ClsCurvAnglS {\right\ClsCurvAngl\relax} % Stretchy Close Curved Angle Bracket + \newcommand \ClsDblParnS {\right\ClsDblParn\relax} % Stretchy Close Double Parenthesis + \newcommand \ClsCeilS {\right\ClsCeil\relax} % Stretchy Close Ceiling + \newcommand \ClsFloorS {\right\ClsFloor\relax} % Stretchy Close Floor + \newcommand \ClsTurnS {\right\ClsTurn\relax} % Stretchy Close Turnstile + \newcommand \ClsCntxS {\right\ClsCntx\relax} % Stretchy Close Context Quote + \newcommand \ClsDblGrpS {\right\ClsDblGrp\relax} % Stretchy Close Double Group Brace + \newcommand \ClsDblBarS {\right\ClsDblBar\relax} % Stretchy Close Vertical Double Bar + + \newcommand \MapParInMul {\lgx{EAA0}\relax} % Continuous, Partial, Into Multi-Map + \newcommand \MapParInSng {\lgx{EAA1}\relax} % Continuous, Partial, Into, Singleton Map + \newcommand \MapParInOne {\lgx{EAA2}\relax} % Continuous, Partial, Into, One-To-One Map + \newcommand \MapParOnMul {\lgx{EAA8}\relax} % Continuous, Partial, Onto Multi-Map + \newcommand \MapParOnSng {\lgx{EAA9}\relax} % Continuous, Partial, Onto, Singleton Map + \newcommand \MapParOnOne {\lgx{EAAA}\relax} % Continuous, Partial, Onto, One-To-One Map + \newcommand \MapParInGndMul {\lgx{EAB0}\relax} % Continuous, Partial, Into, Grounded Multi-Map + \newcommand \MapParInGndSng {\lgx{EAB1}\relax} % Continuous, Partial, Into, Grounded, Singleton Map + \newcommand \MapParInGndOne {\lgx{EAB2}\relax} % Continuous, Partial, Into, Grounded, One-To-One Map + \newcommand \MapParOnGndMul {\lgx{EAB8}\relax} % Continuous, Partial, Onto, Grounded Multi-Map + \newcommand \MapParOnGndSng {\lgx{EAB9}\relax} % Continuous, Partial, Onto, Grounded, Singleton Map + \newcommand \MapParOnGndOne {\lgx{EABA}\relax} % Continuous, Partial, Onto, Grounded, One-To-One Map + + \newcommand \MapTotInMul {\lgx{EA80}\relax} % Continuous, Total, Into Multi-Map + \newcommand \MapTotInSng {\lgx{EA81}\relax} % Continuous, Total, Into, Singleton Map + \newcommand \MapTotInOne {\lgx{EA82}\relax} % Continuous, Total, Into, One-To-One Map + \newcommand \MapTotOnMul {\lgx{EA88}\relax} % Continuous, Total, Onto Multi-Map + \newcommand \MapTotOnSng {\lgx{EA89}\relax} % Continuous, Total, Onto, Singleton Map + \newcommand \MapTotOnOne {\lgx{EA8A}\relax} % Continuous, Total, Onto, One-To-One Map + \newcommand \MapTotInGndMul {\lgx{EA90}\relax} % Continuous, Total, Into, Grounded Multi-Map + \newcommand \MapTotInGndSng {\lgx{EA91}\relax} % Continuous, Total, Into, Grounded, Singleton Map + \newcommand \MapTotInGndOne {\lgx{EA92}\relax} % Continuous, Total, Into, Grounded, One-To-One Map + \newcommand \MapTotOnGndMul {\lgx{EA98}\relax} % Continuous, Total, Onto, Grounded Multi-Map + \newcommand \MapTotOnGndSng {\lgx{EA99}\relax} % Continuous, Total, Onto, Grounded, Singleton Map + \newcommand \MapTotOnGndOne {\lgx{EA9A}\relax} % Continuous, Total, Onto, Grounded, One-To-One Map + + \newcommand \FunParInMul {\lgx{EAA4}\relax} % Continuous, Partial, Into Multi-Function + \newcommand \FunParInSng {\lgx{EAA5}\relax} % Continuous, Partial, Into, Singleton Function + \newcommand \FunParInOne {\lgx{EAA6}\relax} % Continuous, Partial, Into, One-To-One Function + \newcommand \FunParOnMul {\lgx{EAAC}\relax} % Continuous, Partial, Onto Multi-Function + \newcommand \FunParOnSng {\lgx{EAAD}\relax} % Continuous, Partial, Onto, Singleton Function + \newcommand \FunParOnOne {\lgx{EAAE}\relax} % Continuous, Partial, Onto, One-To-One Function + \newcommand \FunParInGndMul {\lgx{EAB4}\relax} % Continuous, Partial, Into, Grounded Multi-Function + \newcommand \FunParInGndSng {\lgx{EAB5}\relax} % Continuous, Partial, Into, Grounded, Singleton Function + \newcommand \FunParInGndOne {\lgx{EAB6}\relax} % Continuous, Partial, Into, Grounded, One-To-One Function + \newcommand \FunParOnGndMul {\lgx{EABC}\relax} % Continuous, Partial, Onto, Grounded Multi-Function + \newcommand \FunParOnGndSng {\lgx{EABD}\relax} % Continuous, Partial, Onto, Grounded, Singleton Function + \newcommand \FunParOnGndOne {\lgx{EABE}\relax} % Continuous, Partial, Onto, Grounded, One-To-One Function + + \newcommand \FunTotInMul {\lgx{EA84}\relax} % Continuous, Total, Into Multi-Function + \newcommand \FunTotInSng {\lgx{EA85}\relax} % Continuous, Total, Into, Singleton Function + \newcommand \FunTotInOne {\lgx{EA86}\relax} % Continuous, Total, Into, One-To-One Function + \newcommand \FunTotOnMul {\lgx{EA8C}\relax} % Continuous, Total, Onto Multi-Function + \newcommand \FunTotOnSng {\lgx{EA8D}\relax} % Continuous, Total, Onto, Singleton Function + \newcommand \FunTotOnOne {\lgx{EA8E}\relax} % Continuous, Total, Onto, One-To-One Function + \newcommand \FunTotInGndMul {\lgx{EA94}\relax} % Continuous, Total, Into, Grounded Multi-Function + \newcommand \FunTotInGndSng {\lgx{EA95}\relax} % Continuous, Total, Into, Grounded, Singleton Function + \newcommand \FunTotInGndOne {\lgx{EA96}\relax} % Continuous, Total, Into, Grounded, One-To-One Function + \newcommand \FunTotOnGndMul {\lgx{EA9C}\relax} % Continuous, Total, Onto, Grounded Multi-Function + \newcommand \FunTotOnGndSng {\lgx{EA9D}\relax} % Continuous, Total, Onto, Grounded, Singleton Function + \newcommand \FunTotOnGndOne {\lgx{EA9E}\relax} % Continuous, Total, Onto, Grounded, One-To-One Function + + \newcommand \MapComp {\lgx{E23C}\relax} % Map Composition + \newcommand \FncComp {\lgx{E239}\relax} % Function Composition + \newcommand \FncCnvrs {\lgx{E2C3}\relax} % Function Converse + + \newcommand \SFunc {\lgx{E9DC}\relax} % Short Function + \newcommand \Func {\lgx{E9DD}\relax} % Function + \newcommand \LFunc {\lgx{E9DE}\relax} % Long Function + \newcommand \XFunc {\lgx{E9DF}\relax} % Extra Long Function + + \newcommand \ClsImpl {\lgx{E79E}\relax} % Classical Implication + \newcommand \NotClsImpl {\lgx{E79F}\relax} % Not Classical Implication + \newcommand \ClsEquv {\lgx{E666}\relax} % Classical Equivalence + \newcommand \NotClsEquv {\lgx{E667}\relax} % Not Classical Equivalence + + \newcommand \SWkMtImpl {\lgx{E810}\relax} % Short Weak Material Implication + \newcommand \NotSWkMtImpl {\lgx{E811}\relax} % Short Not Weak Material Implication + \newcommand \SWkMtEquv {\lgx{E812}\relax} % Short Weak Material Equivalence + \newcommand \NotSWkMtEquv {\lgx{E813}\relax} % Short Not Weak Material Equivalence + \newcommand \WkMtImpl {\lgx{E814}\relax} % Weak Material Implication + \newcommand \NotWkMtImpl {\lgx{E815}\relax} % Not Weak Material Implication + \newcommand \WkMtEquv {\lgx{E816}\relax} % Weak Material Equivalence + \newcommand \NotWkMtEquv {\lgx{E817}\relax} % Not Weak Material Equivalence + \newcommand \LWkMtImpl {\lgx{E818}\relax} % Long Weak Material Implication + \newcommand \NotLWkMtImpl {\lgx{E819}\relax} % Long Not Weak Material Implication + \newcommand \LWkMtEquv {\lgx{E81A}\relax} % Long Weak Material Equivalence + \newcommand \NotLWkMtEquv {\lgx{E81B}\relax} % Long Not Weak Material Equivalence + \newcommand \XWkMtImpl {\lgx{E81C}\relax} % Extra Long Weak Material Implication + \newcommand \NotXWkMtImpl {\lgx{E81D}\relax} % Extra Long Not Weak Material Implication + \newcommand \XWkMtEquv {\lgx{E81E}\relax} % Extra Long Weak Material Equivalence + \newcommand \NotXWkMtEquv {\lgx{E81F}\relax} % Extra Long Not Weak Material Equivalence + + \newcommand \SMtImpl {\lgx{E820}\relax} % Short WMaterial Implication + \newcommand \NotSMtImpl {\lgx{E821}\relax} % Short NNot Material Implication + \newcommand \SMtEquv {\lgx{E822}\relax} % Short WMaterial Equivalence + \newcommand \NotSMtEquv {\lgx{E823}\relax} % Short NNot Material Equivalence + \newcommand \MtImpl {\lgx{E824}\relax} % Material Implication + \newcommand \NotMtImpl {\lgx{E825}\relax} % Not Material Implication + \newcommand \MtEquv {\lgx{E826}\relax} % Material Equivalence + \newcommand \NotMtEquv {\lgx{E827}\relax} % Not Material Equivalence + \newcommand \LMtImpl {\lgx{E828}\relax} % Long Material Implication + \newcommand \NotLMtImpl {\lgx{E829}\relax} % Long Not Material Implication + \newcommand \LMtEquv {\lgx{E82A}\relax} % Long Material Equivalence + \newcommand \NotLMtEquv {\lgx{E82B}\relax} % Long Not Material Equivalence + \newcommand \XMtImpl {\lgx{E82C}\relax} % Extra Long Material Implication + \newcommand \NotXMtImpl {\lgx{E82D}\relax} % Extra Long Not Material Implication + \newcommand \XMtEquv {\lgx{E82E}\relax} % Extra Long Material Equivalence + \newcommand \NotXMtEquv {\lgx{E82F}\relax} % Extra Long Not Material Equivalence + + \newcommand \SInImpl {\lgx{E830}\relax} % Short WIntuitionistic Implication + \newcommand \NotSInImpl {\lgx{E831}\relax} % Short NNot Intuitionistic Implication + \newcommand \SInEquv {\lgx{E832}\relax} % Short WIntuitionistic Equivalence + \newcommand \NotSInEquv {\lgx{E833}\relax} % Short NNot Intuitionistic Equivalence + \newcommand \InImpl {\lgx{E834}\relax} % Intuitionistic Implication + \newcommand \NotInImpl {\lgx{E835}\relax} % Not Intuitionistic Implication + \newcommand \InEquv {\lgx{E836}\relax} % Intuitionistic Equivalence + \newcommand \NotInEquv {\lgx{E837}\relax} % Not Intuitionistic Equivalence + \newcommand \LInImpl {\lgx{E838}\relax} % Long Intuitionistic Implication + \newcommand \NotLInImpl {\lgx{E839}\relax} % Long Not Intuitionistic Implication + \newcommand \LInEquv {\lgx{E83A}\relax} % Long Intuitionistic Equivalence + \newcommand \NotLInEquv {\lgx{E83B}\relax} % Long Not Intuitionistic Equivalence + \newcommand \XInImpl {\lgx{E83C}\relax} % Extra Long Intuitionistic Implication + \newcommand \NotXInImpl {\lgx{E83D}\relax} % Extra Long Not Intuitionistic Implication + \newcommand \XInEquv {\lgx{E83E}\relax} % Extra Long Intuitionistic Equivalence + \newcommand \NotXInEquv {\lgx{E83F}\relax} % Extra Long Not Intuitionistic Equivalence + + \newcommand \SWkImpl {\lgx{E840}\relax} % Short WWeak Implication + \newcommand \NotSWkImpl {\lgx{E841}\relax} % Short NNot Weak Implication + \newcommand \SWkEquv {\lgx{E842}\relax} % Short WWeak Implication Equivalence + \newcommand \NotSWkEquv {\lgx{E843}\relax} % Short NNot Weak Implication Equivalence + \newcommand \WkImpl {\lgx{E844}\relax} % Weak Implication + \newcommand \NotWkImpl {\lgx{E845}\relax} % Not Weak Implication + \newcommand \WkEquv {\lgx{E846}\relax} % Weak Implication Equivalence + \newcommand \NotWkEquv {\lgx{E847}\relax} % Not Weak Implication Equivalence + \newcommand \LWkImpl {\lgx{E848}\relax} % Long Weak Implication + \newcommand \NotLWkImpl {\lgx{E849}\relax} % Long Not Weak Implication + \newcommand \LWkEquv {\lgx{E84A}\relax} % Long Weak Implication Equivalence + \newcommand \NotLWkEquv {\lgx{E84B}\relax} % Long Not Weak Implication Equivalence + \newcommand \XWkImpl {\lgx{E84C}\relax} % Extra Long Weak Implication + \newcommand \NotXWkImpl {\lgx{E84D}\relax} % Extra Long Not Weak Implication + \newcommand \XWkEquv {\lgx{E84E}\relax} % Extra Long Weak Implication Equivalence + \newcommand \NotXWkEquv {\lgx{E84F}\relax} % Extra Long Not Weak Implication Equivalence + + \newcommand \SImpl {\lgx{E850}\relax} % Short WImplication + \newcommand \NotSImpl {\lgx{E851}\relax} % Short NNot Implication + \newcommand \SEquv {\lgx{E852}\relax} % Short WImplication Equivalence + \newcommand \NotSEquv {\lgx{E853}\relax} % Short NNot Implication Equivalence + \newcommand \Impl {\lgx{E854}\relax} % Implication + \newcommand \NotImpl {\lgx{E855}\relax} % Not Implication + \newcommand \Equv {\lgx{E856}\relax} % Implication Equivalence + \newcommand \NotEquv {\lgx{E857}\relax} % Not Implication Equivalence + \newcommand \LImpl {\lgx{E858}\relax} % Long Implication + \newcommand \NotLImpl {\lgx{E859}\relax} % Long Not Implication + \newcommand \LEquv {\lgx{E85A}\relax} % Long Implication Equivalence + \newcommand \NotLEquv {\lgx{E85B}\relax} % Long Not Implication Equivalence + \newcommand \XImpl {\lgx{E85C}\relax} % Extra Long Implication + \newcommand \NotXImpl {\lgx{E85D}\relax} % Extra Long Not Implication + \newcommand \XEquv {\lgx{E85E}\relax} % Extra Long Implication Equivalence + \newcommand \NotXEquv {\lgx{E85F}\relax} % Extra Long Not Implication Equivalence + + \newcommand \SWkEntail {\lgx{E860}\relax} % Short WWeak Entailment + \newcommand \NotSWkEntail {\lgx{E861}\relax} % Short NNot Weak Entailment + \newcommand \SWkEntailEquv {\lgx{E862}\relax} % Short WWeak Entailment Equivalence + \newcommand \NotSWkEntailEquv {\lgx{E863}\relax} % Short NNot Weak Entailment Equivalence + \newcommand \WkEntail {\lgx{E864}\relax} % Weak Entailment + \newcommand \NotWkEntail {\lgx{E865}\relax} % Not Weak Entailment + \newcommand \WkEntailEquv {\lgx{E866}\relax} % Weak Entailment Equivalence + \newcommand \NotWkEntailEquv {\lgx{E867}\relax} % Not Weak Entailment Equivalence + \newcommand \LWkEntail {\lgx{E868}\relax} % Long Weak Entailment + \newcommand \NotLWkEntail {\lgx{E869}\relax} % Long Not Weak Entailment + \newcommand \LWkEntailEquv {\lgx{E86A}\relax} % Long Weak Entailment Equivalence + \newcommand \NotLWkEntailEquv {\lgx{E86B}\relax} % Long Not Weak Entailment Equivalence + \newcommand \XWkEntail {\lgx{E86C}\relax} % Extra Long Weak Entailment + \newcommand \NotXWkEntail {\lgx{E86D}\relax} % Extra Long Not Weak Entailment + \newcommand \XWkEntailEquv {\lgx{E86E}\relax} % Extra Long Weak Entailment Equivalence + \newcommand \NotXWkEntailEquv {\lgx{E86F}\relax} % Extra Long Not Weak Entailment Equivalence + + \newcommand \SEntail {\lgx{E870}\relax} % Short WEntailment + \newcommand \NotSEntail {\lgx{E871}\relax} % Short NNot Entailment + \newcommand \SEntailEquv {\lgx{E872}\relax} % Short WEntailment Equivalence + \newcommand \NotSEntailEquv {\lgx{E873}\relax} % Short NNot Entailment Equivalence + \newcommand \Entail {\lgx{E874}\relax} % Entailment + \newcommand \NotEntail {\lgx{E875}\relax} % Not Entailment + \newcommand \EntailEquv {\lgx{E876}\relax} % Entailment Equivalence + \newcommand \NotEntailEquv {\lgx{E877}\relax} % Not Entailment Equivalence + \newcommand \LEntail {\lgx{E878}\relax} % Long Entailment + \newcommand \NotLEntail {\lgx{E879}\relax} % Long Not Entailment + \newcommand \LEntailEquv {\lgx{E87A}\relax} % Long Entailment Equivalence + \newcommand \NotLEntailEquv {\lgx{E87B}\relax} % Long Not Entailment Equivalence + \newcommand \XEntail {\lgx{E87C}\relax} % Extra Long Entailment + \newcommand \NotXEntail {\lgx{E87D}\relax} % Extra Long Not Entailment + \newcommand \XEntailEquv {\lgx{E87E}\relax} % Extra Long Entailment Equivalence + \newcommand \NotXEntailEquv {\lgx{E87F}\relax} % Extra Long Not Entailment Equivalence + + \newcommand \Seq {\lgx{E94C}\relax} % Sequent + \newcommand \NotSeq {\lgx{E96C}\relax} % Sequent Denied + \newcommand \Rule {\lgx{E940}\relax} % Assertion (Rule) + \newcommand \NotRule {\lgx{E960}\relax} % Assertion (Rule) Denied + \newcommand \Model {\lgx{E942}\relax} % Model + \newcommand \NotModel {\lgx{E962}\relax} % Model Denied + \newcommand \Turn {\lgx{E944}\relax} % Turnstile + \newcommand \NotTurn {\lgx{E964}\relax} % Turnstile Denied + \newcommand \Conseq {\lgx{E946}\relax} % Consequence Relation + \newcommand \NotConseq {\lgx{E966}\relax} % Consequence Relation Denied + + \newcommand \Defn {\lgx{E60A}\relax} % Defines + \newcommand \Qed {\lgx{E08F}\relax} % Q.E.D. + + \newcommand \Nd {\lgx{E6A0}\relax} % Bitwise AND operator / Logical Conjunction + \newcommand \Or {\lgx{E6A1}\relax} % Bitwise OR operator / Logical Disjunction + \newcommand \Nt {\lgx{E0C0}\relax} % Bitwise NOT operator / Logical Negation + \newcommand \Ng {\lgx{E64C}\relax} % Classical Logical Negation + \newcommand \Nand {\lgx{E6A2}\relax} % Bitwise NAND operator + \newcommand \Nor {\lgx{E6A3}\relax} % Bitwise NOR operator + \newcommand \Xor {\lgx{E6A5}\relax} % Bitwise XOR operator + + \newcommand \LcgCohrnc {\lgx{E068}\relax} % Logical Coherence + \newcommand \BncCohrnc {\lgx{E078}\relax} % Bunch Coherence + + \newcommand \True {\lgx{E012}\relax} % True + \newcommand \False {\lgx{E014}\relax} % False + \newcommand \Top {\lgx{E017}\relax} % Lattice / type top + \newcommand \Bot {\lgx{E016}\relax} % Lattice / type bottom + + \newcommand \QuantCon {\lgx{E891}\relax} % Quantified Conjunction + \newcommand \QuantDis {\lgx{E890}\relax} % Quantified Disjuntion + \newcommand \ForAll {\lgx{E8C0}\relax} % Universal Individual Quantifier + \newcommand \Exists {\lgx{E8C1}\relax} % Existential Individual Quantifier + \newcommand \Unique {\lgx{E8C2}\relax} % Unique Existential Individual Quantifier + \newcommand \BnchForAll {\lgx{E8D0}\relax} % Universal Bunch Quantifier + \newcommand \BnchExists {\lgx{E8D1}\relax} % Existential Bunch Quantifier + \newcommand \BnchUnique {\lgx{E8D2}\relax} % Unique Existential Bunch Quantifier + \newcommand \BndMap {\lgx{E030}\relax} % Map Abstraction + + \newcommand \Dt {\lgx{E098}\relax} % Dot + \newcommand \Comma {\lgx{E099}\relax} % Comma + \newcommand \Semicln {\lgx{E09A}\relax} % Semicolon + \newcommand \Cln {\lgx{E091}\relax} % Colon + \newcommand \Thus {\lgx{E092}\relax} % Thus + \newcommand \Since {\lgx{E093}\relax} % Since + \newcommand \Dts {\lgx{E096}\relax} % Dots (ellipsis) + \newcommand \BndDot {\lgx{E090}\relax} % Binding Dot + \newcommand \BndBar {\lgm{E380}\relax} % Binding Bar + \newcommand \BndBarS {\middle\BndBar\relax} % Stretchy Binding Bar + \newcommand \LngVrtBar {\lgx{E0EC}\relax} % Long Vertical Bar + \newcommand \Queston {\lgx{E02C}\relax} % Question mark + \newcommand \Exclaim {\lgx{E02D}\relax} % Exclamation point + \newcommand \Percent {\lgx{E03C}\relax} % Percent sign + \newcommand \Ampersand {\lgx{E03D}\relax} % Ampersand + \newcommand \Dollar {\lgx{E05F}\relax} % Dollar sign + \newcommand \At {\lgx{E03E}\relax} % At sign + \newcommand \Circumflex {\lgx{E03F}\relax} % ASCII Circumflex + \newcommand \Number {\lgx{E04F}\relax} % Number sign + \newcommand \Underscore {\lgx{E09E}\relax} % Underscore + \newcommand \Tild {\lgx{007E}\relax} % Tilde E64C + \newcommand \SingleQuote {\lgx{E09C}\relax} % Single quote + \newcommand \DoubleQuote {\lgx{E09B}\relax} % Double quote + \newcommand \BackQuote {\lgx{E09D}\relax} % Back quote (grave) + \newcommand \LeftSlash {\lgx{E103}\relax} % Left (back) slash + \newcommand \RightSlash {\lgx{E102}\relax} % Right (forward) slash + + \newcommand \ShftSuper {\lgx{EAC3}\relax} % Shift for superscripts + \newcommand \ShftSubscr {\lgx{EAC4}\relax} % Shift for subscripts + \newcommand \ShftAccent {\lgx{EAC5}\relax} % Shift for accents + + \newcommand \RplcAllBndRight {\lgx{E9D4}\relax} % Replace All Bound Variables (right) + \newcommand \RplcAllBndLeft {\lgx{E9D5}\relax} % Replace All Bound Variables (left) + \newcommand \RplcAllRight {\lgx{E9DA}\relax} % Replace All (right) + \newcommand \RplcAllLeft {\lgx{E9DB}\relax} % Replace All (left) + \newcommand \RplcFreeRight {\lgx{E9F0}\relax} % Replace Any Free Variables (right) + \newcommand \RplcFreeLeft {\lgx{E9F1}\relax} % Replace Any Free Variables (left) + \newcommand \RplcEquvRight {\lgx{E9F8}\relax} % Replace Equivalent Expressions (right) + \newcommand \RplcEquvLeft {\lgx{E9F9}\relax} % Replace Equivalent Expressions (left) + + \newcommand \LstFix {\lgx{E031}\relax} % Least Fixed Point + \newcommand \GrtFix {\lgx{E032}\relax} % Greatest Fixed Point + \newcommand \Choice {\lgx{E033}\relax} % Choice + \newcommand \ExLstFix {\lgx{E034}\relax} % Extended Least Fixed Point + \newcommand \ExGrtFix {\lgx{E035}\relax} % Extended Greatest Fixed Point + \newcommand \FrstOrd {\lgx{E039}\relax} % First Ordinal (omega) + + \newcommand \LogNec {\lgx{E230}\relax} % Logical Necessity (temporal always or henceforth) + \newcommand \LogPos {\lgx{E232}\relax} % Logical Possibility (temporal sometime or eventually) + \newcommand \LogNext {\lgx{E233}\relax} % Logical Next (temporal next or nexttime) + \newcommand \LogFutr {\lgx{E234}\relax} % Logical Future (temporal in the future) + \newcommand \LogPast {\lgx{E235}\relax} % Logical Past (temporal in the past) + \newcommand \LogCont {\lgx{E236}\relax} % Logical Contingency + \newcommand \LogNonCont {\lgx{E237}\relax} % Logical Non-contingency + + \newcommand \Nec {\lgx{E270}\relax} % Necessity (temporal always or henceforth) + \newcommand \Pos {\lgx{E272}\relax} % Possibility (temporal sometime or eventually) + \newcommand \Next {\lgx{E273}\relax} % Next (temporal next or nexttime) + \newcommand \Futr {\lgx{E274}\relax} % Future (temporal in the future) + \newcommand \Past {\lgx{E275}\relax} % Past (temporal in the past) + \newcommand \Cont {\lgx{E276}\relax} % Contingency + \newcommand \NonCont {\lgx{E277}\relax} % Non-contingency + + \newcommand \FacNec {\lgx{E220}\relax} % Factual Necessity (temporal always or henceforth) + \newcommand \FacPos {\lgx{E222}\relax} % Factual Possibility (temporal sometime or eventually) + \newcommand \FacNext {\lgx{E223}\relax} % Factual Next (temporal next or nexttime) + \newcommand \FacFutr {\lgx{E224}\relax} % Factual Future (temporal in the future) + \newcommand \FacPast {\lgx{E225}\relax} % Factual Past (temporal in the past) + \newcommand \FacCont {\lgx{E226}\relax} % Factual Contingency + \newcommand \FacNonCont {\lgx{E227}\relax} % Factual Non-contingency + + \newcommand \Of {\lgx{E600}\relax} % Bunch Inclusion + \newcommand \In {\lgx{E602}\relax} % Set Membership + \newcommand \NotIn {\lgx{E603}\relax} % Set Membership Negated + + \newcommand \EmptyBunch {\lgx{E054}\relax} % Empty Bunch + \newcommand \NullSet {\lgx{E053}\relax} % Null Set + + \newcommand \BnchMeet {\lgx{E710}\relax} % Bunch Meet + \newcommand \BnchJoin {\lgx{E711}\relax} % Bunch Join + + \newcommand \StrctSbnch {\lgx{E718}\relax} % Strict Subbunch + \newcommand \NotStrctSbnch {\lgx{E719}\relax} % Strict Subbunch Negated + \newcommand \Sbnch {\lgx{E71A}\relax} % Subbunch + \newcommand \NotSbnch {\lgx{E71B}\relax} % Subbunch Negated + + \newcommand \StrctWkSbnch {\lgx{E738}\relax} % Strict Weak Subbunch + \newcommand \NotStrctWkSbnch {\lgx{E739}\relax} % Strict Weak Subbunch Negated + \newcommand \WkSbnch {\lgx{E73A}\relax} % Weak Subbunch + \newcommand \NotWkSbnch {\lgx{E73B}\relax} % Weak Subbunch Negated + + \newcommand \MapMeet {\lgx{E760}\relax} % Map Meet + \newcommand \MapJoin {\lgx{E761}\relax} % Map Join + + \newcommand \StrctSbmap {\lgx{E768}\relax} % Strict Submap + \newcommand \NotStrctSbmap {\lgx{E769}\relax} % Strict Submap Negated + \newcommand \Sbmap {\lgx{E76A}\relax} % Submap + \newcommand \NotSbmap {\lgx{E76B}\relax} % Submap Negated + + \newcommand \SetMeet {\lgx{E790}\relax} % Set Intersection + \newcommand \SetJoin {\lgx{E791}\relax} % Set Union + \newcommand \Normal {\lgx{E2E5}\relax} % Normal Subgroup + \newcommand \SetSymDiff {\lgx{E2E7}\relax} % Set Symmetric Difference + + \newcommand \StrctSbset {\lgx{E798}\relax} % Strict Subset + \newcommand \NotStrctSbset {\lgx{E799}\relax} % Strict Subset Negated + \newcommand \Sbset {\lgx{E79A}\relax} % Subset + \newcommand \NotSbset {\lgx{E79B}\relax} % Subset Negated + + \newcommand \QuantBnchMeet {\lgx{E895}\relax} % Bunch Meet Quantifier + \newcommand \QuantBnchJoin {\lgx{E894}\relax} % Bunch Join Quantifier + \newcommand \QuantSetMeet {\lgx{E893}\relax} % Set Intersection Quantifier + \newcommand \QuantSetJoin {\lgx{E892}\relax} % Set Union Quantifier + + \newcommand \Ls {\lgx{E6A8}\relax} % Less Than + \newcommand \Lse {\lgx{E6AA}\relax} % Less Than or Equal + \newcommand \Eq {\lgx{E656}\relax} % Equal + \newcommand \Sm {\lgx{E658}\relax} % Similar + \newcommand \Gr {\lgx{E6AE}\relax} % Greater Than + \newcommand \Gre {\lgx{E6AC}\relax} % Greater Than or Equal + + \newcommand \NotLs {\lgx{E6A9}\relax} % Not Less Than + \newcommand \NotLse {\lgx{E6AB}\relax} % Not Less Than or Equal + \newcommand \NotEq {\lgx{E657}\relax} % Not Equal + \newcommand \NotSm {\lgx{E659}\relax} % Not Similar + \newcommand \NotGr {\lgx{E6AF}\relax} % Not Greater Than + \newcommand \NotGre {\lgx{E6AD}\relax} % Not Greater Than or Equal + + \newcommand \Pre {\lgx{E6C8}\relax} % Precedes + \newcommand \Preq {\lgx{E6CA}\relax} % Precedes or Equal + \newcommand \Suc {\lgx{E6CE}\relax} % Succeeds + \newcommand \Sucq {\lgx{E6CC}\relax} % Succeeds or Equal + + \newcommand \NotPre {\lgx{E6C9}\relax} % Not Precedes + \newcommand \NotPreq {\lgx{E6CB}\relax} % Not Precedes or Equal + \newcommand \NotSuc {\lgx{E6CF}\relax} % Not Succeeds + \newcommand \NotSucq {\lgx{E6CD}\relax} % Not Succeeds or Equal + + \newcommand \Minus {\lgx{E0C7}\relax} % Minus + \newcommand \Plus {\lgx{E0C6}\relax} % Plus + \newcommand \PlusMinus {\lgx{E0CE}\relax} % Plus / Minus + \newcommand \MinusPlus {\lgx{E0CF}\relax} % Minus / Plus + \newcommand \Asterick {\lgx{E0C4}\relax} % Asterick + \newcommand \Divide {\lgx{E103}\relax} % Divide + \newcommand \Times {\lgx{E0C5}\relax} % Times + + \newcommand \Append {\lgx{E0CB}\relax} % Append + \newcommand \Concat {\lgx{E0CD}\relax} % Concatenation + + \newcommand \CircPlus {\lgx{E12B}\relax} % Large Circled Plus + \newcommand \CircTimes {\lgx{E12C}\relax} % Large Circled Times + \newcommand \CircStar {\lgx{E11D}\relax} % Circled Star + + \newcommand \Dagger {\lgx{E05B}\relax} % Single dagger + \newcommand \Ddagger {\lgx{E05C}\relax} % Double horizontal dagger + \newcommand \Daggerr {\lgx{E05D}\relax} % Double vertical dagger + \newcommand \Ddaggerr {\lgx{E05E}\relax} % Double horizontal and vertical dagger % - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1610,211 +1610,211 @@ % Define geometric symbols, some of which are also used for mathematical operators. - \newcommand \BlackSquare {\lgx{E220}} - \newcommand \BlackSquareRoundCorners {\lgx{E221}} - \newcommand \BlackDiamond {\lgx{E222}} - \newcommand \BlackCircle {\lgx{E223}} - \newcommand \BlackRightTriangle {\lgx{E224}} - \newcommand \BlackLeftTriangle {\lgx{E225}} - \newcommand \BlackDownTriangle {\lgx{E226}} - \newcommand \BlackUpTriangle {\lgx{E227}} - \newcommand \BlackSmallCircle {\lgx{E228}} - \newcommand \BlackVerySmallCircle {\lgx{E229}} - \newcommand \BlackLozenge {\lgx{E22A}} - \newcommand \BlackCurvedDiamond {\lgx{E22B}} - \newcommand \BlackVerySmallSquare {\lgx{E22C}} - \newcommand \BlackLeftArrowHead {\lgx{E22D}} - \newcommand \BlackRightArrowHead {\lgx{E22E}} - \newcommand \BlackRightCurvedArrowHead {\lgx{E22F}} - - \newcommand \WhiteSquare {\lgx{E230}} - \newcommand \WhiteSquareRoundCorners {\lgx{E231}} - \newcommand \WhiteDiamond {\lgx{E232}} - \newcommand \WhiteCircle {\lgx{E233}} - \newcommand \WhiteRightTriangle {\lgx{E234}} - \newcommand \WhiteLeftTriangle {\lgx{E235}} - \newcommand \WhiteDownTriangle {\lgx{E236}} - \newcommand \WhiteUpTriangle {\lgx{E237}} - \newcommand \WhiteSmallCircle {\lgx{E238}} - \newcommand \WhiteVerySmallCircle {\lgx{E239}} - \newcommand \WhiteLozenge {\lgx{E23A}} - \newcommand \WhiteCurvedDiamond {\lgx{E23B}} - \newcommand \WhiteVerySmallSquare {\lgx{E23C}} - \newcommand \WhiteLeftArrowHead {\lgx{E23D}} - \newcommand \WhiteRightArrowHead {\lgx{E23E}} - \newcommand \WhiteRightCurvedArrowHead {\lgx{E23F}} - - \newcommand \OutlineSquare {\lgx{E240}} - \newcommand \OutlineSquareRoundCorners {\lgx{E241}} - \newcommand \OutlineDiamond {\lgx{E242}} - \newcommand \OutlineCircle {\lgx{E243}} - \newcommand \OutlineRightTriangle {\lgx{E244}} - \newcommand \OutlineLeftTriangle {\lgx{E245}} - \newcommand \OutlineDownTriangle {\lgx{E246}} - \newcommand \OutlineUpTriangle {\lgx{E247}} - \newcommand \OutlineSmallCircle {\lgx{E248}} - \newcommand \OutlineVerySmallCircle {\lgx{E249}} - \newcommand \OutlineLozenge {\lgx{E24A}} - \newcommand \OutlineCurvedDiamond {\lgx{E24B}} - \newcommand \OutlineVerySmallSquare {\lgx{E24C}} - \newcommand \OutlineLeftArrowHead {\lgx{E24D}} - \newcommand \OutlineRightArrowHead {\lgx{E24E}} - \newcommand \OutlineRightCurvedArrowHead {\lgx{E24F}} - - \newcommand \DottedSquare {\lgx{E250}} - \newcommand \DottedSquareRoundCorners {\lgx{E251}} - \newcommand \DottedDiamond {\lgx{E252}} - \newcommand \DottedCircle {\lgx{E253}} - \newcommand \DottedRightTriangle {\lgx{E254}} - \newcommand \DottedLeftTriangle {\lgx{E255}} - \newcommand \DottedDownTriangle {\lgx{E256}} - \newcommand \DottedUpTriangle {\lgx{E257}} - \newcommand \DottedSmallCircle {\lgx{E258}} - \newcommand \DottedVerySmallCircle {\lgx{E259}} - \newcommand \DottedLozenge {\lgx{E25A}} - \newcommand \DottedCurvedDiamond {\lgx{E25B}} - \newcommand \DottedVerySmallSquare {\lgx{E25C}} - \newcommand \DottedLeftArrowHead {\lgx{E25D}} - \newcommand \DottedRightArrowHead {\lgx{E25E}} - \newcommand \DottedRightCurvedArrowHead {\lgx{E25F}} - - \newcommand \WhiteSquareContainingBlackSquare {\lgx{E260}} - \newcommand \WhiteSquareRoundCornersContainingBlackSquare {\lgx{E261}} - \newcommand \WhiteDiamondContainingBlackDiamond {\lgx{E262}} - \newcommand \WhiteCircleContainingBlackCircle {\lgx{E263}} - \newcommand \WhiteRightTriangleContainingBlackRightTriangle {\lgx{E264}} - \newcommand \WhiteLeftTriangleContainingBlackLeftTriangle {\lgx{E265}} - \newcommand \WhiteDownTriangleContainingBlackDownTriangle {\lgx{E266}} - \newcommand \WhiteUpTriangleContainingBlackUpTriangle {\lgx{E267}} - \newcommand \WhiteSmallCircleContainingBlackCircle {\lgx{E268}} - \newcommand \WhiteVerySmallCircleContainingBlackCircle {\lgx{E269}} - \newcommand \WhiteLozengeContainingBlackLozenge {\lgx{E26A}} - \newcommand \WhiteCurvedDiamondContainingBlackDiamond {\lgx{E26B}} - \newcommand \WhiteVerySmallSquareContainingBlackSquare {\lgx{E26C}} - \newcommand \WhiteReallySmallCircle {\lgx{E26D}} - \newcommand \WhiteReallySmallSquare {\lgx{E26E}} - \newcommand \WhiteReallySmallDiamond {\lgx{E26F}} - - \newcommand \HorizontallyDividedSquare {\lgx{E270}} - \newcommand \HorizontallyDividedSquareRoundCorners {\lgx{E271}} - \newcommand \HorizontallyDividedDiamond {\lgx{E272}} - \newcommand \HorizontallyDividedCircle {\lgx{E273}} - \newcommand \HorizontallyDividedRightTriangle {\lgx{E274}} - \newcommand \HorizontallyDividedLeftTriangle {\lgx{E275}} - \newcommand \HorizontallyDividedDownTriangle {\lgx{E276}} - \newcommand \HorizontallyDividedUpTriangle {\lgx{E277}} - \newcommand \HorizontallyDividedSmallCircle {\lgx{E278}} - \newcommand \HorizontallyDividedVerySmallCircle {\lgx{E279}} - \newcommand \HorizontallyDividedLozenge {\lgx{E27A}} - \newcommand \HorizontallyDividedCurvedDiamond {\lgx{E27B}} - \newcommand \HorizontallyDividedVerySmallSquare {\lgx{E27C}} - \newcommand \BlackReallySmallCircle {\lgx{E27D}} - \newcommand \BlackReallySmallSquare {\lgx{E27E}} - \newcommand \BlackReallySmallDiamond {\lgx{E27F}} - - \newcommand \VerticallyDividedSquare {\lgx{E280}} - \newcommand \VerticallyDividedSquareRoundCorners {\lgx{E281}} - \newcommand \VerticallyDividedDiamond {\lgx{E282}} - \newcommand \VerticallyDividedCircle {\lgx{E283}} - \newcommand \VerticallyDividedRightTriangle {\lgx{E284}} - \newcommand \VerticallyDividedLeftTriangle {\lgx{E285}} - \newcommand \VerticallyDividedDownTriangle {\lgx{E286}} - \newcommand \VerticallyDividedUpTriangle {\lgx{E287}} - \newcommand \VerticallyDividedSmallCircle {\lgx{E288}} - \newcommand \VerticallyDividedVerySmallCircle {\lgx{E289}} - \newcommand \VerticallyDividedLozenge {\lgx{E28A}} - \newcommand \VerticallyDividedCurvedDiamond {\lgx{E28B}} - \newcommand \VerticallyDividedVerySmallSquare {\lgx{E28C}} - - \newcommand \QuarteredSquare {\lgx{E290}} - \newcommand \QuarteredSquareRoundCorners {\lgx{E291}} - \newcommand \QuarteredDiamond {\lgx{E292}} - \newcommand \QuarteredCircle {\lgx{E293}} - \newcommand \QuarteredRightTriangle {\lgx{E294}} - \newcommand \QuarteredLeftTriangle {\lgx{E295}} - \newcommand \QuarteredDownTriangle {\lgx{E296}} - \newcommand \QuarteredUpTriangle {\lgx{E297}} - \newcommand \QuarteredSmallCircle {\lgx{E298}} - \newcommand \QuarteredVerySmallCircle {\lgx{E299}} - \newcommand \QuartedLozenge {\lgx{E29A}} - \newcommand \QuarteredCurvedDiamond {\lgx{E29B}} - \newcommand \QuarteredVerySmallSquare {\lgx{E29C}} - - \newcommand \DownSlashedSquare {\lgx{E2A0}} - \newcommand \DownSlashedSquareRoundCorners {\lgx{E2A1}} - \newcommand \DownSlashedDiamond {\lgx{E2A2}} - \newcommand \DownSlashedCircle {\lgx{E2A3}} - \newcommand \DownSlashedRightTriangle {\lgx{E2A4}} - \newcommand \DownSlashedLeftTriangle {\lgx{E2A5}} - \newcommand \DownSlashedDownTriangle {\lgx{E2A6}} - \newcommand \DownSlashedUpTriangle {\lgx{E2A7}} - \newcommand \DownSlashedSmallCircle {\lgx{E2A8}} - \newcommand \DownSlashedVerySmallCircle {\lgx{E2A9}} - \newcommand \DownSlashedLozenge {\lgx{E2AA}} - \newcommand \DownSlashedCurvedDiamond {\lgx{E2AB}} - \newcommand \DownSlashedVerySmallSquare {\lgx{E2AC}} - - \newcommand \UpSlashedSquare {\lgx{E2B0}} - \newcommand \UpSlahsedSquareRoundCorners {\lgx{E2B1}} - \newcommand \UpSlashedDiamond {\lgx{E2B2}} - \newcommand \UpSlashedCircle {\lgx{E2B3}} - \newcommand \UpSlashedRightTriangle {\lgx{E2B4}} - \newcommand \UpSlashedLeftTriangle {\lgx{E2B5}} - \newcommand \UpSlashedDownTriangle {\lgx{E2B6}} - \newcommand \UpSlashedUpTriangle {\lgx{E2B7}} - \newcommand \UpSlashedSmallCircle {\lgx{E2B8}} - \newcommand \UpSlashedVerySmallCircle {\lgx{E2B9}} - \newcommand \UpSlashedLozenge {\lgx{E2BA}} - \newcommand \UpSlashedCurvedDiamond {\lgx{E2BB}} - \newcommand \UpSlashedVerySmallSquare {\lgx{E2BC}} - - \newcommand \CrossedSquare {\lgx{E2C0}} - \newcommand \CrossedSquareRoundCorners {\lgx{E2C1}} - \newcommand \CrossedDiamond {\lgx{E2C2}} - \newcommand \CrossedCircle {\lgx{E2C3}} - \newcommand \CrossedRightTriangle {\lgx{E2C4}} - \newcommand \CrossedLeftTriangle {\lgx{E2C5}} - \newcommand \CrossedDownTriangle {\lgx{E2C6}} - \newcommand \CrossedUpTriangle {\lgx{E2C7}} - \newcommand \CrossedSmallCircle {\lgx{E2C8}} - \newcommand \CrossedVerySmallCircle {\lgx{E2C9}} - \newcommand \CrossedLozenge {\lgx{E2CA}} - \newcommand \CrossedCurvedDiamond {\lgx{E2CB}} - \newcommand \CrossedVerySmallSquare {\lgx{E2CC}} - - \newcommand \LBlackSquare {\lgx{E2D0}} - \newcommand \LBlackSquareRoundCorners {\lgx{E2D1}} - \newcommand \LBlackDiamond {\lgx{E2D2}} - \newcommand \LBlackCircle {\lgx{E2D3}} - \newcommand \LBlackRightTriangle {\lgx{E2D4}} - \newcommand \LBlackLeftTriangle {\lgx{E2D5}} - \newcommand \LBlackDownTriangle {\lgx{E2D6}} - \newcommand \LBlackUpTriangle {\lgx{E2D7}} - \newcommand \LBlackSmallCircle {\lgx{E2D8}} - \newcommand \LBlackVerySmallCircle {\lgx{E2D9}} - \newcommand \LBlackLozenge {\lgx{E2DA}} - \newcommand \LBlackCurvedDiamond {\lgx{E2DB}} - \newcommand \LBlackVerySmallSquare {\lgx{E2DC}} - \newcommand \LBlackLeftArrowHead {\lgx{E2DD}} - \newcommand \LBlackRightArrowHead {\lgx{E2DE}} - \newcommand \LBlackRightCurvedArrowHead {\lgx{E2DF}} - - \newcommand \LWhiteSquare {\lgx{E2E0}} - \newcommand \LWhiteSquareRoundCorners {\lgx{E2E1}} - \newcommand \LWhiteDiamond {\lgx{E2E2}} - \newcommand \LWhiteCircle {\lgx{E2E3}} - \newcommand \LWhiteRightTriangle {\lgx{E2E4}} - \newcommand \LWhiteLeftTriangle {\lgx{E2E5}} - \newcommand \LWhiteDownTriangle {\lgx{E2E6}} - \newcommand \LWhiteUpTriangle {\lgx{E2E7}} - \newcommand \LWhiteSmallCircle {\lgx{E2E8}} - \newcommand \LWhiteVerySmallCircle {\lgx{E2E9}} - \newcommand \LWhiteLozenge {\lgx{E2EA}} - \newcommand \LWhiteCurvedDiamond {\lgx{E2EB}} - \newcommand \LWhiteVerySmallSquare {\lgx{E2EC}} - \newcommand \LWhiteLeftArrowHead {\lgx{E2ED}} - \newcommand \LWhiteRightArrowHead {\lgx{E2EE}} - \newcommand \LWhiteRightCurvedArrowHead {\lgx{E2EF}} + \newcommand \BlackSquare {\lgx{E220}\relax} + \newcommand \BlackSquareRoundCorners {\lgx{E221}\relax} + \newcommand \BlackDiamond {\lgx{E222}\relax} + \newcommand \BlackCircle {\lgx{E223}\relax} + \newcommand \BlackRightTriangle {\lgx{E224}\relax} + \newcommand \BlackLeftTriangle {\lgx{E225}\relax} + \newcommand \BlackDownTriangle {\lgx{E226}\relax} + \newcommand \BlackUpTriangle {\lgx{E227}\relax} + \newcommand \BlackSmallCircle {\lgx{E228}\relax} + \newcommand \BlackVerySmallCircle {\lgx{E229}\relax} + \newcommand \BlackLozenge {\lgx{E22A}\relax} + \newcommand \BlackCurvedDiamond {\lgx{E22B}\relax} + \newcommand \BlackVerySmallSquare {\lgx{E22C}\relax} + \newcommand \BlackLeftArrowHead {\lgx{E22D}\relax} + \newcommand \BlackRightArrowHead {\lgx{E22E}\relax} + \newcommand \BlackRightCurvedArrowHead {\lgx{E22F}\relax} + + \newcommand \WhiteSquare {\lgx{E230}\relax} + \newcommand \WhiteSquareRoundCorners {\lgx{E231}\relax} + \newcommand \WhiteDiamond {\lgx{E232}\relax} + \newcommand \WhiteCircle {\lgx{E233}\relax} + \newcommand \WhiteRightTriangle {\lgx{E234}\relax} + \newcommand \WhiteLeftTriangle {\lgx{E235}\relax} + \newcommand \WhiteDownTriangle {\lgx{E236}\relax} + \newcommand \WhiteUpTriangle {\lgx{E237}\relax} + \newcommand \WhiteSmallCircle {\lgx{E238}\relax} + \newcommand \WhiteVerySmallCircle {\lgx{E239}\relax} + \newcommand \WhiteLozenge {\lgx{E23A}\relax} + \newcommand \WhiteCurvedDiamond {\lgx{E23B}\relax} + \newcommand \WhiteVerySmallSquare {\lgx{E23C}\relax} + \newcommand \WhiteLeftArrowHead {\lgx{E23D}\relax} + \newcommand \WhiteRightArrowHead {\lgx{E23E}\relax} + \newcommand \WhiteRightCurvedArrowHead {\lgx{E23F}\relax} + + \newcommand \OutlineSquare {\lgx{E240}\relax} + \newcommand \OutlineSquareRoundCorners {\lgx{E241}\relax} + \newcommand \OutlineDiamond {\lgx{E242}\relax} + \newcommand \OutlineCircle {\lgx{E243}\relax} + \newcommand \OutlineRightTriangle {\lgx{E244}\relax} + \newcommand \OutlineLeftTriangle {\lgx{E245}\relax} + \newcommand \OutlineDownTriangle {\lgx{E246}\relax} + \newcommand \OutlineUpTriangle {\lgx{E247}\relax} + \newcommand \OutlineSmallCircle {\lgx{E248}\relax} + \newcommand \OutlineVerySmallCircle {\lgx{E249}\relax} + \newcommand \OutlineLozenge {\lgx{E24A}\relax} + \newcommand \OutlineCurvedDiamond {\lgx{E24B}\relax} + \newcommand \OutlineVerySmallSquare {\lgx{E24C}\relax} + \newcommand \OutlineLeftArrowHead {\lgx{E24D}\relax} + \newcommand \OutlineRightArrowHead {\lgx{E24E}\relax} + \newcommand \OutlineRightCurvedArrowHead {\lgx{E24F}\relax} + + \newcommand \DottedSquare {\lgx{E250}\relax} + \newcommand \DottedSquareRoundCorners {\lgx{E251}\relax} + \newcommand \DottedDiamond {\lgx{E252}\relax} + \newcommand \DottedCircle {\lgx{E253}\relax} + \newcommand \DottedRightTriangle {\lgx{E254}\relax} + \newcommand \DottedLeftTriangle {\lgx{E255}\relax} + \newcommand \DottedDownTriangle {\lgx{E256}\relax} + \newcommand \DottedUpTriangle {\lgx{E257}\relax} + \newcommand \DottedSmallCircle {\lgx{E258}\relax} + \newcommand \DottedVerySmallCircle {\lgx{E259}\relax} + \newcommand \DottedLozenge {\lgx{E25A}\relax} + \newcommand \DottedCurvedDiamond {\lgx{E25B}\relax} + \newcommand \DottedVerySmallSquare {\lgx{E25C}\relax} + \newcommand \DottedLeftArrowHead {\lgx{E25D}\relax} + \newcommand \DottedRightArrowHead {\lgx{E25E}\relax} + \newcommand \DottedRightCurvedArrowHead {\lgx{E25F}\relax} + + \newcommand \WhiteSquareContainingBlackSquare {\lgx{E260}\relax} + \newcommand \WhiteSquareRoundCornersContainingBlackSquare {\lgx{E261}\relax} + \newcommand \WhiteDiamondContainingBlackDiamond {\lgx{E262}\relax} + \newcommand \WhiteCircleContainingBlackCircle {\lgx{E263}\relax} + \newcommand \WhiteRightTriangleContainingBlackRightTriangle {\lgx{E264}\relax} + \newcommand \WhiteLeftTriangleContainingBlackLeftTriangle {\lgx{E265}\relax} + \newcommand \WhiteDownTriangleContainingBlackDownTriangle {\lgx{E266}\relax} + \newcommand \WhiteUpTriangleContainingBlackUpTriangle {\lgx{E267}\relax} + \newcommand \WhiteSmallCircleContainingBlackCircle {\lgx{E268}\relax} + \newcommand \WhiteVerySmallCircleContainingBlackCircle {\lgx{E269}\relax} + \newcommand \WhiteLozengeContainingBlackLozenge {\lgx{E26A}\relax} + \newcommand \WhiteCurvedDiamondContainingBlackDiamond {\lgx{E26B}\relax} + \newcommand \WhiteVerySmallSquareContainingBlackSquare {\lgx{E26C}\relax} + \newcommand \WhiteReallySmallCircle {\lgx{E26D}\relax} + \newcommand \WhiteReallySmallSquare {\lgx{E26E}\relax} + \newcommand \WhiteReallySmallDiamond {\lgx{E26F}\relax} + + \newcommand \HorizontallyDividedSquare {\lgx{E270}\relax} + \newcommand \HorizontallyDividedSquareRoundCorners {\lgx{E271}\relax} + \newcommand \HorizontallyDividedDiamond {\lgx{E272}\relax} + \newcommand \HorizontallyDividedCircle {\lgx{E273}\relax} + \newcommand \HorizontallyDividedRightTriangle {\lgx{E274}\relax} + \newcommand \HorizontallyDividedLeftTriangle {\lgx{E275}\relax} + \newcommand \HorizontallyDividedDownTriangle {\lgx{E276}\relax} + \newcommand \HorizontallyDividedUpTriangle {\lgx{E277}\relax} + \newcommand \HorizontallyDividedSmallCircle {\lgx{E278}\relax} + \newcommand \HorizontallyDividedVerySmallCircle {\lgx{E279}\relax} + \newcommand \HorizontallyDividedLozenge {\lgx{E27A}\relax} + \newcommand \HorizontallyDividedCurvedDiamond {\lgx{E27B}\relax} + \newcommand \HorizontallyDividedVerySmallSquare {\lgx{E27C}\relax} + \newcommand \BlackReallySmallCircle {\lgx{E27D}\relax} + \newcommand \BlackReallySmallSquare {\lgx{E27E}\relax} + \newcommand \BlackReallySmallDiamond {\lgx{E27F}\relax} + + \newcommand \VerticallyDividedSquare {\lgx{E280}\relax} + \newcommand \VerticallyDividedSquareRoundCorners {\lgx{E281}\relax} + \newcommand \VerticallyDividedDiamond {\lgx{E282}\relax} + \newcommand \VerticallyDividedCircle {\lgx{E283}\relax} + \newcommand \VerticallyDividedRightTriangle {\lgx{E284}\relax} + \newcommand \VerticallyDividedLeftTriangle {\lgx{E285}\relax} + \newcommand \VerticallyDividedDownTriangle {\lgx{E286}\relax} + \newcommand \VerticallyDividedUpTriangle {\lgx{E287}\relax} + \newcommand \VerticallyDividedSmallCircle {\lgx{E288}\relax} + \newcommand \VerticallyDividedVerySmallCircle {\lgx{E289}\relax} + \newcommand \VerticallyDividedLozenge {\lgx{E28A}\relax} + \newcommand \VerticallyDividedCurvedDiamond {\lgx{E28B}\relax} + \newcommand \VerticallyDividedVerySmallSquare {\lgx{E28C}\relax} + + \newcommand \QuarteredSquare {\lgx{E290}\relax} + \newcommand \QuarteredSquareRoundCorners {\lgx{E291}\relax} + \newcommand \QuarteredDiamond {\lgx{E292}\relax} + \newcommand \QuarteredCircle {\lgx{E293}\relax} + \newcommand \QuarteredRightTriangle {\lgx{E294}\relax} + \newcommand \QuarteredLeftTriangle {\lgx{E295}\relax} + \newcommand \QuarteredDownTriangle {\lgx{E296}\relax} + \newcommand \QuarteredUpTriangle {\lgx{E297}\relax} + \newcommand \QuarteredSmallCircle {\lgx{E298}\relax} + \newcommand \QuarteredVerySmallCircle {\lgx{E299}\relax} + \newcommand \QuartedLozenge {\lgx{E29A}\relax} + \newcommand \QuarteredCurvedDiamond {\lgx{E29B}\relax} + \newcommand \QuarteredVerySmallSquare {\lgx{E29C}\relax} + + \newcommand \DownSlashedSquare {\lgx{E2A0}\relax} + \newcommand \DownSlashedSquareRoundCorners {\lgx{E2A1}\relax} + \newcommand \DownSlashedDiamond {\lgx{E2A2}\relax} + \newcommand \DownSlashedCircle {\lgx{E2A3}\relax} + \newcommand \DownSlashedRightTriangle {\lgx{E2A4}\relax} + \newcommand \DownSlashedLeftTriangle {\lgx{E2A5}\relax} + \newcommand \DownSlashedDownTriangle {\lgx{E2A6}\relax} + \newcommand \DownSlashedUpTriangle {\lgx{E2A7}\relax} + \newcommand \DownSlashedSmallCircle {\lgx{E2A8}\relax} + \newcommand \DownSlashedVerySmallCircle {\lgx{E2A9}\relax} + \newcommand \DownSlashedLozenge {\lgx{E2AA}\relax} + \newcommand \DownSlashedCurvedDiamond {\lgx{E2AB}\relax} + \newcommand \DownSlashedVerySmallSquare {\lgx{E2AC}\relax} + + \newcommand \UpSlashedSquare {\lgx{E2B0}\relax} + \newcommand \UpSlahsedSquareRoundCorners {\lgx{E2B1}\relax} + \newcommand \UpSlashedDiamond {\lgx{E2B2}\relax} + \newcommand \UpSlashedCircle {\lgx{E2B3}\relax} + \newcommand \UpSlashedRightTriangle {\lgx{E2B4}\relax} + \newcommand \UpSlashedLeftTriangle {\lgx{E2B5}\relax} + \newcommand \UpSlashedDownTriangle {\lgx{E2B6}\relax} + \newcommand \UpSlashedUpTriangle {\lgx{E2B7}\relax} + \newcommand \UpSlashedSmallCircle {\lgx{E2B8}\relax} + \newcommand \UpSlashedVerySmallCircle {\lgx{E2B9}\relax} + \newcommand \UpSlashedLozenge {\lgx{E2BA}\relax} + \newcommand \UpSlashedCurvedDiamond {\lgx{E2BB}\relax} + \newcommand \UpSlashedVerySmallSquare {\lgx{E2BC}\relax} + + \newcommand \CrossedSquare {\lgx{E2C0}\relax} + \newcommand \CrossedSquareRoundCorners {\lgx{E2C1}\relax} + \newcommand \CrossedDiamond {\lgx{E2C2}\relax} + \newcommand \CrossedCircle {\lgx{E2C3}\relax} + \newcommand \CrossedRightTriangle {\lgx{E2C4}\relax} + \newcommand \CrossedLeftTriangle {\lgx{E2C5}\relax} + \newcommand \CrossedDownTriangle {\lgx{E2C6}\relax} + \newcommand \CrossedUpTriangle {\lgx{E2C7}\relax} + \newcommand \CrossedSmallCircle {\lgx{E2C8}\relax} + \newcommand \CrossedVerySmallCircle {\lgx{E2C9}\relax} + \newcommand \CrossedLozenge {\lgx{E2CA}\relax} + \newcommand \CrossedCurvedDiamond {\lgx{E2CB}\relax} + \newcommand \CrossedVerySmallSquare {\lgx{E2CC}\relax} + + \newcommand \LBlackSquare {\lgx{E2D0}\relax} + \newcommand \LBlackSquareRoundCorners {\lgx{E2D1}\relax} + \newcommand \LBlackDiamond {\lgx{E2D2}\relax} + \newcommand \LBlackCircle {\lgx{E2D3}\relax} + \newcommand \LBlackRightTriangle {\lgx{E2D4}\relax} + \newcommand \LBlackLeftTriangle {\lgx{E2D5}\relax} + \newcommand \LBlackDownTriangle {\lgx{E2D6}\relax} + \newcommand \LBlackUpTriangle {\lgx{E2D7}\relax} + \newcommand \LBlackSmallCircle {\lgx{E2D8}\relax} + \newcommand \LBlackVerySmallCircle {\lgx{E2D9}\relax} + \newcommand \LBlackLozenge {\lgx{E2DA}\relax} + \newcommand \LBlackCurvedDiamond {\lgx{E2DB}\relax} + \newcommand \LBlackVerySmallSquare {\lgx{E2DC}\relax} + \newcommand \LBlackLeftArrowHead {\lgx{E2DD}\relax} + \newcommand \LBlackRightArrowHead {\lgx{E2DE}\relax} + \newcommand \LBlackRightCurvedArrowHead {\lgx{E2DF}\relax} + + \newcommand \LWhiteSquare {\lgx{E2E0}\relax} + \newcommand \LWhiteSquareRoundCorners {\lgx{E2E1}\relax} + \newcommand \LWhiteDiamond {\lgx{E2E2}\relax} + \newcommand \LWhiteCircle {\lgx{E2E3}\relax} + \newcommand \LWhiteRightTriangle {\lgx{E2E4}\relax} + \newcommand \LWhiteLeftTriangle {\lgx{E2E5}\relax} + \newcommand \LWhiteDownTriangle {\lgx{E2E6}\relax} + \newcommand \LWhiteUpTriangle {\lgx{E2E7}\relax} + \newcommand \LWhiteSmallCircle {\lgx{E2E8}\relax} + \newcommand \LWhiteVerySmallCircle {\lgx{E2E9}\relax} + \newcommand \LWhiteLozenge {\lgx{E2EA}\relax} + \newcommand \LWhiteCurvedDiamond {\lgx{E2EB}\relax} + \newcommand \LWhiteVerySmallSquare {\lgx{E2EC}\relax} + \newcommand \LWhiteLeftArrowHead {\lgx{E2ED}\relax} + \newcommand \LWhiteRightArrowHead {\lgx{E2EE}\relax} + \newcommand \LWhiteRightCurvedArrowHead {\lgx{E2EF}\relax} % - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/macros/generic/2up/2up-doc.pdf b/macros/generic/2up/2up-doc.pdf deleted file mode 100644 index dad87c4e57..0000000000 Binary files a/macros/generic/2up/2up-doc.pdf and /dev/null differ diff --git a/macros/generic/2up/2up-doc.tex b/macros/generic/2up/2up-doc.tex deleted file mode 100644 index f68925ee7a..0000000000 --- a/macros/generic/2up/2up-doc.tex +++ /dev/null @@ -1,502 +0,0 @@ -%% BEGIN 2up.doc -%% -%% Documentation for 2up.tex/2up.sty. -%% See below if you want to try out two-up printing. -%% -%% $Id: 2up-doc.tex 318 2010-05-15 07:29:54Z herbert $ -\documentclass[12pt]{article} -\usepackage[T1]{fontenc} -\usepackage{mathpazo,url} - -\usepackage{2up} -\special{landscape} - -\let\TUfv\fileversion - -%% INSTRUCTIONS FOR TWO-UP PRINTING. -%% 3. Uncomment one of the booklet options, if desired. -%% -%\targetlayout{twosided} -\TwoupWrites - -% \targetlayout{Booklet} %% Booklet printing with 2-sided printer/copier. -% \targetlayout{booklet} %% Booklet printing with 1-sided printer/copier. - -\twouplegaltarget -\target{\magstepminus1}{29.6cm}{21cm} -\source{\magstep0}{21cm}{29.6cm} - -\makeatletter -%% PAGE NUMBERING: -%% Adjust page numbering if using booklet layout option. -\def\next{\if@leftpage\else\stepcounter{page}\fi} -\@ifundefined{target@stop}{}{\next} - -%% Special list: -\newcommand\namelistlabel[1]{\mbox{\bf #1}\hfil} -\newenvironment{namelist}[1]% - {\begin{list}{}% - {\let\makelabel\namelistlabel - \settowidth{\labelwidth}{#1} - \setlength{\leftmargin}{1.1\labelwidth}}}% - {\end{list}} - -%% VERBATIM: -%% -\begingroup - \catcode`\{=12 \catcode`\}=12 - \catcode`\(=1 \catcode`\)=2 - \catcode`\+=0 \catcode`\\=12 - +gdef+|(\) % \| = character \ - +gdef+{({) % \{ = character { - +gdef+}(}) % \} = character } -+endgroup -\def\Backslash{\protect\|} -%% -%% Define some functional font commands: -%% -\def\MainFont{\tt} % For macro definitions. -\def\UsageFont{\tt} % For in-line macro names. -\def\InlineFont{\tt} % For other in-line snipets of code. -\def\MetaFont{\rm\it} % For meta arguments. -%% -%% Short-cuts for font commands: -%% -\def\s#1{\string#1} -\def\t#1{{\InlineFont\string#1}} % For other in-line code. -\def\m#1{{\MetaFont #1\/}} % For just putting things in italics -\def\M#1{{\InlineFont\{\m{#1}\}}} % Arg is in italic, enclosed in tt braces. -\let\N\t % For in-line macro names. -\catcode`\<=13 \def<#1>{\m{#1}} % -\catcode`\"=13\def"{\verb"} % Short verb -%% -%% This is for listing macro definitions in a quote-like environment. -%% -\begingroup - \catcode`\[=1 \catcode`\]=2 - \catcode`\{=13 \catcode`\}=12 - \gdef\@MD[% - \catcode`\{=13 \catcode`\}=12 - \def{##1}[\{[\MetaFont ##1]\}]] -\endgroup -\def\MD{% - \quote - \begingroup - \@MD - \def\end{\endgroup\end}% - \def\\{\@centercr\s}% - \MainFont - \s} -\def\endMD{\endquote} -%% -%% End preamble. -\catcode`\@=12 - -\begin{document} - -\title{Documentation for 2up.tex:\\ - Two-up printing for Generic TeX} -\author{Timothy Van Zandt\thanks{The documentation was put into - \LaTeX\ format by David Todd and Herbert Vo\ss}\\ \url{tvz@Princeton.EDU}} -\date{Version \TUfv\\[3pt] \today} - -\maketitle -\thispagestyle{empty} - -\begin{abstract} - "2up.tex"/"2up.sty" allows one to print a document two-up, with -considerable flexibility as to paper size and layout. It produces a standard -dvi file, and does not involve an additional dvi or PostScript filter. It -should work with most \TeX\ macro packages. - -\end{abstract} - -\clearpage -\tableofcontents -\clearpage - -\section{Usage} -Load 2up as a \LaTeX\ package with \texttt{\textbackslash usepackage}. -There is a good chance you will get the desired layout. See the rest of -this documentation for detailed information on controlling 2up. - -\section{Comparison with other methods} - -There are other tools for two-up printing: -\begin{description} -\item[PostScript filters] -These work well as long as you only use PostScript fonts (as opposed to the -usual Metafont fonts). Otherwise, the PostScript filter scales bitmapped -fonts, and the quality is lower than with "2up.tex". - -\item[Rokicki's dvidvi] -"dvidvi" is a versatil tool that does much more than -2up printing. However, if only rearranges the pages, and does not adjust the -magnification to ensure that the pages fit properly in a two-up format. It -also adds one more step to the \TeX-dvi-printer cycle. "2up.tex", on the other -hand, combines the changes to \TeX's magnification and page layout with the -rearranging of the pages, all with an easy-to-use interface and from within -your \TeX\ document. (See Section \ref{dvidvi} on using both "2up.tex" and -"dvidvi" together.) -\end{description} - -\section{A warning about fonts} - -Two-up printing generally involves reducing a document, and thus using fonts -sizes that are not typically found on your system. If you are using bitmapped -fonts (standard for \TeX\ users), and you do not have and cannot generate the -extra fonts bitmaps, you will find 2up.sty (and any other method of two-up -printing) to give very poor quality output. - -If you are using a program like Rokicki's "dvips" that can generate extra font -bitmaps as needed, you will find that it takes a long time to print your 2up -document the first few times, as "dvips" is busy making the extra fonts. This -problem will go away. Be thankful you have such an easy way to get extra font -bitmaps. - -\section{Source and target dimensions} - -Set the target and source layout: -\begin{MD} - \source{mag}{width}{height}\\ - \target{mag}{width}{height} -\end{MD} - -\begin{itemize} -\item The ``source'' layout is the layout of your document -the way it is usually printed. The ``target'' layout is the layout when it -is printed two-up. - -\item and are the true width and height of the paper, -when looking at the output right-side-up. - -\item refers to the source and target magnification. It should be an -integer, equal to 1000 times the magnification factor. There are also some -magic magnification numbers: -\begin{description} -\item[$\setminus$magstep] for a magnification of 1.2$^n$ (n=0,...,5), or - -\item[$\setminus$magstepminus] for a magnification of 1.2$^{-n}$ -(n=0,...,5). -\end{description} -Using these magnification values will make best use of the available fonts on -your system. -\end{itemize} - -"2up.tex" takes each source page, and centers in half a target page. To get -the pages to fit, the magnification of the document typically has to be -reduced. If you find that the pages are too crowded, try reducing the target -magnification. If they are too lonely, try increasing the target -magnification. - -If you want to adjust the positioning of the scaled pages, try changing the -values of "\hoffset" or "\voffset" with "\advance" or \LaTeX's "\addtolength". - -Don't change the magnification of your document after using the "\target" -command, as you will override the settings made by 2up.tex. - -You can also specify some options: -\begin{MD} - \targetlayout{options} -\end{MD} -where is a comma separated list with no spaces. Valid -options are: -\begin{namelist}{topbottomxxx} - -\item [topbottom] The two source pages are printed one on top of the other. -\item [twosided] Odd pages are always printed on the right or the bottom. -\item [booklet] Pages are printed like a booklet. See Section \ref{booklet}. -\item [Booklet] Like "booklet", but for two-sided printers/copiers. -\item [dvidvi] For arranging in two-up layout with "dvidvi". See Section -\ref{dvidvi}. - -\end{namelist} - -The only other changes you might want to make to your document are the -following: -\begin{itemize} -\item You have to see to it that the target output is printed with the -correct orientation (landscape or portrait). See the documentation for your -dvi driver for details. - -\item "2up.tex" will inserts a line between pages if you change the following -dimensions: -\begin{namelist}{pagesepwidthxxx} -\item [$\setminus$pagesepwidth] Thickness of line. (Default 0pt) -\item [$\setminus$pageseplength] Length of line. (Default 6.5in) -\item [$\setminus$pagesepoffset] Distance from bottom of page to bottom of -line, or (with "topbottom" layout) from side of page to beginning of line. -(Default 1in) -\end{namelist} - -\item You can, but do not need to, use the following commands: -\begin{namelist}{twoupemptypagexxx} - -\item [$\setminus$twoupemptypage] inserts a completely blank half page -in the target. - -\item [$\setminus$twoupclearpage] \LaTeX\ users: ejects a complete target -page. - -\item [$\setminus$twoupeject] Plain \TeX users: ejects a complete target -page. - -\end{namelist} -\end{itemize} - -\section{Defaults} - - The following commands set the parameters for some common sources and -targets. The definitions of these commands are also useful examples. - - For A4 paper, just replace "8.5in" and "11in" in the definitions below by -the width and height of A4 paper. - -\begin{description} - -\item [$\setminus$twouparticle] - -This is the default for \LaTeX. -\begin{namelist}{Sourcexx} - -\item [Source:] A portrait document on 8.5x11 inch paper with wide margins as -used in \LaTeX's article style, and without marginal notes. - -\item [Target:] A landscape document on the same size paper, with the source -pages printed side by side. - -\item [Definition:]\hspace{1pt} -\begin{verbatim} -\target{\magstepminus1}{11in}{8.5in} -\source{\magstep0}{8.5in}{11in}} -\end{verbatim} -\end{namelist} - -If you use narrower side margins, or if you use marginal notes, then you -will need to use "\twoupplain" or \\ "\twouplegaltarget", defined below. - -\item [$\setminus$twoupplain] - -This is the default for non-\LaTeX. - -It is the same as "\twouparticle", but for source documents with narrower -margins. -\begin{namelist}{Sourcexxx} - -\item [Definition:]\hspace{1pt} -\begin{verbatim} -\target{\magstepminus2}{11in}{8.5in} -\source{\magstep0}{8.5in}{11in} -\end{verbatim} -\end{namelist} - -\item [$\setminus$twouplegaltarget] - -\begin{namelist}{Sourcexxx} -\item [Source:] A portrait document on 8.5x11 inch paper with just about any -margins and perhaps with marginal notes. - -\item [Target:] A landscape document on legal size paper (8.5x14 inches), -with the source pages printed side by side. - -\item [Definition:]\hspace{1pt} -\begin{verbatim} -\target{\magstepminus1}{14in}{8.5in} -\source{\magstep0}{8.5in}{11in} -\end{verbatim} -\end{namelist} - -\item [$\setminus$twouplandscape]\hspace{1pt} -\begin{namelist}{Sourcexxx} - -\item [Source:] A landscape document on 8.5x11 inch paper with just about any -margins. - -\item [Target:] A portrait document on the same size paper, with the -source pages stacked vertically. - -\item [Definition:]\hspace{1pt} -\begin{verbatim} -\target{\magstepminus2}{8.5in}{11in} -\source{\magstep0}{11in}{8.5in} -\targetlayout{topbottom} -\end{verbatim} -\end{namelist} - -\end{description} - - -\section{True Dimensions} - -\TeX\ lets you use `true' dimensions, as in -\begin{verbatim} - \topmargin 1truein - \setlength{\topmargin}{1truein} -\end{verbatim} -This sets the length to 1 inch -as it appears on the page, no matter what the magnification. - -Once you use `true' dimensions, it is impossible to change the -magnification of your document, and hence it is almost impossible -to use 2up.tex. You will get an error like: -\begin{verbatim} - ! Incompatible magnification (833); - the previous value will be retained (2000). -\end{verbatim}% - -The use of `true' dimensions might be hiding in macros or style files -you are using. For example, Plain \TeX's "\magnification" command uses -true dimensions; use "\mag" instead, and then set "\hsize" and -"\vsize" appropriately scaled. If you can't find the culprit `true' -dimension in your document or input files, try putting this on the -(very) first line of your document: -\begin{verbatim} - \mag 143 \voffset 1truein \mag 1000 -\end{verbatim} - -You will get the error listed above wherever true dimensions are used -(and in some other places as well). - - -\section{Page Cross-References} - - Page cross-references (e.g., in an index or table of contents) will not be -accurate with "2up.tex", because finished pages are not immediately shipped -out. This can also cause problems with some special \LaTeX\ styles that have -multiple ".aux" files (e.g., for each chapter). - - To get better, but not perfect, page cross-references, try putting the -command -\begin{verbatim} - \TwoupWrites -\end{verbatim} -at the beginning of your document, after inputting "2up.tex". This is good for -drafts, and may fix problems with \LaTeX\ styles that have multiple ".aux" -files. "\TwoupWrites" makes "\write" and "\read" "\immediate", if you know -what that means. It might cause problems of its own, but try it and see. - - To get accurate page cross-references: -\begin{enumerate} -\item Run the job without "2up.tex", until all cross-references -are properly resolved. Run any index utility at this point. - -\item Run the job ONE MORE TIME with "2up.tex"; it will use the -correct cross-references from the previous runs. (In \LaTeX\ documents, -it is useful at this point to include the "\nofiles" command, so that -the correct cross-references are preserved.) -\end{enumerate} - -\section{Booklets\label{booklet}} - -Here are some special considerations for making booklets: - -\begin{itemize} - -\item Use the "booklet" target layout if your printer or copier cannot print -two -sides directly. "2up.tex" prints out the ``tops'' of the pages, and then the -``bottoms'', so that you can copy or print on both sides by doing one side, -flipping the output over, and doing the other side. - -\item Use "Booklet" if your printer or copier can print directly on two sides. - -\item You must have enough memory and box registers to hold all the pages in -the document. A Big\TeX\ should be able to handle at least a 32-page booklet. - -\item Sometimes booklet printing is part of the design of a document, rather -than an afterthought. In this case, you should set up the margins for the -target half-page rather than using "2up.tex" to scale the document. For -example, if using \LaTeX, 8.5x11 inch paper, \LaTeX's twoside style option, -and headings, try the following page parameter changes: -\begin{verbatim} - \setlength{\oddsidemargin}{-0.2in} - \setlength{\evensidemargin}{-0.5in} - \setlength{\textwidth}{4.2in} - \setlength{\textheight}{6.5in} - \setlength{\topmargin}{-.4in} -\end{verbatim} -If you do this, "2up.tex" isn't adjusting margins or scaling the -document. You coould therefore get by without "2up.tex" by using "dvidvi". -\end{itemize} - -\section{Using dvidvi\label{dvidvi}} - - With the "dvidvi" layout option, "2up.tex" takes care of adjusting the -margins, and you then use "dvidvi" to arrange the pages in a two-up -format. The advantage is that cross referencing comes out right. -The disadvantage is that it involves one more step. - -Start by \TeX ing your document with "2up.tex" and the "dvidvi" layout option. -Then run the dvi file through "dvidvi". Specify the offsets for "dvidvi" at -the middle of the page. E.g., for -a side-by-side layout on 8.5x11in paper, use -\begin{verbatim} - dvidvi '2:0,1(5.5in,0in)' foo bar -\end{verbatim} -For other paper sizes, replace "5.5in" by half the target paper width. For the -"topbottom" layout, reverse the dimensions, e.g., -(0in,5.5in). For booklet printing, see the -the documentation for "dvidvi". - - -\section{Compatibility\label{compatibility}} - - These macros should work with most \TeX\ macro packages, except for -the following possible but unlikely compatibility problems: - -\begin{itemize} - -\item If you use a macro package other than \LaTeX\ that does unusual things -to end a document and/or that modifies the definition of "\end", you may -find that the last page is nor printed or that an extra page with headings -is inserted at the end of the document. This is fixable on a case-by-case -basis. See the redefinition of "\end" in "2up.tex". - -\item "2up.tex" might not work if you meddle with \TeX's "\shipout" primitive -after loading "2up.tex". - -\item If the first page of the source document is not on the first two-up -target -page (possible, for example, with two-sided printing and the "booklet" -option, but generally unlikely), "\special"'s that come at the beginning -of the document also do not get onto the first page of output. This can mess -up "\special"'s for landscape printing or -including a PostScript header file. In this case, you have to specify -these things as command line options when using your dvi driver. - -\end{itemize} - - -\section{Changes} -\begin{namelist}{V0.9xxx} -\raggedright - -\item [V0.9a] Everything redone. Too many differences to point out. - -\item [V0.9b] Interface redone again. "booklet" option added. - -\item [V0.9c] Pages ship out a little earlier. A few bugs fixed. - - Parameters "\pageseplength" and "\pagesepthickness" added. - -\item [V0.9d] Fixed bug with "\twoupclearpage" and "\twoupeject". - -\item [V0.9e] Made pages be counted (from dvi driver's viewpoint) by the -physical page number. - -\item [V0.9f] Parameter "\pagesepoffset" added, and "\pagesepthickness" -changed to "\pagesepwidth". - -\item [V1.0] None. Just seemed seemed like it was time to call it 1.0 - -\item [V1.1] Added "Booklet" and "dvidvi" target layouts. - - "\hoffset" and "\voffset" in source document now have expected effect. - -\item[V1.2] Fixed incompatibility problem with AmS-\TeX/AmS-\LaTeX. - Added "\TwoupWrites" command. -\item[V1.3] LPPL license and updated documentation (hv). - -\end{namelist} -\end{document} -%% END 2up-doc diff --git a/macros/generic/2up/2up.sty b/macros/generic/2up/2up.sty deleted file mode 100644 index 15659c7398..0000000000 --- a/macros/generic/2up/2up.sty +++ /dev/null @@ -1,9 +0,0 @@ -%% $Id: 2up.sty 318 2010-05-15 07:29:54Z herbert $ -\ProvidesPackage{2up}[2010/05/15 package wrapper for - 2up.tex (hv)] -\input{2up.tex} -\ProvidesFile{2up.tex} - [\filedate\space v\fileversion\space `2up' (tvz,hv)] -% -\endinput - diff --git a/macros/generic/2up/2up.tex b/macros/generic/2up/2up.tex deleted file mode 100644 index b1f064c0e2..0000000000 --- a/macros/generic/2up/2up.tex +++ /dev/null @@ -1,363 +0,0 @@ -%% -%% $Id: 2up.tex 318 2010-05-15 07:29:54Z herbert $ -%% -%% COPYRIGHT 1992/2010, by Timothy Van Zandt, tvz@Princeton.EDU -%% COPYRIGHT 2010, by Herbert Voss, hvoss@tug.org -%% -%% Copyright: -%% This program can be redistributed and/or modified under the terms -%% of the LaTeX Project Public License Distributed from CTAN archives -%% in directory macros/latex/base/lppl.txt. -%% -%% DESCRIPTION: -%% 2up.tex/2up.sty provides two-up printing for Generic TeX (e.g., -%% Plain, LaTeX, AmSTeX and AmS-LaTeX). It produces a standard dvi file, -%% and does not involve an additional dvi or PostScript filter. It has a -%% flexible interface for specifying paper size and layout. -%% -% -\def\fileversion{1.3} -\def\filedate{2010/05/15} -% -\csname TwoUpLoaded\endcsname -\let\TwoUpLoaded\endinput -% -\edef\TheAtCode{\the\catcode`\@} -\catcode`\@=11\relax -\message{\space\space v\fileversion\space\space \filedate\space\space } -% -% Parameter registers: -\newdimen\@targetwidth -\newdimen\@targetheight -\newdimen\@sourcewidth -\newdimen\@sourceheight -\newdimen\pageseplength -\newdimen\pagesepwidth -\newdimen\pagesepoffset -\newif\if@sidebyside -\@sidebysidetrue -\newif\if@twosided -% -% Registers used by output routine. -\newif\if@leftpage -\@leftpagetrue -\newbox\@leftpage -\newbox\@rightpage -\newcount\@physicalpage -% -% Since pages are shipped out half as often: -\multiply\maxdeadcycles by 2 -% -% Registers used only for booklet layout: -\begingroup - \let\newcount\relax - \gdef\booklet@registers{% - \newcount\bookletpage - \bookletpage=0 - \newcount\leftpagenumber - \newcount\rightpagenumber - \multiply\maxdeadcycles by 20} -\endgroup -% -% A useful extension of the \magstep macro. -\def\magstepminus#1{% - \ifcase#1 \@m\or 833\or 694\or 579\or 482\or 401\fi\relax} -% -% \@targetwidth and \@targetheight are set to the *unmagnified* dimensions -% of the target page. \inv@targetmag is the inverse of the target -% magnification. -{\catcode`\p=12\catcode`\t=12\gdef\@@inv@@mag#1pt#2{\def#2{#1}}} -\def\target#1#2#3{% - \mag #1\relax - \@targetwidth=1000pt - \divide\@targetwidth by #1\relax - \expandafter\@@inv@@mag\the\@targetwidth\inv@targetmag - \@targetwidth=#2\relax - \@targetwidth=\inv@targetmag\@targetwidth - \@targetheight=#3\relax - \@targetheight=\inv@targetmag\@targetheight} -% -% Like \target, but for the source: -\def\source#1#2#3{% - \@sourcewidth=1000pt - \divide\@sourcewidth by #1\relax - \expandafter\@@inv@@mag\the\@sourcewidth\inv@sourcemag - \@sourcewidth=#2\relax - \@sourcewidth=\inv@sourcemag\@sourcewidth - \@sourceheight=#3\relax - \@sourceheight=\inv@sourcemag\@sourceheight} -% -% \targetlayout does a loop that reads the comma separated arguments. -% There can be no extraneous spaces. -\def\targetlayout#1{\process@targetlayout#1,stop,} -\def\process@targetlayout#1,{% - \expandafter\let\expandafter\next\csname target@#1\endcsname - \ifx\next\relax - \begingroup - \errhelp{Valid target layouts are "topbottom", "twosided", - "booklet", "Booklet" and "dvidvi".}% - \errmessage{`#1' is invalid 2up target layout - ignored.}% - \endgroup - \expandafter\process@targetlayout - \else - \next - \fi} -\def\target@stop{} -\def\target@booklet{% - \booklet@registers - \def\ship@@@leftpage{\save@booklet\@leftpage}% - \def\ship@@@rightpage{\save@booklet\@rightpage}% - \@leftpagefalse - \def\twoup@eject{\twoup@eject@booklet}% - \expandafter\process@targetlayout} -\def\target@Booklet{% - \def\booklet@@loop{\Booklet@@loop}% - \target@booklet} -\def\target@twosided{% - \@twosidedtrue - \expandafter\process@targetlayout} -\def\target@topbottom{% - \def\make@@halfpage{\make@@halftopbottom}% - \def\make@fullpage{\make@fulltopbottom}% - \@sidebysidefalse - \expandafter\process@targetlayout} -\def\target@dvidvi{% - \def\ship@@@leftpage{\ship@dvidvi\@leftpage}% - \def\ship@@@rightpage{\ship@dvidvi\@rightpage}% - \expandafter\process@targetlayout} -% -% TeX's \shipout primitive is saved as \&normal@shipout, and then \shipout -% is defined to save each page to \@leftpage or \@rightpage and to print out -% every two. With the twosided layout, filler pages are added when needed. -\expandafter\let\csname &normal@shipout\endcsname\shipout -\def\shipout{% - \if@leftpage - \global\@leftpagefalse - \def\next{\afterassignment\ship@leftpage\global\setbox\@leftpage=}% - \if@twosided - \ifodd\count\z@ - \global\setbox\@leftpage=\hbox{}% - \make@@halfpage\@leftpage\ship@@@leftpage - \def\next{\shipout}% - \fi - \fi - \else - \global\@leftpagetrue - \def\next{\afterassignment\ship@rightpage\global\setbox\@rightpage=}% - \if@twosided - \ifodd\count\z@ - \else - \global\setbox\@rightpage=\hbox{}% - \make@@halfpage\@rightpage\ship@@@rightpage - \def\next{\shipout}% - \fi - \fi - \fi - \next} -% -% The job of \ship@leftpage and \ship@rightpage is to invoke \ship@@leftpage -% or \ship@@rightpage at the right time. \shipout is followed either -% (i) by an \hbox, \vbox or \vtop, in which case \ship@leftpage is invoked -% after the opening {. \@leftpage is void, and \ship@leftpage invokes -% \ship@@leftpage after the closing }, or -% (ii) by a \box or \copy, in which case \ship@leftpage is invoked after -% the full assignment. \@leftpage is not voide, and \ship@leftpage invokes -% \ship@@leftpage immediately. -\def\ship@leftpage{% - \ifvoid\@leftpage\aftergroup\ship@@leftpage\else\ship@@leftpage\fi} -\def\ship@rightpage{% - \ifvoid\@rightpage\aftergroup\ship@@rightpage\else\ship@@rightpage\fi} -% -% \ship@@leftpage/\ship@@rightpage take the output box, and first make it -% into a fully-size source page (with \make@halfpage) and then this is -% centered horizontally and vertically in half of a target page (with -% \make@@halfpage). Then they are shipped individually or together. -\def\ship@@leftpage{\make@halfpage\@leftpage\ship@@@leftpage} -\def\ship@@rightpage{\make@halfpage\@rightpage\ship@@@rightpage} -\def\make@halfpage#1{% - \dp#1=\z@ - \setbox#1=\vbox to\@sourceheight{% - \vskip \inv@sourcemag in - \vskip \voffset - \hbox to\@sourcewidth{\hskip\inv@sourcemag in\hskip\hoffset\box#1\hss}% - \vss}% - \make@@halfpage#1} -% -% The definition of \make@@halfpage depends on the target layout. -\def\make@@halfsidebyside#1{% - \global\setbox#1=\vbox to\@targetheight{\vss - \hbox to.5\@targetwidth{\hss\box#1\hss}\vss}} -\def\make@@halftopbottom#1{% - \global\setbox#1=\vbox to.5\@targetheight{\vss - \hbox to\@targetwidth{\hss\box#1\hss}\vss}} -\def\make@@halfpage{\make@@halfsidebyside} -% -% The pages are generaly shipped in pairs: -\def\ship@twoup{% - \begingroup - \voffset=-\inv@targetmag in - \hoffset=\voffset - \global\advance\@physicalpage by 1 - \count\z@=\@physicalpage - \csname &normal@shipout\endcsname\make@fullpage - \endgroup} -\let\ship@@@leftpage\relax -\def\ship@@@rightpage{\ship@twoup} -% -% The definition of \make@fullpage depends on the layout: -\def\make@fullsidebyside{% - \hbox{\box\@leftpage\pagesep@sidebyside\box\@rightpage}} -\def\make@fulltopbottom{% - \vbox{\offinterlineskip\box\@leftpage\pagesep@topbottom\box\@rightpage}} -\def\make@fullpage{\make@fullsidebyside} -% -% A vertical or horizontal rule can be inserted. These can be redefined -% for other tricks: -\def\pagesep@sidebyside{% - \begingroup - \advance\pageseplength by \pagesepoffset - \pagesepwidth=\inv@targetmag\pagesepwidth - \kern -.5\pagesepwidth - \vrule height \inv@targetmag\pageseplength - depth -\inv@targetmag\pagesepoffset - width \pagesepwidth - \kern -.5\pagesepwidth - \endgroup} -\def\pagesep@topbottom{% - \begingroup - \pagesepwidth=\inv@targetmag\pagesepwidth - \vskip -.5\pagesepwidth - \moveright\inv@targetmag\pagesepoffset\hbox{% - \vrule height\pagesepwidth width\inv@targetmag\pageseplength}% - \vskip -.5\pagesepwidth - \endgroup} -% -% With the dvidvi layout, the pages are shipped individually: -\def\ship@dvidvi#1{% - \begingroup - \voffset=-\inv@targetmag in - \hoffset=\voffset - \csname &normal@shipout\endcsname\box#1% - \endgroup} -% -% With the booklet or Booklet layout, the pages are saved rather than -% shipped. -\begingroup -\let\newbox\relax -\gdef\save@booklet#1{% - \begingroup - \globaldefs=1 - \advance\bookletpage by 1 - \expandafter\newbox\csname bookletbox\the\bookletpage\endcsname - \expandafter\setbox\csname bookletbox\the\bookletpage\endcsname\box#1% - \endgroup} -\endgroup -% -% The pages are then printed at the end with the following macros: -\def\make@bookletpage#1{% - \setbox\ifodd#1\@rightpage\else\@leftpage\fi=% - \expandafter\box\csname bookletbox\the#1\endcsname} -\def\booklet@loop{% - \count\z@\rightpagenumber - \make@bookletpage\leftpagenumber - \make@bookletpage\rightpagenumber - \ship@twoup - \booklet@@loop} -\def\booklet@@loop{% - \advance\rightpagenumber by 2 - \advance\leftpagenumber by -2 - \ifnum\leftpagenumber<1\else\expandafter\booklet@loop\fi} -\def\Booklet@@loop{% - \advance\rightpagenumber by 1 - \advance\leftpagenumber by -1 - \ifnum\leftpagenumber<\rightpagenumber\else\expandafter\booklet@loop\fi} -% -% This one is easy: -\def\twoupemptypage{\shipout\hbox{}} -% -% This clears a whole target page if there is a saved left page. Note that -% this does not invoke the output routine; i.e., it is not like \clearpage -% or \supereject. See \twoupclearpage and \twoupeject below. -\def\twoup@eject{% - \if@leftpage\else - \global\setbox\@rightpage\hbox{}% - \make@@halfpage\@rightpage\ship@@@rightpage - \global\@leftpagetrue - \fi} -% -% This is the definition of \twoup@eject with the booklet option: -\def\twoup@eject@booklet{% - \leftpagenumber\bookletpage - \advance\leftpagenumber by 3 - \divide\leftpagenumber by 4 - \multiply\leftpagenumber by 4 - \rightpagenumber=1 - \ifnum\leftpagenumber>\bookletpage - \setbox\@leftpage\hbox{}% - \make@@halfpage\@leftpage - \loop - \setbox\@rightpage\copy\@leftpage - \save@booklet\@rightpage - \ifnum\leftpagenumber>\bookletpage - \repeat - \fi - \booklet@loop} -% -% This modification is needed for \LaTeX in order to get the last page -% printed out if the final page is a left page (the catcode business is -% because \enddocument is \let to \bye in amstex): -\begingroup -\expandafter\ifx\csname @latexerr\endcsname\relax - \catcode`\>=14\else\catcode`\>=9\fi\relax ->>\gdef\twoupclearpage{\clearpage\twoup@eject} ->>\expandafter\@temptokena\expandafter{\enddocument} ->>\xdef\enddocument{\noexpand\twoupclearpage\the\@temptokena} -\endgroup -% -% For most other macro packages we could just leave be and all pages would -% always be printed because of the way the \end primitive works (except that -% TeX will go bonkers with the booklet layout). However, -% sometimes a blank filler page would be printed *with* headings. We prefer -% the filler page to be truly blank. To achieve this, we hack the definition -% of \end. This may cause problems with some macros. -\expandafter\ifx\csname @latexerr\endcsname\relax - \let\twoup@@@end\end - \def\end{\twoup@eject\twoup@@@end} - \def\twoupeject{\par\vfil\supereject\twoup@eject} -\fi -% -% This is one workaround for the page cross-references problem -\def\TwoupWrites{% - \let\TwoupSaved@write\write - \let\TwoupSaved@read\read - \let\TwoupSaved@openout\openout - \let\TwoupSaved@closeout\closeout - \def\write{\TwoupSaved@write-1{}\immediate\TwoupSaved@write}% - \def\read{\TwoupSaved@write-1{}\immediate\TwoupSaved@read}% - \def\openout{\TwoupSaved@write-1{}\immediate\TwoupSaved@openout}% - \def\closeout{\TwoupSaved@write-1{}\immediate\TwoupSaved@closeout}% - \let\TwoupWrites\relax} -% -% Defaults: -\def\twouparticle{% - \target{\magstepminus1}{11in}{8.5in}% - \source{\magstep0}{8.5in}{11in}} -\def\twoupplain{% - \target{\magstepminus2}{11in}{8.5in}% - \source{\magstep0}{8.5in}{11in}} -\def\twouplegaltarget{% - \target{\magstepminus1}{14in}{8.5in}% - \source{\magstep0}{8.5in}{11in}}% -\def\twouplandscape{% - \target{\magstepminus2}{8.5in}{11in}% - \source{\magstep0}{11in}{8.5in}% - \targetlayout{topbottom}} -\expandafter\ifx\csname @latexerr\endcsname\relax - \twoupplain\else\twouparticle\fi -\pagesepwidth 0pt -\pageseplength 6.5in -\pagesepoffset 1in -% -\expandafter\catcode`\@=\TheAtCode\relax -\endinput -%% END 2up.tex/2up.sty diff --git a/macros/generic/2up/Changes b/macros/generic/2up/Changes index b88341c02c..8794b96bb0 100644 --- a/macros/generic/2up/Changes +++ b/macros/generic/2up/Changes @@ -1,9 +1,10 @@ -$Id: Changes 318 2010-05-15 07:29:54Z herbert $ +$Id: Changes 1180 2020-05-09 10:02:00Z herbert $ --- 2up.tex -1.3 2010-05-14 - small changes to the code (hv) - - LPPL license (hv) +1.3a 2020-05-09 - Updated documentation and small code changes +1.3 2010-05-15 - small changes to the code (hv) + - LPPL license (hv) --- 2up-doc.tex -2010-05-14 - updated and LaTeX2e compatible (hv) +2020-05-09 - updated and LaTeX2e compatible (hv) diff --git a/macros/generic/2up/Makefile b/macros/generic/2up/Makefile deleted file mode 100644 index 9893c8583b..0000000000 --- a/macros/generic/2up/Makefile +++ /dev/null @@ -1,72 +0,0 @@ - -# `Makefile' for `multido.pdf', hv, 2007/03/17 - -.SUFFIXES : .tex .ltx .dvi .ps .pdf .eps - -PACKAGE = 2up - -MAIN = $(PACKAGE)-doc - -TDS = ~/PSTricks/PSTricks-TDS - -LATEX = latex - -ARCHNAME = $(MAIN)-$(shell date +%y%m%d) - -ARCHFILES = $(PACKAGE).sty $(PACKAGE).tex $(PACKAGE).pro $(MAIN).tex README Changes Makefile - -all : doc clean -doc: $(MAIN).pdf - -$(MAIN).pdf : $(MAIN).ps -# GS_OPTIONS=-dAutoRotatePages=/None - ps2pdf $< - -$(MAIN).ps : $(MAIN).dvi - dvips $< - -$(MAIN).dvi : $(MAIN).tex - $(LATEX) $< - $(LATEX) $< -# if ! test -f $(basename $<).glo ; then touch $(basename $<).glo; fi -# if ! test -f $(basename $<).idx ; then touch $(basename $<).idx; fi -# makeindex -t $(basename $<).ilg -s pst-doc.ist -o $(basename $<).ind $(basename $<).idx -# makeindex -s gglo.ist -t $(basename $<).glg -o $(basename $<).gls \ -# $(basename $<).glo -# bibtex $(basename $<) -# $(LATEX) $< -# $(LATEX) $< - -clean : - $(RM) $(addprefix $(MAIN), .log .aux .glg .glo .gls .ilg .idx .ind .tmp .toc .out .blg .Roessler .bbl ) - $(RM) $(addprefix $(MAIN), .dvi .ps .xcp) - $(RM) data3d.Roessler - -veryclean : clean - $(RM) $(addprefix $(MAIN), .pdf .bbl .blg) - -arch : - zip $(ARCHNAME).zip $(ARCHFILES) - -tds: - cp -u Changes $(TDS)/doc/generic/$(PACKAGE)/ - cp -u README $(TDS)/doc/generic/$(PACKAGE)/ - cp -u $(MAIN).pdf $(TDS)/doc/generic/$(PACKAGE)/ -# - cp -u Changes $(TDS)/tex/latex/$(PACKAGE)/ - cp -u $(PACKAGE).sty $(TDS)/tex/latex/$(PACKAGE)/ -# - cp -u Changes $(TDS)/tex/generic/$(PACKAGE)/ - cp -u $(PACKAGE).tex $(TDS)/tex/generic/$(PACKAGE)/ -# - cp -u Changes $(TDS)/dvips/$(PACKAGE)/ - cp -u $(PACKAGE).pro $(TDS)/dvips/$(PACKAGE)/ - cp -u $(PACKAGE).pro ~/Links/dvips-local/ -# - cp -u Changes $(TDS)/source/$(PACKAGE)/ - cp -u $(MAIN).tex $(TDS)/source/$(PACKAGE)/ - cp -u $(MAIN).bib $(TDS)/source/$(PACKAGE)/ - cp -u Makefile $(TDS)/source/$(PACKAGE)/ - - -# EOF diff --git a/macros/generic/2up/README b/macros/generic/2up/README index 42e5388dcb..baedb48a9b 100644 --- a/macros/generic/2up/README +++ b/macros/generic/2up/README @@ -1,9 +1,5 @@ -Save the files 2up.sty|tex in a directory, which is part of your -local TeX tree. -Then do not forget to run texhash to update this tree. -For more information see the documentation of your LATEX distribution -on installing packages into your LATEX distribution or the -TeX Frequently Asked Questions: -(http://www.tex.ac.uk/cgi-bin/texfaq2html?label=instpackages). - +2up works with latex (tex) and xelatex (xetex), but not +with lualatex (luatex). The package modifies the dvi +output to get two pages side by side. +hvoss@tug.org \ No newline at end of file diff --git a/macros/generic/2up/doc/2up-doc.pdf b/macros/generic/2up/doc/2up-doc.pdf new file mode 100644 index 0000000000..1b13e9450f Binary files /dev/null and b/macros/generic/2up/doc/2up-doc.pdf differ diff --git a/macros/generic/2up/doc/2up-doc.tex b/macros/generic/2up/doc/2up-doc.tex new file mode 100644 index 0000000000..00409552a6 --- /dev/null +++ b/macros/generic/2up/doc/2up-doc.tex @@ -0,0 +1,499 @@ +%% +%% $Id: 2up-doc.tex 1180 2020-05-09 10:02:00Z herbert $ +\documentclass[12pt]{article} +%\usepackage[T1]{fontenc} +\usepackage{libertinus} +\usepackage{url} + +\usepackage{2up} +\special{landscape} + +\let\TUfv\fileversion + +%% INSTRUCTIONS FOR TWO-UP PRINTING. +%% 3. Uncomment one of the booklet options, if desired. +%% +%\targetlayout{twosided} +\TwoupWrites + +% \targetlayout{Booklet} %% Booklet printing with 2-sided printer/copier. +% \targetlayout{booklet} %% Booklet printing with 1-sided printer/copier. + +\twouplegaltarget +\target{\magstepminus1}{29.6cm}{21cm} +\source{\magstep0}{21cm}{29.6cm} + +\makeatletter +%% PAGE NUMBERING: +%% Adjust page numbering if using booklet layout option. +\def\next{\if@leftpage\else\stepcounter{page}\fi} +\@ifundefined{target@stop}{}{\next} + +%% Special list: +\newcommand\namelistlabel[1]{\mbox{\bf #1}\hfil} +\newenvironment{namelist}[1]% + {\begin{list}{}% + {\let\makelabel\namelistlabel + \settowidth{\labelwidth}{#1} + \setlength{\leftmargin}{1.1\labelwidth}}}% + {\end{list}} + +%% VERBATIM: +%% +\begingroup + \catcode`\{=12 \catcode`\}=12 + \catcode`\(=1 \catcode`\)=2 + \catcode`\+=0 \catcode`\\=12 + +gdef+|(\) % \| = character \ + +gdef+{({) % \{ = character { + +gdef+}(}) % \} = character } ++endgroup +\def\Backslash{\protect\|} +%% +%% Define some functional font commands: +%% +\def\MainFont{\tt} % For macro definitions. +\def\UsageFont{\tt} % For in-line macro names. +\def\InlineFont{\tt} % For other in-line snipets of code. +\def\MetaFont{\rm\it} % For meta arguments. +%% +%% Short-cuts for font commands: +%% +\def\s#1{\string#1} +\def\t#1{{\InlineFont\string#1}} % For other in-line code. +\def\m#1{{\MetaFont #1\/}} % For just putting things in italics +\def\M#1{{\InlineFont\{\m{#1}\}}} % Arg is in italic, enclosed in tt braces. +\let\N\t % For in-line macro names. +\catcode`\<=13 \def<#1>{\m{#1}} % +\catcode`\"=13\def"{\verb"} % Short verb +%% +%% This is for listing macro definitions in a quote-like environment. +%% +\begingroup + \catcode`\[=1 \catcode`\]=2 + \catcode`\{=13 \catcode`\}=12 + \gdef\@MD[% + \catcode`\{=13 \catcode`\}=12 + \def{##1}[\{[\MetaFont ##1]\}]] +\endgroup +\def\MD{% + \quote + \begingroup + \@MD + \def\end{\endgroup\end}% + \def\\{\@centercr\s}% + \MainFont + \s} +\def\endMD{\endquote} +%% +%% End preamble. +\catcode`\@=12 + +\begin{document} + +\title{Documentation for 2up.tex:\\ + Two-up printing for Generic TeX} +\author{Timothy Van Zandt\thanks{Version 1.3a prepared by Herbert Voß. The documentation was put into + \LaTeX\ format by David Todd and Herbert Voß}\\ \url{tvz@Princeton.EDU}} +\date{Version \TUfv\\[3pt] \today} + +\maketitle +\thispagestyle{empty} + +\begin{abstract} + "2up.tex"/"2up.sty" allows one to print a document two-up, with +considerable flexibility as to paper size and layout. It produces a standard +dvi file, and does not involve an additional dvi or PostScript filter. It +should work with most \TeX\ macro packages. + +\end{abstract} + +\clearpage +\tableofcontents +\clearpage + +\section{Usage} +Load 2up as a \LaTeX\ package with \texttt{\textbackslash usepackage}. +There is a good chance you will get the desired layout. See the rest of +this documentation for detailed information on controlling 2up. + +\section{Comparison with other methods} + +There are other tools for two-up printing: +\begin{description} +\item[PostScript filters] +These work well as long as you only use PostScript fonts (as opposed to the +usual Metafont fonts). Otherwise, the PostScript filter scales bitmapped +fonts, and the quality is lower than with "2up.tex". + +\item[Rokicki's dvidvi] +"dvidvi" is a versatil tool that does much more than +2up printing. However, if only rearranges the pages, and does not adjust the +magnification to ensure that the pages fit properly in a two-up format. It +also adds one more step to the \TeX-dvi-printer cycle. "2up.tex", on the other +hand, combines the changes to \TeX's magnification and page layout with the +rearranging of the pages, all with an easy-to-use interface and from within +your \TeX\ document. (See Section \ref{dvidvi} on using both "2up.tex" and +"dvidvi" together.) +\end{description} + +\section{A warning about fonts} + +Two-up printing generally involves reducing a document, and thus using fonts +sizes that are not typically found on your system. If you are using bitmapped +fonts (standard for \TeX\ users), and you do not have and cannot generate the +extra fonts bitmaps, you will find 2up.sty (and any other method of two-up +printing) to give very poor quality output. + +If you are using a program like Rokicki's "dvips" that can generate extra font +bitmaps as needed, you will find that it takes a long time to print your 2up +document the first few times, as "dvips" is busy making the extra fonts. This +problem will go away. Be thankful you have such an easy way to get extra font +bitmaps. + +\section{Source and target dimensions} + +Set the target and source layout: +\begin{MD} + \source{mag}{width}{height}\\ + \target{mag}{width}{height} +\end{MD} + +\begin{itemize} +\item The ``source'' layout is the layout of your document +the way it is usually printed. The ``target'' layout is the layout when it +is printed two-up. + +\item and are the true width and height of the paper, +when looking at the output right-side-up. + +\item refers to the source and target magnification. It should be an +integer, equal to 1000 times the magnification factor. There are also some +magic magnification numbers: +\begin{description} +\item[$\setminus$magstep] for a magnification of 1.2$^n$ (n=0,...,5), or + +\item[$\setminus$magstepminus] for a magnification of 1.2$^{-n}$ +(n=0,...,5). +\end{description} +Using these magnification values will make best use of the available fonts on +your system. +\end{itemize} + +"2up.tex" takes each source page, and centers in half a target page. To get +the pages to fit, the magnification of the document typically has to be +reduced. If you find that the pages are too crowded, try reducing the target +magnification. If they are too lonely, try increasing the target +magnification. + +If you want to adjust the positioning of the scaled pages, try changing the +values of "\hoffset" or "\voffset" with "\advance" or \LaTeX's "\addtolength". + +Don't change the magnification of your document after using the "\target" +command, as you will override the settings made by 2up.tex. + +You can also specify some options: +\begin{MD} + \targetlayout{options} +\end{MD} +where is a comma separated list with no spaces. Valid +options are: +\begin{namelist}{topbottomxxx} + +\item [topbottom] The two source pages are printed one on top of the other. +\item [twosided] Odd pages are always printed on the right or the bottom. +\item [booklet] Pages are printed like a booklet. See Section \ref{booklet}. +\item [Booklet] Like "booklet", but for two-sided printers/copiers. +\item [dvidvi] For arranging in two-up layout with "dvidvi". See Section +\ref{dvidvi}. + +\end{namelist} + +The only other changes you might want to make to your document are the +following: +\begin{itemize} +\item You have to see to it that the target output is printed with the +correct orientation (landscape or portrait). See the documentation for your +dvi driver for details. + +\item "2up.tex" will inserts a line between pages if you change the following +dimensions: +\begin{namelist}{pagesepwidthxxx} +\item [$\setminus$pagesepwidth] Thickness of line. (Default 0pt) +\item [$\setminus$pageseplength] Length of line. (Default 6.5in) +\item [$\setminus$pagesepoffset] Distance from bottom of page to bottom of +line, or (with "topbottom" layout) from side of page to beginning of line. +(Default 1in) +\end{namelist} + +\item You can, but do not need to, use the following commands: +\begin{namelist}{twoupemptypagexxx} + +\item [$\setminus$twoupemptypage] inserts a completely blank half page +in the target. + +\item [$\setminus$twoupclearpage] \LaTeX\ users: ejects a complete target +page. + +\item [$\setminus$twoupeject] Plain \TeX users: ejects a complete target +page. + +\end{namelist} +\end{itemize} + +\section{Defaults} + + The following commands set the parameters for some common sources and +targets. The definitions of these commands are also useful examples. + + For A4 paper, just replace "8.5in" and "11in" in the definitions below by +the width and height of A4 paper. + +\begin{description} + +\item [$\setminus$twouparticle] + +This is the default for \LaTeX. +\begin{namelist}{Sourcexx} + +\item [Source:] A portrait document on 8.5x11 inch paper with wide margins as +used in \LaTeX's article style, and without marginal notes. + +\item [Target:] A landscape document on the same size paper, with the source +pages printed side by side. + +\item [Definition:]\hspace{1pt} +\begin{verbatim} +\target{\magstepminus1}{11in}{8.5in} +\source{\magstep0}{8.5in}{11in}} +\end{verbatim} +\end{namelist} + +If you use narrower side margins, or if you use marginal notes, then you +will need to use "\twoupplain" or \\ "\twouplegaltarget", defined below. + +\item [$\setminus$twoupplain] + +This is the default for non-\LaTeX. + +It is the same as "\twouparticle", but for source documents with narrower +margins. +\begin{namelist}{Sourcexxx} + +\item [Definition:]\hspace{1pt} +\begin{verbatim} +\target{\magstepminus2}{11in}{8.5in} +\source{\magstep0}{8.5in}{11in} +\end{verbatim} +\end{namelist} + +\item [$\setminus$twouplegaltarget] + +\begin{namelist}{Sourcexxx} +\item [Source:] A portrait document on 8.5x11 inch paper with just about any +margins and perhaps with marginal notes. + +\item [Target:] A landscape document on legal size paper (8.5x14 inches), +with the source pages printed side by side. + +\item [Definition:]\hspace{1pt} +\begin{verbatim} +\target{\magstepminus1}{14in}{8.5in} +\source{\magstep0}{8.5in}{11in} +\end{verbatim} +\end{namelist} + +\item [$\setminus$twouplandscape]\hspace{1pt} +\begin{namelist}{Sourcexxx} + +\item [Source:] A landscape document on 8.5x11 inch paper with just about any +margins. + +\item [Target:] A portrait document on the same size paper, with the +source pages stacked vertically. + +\item [Definition:]\hspace{1pt} +\begin{verbatim} +\target{\magstepminus2}{8.5in}{11in} +\source{\magstep0}{11in}{8.5in} +\targetlayout{topbottom} +\end{verbatim} +\end{namelist} + +\end{description} + + +\section{True Dimensions} + +\TeX\ lets you use `true' dimensions, as in +\begin{verbatim} + \topmargin 1truein + \setlength{\topmargin}{1truein} +\end{verbatim} +This sets the length to 1 inch +as it appears on the page, no matter what the magnification. + +Once you use `true' dimensions, it is impossible to change the +magnification of your document, and hence it is almost impossible +to use 2up.tex. You will get an error like: +\begin{verbatim} + ! Incompatible magnification (833); + the previous value will be retained (2000). +\end{verbatim}% + +The use of `true' dimensions might be hiding in macros or style files +you are using. For example, Plain \TeX's "\magnification" command uses +true dimensions; use "\mag" instead, and then set "\hsize" and +"\vsize" appropriately scaled. If you can't find the culprit `true' +dimension in your document or input files, try putting this on the +(very) first line of your document: +\begin{verbatim} + \mag 143 \voffset 1truein \mag 1000 +\end{verbatim} + +You will get the error listed above wherever true dimensions are used +(and in some other places as well). + + +\section{Page Cross-References} + + Page cross-references (e.g., in an index or table of contents) will not be +accurate with "2up.tex", because finished pages are not immediately shipped +out. This can also cause problems with some special \LaTeX\ styles that have +multiple ".aux" files (e.g., for each chapter). + + To get better, but not perfect, page cross-references, try putting the +command +\begin{verbatim} + \TwoupWrites +\end{verbatim} +at the beginning of your document, after inputting "2up.tex". This is good for +drafts, and may fix problems with \LaTeX\ styles that have multiple ".aux" +files. "\TwoupWrites" makes "\write" and "\read" "\immediate", if you know +what that means. It might cause problems of its own, but try it and see. + + To get accurate page cross-references: +\begin{enumerate} +\item Run the job without "2up.tex", until all cross-references +are properly resolved. Run any index utility at this point. + +\item Run the job ONE MORE TIME with "2up.tex"; it will use the +correct cross-references from the previous runs. (In \LaTeX\ documents, +it is useful at this point to include the "\nofiles" command, so that +the correct cross-references are preserved.) +\end{enumerate} + +\section{Booklets\label{booklet}} + +Here are some special considerations for making booklets: + +\begin{itemize} + +\item Use the "booklet" target layout if your printer or copier cannot print +two +sides directly. "2up.tex" prints out the ``tops'' of the pages, and then the +``bottoms'', so that you can copy or print on both sides by doing one side, +flipping the output over, and doing the other side. + +\item Use "Booklet" if your printer or copier can print directly on two sides. + +\item You must have enough memory and box registers to hold all the pages in +the document. A Big\TeX\ should be able to handle at least a 32-page booklet. + +\item Sometimes booklet printing is part of the design of a document, rather +than an afterthought. In this case, you should set up the margins for the +target half-page rather than using "2up.tex" to scale the document. For +example, if using \LaTeX, 8.5x11 inch paper, \LaTeX's twoside style option, +and headings, try the following page parameter changes: +\begin{verbatim} + \setlength{\oddsidemargin}{-0.2in} + \setlength{\evensidemargin}{-0.5in} + \setlength{\textwidth}{4.2in} + \setlength{\textheight}{6.5in} + \setlength{\topmargin}{-.4in} +\end{verbatim} +If you do this, "2up.tex" isn't adjusting margins or scaling the +document. You coould therefore get by without "2up.tex" by using "dvidvi". +\end{itemize} + +\section{Using dvidvi\label{dvidvi}} + + With the "dvidvi" layout option, "2up.tex" takes care of adjusting the +margins, and you then use "dvidvi" to arrange the pages in a two-up +format. The advantage is that cross referencing comes out right. +The disadvantage is that it involves one more step. + +Start by \TeX ing your document with "2up.tex" and the "dvidvi" layout option. +Then run the dvi file through "dvidvi". Specify the offsets for "dvidvi" at +the middle of the page. E.g., for +a side-by-side layout on 8.5x11in paper, use +\begin{verbatim} + dvidvi '2:0,1(5.5in,0in)' foo bar +\end{verbatim} +For other paper sizes, replace "5.5in" by half the target paper width. For the +"topbottom" layout, reverse the dimensions, e.g., +(0in,5.5in). For booklet printing, see the +the documentation for "dvidvi". + + +\section{Compatibility\label{compatibility}} + + These macros should work with most \TeX\ macro packages, except for +the following possible but unlikely compatibility problems: + +\begin{itemize} + +\item If you use a macro package other than \LaTeX\ that does unusual things +to end a document and/or that modifies the definition of "\end", you may +find that the last page is nor printed or that an extra page with headings +is inserted at the end of the document. This is fixable on a case-by-case +basis. See the redefinition of "\end" in "2up.tex". + +\item "2up.tex" might not work if you meddle with \TeX's "\shipout" primitive +after loading "2up.tex". + +\item If the first page of the source document is not on the first two-up +target +page (possible, for example, with two-sided printing and the "booklet" +option, but generally unlikely), "\special"'s that come at the beginning +of the document also do not get onto the first page of output. This can mess +up "\special"'s for landscape printing or +including a PostScript header file. In this case, you have to specify +these things as command line options when using your dvi driver. + +\end{itemize} + + +\section{Changes} +\begin{namelist}{V0.9xxx} +\raggedright + +\item [V0.9a] Everything redone. Too many differences to point out. + +\item [V0.9b] Interface redone again. "booklet" option added. + +\item [V0.9c] Pages ship out a little earlier. A few bugs fixed. + + Parameters "\pageseplength" and "\pagesepthickness" added. + +\item [V0.9d] Fixed bug with "\twoupclearpage" and "\twoupeject". + +\item [V0.9e] Made pages be counted (from dvi driver's viewpoint) by the +physical page number. + +\item [V0.9f] Parameter "\pagesepoffset" added, and "\pagesepthickness" +changed to "\pagesepwidth". + +\item [V1.0] None. Just seemed seemed like it was time to call it 1.0 + +\item [V1.1] Added "Booklet" and "dvidvi" target layouts. + + "\hoffset" and "\voffset" in source document now have expected effect. + +\item[V1.2] Fixed incompatibility problem with AmS-\TeX/AmS-\LaTeX. + Added "\TwoupWrites" command. +\item[V1.3] LPPL license and updated documentation (hv). + +\end{namelist} +\end{document} +%% END 2up-doc diff --git a/macros/generic/2up/latex/2up.sty b/macros/generic/2up/latex/2up.sty new file mode 100644 index 0000000000..bbc4b143da --- /dev/null +++ b/macros/generic/2up/latex/2up.sty @@ -0,0 +1,9 @@ +%% $Id: 2up.sty 1179 2020-05-09 09:57:53Z herbert $ +\ProvidesPackage{2up}[2010/05/15 package wrapper for + 2up.tex (hv)] +\input{2up.tex} +\ProvidesFile{2up.tex} + [\filedate\space v\fileversion\space `2up' (tvz,hv)] +% +\endinput + diff --git a/macros/generic/2up/tex/2up.tex b/macros/generic/2up/tex/2up.tex new file mode 100644 index 0000000000..080d7ce9f1 --- /dev/null +++ b/macros/generic/2up/tex/2up.tex @@ -0,0 +1,363 @@ +%% +%% $Id: 2up.tex 1180 2020-05-09 10:02:00Z herbert $ +%% +%% COPYRIGHT 1992/2010, by Timothy Van Zandt, tvz@Princeton.EDU +%% COPYRIGHT 2010-2020, by Herbert Voss, hvoss@tug.org +%% +%% Copyright: +%% This program can be redistributed and/or modified under the terms +%% of the LaTeX Project Public License Distributed from CTAN archives +%% in directory macros/latex/base/lppl.txt. +%% +%% DESCRIPTION: +%% 2up.tex/2up.sty provides two-up printing for Generic TeX or LaTeX (e.g., +%% Plain, LaTeX, xetex, xelatex, AmSTeX and AmS-LaTeX). It produces a standard (x)dvi file, +%% and does not involve an additional dvi or PostScript filter. It has a +%% flexible interface for specifying paper size and layout. +%% +% +\def\fileversion{1.3a} +\def\filedate{2020/05/09} +% +\csname TwoUpLoaded\endcsname +\let\TwoUpLoaded\endinput +% +\edef\TheAtCode{\the\catcode`\@} +\catcode`\@=11\relax +\message{\space\space v\fileversion\space\space \filedate\space\space } +% +% Parameter registers: +\newdimen\@targetwidth +\newdimen\@targetheight +\newdimen\@sourcewidth +\newdimen\@sourceheight +\newdimen\pageseplength +\newdimen\pagesepwidth +\newdimen\pagesepoffset +\newif\if@sidebyside +\@sidebysidetrue +\newif\if@twosided +% +% Registers used by output routine. +\newif\if@leftpage +\@leftpagetrue +\newbox\@leftpage +\newbox\@rightpage +\newcount\@physicalpage +% +% Since pages are shipped out half as often: +\multiply\maxdeadcycles by 2 +% +% Registers used only for booklet layout: +\begingroup + \let\newcount\relax + \gdef\booklet@registers{% + \newcount\bookletpage + \bookletpage=0 + \newcount\leftpagenumber + \newcount\rightpagenumber + \multiply\maxdeadcycles by 20} +\endgroup +% +% A useful extension of the \magstep macro. +\def\magstepminus#1{% + \ifcase#1 \@m\or 833\or 694\or 579\or 482\or 401\fi\relax} +% +% \@targetwidth and \@targetheight are set to the *unmagnified* dimensions +% of the target page. \inv@targetmag is the inverse of the target +% magnification. +{\catcode`\p=12\catcode`\t=12\gdef\@@inv@@mag#1pt#2{\def#2{#1}}} +\def\target#1#2#3{% + \mag #1\relax + \@targetwidth=1000pt + \divide\@targetwidth by #1\relax + \expandafter\@@inv@@mag\the\@targetwidth\inv@targetmag + \@targetwidth=#2\relax + \@targetwidth=\inv@targetmag\@targetwidth + \@targetheight=#3\relax + \@targetheight=\inv@targetmag\@targetheight} +% +% Like \target, but for the source: +\def\source#1#2#3{% + \@sourcewidth=1000pt + \divide\@sourcewidth by #1\relax + \expandafter\@@inv@@mag\the\@sourcewidth\inv@sourcemag + \@sourcewidth=#2\relax + \@sourcewidth=\inv@sourcemag\@sourcewidth + \@sourceheight=#3\relax + \@sourceheight=\inv@sourcemag\@sourceheight} +% +% \targetlayout does a loop that reads the comma separated arguments. +% There can be no extraneous spaces. +\def\targetlayout#1{\process@targetlayout#1,stop,} +\def\process@targetlayout#1,{% + \expandafter\let\expandafter\next\csname target@#1\endcsname + \ifx\next\relax + \begingroup + \errhelp{Valid target layouts are "topbottom", "twosided", + "booklet", "Booklet" and "dvidvi".}% + \errmessage{`#1' is invalid 2up target layout - ignored.}% + \endgroup + \expandafter\process@targetlayout + \else + \next + \fi} +\def\target@stop{} +\def\target@booklet{% + \booklet@registers + \def\ship@@@leftpage{\save@booklet\@leftpage}% + \def\ship@@@rightpage{\save@booklet\@rightpage}% + \@leftpagefalse + \def\twoup@eject{\twoup@eject@booklet}% + \expandafter\process@targetlayout} +\def\target@Booklet{% + \def\booklet@@loop{\Booklet@@loop}% + \target@booklet} +\def\target@twosided{% + \@twosidedtrue + \expandafter\process@targetlayout} +\def\target@topbottom{% + \def\make@@halfpage{\make@@halftopbottom}% + \def\make@fullpage{\make@fulltopbottom}% + \@sidebysidefalse + \expandafter\process@targetlayout} +\def\target@dvidvi{% + \def\ship@@@leftpage{\ship@dvidvi\@leftpage}% + \def\ship@@@rightpage{\ship@dvidvi\@rightpage}% + \expandafter\process@targetlayout} +% +% TeX's \shipout primitive is saved as \&normal@shipout, and then \shipout +% is defined to save each page to \@leftpage or \@rightpage and to print out +% every two. With the twosided layout, filler pages are added when needed. +\expandafter\let\csname &normal@shipout\endcsname\shipout +\def\shipout{% + \if@leftpage + \global\@leftpagefalse + \def\next{\afterassignment\ship@leftpage\global\setbox\@leftpage=}% + \if@twosided + \ifodd\count\z@ + \global\setbox\@leftpage=\hbox{}% + \make@@halfpage\@leftpage\ship@@@leftpage + \def\next{\shipout}% + \fi + \fi + \else + \global\@leftpagetrue + \def\next{\afterassignment\ship@rightpage\global\setbox\@rightpage=}% + \if@twosided + \ifodd\count\z@ + \else + \global\setbox\@rightpage=\hbox{}% + \make@@halfpage\@rightpage\ship@@@rightpage + \def\next{\shipout}% + \fi + \fi + \fi + \next} +% +% The job of \ship@leftpage and \ship@rightpage is to invoke \ship@@leftpage +% or \ship@@rightpage at the right time. \shipout is followed either +% (i) by an \hbox, \vbox or \vtop, in which case \ship@leftpage is invoked +% after the opening {. \@leftpage is void, and \ship@leftpage invokes +% \ship@@leftpage after the closing }, or +% (ii) by a \box or \copy, in which case \ship@leftpage is invoked after +% the full assignment. \@leftpage is not voide, and \ship@leftpage invokes +% \ship@@leftpage immediately. +\def\ship@leftpage{% + \ifvoid\@leftpage\aftergroup\ship@@leftpage\else\ship@@leftpage\fi} +\def\ship@rightpage{% + \ifvoid\@rightpage\aftergroup\ship@@rightpage\else\ship@@rightpage\fi} +% +% \ship@@leftpage/\ship@@rightpage take the output box, and first make it +% into a fully-size source page (with \make@halfpage) and then this is +% centered horizontally and vertically in half of a target page (with +% \make@@halfpage). Then they are shipped individually or together. +\def\ship@@leftpage{\make@halfpage\@leftpage\ship@@@leftpage} +\def\ship@@rightpage{\make@halfpage\@rightpage\ship@@@rightpage} +\def\make@halfpage#1{% + \dp#1=\z@ + \setbox#1=\vbox to\@sourceheight{% + \vskip \inv@sourcemag in + \vskip \voffset + \hbox to\@sourcewidth{\hskip\inv@sourcemag in\hskip\hoffset\box#1\hss}% + \vss}% + \make@@halfpage#1} +% +% The definition of \make@@halfpage depends on the target layout. +\def\make@@halfsidebyside#1{% + \global\setbox#1=\vbox to\@targetheight{\vss + \hbox to.5\@targetwidth{\hss\box#1\hss}\vss}} +\def\make@@halftopbottom#1{% + \global\setbox#1=\vbox to.5\@targetheight{\vss + \hbox to\@targetwidth{\hss\box#1\hss}\vss}} +\def\make@@halfpage{\make@@halfsidebyside} +% +% The pages are generaly shipped in pairs: +\def\ship@twoup{% + \begingroup + \voffset=-\inv@targetmag in + \hoffset=\voffset + \global\advance\@physicalpage by 1 + \count\z@=\@physicalpage + \csname &normal@shipout\endcsname\make@fullpage + \endgroup} +\let\ship@@@leftpage\relax +\def\ship@@@rightpage{\ship@twoup} +% +% The definition of \make@fullpage depends on the layout: +\def\make@fullsidebyside{% + \hbox{\box\@leftpage\pagesep@sidebyside\box\@rightpage}} +\def\make@fulltopbottom{% + \vbox{\offinterlineskip\box\@leftpage\pagesep@topbottom\box\@rightpage}} +\def\make@fullpage{\make@fullsidebyside} +% +% A vertical or horizontal rule can be inserted. These can be redefined +% for other tricks: +\def\pagesep@sidebyside{% + \begingroup + \advance\pageseplength by \pagesepoffset + \pagesepwidth=\inv@targetmag\pagesepwidth + \kern -.5\pagesepwidth + \vrule height \inv@targetmag\pageseplength + depth -\inv@targetmag\pagesepoffset + width \pagesepwidth + \kern -.5\pagesepwidth + \endgroup} +\def\pagesep@topbottom{% + \begingroup + \pagesepwidth=\inv@targetmag\pagesepwidth + \vskip -.5\pagesepwidth + \moveright\inv@targetmag\pagesepoffset\hbox{% + \vrule height\pagesepwidth width\inv@targetmag\pageseplength}% + \vskip -.5\pagesepwidth + \endgroup} +% +% With the dvidvi layout, the pages are shipped individually: +\def\ship@dvidvi#1{% + \begingroup + \voffset=-\inv@targetmag in + \hoffset=\voffset + \csname &normal@shipout\endcsname\box#1% + \endgroup} +% +% With the booklet or Booklet layout, the pages are saved rather than +% shipped. +\begingroup +\let\newbox\relax +\gdef\save@booklet#1{% + \begingroup + \globaldefs=1 + \advance\bookletpage by 1 + \expandafter\newbox\csname bookletbox\the\bookletpage\endcsname + \expandafter\setbox\csname bookletbox\the\bookletpage\endcsname\box#1% + \endgroup} +\endgroup +% +% The pages are then printed at the end with the following macros: +\def\make@bookletpage#1{% + \setbox\ifodd#1\@rightpage\else\@leftpage\fi=% + \expandafter\box\csname bookletbox\the#1\endcsname} +\def\booklet@loop{% + \count\z@\rightpagenumber + \make@bookletpage\leftpagenumber + \make@bookletpage\rightpagenumber + \ship@twoup + \booklet@@loop} +\def\booklet@@loop{% + \advance\rightpagenumber by 2 + \advance\leftpagenumber by -2 + \ifnum\leftpagenumber<1\else\expandafter\booklet@loop\fi} +\def\Booklet@@loop{% + \advance\rightpagenumber by 1 + \advance\leftpagenumber by -1 + \ifnum\leftpagenumber<\rightpagenumber\else\expandafter\booklet@loop\fi} +% +% This one is easy: +\def\twoupemptypage{\shipout\hbox{}} +% +% This clears a whole target page if there is a saved left page. Note that +% this does not invoke the output routine; i.e., it is not like \clearpage +% or \supereject. See \twoupclearpage and \twoupeject below. +\def\twoup@eject{% + \if@leftpage\else + \global\setbox\@rightpage\hbox{}% + \make@@halfpage\@rightpage\ship@@@rightpage + \global\@leftpagetrue + \fi} +% +% This is the definition of \twoup@eject with the booklet option: +\def\twoup@eject@booklet{% + \leftpagenumber\bookletpage + \advance\leftpagenumber by 3 + \divide\leftpagenumber by 4 + \multiply\leftpagenumber by 4 + \rightpagenumber=1 + \ifnum\leftpagenumber>\bookletpage + \setbox\@leftpage\hbox{}% + \make@@halfpage\@leftpage + \loop + \setbox\@rightpage\copy\@leftpage + \save@booklet\@rightpage + \ifnum\leftpagenumber>\bookletpage + \repeat + \fi + \booklet@loop} +% +% This modification is needed for \LaTeX in order to get the last page +% printed out if the final page is a left page (the catcode business is +% because \enddocument is \let to \bye in amstex): +\begingroup +\expandafter\ifx\csname @latexerr\endcsname\relax + \catcode`\>=14\else\catcode`\>=9\fi\relax +>>\gdef\twoupclearpage{\clearpage\twoup@eject} +>>\expandafter\@temptokena\expandafter{\enddocument} +>>\xdef\enddocument{\noexpand\twoupclearpage\the\@temptokena} +\endgroup +% +% For most other macro packages we could just leave be and all pages would +% always be printed because of the way the \end primitive works (except that +% TeX will go bonkers with the booklet layout). However, +% sometimes a blank filler page would be printed *with* headings. We prefer +% the filler page to be truly blank. To achieve this, we hack the definition +% of \end. This may cause problems with some macros. +\expandafter\ifx\csname @latexerr\endcsname\relax + \let\twoup@@@end\end + \def\end{\twoup@eject\twoup@@@end} + \def\twoupeject{\par\vfil\supereject\twoup@eject} +\fi +% +% This is one workaround for the page cross-references problem +\def\TwoupWrites{% + \let\TwoupSaved@write\write + \let\TwoupSaved@read\read + \let\TwoupSaved@openout\openout + \let\TwoupSaved@closeout\closeout + \def\write{\TwoupSaved@write-1{}\immediate\TwoupSaved@write}% + \def\read{\TwoupSaved@write-1{}\immediate\TwoupSaved@read}% + \def\openout{\TwoupSaved@write-1{}\immediate\TwoupSaved@openout}% + \def\closeout{\TwoupSaved@write-1{}\immediate\TwoupSaved@closeout}% + \let\TwoupWrites\relax} +% +% Defaults: +\def\twouparticle{% + \target{\magstepminus1}{11in}{8.5in}% + \source{\magstep0}{8.5in}{11in}} +\def\twoupplain{% + \target{\magstepminus2}{11in}{8.5in}% + \source{\magstep0}{8.5in}{11in}} +\def\twouplegaltarget{% + \target{\magstepminus1}{14in}{8.5in}% + \source{\magstep0}{8.5in}{11in}}% +\def\twouplandscape{% + \target{\magstepminus2}{8.5in}{11in}% + \source{\magstep0}{11in}{8.5in}% + \targetlayout{topbottom}} +\expandafter\ifx\csname @latexerr\endcsname\relax + \twoupplain\else\twouparticle\fi +\pagesepwidth 0pt +\pageseplength 6.5in +\pagesepoffset 1in +% +\expandafter\catcode`\@=\TheAtCode\relax +\endinput +%% END 2up.tex/2up.sty diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/CHANGES.md b/macros/latex/contrib/biblatex-contrib/biblatex-ext/CHANGES.md index 2aa2f2c4e1..ce510da643 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/CHANGES.md +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/CHANGES.md @@ -1,5 +1,14 @@ # Changelog +## Version 0.8f (2020-05-09) + +See + +### Fixed +- Fixed inner cite delimiters for `\footcitetext` in `authoryear` + and `authortitle` (not `comp`) styles + (https://github.com/moewew/biblatex-ext/issues/19). + ## Version 0.8e (2020-05-05) @@ -7,7 +16,8 @@ See ### Fixed - Fixed `bbx:introcite` definition for `ext-numeric-comp`. -- Fixed issue with `labelprefix` in `\printbibtabular` (#18). +- Fixed issue with `labelprefix` in `\printbibtabular` + (https://github.com/moewew/biblatex-ext/pull/18). ### Changed - `biblatex-ext-tabular` now checks for the recommended `biblatex` diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oa-doiapi.sty b/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oa-doiapi.sty index 0f725cf626..2847bcd55c 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oa-doiapi.sty +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oa-doiapi.sty @@ -1,5 +1,5 @@ \ProvidesPackage{biblatex-ext-oa-doiapi} - [2020/05/05 v0.8e Obtain open access information from DOI via + [2020/05/09 v0.8f Obtain open access information from DOI via unpaywall.org and doi.org (MW)] \RequirePackage{etoolbox} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oa.sty b/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oa.sty index 3923763c44..fe862ed459 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oa.sty +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oa.sty @@ -1,5 +1,5 @@ \ProvidesPackage{biblatex-ext-oa} - [2020/05/05 v0.8e mark open access in biblatex bibliographies (MW)] + [2020/05/09 v0.8f mark open access in biblatex bibliographies (MW)] \RequirePackage{etoolbox} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oasymb-l3draw.sty b/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oasymb-l3draw.sty index b2857aa666..1807dc82f3 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oasymb-l3draw.sty +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oasymb-l3draw.sty @@ -1,7 +1,7 @@ \RequirePackage{expl3} \ProvidesExplPackage {biblatex-ext-oasymb-l3draw} - {2020/05/05} {0.8e} + {2020/05/09} {0.8f} {open access symbols with l3draw (MW)} \RequirePackage{xparse} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oasymb-pict2e.sty b/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oasymb-pict2e.sty index 7ec90ba7a1..89c7b01f9f 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oasymb-pict2e.sty +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oasymb-pict2e.sty @@ -1,5 +1,5 @@ \ProvidesPackage{biblatex-ext-oasymb-pict2e} - [2020/05/05 v0.8e open access symbols with pict2e (MW)] + [2020/05/09 v0.8f open access symbols with pict2e (MW)] \RequirePackage{etoolbox} \RequirePackage{kvoptions} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oasymb-tikz.sty b/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oasymb-tikz.sty index 8ce360fb61..1ea5644456 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oasymb-tikz.sty +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oasymb-tikz.sty @@ -1,5 +1,5 @@ \ProvidesPackage{biblatex-ext-oasymb-tikz} - [2020/05/05 v0.8e open access symbols with TikZ (MW)] + [2020/05/09 v0.8f open access symbols with TikZ (MW)] \RequirePackage{etoolbox} \RequirePackage{kvoptions} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-tabular.sty b/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-tabular.sty index 1e9d4989d5..f36dfcbb5d 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-tabular.sty +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-tabular.sty @@ -1,5 +1,5 @@ \ProvidesPackage{biblatex-ext-tabular} - [2020/05/05 v0.8e tabular bibliographies for biblatex (MW)] + [2020/05/09 v0.8f tabular bibliographies for biblatex (MW)] % Code based on Audrey's % (https://tex.stackexchange.com/users/4483/audrey) diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext.pdf b/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext.pdf index 5753cb029d..b0ce0a6f9b 100644 Binary files a/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext.pdf and b/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext.pdf differ diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext.tex b/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext.tex index e66aa4e21c..b9af8f0007 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext.tex +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext.tex @@ -455,7 +455,7 @@ \newcommand*{\ctan}{\mkbibacro{CTAN}} \newcommand*{\gitbaseurl}{https://github.com/moewew/biblatex-ext} -\newcommand*{\extblxversion}{0.8e} +\newcommand*{\extblxversion}{0.8f} \newcommand*{\biber}{Biber} \newcommand*{\gitissuelink}[1]{% \href{\gitbaseurl/issues/#1}{issue \##1 on github}} @@ -528,7 +528,7 @@ author = {Moritz Wemheuer}, link = {mwemheu@gmail.com},% revision = {\extblxversion}, - date = {\DTMDate{2020-05-05}}, + date = {\DTMDate{2020-05-09}}, } \hypersetup{% @@ -3176,6 +3176,10 @@ See also \filename{CHANGES.md}. The numbers on the right indicate the relevant section of the manual. \begin{changelog} +\begin{release}{0.8f}{2020-05-09} + \item Fixed inner cite delimiters for \cmd{footcitetext}% + \see{sec:opt:citedelims} +\end{release} \begin{release}{0.8e}{2020-05-05} \item Fixed \hyperopt{introcite} definition for \blxstyle{ext-numeric-comp}\see{sec:opt:style} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/blxextdoiapi.lua b/macros/latex/contrib/biblatex-contrib/biblatex-ext/blxextdoiapi.lua index 35cf4d3496..4f534fbc9a 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/blxextdoiapi.lua +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/blxextdoiapi.lua @@ -2,8 +2,8 @@ blxextdoiapi = blxextdoiapi or {} local blxextdoiapi_module = { name = "blxextdoiapi", - version = "v0.8e", - date = "2020/05/05", + version = "v0.8f", + date = "2020/05/09", description = "Obtain open access information from DOI via unpaywall.org", author = "Moritz Wemheuer", license = "LPPL v1.3c", diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic-verb.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic-verb.bbx index 0301dff918..b69180d642 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic-verb.bbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic-verb.bbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-alphabetic-verb.bbx} - [2020/05/05 v0.8e extended biblatex alphabetic-verb + [2020/05/09 v0.8f extended biblatex alphabetic-verb bibliography style (MW)] \RequireBibliographyStyle{ext-standard} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic-verb.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic-verb.cbx index a7f71436d0..fa8dd1ea36 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic-verb.cbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic-verb.cbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-alphabetic-verb.cbx} - [2020/05/05 v0.8e extended biblatex alphabetic-verb citation style + [2020/05/09 v0.8f extended biblatex alphabetic-verb citation style (MW)] \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic.bbx index 0e960af4ba..d113a3f304 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic.bbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic.bbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-alphabetic.bbx} - [2020/05/05 v0.8e extended biblatex alphabetic bibliography style (MW)] + [2020/05/09 v0.8f extended biblatex alphabetic bibliography style (MW)] \RequireBibliographyStyle{ext-standard} \RequireBibliographyStyle{alphabetic} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic.cbx index a205aee7fd..b6435c7dc4 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic.cbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic.cbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-alphabetic.cbx} - [2020/05/05 v0.8e extended biblatex alphabetic citation style (MW)] + [2020/05/09 v0.8f extended biblatex alphabetic citation style (MW)] \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex} {}{}{}{} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-common.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-common.bbx index 041f62aae6..4f1836c73b 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-common.bbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-common.bbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-authortitle-common.bbx} - [2020/05/05 v0.8e common files for extended biblatex + [2020/05/09 v0.8f common files for extended biblatex authortitle bibliography styles (MW)] \RequireBibliographyStyle{ext-dashed-common} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-comp.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-comp.bbx index 495463a078..c8baf8aeef 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-comp.bbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-comp.bbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-authortitle-comp.bbx} - [2020/05/05 v0.8e extended biblatex authortitle-comp + [2020/05/09 v0.8f extended biblatex authortitle-comp bibliography style (MW)] \RequireBibliographyStyle{ext-standard} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-comp.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-comp.cbx index 70696801b0..dd58b0919b 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-comp.cbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-comp.cbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-authortitle-comp.cbx} - [2020/05/05 v0.8e extended biblatex authortitle-comp + [2020/05/09 v0.8f extended biblatex authortitle-comp citation style (MW)] \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ibid.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ibid.bbx index 0bc38eed59..45ff05afe8 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ibid.bbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ibid.bbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-authortitle-ibid.bbx} - [2020/05/05 v0.8e extended biblatex authortitle-ibid + [2020/05/09 v0.8f extended biblatex authortitle-ibid bibliography style (MW)] \RequireBibliographyStyle{ext-standard} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ibid.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ibid.cbx index f98db03fe8..6449176a7b 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ibid.cbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ibid.cbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-authortitle-ibid.cbx} - [2020/05/05 v0.8e extended biblatex authortitle-ibid + [2020/05/09 v0.8f extended biblatex authortitle-ibid citation style (MW)] \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex} @@ -21,6 +21,9 @@ \DeclareFieldFormat{extblx@innertextcitedelims}{#1} \DeclareFieldFormat{extblx@innerfootcitedelims}{% \csuse{mkinner\blx@delimcontext delims}{#1}} +\DeclareFieldAlias + {extblx@innerfootcitetextdelims} + {extblx@innerfootcitedelims} \renewbibmacro*{textcite}{% \global\boolfalse{cbx:loccit}% diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-icomp.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-icomp.bbx index 7876e9e561..425b307986 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-icomp.bbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-icomp.bbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-authortitle-icomp.bbx} - [2020/05/05 v0.8e extended biblatex authortitle-icomp + [2020/05/09 v0.8f extended biblatex authortitle-icomp bibliography style (MW)] \RequireBibliographyStyle{ext-standard} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-icomp.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-icomp.cbx index 4dfcf3e596..c4ebc7e368 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-icomp.cbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-icomp.cbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-authortitle-icomp.cbx} - [2020/05/05 v0.8e extended biblatex authortitle-icomp + [2020/05/09 v0.8f extended biblatex authortitle-icomp citation style (MW)] \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-tcomp.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-tcomp.bbx index e64e4d6b06..416259ca25 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-tcomp.bbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-tcomp.bbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-authortitle-tcomp.bbx} - [2020/05/05 v0.8e extended biblatex authortitle-tcomp + [2020/05/09 v0.8f extended biblatex authortitle-tcomp bibliography style (MW)] \RequireBibliographyStyle{ext-standard} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-tcomp.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-tcomp.cbx index d42065b8e4..ad948e5d6c 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-tcomp.cbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-tcomp.cbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-authortitle-tcomp.cbx} - [2020/05/05 v0.8e extended biblatex authortitle-tcomp + [2020/05/09 v0.8f extended biblatex authortitle-tcomp citation style (MW)] \RequireCitationStyle{ext-authortitle-comp} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-terse.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-terse.bbx index 2ea567a395..86cfd6f54d 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-terse.bbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-terse.bbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-authortitle-terse.bbx} - [2020/05/05 v0.8e extended biblatex authortitle-terse + [2020/05/09 v0.8f extended biblatex authortitle-terse bibliography style (MW)] \RequireBibliographyStyle{ext-standard} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-terse.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-terse.cbx index f7e80f8d2e..548508cca7 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-terse.cbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-terse.cbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-authortitle-terse.cbx} - [2020/05/05 v0.8e extended biblatex authortitle-terse + [2020/05/09 v0.8f extended biblatex authortitle-terse citation style (MW)] \RequireCitationStyle{ext-authortitle} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ticomp.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ticomp.bbx index d66403c07f..2b5405a54a 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ticomp.bbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ticomp.bbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-authortitle-ticomp.bbx} - [2020/05/05 v0.8e extended biblatex authortitle-ticomp + [2020/05/09 v0.8f extended biblatex authortitle-ticomp bibliography style (MW)] \RequireBibliographyStyle{ext-standard} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ticomp.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ticomp.cbx index e14d08d3b9..a3f16343fd 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ticomp.cbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ticomp.cbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-authortitle-ticomp.cbx} - [2020/05/05 v0.8e extended biblatex authortitle-ticomp citation style + [2020/05/09 v0.8f extended biblatex authortitle-ticomp citation style (MW)] \RequireCitationStyle{ext-authortitle-icomp} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle.bbx index f681222b4a..8df5d53a0e 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle.bbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle.bbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-authortitle.bbx} - [2020/05/05 v0.8e extended biblatex authortitle + [2020/05/09 v0.8f extended biblatex authortitle bibliography style (MW)] \RequireBibliographyStyle{ext-standard} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle.cbx index e4970f6f02..52d35c840b 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle.cbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle.cbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-authortitle.cbx} - [2020/05/05 v0.8e extended biblatex authortitle citation style (MW)] + [2020/05/09 v0.8f extended biblatex authortitle citation style (MW)] \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex} {}{}{}{} @@ -20,6 +20,9 @@ \DeclareFieldFormat{extblx@innertextcitedelims}{#1} \DeclareFieldFormat{extblx@innerfootcitedelims}{% \csuse{mkinner\blx@delimcontext delims}{#1}} +\DeclareFieldAlias + {extblx@innerfootcitetextdelims} + {extblx@innerfootcitedelims} \renewbibmacro*{textcite}{% \printnames{labelname}% diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-common.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-common.bbx index d7d13ae99b..15f5a22fe4 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-common.bbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-common.bbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-authoryear-common.bbx} - [2020/05/05 v0.8e common files for extended biblatex + [2020/05/09 v0.8f common files for extended biblatex authoryear bibliography styles (MW)] \RequireBibliographyStyle{ext-dashed-common} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-comp.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-comp.bbx index da8576b8a4..51da89c84d 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-comp.bbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-comp.bbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-authoryear-comp.bbx} - [2020/05/05 v0.8e extended biblatex authoryear-comp + [2020/05/09 v0.8f extended biblatex authoryear-comp bibliography style (MW)] \RequireBibliographyStyle{ext-standard} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-comp.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-comp.cbx index 730a019236..c97f1314c2 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-comp.cbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-comp.cbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-authoryear-comp.cbx} - [2020/05/05 v0.8e extended biblatex authoryear-comp + [2020/05/09 v0.8f extended biblatex authoryear-comp citation style (MW)] \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex} @@ -15,6 +15,7 @@ \DeclareFieldFormat{parencitelabeldate}{#1} \DeclareFieldFormat{textcitelabeldate}{#1} \DeclareFieldFormat{footcitelabeldate}{#1} +\DeclareFieldAlias{footcitetextlabeldate}{footcitelabeldate} \DeclareDelimFormat{extradateonlycompcitedelim}{\addcomma} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ecomp.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ecomp.bbx index 636eb7fc15..afa46de018 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ecomp.bbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ecomp.bbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-authoryear-ecomp.bbx} - [2020/05/05 v0.8e biblatex authoryear-ecomp + [2020/05/09 v0.8f biblatex authoryear-ecomp bibliography style (MW)] \RequireBibliographyStyle{ext-standard} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ecomp.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ecomp.cbx index 52c3128efc..1c2cbd2e38 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ecomp.cbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ecomp.cbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-authoryear-ecomp.cbx} - [2020/05/05 v0.8e biblatex authoryear-ecomp + [2020/05/09 v0.8f biblatex authoryear-ecomp citation style (MW)] \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex} @@ -15,6 +15,7 @@ \DeclareFieldFormat{parencitelabeldate}{#1} \DeclareFieldFormat{textcitelabeldate}{#1} \DeclareFieldFormat{footcitelabeldate}{#1} +\DeclareFieldAlias{footcitetextlabeldate}{footcitelabeldate} \DeclareDelimFormat{extradateonlycompcitedelim}{\addcomma} \DeclareDelimFormat{extradateonlycompciterangedelim}{\bibrangedash} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ibid.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ibid.bbx index 2b9524b738..79fcbd2129 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ibid.bbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ibid.bbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-authoryear-ibid.bbx} - [2020/05/05 v0.8e extended biblatex authoryear-ibid + [2020/05/09 v0.8f extended biblatex authoryear-ibid bibliography style (MW)] \RequireBibliographyStyle{ext-standard} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ibid.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ibid.cbx index 435fbd61df..993c8e3210 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ibid.cbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ibid.cbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-authoryear-ibid.cbx} - [2020/05/05 v0.8e extended biblatex authoryear-ibid + [2020/05/09 v0.8f extended biblatex authoryear-ibid citation style (MW)] \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex} @@ -18,11 +18,15 @@ \DeclareFieldFormat{extblx@innertextcitedelims}{#1} \DeclareFieldFormat{extblx@innerfootcitedelims}{% \csuse{mkinner\blx@delimcontext delims}{#1}} +\DeclareFieldAlias + {extblx@innerfootcitetextdelims} + {extblx@innerfootcitedelims} \DeclareFieldFormat{citelabeldate}{#1} \DeclareFieldFormat{parencitelabeldate}{#1} \DeclareFieldFormat{textcitelabeldate}{#1} \DeclareFieldFormat{footcitelabeldate}{#1} +\DeclareFieldAlias{footcitetextlabeldate}{footcitelabeldate} \renewbibmacro*{cite:labeldate+extradate}{% \iffieldundef{labelyear} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-icomp.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-icomp.bbx index 05c0f43147..c33f3c48a7 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-icomp.bbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-icomp.bbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-authoryear-icomp.bbx} - [2020/05/05 v0.8e extended biblatex authoryear-icomp + [2020/05/09 v0.8f extended biblatex authoryear-icomp bibliography style (MW)] \RequireBibliographyStyle{ext-standard} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-icomp.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-icomp.cbx index 1ecbe0bcbc..0d4523d3fd 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-icomp.cbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-icomp.cbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-authoryear-icomp.cbx} - [2020/05/05 v0.8e extended biblatex authoryear-icomp + [2020/05/09 v0.8f extended biblatex authoryear-icomp citation style (MW)] \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex} @@ -15,6 +15,7 @@ \DeclareFieldFormat{parencitelabeldate}{#1} \DeclareFieldFormat{textcitelabeldate}{#1} \DeclareFieldFormat{footcitelabeldate}{#1} +\DeclareFieldAlias{footcitetextlabeldate}{footcitelabeldate} \DeclareDelimFormat{extradateonlycompcitedelim}{\addcomma} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-iecomp.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-iecomp.bbx index 26282876cc..38beb664a7 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-iecomp.bbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-iecomp.bbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-authoryear-iecomp.bbx} - [2020/05/05 v0.8e biblatex authoryear-iecomp + [2020/05/09 v0.8f biblatex authoryear-iecomp bibliography style (MW)] \RequireBibliographyStyle{ext-standard} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-iecomp.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-iecomp.cbx index d236e3ac8a..f80d14e828 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-iecomp.cbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-iecomp.cbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-authoryear-iecomp.cbx} - [2020/05/05 v0.8e biblatex authoryear-iecomp + [2020/05/09 v0.8f biblatex authoryear-iecomp citation style (MW)] \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex} @@ -15,6 +15,7 @@ \DeclareFieldFormat{parencitelabeldate}{#1} \DeclareFieldFormat{textcitelabeldate}{#1} \DeclareFieldFormat{footcitelabeldate}{#1} +\DeclareFieldAlias{footcitetextlabeldate}{footcitelabeldate} \DeclareDelimFormat{extradateonlycompcitedelim}{\addcomma} \DeclareDelimFormat{extradateonlycompciterangedelim}{\bibrangedash} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tcomp.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tcomp.bbx index 246e337f48..831bba4f94 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tcomp.bbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tcomp.bbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-authoryear-tcomp.bbx} - [2020/05/05 v0.8e extended biblatex authoryear-tcomp + [2020/05/09 v0.8f extended biblatex authoryear-tcomp bibliography style (MW)] \RequireBibliographyStyle{ext-standard} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tcomp.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tcomp.cbx index 31047b784b..d8a2265085 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tcomp.cbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tcomp.cbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-authoryear-tcomp.cbx} - [2020/05/05 v0.8e extended biblatex authoryear-tcomp + [2020/05/09 v0.8f extended biblatex authoryear-tcomp citation style (MW)] \RequireCitationStyle{ext-authoryear-comp} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tecomp.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tecomp.bbx index 504e21601e..20918ade3e 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tecomp.bbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tecomp.bbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-authoryear-tecomp.bbx} - [2020/05/05 v0.8e extended biblatex authoryear-tecomp + [2020/05/09 v0.8f extended biblatex authoryear-tecomp bibliography style (MW)] \RequireBibliographyStyle{ext-standard} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tecomp.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tecomp.cbx index cb5d0a7be2..a7cb3a12c7 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tecomp.cbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tecomp.cbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-authoryear-tecomp.cbx} - [2020/05/05 v0.8e extended biblatex authoryear-tecomp + [2020/05/09 v0.8f extended biblatex authoryear-tecomp citation style (MW)] \RequireCitationStyle{ext-authoryear-ecomp} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-terse.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-terse.bbx index ecc6743314..b47a1ebf63 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-terse.bbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-terse.bbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-authoryear-terse.bbx} - [2020/05/05 v0.8e extended biblatex authoryear-terse + [2020/05/09 v0.8f extended biblatex authoryear-terse bibliography style (MW)] \RequireBibliographyStyle{ext-standard} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-terse.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-terse.cbx index 64608d3328..033d74e3fc 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-terse.cbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-terse.cbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-authoryear-terse.cbx} - [2020/05/05 v0.8e extended biblatex authoryear-terse + [2020/05/09 v0.8f extended biblatex authoryear-terse citation style (MW)] \RequireCitationStyle{ext-authoryear} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ticomp.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ticomp.bbx index 8ecb5c681f..259f8a5c22 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ticomp.bbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ticomp.bbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-authoryear-ticomp.bbx} - [2020/05/05 v0.8e extended biblatex authoryear-ticomp + [2020/05/09 v0.8f extended biblatex authoryear-ticomp bibliography style (MW)] \RequireBibliographyStyle{ext-standard} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ticomp.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ticomp.cbx index 7d5b4fca1b..2f6f0b3e2a 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ticomp.cbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ticomp.cbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-authoryear-ticomp.cbx} - [2020/05/05 v0.8e extended biblatex authoryear-ticomp citation style + [2020/05/09 v0.8f extended biblatex authoryear-ticomp citation style (MW)] \RequireCitationStyle{ext-authoryear-icomp} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tiecomp.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tiecomp.bbx index 896f94d3b2..675c175687 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tiecomp.bbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tiecomp.bbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-authoryear-tiecomp.bbx} - [2020/05/05 v0.8e extended biblatex authoryear-tiecomp + [2020/05/09 v0.8f extended biblatex authoryear-tiecomp bibliography style (MW)] \RequireBibliographyStyle{ext-standard} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tiecomp.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tiecomp.cbx index a464fdb3d2..e74f4c7af0 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tiecomp.cbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tiecomp.cbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-authoryear-tiecomp.cbx} - [2020/05/05 v0.8e extended biblatex authoryear-tiecomp citation style + [2020/05/09 v0.8f extended biblatex authoryear-tiecomp citation style (MW)] \RequireCitationStyle{ext-authoryear-iecomp} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear.bbx index 695a6b787c..7a19eaae83 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear.bbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear.bbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-authoryear.bbx} - [2020/05/05 v0.8e extended biblatex authoryear bibliography style (MW)] + [2020/05/09 v0.8f extended biblatex authoryear bibliography style (MW)] \RequireBibliographyStyle{ext-standard} \RequireBibliographyStyle{authoryear} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear.cbx index 207fb40552..2317b2cb3c 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear.cbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear.cbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-authoryear.cbx} - [2020/05/05 v0.8e extended biblatex authoryear citation style (MW)] + [2020/05/09 v0.8f extended biblatex authoryear citation style (MW)] \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex} {}{}{}{} @@ -17,11 +17,17 @@ \DeclareFieldFormat{extblx@innertextcitedelims}{#1} \DeclareFieldFormat{extblx@innerfootcitedelims}{% \csuse{mkinner\blx@delimcontext delims}{#1}} +\DeclareFieldFormat{extblx@innerfootcitetextdelims}{% + \csuse{mkinner\blx@delimcontext delims}{#1}} +\DeclareFieldAlias + {extblx@innerfootcitetextdelims} + {extblx@innerfootcitedelims} \DeclareFieldFormat{citelabeldate}{#1} \DeclareFieldFormat{parencitelabeldate}{#1} \DeclareFieldFormat{textcitelabeldate}{#1} \DeclareFieldFormat{footcitelabeldate}{#1} +\DeclareFieldAlias{footcitetextlabeldate}{footcitelabeldate} \renewbibmacro*{cite:labeldate+extradate}{% \iffieldundef{labelyear} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-biblatex-aux.def b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-biblatex-aux.def index 7c03f1dd33..26af96b47c 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-biblatex-aux.def +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-biblatex-aux.def @@ -1,5 +1,5 @@ \ProvidesFile{ext-biblatex-aux.def} - [2020/05/05 v0.8e auxiliaries for extended biblatex citation style + [2020/05/09 v0.8f auxiliaries for extended biblatex citation style (MW)] \def\extblx@requiredbiblatexversion{3.14} @@ -94,7 +94,7 @@ \RegisterCiteDelims{outer}{textcite} \RegisterCiteDelims{outer}{footcite} \RegisterCiteDelims{outer}{footcitetext} -\DeclareOuterCiteDelimsAlias{footcite}{footcitetext} +\DeclareOuterCiteDelimsAlias{footcitetext}{footcite} \RegisterCiteDelims{inner}{cite} \RegisterCiteDelims{inner}{parencite} @@ -102,7 +102,7 @@ \RegisterCiteDelims{inner}{textcite} \RegisterCiteDelims{inner}{footcite} \RegisterCiteDelims{inner}{footcitetext} -\DeclareInnerCiteDelimsAlias{footcite}{footcitetext} +\DeclareInnerCiteDelimsAlias{footcitetext}{footcite} \newrobustcmd*{\mkextblxsupercite}[1]{% \mkbibsuperscript{% diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-dashed-common.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-dashed-common.bbx index f9491984c5..9af8ed6664 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-dashed-common.bbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-dashed-common.bbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-dashed-common.bbx} - [2020/05/05 v0.8e common files for extended biblatex + [2020/05/09 v0.8f common files for extended biblatex dashed bibliography styles (MW)] \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-comp.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-comp.bbx index 8dc1e5f515..033276caa4 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-comp.bbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-comp.bbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-numeric-comp.bbx} - [2020/05/05 v0.8e extended biblatex numeric-comp + [2020/05/09 v0.8f extended biblatex numeric-comp bibliography style (MW)] \RequireBibliographyStyle{ext-standard} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-comp.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-comp.cbx index cfc18f1da5..6e1354dcb2 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-comp.cbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-comp.cbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-numeric-comp.cbx} - [2020/05/05 v0.8e extended biblatex numeric-comp citation style (MW)] + [2020/05/09 v0.8f extended biblatex numeric-comp citation style (MW)] \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex} {}{}{}{} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-verb.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-verb.bbx index 99d666664d..1dcf95e0f7 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-verb.bbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-verb.bbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-numeric-verb.bbx} - [2020/05/05 v0.8e extended biblatex numeric-verb + [2020/05/09 v0.8f extended biblatex numeric-verb bibliography style (MW)] \RequireBibliographyStyle{ext-standard} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-verb.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-verb.cbx index be6ec78e99..84441e93e8 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-verb.cbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-verb.cbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-numeric-verb.cbx} - [2020/05/05 v0.8e extended biblatex numeric-verb citation style (MW)] + [2020/05/09 v0.8f extended biblatex numeric-verb citation style (MW)] \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex} {}{}{}{} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric.bbx index 13a6891446..3f07bed7e1 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric.bbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric.bbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-numeric.bbx} - [2020/05/05 v0.8e extended biblatex numeric bibliography style (MW)] + [2020/05/09 v0.8f extended biblatex numeric bibliography style (MW)] \RequireBibliographyStyle{ext-standard} \RequireBibliographyStyle{numeric} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric.cbx index 9357060a6d..f3e1661648 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric.cbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric.cbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-numeric.cbx} - [2020/05/05 v0.8e extended biblatex numeric citation style (MW)] + [2020/05/09 v0.8f extended biblatex numeric citation style (MW)] \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex} {}{}{}{} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-standard.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-standard.bbx index af1a5f3abc..7227d1f946 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-standard.bbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-standard.bbx @@ -1,9 +1,9 @@ -% biblatex-ext v0.8e (2020-05-05) +% biblatex-ext v0.8f (2020-05-09) % Maintainer: Moritz Wemheuer % Licence: LaTeX Project Public License v1.3c or later % \ProvidesFile{ext-standard.bbx} - [2020/05/05 v0.8e extended biblatex standard style (MW)] + [2020/05/09 v0.8f extended biblatex standard style (MW)] \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex} {}{}{}{} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-ibid.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-ibid.bbx index 7a628b8f79..a3b798a03b 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-ibid.bbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-ibid.bbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-verbose-ibid.bbx} - [2020/05/05 v0.8e extended biblatex verbose-ibid + [2020/05/09 v0.8f extended biblatex verbose-ibid bibliography style (MW)] \RequireBibliographyStyle{ext-standard} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-ibid.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-ibid.cbx index 8271dbc79d..876bf34d6d 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-ibid.cbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-ibid.cbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-verbose-ibid.cbx} - [2020/05/05 v0.8e extended biblatex verbose-ibid citation style (MW)] + [2020/05/09 v0.8f extended biblatex verbose-ibid citation style (MW)] \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex} {}{}{}{} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-inote.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-inote.bbx index 30694a6e6f..2f23acfbcc 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-inote.bbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-inote.bbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-verbose-inote.bbx} - [2020/05/05 v0.8e extended biblatex verbose-inote + [2020/05/09 v0.8f extended biblatex verbose-inote bibliography style (MW)] \RequireBibliographyStyle{ext-standard} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-inote.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-inote.cbx index c15b65704a..03d7aee300 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-inote.cbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-inote.cbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-verbose-inote.cbx} - [2020/05/05 v0.8e extended biblatex verbose-inote citation style (MW)] + [2020/05/09 v0.8f extended biblatex verbose-inote citation style (MW)] \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex} {}{}{}{} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-note.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-note.bbx index eb83127ee2..8d6e84eddd 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-note.bbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-note.bbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-verbose-note.bbx} - [2020/05/05 v0.8e extended biblatex verbose-note + [2020/05/09 v0.8f extended biblatex verbose-note bibliography style (MW)] \RequireBibliographyStyle{ext-standard} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-note.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-note.cbx index 65f928af8f..85cb719162 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-note.cbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-note.cbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-verbose-note.cbx} - [2020/05/05 v0.8e extended biblatex verbose-note citation style (MW)] + [2020/05/09 v0.8f extended biblatex verbose-note citation style (MW)] \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex} {}{}{}{} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad1.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad1.bbx index 189110d53f..c6f0d719ae 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad1.bbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad1.bbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-verbose-trad1.bbx} - [2020/05/05 v0.8e extended biblatex verbose-trad1 + [2020/05/09 v0.8f extended biblatex verbose-trad1 bibliography style (MW)] \RequireBibliographyStyle{ext-standard} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad1.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad1.cbx index acb9111ead..62f4efd31a 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad1.cbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad1.cbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-verbose-trad1.cbx} - [2020/05/05 v0.8e extended biblatex verbose-trad1 citation style (MW)] + [2020/05/09 v0.8f extended biblatex verbose-trad1 citation style (MW)] \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex} {}{}{}{} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad2.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad2.bbx index 798f81eb07..2696743659 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad2.bbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad2.bbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-verbose-trad2.bbx} - [2020/05/05 v0.8e extended biblatex verbose-trad2 + [2020/05/09 v0.8f extended biblatex verbose-trad2 bibliography style (MW)] \RequireBibliographyStyle{ext-standard} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad2.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad2.cbx index 441a31bff7..6456ad3cdc 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad2.cbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad2.cbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-verbose-trad2.cbx} - [2020/05/05 v0.8e extended biblatex verbose-trad2 citation style (MW)] + [2020/05/09 v0.8f extended biblatex verbose-trad2 citation style (MW)] \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex} {}{}{}{} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad3.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad3.bbx index 3f9d00ef11..5c808633ec 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad3.bbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad3.bbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-verbose-trad3.bbx} - [2020/05/05 v0.8e extended biblatex verbose-trad3 + [2020/05/09 v0.8f extended biblatex verbose-trad3 bibliography style (MW)] \RequireBibliographyStyle{ext-standard} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad3.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad3.cbx index 5119adad2b..aa93f6b569 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad3.cbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad3.cbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-verbose-trad3.cbx} - [2020/05/05 v0.8e extended biblatex verbose-trad3 citation style (MW)] + [2020/05/09 v0.8f extended biblatex verbose-trad3 citation style (MW)] \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex} {}{}{}{} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose.bbx index 983e5507e8..fb38e79ffa 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose.bbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose.bbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-verbose.bbx} - [2020/05/05 v0.8e extended biblatex verbose + [2020/05/09 v0.8f extended biblatex verbose bibliography style (MW)] \RequireBibliographyStyle{ext-standard} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose.cbx index aeaee467cd..0f70a00cac 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose.cbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose.cbx @@ -1,5 +1,5 @@ \ProvidesFile{ext-verbose.cbx} - [2020/05/05 v0.8e extended biblatex verbose citation style (MW)] + [2020/05/09 v0.8f extended biblatex verbose citation style (MW)] \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex} {}{}{}{} diff --git a/macros/latex/contrib/nicematrix/nicematrix-french.pdf b/macros/latex/contrib/nicematrix/nicematrix-french.pdf index 26f4bdf64a..5e5910a1ed 100644 Binary files a/macros/latex/contrib/nicematrix/nicematrix-french.pdf and b/macros/latex/contrib/nicematrix/nicematrix-french.pdf differ diff --git a/macros/latex/contrib/nicematrix/nicematrix-french.tex b/macros/latex/contrib/nicematrix/nicematrix-french.tex index 27ec881c96..7adcadf738 100644 --- a/macros/latex/contrib/nicematrix/nicematrix-french.tex +++ b/macros/latex/contrib/nicematrix/nicematrix-french.tex @@ -10,8 +10,9 @@ \usepackage{amsmath} \usepackage{array} -\usepackage{colortbl} \usepackage{nicematrix} +% \usepackage{colortbl} + \usepackage{tikz} \usetikzlibrary{fit} @@ -21,7 +22,7 @@ \usepackage{siunitx} -\usepackage{arydshln} +% \usepackage{arydshln} \usepackage{verbatim} % We use \MakeShortVerb of shortvrb and not \DefineShortVerb of fancyvrb @@ -84,9 +85,9 @@ \begin{abstract} L'extension LaTeX \pkg{nicematrix} fournit de nouveaux environnements similaires aux environnements classiques -|{array}| et |{matrix}| mais avec des fonctionnalités supplémentaires. Parmi ces fonctionnalités figurent la -possibilité de fixer la largeur des colonnes et de tracer des traits en pointillés continus entre les cases du -tableau. +|{tabular}|, |{array}| et |{matrix}| mais avec des fonctionnalités supplémentaires. Parmi ces fonctionnalités +figurent la possibilité de fixer la largeur des colonnes et de tracer des traits en pointillés continus entre les +cases du tableau. \end{abstract} \vspace{1cm} @@ -107,9 +108,7 @@ l'instruction habituelle : |\usepackage{nicematrix}|. Cette extension fournit quelques outils supplémentaires pour dessiner des matrices (au sens mathématique). Les principales caractéristiques sont les suivantes : \begin{itemize}\setlength{\itemsep}{0pt} -\item des lignes en pointillés continues\footnote{Si l'option de classe -\texttt{draft} est utilisée, ces lignes en pointillés ne sont pas tracées pour -accélérer la compilation.} ; +\item des lignes en pointillés continues ; \item des rangées et colonnes extérieures pour les labels ; \item un contrôle sur la largeur des colonnes. \end{itemize} @@ -134,9 +133,6 @@ L_n & a_{n1} & a_{n2} & \Cdots & a_{nn} Une commande|\NiceMatrixOptions| est fournie pour régler les options (la portée des options fixées par cette commande est le groupe TeX courant). - - - \bigskip \textbf{Un exemple d'utilisation pour les lignes en pointillés continues} @@ -193,17 +189,17 @@ L'extension \pkg{nicematrix} définit les nouveaux environnements suivants : \begin{ttfamily} \setlength{\tabcolsep}{3mm} \begin{tabular}{llll} -\{NiceMatrix\} & \{NiceArray\} & \{pNiceArray\} \\ -\{pNiceMatrix\} & & \{bNiceArray\} \\ -\{bNiceMatrix\} & & \{BNiceArray\} \\ -\{BNiceMatrix\} & & \{vNiceArray\} \\ -\{vNiceMatrix\} & & \{VNiceArray\} \\ -\{VNiceMatrix\} & & \{NiceArrayWithDelims\} \\ +\{NiceMatrix\} & \{NiceArray\} & \{NiceTabular\} \\ +\{pNiceMatrix\} & \{pNiceArray\} \\ +\{bNiceMatrix\} & \{bNiceArray\} \\ +\{BNiceMatrix\} & \{BNiceArray\} \\ +\{vNiceMatrix\} & \{vNiceArray\} \\ +\{VNiceMatrix\} & \{VNiceArray\} \\ + & \{NiceArrayWithDelims\} \end{tabular} \end{ttfamily} - \medskip Par défaut, les environnements |{NiceMatrix}|, |{pNiceMatrix}|, |{bNiceMatrix}|, |{BNiceMatrix}|, |{vNiceMatrix}| et |{VNiceMatrix}| se comportent quasiment comme les environnements correspondants de \pkg{amsmath} : |{matrix}|, @@ -211,13 +207,13 @@ et |{VNiceMatrix}| se comportent quasiment comme les environnements correspondan \medskip -L'environnement |{NiceArray}| est similaire à l'environnement |{array}| de l'extension |{array}|. Néanmoins, pour -des raisons techniques, dans le préambule de l'environnement |{NiceArray}|, l'utilisateur doit utiliser les lettres -|L|, |C| et~|R| au lieu de |l|, |c| et |r|. Il est possible d'utiliser les constructions |w{...}{...}|, -|W{...}{...}|\footnote{Pour les colonnes de type |w| et |W|, les cases sont composées en mode mathématique (dans - les environnements de \pkg{nicematrix}) alors que dans |{array}| de \pkg{array}, elles sont composées en mode - texte.}, \verb+|+, |>{...}|, |<{...}|, |@{...}|, |!{...}| et |*{n}{...}| mais les lettres |p|, |m| et |b| ne -doivent pas être employées. Voir p.~\pageref{NiceArray} la partie concernant |{NiceArray}|. +Les environnements |{NiceArray}| et |{NiceTabular}| sont similaires aux environnements |{array}| et |{tabular}| de +l'extension |{array}|. Néanmoins, pour des raisons techniques, dans le préambule de ces environnements, +l'utilisateur doit utiliser les lettres |L|, |C| et~|R| au lieu de |l|, |c| et |r|. Il est possible d'utiliser les +constructions |p{...}|, |m{...}|, |b{...}|, |w{...}{...}|, |W{...}{...}|, \verb+|+, |>{...}|, |<{...}|, |@{...}|, +|!{...}| et |*{n}{...}|. + +Voir p.~\pageref{NiceArray} la partie concernant |{NiceArray}| et |{NiceTabular}|. \section{Les lignes en pointillés continues} @@ -358,12 +354,12 @@ Considérons la matrice suivante qui a été composée classiquement avec l'envi \begin{BVerbatim}[baseline=c,boxwidth=10cm] $A = \begin{pmatrix} h & i & j & k & l & m \\ -x & & & & & x \\ +x & & & & & x \end{pmatrix}$ \end{BVerbatim} $A = \begin{pmatrix} h & i & j & k & l & m \\ -x & & & & & x \\ +x & & & & & x \end{pmatrix}$ @@ -375,12 +371,12 @@ modifiée.\par\nobreak \begin{BVerbatim}[baseline=c,boxwidth=10cm] $B = \begin{pmatrix} h & i & j & k & l & m \\ -x & \ldots & \ldots & \ldots & \ldots & x \\ +x & \ldots & \ldots & \ldots & \ldots & x \end{pmatrix}$ \end{BVerbatim} $B = \begin{pmatrix} h & i & j & k & l & m \\ -x & \ldots & \ldots & \ldots & \ldots & x \\ +x & \ldots & \ldots & \ldots & \ldots & x \end{pmatrix}$ \bigskip @@ -391,12 +387,12 @@ géométrie de la matrice n'est pas changée.\par\nobreak \begin{BVerbatim}[baseline=c,boxwidth=10cm] $C = \begin{pNiceMatrix} h & i & j & k & l & m \\ -x & \Ldots & \Ldots & \Ldots & \Ldots & x \\ +x & \Ldots & \Ldots & \Ldots & \Ldots & x \end{pNiceMatrix}$ \end{BVerbatim} $C = \begin{pNiceMatrix} h & i & j & k & l & m \\ -x & \Ldots & \Ldots & \Ldots & \Ldots & x \\ +x & \Ldots & \Ldots & \Ldots & \Ldots & x \end{pNiceMatrix}$ \bigskip @@ -408,12 +404,12 @@ seule instruction |\Ldots| suffit).\par\nobreak \begin{BVerbatim}[baseline=c,boxwidth=10cm] $D = \begin{pNiceMatrix}[~emphase#nullify-dots@] h & i & j & k & l & m \\ -x & \Ldots & & & & x \\ +x & \Ldots & & & & x \end{pNiceMatrix}$ \end{BVerbatim} $D = \begin{pNiceMatrix}[nullify-dots] h & i & j & k & l & m \\ -x & \Ldots & & & & x \\ +x & \Ldots & & & & x \end{pNiceMatrix}$ \medskip @@ -459,7 +455,7 @@ $\begin{pNiceMatrix} 1 & 2 & 3 & 4 & 5 \\ & ~emphase#\Hdotsfor{3}@ \\ 1 & 2 & 3 & 4 & 5 \\ -1 & 2 & 3 & 4 & 5 \\ +1 & 2 & 3 & 4 & 5 \end{pNiceMatrix}$ \end{BVerbatim} $\begin{pNiceMatrix} @@ -469,7 +465,7 @@ $\begin{pNiceMatrix} 1 & 2 & 3 & 4 & 5 \end{pNiceMatrix}$ - +\medskip Remarque : Contrairement à la commande |\hdotsfor| de \pkg{amsmath}, la commande |\Hdotsfor| est utilisable lorsque l'extension \pkg{colortbl} est chargée (mais vous risquez d'avoir des problèmes si vous utilisez |\rowcolor| sur la même rangée que |\Hdotsfor|). @@ -535,13 +531,13 @@ sont composés en mode mathématique avec |\scriptstyle|. $\begin{bNiceMatrix} 1 & \hspace*{1cm} & 0 \\[8mm] & ~emphase#\Ddots^{n \text{ times}}@ & \\ -0 & & 1 \\ +0 & & 1 \end{bNiceMatrix}$ \end{BVerbatim} $\begin{bNiceMatrix} 1 & \hspace*{1cm} & 0 \\[8mm] & \Ddots^{n \text{ times}} & \\ -0 & & 1 \\ +0 & & 1 \end{bNiceMatrix}$ \subsection{Personnalisation des lignes en pointillés} @@ -606,7 +602,7 @@ carrés et non pas ronds.\footnote{La raison de départ est que le format \texts \bigskip Voulant proposer des lignes avec des points ronds dans le style de celui de |\ldots| (au moins celui des fontes \emph{Computer Modern}), l'extension \pkg{nicematrix} contient en interne son propre système de ligne en pointillés -(qui, au passage n'utilise que \pkg{pgf} et non \pkg{tikz}). Ce style est appelé le style |standard|. Cette valeur +(qui, au passage, n'utilise que \pkg{pgf} et non \pkg{tikz}). Ce style est appelé le style |standard|. Cette valeur est la valeur initiale du paramètre |xdots/line-style|. \bigskip @@ -883,45 +879,23 @@ I & 0 & \Cdots &0 \\ \medskip Pour améliorer la lisibilité du code, une syntaxe alternative est proposée : on peut spécifier les instructions du -|code-after| à la fin de l'environnement, après le mot-clé |\CodeAfter|. +|code-after| à la fin de l'environnement, après le mot-clé |\CodeAfter|. Pour un exemple, voir page +\pageref{exemple-CodeAfter}. -\medskip -\begin{BVerbatim}[baseline=c,boxwidth=11cm] -\NiceMatrixOptions{xdots/shorten = 0.6 em} -\begin{pNiceMatrix} -I & 0 & \Cdots &0 \\ -0 & I & \Ddots &\Vdots\\ -\Vdots &\Ddots & I &0 \\ -0 &\Cdots & 0 &I -~emphase#\CodeAfter@ -~emphase#\line{2-2}{3-3}@ -\end{pNiceMatrix} -\end{BVerbatim} -\begin{scope} -\NiceMatrixOptions{xdots/shorten = 0.6 em} -$\begin{pNiceMatrix} -I & 0 & \Cdots &0 \\ -0 & I & \Ddots &\Vdots\\ -\Vdots &\Ddots & I &0 \\ -0 &\Cdots & 0 &I -\CodeAfter -\line{2-2}{3-3} -\end{pNiceMatrix}$ -\end{scope} - - -\section{L'environnement \{NiceArray\} et ses variantes} +\section{Les environnements \{NiceArray\} et \{NiceTabular\}} \label{NiceArray} -L'environnement |{NiceArray}| est similaire à l'environnement |{array}|. Comme pour |{array}|, l'argument -obligatoire est le préambule du tableau. Néanmoins, pour des raisons techniques, l'utilisateur doit utiliser les -lettres |L|, |C| et |R|\footnote{Les types de colonnes |L|, |C| et |R| sont définis localement à l'intérieur de - |{NiceArray}| avec la commande |\newcolumntype| de \pkg{array}. Cette définition masque une éventuelle définition - précédente. En fait, les types de colonnes |w| et |W| sont également redéfinis.} au lieu de |l|, |c| et |r|. +Les environnements |{NiceArray}| et |{NiceTabular}| sont similaires aux environnements |{array}| et |{tabular}|. +L'argument obligatoire est le préambule du tableau. Néanmoins, pour des raisons techniques, l'utilisateur doit +utiliser les lettres |L|, |C| et |R|\footnote{Les types de colonnes |L|, |C| et |R| sont définis localement à + l'intérieur de |{NiceArray}| avec la commande |\newcolumntype| de \pkg{array}. Cette définition masque une + éventuelle définition précédente.} au lieu de |l|, |c| et |r|. Dans une commande |\multicolumn|, on doit +également utiliser les lettres |L|, |C| et |R|. -Il est possible d'utiliser les constructions |w{...}{...}|, |W{...}{...}|, \verb+|+, |>{...}|, |<{...}|, |@{...}|, -|!{...}| et |*{n}{...}| mais les lettres |p|, |m| et |b| ne doivent pas être employées.\footnote{Dans une commande - |\multicolumn|, on doit également utiliser les lettres |L|, |C| et |R|.} +Il est possible d'utiliser les constructions |p{...}|, |m{...}|, |b{...}|, |w{...}{...}|, |W{...}{...}|, \verb+|+, +|>{...}|, |<{...}|, |@{...}|, |!{...}| et |*{n}{...}|. Néanmoins, dans l'environnement |{NiceArray}| (et ses +variantes), le contenu des colonnes de type |w| ou |W| est composé en mode mathématique (dans |{array}| de +\pkg{array}, elles sont composées en mode texte). \bigskip Sans surprise, l'extension \pkg{nicematrix} fournit également les variantes |{pNiceArray}|, |{vNiceArray}|, @@ -980,26 +954,26 @@ $\begin{~emphase#NiceArrayWithDelims@} {\downarrow}{\uparrow}{CCC}[margin] 1 & 2 & 3 \\ 4 & 5 & 6 \\ -7 & 8 & 9 \\ +7 & 8 & 9 \end{~emphase#NiceArrayWithDelims@}$ \end{BVerbatim} $\begin{NiceArrayWithDelims} {\downarrow}{\uparrow}{CCC}[margin] 1 & 2 & 3 \\ 4 & 5 & 6 \\ -7 & 8 & 9 \\ +7 & 8 & 9 \end{NiceArrayWithDelims}$ \bigskip \subsection{Le positionnement vertical des matrices} -L'extension \pkg{nicematrix} propose aussi une option |baseline| par la position verticale des matrices. Cette +L'extension \pkg{nicematrix} propose aussi une option |baseline| pour la position verticale des matrices. Cette option |baseline| prend comme valeur un entier qui indique le numéro de rangée dont la ligne de base servira de -ligne de base pour l'environnement |{NiceArray}|. +ligne de base pour le tableau. \medskip \begin{BVerbatim}[baseline=c,boxwidth=9cm] -$A = \begin{pNiceMatrix}[baseline=2] +$A = \begin{pNiceMatrix}[~emphase#baseline=2@] \frac{1}{\sqrt{1+p^2}} & p & 1-p \\ 1 & 1 & 1 \\ 1 & p & 1+p @@ -1134,7 +1108,7 @@ colonne |L| pour la dernière. composition de la «dernière rangée» et de la «dernière colonne». \begin{itemize} -\item Dans le cas d'un environnement avec préambule, comme |{NiceArray}| ou |{pNiceArray}|, le nombre de colonnes +\item Dans le cas d'un environnement avec préambule, comme |{NiceTabular}| ou |{pNiceArray}|, le nombre de colonnes se déduit évidemment du préambule. \item Dans le cas où l'option |light-syntax| (cf. p. \pageref{light-syntax}) est utilisée, \pkg{nicematrix} profite @@ -1146,7 +1120,7 @@ l'environnement donne le nombre de rangées (mais pas le nombre de colonnes). et l'écrit dans le fichier |.aux| pour pouvoir l'utiliser à la compilation suivante. \textsl{Néanmoins, il est possible de donner le numéro de la dernière rangée et le numéro de la dernière colonne en -arguments des options |last-row| et |last-col| pour ce qui permettra d'accélérer le processus complet de +arguments des options |last-row| et |last-col|, ce qui permettra d'accélérer le processus complet de compilation.} C'est ce que nous ferons dans la suite. \end{itemize} @@ -1294,36 +1268,7 @@ C_1 & C_2 & C_3 & C_4 \\ \bigskip Il est possible de changer dans \pkg{nicematrix} la lettre utilisée pour indiquer dans le préambule un trait -vertical en pointillés avec l'option |letter-for-dotted-lines| disponible dans |\NiceMatrixOptions|. Par exemple, -dans ce document, nous avons chargé l'extension \pkg{arydshln} qui utilise la lettre «|:|» pour indiquer un trait -vertical en tiretés. Par conséquent, en utilisant l'option |letter-for-dotted-lines|, on peut utiliser les traits -verticaux fournis à la fois par \pkg{arydshln} et par \pkg{nicematrix}. - - -\medskip -\begin{BVerbatim}[baseline=c,boxwidth=9.5cm] -\NiceMatrixOptions{letter-for-dotted-lines = I} -\arrayrulecolor{blue} -\begin{pNiceArray}{~emphase#C|C:CIC@} -1 & 2 & 3 & 4 \\ -5 & 6 & 7 & 8 \\ -9 & 10 & 11 & 12 -\end{pNiceArray} -\arrayrulecolor{black} -\end{BVerbatim} -\begin{scope} -\arrayrulecolor{blue} -\NiceMatrixOptions{letter-for-dotted-lines = I} -$\begin{pNiceArray}{C|C:CIC} -1 & 2 & 3 & 4 \\ -5 & 6 & 7 & 8 \\ -9 & 10 & 11 & 12 -\end{pNiceArray}$ -\arrayrulecolor{black} -\end{scope} - -\smallskip -On a utilisé |\arrayrulecolor| de \pkg{colortbl} pour colorier les trois traits. +vertical en pointillés avec l'option |letter-for-dotted-lines| disponible dans |\NiceMatrixOptions|. \bigskip @@ -1540,6 +1485,175 @@ Pour des raisons techniques, il n'est pas possible d'écrire |\Block{|$i$|-|$j$| (mais on peut écrire |\Block{|$i$|-|$j$|}<>{<}| avec le résultat attendu). +\section{Les couleurs des rangées et des colonnes} + +L'extension \pkg{colortbl} permet de colorier des cellules, des rangées ou des colonnes d'un tableau. Néanmoins, +l'affichage du \textsc{pdf} résultant n'est pas toujours parfait, en particulier quand on utilise également des +filets. Dans certains lecteurs de \textsc{pdf}, des filets verticaux semblent disparaître. De fines lignes +blanches peuvent également apparaître. + +\medskip +La version 4.0 de \pkg{nicematrix} propose des outils similaires qui ne présentent pas ces inconvénients. Elle +propose une option |code-before| pour du code qui sera exécuté \emph{avant} le tracé du tableau. Dans ce +|code-before|, de nouvelles commandes sont disponibles : |\cellcolor|, |\rectanglecolor|, |\rowcolor|, +|\columncolor|, |\rowcolors| et |\chessboardcolors|. + +\medskip +\begin{itemize} +\item La commande |\cellcolor| tient son nom de la commande |\cellcolor| de \pkg{colortbl}. + +Elle prend en arguments une couleur et une liste de cellules sous le format $i$-$j$ où $i$ est le numéro de ligne +et $j$ le numéro de colonne. + +\medskip +\begin{scope} +\hfuzz=10cm +\begin{BVerbatim}[boxwidth=10cm,baseline=c] +\begin{NiceTabular}{|C|C|C|}[code-before = ~emphase#\cellcolor{red!15}{3-1,2-2,1-3}@] +\hline +a & b & c \\ \hline +e & f & g \\ \hline +h & i & j \\ \hline +\end{NiceTabular} +\end{BVerbatim} +\begin{NiceTabular}{|C|C|C|}[code-before = \cellcolor{red!15}{3-1,2-2,1-3}] +\hline +a & b & c \\ \hline +e & f & g \\ \hline +h & i & j \\ \hline +\end{NiceTabular} +\end{scope} + +\bigskip +\item La commande |\rectanglecolor| prend trois arguments. Le premier est la couleur, les deux suivants fournissent +la case en haut à gauche et la case en bas à droite du rectangle. + +\medskip +\begin{scope} +\hfuzz=10cm +\begin{BVerbatim}[boxwidth=10cm,baseline=c] +\begin{NiceTabular}{|C|C|C|}[code-before = ~emphase#\rectanglecolor{red!15}{2-2}{3-3}@] +\hline +a & b & c \\ \hline +e & f & g \\ \hline +h & i & j \\ \hline +\end{NiceTabular} +\end{BVerbatim} +\begin{NiceTabular}{|C|C|C|}[code-before = \rectanglecolor{red!15}{2-2}{3-3}] +\hline +a & b & c \\ \hline +e & f & g \\ \hline +h & i & j \\ \hline +\end{NiceTabular} +\end{scope} + + + +\bigskip +\item La commande |\rowcolor| doit son nom à la commande |\rowcolor| de \pkg{colortbl}. Son premier argument est la +couleur et le deuxième est une liste de numéros de rangées ou bien d'intervalles de rangées sous la forme +$a$-$b$ (un intervalle de la forme $a$- représente toutes les rangées à partir de la rangée~$a$). + +\medskip + +\begin{scope} +\hfuzz=10cm +\begin{BVerbatim}[boxwidth=9cm,baseline=c] +$\begin{NiceArray}{LLL}[hvlines, ~emphase#code-before = \rowcolor{red!15}{1,3-5,8-}@] +a_1 & b_1 & c_1 \\ +a_2 & b_2 & c_2 \\ +a_3 & b_3 & c_3 \\ +a_4 & b_4 & c_4 \\ +a_5 & b_5 & c_5 \\ +a_6 & b_6 & c_6 \\ +a_7 & b_7 & c_7 \\ +a_8 & b_8 & c_8 \\ +a_9 & b_9 & c_9 \\ +a_{10} & b_{10} & c_{10} \\ +\end{NiceArray}$ +\end{BVerbatim} +% +$\begin{NiceArray}{LLL}% +[baseline=4,hvlines, code-before = \rowcolor{red!15}{1,3-5,8-}] +a_1 & b_1 & c_1 \\ +a_2 & b_2 & c_2 \\ +a_3 & b_3 & c_3 \\ +a_4 & b_4 & c_4 \\ +a_5 & b_5 & c_5 \\ +a_6 & b_6 & c_6 \\ +a_7 & b_7 & c_7 \\ +a_8 & b_8 & c_8 \\ +a_9 & b_9 & c_9 \\ +a_{10} & b_{10} & c_{10} \\ +\end{NiceArray}$ +\end{scope} + + +\bigskip +\item La commande |\columncolor| doit son nom à la commande |\columncolor| de \pkg{colortbl}. Sa syntaxe est +similaire à celle de |\rowcolor|. + +\bigskip +\item La commande |\rowcolors| (avec un \emph{s}) doit son nom à la commande |\rowcolors| de \pkg{xcolor}. Le +\emph{s} rappelle qu'il y a deux couleurs. Elle colorie alternativement les rangées avec les deux couleurs à partir +de la rangée dont le numéro est donné en premier argument. + +\medskip + + +\begin{scope} +\hfuzz=10cm +\begin{BVerbatim}[baseline=c,boxwidth=9cm] +\begin{NiceTabular}{LR}% +[~emphase#code-before = \rowcolor{red!15}{1} \rowcolors{3}{blue!10}{}@] +\toprule +Ville & habitants \\ +\midrule +Pau & 80000 \\ +Paris & 2000000 \\ +Toulouse & 700000 \\ +Reims & 40000 \\ +\bottomrule +\end{NiceTabular} +\end{BVerbatim} +\begin{NiceTabular}{LR}[code-before =\rowcolor{red!15}{1} \rowcolors{3}{blue!10}{}] +\toprule +Ville & habitants \\ +\midrule +Pau & 80000 \\ +Paris & 2000000 \\ +Toulouse & 700000 \\ +Reims & 40000 \\ +\bottomrule +\end{NiceTabular} +\end{scope} + +\bigskip +\item La commande |\chessboardcolors| prend en arguments deux couleurs et colorie les cellules en quinconces avec +les deux couleurs. + +\medskip +\begin{scope} +\hfuzz=10cm +\begin{BVerbatim}[baseline=c,boxwidth=9cm] +$\begin{pNiceMatrix}[R,margin, ~emphase#code-before=\chessboardcolors{red!15}{blue!15}@] +1 & -1 & 1 \\ +-1 & 1 & -1 \\ +1 & -1 & 1 +\end{pNiceMatrix}$ +\end{BVerbatim} +$\begin{pNiceMatrix}% +[baseline=1, R, margin, code-before = \chessboardcolors{red!15}{blue!15}] +1 & -1 & 1 \\ +-1 & 1 & -1 \\ +1 & -1 & 1 +\end{pNiceMatrix}$ +\end{scope} + +\end{itemize} + + + \section{Fonctionnalités avancées} \subsection{Option d'alignement dans NiceMatrix} @@ -1581,7 +1695,7 @@ $A = \begin{pNiceMatrix}[first-row,last-col=4] e_1 & e_2 & e_3 \\ 1 & 2 & 3 & e_1 \\ 4 & 5 & 6 & e_2 \\ -7 & 8 & 9 & e_3 \\ +7 & 8 & 9 & e_3 \end{pNiceMatrix}$ \end{BVerbatim} \begin{varwidth}{10cm} @@ -1597,7 +1711,7 @@ e_1 & e_2 & e_3 \\ \end{varwidth} \bigskip -Si la commande |\rotate| est utilisée dans la ``dernière rangée'' (extérieure à la matrice), les éléments qui +Si la commande |\rotate| est utilisée dans la «dernière rangée» (extérieure à la matrice), les éléments qui subissent cette rotation sont alignés vers le haut. \bigskip @@ -1609,7 +1723,7 @@ $A = \begin{pNiceMatrix}[last-row,last-col=4] 1 & 2 & 3 & e_1 \\ 4 & 5 & 6 & e_2 \\ 7 & 8 & 9 & e_3 \\ -\text{image de } e_1 & e_2 & e_3 \\ +\text{image de } e_1 & e_2 & e_3 \end{pNiceMatrix}$ \end{BVerbatim} \begin{varwidth}{10cm} @@ -1620,7 +1734,7 @@ $A = \begin{pNiceMatrix}[last-row,last-col=4] 1 & 2 & 3 & e_1 \\ 4 & 5 & 6 & e_2 \\ 7 & 8 & 9 & e_3 \\ -\text{image de } e_1 & e_2 & e_3 \\ +\text{image de } e_1 & e_2 & e_3 \end{pNiceMatrix}$ \end{varwidth} @@ -1641,14 +1755,14 @@ $\begin{bNiceArray}{CCCC|C}[~emphase#small@, columns-width = 3mm ] 1 & -2 & 3 & 4 & 5 \\ 0 & 3 & 2 & 1 & 2 & L_2 \gets 2 L_1 - L_2 \\ -0 & 1 & 1 & 2 & 3 & L_3 \gets L_1 + L_3 \\ +0 & 1 & 1 & 2 & 3 & L_3 \gets L_1 + L_3 \end{bNiceArray}$ \end{Verbatim} % \[\begin{bNiceArray}{CCCC|C}[small, last-col, code-for-last-col = \scriptscriptstyle, columns-width=3mm] 1 & -2 & 3 & 4 & 5 \\ 0 & 3 & 2 & 1 & 2 & L_2 \gets 2 L_1 - L_2 \\ -0 & 1 & 1 & 2 & 3 & L_3 \gets L_1 + L_3 \\ +0 & 1 & 1 & 2 & 3 & L_3 \gets L_1 + L_3 \end{bNiceArray}\] @@ -1710,8 +1824,8 @@ Si des compteurs LaTeX nommés |iRow| ou |jCol| sont créés dans le document pa \bigskip L'extension \pkg{nicematrix} propose aussi des commandes pour composer automatiquement des matrices à partir d'un -motif général. Ces commandes sont nommées |\pAutoNiceMatrix|, |\bAutoNiceMatrix|, |\vAutoNiceMatrix|, -|\VAutoNiceMatrix| et |\BAutoNiceMatrix|. +motif général. Ces commandes sont nommées |\AutoNiceMatrix|, |\pAutoNiceMatrix|, |\bAutoNiceMatrix|, +|\vAutoNiceMatrix|, |\VAutoNiceMatrix| et |\BAutoNiceMatrix|. Chacune de ces commandes prend deux arguments obligatoires : le premier est la taille de la matrice, sous la forme $n$-$p$, où $n$ est le nombre de rangées et $p$ est le nombre de colonnes et le deuxième est le motif (c'est-à-dire @@ -1740,11 +1854,12 @@ des options |hlines| et |vlines|. \medskip Dans l'exemple suivant, on utilise la commande |\arrayrulecolor| de \pkg{colortbl}. + + \medskip \begin{BVerbatim}[baseline=c,boxwidth=11cm] \arrayrulecolor{blue} -$\begin{NiceArray}{CCCC}% - [~emphase#hvlines@,first-row,first-col] +$\begin{NiceArray}{CCCC}[~emphase#hvlines@,first-row,first-col] & e & a & b & c \\ e & e & a & b & c \\ a & a & e & c & b \\ @@ -1765,8 +1880,9 @@ c & c & b & a & e \arrayrulecolor{black} + \bigskip -Il y a néanmoins une différence entre l'utilisation de l'option |vlines| et du spécificateur ``\verb+|+'' dans le +Il y a néanmoins une différence entre l'utilisation de l'option |vlines| et du spécificateur «\verb+|+» dans le préambule de l'environnement : les filets tracés par |vlines| traversent les double-filets horizontaux tracés par |\hline\hline|. @@ -2031,7 +2147,7 @@ Pour \pkg{nicematrix}, les règles précises sont les suivantes : \begin{Verbatim} \begin{pmatrix} a & b \\ -c \\ +c \end{pmatrix} \end{Verbatim} @@ -2068,11 +2184,6 @@ Avec cette option, des espaces extérieurs de longueur |\arraycolsep| seront ins |{NiceArray}| (les autres environnements de l'extension \pkg{nicematrix} ne sont pas affectés). -\subsection{L'option de classe draft} - -Quand l'option de classe |draft| est utilisée, les lignes en pointillés ne sont pas tracées, pour accélérer la -compilation. - \subsection{Un problème technique avec l'argument de \textbackslash\textbackslash} @@ -2144,8 +2255,8 @@ b & c La version 3.0 de \pkg{nicematrix} a introduit l'environnement |{pNiceArray}| (et ses variantes) avec les options |first-row|, |last-row|, |first-col| et |last-col|. -Par conséquent, les environnements suivants, présents dans les versions précédentes de \pkg{nicematrix} sont devenus -obsolètes : +Par conséquent, les environnements suivants, présents dans les versions précédentes de \pkg{nicematrix} ont été +supprimés. % \begin{itemize} \item |{NiceArrayCwithDelims}| ; @@ -2156,10 +2267,8 @@ obsolètes : |{VNiceArrayRC}|. \end{itemize} -\medskip -Depuis la version 3.12 de \pkg{nicematrix}, on ne peut utiliser ces environnements que si on a chargé l'extension -\pkg{nicematrix} avec l'option |obsolete-environments|. Il faut toutefois avoir conscience que ces environnements -seront certainement supprimés dans une prochaine version de \pkg{nicematrix}. +Le code correspondant est toutefois encore présent à la fin du fichier |nicematrix.sty|, après une +commande |\file_input_stop:|. @@ -2337,7 +2446,7 @@ $\begin{pNiceMatrix}[first-row,first-col] \Vdots[line-style={solid,<->}]_{n \text{ rows}} & 1 & 1 & 1 & & 1 \\ & 1 & 1 & 1 & & 1 \\ - & 1 & 1 & 1 & \Ldots & 1 \\ + & 1 & 1 & 1 & \Ldots & 1 \end{pNiceMatrix}$ \end{Verbatim} @@ -2351,7 +2460,7 @@ $\begin{pNiceMatrix}[first-row,first-col] & 1 & 1 & 1 & & 1 \\ \Vdots[line-style={solid,<->}]_{n \text{ rows}} & 1 & 1 & 1 & & 1 \\ & 1 & 1 & 1 & & 1 \\ - & 1 & 1 & 1 & \Ldots & 1 \\ + & 1 & 1 & 1 & \Ldots & 1 \end{pNiceMatrix}\] \end{scope} @@ -2366,16 +2475,17 @@ voulons la même largeur (automatique) pour toutes les colonnes. \bigskip \begin{BVerbatim} ~emphase#\begin{NiceMatrixBlock}[auto-columns-width]@ -\NiceMatrixOptions{code-for-last-col = \color{blue}\scriptstyle,light-syntax} +\NiceMatrixOptions + { last-col,code-for-last-col = \color{blue}\scriptstyle,light-syntax} \setlength{\extrarowheight}{1mm} -$\begin{pNiceArray}{CCCC:C}[last-col] +$\begin{pNiceArray}{CCCC:C} 1 1 1 1 1 ; 2 4 8 16 9 ; 3 9 27 81 36 ; 4 16 64 256 100 \end{pNiceArray}$ \medskip -$\begin{pNiceArray}{CCCC:C}[last-col] +$\begin{pNiceArray}{CCCC:C} 1 1 1 1 1 ; 0 2 6 14 7 { L_2 \gets -2 L_1 + L_2 } ; 0 6 24 78 33 { L_3 \gets -3 L_1 + L_3 } ; @@ -2389,10 +2499,10 @@ $\begin{pNiceArray}{CCCC:C}[last-col] \begin{multicols}{2} \begin{NiceMatrixBlock}[auto-columns-width] -\NiceMatrixOptions{code-for-last-col = \color{blue}\scriptstyle,light-syntax} +\NiceMatrixOptions{last-col,code-for-last-col = \color{blue}\scriptstyle,light-syntax} \setlength{\extrarowheight}{1mm} -\enskip $\begin{pNiceArray}{CCCC:C}[last-col] +\enskip $\begin{pNiceArray}{CCCC:C} 1 1 1 1 1 ; 2 4 8 16 9 ; 3 9 27 81 36 ; @@ -2401,7 +2511,7 @@ $\begin{pNiceArray}{CCCC:C}[last-col] \medskip -\enskip $\begin{pNiceArray}{CCCC:C}[last-col] +\enskip $\begin{pNiceArray}{CCCC:C} 1 1 1 1 1 ; 0 2 6 14 7 { L_2 \gets -2 L_1 + L_2 } ; 0 6 24 78 33 { L_3 \gets -3 L_1 + L_3 } ; @@ -2410,7 +2520,7 @@ $\begin{pNiceArray}{CCCC:C}[last-col] \medskip -\enskip $\begin{pNiceArray}{CCCC:C}[last-col] +\enskip $\begin{pNiceArray}{CCCC:C} 1 1 1 1 1 ; 0 1 3 7 \frac72 { L_2 \gets \frac12 L_2 } ; 0 3 12 39 \frac{33}2 { L_3 \gets \frac12 L_3 } ; @@ -2419,7 +2529,7 @@ $\begin{pNiceArray}{CCCC:C}[last-col] \medskip -\enskip $\begin{pNiceArray}{CCCC:C}[last-col] +\enskip $\begin{pNiceArray}{CCCC:C} 1 1 1 1 1 ; 0 1 3 7 \frac72 ; 0 0 3 18 6 { L_3 \gets -3 L_2 + L_3 } ; @@ -2428,7 +2538,7 @@ $\begin{pNiceArray}{CCCC:C}[last-col] \medskip -\enskip $\begin{pNiceArray}{CCCC:C}[last-col] +\enskip $\begin{pNiceArray}{CCCC:C} 1 1 1 1 1 ; 0 1 3 7 \frac72 ; 0 0 1 6 2 { L_3 \gets \frac13 L_3 } ; @@ -2437,7 +2547,7 @@ $\begin{pNiceArray}{CCCC:C}[last-col] \medskip -\enskip $\begin{pNiceArray}{CCCC:C}[last-col] +\enskip $\begin{pNiceArray}{CCCC:C} 1 1 1 1 1 ; 0 1 3 7 \frac72 ; 0 0 1 6 2 ; @@ -2471,6 +2581,8 @@ Nous redessinons les nœuds avec de nouveaux nœuds en utilisant la bibliothèqu voulons recréer des nœuds identiques aux premiers, nous devons fixer |inner sep = 0pt| (si on ne fait pas cela, les nouveaux nœuds seront plus grands que les nœuds d'origine créés par \pkg{nicematrix}). +\label{exemple-CodeAfter} + \begin{Verbatim} $\begin{pNiceArray}{>{\strut}CCCC}[create-large-nodes,margin,extra-margin = 2pt] a_{11} & a_{12} & a_{13} & a_{14} \\ @@ -2578,25 +2690,6 @@ pour l'ensemble des cases avec pour nom $i$|-|$j$|-block| où $i$ et $j$ sont le la case en haut à gauche (où a été utilisée la commande |\Block|). Si on a demandé la création des nœuds |medium|, alors un nœud de ce type est aussi créé pour ce bloc avec un nom suffixé par |-medium|. -\medskip -% $\begin{pNiceMatrix}[margin,create-medium-nodes] -% \Block{3-3}<\Large>{A} & & & 0 \\ -% & \hspace*{1cm} & & \Vdots \\ -% & & & 0 \\ -% 0 & \Cdots& 0 & 0 -% \CodeAfter -% \tikz \node [~emphase#highlight = (1-1-block-medium)@] {} ; -% \end{pNiceMatrix}$ -% \end{BVerbatim} -% $\begin{pNiceMatrix}[margin,create-medium-nodes] -% \Block{3-3}<\Large>{A} & & & 0 \\ -% & \hspace*{1cm} & & \Vdots \\ -% & & & 0 \\ -% 0 & \Cdots& 0 & 0 -% \CodeAfter -% \tikz \node [highlight = (1-1-block-medium)] {} ; -% \end{pNiceMatrix}$ - \vspace{1cm} @@ -2775,7 +2868,7 @@ La matrice $A$ a une «première colonne» (pour $L_i$) d'où l'option |first-co & \Vdots & & & & \Vdots \\ ~emphase#L_i@ & a_{i1} & \Cdots & a_{ik} & \Cdots & a_{in} \\ & \Vdots & & & & \Vdots \\ - & a_{n1} & \Cdots & & & a_{nn} \\ + & a_{n1} & \Cdots & & & a_{nn} \end{bNiceArray} & \end{Verbatim} diff --git a/macros/latex/contrib/nicematrix/nicematrix.dtx b/macros/latex/contrib/nicematrix/nicematrix.dtx index 2bd6e5ed43..a78a94ee50 100644 --- a/macros/latex/contrib/nicematrix/nicematrix.dtx +++ b/macros/latex/contrib/nicematrix/nicematrix.dtx @@ -15,8 +15,8 @@ % % \fi % \iffalse -\def\myfileversion{3.15} -\def\myfiledate{2020/04/06} +\def\myfileversion{4.0} +\def\myfiledate{2020/05/08} % % %<*batchfile> @@ -51,7 +51,6 @@ version 2005/12/01 or later. \usepackage[xetex]{geometry} \geometry{left=2.8cm,right=2.8cm,top=2.5cm,bottom=2.5cm,papersize={21cm,29.7cm}} -\usepackage{colortbl} \usepackage{tikz} \usetikzlibrary{fit} \usepackage{nicematrix} @@ -66,13 +65,41 @@ version 2005/12/01 or later. \titlespacing*{\section}{0pt}{6.5ex plus 1ex minus .2ex}{4.3ex plus .2ex} \titlespacing*{\subsection}{0pt}{4.5ex plus 1ex minus .2ex}{2ex plus .2ex} \usepackage{multicol} -\usepackage{arydshln} \setlength{\columnseprule}{0.4pt} \usepackage{footnotehyper} \usepackage{varwidth} \parindent 0pt \EnableCrossrefs +\makeatletter +\ExplSyntaxOn +\DoNotIndex{\begin,\end} +\DoNotIndex{\c@iRow,\c@jCol,\theiRow,\thejCol} +\DoNotIndex{\pgfpicture,\endpgfpicture,\tikzpicture,\endtikzpicture} +\DoNotIndex{\pgfpoint,\pgfnode,\pgfnodealias,\pgfcoordinate} +\DoNotIndex{\pgf@x,\pgf@y} +\DoNotIndex{\int_add:Nn,\int_case:nnTF,\int_compare:nNnTF,\int_compare:nTF, + \int_compare_p:nNn,\int_decr:N,\int_eval:n,\int_add:Nn,\int_gdecr:N,\int_gincr:N + \int_gset:Nn,\int_gset_eq:NN,\int_gzero:N,\int_gzero_new:N,\int_if_odd:nTF, + \int_max:nn,\int_new:N,\int_set:Nn,\int_set_eq:NN,\int_step_inline:nnn, + \int_step_variable:nNn,\int_step_variable:nnNn,\int_sub:Nn,\int_use:N,\int_zero:N, + \int_zero_new:N,\g_tmpa_int,\l_tmpa_int,\l_tmpb_int +} +\DoNotIndex{\dim_abs:n,\dim_add:Nn,\dim_compare:nNnTF,\dim_compare_p:nNn, +\dim_const:Nn,\dim_eval:n,\dim_gadd:Nn,\dim_gset:Nn,\dim_gset_eq:NN, +\dim_gset:Nn,\dim_gset_eq:NN,\dim_gsub:Nn,\dim_gzero_new:N,\dim_max:nn, +\dim_min:nn,\dim_new:N,\dim_ration:nn,\dim_set:Nn,\dim_set_eq:NN,\dim_sub:Nn, +\dim_use:N,\dim_zero:N,\dim_zero_new:N,\g_tmpa_dim,\l_tmpa_dim,\l_tmpb_dim, +\c_zero_dim} +\DoNotIndex{\cs_new_protected:Npn,\cs_new:Npn,\cs_set_eq:NN, +\cs_set_protected:Npn} +\DoNotIndex{\bool_if:NTF,\bool_new:N,\bool_set_false:N,\bool_set_true:N,\l_tmpa_bool} +\DoNotIndex{\group_begin:,\group_end:,\c_math_toggle_token} +\DoNotIndex{\tl_set:Nn,\l_tmpa_tl} +\ExplSyntaxOff +\makeatother + + \begin{document} \DocInput{nicematrix.dtx} \end{document} @@ -96,9 +123,10 @@ version 2005/12/01 or later. % % \begin{abstract} % The LaTeX package \pkg{nicematrix} provides new environments similar to the -% classical environments |{array}| and |{matrix}| but with some additional -% features. Among these features are the possibilities to fix the width of the -% columns and to draw continuous ellipsis dots between the cells of the array. +% classical environments |{tabular}|, |{array}| and |{matrix}| but with some +% additional features. Among these features are the possibilities to fix the +% width of the columns and to draw continuous ellipsis dots between the cells of +% the array. % \end{abstract} % % \vspace{1cm} @@ -120,8 +148,7 @@ version 2005/12/01 or later. % This package provides some new tools to draw mathematical matrices. The main % features are the following: % \begin{itemize}\setlength{\itemsep}{0pt} -% \item continuous dotted lines\footnote{If the class option |draft| is -% used, these dotted lines will not be drawn for a faster compilation.}; +% \item continuous dotted lines; % \item exterior rows and columns for labels; % \item a control of the width of the columns. % \end{itemize} @@ -197,12 +224,13 @@ version 2005/12/01 or later. % \begin{ttfamily} % \setlength{\tabcolsep}{3mm} % \begin{tabular}{llll} -% \{NiceMatrix\} & \{NiceArray\} & \{pNiceArray\} \\ -% \{pNiceMatrix\} & & \{bNiceArray\} \\ -% \{bNiceMatrix\} & & \{BNiceArray\} \\ -% \{BNiceMatrix\} & & \{vNiceArray\} \\ -% \{vNiceMatrix\} & & \{VNiceArray\} \\ -% \{VNiceMatrix\} & & \{NiceArrayWithDelims\} \\ +% \{NiceMatrix\} & \{NiceArray\} & \{NiceTabular\} \\ +% \{pNiceMatrix\} & \{pNiceArray\} \\ +% \{bNiceMatrix\} & \{bNiceArray\} \\ +% \{BNiceMatrix\} & \{BNiceArray\} \\ +% \{vNiceMatrix\} & \{vNiceArray\} \\ +% \{VNiceMatrix\} & \{VNiceArray\} \\ +% & \{NiceArrayWithDelims\} % \end{tabular} % \end{ttfamily} % @@ -215,16 +243,15 @@ version 2005/12/01 or later. % % % \medskip -% The environment |{NiceArray}| is similar to the environment |{array}| of the -% package |{array}|. However, for technical reasons, in the preamble of the -% environment |{NiceArray}|, the user must use the letters |L|, |C| and~|R| +% The environments |{NiceArray}| and |{NiceTabular}| are similar to the +% environments |{array}| and |{tabular}| of the +% package |{array}|. However, for technical reasons, in the preamble of these +% environments, the user must use the letters |L|, |C| and~|R| % instead of |l|, |c| and |r|. It's possible to use the constructions -% |w{...}{...}|, |W{...}{...}|\footnote{However, for the columns of type |w| and -% |W|, the cells are composed in math mode (in the environments of -% \pkg{nicematrix}) whereas in |{array}| of \pkg{array}, they are composed in -% text mode.}, "|", |>{...}|, |<{...}|, |@{...}|, |!{...}| and |*{n}{...}| but -% the letters |p|, |m| and |b| should not be used. See p.~\pageref{NiceArray} -% the section relating to |{NiceArray}|. +% |w{...}{...}|, |W{...}{...}|, "|", |>{...}|, |<{...}|, |@{...}|, |!{...}| and +% |*{n}{...}| but the letters |p|, |m| and |b| should not be used. +% +% See p.~\pageref{NiceArray} the section relating to |{NiceArray}| and |{NiceTabular}|. % % % \section{The continuous dotted lines} @@ -372,12 +399,12 @@ version 2005/12/01 or later. % \begin{BVerbatim}[baseline=c,boxwidth=10cm] % $A = \begin{pmatrix} % h & i & j & k & l & m \\ -% x & & & & & x \\ +% x & & & & & x % \end{pmatrix}$ % \end{BVerbatim} % $A = \begin{pmatrix} % h & i & j & k & l & m \\ -% x & & & & & x \\ +% x & & & & & x % \end{pmatrix}$ % % @@ -389,12 +416,12 @@ version 2005/12/01 or later. % \begin{BVerbatim}[baseline=c,boxwidth=10cm] % $B = \begin{pmatrix} % h & i & j & k & l & m \\ -% x & \ldots & \ldots & \ldots & \ldots & x \\ +% x & \ldots & \ldots & \ldots & \ldots & x % \end{pmatrix}$ % \end{BVerbatim} % $B = \begin{pmatrix} % h & i & j & k & l & m \\ -% x & \ldots & \ldots & \ldots & \ldots & x \\ +% x & \ldots & \ldots & \ldots & \ldots & x % \end{pmatrix}$ % % \bigskip @@ -406,12 +433,12 @@ version 2005/12/01 or later. % \begin{BVerbatim}[baseline=c,boxwidth=10cm] % $C = \begin{pNiceMatrix} % h & i & j & k & l & m \\ -% x & \Ldots & \Ldots & \Ldots & \Ldots & x \\ +% x & \Ldots & \Ldots & \Ldots & \Ldots & x % \end{pNiceMatrix}$ % \end{BVerbatim} % $C = \begin{pNiceMatrix} % h & i & j & k & l & m \\ -% x & \Ldots & \Ldots & \Ldots & \Ldots & x \\ +% x & \Ldots & \Ldots & \Ldots & \Ldots & x % \end{pNiceMatrix}$ % % \bigskip @@ -424,12 +451,12 @@ version 2005/12/01 or later. % \begin{BVerbatim}[baseline=c,boxwidth=10cm] % $D = \begin{pNiceMatrix}[~emphase#nullify-dots@] % h & i & j & k & l & m \\ -% x & \Ldots & & & & x \\ +% x & \Ldots & & & & x % \end{pNiceMatrix}$ % \end{BVerbatim} % $D = \begin{pNiceMatrix}[nullify-dots] % h & i & j & k & l & m \\ -% x & \Ldots & & & & x \\ +% x & \Ldots & & & & x % \end{pNiceMatrix}$ % % \medskip @@ -558,13 +585,13 @@ version 2005/12/01 or later. % $\begin{bNiceMatrix} % 1 & \hspace*{1cm} & 0 \\[8mm] % & ~emphase#\Ddots^{n \text{ times}}@ & \\ -% 0 & & 1 \\ +% 0 & & 1 % \end{bNiceMatrix}$ % \end{BVerbatim} % $\begin{bNiceMatrix} % 1 & \hspace*{1cm} & 0 \\[8mm] % & \Ddots^{n \text{ times}} & \\ -% 0 & & 1 \\ +% 0 & & 1 % \end{bNiceMatrix}$ % % \subsection{Customization of the dotted lines} @@ -918,46 +945,27 @@ version 2005/12/01 or later. % \medskip % For the readability of the code, an alternative syntax is provided: it's % possible to give the instructions of the |\code-after| at the end of the -% environment, after the keyword |\CodeAfter|. +% environment, after the keyword |\CodeAfter|. For an example, cf. +% p.~\pageref{example-CodeAfter}. % -% \medskip -% \begin{BVerbatim}[baseline=c,boxwidth=11cm] -% \NiceMatrixOptions{xdots/shorten = 0.6 em} -% \begin{pNiceMatrix} -% I & 0 & \Cdots &0 \\ -% 0 & I & \Ddots &\Vdots\\ -% \Vdots &\Ddots & I &0 \\ -% 0 &\Cdots & 0 &I -% ~emphase#\CodeAfter@ -% ~emphase#\line{2-2}{3-3}@ -% \end{pNiceMatrix} -% \end{BVerbatim} -% \begin{scope} -% \NiceMatrixOptions{xdots/shorten = 0.6 em} -% $\begin{pNiceMatrix} -% I & 0 & \Cdots &0 \\ -% 0 & I & \Ddots &\Vdots\\ -% \Vdots &\Ddots & I &0 \\ -% 0 &\Cdots & 0 &I -% \CodeAfter -% \line{2-2}{3-3} -% \end{pNiceMatrix}$ -% \end{scope} % -% \section{The environment \{NiceArray\} and its variants} +% \section{The environments \{NiceArray\} and \{NiceTabular\}} % \label{NiceArray} % -% The environment |{NiceArray}| is similar to the environment |{array}|. As for -% |{array}|, the mandatory argument is the preamble of the array. However, for -% technical reasons, in this preamble, the user must use the letters |L|, |C| -% and~|R|\footnote{The column types |L|, |C| and |R| are defined locally inside -% |{NiceArray}| with |\newcolumntype| of \pkg{array}. This definition overrides -% an eventual previous definition. In fact, the column types |w| and |W| are -% also redefined.} instead of |l|, |c| and |r|. It's possible -% to use the constructions |w{...}{...}|, |W{...}{...}|, "|", |>{...}|, -% |<{...}|, |@{...}|, |!{...}| and |*{n}{...}| but the letters |p|, |m| and |b| -% should not be used.\footnote{In a command |\multicolumn|, one should also use -% the letters |L|, |C|, |R|.} +% The environments |{NiceArray}| and |{NiceTabular}| are similar to the +% environments |{array}| and |{tabular}|. The mandatory argument is the preamble +% of the array. However, for technical reasons, in this preamble, the user must +% use the letters |L|, |C| and~|R|\footnote{The column types |L|, |C| and |R| +% are defined locally inside |{NiceArray}| with |\newcolumntype| of \pkg{array}. +% This definition overrides an eventual previous definition.} instead of |l|, +% |c| and |r|. In a command |\multicolumn|, one should also use the letters |L|, +% |C|, |R|. +% +% It's possible to use the constructions |p{...}|, |m{...}|, |b{...}|, +% |w{...}{...}|, |W{...}{...}|, "|", |>{...}|, |<{...}|, |@{...}|, |!{...}| and +% |*{n}{...}|. However, in the environment |{NiceArray}| (and its variants), the +% content of the columns of type |w| or |W| is composed in math mode (in +% |{array}| of \pkg{array}, they are composed in text mode). % % \bigskip % The package \pkg{nicematrix} provides also the variants |{pNiceArray}|, @@ -1016,14 +1024,14 @@ version 2005/12/01 or later. % {\downarrow}{\uparrow}{CCC}[margin] % 1 & 2 & 3 \\ % 4 & 5 & 6 \\ -% 7 & 8 & 9 \\ +% 7 & 8 & 9 % \end{~emphase#NiceArrayWithDelims@}$ % \end{BVerbatim} % $\begin{NiceArrayWithDelims} % {\downarrow}{\uparrow}{CCC}[margin] % 1 & 2 & 3 \\ % 4 & 5 & 6 \\ -% 7 & 8 & 9 \\ +% 7 & 8 & 9 % \end{NiceArrayWithDelims}$ % % @@ -1036,7 +1044,7 @@ version 2005/12/01 or later. % % \medskip % \begin{BVerbatim}[baseline=c,boxwidth=9cm] -% $A = \begin{pNiceMatrix}[baseline=2] +% $A = \begin{pNiceMatrix}[~emphase#baseline=2@] % \frac{1}{\sqrt{1+p^2}} & p & 1-p \\ % 1 & 1 & 1 \\ % 1 & p & 1+p @@ -1170,7 +1178,7 @@ version 2005/12/01 or later. % columns which are needed for the composition of the ``last row'' and ``last % column''. % \begin{itemize} -% \item For the environments with explicit preamble, like |{NiceArray}| and +% \item For the environments with explicit preamble, like |{NiceTabular}| and % |{pNiceArray}|, the number of columns can obviously be computed from the % preamble. % @@ -1184,10 +1192,10 @@ version 2005/12/01 or later. % columns during the first compilation and write the result in the |aux| file % for the next run. % -% \textsl{However, it's possible to provide the number of the last row and the number of -% the last column as values of the options |last-row| and |last-col|, tending to -% an acceleration of the whole compilation of the document.} That's what we will -% do throughout the rest of the document. +% \textsl{However, it's possible to provide the number of the last row and the +% number of the last column as values of the options |last-row| and |last-col|, +% tending to an acceleration of the whole compilation of the document.} That's +% what we will do throughout the rest of the document. % \end{itemize} % \end{itemize} % @@ -1343,37 +1351,8 @@ version 2005/12/01 or later. % \bigskip % It's possible to change in \pkg{nicematrix} the letter used to specify a % vertical dotted line with the option |letter-for-dotted-lines| available in -% |\NiceMatrixOptions|. For example, in this document, we have loaded the -% package \pkg{arydshln} which uses the letter ``|:|'' to specify a vertical -% dashed line. Thus, by using |letter-for-dotted-lines|, we can use the -% vertical lines of both \pkg{arydshln} and \pkg{nicematrix}. -% -% \medskip -% \begin{BVerbatim}[baseline=c,boxwidth=9.5cm] -% \NiceMatrixOptions{letter-for-dotted-lines = I} -% \arrayrulecolor{blue} -% \left(\begin{NiceArray}{~emphase#C|C:CIC@} -% 1 & 2 & 3 & 4 \\ -% 5 & 6 & 7 & 8 \\ -% 9 & 10 & 11 & 12 -% \end{NiceArray}\right) -% \arrayrulecolor{black} -% \end{BVerbatim} -% \begin{scope} -% \NiceMatrixOptions{letter-for-dotted-lines = I} -% \arrayrulecolor{blue} -% $\left(\begin{NiceArray}{C|C:CIC} -% 1 & 2 & 3 & 4 \\ -% 5 & 6 & 7 & 8 \\ -% 9 & 10 & 11 & 12 -% \end{NiceArray}\right)$ -% \arrayrulecolor{black} -% \end{scope} +% |\NiceMatrixOptions|. % -% \smallskip -% We have used the command |\arrayrulecolor| (de \pkg{colortbl}) to draw in blue -% the three rules. -% % \bigskip % \emph{Remark} : In the package \pkg{array} (on which the package % \pkg{nicematrix} relies), horizontal and vertical rules make the array larger @@ -1462,23 +1441,23 @@ version 2005/12/01 or later. % \begin{BVerbatim}[baseline=c,boxwidth=8.5cm] % ~emphase#\NiceMatrixOptions{columns-width=10mm}@ % $\begin{pNiceMatrix} -% a & b \\ c & d \\ +% a & b \\ c & d % \end{pNiceMatrix} % = % \begin{pNiceMatrix} -% 1 & 1245 \\ 345 & 2 \\ +% 1 & 1245 \\ 345 & 2 % \end{pNiceMatrix}$ % \end{BVerbatim} % \begin{scope} % \NiceMatrixOptions{columns-width=10mm} % $\begin{pNiceMatrix} % a & b \\ -% c & d \\ +% c & d % \end{pNiceMatrix} % = % \begin{pNiceMatrix} % 1 & 1245 \\ -% 345 & 2 \\ +% 345 & 2 % \end{pNiceMatrix}$ % \end{scope} % @@ -1496,21 +1475,21 @@ version 2005/12/01 or later. % \begin{BVerbatim}[baseline=c,boxwidth=8.5cm] % ~emphase#\begin{NiceMatrixBlock}[auto-columns-width]@ % $\begin{pNiceMatrix} -% a & b \\ c & d \\ +% a & b \\ c & d % \end{pNiceMatrix} % = % \begin{pNiceMatrix} -% 1 & 1245 \\ 345 & 2 \\ +% 1 & 1245 \\ 345 & 2 % \end{pNiceMatrix}$ % ~emphase#\end{NiceMatrixBlock}@ % \end{BVerbatim} % \begin{NiceMatrixBlock}[auto-columns-width] % $\begin{pNiceMatrix} -% a & b \\ c & d \\ +% a & b \\ c & d % \end{pNiceMatrix} % = % \begin{pNiceMatrix} -% 1 & 1245 \\ 345 & 2 \\ +% 1 & 1245 \\ 345 & 2 % \end{pNiceMatrix}$ % \end{NiceMatrixBlock} % @@ -1601,6 +1580,181 @@ version 2005/12/01 or later. % For technical reasons, you can't write |\Block{|$i$|-|$j$|}{<}|. But you can % write |\Block{|$i$|-|$j$|}<>{<}| with the expected result. % +% +% \section{The color of the rows and columns} +% +% With the classical package \pkg{colortbl}, it's possible to color the cells, +% rows and columns of a tabular. However, the resulting \textsc{pdf} is not +% always perfectly displayed by the \textsc{pdf} viewers, in particular in +% conjonction with rules. With some \textsc{pdf} viewers, some vertical rules +% seem to vanish. On the other side, some thin horizontal white lines may appear +% in some circonstances. +% +% +% \medskip +% The version 4.0 of \pkg{nicematrix} provide similar tools which do not +% present these drawbacks. This version provides a key |code-before| for some +% code which will be executed \emph{before} the drawing of the tabular. In this +% |code-before|, new commands are available: |\cellcolor|, |\rectanglecolor|, +% |\rowcolor|, |\columncolor|, |\rowcolors| and |\chessboardcolors|. +% +% \medskip +% \begin{itemize} +% \item The command |\cellcolor| takes its name from the command |\cellcolor| of +% \pkg{colortbl}. +% +% This command takes in arguments a color and a list of cells, each of which +% with the format $i$-$j$ where $i$ is the number of row and $j$ the number of +% colummn of the cell. +% +% +% \medskip +% \begin{scope} +% \hfuzz=10cm +% \begin{BVerbatim}[boxwidth=10cm,baseline=c] +% \begin{NiceTabular}{|C|C|C|}[code-before = ~emphase#\cellcolor{red!15}{3-1,2-2,1-3}@] +% \hline +% a & b & c \\ \hline +% e & f & g \\ \hline +% h & i & j \\ \hline +% \end{NiceTabular} +% \end{BVerbatim} +% \begin{NiceTabular}{|C|C|C|}[code-before = \cellcolor{red!15}{3-1,2-2,1-3}] +% \hline +% a & b & c \\ \hline +% e & f & g \\ \hline +% h & i & j \\ \hline +% \end{NiceTabular} +% \end{scope} +% +% \bigskip +% \item The command |\rectanglecolor| takes three arguments. The first is the +% color. The second is the upper-left cell of the rectangle and the third is +% the lower-right cell of the rectangle. +% +% \medskip +% \begin{scope} +% \hfuzz=10cm +% \begin{BVerbatim}[boxwidth=10cm,baseline=c] +% \begin{NiceTabular}{|C|C|C|}[code-before = ~emphase#\rectanglecolor{red!15}{2-2}{3-3}@] +% \hline +% a & b & c \\ \hline +% e & f & g \\ \hline +% h & i & j \\ \hline +% \end{NiceTabular} +% \end{BVerbatim} +% \begin{NiceTabular}{|C|C|C|}[code-before = \rectanglecolor{red!15}{2-2}{3-3}] +% \hline +% a & b & c \\ \hline +% e & f & g \\ \hline +% h & i & j \\ \hline +% \end{NiceTabular} +% \end{scope} +% +% +% +% \bigskip +% \item The command |\rowcolor| takes its name from the command |\rowcolor| of +% \pkg{colortbl}. Its first argument is the color and the second is a +% comma-separated list of rows or interval of rows with the form $a$-$b$ (an +% interval of the form $a$- represent all the rows from the row $a$ until the end). +% +% \medskip +% \begin{scope} +% \hfuzz = 10cm +% \begin{BVerbatim}[boxwidth=9cm,baseline=c] +% $\begin{NiceArray}{LLL}[hvlines, ~emphase#code-before = \rowcolor{red!15}{1,3-5,8-}@] +% a_1 & b_1 & c_1 \\ +% a_2 & b_2 & c_2 \\ +% a_3 & b_3 & c_3 \\ +% a_4 & b_4 & c_4 \\ +% a_5 & b_5 & c_5 \\ +% a_6 & b_6 & c_6 \\ +% a_7 & b_7 & c_7 \\ +% a_8 & b_8 & c_8 \\ +% a_9 & b_9 & c_9 \\ +% a_{10} & b_{10} & c_{10} \\ +% \end{NiceArray}$ +% \end{BVerbatim} +% $\begin{NiceArray}{LLL}[baseline=4,hvlines, code-before = \rowcolor{red!15}{1,3-5,8-}] +% a_1 & b_1 & c_1 \\ +% a_2 & b_2 & c_2 \\ +% a_3 & b_3 & c_3 \\ +% a_4 & b_4 & c_4 \\ +% a_5 & b_5 & c_5 \\ +% a_6 & b_6 & c_6 \\ +% a_7 & b_7 & c_7 \\ +% a_8 & b_8 & c_8 \\ +% a_9 & b_9 & c_9 \\ +% a_{10} & b_{10} & c_{10} \\ +% \end{NiceArray}$ +% \end{scope} +% +% +% \bigskip +% \item The command |\columncolor| takes its name from the command +% |\columncolor| of \pkg{colortbl}. Its syntax is similar to the syntaxe of +% |\rowcolor|. +% +% \bigskip +% \item The command |\rowcolors| (with a \emph{s}) takes its name from the +% command |\rowcolors| of \pkg{xcolor}. The \emph{s} emphasizes the fact that +% there is \emph{two} colors. This command colors alternately the rows of the +% tabular, beginning with the row whose number is given in first argument. The +% two other arguments are the colors. +% +% \medskip +% \begin{scope} +% \hfuzz=10cm +% \begin{BVerbatim}[baseline=c,boxwidth=9cm] +% \begin{NiceTabular}{LR}% +% [~emphase#code-before = \rowcolor{red!15}{1} \rowcolors{3}{blue!10}{}@] +% \toprule +% Town & Habitants \\ +% \midrule +% Pau & 80000 \\ +% Paris & 2000000 \\ +% Toulouse & 700000 \\ +% Reims & 40000 \\ +% \bottomrule +% \end{NiceTabular} +% \end{BVerbatim} +% \begin{NiceTabular}{LR}[code-before =\rowcolor{red!15}{1} \rowcolors{3}{blue!10}{}] +% \toprule +% Ville & habitants \\ +% \midrule +% Pau & 80000 \\ +% Paris & 2000000 \\ +% Toulouse & 700000 \\ +% Reims & 40000 \\ +% \bottomrule +% \end{NiceTabular} +% \end{scope} +% +% \bigskip +% \item The command |\chessboardcolors| take in arguments two colors and colors +% the cells of the tabular in quincunx with these colors. +% +% \medskip +% \begin{scope} +% \hfuzz=10cm +% \begin{BVerbatim}[baseline=c,boxwidth=9cm] +% $\begin{pNiceMatrix}[R,margin, ~emphase#code-before=\chessboardcolors{red!15}{blue!15}@] +% 1 & -1 & 1 \\ +% -1 & 1 & -1 \\ +% 1 & -1 & 1 +% \end{pNiceMatrix}$ +% \end{BVerbatim} +% $\begin{pNiceMatrix}[R,baseline=1, margin, code-before = \chessboardcolors{red!15}{blue!15}] +% 1 & -1 & 1 \\ +% -1 & 1 & -1 \\ +% 1 & -1 & 1 +% \end{pNiceMatrix}$ +% \end{scope} +% +% \end{itemize} +% +% % % \section{Advanced features} % @@ -1645,7 +1799,7 @@ version 2005/12/01 or later. % e_1 & e_2 & e_3 \\ % 1 & 2 & 3 & e_1 \\ % 4 & 5 & 6 & e_2 \\ -% 7 & 8 & 9 & e_3 \\ +% 7 & 8 & 9 & e_3 % \end{pNiceMatrix}$ % \end{BVerbatim} % \begin{varwidth}{10cm} @@ -1656,7 +1810,7 @@ version 2005/12/01 or later. % e_1 & e_2 & e_3 \\ % 1 & 2 & 3 & e_1 \\ % 4 & 5 & 6 & e_2 \\ -% 7 & 8 & 9 & e_3 \\ +% 7 & 8 & 9 & e_3 % \end{pNiceMatrix}$ % \end{varwidth} % @@ -1673,7 +1827,7 @@ version 2005/12/01 or later. % 1 & 2 & 3 & e_1 \\ % 4 & 5 & 6 & e_2 \\ % 7 & 8 & 9 & e_3 \\ -% \text{image of } e_1 & e_2 & e_3 \\ +% \text{image of } e_1 & e_2 & e_3 % \end{pNiceMatrix}$ % \end{BVerbatim} % \begin{varwidth}{10cm} @@ -1684,7 +1838,7 @@ version 2005/12/01 or later. % 1 & 2 & 3 & e_1 \\ % 4 & 5 & 6 & e_2 \\ % 7 & 8 & 9 & e_3 \\ -% \text{image of } e_1 & e_2 & e_3 \\ +% \text{image of } e_1 & e_2 & e_3 % \end{pNiceMatrix}$ % \end{varwidth} % @@ -1707,7 +1861,7 @@ version 2005/12/01 or later. % columns-width = 3mm ] % 1 & -2 & 3 & 4 & 5 \\ % 0 & 3 & 2 & 1 & 2 & L_2 \gets 2 L_1 - L_2 \\ -% 0 & 1 & 1 & 2 & 3 & L_3 \gets L_1 + L_3 \\ +% 0 & 1 & 1 & 2 & 3 & L_3 \gets L_1 + L_3 % \end{bNiceArray}$ % \end{Verbatim} % % @@ -1716,7 +1870,7 @@ version 2005/12/01 or later. % columns-width=3mm] % 1 & -2 & 3 & 4 & 5 \\ % 0 & 3 & 2 & 1 & 2 & L_2 \gets 2 L_1 - L_2 \\ -% 0 & 1 & 1 & 2 & 3 & L_3 \gets L_1 + L_3 \\ +% 0 & 1 & 1 & 2 & 3 & L_3 \gets L_1 + L_3 % \end{bNiceArray}\] % % @@ -1781,7 +1935,7 @@ version 2005/12/01 or later. % \bigskip % The package \pkg{nicematrix} also provides commands in order to compose % automatically matrices from a general pattern. These commands are -% |\pAutoNiceMatrix|, |\bAutoNiceMatrix|, |\vAutoNiceMatrix|, +% |\AutoNiceMatrix|, |\pAutoNiceMatrix|, |\bAutoNiceMatrix|, |\vAutoNiceMatrix|, % |\VAutoNiceMatrix| and |\BAutoNiceMatrix|. % % These commands take two mandatory arguments. The first is the format of the @@ -1818,7 +1972,7 @@ version 2005/12/01 or later. % \arrayrulecolor{blue} % $\begin{NiceArray}{CCCC}% % [~emphase#hvlines@,first-row,first-col] -% % & e & a & b & c \\ +% & e & a & b & c \\ % e & e & a & b & c \\ % a & a & e & c & b \\ % b & b & c & e & a \\ @@ -1869,7 +2023,7 @@ version 2005/12/01 or later. % $\begin{pNiceMatrix}[vlines] % 1 & 2 & 3 & 4 & 5 & 6 \\ % 1 & 2 & 3 & 4 & 5 & 6 \\ -% 1 & 2 & 3 & 4 & 5 & 6 \\ +% 1 & 2 & 3 & 4 & 5 & 6 % \end{pNiceMatrix}$ % \end{BVerbatim} % \begin{scope} @@ -1877,7 +2031,7 @@ version 2005/12/01 or later. % $\begin{pNiceMatrix}[vlines] % 1 & 2 & 3 & 4 & 5 & 6 \\ % 1 & 2 & 3 & 4 & 5 & 6 \\ -% 1 & 2 & 3 & 4 & 5 & 6 \\ +% 1 & 2 & 3 & 4 & 5 & 6 % \end{pNiceMatrix}$ % \end{scope} % @@ -2156,10 +2310,6 @@ version 2005/12/01 or later. % environments of \pkg{nicematrix} are not affected). % % -% \subsection{The class option draft} -% -% When the class option |draft| is used, the dotted lines are not drawn, for a -% faster compilation. % % \subsection{A technical problem with the argument of % \textbackslash\textbackslash} @@ -2228,14 +2378,14 @@ version 2005/12/01 or later. % \end{pNiceMatrix}$ % % -% \subsection{Obsolete environments} +% \subsection{Obsolete environments which have been deleted} % % The version 3.0 of \pkg{nicematrix} has introduced the environment % |{pNiceArray}| (and its variants) with the options |first-row|, |last-row|, % |first-col| and |last-col|. % % Consequently the following environments present in previous versions of -% \pkg{nicematrix} are deprecated: +% have been deleted from \pkg{nicematrix}. % % % \begin{itemize} % \item |{NiceArrayCwithDelims}| ; @@ -2245,12 +2395,9 @@ version 2005/12/01 or later. % \item |{pNiceArrayRC}|, |{bNiceArrayRC}|, |{BNiceArrayRC}|, |{vNiceArrayRC}|, % |{VNiceArrayRC}|. % \end{itemize} -% -% Since the version 3.12, the only way to use these environments is loading -% \pkg{nicematrix} with the option |obsolete-environments|. -% -% However, these environments will certainly be completely deleted in a future -% version of \pkg{nicematrix}. +% +% However, the definition of those environments is still available (temporarily) +% at the end of the file |nicematrix.sty| after a command |\file_input_stop:|. % % \section{Examples} % @@ -2428,7 +2575,7 @@ version 2005/12/01 or later. % & 1 & 1 & 1 & & 1 \\ % \Vdots[line-style={solid,<->}]_{n \text{ rows}} & 1 & 1 & 1 & & 1 \\ % & 1 & 1 & 1 & & 1 \\ -% & 1 & 1 & 1 & \Ldots & 1 \\ +% & 1 & 1 & 1 & \Ldots & 1 % \end{pNiceMatrix}$ % \end{Verbatim} % @@ -2442,7 +2589,7 @@ version 2005/12/01 or later. % & 1 & 1 & 1 & & 1 \\ % \Vdots[line-style={solid,<->}]_{n \text{ rows}} & 1 & 1 & 1 & & 1 \\ % & 1 & 1 & 1 & & 1 \\ -% & 1 & 1 & 1 & \Ldots & 1 \\ +% & 1 & 1 & 1 & \Ldots & 1 % \end{pNiceMatrix}\] % \end{scope} % @@ -2457,16 +2604,17 @@ version 2005/12/01 or later. % \bigskip % \begin{BVerbatim} % ~emphase#\begin{NiceMatrixBlock}[auto-columns-width]@ -% \NiceMatrixOptions{code-for-last-col = \color{blue}\scriptstyle,light-syntax} +% \NiceMatrixOptions +% { last-col,code-for-last-col = \color{blue}\scriptstyle,light-syntax} % \setlength{\extrarowheight}{1mm} -% $\begin{pNiceArray}{CCCC:C}[last-col] +% $\begin{pNiceArray}{CCCC:C} % 1 1 1 1 1 ; % 2 4 8 16 9 ; % 3 9 27 81 36 ; % 4 16 64 256 100 % \end{pNiceArray}$ % \medskip -% $\begin{pNiceArray}{CCCC:C}[last-col] +% $\begin{pNiceArray}{CCCC:C} % 1 1 1 1 1 ; % 0 2 6 14 7 { L_2 \gets -2 L_1 + L_2 } ; % 0 6 24 78 33 { L_3 \gets -3 L_1 + L_3 } ; @@ -2475,15 +2623,15 @@ version 2005/12/01 or later. % ... % ~emphase#\end{NiceMatrixBlock}@ % \end{BVerbatim} -% +% % \bigskip -% -% % \begin{multicols}{2} +% +% \begin{multicols}{2} % \begin{NiceMatrixBlock}[auto-columns-width] -% \NiceMatrixOptions{code-for-last-col = \color{blue}\scriptstyle,light-syntax} +% \NiceMatrixOptions{last-col,code-for-last-col = \color{blue}\scriptstyle,light-syntax} % \setlength{\extrarowheight}{1mm} % -% \enskip $\begin{pNiceArray}{CCCC:C}[last-col] +% \enskip $\begin{pNiceArray}{CCCC:C} % 1 1 1 1 1 ; % 2 4 8 16 9 ; % 3 9 27 81 36 ; @@ -2492,7 +2640,7 @@ version 2005/12/01 or later. % % \medskip % -% \enskip $\begin{pNiceArray}{CCCC:C}[last-col] +% \enskip $\begin{pNiceArray}{CCCC:C} % 1 1 1 1 1 ; % 0 2 6 14 7 { L_2 \gets -2 L_1 + L_2 } ; % 0 6 24 78 33 { L_3 \gets -3 L_1 + L_3 } ; @@ -2501,7 +2649,7 @@ version 2005/12/01 or later. % % \medskip % -% \enskip $\begin{pNiceArray}{CCCC:C}[last-col] +% \enskip $\begin{pNiceArray}{CCCC:C} % 1 1 1 1 1 ; % 0 1 3 7 \frac72 { L_2 \gets \frac12 L_2 } ; % 0 3 12 39 \frac{33}2 { L_3 \gets \frac12 L_3 } ; @@ -2510,7 +2658,7 @@ version 2005/12/01 or later. % % \medskip % -% \enskip $\begin{pNiceArray}{CCCC:C}[last-col] +% \enskip $\begin{pNiceArray}{CCCC:C} % 1 1 1 1 1 ; % 0 1 3 7 \frac72 ; % 0 0 3 18 6 { L_3 \gets -3 L_2 + L_3 } ; @@ -2519,7 +2667,7 @@ version 2005/12/01 or later. % % \medskip % -% \enskip $\begin{pNiceArray}{CCCC:C}[last-col] +% \enskip $\begin{pNiceArray}{CCCC:C} % 1 1 1 1 1 ; % 0 1 3 7 \frac72 ; % 0 0 1 6 2 { L_3 \gets \frac13 L_3 } ; @@ -2528,7 +2676,7 @@ version 2005/12/01 or later. % % \medskip % -% \enskip $\begin{pNiceArray}{CCCC:C}[last-col] +% \enskip $\begin{pNiceArray}{CCCC:C} % 1 1 1 1 1 ; % 0 1 3 7 \frac72 ; % 0 0 1 6 2 ; @@ -2544,7 +2692,7 @@ version 2005/12/01 or later. % \label{highlight} % The following examples require Tikz (by default, \pkg{nicematrix} only loads % \textsc{pgf}) and the Tikz library |fit|. The following lines in the preamble -% of your document may do the job: +% of your document do the job: % \begin{verbatim} % \usepackage{tikz} % \usetikzlibrary{fit} @@ -2562,6 +2710,8 @@ version 2005/12/01 or later. % don't do that, the new nodes will be larger that the nodes created by % \pkg{nicematrix}). % +% \label{example-CodeAfter} +% % \begin{Verbatim} % $\begin{pNiceArray}{>{\strut}CCCC}[create-large-nodes,margin,extra-margin = 2pt] % a_{11} & a_{12} & a_{13} & a_{14} \\ @@ -2879,7 +3029,7 @@ version 2005/12/01 or later. % & \Vdots & & & & \Vdots \\ % L_i & a_{i1} & \Cdots & a_{ik} & \Cdots & a_{in} \\ % & \Vdots & & & & \Vdots \\ -% & a_{n1} & \Cdots & & & a_{nn} \\ +% & a_{n1} & \Cdots & & & a_{nn} % \end{bNiceArray} % & % \end{Verbatim} @@ -3010,24 +3160,12 @@ version 2005/12/01 or later. You~can~go~on~but~you~will~probably~have~other~errors~ if~you~use~the~functionalities~of~nicematrix. } -\cs_if_exist:NF \l_keys_key_str - { \msg_error:nn { nicematrix } { expl3~too~old } } +\cs_if_exist:NF \l_keys_key_str + { \msg_error:nn { nicematrix } { expl3~too~old } } % \end{macrocode} % % % \bigskip -% We test the class option |draft|. In this case, we raise the flag -% |\c_@@_draft_bool| because we won't draw the dotted lines if the option -% |draft| is used. -% \begin{macrocode} -\bool_new:N \c_@@_draft_bool -\DeclareOption { draft } { \bool_set_true:N \c_@@_draft_bool } -\DeclareOption* { } -\ProcessOptions \relax -% \end{macrocode} -% -% -% % The command for the treatment of the options of |\usepackage| is at the end of % this package for technical reasons. % @@ -3059,10 +3197,15 @@ version 2005/12/01 or later. % \bigskip % \subsection*{Technical definitions} % +% % \begin{macrocode} +\bool_new:N \c_@@_booktabs_loaded_bool \bool_new:N \c_@@_tikz_loaded_bool \AtBeginDocument { + \@ifpackageloaded { booktabs } + { \bool_set_true:N \c_@@_booktabs_loaded_bool } + { } \@ifpackageloaded { tikz } { % \end{macrocode} @@ -3071,8 +3214,8 @@ version 2005/12/01 or later. % between |{pgfpicture}| and |{tikzpicture}| can't be done dynamically with a % conditional because, when the Tikz library |external| is loaded by the user, % the pair |\tikzpicture|-|\endtikpicture| (or -% |\begin{tikzpicture}-\end{tikzpicture}| must be statically ``visible'' (even -% when extenalization is not activated). +% |\begin{tikzpicture}-\end{tikzpicture}|) must be statically ``visible'' (even +% when externalization is not activated). % % That's why we create |\c_@@_pgfortikzpicture_tl| and % |\c_@@_endpgfortikzpicture_tl| which will be used to construct in a @@ -3102,18 +3245,6 @@ version 2005/12/01 or later. { } % \end{macrocode} % -% -% The following message must be defined right now because it may be used during -% the loading of the package. -% \begin{macrocode} -\@@_msg_new:nn { Draft~mode } - { The~compilation~is~in~draft~mode:~the~dotted~lines~won't~be~drawn. } -% \end{macrocode} -% -% \begin{macrocode} -\bool_if:NT \c_@@_draft_bool { \msg_warning:nn { nicematrix } { Draft~mode } } -% \end{macrocode} -% % % \bigskip % We define a command |\iddots| similar to |\ddots| ($\ddots$) but with dots @@ -3141,146 +3272,312 @@ version 2005/12/01 or later. % This definition is a variant of the standard definition of |\ddots|. % % -% \bigskip -% The following counter will count the environments |{NiceArray}|. The value of -% this counter will be used to prefix the names of the Tikz nodes created in the -% array. -% \begin{macrocode} -\int_new:N \g_@@_env_int -% \end{macrocode} -% -% \begin{macrocode} -\cs_new:Npn \@@_env: { nm - \int_use:N \g_@@_env_int } -\cs_new_protected:Npn \@@_qpoint: #1 - { \pgfpointanchor { \@@_env: - #1 } { center } } -% \end{macrocode} -% -% \bigskip -% We also define a counter to count the environments |{NiceMatrixBlock}|. -% \begin{macrocode} -\int_new:N \g_@@_NiceMatrixBlock_int -% \end{macrocode} -% -% \bigskip -% The dimension |\l_@@_columns_width_dim| will be used when the options specify -% that all the columns must have the same width (but, if the key |columns-width| -% is used with the special value |auto|, the boolean -% |l_@@_auto_columns_width_bool| also will be raised). -% \begin{macrocode} -\dim_new:N \l_@@_columns_width_dim -% \end{macrocode} -% -% \bigskip -% The sequence |\g_@@_names_seq| will be the list of all the names of -% environments used (via the option |name|) in the document: two environments -% must not have the same name. However, it's possible to use the option -% |allow-duplicate-names|. -% \begin{macrocode} -\seq_new:N \g_@@_names_seq -% \end{macrocode} -% - -% \bigskip -% We want to know if we are in an environment of \pkg{nicematrix} because we -% will raise an error if the user tries to use nested environments. -% \begin{macrocode} -\bool_new:N \l_@@_in_env_bool -% \end{macrocode} -% -% % \bigskip -% If the user uses |{NiceArray}| (and not another environment relying upon -% |{NiceArrayWithDelims}| like |{pNiceArray}|), we will raise the flag -% |\l_@@_NiceArray_bool|. We have to know that, because, in |{NiceArray}|, we -% won't use a structure with |\left| and |\right| and we will use the option of -% position (|t|, |b| or |c|). +% In the |aux| file, we will have the references of the PGF/Tikz nodes created +% by \pkg{nicematrix}. However, when \pkg{booktabs} is used, some nodes (more +% precisely, some |row| nodes) will be defined twice because their position will +% be modified. In order to avoid an error message in this case, we will redefine +% |\pgfutil@check@rerun| in the |aux| file. % \begin{macrocode} -\bool_new:N \l_@@_NiceArray_bool +\AtBeginDocument + { + \@ifpackageloaded { booktabs } + { \iow_now:Nn \@mainaux \nicematrix@redefine@check@rerun } + { } + } +\cs_set_protected:Npn \nicematrix@redefine@check@rerun + { + \cs_set_eq:NN \@@_old_pgfutil@check@rerun \pgfutil@check@rerun % \end{macrocode} -% -% -% \bigskip +% The new version of |\pgfutil@check@rerun| will not check the PGF nodes whose +% names start with |nm-| (which is the prefix for the nodes creates by +% \pkg{nicematrix}). % \begin{macrocode} -\cs_new_protected:Npn \@@_test_if_math_mode: - { - \if_mode_math: \else: - \@@_fatal:n { Outside~math~mode } - \fi: + \cs_set_protected:Npn \pgfutil@check@rerun ##1 ##2 + { + \str_set:Nx \l_tmpa_str { \tl_range:nnn { ##1 } 1 3 } + \str_if_eq:VnF \l_tmpa_str { nm- } + { \@@_old_pgfutil@check@rerun { ##1 } { ##2 } } + } } % \end{macrocode} % -% -% % \bigskip -% We have to know whether \pkg{colortbl} is loaded for the redefinition of -% |\everycr| and |\vline| and for the options |hlines| and |vlines|. +% We have to know whether \pkg{colortbl} is loaded in particular for the +% redefinition of |\everycr|. % \begin{macrocode} \bool_new:N \c_@@_colortbl_loaded_bool \AtBeginDocument { \@ifpackageloaded { colortbl } + { \bool_set_true:N \c_@@_colortbl_loaded_bool } { - \bool_set_true:N \c_@@_colortbl_loaded_bool - \cs_set_protected:Npn \@@_vline_i: { { \CT@arc@ \vline } } - } - { } - } % \end{macrocode} -% +% The command |\CT@arc@| is a command of \pkg{colortbl} which sets the color of +% the rules in the array. We will use it to store the instruction of color for +% the rules even if \pkg{colortbl} is not loaded. % \begin{macrocode} -\colorlet { nicematrix-last-col } { . } -\colorlet { nicematrix-last-row } { . } + \cs_set_protected:Npn \CT@arc@ { } + \NewDocumentCommand { \arrayrulecolor } { m } + { \tl_gset:Nn \CT@arc@ { \color { #1 } } } % \end{macrocode} -% -% \bigskip -% The length |\l_@@_inter_dots_dim| is the distance between two dots for the -% dotted lines. The default value is 0.45~em but it will be changed if the -% option |small| is used. +% The following line are from the redefinition of |\hline| of standard LaTeX by +% \pkg{colortbl} (\pkg{array} does not redefine |\hline|). % \begin{macrocode} -\dim_new:N \l_@@_inter_dots_dim -\dim_set:Nn \l_@@_inter_dots_dim { 0.45 em } + \cs_set:Npn \hline + { + \noalign { \ifnum 0 = `} \fi + \let \hskip \vskip + \let \vrule \hrule + \let \@width \@height + { \CT@arc@ \vline } + \futurelet \reserved@a + \@xhline + } + } + } % \end{macrocode} % % \bigskip -% The length |\l_@@_xdots_shorten_dim| is the minimal distance between a -% node (in fact an anchor of that node) and a dotted line (we say ``minimal'' -% because, by definition, a dotted line is not a continuous line and, therefore, -% this distance may vary a little). -% \begin{macrocode} -\dim_new:N \l_@@_xdots_shorten_dim -\dim_set:Nn \l_@@_xdots_shorten_dim { 0.3 em } -% \end{macrocode} -% -% \bigskip -% The length |\l_@@_radius_dim| is the radius of the dots for the dotted lines -% (for |\hdottedline| and |\dottedline| and for all the other dotted lines when -% |line-style| is equal to |standard|, which is the initial value). The initial -% value is 0.53~pt but it will be changed if the option |small| is used (to -% 0.37~pt). +% The following command are only for efficiency. It must \emph{not} be protected +% because it will be used (for instance) in names of \textsc{pgf} nodes. % \begin{macrocode} -\dim_new:N \l_@@_radius_dim -\dim_set:Nn \l_@@_radius_dim { 0.53 pt } +\cs_new:Npn \@@_succ:n #1 { \the \numexpr #1 + 1 \relax } +\cs_new:Npn \@@_pred:n #1 { \the \numexpr #1 - 1 \relax } % \end{macrocode} % % \bigskip -% The name of the current environment or the current command (despite the name -% which contains \textsl{env}). +% \textbf{The column S of siunitx}\par\nobreak +% +% \medskip +% We want to know whether the package \pkg{siunitx} is loaded and, if it is +% loaded, we redefine the |S| columns of \pkg{siunitx}. % \begin{macrocode} -\str_new:N \g_@@_name_env_str +\bool_new:N \c_@@_siunitx_loaded_bool +\AtBeginDocument + { + \@ifpackageloaded { siunitx } + { \bool_set_true:N \c_@@_siunitx_loaded_bool } + { } + } % \end{macrocode} % -% The string |\g_@@_com_or_env_str| will contain the word \emph{command} or -% \emph{environment} whether we are in a command of \pkg{nicematrix} or a an -% environment of \pkg{nicematrix}. The default value is \emph{environment}. -% \begin{macrocode} -\str_new:N \g_@@_com_or_env_str +% \medskip +% The command |\NC@rewrite@S| is a LaTeX command created by \pkg{siunitx} in +% connection with the |S| column. In the code of \pkg{siunitx}, this command is +% defined by: +% \begin{Verbatim}[commandchars=\~\!\+, formatcom = \small] +% \renewcommand*{\NC@rewrite@S}[1][] +% { +% \@temptokena \exp_after:wN +% { +% \tex_the:D \@temptokena +% > { \__siunitx_table_collect_begin: S {#1} } +% c +% < { \__siunitx_table_print: } +% } +% \NC@find +% } +% \end{Verbatim} +% We want to patch this command (in the environments of \pkg{nicematrix}) in +% order to have: +% \begin{Verbatim}[commandchars=\~\!\+, formatcom = \small] +% \renewcommand*{\NC@rewrite@S}[1][] +% { +% \@temptokena \exp_after:wN +% { +% \tex_the:D \@temptokena +% > { ~emphase!\@@_Cell:+ \__siunitx_table_collect_begin: S {#1} } +% c +% < { \__siunitx_table_print: ~emphase!\@@_end_Cell:+ } +% } +% \NC@find +% } +% \end{Verbatim} +% However, we don't want do use explicitly any private command of \pkg{siunitx}. +% That's why we will extract the name of the two |\__siunitx...| commands by +% their position in the code of |\NC@rewrite@S|. +% +% Since the command |\NC@rewrite@S| appends some tokens to the \emph{toks} list +% |\@temptokena|, we use the LaTeX command |\NC@rewrite@S| in a group +% (|\group_begin:|--|\group_end:|) and we extract the two command names which +% are in the toks |\@temptokena|. However, this extraction can be done only +% when \pkg{siunitx} is loaded (and it may be loaded after \pkg{nicematrix}) +% and, in fact, after the beginning of the document --- because some +% instructions of \pkg{siunitx} are executed in a |\AtBeginDocument|). That's +% why this extraction will be done only at the first use of an +% environment of \pkg{nicematrix} with the command |\@@_adapt_S_column:|. +% \begin{macrocode} +\cs_set_protected:Npn \@@_adapt_S_column: + { + \bool_if:NT \c_@@_siunitx_loaded_bool + { + \group_begin: + \@temptokena = { } +% \end{macrocode} +% We protect |\NC@find| which is at the end of |\NC@rewrite@S|. +% \begin{macrocode} + \cs_set_eq:NN \NC@find \prg_do_nothing: + \NC@rewrite@S { } +% \end{macrocode} +% Conversion of the \emph{toks} |\@temptokena| in a token list of \pkg{expl3} +% (the toks are not supported by \pkg{expl3} but we can, nevertheless, use the +% option |V| for |\tl_gset:NV|). +% \begin{macrocode} + \tl_gset:NV \g_tmpa_tl \@temptokena + \group_end: + \tl_new:N \c_@@_table_collect_begin_tl + \tl_set:Nx \l_tmpa_tl { \tl_item:Nn \g_tmpa_tl 2 } + \tl_gset:Nx \c_@@_table_collect_begin_tl { \tl_item:Nn \l_tmpa_tl 1 } + \tl_new:N \c_@@_table_print_tl + \tl_gset:Nx \c_@@_table_print_tl { \tl_item:Nn \g_tmpa_tl { -1 } } +% \end{macrocode} +% The token lists |\c_@@_table_collect_begin_tl| and |\c_@@_table_print_tl| +% contain now the two commands of \pkg{siunitx}. +% +% \smallskip +% If the adaptation has been done, the command |\@@_adapt_S_column:| becomes +% no-op (globally). +% \begin{macrocode} + \cs_gset_eq:NN \@@_adapt_S_column: \prg_do_nothing: + } + } +% \end{macrocode} +% +% \bigskip +% The command |\@@_renew_NC@rewrite@S:| will be used in each environment of +% \pkg{nicematrix} in order to ``rewrite'' the |S| column in each environment +% (only if the boolean |\c_@@_siunitx_loaded_bool| is raised, of course). +% \begin{macrocode} +\cs_new_protected:Npn \@@_renew_NC@rewrite@S: + { + \renewcommand*{\NC@rewrite@S}[1][] + { + \@temptokena \exp_after:wN + { + \tex_the:D \@temptokena + > { \@@_Cell: \c_@@_table_collect_begin_tl S {##1} } + c + < { \c_@@_table_print_tl \@@_end_Cell: } + } + \NC@find + } + } +% \end{macrocode} +% +% +% \bigskip +% \subsection*{Parameters} +% +% +% \bigskip +% The following counter will count the environments |{NiceArray}|. The value of +% this counter will be used to prefix the names of the Tikz nodes created in the +% array. +% \begin{macrocode} +\int_new:N \g_@@_env_int +% \end{macrocode} +% +% \bigskip +% The following command is only a syntaxic shortcut. It must \emph{not} be +% protected (it will be used in names of \textsc{pgf} nodes). +% \begin{macrocode} +\cs_new:Npn \@@_env: { nm - \int_use:N \g_@@_env_int } +% \end{macrocode} +% +% \bigskip +% The following command is only a syntaxic shortcut. The |q| in |qpoint| means +% \emph{quick}. +% \begin{macrocode} +\cs_new_protected:Npn \@@_qpoint:n #1 + { \pgfpointanchor { \@@_env: - #1 } { center } } +% \end{macrocode} +% +% \bigskip +% the following counter will count the environments |{NiceMatrixBlock}|. +% \begin{macrocode} +\int_new:N \g_@@_NiceMatrixBlock_int +% \end{macrocode} +% +% \bigskip +% The dimension |\l_@@_columns_width_dim| will be used when the options specify +% that all the columns must have the same width (but, if the key |columns-width| +% is used with the special value |auto|, the boolean +% |l_@@_auto_columns_width_bool| also will be raised). +% \begin{macrocode} +\dim_new:N \l_@@_columns_width_dim +% \end{macrocode} +% +% \bigskip +% The sequence |\g_@@_names_seq| will be the list of all the names of +% environments used (via the option |name|) in the document: two environments +% must not have the same name. However, it's possible to use the option +% |allow-duplicate-names|. +% \begin{macrocode} +\seq_new:N \g_@@_names_seq +% \end{macrocode} +% +% \bigskip +% We want to know if we are in an environment of \pkg{nicematrix} because we +% will raise an error if the user tries to use nested environments. +% \begin{macrocode} +\bool_new:N \l_@@_in_env_bool +% \end{macrocode} +% +% \bigskip +% If the user uses |{NiceArray}| (and not another environment relying upon +% |{NiceArrayWithDelims}| like |{pNiceArray}|), we will raise the flag +% |\l_@@_NiceArray_bool|. We have to know that, because, in |{NiceArray}|, we +% won't use a structure with |\left| and |\right| and we will use the option of +% position (|t|, |b| or |c|). +% \begin{macrocode} +\bool_new:N \l_@@_NiceArray_bool +% \end{macrocode} +% +% \bigskip +% If the user uses |{NiceTabular}|, we will raise the following flag. +% \begin{macrocode} +\bool_new:N \l_@@_NiceTabular_bool +% \end{macrocode} +% +% \bigskip +% \begin{macrocode} +\cs_new_protected:Npn \@@_test_if_math_mode: + { + \if_mode_math: \else: + \@@_fatal:n { Outside~math~mode } + \fi: + } +% \end{macrocode} +% +% +% \bigskip +% The following colors will be used to memorize le color of the potential ``first +% col'' and the potential ``first row''. +% \begin{macrocode} +\colorlet { nicematrix-last-col } { . } +\colorlet { nicematrix-last-row } { . } +% \end{macrocode} +% \bigskip +% The following string is the name of the current environment or the current +% command of \pkg{nicematrix} (despite its name which contains \textsl{env}). +% \begin{macrocode} +\str_new:N \g_@@_name_env_str +% \end{macrocode} +% +% \bigskip +% The following string will contain the word \emph{command} or +% \emph{environment} whether we are in a command of \pkg{nicematrix} or in an +% environment of \pkg{nicematrix}. The default value is \emph{environment}. +% \begin{macrocode} +\str_new:N \g_@@_com_or_env_str \str_set:Nn \g_@@_com_or_env_str { environment } % \end{macrocode} % -% The following control sequence will be able to reconstruct the full name of -% the current command or environment (despite the name which contains -% \textsl{env}). This command must \emph{not} be protected since it's used in -% error messages. +% \bigskip +% The following command will be able to reconstruct the full name of the current +% command or environment (despite its name which contains \textsl{env}). This +% command must \emph{not} be protected since it will be used in error messages. % \begin{macrocode} \cs_new:Npn \@@_full_name_env: { @@ -3291,35 +3588,56 @@ version 2005/12/01 or later. % \end{macrocode} % % \bigskip +% The following token list corresponds to the option |code-after| (it's also +% possible to set the value of that parameter with the command |\CodeAfter|). % \begin{macrocode} -\tl_new:N \g_@@_internal_code_after_tl \tl_new:N \g_@@_code_after_tl % \end{macrocode} % -% % \bigskip -% The counters |\l_@@_save_iRow_int| and |\l_@@_save_jCol_int| will be used to -% save the values of the eventual LaTeX counters |iRow| and |jCol|. These LaTeX +% The following token list has a function similar to |\g_@@_code_after_tl| but +% it is used internally by \pkg{nicematrix}. In fact, we have to distinguish +% between |\g_@@_code_after_tl| and |\g_@@_internal_code_after_tl| because we +% must take care of the order in which instructions stored in that paremeters +% are executed. +% \begin{macrocode} +\tl_new:N \g_@@_internal_code_after_tl +% \end{macrocode} +% +% \bigskip +% The counters |\l_@@_old_iRow_int| and |\l_@@_old_jCol_int| will be used to +% save the values of the potential LaTeX counters |iRow| and |jCol|. These LaTeX % counters will be restored at the end of the environment. % \begin{macrocode} -\int_new:N \l_@@_save_iRow_int -\int_new:N \l_@@_save_jCol_int +\int_new:N \l_@@_old_iRow_int +\int_new:N \l_@@_old_jCol_int % \end{macrocode} % % The TeX counters |\c@iRow| and |\c@jCol| will be created in the beginning of % |{NiceArrayWithDelims}| (if they don't exist previously). % +% \bigskip +% A kind of false row will be inserted at the end of the array for the +% construction of the |col| nodes (and also to fix the width of the columns when +% |columns-width| is used). When this special row will be created, we will raise +% the flag |\g_@@_row_of_col_done_bool| in order to avoid some actions set in +% the redefinition of |\everycr| when the last |\cr| of the |\halign| will occur +% (after that row of |col| nodes). % \begin{macrocode} \bool_new:N \g_@@_row_of_col_done_bool % \end{macrocode} % +% \bigskip +% The following flag will be raised when the key |code-before| is used in the +% environment. Indeed, if there is a |code-before| in the environment, we will +% manage to have the |row| nodes and the |col| nodes available \emph{before} the +% creation of the array. % \begin{macrocode} -\tl_new:N \l_@@_initial_suffix_tl -\tl_new:N \l_@@_initial_anchor_tl -\tl_new:N \l_@@_final_suffix_tl -\tl_new:N \l_@@_final_anchor_tl -% \end{macrocode} +\bool_new:N \l_@@_code_before_bool +% \end{macrocode} % +% \bigskip +% The following dimensions will be used when drawing the dotted lines. % \begin{macrocode} \dim_new:N \l_@@_x_initial_dim \dim_new:N \l_@@_y_initial_dim @@ -3327,25 +3645,37 @@ version 2005/12/01 or later. \dim_new:N \l_@@_y_final_dim % \end{macrocode} % +% \bigskip +% \pkg{expl3} provides scratch dimension |\l_tmpa_dim| and |\l_tmpd_dim|. We +% creates two other in the same spirit (if they don't exist yet : that's why we +% use |\dim_zero_new:N|). % \begin{macrocode} -\dim_new:N \l_tmpc_dim -\dim_new:N \l_tmpd_dim +\dim_zero_new:N \l_tmpc_dim +\dim_zero_new:N \l_tmpd_dim % \end{macrocode} % +% \bigskip +% Some cells will be declared as ``empty'' (for example a cell with the +% instrution |\Cdot|). % \begin{macrocode} \bool_new:N \g_@@_empty_cell_bool % \end{macrocode} % -% \medskip -% The token list |\l_@@_xdots_line_style_tl| corresponds to the option |tikz| of the -% commands |\Cdots|, |\Ldots|, etc. and of the options |line-style| for the -% environments and |\NiceMatrixOptions|. The constant |\c_@@_standard_tl| will -% be used in some tests. +% \bigskip +% The following dimension will be used to save the current value of +% |\arraycolsep|. % \begin{macrocode} -\tl_new:N \l_@@_xdots_line_style_tl -\tl_const:Nn \c_@@_standard_tl { standard } -\tl_set_eq:NN \l_@@_xdots_line_style_tl \c_@@_standard_tl +\dim_new:N \@@_old_arraycolsep_dim % \end{macrocode} +% +% \bigskip +% The following dimensions will be used internally to compute the width of the +% potential ``first column'' and ``last column''. +% \begin{macrocode} +\dim_new:N \g_@@_width_last_col_dim +\dim_new:N \g_@@_width_first_col_dim +% \end{macrocode} +% % % \bigskip % \textbf{Variables for the exterior rows and columns}\par\nobreak @@ -3360,8 +3690,7 @@ version 2005/12/01 or later. % \item \textbf{First row}\par\nobreak % The integer |\l_@@_first_row_int| is the number of the first row of the % array. The default value is $1$, but, if the option |first-row| is used, -% the value will be~$0$. As usual, the global version is for the passage in the -% |\group_insert_after:N|. +% the value will be~$0$. % \begin{macrocode} \int_new:N \l_@@_first_row_int \int_set:Nn \l_@@_first_row_int 1 @@ -3409,7 +3738,7 @@ version 2005/12/01 or later. % \medskip % \item \textbf{Last column}\par\nobreak % -% For the eventual ``last column'', we use an integer. A value of $-2$ means +% For the potential ``last column'', we use an integer. A value of $-2$ means % that there is no last column. A value of $-1$ means that there is a last % column but we don't know its value because the user has used the option % |last-col| without value (it's possible in an environment without preamble @@ -3438,138 +3767,13 @@ version 2005/12/01 or later. % This boolean is set to |false| at the end of |\@@_pre_array:|. % \end{itemize} % -% \bigskip -% \textbf{The column S of siunitx}\par\nobreak -% -% \medskip -% We want to know whether the package \pkg{siunitx} is loaded and, if it is -% loaded, we redefine the |S| columns of \pkg{siunitx}. -% \begin{macrocode} -\bool_new:N \c_@@_siunitx_loaded_bool -\AtBeginDocument - { - \@ifpackageloaded { siunitx } - { \bool_set_true:N \c_@@_siunitx_loaded_bool } - { } - } -% \end{macrocode} -% -% \medskip -% The command |\NC@rewrite@S| is a LaTeX command created by \pkg{siunitx} in -% connection with the |S| column. In the code of \pkg{siunitx}, this command is -% defined by: -% \begin{Verbatim}[commandchars=\~\!\+, formatcom = \small] -% \renewcommand*{\NC@rewrite@S}[1][] -% { -% \@temptokena \exp_after:wN -% { -% \tex_the:D \@temptokena -% > { \__siunitx_table_collect_begin: S {#1} } -% c -% < { \__siunitx_table_print: } -% } -% \NC@find -% } -% \end{Verbatim} -% We want to patch this command (in the environments of \pkg{nicematrix}) in -% order to have: -% \begin{Verbatim}[commandchars=\~\!\+, formatcom = \small] -% \renewcommand*{\NC@rewrite@S}[1][] -% { -% \@temptokena \exp_after:wN -% { -% \tex_the:D \@temptokena -% > { ~emphase!\@@_Cell:+ \__siunitx_table_collect_begin: S {#1} } -% c -% < { \__siunitx_table_print: ~emphase!\@@_end_Cell:+ } -% } -% \NC@find -% } -% \end{Verbatim} -% However, we don't want do use explicitly any private command of \pkg{siunitx}. -% That's why we will extract the name of the two |\__siunitx...| commands by -% their position in the code of |\NC@rewrite@S|. -% -% Since the command |\NC@rewrite@S| appends some tokens to the \emph{toks} list -% |\@temptokena|, we use the LaTeX command |\NC@rewrite@S| in a group -% (|\group_begin:|--|\group_end:|) and we extract the two command names which -% are in the toks |\@temptokena|. However, this extraction can be done only -% when \pkg{siunitx} is loaded (and it may be loaded after \pkg{nicematrix}) -% and, in fact, after the beginning of the document --- because some -% instructions of \pkg{siunitx} are executed in a |\AtBeginDocument|). That's -% why this extraction will be done only at the first use of an -% environment of \pkg{nicematrix} with the command |\@@_adapt_S_column:|. -% \begin{macrocode} -\cs_set_protected:Npn \@@_adapt_S_column: - { - \bool_if:NT \c_@@_siunitx_loaded_bool - { - \group_begin: - \@temptokena = { } -% \end{macrocode} -% We protect |\NC@find| which is at the end of |\NC@rewrite@S|. -% \begin{macrocode} - \cs_set_eq:NN \NC@find \prg_do_nothing: - \NC@rewrite@S { } -% \end{macrocode} -% Conversion of the \emph{toks} |\@temptokena| in a token list of \pkg{expl3} -% (the toks are not supported by \pkg{expl3} but we can, nevertheless, use the -% option |V| for |\tl_gset:NV|). -% \begin{macrocode} - \tl_gset:NV \g_tmpa_tl \@temptokena - \group_end: - \tl_new:N \c_@@_table_collect_begin_tl - \tl_set:Nx \l_tmpa_tl { \tl_item:Nn \g_tmpa_tl 2 } - \tl_gset:Nx \c_@@_table_collect_begin_tl { \tl_item:Nn \l_tmpa_tl 1 } - \tl_new:N \c_@@_table_print_tl - \tl_gset:Nx \c_@@_table_print_tl { \tl_item:Nn \g_tmpa_tl { -1 } } -% \end{macrocode} -% The token lists |\c_@@_table_collect_begin_tl| and |\c_@@_table_print_tl| -% contain now the two commands of \pkg{siunitx}. -% -% \smallskip -% If the adaptation has been done, the command |\@@_adapt_S_column:| becomes -% no-op (globally). -% \begin{macrocode} - \cs_gset_eq:NN \@@_adapt_S_column: \prg_do_nothing: - } - } -% \end{macrocode} -% -% \bigskip -% The command |\@@_renew_NC@rewrite@S:| will be used in each environment of -% \pkg{nicematrix} in order to ``rewrite'' the |S| column in each environment -% (only if the boolean |\c_@@_siunitx_loaded_bool| is raised, of course). -% \begin{macrocode} -\cs_new_protected:Npn \@@_renew_NC@rewrite@S: - { - \renewcommand*{\NC@rewrite@S}[1][] - { - \@temptokena \exp_after:wN - { - \tex_the:D \@temptokena - > { \@@_Cell: \c_@@_table_collect_begin_tl S {##1} } - c - < { \c_@@_table_print_tl \@@_end_Cell: } - } - \NC@find - } - } -% \end{macrocode} % -% \bigskip -% The following command is only for efficiency. It must \emph{not} be protected -% because it will be used (for instance) in names of \textsc{pgf} nodes. -% \begin{macrocode} -\cs_new:Npn \@@_succ:n #1 { \the \numexpr #1 + 1 \relax } -\cs_new:Npn \@@_pred:n #1 { \the \numexpr #1 - 1 \relax } -% \end{macrocode} % % \subsection*{Command for creation of rectangle nodes} % % -% The following command should be used in a |{pgfpicture}|. It creates an -% rectangular (empty but with a name) when the four corners are given. +% The following command should be used in a |{pgfpicture}|. It creates a +% rectangle (empty but with a name). % % |#1| is the name of the node which will be created; % |#2| and |#3| are the coordinates of one of the corner of the rectangle; @@ -3634,16 +3838,64 @@ version 2005/12/01 or later. % \end{macrocode} % % -% \bigskip -% \subsection*{The options} -% +% \bigskip +% \subsection*{The options} +% +% +% The following dimensions correspond to the options |cell-space-top-limit| and co +% (these parameters are inspired by the package \pkg{cellspace}). +% \begin{macrocode} +\dim_new:N \l_@@_cell_space_top_limit_dim +\dim_new:N \l_@@_cell_space_bottom_limit_dim +% \end{macrocode} +% +% \bigskip +% The following dimension is the distance between two dots for the dotted lines +% (when |line-style| is equal to |standard|, which is the initial value). The +% initial value is 0.45~em but it will be changed if the option |small| is used. +% \begin{macrocode} +\dim_new:N \l_@@_inter_dots_dim +\dim_set:Nn \l_@@_inter_dots_dim { 0.45 em } +% \end{macrocode} +% +% \bigskip +% The following dimension is the minimal distance between a node (in fact an +% anchor of that node) and a dotted line (we say ``minimal'' because, by +% definition, a dotted line is not a continuous line and, therefore, this +% distance may vary a little). +% \begin{macrocode} +\dim_new:N \l_@@_xdots_shorten_dim +\dim_set:Nn \l_@@_xdots_shorten_dim { 0.3 em } +% \end{macrocode} +% +% \bigskip +% The following dimension is the radius of the dots for the dotted lines (when +% |line-style| is equal to |standard|, which is the initial value). The initial +% value is 0.53~pt but it will be changed if the option |small| is used. +% \begin{macrocode} +\dim_new:N \l_@@_radius_dim +\dim_set:Nn \l_@@_radius_dim { 0.53 pt } +% \end{macrocode} +% +% \bigskip +% The token list |\l_@@_xdots_line_style_tl| corresponds to the option |tikz| of the +% commands |\Cdots|, |\Ldots|, etc. and of the options |line-style| for the +% environments and |\NiceMatrixOptions|. The constant |\c_@@_standard_tl| will +% be used in some tests. +% \begin{macrocode} +\tl_new:N \l_@@_xdots_line_style_tl +\tl_const:Nn \c_@@_standard_tl { standard } +\tl_set_eq:NN \l_@@_xdots_line_style_tl \c_@@_standard_tl +% \end{macrocode} +% +% \bigskip % The boolean |\l_@@_light_syntax_bool| corresponds to the option |light-syntax|. % \begin{macrocode} \bool_new:N \l_@@_light_syntax_bool % \end{macrocode} % % \bigskip -% The token list |\l_@@_baseline_str| may contain one of the three values |t|, +% The string |\l_@@_baseline_str| may contain one of the three values |t|, % |c| or |b| as in the option of the environment |{array}|. However, it may also % contain an integer (which represents the number of the row to which align the % array). @@ -3698,7 +3950,7 @@ version 2005/12/01 or later. % % % \bigskip -% The token list |\l_@@_name_str| will contain the optional name of the +% The string |\l_@@_name_str| will contain the optional name of the % environment: this name can be used to access to the Tikz nodes created in the % array from outside the environment. % \begin{macrocode} @@ -3723,13 +3975,6 @@ version 2005/12/01 or later. \dim_new:N \l_@@_right_margin_dim % \end{macrocode} % -% \bigskip -% The following dimensions will be used internally to compute the width of the -% potential ``first column'' and ``last column''. -% \begin{macrocode} -\dim_new:N \g_@@_width_last_col_dim -\dim_new:N \g_@@_width_first_col_dim -% \end{macrocode} % % \bigskip % The dimensions |\l_@@_extra_left_margin_dim| and @@ -3809,12 +4054,20 @@ version 2005/12/01 or later. % \begin{macrocode} \keys_define:nn { NiceMatrix / Global } { + cell-space-top-limit .dim_set:N = \l_@@_cell_space_top_limit_dim , + cell-space-top-limit .value_required:n = true , + cell-space-bottom-limit .dim_set:N = \l_@@_cell_space_bottom_limit_dim , + cell-space-bottom-limit .value_required:n = true , xdots .code:n = \keys_set:nn { NiceMatrix / xdots } { #1 } , max-delimiter-width .bool_set:N = \l_@@_max_delimiter_width_bool , light-syntax .bool_set:N = \l_@@_light_syntax_bool , light-syntax .default:n = true , end-of-row .tl_set:N = \l_@@_end_of_row_tl , end-of-row .value_required:n = true , + first-col .code:n = \int_zero:N \l_@@_first_col_int , + first-row .code:n = \int_zero:N \l_@@_first_row_int , + last-row .int_set:N = \l_@@_last_row_int , + last-row .default:n = -1 , code-for-first-col .tl_set:N = \l_@@_code_for_first_col_tl , code-for-first-col .value_required:n = true , code-for-last-col .tl_set:N = \l_@@_code_for_last_col_tl , @@ -3823,7 +4076,6 @@ version 2005/12/01 or later. code-for-first-row .value_required:n = true , code-for-last-row .tl_set:N = \l_@@_code_for_last_row_tl , code-for-last-row .value_required:n = true , - small .bool_set:N = \l_@@_small_bool , hlines .bool_set:N = \l_@@_hlines_bool , vlines .bool_set:N = \l_@@_vlines_bool , hvlines .meta:n = { hlines , vlines } , @@ -3831,19 +4083,13 @@ version 2005/12/01 or later. % \end{macrocode} % % \bigskip -% With the option |renew-dots|, the command |\cdots|, |\ldots|, |\vdots| and -% |\ddots| are redefined and behave like the commands |\Cdots|, |\Ldots|, -% |\Vdots| and |\Ddots|. +% With the option |renew-dots|, the command |\cdots|, |\ldots|, |\vdots|, +% |\ddots|, etc. are redefined and behave like the commands |\Cdots|, |\Ldots|, +% |\Vdots|, |\Ddots|, etc. % \begin{macrocode} renew-dots .bool_set:N = \l_@@_renew_dots_bool , renew-dots .value_forbidden:n = true , nullify-dots .bool_set:N = \l_@@_nullify_dots_bool , -% \end{macrocode} -% -% \bigskip -% In some circonstancies, the ``medium nodes'' are created automatically, for -% example when a dotted line has an ``open'' extremity (idem for the ``large nodes''). -% \begin{macrocode} create-medium-nodes .bool_set:N = \l_@@_medium_nodes_bool , create-large-nodes .bool_set:N = \l_@@_large_nodes_bool , create-extra-nodes .meta:n = @@ -3868,6 +4114,14 @@ version 2005/12/01 or later. % \begin{macrocode} \keys_define:nn { NiceMatrix / Env } { + code-before .code:n = + { + \tl_if_empty:nF { #1 } + { + \tl_set:Nn \l_@@_code_before_tl { #1 } + \bool_set_true:N \l_@@_code_before_bool + } + } , % \end{macrocode} % \bigskip % The options |c|, |t| and |b| of the environment |{NiceArray}| have the same @@ -3900,10 +4154,6 @@ version 2005/12/01 or later. name .value_required:n = true , code-after .tl_gset:N = \g_@@_code_after_tl , code-after .value_required:n = true , - first-col .code:n = \int_zero:N \l_@@_first_col_int , - first-row .code:n = \int_zero:N \l_@@_first_row_int , - last-row .int_set:N = \l_@@_last_row_int , - last-row .default:n = -1 , } % \end{macrocode} % @@ -3925,6 +4175,12 @@ version 2005/12/01 or later. NiceMatrix / Env , } , NiceMatrix / xdots .inherit:n = NiceMatrix / xdots , + NiceTabular .inherit:n = + { + NiceMatrix / Global , + NiceMatrix / Env + } , + NiceTabular / xdots .inherit:n = NiceMatrix / xdots , NiceArray .inherit:n = { NiceMatrix / Global , @@ -3948,6 +4204,11 @@ version 2005/12/01 or later. % \begin{macrocode} \keys_define:nn { NiceMatrix / NiceMatrixOptions } { + last-col .code:n = \tl_if_empty:nF { #1 } + { \@@_error:n { last-col~non~empty~for~NiceMatrixOptions } } + \int_zero:N \l_@@_last_col_int , + small .bool_set:N = \l_@@_small_bool , + small .value_forbidden:n = true , % \end{macrocode} % % With the option |renew-matrix|, the environment |{matrix}| of \pkg{amsmath} @@ -3981,7 +4242,7 @@ version 2005/12/01 or later. % \end{macrocode} % % \bigskip -% Usually, an error is raised when the user tries to give the same to name two +% Usually, an error is raised when the user tries to give the same name to two % distincts environments of \pkg{nicematrix} (theses names are global and not % local to the current TeX scope). However, the option |allow-duplicate-names| % disables this feature. @@ -4041,6 +4302,11 @@ version 2005/12/01 or later. r .code:n = \tl_set:Nn \l_@@_type_of_col_tl R , L .code:n = \tl_set:Nn \l_@@_type_of_col_tl L , R .code:n = \tl_set:Nn \l_@@_type_of_col_tl R , + S .code:n = \bool_if:NTF \c_@@_siunitx_loaded_bool + { \tl_set:Nn \l_@@_type_of_col_tl S } + { \@@_error:n { option~S~without~siunitx } } , + small .bool_set:N = \l_@@_small_bool , + small .value_forbidden:n = true , unknown .code:n = \@@_error:n { Unknown~option~for~NiceMatrix } } % \end{macrocode} @@ -4060,6 +4326,8 @@ version 2005/12/01 or later. % be used without value because the number of columns of the array is read % from the preamble of the array. % \begin{macrocode} + small .bool_set:N = \l_@@_small_bool , + small .value_forbidden:n = true , last-col .code:n = \tl_if_empty:nF { #1 } { \@@_error:n { last-col~non~empty~for~NiceArray } } \int_zero:N \l_@@_last_col_int , @@ -4077,13 +4345,23 @@ version 2005/12/01 or later. { \@@_error:n { last-col~non~empty~for~NiceArray } } \int_zero:N \l_@@_last_col_int , first-row .code:n = \int_zero:N \l_@@_first_row_int , - last-row .int_set:N = \l_@@_last_row_int , - last-row .default:n = -1 , + small .bool_set:N = \l_@@_small_bool , + small .value_forbidden:n = true , unknown .code:n = \@@_error:n { Unknown~option~for~NiceMatrix } } % \end{macrocode} % +% \bigskip +% We finalise the definition of the set of keys ``|NiceMatrix / NiceTabular|'' +% with the options specific to |{NiceTabular}|. % +% \begin{macrocode} +\keys_define:nn { NiceMatrix / NiceTabular } + { + unknown .code:n = \@@_error:n { Unknown~option~for~NiceTabular } + } +% \end{macrocode} +% % \bigskip % \subsection*{Important code used by \{NiceArrayWithDelims\} } % @@ -4110,12 +4388,15 @@ version 2005/12/01 or later. % \end{macrocode} % The content of the cell is composed in the box |\l_@@_cell_box| because we want % to compute some dimensions of the box. The |\hbox_set_end:| corresponding to -% this |\hbox_set:Nw| will be in the |\@@_end_Cell:| (and the +% this |\hbox_set:Nw| will be in the |\@@_end_Cell:| (and the potential % |\c_math_toggle_token| also). % \begin{macrocode} \hbox_set:Nw \l_@@_cell_box - \c_math_toggle_token - \bool_if:NT \l_@@_small_bool \scriptstyle + \bool_if:NF \l_@@_NiceTabular_bool + { + \c_math_toggle_token + \bool_if:NT \l_@@_small_bool \scriptstyle + } % \end{macrocode} % % We will call \emph{corners} of the matrix the cases which are at the @@ -4158,12 +4439,12 @@ version 2005/12/01 or later. \pgfrememberpicturepositiononpagetrue \pgfcoordinate { \@@_env: - row - \int_use:N \c@iRow - base } - \pgfpointorigin + { \pgfpoint \c_zero_dim { 0.5 \arrayrulewidth } } \str_if_empty:NF \l_@@_name_str { \pgfnodealias - { \@@_env: - row - \int_use:N \c@iRow - base } { \l_@@_name_str - row - \int_use:N \c@iRow - base } + { \@@_env: - row - \int_use:N \c@iRow - base } } \endpgfpicture } @@ -4199,14 +4480,20 @@ version 2005/12/01 or later. % \begin{macrocode} \cs_new_protected:Npn \@@_end_Cell: { - \c_math_toggle_token + \bool_if:NF \l_@@_NiceTabular_bool \c_math_toggle_token \hbox_set_end: % \end{macrocode} % +% \begin{macrocode} + \box_set_ht:Nn \l_@@_cell_box + { \box_ht:N \l_@@_cell_box + \l_@@_cell_space_top_limit_dim } + \box_set_dp:Nn \l_@@_cell_box + { \box_dp:N \l_@@_cell_box + \l_@@_cell_space_bottom_limit_dim } +% \end{macrocode} +% % We want to compute in |\g_@@_max_cell_width_dim| the width of the widest cell % of the array (except the cells of the ``first column'' and the ``last % column''). -% % \begin{macrocode} \dim_gset:Nn \g_@@_max_cell_width_dim { \dim_max:nn \g_@@_max_cell_width_dim { \box_wd:N \l_@@_cell_box } } @@ -4242,10 +4529,7 @@ version 2005/12/01 or later. % \end{itemize} % \begin{macrocode} \bool_if:NTF \g_@@_empty_cell_bool - { - \box_use_drop:N \l_@@_cell_box - \bool_gset_false:N \g_@@_empty_cell_bool - } + { \box_use_drop:N \l_@@_cell_box } { \dim_compare:nNnTF { \box_wd:N \l_@@_cell_box } > \c_zero_dim \@@_node_for_the_cell: @@ -4300,13 +4584,13 @@ version 2005/12/01 or later. % \begin{pNiceMatrix} % 1 & 2 & 3 & 4 \\ % 5 & \Cdots & & 6 \\ -% 7 & \Cdots[color=red] \\ +% 7 & \Cdots[color=red] % \end{pNiceMatrix} % \end{BVerbatim} % $\begin{pNiceMatrix} % 1 & 2 & 3 & 4 \\ % 5 & \Cdots & & 6 \\ -% 7 & \Cdots[color=red] \\ +% 7 & \Cdots[color=red] % \end{pNiceMatrix}$ % % \smallskip @@ -4322,29 +4606,23 @@ version 2005/12/01 or later. % % % \bigskip -% We begin with a test of the flag |\c_@@_draft_bool| because, if the key -% |draft| is used, the dotted lines are not drawn. % \begin{macrocode} -\bool_if:NTF \c_@@_draft_bool - { \cs_set_protected:Npn \@@_instruction_of_type:nn #1 #2 { } } - { - \cs_new_protected:Npn \@@_instruction_of_type:nn #1 #2 - { +\cs_new_protected:Npn \@@_instruction_of_type:nn #1 #2 + { % \end{macrocode} % It's important to use a |\tl_gput_right:cx| and not a |\tl_gput_left:cx| % because we want the |\Ddots| lines to be drawn in the order of appearance % in the array (for parallelisation). % \begin{macrocode} - \tl_gput_right:cx - { g_@@_ #1 _ lines _ tl } - { - \use:c { @@ _ draw _ #1 : nnn } - { \int_use:N \c@iRow } - { \int_use:N \c@jCol } - { \exp_not:n { #2 } } - } - } - } + \tl_gput_right:cx + { g_@@_ #1 _ lines _ tl } + { + \use:c { @@ _ draw _ #1 : nnn } + { \int_use:N \c@iRow } + { \int_use:N \c@jCol } + { \exp_not:n { #2 } } + } + } % \end{macrocode} % % @@ -4380,58 +4658,126 @@ version 2005/12/01 or later. % |\ialign| in the environment |{NiceArrayWithDelims}| but restore the standard % version for use in the cells of the array. % \begin{macrocode} -\cs_set_eq:NN \@@_standard_ialign: \ialign +\cs_set_eq:NN \@@_old_ialign: \ialign % \end{macrocode} % -% \bigskip -% The following must \emph{not} be protected because it begins with |\noalign|. -% \begin{macrocode} -\cs_new:Npn \@@_everycr: { \noalign { \@@_everycr_i: } } -% \end{macrocode} % +% The following command creates a |row| node (and not a row of nodes!). % \begin{macrocode} -\cs_new_protected:Npn \@@_everycr_i: - { - \int_gzero:N \c@jCol +\cs_new_protected:Npn \@@_create_row_node: + { % \end{macrocode} % The |\hbox:n| (or |\hbox|) is mandatory. % \begin{macrocode} \hbox { + \bool_if:NT \l_@@_code_before_bool + { + \vtop + { + \skip_vertical:N 0.5\arrayrulewidth + \pgfsys@markposition { \@@_env: - row - \@@_succ:n \c@iRow } + \skip_vertical:N -0.5\arrayrulewidth + } + } \pgfpicture \pgfrememberpicturepositiononpagetrue \pgfcoordinate { \@@_env: - row - \@@_succ:n \c@iRow } - \pgfpointorigin + { \pgfpoint \c_zero_dim { - 0.5 \arrayrulewidth } } \str_if_empty:NF \l_@@_name_str { \pgfnodealias - { \@@_env: - row - \int_use:N \c@iRow - row } - { \l_@@_name_str - row - \int_use:N \c@iRow - row } + { \l_@@_name_str - row - \int_use:N \c@iRow } + { \@@_env: - row - \int_use:N \c@iRow } } \endpgfpicture - } + } + } % \end{macrocode} -% We add the potential horizontal lines specified by the option |hlines|. +% +% +% +% \bigskip +% The following must \emph{not} be protected because it begins with |\noalign|. +% \begin{macrocode} +\cs_new:Npn \@@_everycr: { \noalign { \@@_everycr_i: } } +% \end{macrocode} +% +% % \begin{macrocode} - \bool_if:NT \l_@@_hlines_bool +\cs_new_protected:Npn \@@_everycr_i: + { + \int_gzero:N \c@jCol + \bool_if:NF \g_@@_row_of_col_done_bool { + \@@_create_row_node: +% \end{macrocode} +% We add the potential horizontal lines specified by the option |hlines|. +% \begin{macrocode} + \bool_if:NT \l_@@_hlines_bool + { % \end{macrocode} % The counter |\c@iRow| has the value $-1$ only if there is a ``first % row'' and that we are before that ``first row'', i.e. just before the % beginning of the array. % \begin{macrocode} - \int_compare:nNnT \c@iRow > { -1 } - { - \bool_if:NF \g_@@_row_of_col_done_bool + \int_compare:nNnT \c@iRow > { -1 } { \int_compare:nNnF \c@iRow = \l_@@_last_row_int - { - \bool_if:NTF \c_@@_colortbl_loaded_bool - { { \CT@arc@ \hrule height \arrayrulewidth } } - { \hrule height \arrayrulewidth } - } - } +% \end{macrocode} +% The command |\CT@arc@| is a command of \pkg{colortbl} which sets the color of +% the rules in the array. The package \pkg{nicematrix} uses it even if +% \pkg{colortbl} is not loaded. We use a TeX group in order to limit the scope +% of |\CT@arc@|. +% \begin{macrocode} + { { \CT@arc@ \hrule height \arrayrulewidth } } + } + } + } + } +% \end{macrocode} +% +% \bigskip +% The command |\@@_newcolumntype| is the command |\newcolumntype| of +% \pkg{array} without the warnings for redefinitions of columns types (we will +% use it to redefine the columns types |w|, |W|, |p|, |m| and |b|). +% \begin{macrocode} +\cs_set_protected:Npn \@@_newcolumntype #1 + { + \cs_if_free:cT { NC @ find @ #1 } + { \NC@list \expandafter { \the \NC@list \NC@do #1 } } + \cs_set:cpn {NC @ find @ #1 } ##1 #1 { \NC@ { ##1 } } + \peek_meaning:NTF [ + { \newcol@ #1 } + { \newcol@ #1 [ 0 ] } + } +% \end{macrocode} +% +% +% \bigskip +% The following command will be used to redefine the column types |p|, |m| and +% |b|. That means that it will be used three times. The first argument is the +% letter of the column type (|p|, |m| or |b|). The second is the letter of +% position for the environment |{minipage}| (|t|, |c| or |b|). +% \begin{macrocode} +\cs_new_protected:Npn \@@_define_columntype:nn #1 #2 + { +% \end{macrocode} +% We don't want a warning for redefinition of the column type. That's why we use +% |\@@_newcolumntype| and not |\newcolumntype|. +% \begin{macrocode} + \@@_newcolumntype #1 [ 1 ] + { + > { + \@@_Cell: + \begin { minipage } [ #2 ] { ##1 } + \mode_leave_vertical: \box_use:N \@arstrutbox } +% \end{macrocode} +% Here, we put |c| but we would have the result with |l| or |r|. +% \begin{macrocode} + c + < { \box_use:N \@arstrutbox \end { minipage } \@@_end_Cell: } } } % \end{macrocode} @@ -4444,12 +4790,26 @@ version 2005/12/01 or later. % \begin{macrocode} \cs_new_protected:Npn \@@_pre_array: { +% \end{macrocode} +% If \pkg{booktabs} is loaded, we have to patch the macro |\@BTnormal| which is +% a macro of \pkg{booktabs}. The macro |\@BTnormal| draws an horizontal rule but +% it occurs after a vertical skip done by a low level TeX command. When this +% macro |\@BTnormal| occurs, the |row| node has yet been inserted by +% \pkg{nicematrix} \emph{before} the vertical skip (and thus, at a wrong place). +% That why we decide to create a new |row| node (for the same row). We patch the +% macro |\@BTnormal| to create this |row| node. This new |row| node will +% overwrite the previous definition of that |row| node and we have managed to +% avoid the error messages of that redefinition +% \footnote{cf. |\nicematrix@redefine@check@rerun|}. +% \begin{macrocode} + \bool_if:NT \c_@@_booktabs_loaded_bool + { \tl_put_left:Nn \@BTnormal \@@_create_row_node: } \box_clear_new:N \l_@@_cell_box \cs_if_exist:NT \theiRow - { \int_set_eq:NN \l_@@_save_iRow_int \c@iRow } + { \int_set_eq:NN \l_@@_old_iRow_int \c@iRow } \int_gzero_new:N \c@iRow \cs_if_exist:NT \thejCol - { \int_set_eq:NN \l_@@_save_jCol_int \c@jCol } + { \int_set_eq:NN \l_@@_old_jCol_int \c@jCol } \int_gzero_new:N \c@jCol \normalbaselines % \end{macrocode} @@ -4475,6 +4835,8 @@ version 2005/12/01 or later. % \begin{macrocode} \cs_set:Npn \ialign { + \bool_if:NT \l_@@_NiceTabular_bool + { \dim_set_eq:NN \arraycolsep \@@_old_arraycolsep_dim } \bool_if:NTF \c_@@_colortbl_loaded_bool { \CT@everycr @@ -4513,31 +4875,24 @@ version 2005/12/01 or later. % After its first use, the definition of |\ialign| will revert % automatically to its default definition. With this programmation, we will % have, in the cells of the array, a clean version of |\ialign|.\footnote{The -% user will probably not employ directly |\ialign| in the array... but more +% user will probably not use directly |\ialign| in the array... but more % likely environments that utilize |\ialign| internally (e.g.: |{substack}|).} % \begin{macrocode} - \cs_set_eq:NN \ialign \@@_standard_ialign: + \cs_set_eq:NN \ialign \@@_old_ialign: \halign } % \end{macrocode} % -% We define the new column types |L|, |C| and |R| that must be used instead of -% |l|, |c| and |r| in the preamble of |{NiceArray}|. -% \begin{macrocode} - \newcolumntype L { > \@@_Cell: l < \@@_end_Cell: } - \newcolumntype C { > \@@_Cell: c < \@@_end_Cell: } - \newcolumntype R { > \@@_Cell: r < \@@_end_Cell: } -% \end{macrocode} % We keep in memory the old versions or |\ldots|, |\cdots|, etc. only because we % use them inside |\phantom| commands in order that the new commands |\Ldots|, % |\Cdots|, etc. give the same spacing (except when the option |nullify-dots| is % used). % \begin{macrocode} - \cs_set_eq:NN \@@_ldots \ldots - \cs_set_eq:NN \@@_cdots \cdots - \cs_set_eq:NN \@@_vdots \vdots - \cs_set_eq:NN \@@_ddots \ddots - \cs_set_eq:NN \@@_iddots \iddots + \cs_set_eq:NN \@@_old_ldots \ldots + \cs_set_eq:NN \@@_old_cdots \cdots + \cs_set_eq:NN \@@_old_vdots \vdots + \cs_set_eq:NN \@@_old_ddots \ddots + \cs_set_eq:NN \@@_old_iddots \iddots \cs_set_eq:NN \firsthline \hline \cs_set_eq:NN \lasthline \hline \cs_set_eq:NN \Ldots \@@_Ldots @@ -4548,11 +4903,14 @@ version 2005/12/01 or later. \cs_set_eq:NN \hdottedline \@@_hdottedline: \cs_set_eq:NN \Hspace \@@_Hspace: \cs_set_eq:NN \Hdotsfor \@@_Hdotsfor: + \cs_set_eq:NN \Vdotsfor \@@_Vdotsfor: \cs_set_eq:NN \multicolumn \@@_multicolumn:nnn \cs_set_eq:NN \Block \@@_Block: \cs_set_eq:NN \rotate \@@_rotate: \cs_set_eq:NN \OnlyMainNiceMatrix \@@_OnlyMainNiceMatrix:n + \cs_set_eq:NN \dotfill \@@_dotfill: \cs_set_eq:NN \CodeAfter \@@_CodeAfter:n + \cs_set_eq:NN \slashbox \@@_slashbox:nn \bool_if:NT \l_@@_renew_dots_bool { \cs_set_eq:NN \ldots \@@_Ldots @@ -4604,14 +4962,31 @@ version 2005/12/01 or later. \cs_set_eq:NN \@ifnextchar \new@ifnextchar % \end{macrocode} % -% We nullify the definitions of the column types |w| and |W| before their -% redefinition because we want to avoid a warning in the log file for a -% redefinition of a column type. We must put |\relax| and not -% |\prg_do_nothing:|. +% \bigskip +% We define the new column types |L|, |C| and |R| that must be used instead of +% |l|, |c| and |r| in the preamble of |{NiceArray}|. We use |\@@_newcolumntype| +% because it will be slightly quicker thant |\newcolumtype|. +% \begin{macrocode} + \@@_newcolumntype L { > \@@_Cell: l < \@@_end_Cell: } + \@@_newcolumntype C { > \@@_Cell: c < \@@_end_Cell: } + \@@_newcolumntype R { > \@@_Cell: r < \@@_end_Cell: } +% \end{macrocode} +% +% \bigskip +% We redefine the column types |p|, |m| and |b|. The command +% |\@@_define_columntype:nn| is only used here. +% \begin{macrocode} + \@@_define_columntype:nn p t + \@@_define_columntype:nn m c + \@@_define_columntype:nn b b +% \end{macrocode} +% +% \bigskip +% We redefine the column types |w| and |W|. We use |\@@_newcolumntype| instead +% of |\newcolumtype| because we don't want warnings for column types already +% defined. % \begin{macrocode} - \cs_set_eq:NN \NC@find@w \relax - \cs_set_eq:NN \NC@find@W \relax - \newcolumntype w [ 2 ] + \@@_newcolumntype w [ 2 ] { > { \hbox_set:Nw \l_@@_cell_box @@ -4630,7 +5005,7 @@ version 2005/12/01 or later. { \box_use_drop:N \l_@@_cell_box } } } - \newcolumntype W [ 2 ] + \@@_newcolumntype W [ 2 ] { > { \hbox_set:Nw \l_@@_cell_box @@ -4726,7 +5101,7 @@ version 2005/12/01 or later. \tl_gclear_new:N \g_@@_Vdots_lines_tl \tl_gclear_new:N \g_@@_Ddots_lines_tl \tl_gclear_new:N \g_@@_Iddots_lines_tl - \tl_gclear_new:N \g_@@_Hdotsfor_lines_tl + \tl_gclear_new:N \g_@@_HVdotsfor_lines_tl } % \end{macrocode} % @@ -4742,7 +5117,9 @@ version 2005/12/01 or later. \str_if_empty:NT \g_@@_name_env_str { \str_gset:Nn \g_@@_name_env_str { NiceArrayWithDelims } } \@@_adapt_S_column: - \@@_test_if_math_mode: + \bool_if:NTF \l_@@_NiceTabular_bool + \mode_leave_vertical: + \@@_test_if_math_mode: \bool_if:NT \l_@@_in_env_bool { \@@_fatal:n { Yet~in~env } } \bool_set_true:N \l_@@_in_env_bool % \end{macrocode} @@ -4785,6 +5162,98 @@ version 2005/12/01 or later. { #3 , #5 } % \end{macrocode} % +% \bigskip +% If the key |code-before| is used, we have to create the |col| nodes and the +% |row| nodes before the creation of the array. First, we have to test whether +% the size of the array has been written in the |aux| file in a previous run. In +% this case, a command |\@@_size_|{\slshape\ttfamily nb_of_env}|:| has been +% created. +% \begin{macrocode} + \bool_if:NT \l_@@_code_before_bool + { + \seq_if_exist:cT { @@_size_ \int_use:N \g_@@_env_int _ seq } + { +% \end{macrocode} +% First, we give values to the LaTeX counters |iRow| and |jCol|. We remind that, +% in the |code-before| (and in the |code-after|) they represent the numbers of +% rows and columns of the array (without the potential last row and last column). +% \begin{macrocode} + \int_zero_new:N \c@iRow + \int_set:Nn \c@iRow + { \seq_item:cn { @@_size_ \int_use:N \g_@@_env_int _ seq } 2 } + \int_zero_new:N \c@jCol + \int_set:Nn \c@jCol + { \seq_item:cn { @@_size_ \int_use:N \g_@@_env_int _ seq } 4 } +% \end{macrocode} +% We have to adjust the values of |\c@iRow| and |\c@jCol| to take into account +% the potential last row and last column. A value of $-2$ for +% |\l_@@_last_row_int| means that there is no last row. Idem for the columns. +% \begin{macrocode} + \int_compare:nNnF \l_@@_last_row_int = { -2 } + { \int_decr:N \c@iRow } + \int_compare:nNnF \l_@@_last_col_int = { -2 } + { \int_decr:N \c@jCol } +% \end{macrocode} +% +% Now, we will create all the |col| nodes and |row| nodes with the informations +% written in the |aux| file. You use the technique described in the page~1229 of +% |pgfmanual.pdf|, version~3.1.4b. +% \begin{macrocode} + \pgfsys@markposition { \@@_env: - position } + \pgfsys@getposition { \@@_env: - position } \@@_picture_position: + \pgfpicture +% \end{macrocode} +% First, the creation of the |row| nodes. +% \begin{macrocode} + \int_step_inline:nnn + { \seq_item:cn { @@_size_ \int_use:N \g_@@_env_int _ seq } 1 } + { \seq_item:cn { @@_size_ \int_use:N \g_@@_env_int _ seq } 2 + 1 } + { + \pgfsys@getposition { \@@_env: - row - ##1 } \@@_node_position: + \pgfcoordinate { \@@_env: - row - ##1 } + { \pgfpointdiff \@@_picture_position: \@@_node_position: } + } +% \end{macrocode} +% Now, the creation of the |col| nodes. +% \begin{macrocode} + \int_step_inline:nnn + { \seq_item:cn { @@_size_ \int_use:N \g_@@_env_int _ seq } 3 } + { \seq_item:cn { @@_size_ \int_use:N \g_@@_env_int _ seq } 4 + 1 } + { + \pgfsys@getposition { \@@_env: - col - ##1 } \@@_node_position: + \pgfcoordinate { \@@_env: - col - ##1 } + { \pgfpointdiff \@@_picture_position: \@@_node_position: } + } + \endpgfpicture + \group_begin: + \bool_if:NT \c_@@_tikz_loaded_bool + { +% \end{macrocode} +% Be careful: we must \emph{not} put ``|remember picture|'' in the |\pgfset|. +% \begin{macrocode} + \pgfset + { + every~picture / .style = + { overlay , name~prefix = \@@_env: - } + } + } + \cs_set_eq:NN \cellcolor \@@_cellcolor:nn + \cs_set_eq:NN \rectanglecolor \@@_rectanglecolor:nnn + \cs_set_eq:NN \rowcolor \@@_rowcolor:nn + \cs_set_eq:NN \rowcolors \@@_rowcolors:nnn + \cs_set_eq:NN \columncolor \@@_columncolor:nn + \cs_set_eq:NN \chessboardcolors \@@_chessboardcolors:nn +% \end{macrocode} +% We compose the |code-before| in math mode in order to nullify the spaces put +% by the user between instructions in the |code-before|. +% \begin{macrocode} + \bool_if:NT \l_@@_NiceTabular_bool \c_math_toggle_token + \l_@@_code_before_tl + \bool_if:NT \l_@@_NiceTabular_bool \c_math_toggle_token + \group_end: + } + } +% \end{macrocode} % % A value of $-1$ for the counter |\l_@@_last_row_int| means that the user has % used the option |last-row| without value, that is to say without specifying @@ -4897,6 +5366,7 @@ version 2005/12/01 or later. \bool_lazy_all:nT { \l_@@_NiceArray_bool + { \bool_not_p:n \l_@@_NiceTabular_bool } { \bool_not_p:n \l_@@_vlines_bool } { \bool_not_p:n \l_@@_exterior_arraycolsep_bool } } @@ -4908,6 +5378,7 @@ version 2005/12/01 or later. \bool_lazy_all:nT { \l_@@_NiceArray_bool + { \bool_not_p:n \l_@@_NiceTabular_bool } { \bool_not_p:n \l_@@_vlines_bool } { \bool_not_p:n \l_@@_exterior_arraycolsep_bool } } @@ -4921,6 +5392,22 @@ version 2005/12/01 or later. % \begin{macrocode} \hbox_set:Nw \l_@@_the_array_box % \end{macrocode} +% Here is a trick. We will call |\array| and, at the beginning, |\array| will set +% |\col@sep| equal to the current value of |\arraycolsep|. In we are in an +% environment |{NiceTabular}|, we would like that |\array| sets |\col@sep| equal +% to the current value of |\tabcolsep|. That's why we set |\arraycolsep| equal +% to |\tabcolsep|. However, the value of |\tabcolsep| in each cell of the array +% should be equal to the current value of |\tabcolsep| outside |{NiceTabular}|. +% That's why we save the current value of |\arraycolsep| and we will restore the +% value just before the |\halign|. It's possible because we do a redefinition of +% |\ialign| (see just below). +% \begin{macrocode} + \bool_if:NT \l_@@_NiceTabular_bool + { + \dim_set_eq:NN \@@_old_arraycolsep_dim \arraycolsep + \dim_set_eq:NN \arraycolsep \tabcolsep + } +% \end{macrocode} % If the key |\vlines| is used, we increase |\arraycolsep| by % |0.5\arrayrulewidth| in order to reserve space for the width of the vertical % rules drawn with Tikz after the end of the array. However, the first @@ -4932,12 +5419,16 @@ version 2005/12/01 or later. \dim_add:Nn \arraycolsep { 0.5 \arrayrulewidth } \skip_horizontal:N 0.5\arrayrulewidth } +% \end{macrocode} +% +% +% \begin{macrocode} \skip_horizontal:N \l_@@_left_margin_dim \skip_horizontal:N \l_@@_extra_left_margin_dim \c_math_toggle_token \bool_if:NTF \l_@@_light_syntax_bool - { \begin { @@-light-syntax } } - { \begin { @@-normal-syntax } } + { \use:c { @@-light-syntax } } + { \use:c { @@-normal-syntax } } } % \end{macrocode} % @@ -4945,8 +5436,8 @@ version 2005/12/01 or later. % \begin{macrocode} { \bool_if:NTF \l_@@_light_syntax_bool - { \end { @@-light-syntax } } - { \end { @@-normal-syntax } } + { \use:c { end @@-light-syntax } } + { \use:c { end @@-normal-syntax } } \c_math_toggle_token \skip_horizontal:N \l_@@_right_margin_dim \skip_horizontal:N \l_@@_extra_right_margin_dim @@ -4964,7 +5455,7 @@ version 2005/12/01 or later. % % \bigskip % It the user has used the key |last-row| with a value, we control that the -% given value is correct (since we have just contructed the array, we know the +% given value is correct (since we have just constructed the array, we know the % real number of rows of the array). % \begin{macrocode} \int_compare:nNnT \l_@@_last_row_int > { -2 } @@ -5027,9 +5518,9 @@ version 2005/12/01 or later. \str_if_eq:VnTF \l_@@_baseline_str { b } { \pgfpicture - \@@_qpoint: { row - 1 } + \@@_qpoint:n { row - 1 } \dim_gset_eq:NN \g_tmpa_dim \pgf@y - \@@_qpoint: { row - \int_use:N \c@iRow - base } + \@@_qpoint:n { row - \int_use:N \c@iRow - base } \dim_gsub:Nn \g_tmpa_dim \pgf@y \endpgfpicture \int_compare:nNnT \l_@@_first_row_int = 0 @@ -5063,9 +5554,9 @@ version 2005/12/01 or later. \int_set:Nn \l_tmpa_int 1 } \pgfpicture - \@@_qpoint: { row - 1 } + \@@_qpoint:n { row - 1 } \dim_gset_eq:NN \g_tmpa_dim \pgf@y - \@@_qpoint: { row - \int_use:N \l_tmpa_int - base } + \@@_qpoint:n { row - \int_use:N \l_tmpa_int - base } \dim_gsub:Nn \g_tmpa_dim \pgf@y \endpgfpicture \int_compare:nNnT \l_@@_first_row_int = 0 @@ -5122,9 +5613,13 @@ version 2005/12/01 or later. \skip_vertical:N -\l_tmpa_dim \hbox { - \skip_horizontal:N -\arraycolsep + \bool_if:NTF \l_@@_NiceTabular_bool + { \skip_horizontal:N -\tabcolsep } + { \skip_horizontal:N -\arraycolsep } \box_use_drop:N \l_@@_the_array_box - \skip_horizontal:N -\arraycolsep + \bool_if:NTF \l_@@_NiceTabular_bool + { \skip_horizontal:N -\tabcolsep } + { \skip_horizontal:N -\arraycolsep } } % \end{macrocode} % We take into account the ``last row'' (we have previously computed its total @@ -5203,16 +5698,16 @@ version 2005/12/01 or later. \int_set:Nn \l_tmpa_int 1 } \pgfpicture - \@@_qpoint: { row - 1 } + \@@_qpoint:n { row - 1 } \dim_gset_eq:NN \g_tmpa_dim \pgf@y - \@@_qpoint: { row - \@@_succ:n \c@iRow } + \@@_qpoint:n { row - \@@_succ:n \c@iRow } \dim_gadd:Nn \g_tmpa_dim \pgf@y \dim_gset:Nn \g_tmpa_dim { 0.5 \g_tmpa_dim } % \end{macrocode} % Now, |\g_tmpa_dim| contains the $y$-value of the center of the array (the % delimiters are centered in relation with this value). % \begin{macrocode} - \@@_qpoint: { row - \int_use:N \l_tmpa_int - base } + \@@_qpoint:n { row - \int_use:N \l_tmpa_int - base } \dim_gsub:Nn \g_tmpa_dim \pgf@y % \end{macrocode} % We take into account the position of the mathematical axis. @@ -5314,6 +5809,7 @@ version 2005/12/01 or later. % \bigskip % When the key |light-syntax| is used, we use an environment which takes its whole % body as an argument (with the specifier |b| of \pkg{xparse}). +% % \label{code-light-syntax} % \begin{macrocode} \NewDocumentEnvironment { @@-light-syntax } { b } { @@ -5331,8 +5827,31 @@ version 2005/12/01 or later. { \@@_fatal:n { double-backslash~in~light-syntax } } } % \end{macrocode} -% The body of the environment, which is stored in the argument |#1|, is now -% splitted into items (and \emph{not} tokens) +% Now, you extract the |code-after| or the body of the environment. Maybe, there +% is no command |\CodeAfter| in the body. That's why you put a marker +% |\CodeAfter| after |#1|. If there is yet a |\CodeAfter| in |#1|, this second +% (or third...) |\CodeAfter| will be catched in the value of +% |\g_@@_code_after_tl|. That doesn't matter because |\CodeAfter| will be set to +% \textsl{no-op} before the execution of |\g_@@_code_after_tl|. +% \begin{macrocode} + \@@_light_syntax_i #1 \CodeAfter \q_stop + } +% \end{macrocode} +% Now, the second part of the environment. It is empty. That's not surprising +% because we have caught the whole body of the environment with the specifier +% |b| provided by \pkg{xparse}. +% \begin{macrocode} + { } +% \end{macrocode} +% +% +% \begin{macrocode} +\cs_new_protected:Npn \@@_light_syntax_i #1\CodeAfter #2\q_stop + { + \tl_gput_right:Nn \g_@@_code_after_tl { #2 } +% \end{macrocode} +% The body of the array, which is stored in the argument |#1|, is now +% splitted into items (and \emph{not} tokens). % \begin{macrocode} \seq_gclear_new:N \g_@@_rows_seq \tl_set_rescan:Nno \l_@@_end_of_row_tl { } \l_@@_end_of_row_tl @@ -5361,11 +5880,10 @@ version 2005/12/01 or later. \endarray } % \end{macrocode} -% Now, the second part of the environment. It is empty. That's not surprising -% because we have caught the whole body of the environment with the specifier -% |b| provided by \pkg{xparse}. +% % \begin{macrocode} - { } +\cs_new_protected:Npn \@@_line_with_light_syntax:n #1 + { \tl_if_empty:nF { #1 } { \\ \@@_line_with_light_syntax_i:n { #1 } } } % \end{macrocode} % % \begin{macrocode} @@ -5375,22 +5893,10 @@ version 2005/12/01 or later. \seq_gset_split:Nnn \g_@@_cells_seq { ~ } { #1 } \seq_gpop_left:NN \g_@@_cells_seq \l_tmpa_tl \l_tmpa_tl - \seq_map_function:NN \g_@@_cells_seq \@@_cell_with_light_syntax:n + \seq_map_inline:Nn \g_@@_cells_seq { & ##1 } } % \end{macrocode} -% -% \begin{macrocode} -\cs_new_protected:Npn \@@_line_with_light_syntax:n #1 - { - \tl_if_empty:nF { #1 } - { \\ \@@_line_with_light_syntax_i:n { #1 } } - } -% \end{macrocode} % -% \begin{macrocode} -\cs_new_protected:Npn \@@_cell_with_light_syntax:n #1 { & #1 } -% \end{macrocode} -% % \bigskip % The following command is used by the code which detects whether the % environment is empty (we raise a fatal error in this case: it's only a @@ -5410,7 +5916,7 @@ version 2005/12/01 or later. % % \bigskip % The command |\@@_create_col_nodes:| will construct a special last row. -% That last row is a false row used to create the |col|-nodes and to fix the +% That last row is a false row used to create the |col| nodes and to fix the % width of the columns (when the array is constructed with an option which % specify the width of the columns). % \begin{macrocode} @@ -5421,12 +5927,14 @@ version 2005/12/01 or later. \int_compare:nNnT \l_@@_first_col_int = 0 { \omit - \skip_horizontal:N -2\arraycolsep + \skip_horizontal:N -2\col@sep + \bool_if:NT \l_@@_code_before_bool + { \pgfsys@markposition { \@@_env: - col - 0 } } \pgfpicture \pgfrememberpicturepositiononpagetrue \pgfcoordinate { \@@_env: - col - 0 } \pgfpointorigin \str_if_empty:NF \l_@@_name_str - { \pgfnodealias { \@@_env: - col - 0 } { \l_@@_name_str - col - 0 } } + { \pgfnodealias { \l_@@_name_str - col - 0 } { \@@_env: - col - 0 } } \endpgfpicture & } @@ -5436,15 +5944,46 @@ version 2005/12/01 or later. % \begin{macrocode} \bool_gset_true:N \g_@@_row_of_col_done_bool % \end{macrocode} -% First, we put a ``|col|'' node on the left of the first column (of course, we +% First, we put a |col| node on the left of the first column (of course, we % have to do that \emph{after} the |\omit|). % \begin{macrocode} - \pgfpicture - \pgfrememberpicturepositiononpagetrue - \pgfcoordinate { \@@_env: - col - 1 } \pgfpointorigin - \str_if_empty:NF \l_@@_name_str - { \pgfnodealias { \@@_env: - col - 1 } { \l_@@_name_str - col - 1 } } - \endpgfpicture + \int_compare:nNnTF \l_@@_first_col_int = 0 + { + \bool_if:NT \l_@@_code_before_bool + { + \hbox + { + \skip_horizontal:N -0.5\arrayrulewidth + \pgfsys@markposition { \@@_env: - col - 1 } + \skip_horizontal:N 0.5\arrayrulewidth + } + } + \pgfpicture + \pgfrememberpicturepositiononpagetrue + \pgfcoordinate { \@@_env: - col - 1 } + { \pgfpoint { - 0.5 \arrayrulewidth } \c_zero_dim } + \str_if_empty:NF \l_@@_name_str + { \pgfnodealias { \l_@@_name_str - col - 1 } { \@@_env: - col - 1 } } + \endpgfpicture + } + { + \bool_if:NT \l_@@_code_before_bool + { + \hbox + { + \skip_horizontal:N 0.5 \arrayrulewidth + \pgfsys@markposition { \@@_env: - col - 1 } + \skip_horizontal:N -0.5\arrayrulewidth + } + } + \pgfpicture + \pgfrememberpicturepositiononpagetrue + \pgfcoordinate { \@@_env: - col - 1 } + { \pgfpoint { 0.5 \arrayrulewidth } \c_zero_dim } + \str_if_empty:NF \l_@@_name_str + { \pgfnodealias { \l_@@_name_str - col - 1 } { \@@_env: - col - 1 } } + \endpgfpicture + } % \end{macrocode} % We compute in |\g_tmpa_skip| the common width of the columns (it's a skip and % not a dimension). We use a global variable because we are in a cell of an @@ -5465,16 +6004,26 @@ version 2005/12/01 or later. { \bool_not_p:n \l_@@_block_auto_columns_width_bool } { \skip_gset_eq:NN \g_tmpa_skip \g_@@_max_cell_width_dim } { \skip_gset_eq:NN \g_tmpa_skip \l_@@_columns_width_dim } - \skip_gadd:Nn \g_tmpa_skip { 2 \arraycolsep } + \skip_gadd:Nn \g_tmpa_skip { 2 \col@sep } } \skip_horizontal:N \g_tmpa_skip \hbox { + \bool_if:NT \l_@@_code_before_bool + { + \hbox + { + \skip_horizontal:N -0.5\arrayrulewidth + \pgfsys@markposition { \@@_env: - col - 2 } + \skip_horizontal:N 0.5\arrayrulewidth + } + } \pgfpicture \pgfrememberpicturepositiononpagetrue - \pgfcoordinate { \@@_env: - col - 2 } \pgfpointorigin + \pgfcoordinate { \@@_env: - col - 2 } + { \pgfpoint { - 0.5 \arrayrulewidth } \c_zero_dim } \str_if_empty:NF \l_@@_name_str - { \pgfnodealias { \@@_env: - col - 2 } { \l_@@_name_str - col - 2 } } + { \pgfnodealias { \l_@@_name_str - col - 2 } { \@@_env: - col - 2 } } \endpgfpicture } % \end{macrocode} @@ -5486,32 +6035,45 @@ version 2005/12/01 or later. { \prg_replicate:nn { \g_@@_col_total_int - 2 } } { \prg_replicate:nn { \g_@@_col_total_int - 1 } } { - & - \omit + & + \omit % \end{macrocode} % The incrementation of the counter |\g_tmpa_int| must be done after the |\omit| % of the cell. % \begin{macrocode} - \int_gincr:N \g_tmpa_int - \skip_horizontal:N \g_tmpa_skip + \int_gincr:N \g_tmpa_int + \skip_horizontal:N \g_tmpa_skip + \bool_if:NT \l_@@_code_before_bool + { + \hbox + { + \skip_horizontal:N -0.5\arrayrulewidth + \pgfsys@markposition { \@@_env: - col - \@@_succ:n \g_tmpa_int } + \skip_horizontal:N 0.5\arrayrulewidth + } + } % \end{macrocode} -% We create the ``|col|'' node on the right of the current column. +% We create the |col| node on the right of the current column. % \begin{macrocode} - \pgfpicture - \pgfrememberpicturepositiononpagetrue - \pgfcoordinate { \@@_env: - col - \@@_succ:n \g_tmpa_int } - \pgfpointorigin - \str_if_empty:NF \l_@@_name_str - { - \pgfnodealias - { \@@_env: - col - \@@_succ:n \g_tmpa_int } - { \l_@@_name_str - col - \@@_succ:n \g_tmpa_int } - } - \endpgfpicture + \pgfpicture + \pgfrememberpicturepositiononpagetrue + \pgfcoordinate { \@@_env: - col - \@@_succ:n \g_tmpa_int } + { \pgfpoint { - 0.5 \arrayrulewidth } \c_zero_dim } + \str_if_empty:NF \l_@@_name_str + { + \pgfnodealias + { \l_@@_name_str - col - \@@_succ:n \g_tmpa_int } + { \@@_env: - col - \@@_succ:n \g_tmpa_int } + } + \endpgfpicture } \bool_if:NT \g_@@_last_col_found_bool { - \skip_horizontal:N 2\arraycolsep + \bool_if:NT \l_@@_code_before_bool + { + \pgfsys@markposition { \@@_env: - col - \@@_succ:n \g_@@_col_total_int } + } + \skip_horizontal:N 2\col@sep \pgfpicture \pgfrememberpicturepositiononpagetrue \pgfcoordinate { \@@_env: - col - \@@_succ:n \g_@@_col_total_int } @@ -5519,11 +6081,11 @@ version 2005/12/01 or later. \str_if_empty:NF \l_@@_name_str { \pgfnodealias - { \@@_env: - col - \@@_succ:n \g_@@_col_total_int } { \l_@@_name_str - col - \@@_succ:n \g_@@_col_total_int } + { \@@_env: - col - \@@_succ:n \g_@@_col_total_int } } \endpgfpicture - \skip_horizontal:N -2\arraycolsep + \skip_horizontal:N -2\col@sep } \cr } @@ -5544,7 +6106,7 @@ version 2005/12/01 or later. % have to compute some dimensions of this box. % \begin{macrocode} \hbox_set:Nw \l_@@_cell_box - \c_math_toggle_token + \bool_if:NF \l_@@_NiceTabular_bool \c_math_toggle_token \bool_if:NT \l_@@_small_bool \scriptstyle % \end{macrocode} % We insert |\l_@@_code_for_first_col_tl|... but we don't insert it in the @@ -5569,7 +6131,7 @@ version 2005/12/01 or later. l < { - \c_math_toggle_token + \bool_if:NF \l_@@_NiceTabular_bool \c_math_toggle_token \hbox_set_end: \@@_update_for_first_and_last_row: % \end{macrocode} @@ -5591,7 +6153,7 @@ version 2005/12/01 or later. \skip_horizontal:N \l_@@_left_margin_dim \skip_horizontal:N \l_@@_extra_left_margin_dim } - \skip_horizontal:N -2\arraycolsep + \skip_horizontal:N -2\col@sep } } % \end{macrocode} @@ -5616,7 +6178,7 @@ version 2005/12/01 or later. % have to compute some dimensions of this box. % \begin{macrocode} \hbox_set:Nw \l_@@_cell_box - \c_math_toggle_token + \bool_if:NF \l_@@_NiceTabular_bool \c_math_toggle_token \bool_if:NT \l_@@_small_bool \scriptstyle % \end{macrocode} % We insert |\l_@@_code_for_last_col_tl|... but we don't insert it in the @@ -5636,7 +6198,7 @@ version 2005/12/01 or later. l < { - \c_math_toggle_token + \bool_if:NF \l_@@_NiceTabular_bool \c_math_toggle_token \hbox_set_end: \@@_update_for_first_and_last_row: % \end{macrocode} @@ -5645,7 +6207,7 @@ version 2005/12/01 or later. % \begin{macrocode} \dim_gset:Nn \g_@@_width_last_col_dim { \dim_max:nn \g_@@_width_last_col_dim { \box_wd:N \l_@@_cell_box } } - \skip_horizontal:N -2\arraycolsep + \skip_horizontal:N -2\col@sep % \end{macrocode} % The content of the cell is inserted in an overlapping position. % \label{overlap-right} @@ -5758,14 +6320,14 @@ version 2005/12/01 or later. \keys_set:nn { NiceMatrix / NiceMatrix } { ##1 } \exp_args:Nnx \@@_begin_of_NiceMatrix:nn { #1 } \l_@@_type_of_col_tl } - { \end { #1 NiceArray } } + { \use:c { end #1 NiceArray } } } % \end{macrocode} % % \begin{macrocode} \cs_new_protected:Npn \@@_begin_of_NiceMatrix:nn #1 #2 { - \begin { #1 NiceArray } + \use:c { #1 NiceArray } { * { @@ -5787,8 +6349,18 @@ version 2005/12/01 or later. \@@_define_env:n V % \end{macrocode} % +% \bigskip +% \subsection*{The environment \{NiceTabular\}} +% \begin{macrocode} +\NewDocumentEnvironment { NiceTabular } { O { } m ! O { } } + { + \keys_set:nn { NiceMatrix / NiceTabular } { #1 , #3 } + \bool_set_true:N \l_@@_NiceTabular_bool + \NiceArray { #2 } + } + { \endNiceArray } +% \end{macrocode} % -% % % \bigskip % \subsection*{After the construction of the array} @@ -5873,7 +6445,38 @@ version 2005/12/01 or later. } % \end{macrocode} % -% +% If the key |code-before| is used, we have to write on the |aux| file the actual +% size of the array. +% \begin{macrocode} + \bool_if:NT \l_@@_code_before_bool + { + \iow_now:Nn \@mainaux \ExplSyntaxOn + \iow_now:Nx \@mainaux + { \seq_clear_new:c { @@_size _ \int_use:N \g_@@_env_int _ seq } } + \iow_now:Nx \@mainaux + { + \seq_gset_from_clist:cn { @@_size _ \int_use:N \g_@@_env_int _ seq } + { + \int_use:N \l_@@_first_row_int , + \int_use:N \g_@@_row_total_int , + \int_use:N \l_@@_first_col_int , +% \end{macrocode} +% If the user has used a key |last-row| in an environment with preamble (like +% |{pNiceArray}|) and that that last row has not been found, we have to +% increment the value because it will be decreased when used in the |code-before|. +% \begin{macrocode} + \bool_lazy_and:nnTF + { \int_compare_p:nNn \l_@@_last_col_int > { -2 } } + { \bool_not_p:n \g_@@_last_col_found_bool } + \@@_succ:n + \int_use:N + \g_@@_col_total_int + } + } + \iow_now:Nn \@mainaux \ExplSyntaxOff + } +% \end{macrocode} +% % By default, the diagonal lines will be parallelized\footnote{It's possible to % use the option |parallelize-diags| to disable this parallelization.}. There % are two types of diagonals lines: the $|\Ddots|$ diagonals and the |\Iddots| @@ -5936,7 +6539,7 @@ version 2005/12/01 or later. % % % \bigskip -% Now, we really draw the lines. +% Now, we really draw the dotted lines. % \begin{macrocode} \@@_draw_dotted_lines: % \end{macrocode} @@ -5950,7 +6553,7 @@ version 2005/12/01 or later. \tl_gclear:N \g_@@_internal_code_after_tl \bool_if:NT \c_@@_tikz_loaded_bool { - \tikzset + \tikzset { every~picture / .style = { @@ -5961,6 +6564,16 @@ version 2005/12/01 or later. } } \cs_set_eq:NN \line \@@_line +% \end{macrocode} +% When |light-syntax| is used, we insert systematically a |\CodeAfter| in the +% flow. Thus, it's possible to have two instructions |\CodeAfter| and the second +% one is eventually present in |\g_@@_code_after_tl|. That's why we set +% |\Code-after| to be \textsl{no-op} now. +% \begin{macrocode} + \cs_set_eq:NN \CodeAfter \prg_do_nothing: +% \end{macrocode} +% And here's the |code-after|: +% \begin{macrocode} \g_@@_code_after_tl \tl_gclear:N \g_@@_code_after_tl \group_end: @@ -5994,7 +6607,7 @@ version 2005/12/01 or later. { \pgfrememberpicturepositiononpagetrue \pgf@relevantforpicturesizefalse - \g_@@_Hdotsfor_lines_tl + \g_@@_HVdotsfor_lines_tl \g_@@_Vdots_lines_tl \g_@@_Ddots_lines_tl \g_@@_Iddots_lines_tl @@ -6007,8 +6620,8 @@ version 2005/12/01 or later. % \begin{macrocode} \cs_new_protected:Npn \@@_restore_iRow_jCol: { - \cs_if_exist:NT \theiRow { \int_gset_eq:NN \c@iRow \l_@@_save_iRow_int } - \cs_if_exist:NT \thejCol { \int_gset_eq:NN \c@jCol \l_@@_save_jCol_int } + \cs_if_exist:NT \theiRow { \int_gset_eq:NN \c@iRow \l_@@_old_iRow_int } + \cs_if_exist:NT \thejCol { \int_gset_eq:NN \c@jCol \l_@@_old_jCol_int } } % \end{macrocode} % @@ -6239,10 +6852,6 @@ version 2005/12/01 or later. % % \medskip % \begin{macrocode} -\cs_new:Nn \@@_initial_cell: - { \@@_env: - \int_use:N \l_@@_initial_i_int - \int_use:N \l_@@_initial_j_int } -\cs_new:Nn \@@_final_cell: - { \@@_env: - \int_use:N \l_@@_final_i_int - \int_use:N \l_@@_final_j_int } \cs_new_protected:Npn \@@_set_initial_coords: { \dim_set_eq:NN \l_@@_x_initial_dim \pgf@x @@ -6255,12 +6864,24 @@ version 2005/12/01 or later. } \cs_new_protected:Npn \@@_set_initial_coords_from_anchor:n #1 { - \pgfpointanchor \@@_initial_cell: { #1 } + \pgfpointanchor + { + \@@_env: + - \int_use:N \l_@@_initial_i_int + - \int_use:N \l_@@_initial_j_int + } + { #1 } \@@_set_initial_coords: } \cs_new_protected:Npn \@@_set_final_coords_from_anchor:n #1 { - \pgfpointanchor \@@_final_cell: { #1 } + \pgfpointanchor + { + \@@_env: + - \int_use:N \l_@@_final_i_int + - \int_use:N \l_@@_final_j_int + } + { #1 } \@@_set_final_coords: } % \end{macrocode} @@ -6317,25 +6938,28 @@ version 2005/12/01 or later. { \bool_if:NTF \l_@@_initial_open_bool { - \@@_qpoint: { col - \int_use:N \l_@@_initial_j_int } + \@@_qpoint:n { col - \int_use:N \l_@@_initial_j_int } \dim_set_eq:NN \l_@@_x_initial_dim \pgf@x - \dim_add:Nn \l_@@_x_initial_dim \arraycolsep - \@@_qpoint: { row - \int_use:N \l_@@_initial_i_int - base } + \dim_add:Nn \l_@@_x_initial_dim + { \bool_if:NTF \l_@@_NiceTabular_bool \tabcolsep \arraycolsep } + \@@_qpoint:n { row - \int_use:N \l_@@_initial_i_int - base } \dim_set_eq:NN \l_@@_y_initial_dim \pgf@y } { \@@_set_initial_coords_from_anchor:n { base~east } } \bool_if:NTF \l_@@_final_open_bool { - \@@_qpoint: { col - \@@_succ:n \l_@@_final_j_int } + \@@_qpoint:n { col - \@@_succ:n \l_@@_final_j_int } \dim_set_eq:NN \l_@@_x_final_dim \pgf@x - \dim_sub:Nn \l_@@_x_final_dim \arraycolsep - \@@_qpoint: { row - \int_use:N \l_@@_final_i_int - base } + \dim_sub:Nn \l_@@_x_final_dim + { \bool_if:NTF \l_@@_NiceTabular_bool \tabcolsep \arraycolsep } + \@@_qpoint:n { row - \int_use:N \l_@@_final_i_int - base } \dim_set_eq:NN \l_@@_y_final_dim \pgf@y } { \@@_set_final_coords_from_anchor:n { base~west } } % \end{macrocode} % We raise the line of a quantity equal to the radius of the dots because we -% want the dots really ``on'' the line of texte. +% want the dots really ``on'' the line of texte. Of course, maybe we should not +% do that when the option |line-style| is used (?). % \begin{macrocode} \dim_add:Nn \l_@@_y_initial_dim \l_@@_radius_dim \dim_add:Nn \l_@@_y_final_dim \l_@@_radius_dim @@ -6393,25 +7017,27 @@ version 2005/12/01 or later. { \bool_if:NTF \l_@@_initial_open_bool { - \@@_qpoint: { col - \int_use:N \l_@@_initial_j_int } + \@@_qpoint:n { col - \int_use:N \l_@@_initial_j_int } \dim_set_eq:NN \l_@@_x_initial_dim \pgf@x - \dim_add:Nn \l_@@_x_initial_dim \arraycolsep + \dim_add:Nn \l_@@_x_initial_dim + { \bool_if:NTF \l_@@_NiceTabular_bool \tabcolsep \arraycolsep } } { \@@_set_initial_coords_from_anchor:n { mid~east } } \bool_if:NTF \l_@@_final_open_bool { - \@@_qpoint: { col - \@@_succ:n \l_@@_final_j_int } + \@@_qpoint:n { col - \@@_succ:n \l_@@_final_j_int } \dim_set_eq:NN \l_@@_x_final_dim \pgf@x - \dim_sub:Nn \l_@@_x_final_dim \arraycolsep + \dim_sub:Nn \l_@@_x_final_dim + { \bool_if:NTF \l_@@_NiceTabular_bool \tabcolsep \arraycolsep } } { \@@_set_final_coords_from_anchor:n { mid~west } } \bool_lazy_and:nnTF \l_@@_initial_open_bool \l_@@_final_open_bool { - \@@_qpoint: { row - \int_use:N \l_@@_initial_i_int } + \@@_qpoint:n { row - \int_use:N \l_@@_initial_i_int } \dim_set_eq:NN \l_tmpa_dim \pgf@y - \@@_qpoint: { row - \@@_succ:n \l_@@_initial_i_int } + \@@_qpoint:n { row - \@@_succ:n \l_@@_initial_i_int } \dim_set:Nn \l_@@_y_initial_dim { ( \l_tmpa_dim + \pgf@y ) / 2 } \dim_set_eq:NN \l_@@_y_final_dim \l_@@_y_initial_dim } @@ -6464,6 +7090,8 @@ version 2005/12/01 or later. % \item |\l_@@_final_j_int| % \item |\l_@@_final_open_bool|. % \end{itemize} +% +% The following function is also used by |\Vdotsfor|. % \begin{macrocode} \cs_new_protected:Npn \@@_actually_draw_Vdots: { @@ -6485,13 +7113,13 @@ version 2005/12/01 or later. % \begin{macrocode} \bool_if:NTF \l_@@_initial_open_bool { - \@@_qpoint: { row - 1 } + \@@_qpoint:n { row - \int_use:N \l_@@_initial_i_int } \dim_set_eq:NN \l_@@_y_initial_dim \pgf@y } { \@@_set_initial_coords_from_anchor:n { south } } \bool_if:NTF \l_@@_final_open_bool { - \@@_qpoint: { row - \@@_succ:n \c@iRow } + \@@_qpoint:n { row - \@@_succ:n \l_@@_final_i_int } \dim_set_eq:NN \l_@@_y_final_dim \pgf@y } { \@@_set_final_coords_from_anchor:n { north } } @@ -6499,11 +7127,27 @@ version 2005/12/01 or later. { \bool_if:NTF \l_@@_final_open_bool { - \@@_qpoint: { col - \int_use:N \l_@@_initial_j_int } + \@@_qpoint:n { col - \int_use:N \l_@@_initial_j_int } \dim_set_eq:NN \l_tmpa_dim \pgf@x - \@@_qpoint: { col - \@@_succ:n \l_@@_initial_j_int } + \@@_qpoint:n { col - \@@_succ:n \l_@@_initial_j_int } \dim_set:Nn \l_@@_x_initial_dim { ( \pgf@x + \l_tmpa_dim ) / 2 } \dim_set_eq:NN \l_@@_x_final_dim \l_@@_x_initial_dim +% \end{macrocode} +% We may think that the final user won't use a ``last column'' which contains +% only a command |\Vdots|. However, if the |\Vdots| is in fact used to draw, not +% a dotted line, but an arrow (to indicate the number of rows of the matrix), it +% may be really encountered. +% \begin{macrocode} + \int_compare:nNnT \l_@@_last_col_int > { -2 } + { + \int_compare:nNnT \l_@@_initial_j_int = \g_@@_col_total_int + { + \dim_set_eq:NN \l_tmpa_dim \l_@@_right_margin_dim + \dim_add:Nn \l_tmpa_dim \l_@@_extra_right_margin_dim + \dim_add:Nn \l_@@_x_initial_dim \l_tmpa_dim + \dim_add:Nn \l_@@_x_final_dim \l_tmpa_dim + } + } } { \dim_set_eq:NN \l_@@_x_initial_dim \l_@@_x_final_dim } } @@ -6574,17 +7218,17 @@ version 2005/12/01 or later. { \bool_if:NTF \l_@@_initial_open_bool { - \@@_qpoint: { row - \int_use:N \l_@@_initial_i_int } + \@@_qpoint:n { row - \int_use:N \l_@@_initial_i_int } \dim_set_eq:NN \l_@@_y_initial_dim \pgf@y - \@@_qpoint: { col - \int_use:N \l_@@_initial_j_int } + \@@_qpoint:n { col - \int_use:N \l_@@_initial_j_int } \dim_set_eq:NN \l_@@_x_initial_dim \pgf@x } { \@@_set_initial_coords_from_anchor:n { south~east } } \bool_if:NTF \l_@@_final_open_bool { - \@@_qpoint: { row - \@@_succ:n \l_@@_final_i_int } + \@@_qpoint:n { row - \@@_succ:n \l_@@_final_i_int } \dim_set_eq:NN \l_@@_y_final_dim \pgf@y - \@@_qpoint: { col - \@@_succ:n \l_@@_final_j_int } + \@@_qpoint:n { col - \@@_succ:n \l_@@_final_j_int } \dim_set_eq:NN \l_@@_x_final_dim \pgf@x } { \@@_set_final_coords_from_anchor:n { north~west } } @@ -6671,17 +7315,17 @@ version 2005/12/01 or later. { \bool_if:NTF \l_@@_initial_open_bool { - \@@_qpoint: { row - \int_use:N \l_@@_initial_i_int } + \@@_qpoint:n { row - \int_use:N \l_@@_initial_i_int } \dim_set_eq:NN \l_@@_y_initial_dim \pgf@y - \@@_qpoint: { col - \@@_succ:n \l_@@_initial_j_int } + \@@_qpoint:n { col - \@@_succ:n \l_@@_initial_j_int } \dim_set_eq:NN \l_@@_x_initial_dim \pgf@x } { \@@_set_initial_coords_from_anchor:n { south~west } } \bool_if:NTF \l_@@_final_open_bool { - \@@_qpoint: { row - \@@_succ:n \l_@@_final_i_int } + \@@_qpoint:n { row - \@@_succ:n \l_@@_final_i_int } \dim_set_eq:NN \l_@@_y_final_dim \pgf@y - \@@_qpoint: { col - \int_use:N \l_@@_final_j_int } + \@@_qpoint:n { col - \int_use:N \l_@@_final_j_int } \dim_set_eq:NN \l_@@_x_final_dim \pgf@x } { \@@_set_final_coords_from_anchor:n { north~east } } @@ -7015,8 +7659,19 @@ version 2005/12/01 or later. { \bool_if:nTF { #1 } { \@@_error:n { starred~commands } } - { \@@_instruction_of_type:nn { Ldots } { #2 , down = #3 , up = #4 } } - \bool_if:NF \l_@@_nullify_dots_bool { \phantom \@@_ldots } + { + \int_compare:nNnTF \c@jCol = 0 + { \@@_error:nn { in~first~col } \Ldots } + { + \int_compare:nNnTF \c@jCol = \l_@@_last_col_int + { \@@_error:nn { in~last~col } \Ldots } + { + \@@_instruction_of_type:nn { Ldots } + { #2 , down = #3 , up = #4 } + } + } + } + \bool_if:NF \l_@@_nullify_dots_bool { \phantom \@@_old_ldots } \bool_gset_true:N \g_@@_empty_cell_bool } % \end{macrocode} @@ -7027,8 +7682,19 @@ version 2005/12/01 or later. { \bool_if:nTF { #1 } { \@@_error:n { starred~commands } } - { \@@_instruction_of_type:nn { Cdots } { #2 , down = #3 , up = #4 } } - \bool_if:NF \l_@@_nullify_dots_bool { \phantom \@@_cdots } + { + \int_compare:nNnTF \c@jCol = 0 + { \@@_error:nn { in~first~col } \Cdots } + { + \int_compare:nNnTF \c@jCol = \l_@@_last_col_int + { \@@_error:nn { in~last~col } \Cdots } + { + \@@_instruction_of_type:nn { Cdots } + { #2 , down = #3 , up = #4 } + } + } + } + \bool_if:NF \l_@@_nullify_dots_bool { \phantom \@@_old_cdots } \bool_gset_true:N \g_@@_empty_cell_bool } % \end{macrocode} @@ -7039,8 +7705,17 @@ version 2005/12/01 or later. { \bool_if:nTF { #1 } { \@@_error:n { starred~commands } } - { \@@_instruction_of_type:nn { Vdots } { #2 , down = #3 , up = #4 } } - \bool_if:NF \l_@@_nullify_dots_bool { \phantom \@@_vdots } + \int_compare:nNnTF \c@iRow = 0 + { \@@_error:nn { in~first~row } \Vdots } + { + \int_compare:nNnTF \c@iRow = \l_@@_last_row_int + { \@@_error:nn { in~last~row } \Vdots } + { + \@@_instruction_of_type:nn { Vdots } + { #2 , down = #3 , up = #4 } + } + } + \bool_if:NF \l_@@_nullify_dots_bool { \phantom \@@_old_vdots } \bool_gset_true:N \g_@@_empty_cell_bool } % \end{macrocode} @@ -7051,8 +7726,26 @@ version 2005/12/01 or later. { \bool_if:nTF { #1 } { \@@_error:n { starred~commands } } - { \@@_instruction_of_type:nn { Ddots } { #2 , down = #3 , up = #4 } } - \bool_if:NF \l_@@_nullify_dots_bool { \phantom \@@_ddots } + { + \int_case:nnF \c@iRow + { + 0 { \@@_error:nn { in~first~row } \Ddots } + \l_@@_last_row_int { \@@_error:nn { in~last~row } \Ddots } + } + { + \int_case:nnF \c@jCol + { + 0 { \@@_error:nn { in~first~col } \Ddots } + \l_@@_last_col_int { \@@_error:nn { in~last~col } \Ddots } + } + { + \@@_instruction_of_type:nn { Ddots } + { #2 , down = #3 , up = #4 } + } + + } + } + \bool_if:NF \l_@@_nullify_dots_bool { \phantom \@@_old_ddots } \bool_gset_true:N \g_@@_empty_cell_bool } % \end{macrocode} @@ -7063,8 +7756,26 @@ version 2005/12/01 or later. { \bool_if:nTF { #1 } { \@@_error:n { starred~commands } } - { \@@_instruction_of_type:nn { Iddots } { #2 , down = #3 , up = #4 } } - \bool_if:NF \l_@@_nullify_dots_bool { \phantom \@@_iddots } + { + \int_case:nnF \c@iRow + { + 0 { \@@_error:nn { in~first~row } \Iddots } + \l_@@_last_row_int { \@@_error:nn { in~last~row } \Iddots } + } + { + \int_case:nnF \c@jCol + { + 0 { \@@_error:nn { in~first~col } \Iddots } + \l_@@_last_col_int { \@@_error:nn { in~last~col } \Iddots } + } + { + \@@_instruction_of_type:nn { Iddots } + { #2 , down = #3 , up = #4 } + } + + } + } + \bool_if:NF \l_@@_nullify_dots_bool { \phantom \@@_old_iddots } \bool_gset_true:N \g_@@_empty_cell_bool } } @@ -7095,7 +7806,7 @@ version 2005/12/01 or later. \int_compare:nNnT #1 > 1 { \seq_gput_left:Nx \g_@@_multicolumn_cells_seq - { \int_eval:n \c@iRow - \int_use:N \c@jCol } + { \int_use:N \c@iRow - \int_use:N \c@jCol } \seq_gput_left:Nn \g_@@_multicolumn_sizes_seq { #1 } } \int_gadd:Nn \c@jCol { #1 - 1 } @@ -7105,11 +7816,8 @@ version 2005/12/01 or later. % % \bigskip % The command |\@@_Hdotsfor| will be linked to |\Hdotsfor| in -% |{NiceArrayWithDelims}|. This command uses an optional argument (as does -% |\hdotsfor|) but this argument is discarded (in |\hdotsfor|, this argument is -% used for fine tuning of the space between two consecutive dots). Tikz nodes -% are created also the implicit cells of the |\Hdotsfor| (maybe we should modify -% that point). +% |{NiceArrayWithDelims}|. Tikz nodes are created also in the implicit cells of +% the |\Hdotsfor| (maybe we should modify that point). % % \medskip % This command must \emph{not} be protected since it begins with |\multicolumn|. @@ -7121,12 +7829,6 @@ version 2005/12/01 or later. } % \end{macrocode} % -% \begin{macrocode} -\ExplSyntaxOff -\def \@tempa { O { } m O { } E { _ ^ } { { } { } } } -\ExplSyntaxOn -\tl_set_eq:NN \l_@@_a_signature_tl \@tempa -% \end{macrocode} % % The command |\@@_Hdotsfor_i| is defined with the tools of \pkg{xparse} because % it has an optional argument. Note that such a command defined by @@ -7137,28 +7839,24 @@ version 2005/12/01 or later. { \tl_set:Nn \l_@@_argspec_tl { O { } m O { } E { _ ^ } { { } { } } } \tl_set_rescan:Nno \l_@@_argspec_tl { } \l_@@_argspec_tl - \bool_if:NTF \c_@@_draft_bool - { % \end{macrocode} % We don't put |!| before the last optionnal argument for homogeneity with % |\Cdots|, etc. which have only one optional argument. % \begin{macrocode} - \exp_args:NNV \NewDocumentCommand \@@_Hdotsfor_i \l_@@_argspec_tl - { \prg_replicate:nn { #2 - 1 } { & \multicolumn { 1 } { C } { } } } - } + \exp_args:NNV \NewDocumentCommand \@@_Hdotsfor_i \l_@@_argspec_tl { - \exp_args:NNV \NewDocumentCommand \@@_Hdotsfor_i \l_@@_argspec_tl + \tl_gput_right:Nx \g_@@_HVdotsfor_lines_tl { - \tl_gput_right:Nx \g_@@_Hdotsfor_lines_tl - { - \@@_Hdotsfor:nnnn - { \int_use:N \c@iRow } - { \int_use:N \c@jCol } - { #2 } - { #1 , #3 , down = #4 , up = #5 } - } - \prg_replicate:nn { #2 - 1 } { & \multicolumn { 1 } { C } { } } - } + \@@_Hdotsfor:nnnn + { \int_use:N \c@iRow } + { \int_use:N \c@jCol } + { #2 } + { + #1 , #3 , + down = \exp_not:n { #4 } , up = \exp_not:n { #5 } + } + } + \prg_replicate:nn { #2 - 1 } { & \multicolumn { 1 } { C } { } } } } % \end{macrocode} @@ -7240,11 +7938,111 @@ version 2005/12/01 or later. { \cs_set:cpn { @@ _ dotted _ #1 - ##1 } { } } } % \end{macrocode} -% % -% \bigskip -% The control sequence |\@@_rotate:| will be linked to |\rotate| in -% |{NiceArrayWithDelims}|. +% \bigskip +% \begin{macrocode} +\AtBeginDocument + { + \tl_set:Nn \l_@@_argspec_tl { O { } m O { } E { _ ^ } { { } { } } } + \tl_set_rescan:Nno \l_@@_argspec_tl { } \l_@@_argspec_tl + \exp_args:NNV \NewDocumentCommand \@@_Vdotsfor: \l_@@_argspec_tl + { + \tl_gput_right:Nx \g_@@_HVdotsfor_lines_tl + { + \@@_Vdotsfor:nnnn + { \int_use:N \c@iRow } + { \int_use:N \c@jCol } + { #2 } + { + #1 , #3 , + down = \exp_not:n { #4 } , up = \exp_not:n { #5 } + } + } + } + } +% \end{macrocode} +% Enf of |\AtBeginDocument|. +% +% \begin{macrocode} +\cs_new_protected:Npn \@@_Vdotsfor:nnnn #1 #2 #3 #4 + { + \bool_set_false:N \l_@@_initial_open_bool + \bool_set_false:N \l_@@_final_open_bool +% \end{macrocode} +% For the column, it's easy. +% \begin{macrocode} + \int_set:Nn \l_@@_initial_j_int { #2 } + \int_set_eq:NN \l_@@_final_j_int \l_@@_initial_j_int +% \end{macrocode} +% For the row, it's a bit more complicated. +% \begin{macrocode} + \int_compare:nNnTF #1 = 1 + { + \int_set:Nn \l_@@_initial_i_int 1 + \bool_set_true:N \l_@@_initial_open_bool + } + { + \cs_if_exist:cTF + { + pgf @ sh @ ns @ \@@_env: + - \int_eval:n { #1 - 1 } + - \int_use:N \l_@@_initial_j_int + } + { \int_set:Nn \l_@@_initial_i_int { #1 - 1 } } + { + \int_set:Nn \l_@@_initial_i_int { #1 } + \bool_set_true:N \l_@@_initial_open_bool + } + } + \int_compare:nNnTF { #1 + #3 -1 } = \c@iRow + { + \int_set:Nn \l_@@_final_i_int { #1 + #3 - 1 } + \bool_set_true:N \l_@@_final_open_bool + } + { + \cs_if_exist:cTF + { + pgf @ sh @ ns @ \@@_env: + - \int_eval:n { #1 + #3 } + - \int_use:N \l_@@_final_j_int + } + { \int_set:Nn \l_@@_final_i_int { #1 + #3 } } + { + \int_set:Nn \l_@@_final_i_int { #1 + #3 - 1 } + \bool_set_true:N \l_@@_final_open_bool + } + } +% \end{macrocode} +% +% \begin{macrocode} + \group_begin: + \int_compare:nNnTF { #2 } = 0 + { \color { nicematrix-first-col } } + { + \int_compare:nNnT { #2 } = \g_@@_col_total_int + { \color { nicematrix-last-col } } + } + \keys_set:nn { NiceMatrix / xdots } { #4 } + \tl_if_empty:VF \l_@@_xdots_color_tl { \color { \l_@@_xdots_color_tl } } + \@@_actually_draw_Vdots: + \group_end: +% \end{macrocode} +% +% \medskip +% We declare all the cells concerned by the |\Vdotsfor| as ``dotted'' (for the +% dotted lines created by |\Cdots|, |\Ldots|, etc., this job is done by +% |\@@_find_extremities_of_line:nnnn|). This declaration is done by defining a +% special control sequence (to nil). +% \begin{macrocode} + \int_step_inline:nnn { #1 } { #1 + #3 - 1 } + { \cs_set:cpn { @@ _ dotted _ ##1 - #2 } { } } + } +% \end{macrocode} +% +% +% \vspace{1cm} +% The command |\@@_rotate:| will be linked to |\rotate| in +% |{NiceArrayWithDelims}|. % % The command will exit three levels of groups in order % to execute the command @@ -7297,12 +8095,6 @@ version 2005/12/01 or later. { \int_eval:n { #1 } - \int_eval:n { #2 } } % \end{macrocode} % -% \begin{macrocode} -\ExplSyntaxOff -\def \@tempa { O { } m m ! O { } E { _ ^ } { { } { } } } -\ExplSyntaxOn -\tl_set_eq:NN \l_@@_a_signature_tl \@tempa -% \end{macrocode} % % \medskip % With the following construction, the command |\@@_double_int_eval:n| is @@ -7331,24 +8123,20 @@ version 2005/12/01 or later. % \end{macrocode} % % \begin{macrocode} -\bool_if:NTF \c_@@_draft_bool - { \cs_new_protected:Npn \@@_line_i:nn #1 #2 { } } +\cs_new_protected:Npn \@@_line_i:nn #1 #2 { - \cs_new_protected:Npn \@@_line_i:nn #1 #2 + \bool_set_false:N \l_@@_initial_open_bool + \bool_set_false:N \l_@@_final_open_bool + \bool_if:nTF { - \bool_set_false:N \l_@@_initial_open_bool - \bool_set_false:N \l_@@_final_open_bool - \bool_if:nTF - { - \cs_if_free_p:c { pgf @ sh @ ns @ \@@_env: - #1 } - || - \cs_if_free_p:c { pgf @ sh @ ns @ \@@_env: - #2 } - } - { - \@@_error:nnn { unknown~cell~for~line~in~code-after } { #1 } { #2 } - } - { \@@_draw_line_ii:nn { #1 } { #2 } } + \cs_if_free_p:c { pgf @ sh @ ns @ \@@_env: - #1 } + || + \cs_if_free_p:c { pgf @ sh @ ns @ \@@_env: - #2 } } + { + \@@_error:nnn { unknown~cell~for~line~in~code-after } { #1 } { #2 } + } + { \@@_draw_line_ii:nn { #1 } { #2 } } } % \end{macrocode} % @@ -7363,35 +8151,243 @@ version 2005/12/01 or later. % ``visible'' and that why we do this static construction of the command % |\@@_draw_line_ii:|. % \begin{macrocode} - \c_@@_pgfortikzpicture_tl - \@@_draw_line_iii:nn { #1 } { #2 } - \c_@@_endpgfortikzpicture_tl + \c_@@_pgfortikzpicture_tl + \@@_draw_line_iii:nn { #1 } { #2 } + \c_@@_endpgfortikzpicture_tl + } + } +% \end{macrocode} +% +% \bigskip +% The following command \emph{must} be protected (it's used in the +% construction of |\@@_draw_line_ii:nn|). +% \begin{macrocode} +\cs_new_protected:Npn \@@_draw_line_iii:nn #1 #2 + { + \pgfrememberpicturepositiononpagetrue + \pgfpointshapeborder { \@@_env: - #1 } { \@@_qpoint:n { #2 } } + \dim_set_eq:NN \l_@@_x_initial_dim \pgf@x + \dim_set_eq:NN \l_@@_y_initial_dim \pgf@y + \pgfpointshapeborder { \@@_env: - #2 } { \@@_qpoint:n { #1 } } + \dim_set_eq:NN \l_@@_x_final_dim \pgf@x + \dim_set_eq:NN \l_@@_y_final_dim \pgf@y + \@@_draw_line: + } +% \end{macrocode} +% +% +% The commands |\Ldots|, |\Cdots|, |\Vdots|, |\Ddots|, and |\Iddots| don't use +% this command because they have to do other settings (for example, the diagonal +% lines must be parallelized). +% +% \bigskip +% \subsection*{Commands available in the code-before} +% +% In the beginning of the |code-before|, the command |\@@_rowcolor:nn| will be +% linked to |\rowcolor| and the command |\@@_columncolor:nn| to |\columncolor|. +% +% \begin{macrocode} +\cs_set_protected:Npn \@@_cut_on_hyphen:w #1-#2\q_stop + { + \tl_set:Nn \l_tmpa_tl { #1 } + \tl_set:Nn \l_tmpb_tl { #2 } + } +% \end{macrocode} +% +% +% \bigskip +% Here an example : |\@@_rowcolor:nn {red!15} {1,3,5-7,10-}| +% \begin{macrocode} +\cs_new_protected:Npn \@@_rowcolor:nn #1 #2 + { + \tl_if_blank:nF { #1 } + { + \pgfpicture + \pgf@relevantforpicturesizefalse + \pgfsetfillcolor { #1 } +% \end{macrocode} +% |\l_tmpa_dim| is the $x$-value of the left side of the rows. +% \begin{macrocode} + \@@_qpoint:n { col - \@@_succ:n \c@jCol } + \dim_set_eq:NN \l_tmpa_dim \pgf@x + \clist_map_inline:nn { #2 } + { + \tl_set:Nn \l_tmpa_tl { ##1 } + \tl_if_in:NnTF \l_tmpa_tl { - } + { \@@_cut_on_hyphen:w ##1 \q_stop } + { \@@_cut_on_hyphen:w ##1 - ##1 \q_stop } + \tl_if_empty:NT \l_tmpa_tl { \tl_set:Nn \l_tmpa_tl { 1 } } + \tl_if_empty:NT \l_tmpb_tl + { \tl_set:Nx \l_tmpb_tl { \int_use:N \c@iRow } } + \int_compare:nNnT \l_tmpb_tl > \c@iRow + { \tl_set:Nx \l_tmpb_tl { \int_use:N \c@iRow } } +% \end{macrocode} +% Now, the numbers of both rows are in |\l_tmpa_tl| and |\l_tmpb_tl|. +% \begin{macrocode} + \@@_qpoint:n { row - \@@_succ:n \l_tmpb_tl } + \pgfpathrectanglecorners + { \@@_qpoint:n { row - \l_tmpa_tl } } + { \pgfpoint \l_tmpa_dim \pgf@y } + } + \pgfusepathqfill + \endpgfpicture + } + } +% \end{macrocode} +% +% \bigskip +% Here an example : |\@@_columncolor:nn {red!15} {1,3,5-7,10-}| +% \begin{macrocode} +\cs_new_protected:Npn \@@_columncolor:nn #1 #2 + { + \tl_if_blank:nF { #1 } + { + \pgfpicture + \pgf@relevantforpicturesizefalse + \pgfsetfillcolor { #1 } + \@@_qpoint:n { row - 1 } +% \end{macrocode} +% |\l_tmpa_dim| is the $y$-value of the top of the columns et |\l_tmpb_dim| is +% the $y$-value of the bottom. +% \begin{macrocode} + \dim_set_eq:NN \l_tmpa_dim \pgf@y + \@@_qpoint:n { row - \@@_succ:n \c@iRow } + \dim_set_eq:NN \l_tmpb_dim \pgf@y + \clist_map_inline:nn { #2 } + { + \tl_set:Nn \l_tmpa_tl { ##1 } + \tl_if_in:NnTF \l_tmpa_tl { - } + { \@@_cut_on_hyphen:w ##1 \q_stop } + { \@@_cut_on_hyphen:w ##1 - ##1 \q_stop } + \tl_if_empty:NT \l_tmpa_tl { \tl_set:Nn \l_tmpa_tl { 1 } } + \tl_if_empty:NT \l_tmpb_tl + { \tl_set:Nx \l_tmpb_tl { \int_use:N \c@jCol } } + \int_compare:nNnT \l_tmpb_tl > \c@jCol + { \tl_set:Nx \l_tmpb_tl { \int_use:N \c@jCol } } +% \end{macrocode} +% Now, the numbers of both columns are in |\l_tmpa_tl| and |\l_tmpb_tl|. +% \begin{macrocode} + \@@_qpoint:n { col - \l_tmpa_tl } + \dim_set_eq:NN \l_tmpc_dim \pgf@x + \@@_qpoint:n { col - \@@_succ:n \l_tmpb_tl } + \pgfpathrectanglecorners + { \pgfpoint \l_tmpc_dim \l_tmpa_dim } + { \pgfpoint \pgf@x \l_tmpb_dim } + } + \pgfusepathqfill + \endpgfpicture + } + } +% \end{macrocode} +% +% \bigskip +% Here an example : |\@@_cellcolor:nn {red!15}{2-3,3-4,4-5,5-6}| +% \begin{macrocode} +\cs_new_protected:Npn \@@_cellcolor:nn #1 #2 + { + \tl_if_blank:nF { #1 } + { + \pgfpicture + \pgf@relevantforpicturesizefalse + \pgfsetfillcolor { #1 } + \clist_map_inline:nn { #2 } + { + \@@_cut_on_hyphen:w ##1 \q_stop + \@@_qpoint:n { row - \l_tmpa_tl } + \bool_lazy_and:nnT + { \int_compare_p:n { \l_tmpa_tl <= \c@iRow } } + { \int_compare_p:n { \l_tmpb_tl <= \c@jCol } } + { + \dim_set_eq:NN \l_tmpb_dim \pgf@y + \@@_qpoint:n { row - \@@_succ:n \l_tmpa_tl } + \dim_set_eq:NN \l_tmpa_dim \pgf@y + \@@_qpoint:n { col - \l_tmpb_tl } + \dim_set_eq:NN \l_tmpc_dim \pgf@x + \@@_qpoint:n { col - \@@_succ:n \l_tmpb_tl } + \dim_set_eq:NN \l_tmpd_dim \pgf@x + \pgfpathrectanglecorners + { \pgfpoint \l_tmpc_dim \l_tmpb_dim } + { \pgfpoint \l_tmpd_dim \l_tmpa_dim } + } + } + \pgfusepathqfill + \endpgfpicture + } + } +% \end{macrocode} +% +% \bigskip +% Here an example : |\@@_rectanglecolor:nn {red!15}{2-3}{5-6}| +% \begin{macrocode} +\cs_new_protected:Npn \@@_rectanglecolor:nnn #1 #2 #3 + { + \tl_if_blank:nF { #1 } + { + \pgfpicture + \pgf@relevantforpicturesizefalse + \pgfsetfillcolor { #1 } + \@@_cut_on_hyphen:w #2 \q_stop + \bool_lazy_and:nnT + { \int_compare_p:n { \l_tmpa_tl <= \c@iRow } } + { \int_compare_p:n { \l_tmpb_tl <= \c@jCol } } + { + \@@_qpoint:n { row - \l_tmpa_tl } + \dim_set_eq:NN \l_tmpb_dim \pgf@y + \@@_qpoint:n { col - \l_tmpb_tl } + \@@_cut_on_hyphen:w #3 \q_stop + \int_compare:nNnT \l_tmpa_tl > \c@iRow + { \tl_set:Nx \l_tmpa_tl { \int_use:N \c@iRow } } + \int_compare:nNnT \l_tmpb_tl > \c@jCol + { \tl_set:Nx \l_tmpb_tl { \int_use:N \c@jCol } } + \dim_set_eq:NN \l_tmpc_dim \pgf@x + \@@_qpoint:n { row - \@@_succ:n \l_tmpa_tl } + \dim_set_eq:NN \l_tmpa_dim \pgf@y + \@@_qpoint:n { col - \@@_succ:n \l_tmpb_tl } + \dim_set_eq:NN \l_tmpd_dim \pgf@x + \pgfpathrectanglecorners + { \pgfpoint \l_tmpc_dim \l_tmpb_dim } + { \pgfpoint \l_tmpd_dim \l_tmpa_dim } + \pgfusepathqfill + } + \endpgfpicture + } + } +% \end{macrocode} +% +% +% \bigskip +% The command |\rowcolors| (accessible in the |code-before|) is inspired by the +% command |\rowcolors| of the package \pkg{xcolor} (with the option |table|). +% However, the command |\rowcolors| of \pkg{nicematrix} has \emph{not} the +% optional argument of the command |\rowcolors| of \pkg{xcolor}. +% \begin{macrocode} +\cs_new_protected:Npn \@@_rowcolors:nnn #1 #2 #3 + { + \int_step_inline:nnn { #1 } { \int_use:N \c@iRow } + { + \int_if_odd:nTF { ##1 } + { \@@_rowcolor:nn { #2 } { ##1 } } + { \@@_rowcolor:nn { #3 } { ##1 } } } } % \end{macrocode} -% +% % \bigskip -% The following command \emph{must} be protected (it's used in the -% construction of |\@@_draw_line_ii:nn|). % \begin{macrocode} -\cs_new_protected:Npn \@@_draw_line_iii:nn #1 #2 +\cs_new_protected:Npn \@@_chessboardcolors:nn #1 #2 { - \pgfrememberpicturepositiononpagetrue - \pgfpointshapeborder { \@@_env: - #1 } { \@@_qpoint: { #2 } } - \dim_set_eq:NN \l_@@_x_initial_dim \pgf@x - \dim_set_eq:NN \l_@@_y_initial_dim \pgf@y - \pgfpointshapeborder { \@@_env: - #2 } { \@@_qpoint: { #1 } } - \dim_set_eq:NN \l_@@_x_final_dim \pgf@x - \dim_set_eq:NN \l_@@_y_final_dim \pgf@y - \@@_draw_line: + \int_step_inline:nn { \int_use:N \c@iRow } + { + \int_step_inline:nn { \int_use:N \c@jCol } + { + \int_if_even:nTF { ####1 + ##1 } + { \@@_cellcolor:nn { #1 } { ####1 - ##1 } } + { \@@_cellcolor:nn { #2 } { ####1 - ##1 } } + } + } } % \end{macrocode} % -% -% The commands |\Ldots|, |\Cdots|, |\Vdots|, |\Ddots|, and |\Iddots| don't use -% this command because they have to do other settings (for example, the diagonal -% lines must be parallelized). -% % \bigskip % \subsection*{The vertical rules} % @@ -7465,24 +8461,20 @@ version 2005/12/01 or later. % consecutive specifiers ``"|"'' (in a preambule like "ccc||ccc"). % % That's why we have done a redefinition of the macro |\@arrayrule| of -% \pkg{array} and this redefinition will add |\@@_vline:| instead of |\vline| to -% the preamble (that definition is in the beginning of |{NiceArrayWithDelims}|). +% \pkg{array} and this redefinition will add |\@@_vline:| instead of |\vline| +% in the preamble (that definition is in the beginning of +% |{NiceArrayWithDelims}|). % % Here is the definition of |\@@_vline:|. This definition \emph{must} be % protected because you don't want that macro expanded during the construction % of the preamble (the tests in |\@@_OnlyMainNiceMatrix:n| must be effective in -% each row and not once for all when the preamble is constructed). -% -% \medskip -% \begin{macrocode} -\cs_new_protected:Npn \@@_vline: { \@@_OnlyMainNiceMatrix:n { \@@_vline_i: } } -% \end{macrocode} -% -% If \pkg{colortbl} is loaded, the following macro will be redefined (in a -% |\AtBeginDocument|) to take into account the color fixed by |\arrayrulecolor| -% of \pkg{colortbl}. +% each row and not once for all when the preamble is constructed). The command +% |\CT@arc@| is a command of \pkg{colortbl} which sets the color of the rules in +% the array. The package \pkg{nicematrix} uses it even if \pkg{colortbl} is not +% loaded. % \begin{macrocode} -\cs_set_eq:NN \@@_vline_i: \vline +\cs_new_protected:Npn \@@_vline: + { \@@_OnlyMainNiceMatrix:n { { \CT@arc@ \vline } } } % \end{macrocode} % % \bigskip @@ -7493,9 +8485,12 @@ version 2005/12/01 or later. { \group_begin: % \end{macrocode} -% The command |\CT@arc@| is a command of color from \pkg{colortbl}. +% +% The command |\CT@arc@| is a command of \pkg{colortbl} which sets the color of +% the rules in the array. The package \pkg{nicematrix} uses it even if +% \pkg{colortbl} is not loaded. % \begin{macrocode} - \bool_if:NT \c_@@_colortbl_loaded_bool \CT@arc@ + \CT@arc@ \pgfpicture \pgfrememberpicturepositiononpagetrue \pgf@relevantforpicturesizefalse @@ -7503,10 +8498,10 @@ version 2005/12/01 or later. % \end{macrocode} % First, we compute in |\l_tmpa_dim| the height of the rules we have to draw. % \begin{macrocode} - \@@_qpoint: {row - 1 } + \@@_qpoint:n { row - 1 } \dim_set_eq:NN \l_tmpa_dim \pgf@y \pgfusepathqfill - \@@_qpoint: { row - \@@_succ:n \c@iRow } + \@@_qpoint:n { row - \@@_succ:n \c@iRow } \dim_sub:Nn \l_tmpa_dim \pgf@y \pgfusepathqfill % \end{macrocode} @@ -7521,53 +8516,28 @@ version 2005/12/01 or later. % We adjust the value of |\l_tmpa_dim| by the width of the horizontal rule just % before the ``last row''. % \begin{macrocode} - \@@_qpoint: { row - \@@_succ:n\c@iRow } + \@@_qpoint:n { row - \@@_succ:n\c@iRow } \dim_add:Nn \l_tmpa_dim \pgf@y - \@@_qpoint: { row - \@@_succ:n \g_@@_row_total_int } + \@@_qpoint:n { row - \@@_succ:n \g_@@_row_total_int } \dim_sub:Nn \l_tmpa_dim \pgf@y \dim_sub:Nn \l_tmpa_dim \l_tmpb_dim } + \dim_add:Nn \l_tmpa_dim \arrayrulewidth % \end{macrocode} % -% Now, we can draw the lines with a loop. +% +% Now, we can draw the vertical rules with a loop. % \begin{macrocode} \int_step_inline:nnn { \bool_if:NTF \l_@@_NiceArray_bool 1 2 } { \bool_if:NTF \l_@@_NiceArray_bool { \@@_succ:n \c@jCol } \c@jCol } - { - \pgfpathmoveto - { - \pgfpointadd - { \@@_qpoint: { col - ##1 } } - { - \pgfpoint - { - -0.5 \arrayrulewidth - \int_compare:nNnT { ##1 } = 1 - { - \int_compare:nNnT \l_@@_first_col_int = 1 - { + \arrayrulewidth } - } - } - { \l_tmpb_dim } - } - } + { + \pgfpathmoveto { \@@_qpoint:n { col - ##1 } } \pgfpathlineto { \pgfpointadd - { \@@_qpoint: { col - ##1 } } - { - \pgfpoint - { - -0.5 \arrayrulewidth - \int_compare:nNnT { ##1 } = 1 - { - \int_compare:nNnT \l_@@_first_col_int = 1 - { + \arrayrulewidth } - } - } - { \l_tmpb_dim + \l_tmpa_dim } - } + { \@@_qpoint:n { col - ##1 } } + { \pgfpoint \c_zero_dim { \l_tmpb_dim + \l_tmpa_dim } } } } \pgfusepathqstroke @@ -7581,7 +8551,7 @@ version 2005/12/01 or later. % \subsection*{The commands to draw dotted lines to separate columns and rows} % % These commands don't use the normal nodes, the medium nor the large nodes. -% They only use the |col|-nodes and the |row|-nodes. +% They only use the |col| nodes and the |row| nodes. % % \textbf{Horizontal dotted lines}\par\nobreak % @@ -7589,14 +8559,10 @@ version 2005/12/01 or later. % The following command must \emph{not} be protected because it's meant to be % expanded in a |\noalign|. % \begin{macrocode} -\bool_if:NTF \c_@@_draft_bool - { \cs_new:Npn \@@_hdottedline: { } } +\cs_new:Npn \@@_hdottedline: { - \cs_new:Npn \@@_hdottedline: - { - \noalign { \skip_vertical:N 2\l_@@_radius_dim } - \@@_hdottedline_i: - } + \noalign { \skip_vertical:N 2\l_@@_radius_dim } + \@@_hdottedline_i: } % \end{macrocode} % @@ -7645,7 +8611,7 @@ version 2005/12/01 or later. \cs_new_protected:Npn \@@_hdottedline_i:n #1 { \pgfrememberpicturepositiononpagetrue - \@@_qpoint: { row - #1 } + \@@_qpoint:n { row - #1 } % \end{macrocode} % We do a translation par |-\l_@@_radius_dim| because we want the dotted line to % have exactly the same position as a vertical rule drawn by ``"|"'' @@ -7671,7 +8637,7 @@ version 2005/12/01 or later. % \hline % 1 & 2 & 3 & 4 \\ % \hdottedline -% 1 & 2 & 3 & 4 \\ +% 1 & 2 & 3 & 4 % \end{bNiceMatrix} % \end{BVerbatim} % $\begin{bNiceMatrix} @@ -7679,7 +8645,7 @@ version 2005/12/01 or later. % \hline % 1 & 2 & 3 & 4 \\ % \hdottedline -% 1 & 2 & 3 & 4 \\ +% 1 & 2 & 3 & 4 % \end{bNiceMatrix}$ % % \smallskip @@ -7693,7 +8659,7 @@ version 2005/12/01 or later. % \hline % 1 & 2 & 3 & 4 \\ % \hdottedline -% 1 & 2 & 3 & 4 \\ +% 1 & 2 & 3 & 4 % \end{bNiceMatrix} % \end{BVerbatim} % $\begin{bNiceMatrix}[margin] @@ -7701,17 +8667,25 @@ version 2005/12/01 or later. % \hline % 1 & 2 & 3 & 4 \\ % \hdottedline -% 1 & 2 & 3 & 4 \\ +% 1 & 2 & 3 & 4 % \end{bNiceMatrix}$ % % \medskip % \begin{macrocode} - \@@_qpoint: { col - 1 } + \@@_qpoint:n { col - 1 } \dim_set:Nn \l_@@_x_initial_dim - { \pgf@x + \arraycolsep - \l_@@_left_margin_dim } - \@@_qpoint: { col - \@@_succ:n \c@jCol } + { + \pgf@x + + \bool_if:NTF \l_@@_NiceTabular_bool \tabcolsep \arraycolsep + - \l_@@_left_margin_dim + } + \@@_qpoint:n { col - \@@_succ:n \c@jCol } \dim_set:Nn \l_@@_x_final_dim - { \pgf@x - \arraycolsep + \l_@@_right_margin_dim } + { + \pgf@x - + \bool_if:NTF \l_@@_NiceTabular_bool \tabcolsep \arraycolsep + + \l_@@_right_margin_dim + } % \end{macrocode} % For reasons purely aesthetic, we do an adjustment in the case of a rounded % bracket. The correction by |0.5 \l_@@_inter_dots_dim| is \emph{ad hoc} for a @@ -7743,29 +8717,25 @@ version 2005/12/01 or later. % % \medskip % \begin{macrocode} -\bool_if:nTF \c_@@_draft_bool - { \cs_new_protected:Npn \@@_vdottedline:n #1 { } } +\cs_new_protected:Npn \@@_vdottedline:n #1 { - \cs_new_protected:Npn \@@_vdottedline:n #1 - { - \bool_set_true:N \l_@@_initial_open_bool - \bool_set_true:N \l_@@_final_open_bool + \bool_set_true:N \l_@@_initial_open_bool + \bool_set_true:N \l_@@_final_open_bool % \end{macrocode} % We recall that, when externalization is used, |\tikzpicture| and % |\endtikzpicture| (or |\pgfpicture| and |\endpgfpicture|) must be directly % ``visible''. % \begin{macrocode} - \bool_if:NTF \c_@@_tikz_loaded_bool - { - \tikzpicture - \@@_vdottedline_i:n { #1 } - \endtikzpicture - } - { - \pgfpicture - \@@_vdottedline_i:n { #1 } - \endpgfpicture - } + \bool_if:NTF \c_@@_tikz_loaded_bool + { + \tikzpicture + \@@_vdottedline_i:n { #1 } + \endtikzpicture + } + { + \pgfpicture + \@@_vdottedline_i:n { #1 } + \endpgfpicture } } % \end{macrocode} @@ -7775,11 +8745,13 @@ version 2005/12/01 or later. \cs_new_protected:Npn \@@_vdottedline_i:n #1 { % \end{macrocode} -% The command |\CT@arc@| is a command of color from \pkg{colortbl}. +% The command |\CT@arc@| is a command of \pkg{colortbl} which sets the color of +% the rules in the array. The package \pkg{nicematrix} uses it even if \pkg{colortbl} is not +% loaded. % \begin{macrocode} - \bool_if:NT \c_@@_colortbl_loaded_bool \CT@arc@ + \CT@arc@ \pgfrememberpicturepositiononpagetrue - \@@_qpoint: { col - \int_eval:n { #1 + 1 } } + \@@_qpoint:n { col - \int_eval:n { #1 + 1 } } % \end{macrocode} % We do a translation par |-\l_@@_radius_dim| because we want the dotted line to % have exactly the same position as a vertical rule drawn by ``"|"'' @@ -7787,13 +8759,13 @@ version 2005/12/01 or later. % \begin{macrocode} \dim_set:Nn \l_@@_x_initial_dim { \pgf@x - \l_@@_radius_dim } \dim_set:Nn \l_@@_x_final_dim { \pgf@x - \l_@@_radius_dim } - \@@_qpoint: { row - 1 } + \@@_qpoint:n { row - 1 } % \end{macrocode} % We arbitrary decrease the height of the dotted line by a quantity equal to % |\l_@@_inter_dots_dim| in order to improve the visual impact. % \begin{macrocode} \dim_set:Nn \l_@@_y_initial_dim { \pgf@y - 0.5 \l_@@_inter_dots_dim } - \@@_qpoint: { row - \@@_succ:n \c@iRow } + \@@_qpoint:n { row - \@@_succ:n \c@iRow } \dim_set:Nn \l_@@_y_final_dim { \pgf@y + 0.5 \l_@@_inter_dots_dim } % \end{macrocode} % As for now, we have no option to control the style of the lines drawn by @@ -7984,7 +8956,7 @@ version 2005/12/01 or later. \dim_compare:nNnT { \dim_use:c { l_@@_row _ \@@_i: _ min _ dim } } = \c_max_dim { - \@@_qpoint: { row - \@@_i: - base } + \@@_qpoint:n { row - \@@_i: - base } \dim_set:cn { l_@@_row _ \@@_i: _ max _ dim } \pgf@y \dim_set:cn { l_@@_row _ \@@_i: _ min _ dim } \pgf@y } @@ -7994,7 +8966,7 @@ version 2005/12/01 or later. \dim_compare:nNnT { \dim_use:c { l_@@_column _ \@@_j: _ min _ dim } } = \c_max_dim { - \@@_qpoint: { col - \@@_j: } + \@@_qpoint:n { col - \@@_j: } \dim_set:cn { l_@@_column _ \@@_j: _ max _ dim } \pgf@y \dim_set:cn { l_@@_column _ \@@_j: _ min _ dim } \pgf@y } @@ -8110,9 +9082,9 @@ version 2005/12/01 or later. \dim_set_eq:cc { l_@@_column _ \@@_succ:n \@@_j: _ min _ dim } { l_@@_column _ \@@_j: _ max _ dim } } -% \end{macrocode} +% \end{macrocode} % Here, we have to use |\dim_sub:cn| because of the number 1 in the name. -% \begin{macrocode} +% \begin{macrocode} \dim_sub:cn { l_@@_column _ 1 _ min _ dim } \l_@@_left_margin_dim @@ -8125,7 +9097,7 @@ version 2005/12/01 or later. % % % \bigskip -% The control sequence |\@@_create_nodes:| is used twice: for the construction +% The command |\@@_create_nodes:| is used twice: for the construction % of the ``medium nodes'' and for the construction of the ``large nodes''. The % nodes are constructed with the value of all the dimensions % \texttt{l_@@_row_\textsl{i}_min_dim}, \texttt{l_@@_row_\textsl{i}_max_dim}, @@ -8318,13 +9290,13 @@ version 2005/12/01 or later. \pgfpicture \pgfrememberpicturepositiononpagetrue \pgf@relevantforpicturesizefalse - \@@_qpoint: { row - #1 } + \@@_qpoint:n { row - #1 } \dim_set_eq:NN \l_tmpa_dim \pgf@y - \@@_qpoint: { col - #2 } + \@@_qpoint:n { col - #2 } \dim_set_eq:NN \l_tmpb_dim \pgf@x - \@@_qpoint: { row - \@@_succ:n { #3 } } + \@@_qpoint:n { row - \@@_succ:n { #3 } } \dim_set_eq:NN \l_tmpc_dim \pgf@y - \@@_qpoint: { col - \@@_succ:n { #4 } } + \@@_qpoint:n { col - \@@_succ:n { #4 } } \dim_set_eq:NN \l_tmpd_dim \pgf@x % \end{macrocode} % @@ -8337,24 +9309,19 @@ version 2005/12/01 or later. \begin { pgfscope } \pgfsetfillcolor { white } % \end{macrocode} -% Usually, the vertical rules are \emph{before} the |col|-nodes. But there is an -% exception: if there is no ``first col'', the first vertical rule is after the -% col node.\footnote{That's true for the vertical rules drawn by ``"|"'' due to -% the conception of |{array}| (of \pkg{array}) and we have managed to have the -% same behaviour with |vlines|.} % -% Since we don't want the white rectangle to erase a part of this -% first rule, we have to do an adjustment in this case. -% \emph{after} the ``col node''. % \begin{macrocode} - \int_compare:nNnT { #2 } = 1 + \pgfpathrectanglecorners { - \int_compare:nNnT \l_@@_first_col_int = 1 - { \dim_add:Nn \l_tmpb_dim \arrayrulewidth } + \pgfpoint + { \l_tmpb_dim + 0.5 \arrayrulewidth } + { \l_tmpa_dim - 0.5 \arrayrulewidth } + } + { + \pgfpoint + { \l_tmpd_dim - 0.5 \arrayrulewidth } + { \l_tmpc_dim + 0.5 \arrayrulewidth } } - \pgfpathrectanglecorners - { \pgfpoint \l_tmpb_dim { \l_tmpa_dim - \arrayrulewidth } } - { \pgfpoint { \l_tmpd_dim - \arrayrulewidth } \l_tmpc_dim } \pgfusepathqfill \end { pgfscope } } @@ -8398,11 +9365,11 @@ version 2005/12/01 or later. % |\pgfcoordinate| on the baseline of the row, in the first column of the array. % Now, we retrieve the $y$-value of that node and we store it in |\l_tmpa_dim|. % \begin{macrocode} - \pgfextracty \l_tmpa_dim { \@@_qpoint: { row - #1 - base } } + \pgfextracty \l_tmpa_dim { \@@_qpoint:n { row - #1 - base } } % \end{macrocode} % We retrieve (in |\pgf@x|) the $x$-value of the center of the block. % \begin{macrocode} - \@@_qpoint: { #1 - #2 - block } + \@@_qpoint:n { #1 - #2 - block } % \end{macrocode} % We put the label of the block which has been composed in |\l_@@_cell_box|. % \begin{macrocode} @@ -8418,7 +9385,7 @@ version 2005/12/01 or later. % |\l_@@_cell_box|). % \begin{macrocode} { - \pgftransformshift { \@@_qpoint: { #1 - #2 - block } } + \pgftransformshift { \@@_qpoint:n { #1 - #2 - block } } \pgfnode { rectangle } { center } { \box_use_drop:N \l_@@_cell_box } { } { } } @@ -8519,9 +9486,106 @@ version 2005/12/01 or later. \@@_define_com:nnn V \| \| \@@_define_com:nnn B \{ \} % \end{macrocode} +% +% \bigskip +% We define also an command |\AutoNiceMatrix| similar to the environment |{NiceMatrix}|. +% \begin{macrocode} +\NewDocumentCommand \AutoNiceMatrix { O { } m O { } m ! O { } } + { + \group_begin: + \bool_set_true:N \l_@@_NiceArray_bool + \AutoNiceMatrixWithDelims . . { #2 } { #4 } [ #1 , #3 , #5 ] + \group_end: + } +% \end{macrocode} +% +% \subsection*{The redefinition of the command \textbackslash dotfill } +% +% \begin{macrocode} +\cs_set_eq:NN \@@_dotfill \dotfill +\cs_new_protected:Npn \@@_dotfill: + { +% \end{macrocode} +% First, we insert |\@@_dotfill| (which is the saved version of |\dotfill|) in +% case of use of |\dotfill| ``internally'' in the cell (e.g. |\hbox to 1cm {\dotfill}|). +% \begin{macrocode} + \@@_dotfill + \group_insert_after:N \@@_dotfill_i: + } +\cs_new_protected:Npn \@@_dotfill_i: { \group_insert_after:N \@@_dotfill_ii: } +\cs_new_protected:Npn \@@_dotfill_ii: { \group_insert_after:N \@@_dotfill_iii: } +% \end{macrocode} +% Now, if the box if not empty (unfornately, we can't actually test whether the +% box is empty and that's why we only consider it's width), we insert +% |\@@_dotfill| (which is the saved version of |\dotfill|) in the cell of the +% array, and it will extends, since it's no longer in |\l_@@_cell_box|. +% \begin{macrocode} +\cs_new_protected:Npn \@@_dotfill_iii: + { \dim_compare:nNnT { \box_wd:N \l_@@_cell_box } = \c_zero_dim \@@_dotfill } +% \end{macrocode} +% +% \subsection*{The command \textbackslash slashbox} +% +% +% \begin{macrocode} +\cs_new_protected:Npn \@@_slashbox:nn #1 #2 + { + \tl_gput_right:Nx \g_@@_internal_code_after_tl + { + \@@_actually_slashbox:nnnn + { \int_use:N \c@iRow } { \int_use:N \c@jCol } { #1 } { #2 } + } + } +% \end{macrocode} +% +% \medskip +% The two arguments of |\@@_actually_slashbox:nn| are the number of row and the +% number of column of the cell to slash. The two other are the elements to draw +% below and above the diagonal line. +% \begin{macrocode} +\cs_new_protected:Npn \@@_actually_slashbox:nnnn #1 #2 #3 #4 + { + \pgfpicture + \pgf@relevantforpicturesizefalse + \pgfrememberpicturepositiononpagetrue + \@@_qpoint:n { row - #1 } + \dim_set_eq:NN \l_tmpa_dim \pgf@y + \@@_qpoint:n { col - #2 } + \dim_set_eq:NN \l_tmpb_dim \pgf@x + \pgfpathmoveto { \pgfpoint \l_tmpb_dim \l_tmpa_dim } + \@@_qpoint:n { row - \@@_succ:n { #1 } } + \dim_set_eq:NN \l_tmpc_dim \pgf@y + \@@_qpoint:n { col - \@@_succ:n { #2 } } + \dim_set_eq:NN \l_tmpd_dim \pgf@x + \pgfpathlineto { \pgfpoint \l_tmpd_dim \l_tmpc_dim } + { +% \end{macrocode} +% The command |\CT@arc@| is a command of \pkg{colortbl} which sets the color of +% the rules in the array. The package \pkg{nicematrix} uses it even if \pkg{colortbl} is not +% loaded. +% \begin{macrocode} + \CT@arc@ + \pgfsetroundcap + \pgfusepathqstroke + } + \pgfset { inner~sep = 1 pt } + \pgfscope + \pgftransformshift { \pgfpoint \l_tmpb_dim \l_tmpc_dim } + \pgfnode { rectangle } { south~west } { $ #3 $ } { } { } + \endpgfscope + \pgftransformshift { \pgfpoint \l_tmpd_dim \l_tmpa_dim } + \pgfnode { rectangle } { north~east } { $ #4 $ } { } { } + \endpgfpicture + } +% \end{macrocode} % % \subsection*{The command \textbackslash CodeAfter} % +% In fact, in this subsection, we define the user command |\CodeAfter| for the +% case of the ``normal syntax''. For the case of ``light-syntax'', see the +% definition of the environment |{@@-light-syntax}| on +% p.~\pageref{code-light-syntax}. +% % The command |\CodeAfter| catches everything until the end of the current % environment (of \pkg{nicematrix}). % @@ -8542,7 +9606,8 @@ version 2005/12/01 or later. % If this is really the end of the current environment (of \pkg{nicematrix}), we % put back the command |\end| and its argument in the TeX flow. % \begin{macrocode} - \bool_if:NTF { \str_if_eq_p:Vn \g_@@_name_env_str { #1 } } + \str_set:NV \l_tmpa_str \@currenvir + \bool_if:NTF { \str_if_eq_p:Vn \l_tmpa_str { #1 } } { \end { #1 } } % \end{macrocode} % It this is not the |\end| we are looking for, we put those tokens in @@ -8560,6 +9625,18 @@ version 2005/12/01 or later. % \bigskip % \subsection*{We process the options} % +% +% \begin{macrocode} +\@@_msg_new:nn { obsolete~environments } + { + The~obsolete~environments~(eg.~{pNiceArrayC})~have~been~deleted~ + from~the~package~nicematrix.\\ + However,~if~you~still~want~to~use~them,~you~will~find~the~code~for~ + those~environments~at~the~end~of~the~file~'nicematrix.sty',~after~ + a~command~'\token_to_str:N\file_input_stop:'. + } +% \end{macrocode} +% % We process the options when the package is loaded (with |\usepackage|) but we % recommend to use |\NiceMatrixOptions| instead. % @@ -8570,7 +9647,6 @@ version 2005/12/01 or later. % Of course, the command |\NiceMatrix| must be defined before such an % instruction is executed. % \begin{macrocode} -\bool_new:N \c_@@_obsolete_environments_bool \keys_define:nn { NiceMatrix / Package } { renew-dots .bool_set:N = \l_@@_renew_dots_bool , @@ -8579,9 +9655,7 @@ version 2005/12/01 or later. renew-matrix .value_forbidden:n = true , transparent .meta:n = { renew-dots , renew-matrix } , transparent .value_forbidden:n = true, - obsolete-environments .bool_set:N = \c_@@_obsolete_environments_bool , - obsolete-environments .value_forbidden:n = true , - obsolete-environments .default:n = true , + obsolete-environments .code:n = \@@_fatal:n { obsolete~environments }, starred-commands .code:n = \@@_msg_redirect_name:nn { starred~commands } { none } , starred-commands .value_forbidden:n = true , @@ -8650,7 +9724,7 @@ version 2005/12/01 or later. % \begin{macrocode} \cs_new:Npn \@@_message_hdotsfor: { - \tl_if_empty:VF \g_@@_Hdotsfor_lines_tl + \tl_if_empty:VF \g_@@_HVdotsfor_lines_tl { ~Maybe~your~use~of~\token_to_str:N \Hdotsfor\ is~incorrect.} } % \end{macrocode} @@ -8692,7 +9766,47 @@ version 2005/12/01 or later. } % \end{macrocode} % -% +% \begin{macrocode} +\@@_msg_new:nn { in~first~col } + { + You~can't~use~the~command~#1 in~the~first~column~(number~0)~of~the~array.\\ + If~you~go~on,~this~command~will~be~ignored. + } +% \end{macrocode} +% +% \begin{macrocode} +\@@_msg_new:nn { in~last~col } + { + You~can't~use~the~command~#1 in~the~last~column~(exterior)~of~the~array.\\ + If~you~go~on,~this~command~will~be~ignored. + } +% \end{macrocode} +% +% \begin{macrocode} +\@@_msg_new:nn { in~first~row } + { + You~can't~use~the~command~#1 in~the~first~row~(number~0)~of~the~array.\\ + If~you~go~on,~this~command~will~be~ignored. + } +% \end{macrocode} +% +% \begin{macrocode} +\@@_msg_new:nn { in~last~row } + { + You~can't~use~the~command~#1 in~the~last~row~(exterior)~of~the~array.\\ + If~you~go~on,~this~command~will~be~ignored. + } +% \end{macrocode} +% +% \begin{macrocode} +\@@_msg_new:nn { option~S~without~siunitx } + { + You~can't~use~the~option~'S'~in~your~environment~\@@_full_name_env: + because~you~have~not~loaded~siunitx.\\ + If~you~go~on,~this~option~will~be~ignored. + } +% \end{macrocode} +% % \begin{macrocode} \@@_msg_new:nn { bad~option~for~line-style } { @@ -8782,6 +9896,16 @@ version 2005/12/01 or later. } % \end{macrocode} % +% \begin{macrocode} +\@@_msg_new:nn { last-col~non~empty~for~NiceMatrixOptions } + { + In~\NiceMatrixoptions,~you~must~use~the~option~ + 'last-col'~without~value.\\ + However,~you~can~go~on~for~this~time~ + (the~value~'\l_keys_value_tl'~will~be~ignored). + } +% \end{macrocode} +% % % \begin{macrocode} \@@_msg_new:nn { Block~too~large } @@ -8843,6 +9967,8 @@ version 2005/12/01 or later. The~available~options~are~(in~alphabetic~order):~ allow-duplicate-names,~ code-for-first-col,~ + cell-space-bottom-limit,~ + cell-space-top-limit,~ code-for-first-row,~ code-for-last-col,~ code-for-last-row,~ @@ -8851,8 +9977,12 @@ version 2005/12/01 or later. create-large-nodes,~ end-of-row,~ exterior-arraycolsep,~ + first-col,~ + first-row,~ hlines,~ hvlines,~ + last-col,~ + last-row,~ left-margin,~ letter-for-dotted-lines,~ light-syntax,~ @@ -8883,6 +10013,8 @@ version 2005/12/01 or later. b,~ baseline,~ c,~ + cell-space-bottom-limit,~ + cell-space-top-limit,~ code-after,~ code-for-first-col,~ code-for-first-row,~ @@ -8934,6 +10066,8 @@ version 2005/12/01 or later. b,~ baseline,~ c,~ + cell-space-bottom-limit,~ + cell-space-top-limit,~ code-after,~ code-for-first-col,~ code-for-first-row,~ @@ -8961,6 +10095,7 @@ version 2005/12/01 or later. r~(=R),~ renew-dots,~ right-margin,~ + S,~ small,~ t,~ vlines,~ @@ -8970,6 +10105,54 @@ version 2005/12/01 or later. } % \end{macrocode} % +% \begin{macrocode} +\@@_msg_new:nnn { Unknown~option~for~NiceTabular } + { + The~option~'\tl_use:N\l_keys_key_str'~is~unknown~for~the~environment~ + \{NiceTabular\}. \\ + If~you~go~on,~it~will~be~ignored. \\ + For~a~list~of~the~available~options,~type~H~. + } + { + The~available~options~are~(in~alphabetic~order):~ + b,~ + baseline,~ + c,~ + cell-space-bottom-limit,~ + cell-space-top-limit,~ + code-after,~ + code-for-first-col,~ + code-for-first-row,~ + code-for-last-col,~ + code-for-last-row,~ + columns-width,~ + create-extra-nodes,~ + create-medium-nodes,~ + create-large-nodes,~ + end-of-row,~ + extra-left-margin,~ + extra-right-margin,~ + first-col,~ + first-row,~ + hlines,~ + hvlines,~ + last-col,~ + last-row,~ + left-margin,~ + light-syntax,~ + name,~ + nullify-dots,~ + parallelize-diags,~ + renew-dots,~ + right-margin,~ + t,~ + vlines,~ + xdots/color,~ + xdots/shorten~and~ + xdots/line-style. + } +% \end{macrocode} +% % % \begin{macrocode} \@@_msg_new:nnn { Duplicate~name } @@ -9013,87 +10196,85 @@ version 2005/12/01 or later. % completly deleted in a future version. % % \begin{macrocode} -\bool_if:NT \c_@@_obsolete_environments_bool +\file_input_stop: +\NewDocumentEnvironment { pNiceArrayC } { } { - \NewDocumentEnvironment { pNiceArrayC } { } - { - \int_zero:N \l_@@_last_col_int - \pNiceArray - } - { \endpNiceArray } - \NewDocumentEnvironment { bNiceArrayC } { } - { - \int_zero:N \l_@@_last_col_int - \bNiceArray - } - { \endbNiceArray } - \NewDocumentEnvironment { BNiceArrayC } { } - { - \int_zero:N \l_@@_last_col_int - \BNiceArray - } - { \endBNiceArray } - \NewDocumentEnvironment { vNiceArrayC } { } - { - \int_zero:N \l_@@_last_col_int - \vNiceArray - } - { \endvNiceArray } - \NewDocumentEnvironment { VNiceArrayC } { } - { - \int_zero:N \l_@@_last_col_int - \VNiceArray - } - { \endVNiceArray } - \NewDocumentEnvironment { pNiceArrayRC } { } - { - \int_zero:N \l_@@_last_col_int - \int_zero:N \l_@@_first_row_int - \pNiceArray - } - { \endpNiceArray } - \NewDocumentEnvironment { bNiceArrayRC } { } - { - \int_zero:N \l_@@_last_col_int - \int_zero:N \l_@@_first_row_int - \bNiceArray - } - { \endbNiceArray } - \NewDocumentEnvironment { BNiceArrayRC } { } - { - \int_zero:N \l_@@_last_col_int - \int_zero:N \l_@@_first_row_int - \BNiceArray - } - { \endBNiceArray } - \NewDocumentEnvironment { vNiceArrayRC } { } - { - \int_zero:N \l_@@_last_col_int - \int_zero:N \l_@@_first_row_int - \vNiceArray - } - { \endvNiceArray } - \NewDocumentEnvironment { VNiceArrayRC } { } - { - \int_zero:N \l_@@_last_col_int - \int_zero:N \l_@@_first_row_int - \VNiceArray - } - { \endVNiceArray } - \NewDocumentEnvironment { NiceArrayCwithDelims } { } - { - \int_zero:N \l_@@_last_col_int - \NiceArrayWithDelims - } - { \endNiceArrayWithDelims } - \NewDocumentEnvironment { NiceArrayRCwithDelims } { } - { - \int_zero:N \l_@@_last_col_int - \int_zero:N \l_@@_first_row_int - \NiceArrayWithDelims - } - { \endNiceArrayWithDelims } + \int_zero:N \l_@@_last_col_int + \pNiceArray + } + { \endpNiceArray } + \NewDocumentEnvironment { bNiceArrayC } { } + { + \int_zero:N \l_@@_last_col_int + \bNiceArray + } + { \endbNiceArray } +\NewDocumentEnvironment { BNiceArrayC } { } + { + \int_zero:N \l_@@_last_col_int + \BNiceArray + } + { \endBNiceArray } +\NewDocumentEnvironment { vNiceArrayC } { } + { + \int_zero:N \l_@@_last_col_int + \vNiceArray + } + { \endvNiceArray } +\NewDocumentEnvironment { VNiceArrayC } { } + { + \int_zero:N \l_@@_last_col_int + \VNiceArray + } + { \endVNiceArray } +\NewDocumentEnvironment { pNiceArrayRC } { } + { + \int_zero:N \l_@@_last_col_int + \int_zero:N \l_@@_first_row_int + \pNiceArray + } + { \endpNiceArray } +\NewDocumentEnvironment { bNiceArrayRC } { } + { + \int_zero:N \l_@@_last_col_int + \int_zero:N \l_@@_first_row_int + \bNiceArray + } + { \endbNiceArray } +\NewDocumentEnvironment { BNiceArrayRC } { } + { + \int_zero:N \l_@@_last_col_int + \int_zero:N \l_@@_first_row_int + \BNiceArray } + { \endBNiceArray } +\NewDocumentEnvironment { vNiceArrayRC } { } + { + \int_zero:N \l_@@_last_col_int + \int_zero:N \l_@@_first_row_int + \vNiceArray + } + { \endvNiceArray } +\NewDocumentEnvironment { VNiceArrayRC } { } + { + \int_zero:N \l_@@_last_col_int + \int_zero:N \l_@@_first_row_int + \VNiceArray + } + { \endVNiceArray } +\NewDocumentEnvironment { NiceArrayCwithDelims } { } + { + \int_zero:N \l_@@_last_col_int + \NiceArrayWithDelims + } + { \endNiceArrayWithDelims } +\NewDocumentEnvironment { NiceArrayRCwithDelims } { } + { + \int_zero:N \l_@@_last_col_int + \int_zero:N \l_@@_first_row_int + \NiceArrayWithDelims + } + { \endNiceArrayWithDelims } % \end{macrocode} % % @@ -9164,8 +10345,6 @@ version 2005/12/01 or later. % possible to externalize the Tikz elements constructed by \pkg{nicematrix} % because they use the options |overlay| and |remember picture|.} % -% \subsection*{Changes between version 2.1 and 2.1.2} -% Option |draft|: with this option, the dotted lines are not drawn (quicker). % % \subsection*{Changes between version 2.1.2 and 2.1.3} % @@ -9218,9 +10397,6 @@ version 2005/12/01 or later. % % Option |hlines|. % -% A warning is issued when the |draft| mode is used. In this case, the dotted -% lines are not drawn. -% % % \subsection*{Changes between version 2.3 and 3.0} % @@ -9393,6 +10569,14 @@ version 2005/12/01 or later. % % New command |\CodeAfter| (in the environments of \pkg{nicematrix}). % +% +% \subsection*{Changes between versions 3.15 and 4.0} +% +% New environment |{NiceTabular}| +% +% Commands to color cells, row and columns with a perfect result in the \textsc{pdf}. +% +% % \PrintIndex % % \tableofcontents diff --git a/macros/latex/contrib/nicematrix/nicematrix.pdf b/macros/latex/contrib/nicematrix/nicematrix.pdf index 8507028d22..8f7fb6b647 100644 Binary files a/macros/latex/contrib/nicematrix/nicematrix.pdf and b/macros/latex/contrib/nicematrix/nicematrix.pdf differ diff --git a/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl b/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl index 880d2a7cfd..ead3c72ed4 100644 --- a/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl +++ b/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl @@ -38,6 +38,7 @@ $mirrors = { }, 'Japan' => { 'ftp://ftp.kddilabs.jp/CTAN/' => 1, + 'ftp://ftp.u-aizu.ac.jp/pub/tex/CTAN/' => 1, 'http://ftp.jaist.ac.jp/pub/CTAN/' => 1, 'http://ftp.yz.yamagata-u.ac.jp/pub/CTAN/' => 1, }, @@ -96,6 +97,7 @@ $mirrors = { 'http://ctan.space-pro.be/tex-archive/' => 1, 'http://ftp.fau.de/ctan/' => 1, 'http://ftp.gwdg.de/pub/ctan/' => 1, + 'http://mirror.informatik.hs-fulda.de/tex-archive/' => 1, 'http://mirror.physik-pool.tu-berlin.de/pub/CTAN/' => 1, 'http://packages.oth-regensburg.de/ctan/' => 1, 'http://vesta.informatik.rwth-aachen.de/ftp/pub/mirror/ctan/' => 1, diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb b/systems/texlive/tlnet/tlpkg/texlive.tlpdb index 5d23683ca4..84cfb35dc7 100644 --- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb +++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb @@ -26,11 +26,11 @@ depend container_split_src_files/1 depend frozen/0 depend minrelease/2016 depend release/2020 -depend revision/55070 +depend revision/55079 name 00texlive.image category TLCore -revision 55064 +revision 55076 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 @@ -4194,7 +4194,7 @@ depend setting_available_architectures:aarch64-linux amd64-freebsd amd64-netbsd name 00texlive.installer category TLCore -revision 55050 +revision 55072 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 @@ -6973,31 +6973,30 @@ catalogue-version 0.3 name 2up category Package -revision 41578 +revision 55076 catalogue twoup-gen shortdesc Macros to print two-up relocated 1 longdesc The 2up package offers considerable flexibility as to paper longdesc size and layout, and produces a standard dvi file without longdesc involving additional dvi or PostScript filters. -containersize 4192 -containerchecksum b7844f246ef486d68babff92f2f648ef6b2eab28dbf8d22f649b2c9c26fc857b05f475e766a0c9b4c4cb5be1224afc690c22d19865e9efb9f4e75a8ff6d9dda8 -doccontainersize 62740 -doccontainerchecksum c8569e5cec43525d6814816f7fdaa6bc9ce0ea810fd6be60da992c251fcfaaf4c5229a1956c1fc3e6675ea5dfb4529267acc5f198053a80902b69b25a1464b75 -docfiles size=24 +containersize 4200 +containerchecksum 6408d1d99a97df71640bcdde4133edc2e5861bbcdc8c5e1be98d5704f7ecf9c043c5538ea19ac4952d811e3677ee0698bdd477eadbd1068725bdb210787d9dbc +doccontainersize 52456 +doccontainerchecksum 3375cfbd95412f2fde2bdb9171b1c081890a52168d0c6d0f0dfb0ad914117c79291a56bc97602627a698509635765fd5e6e95387a006039178e440a8bea24837 +docfiles size=19 RELOC/doc/generic/2up/2up-doc.pdf details="Package documentation" RELOC/doc/generic/2up/2up-doc.tex RELOC/doc/generic/2up/Changes - RELOC/doc/generic/2up/Makefile - RELOC/doc/generic/2up/README + RELOC/doc/generic/2up/README details="Readme" runfiles size=4 RELOC/tex/generic/2up/2up.sty RELOC/tex/generic/2up/2up.tex catalogue-also twoupltx catalogue-ctan /macros/generic/2up -catalogue-license other-free +catalogue-license lppl catalogue-topics layout -catalogue-version 1.2 +catalogue-version 1.3a name Asana-Math category Package @@ -35378,7 +35377,7 @@ catalogue-version 1.0 name biblatex-ext category Package -revision 55033 +revision 55078 shortdesc Extended BibLaTeX standard styles relocated 1 longdesc The BibLaTeX-ext bundle provides styles that slightly extend @@ -35388,10 +35387,10 @@ longdesc stylistic decisions made in the standard styles. At the same longdesc time they stay as close to their standard counterparts as longdesc possible, so that most customisation methods can be applied longdesc here as well. -containersize 26280 -containerchecksum 83f5a8727e35a876c8ba52f02abca2cb90ed3171960914faf0d3149f6ef47783949302a72a6f7e44c336c47aef00260529fde764228c5adbaef94a1be9767f46 -doccontainersize 581528 -doccontainerchecksum 39962360d63db1e979eb8dfd1fe8df95b2f4739e8901cf87892e9a0d60d3809e0ca01746b72a194e98de7ef7e68de9918d2ccf22bb9142f7fe334943558a0b30 +containersize 26304 +containerchecksum a559fe297ddbba5d7f1703f8f093450e56c7123f7d003f3fb0b50298a3caa144e54b3d7fd17ffe12339a227db33e12e4737dd5d0e8b49683c85e6144fa62d3a5 +doccontainersize 581820 +doccontainerchecksum de2ea3fd351dae2c786556636cb6842c145369afc3f05ea7f2c7dedf5c7c5689863122786199e3707cd02f61c450d70d167476703540cdd0bd61cb6c937fb747 docfiles size=174 RELOC/doc/latex/biblatex-ext/CHANGES.md RELOC/doc/latex/biblatex-ext/README.md details="Readme" @@ -35476,7 +35475,7 @@ catalogue-contact-home https://github.com/moewew/biblatex-ext catalogue-ctan /macros/latex/contrib/biblatex-contrib/biblatex-ext catalogue-license lppl1.3c catalogue-topics biblatex -catalogue-version 0.8e +catalogue-version 0.8f name biblatex-fiwi category Package @@ -176040,17 +176039,17 @@ catalogue-version 2.5 name logix category Package -revision 54512 -shortdesc Supplement to the Unicode math symbols providing over 3,000 symbols +revision 55077 +shortdesc Supplement to the Unicode math symbols relocated 1 -longdesc The package provides a Unicode font with over 3,000 symbols to +longdesc The package provides a Unicode font with over 4,000 symbols to longdesc supplement the Unicode math symbols. It is compatible with and longdesc complements the AMS STIX2 math fonts, but focuses on new longdesc symbols and symbol variants more suited to work in logic. -containersize 1371424 -containerchecksum 1d56e6257fdc78aaf4b90e92c8148acab2a7153e8e48a2cbf606dec7695fdc5a4a2dffbb242deb627368ce9470abc3fed5031054eb0dd5b37a1798176fa9fb73 -doccontainersize 1247836 -doccontainerchecksum bc6f6271598c29eb8072dfdaedf6ea7bc7dcec279cbbf54819235f03d30c9b913702ec2474871ae07e760bc2a5b0e2072f7be3facb9ea14f2d6e3e3743fd9b5a +containersize 1371584 +containerchecksum 87f65786a0236d850c3de66a3799dca4df94dde88c6560205f9fc0f1620d1af3e296f2ed44bc9ebe3c720f06c26747a5bc61b70f973944e1f6729b3bd4f70ab2 +doccontainersize 1247984 +doccontainerchecksum ab3d7fc13ea93610453513f062895023719f2c9ccc113689316442c46a0c0a08d1aa9ed455644215025c6e33001921e93ee9bad2846337458e127af05b437859 docfiles size=1225 RELOC/doc/fonts/logix/CHANGELOG RELOC/doc/fonts/logix/README details="Readme" @@ -176059,7 +176058,7 @@ docfiles size=1225 RELOC/doc/fonts/logix/logix.pdf details="Package documentation" RELOC/doc/fonts/logix/logix.tex RELOC/doc/fonts/logix/logix.vfc -runfiles size=585 +runfiles size=586 RELOC/fonts/opentype/public/logix/logix.otf RELOC/fonts/opentype/public/logix/logix.woff RELOC/fonts/opentype/public/logix/logix.woff2 @@ -176068,7 +176067,7 @@ runfiles size=585 catalogue-ctan /fonts/logix catalogue-license ofl lppl1.3c catalogue-topics font font-otf -catalogue-version 1.02 +catalogue-version 1.03 name logpap category Package @@ -178461,10 +178460,10 @@ binfiles arch=i386-solaris size=1712 name luahbtex.win32 category TLCore -revision 55067 +revision 55073 shortdesc win32 files of luahbtex -containersize 1546416 -containerchecksum 894dd612139030261b5320644d77ebf6e65b349646dcbc216c5f1201bb064212d8af521c9cdd0659b75ea3d45c04257b4a05dd2d8cb40a243af1790b3c6deaa4 +containersize 1550472 +containerchecksum 5e395b24bd9e710be88f1f2e2a3bd18022daf3cf1e2be18d27192eccea50f5ddaa122c6ae8cd4cce6b54d3a8608ae9e119d0dbf25d1e37aa2da8a986aa0a0c70 binfiles arch=win32 size=1437 bin/win32/luahbtex.dll bin/win32/luahbtex.exe @@ -179008,10 +179007,10 @@ binfiles arch=i386-solaris size=3234 name luajittex.win32 category TLCore -revision 55068 +revision 55073 shortdesc win32 files of luajittex -containersize 2158556 -containerchecksum 3d29a004cdd46b621bb01f9acd20af133ee9cb2e6cb32ce9d15d52bf64148a1f6d475c6481135dacff6d8440c4b0561110257acaa9af3c5b29863edc399a0ff8 +containersize 2186820 +containerchecksum d1649342c5f398c1b843a392a7109760abeac59dbb3047d09d3c35c38450247cf6c705165334ef5fa48211871ee5686f19e66f91dd6237bd5840e6de6081ed4a binfiles arch=win32 size=3055 bin/win32/luajit51.dll bin/win32/luajithbtex.dll @@ -179887,10 +179886,10 @@ binfiles arch=i386-solaris size=1432 name luatex.win32 category TLCore -revision 55067 +revision 55073 shortdesc win32 files of luatex -containersize 1824220 -containerchecksum 29e1772b2122506dadf548fb0e61dd9f73c16456c48f501f71597f7e89a1a68a5fe7eb417c65dca8e84752eef762020a38707ff230a12f743c5dbdc6e1384401 +containersize 1819916 +containerchecksum 2e22def143606949b8eab4ce7a0850768e1d78ed9bccdfc35db54f6caabb22788f324c323c4b9f51827463f3c5e848c62821beef24d00ead81078d7c03f49232 binfiles arch=win32 size=1684 bin/win32/api-ms-win-core-file-l1-2-0.dll bin/win32/api-ms-win-core-file-l2-1-0.dll @@ -205919,7 +205918,7 @@ catalogue-topics font font-type1 font-decor name nicematrix category Package -revision 54758 +revision 55079 shortdesc Improve the typesetting of mathematical matrices with PGF relocated 1 longdesc This package provides new environments similar to the @@ -205934,26 +205933,26 @@ longdesc a control over the width of the columns and the possibility to longdesc add an exterior line and an exterior column. nicematrix longdesc requires and loads amsmath, array, expl3, l3keys2e, xparse, longdesc pgf, as well as the TikZ library fit. -containersize 16036 -containerchecksum 8693a9ba6f0a7fc2e306ce3bfc490b465ea93062940040346443edc29cd258ddbcce3b5d505b3be77400948448a1872db8b9dbbb8f762bb2de540cf4630ba7cb -doccontainersize 1139268 -doccontainerchecksum 3334d98d084fdb205509f46f5ca893b206aec59be1c44e24e26aab5fa4ddac8fa6c316199b6d77ff8511869a03c1b54cc9145250c84c1fabec6d536cd4c514ee -docfiles size=309 +containersize 18160 +containerchecksum 15ee802bfe36a5973bac24f3eec50078483ae37f8f85c410801acdbcc2ee4e8c5e40409b96adfa3d067edb27a5e96a8b31ac326da04dcb3609f824b6d7c175d4 +doccontainersize 1176436 +doccontainerchecksum 19d5b103c87ecde489325dc36eb1860e3ee761182c388b7a2a7e819e98d9bc7227b611778342cd613240829814b3218895589bcadf9e5410e754974a90dda2ca +docfiles size=320 RELOC/doc/latex/nicematrix/README.md details="Readme" RELOC/doc/latex/nicematrix/nicematrix-french.pdf details="Package documentation in French" language="fr" RELOC/doc/latex/nicematrix/nicematrix-french.tex RELOC/doc/latex/nicematrix/nicematrix.pdf details="Package documentation" -srccontainersize 56648 -srccontainerchecksum c26953d44e50d352a7cfa931c347113ba8fe34ccf0901f4e6674702a180de46fba71414f8f4c7b0f3a8f6a779e164036ad79982aee1e2d7af17bb7d11c0d8abd -srcfiles size=81 +srccontainersize 62052 +srccontainerchecksum 67ae5b82194e81f4cd98582cb7a3cd682c4d67e0286479710ad95268b92b67e86753a5bea23cd39ebb18514b1facf2fb80baca4ae5d4d25b149606827d473b89 +srcfiles size=91 RELOC/source/latex/nicematrix/nicematrix.dtx RELOC/source/latex/nicematrix/nicematrix.ins -runfiles size=31 +runfiles size=38 RELOC/tex/latex/nicematrix/nicematrix.sty catalogue-ctan /macros/latex/contrib/nicematrix catalogue-license lppl1.3 catalogue-topics maths matrix pgf-tikz expl3 -catalogue-version 3.15 +catalogue-version 4.0 name nicetext category Package @@ -289312,7 +289311,7 @@ docfiles size=368 name texlive-scripts category TLCore -revision 55050 +revision 55072 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. @@ -289320,10 +289319,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 132428 -containerchecksum d31a6cefd98e474f409a699ab5eeccabfb3c11c4c6e90e229a0d2101427e95e3e35c735324435eda6f9095c972b6aa58120ffe512971e92043f6d3b0e862607b +containersize 132452 +containerchecksum 282cbf7117c2f7b24eb32481cc0b920f51318c21f78e4930542530b01f7689394e67398f37573cb2ff8df5c24fcd08c7acba3ba0e9d8638f2f5693b9a356dd68 doccontainersize 219376 -doccontainerchecksum 5c1cbbb49eb812aee2eb1efdf71d561e48e8a670dc88905df5253c805a9e5e84d124893d4e4d2523af1c33f66fbfe4273b4cf70264bda54fe38a6391e4d51ea0 +doccontainerchecksum 854067afb72f38d9b4c8cfd6984561bb9806c535e593738f297e68a0932183d4e0960afbd2683295bb07acd44d2a168d348f93c307a47047b55700af46ad453b docfiles size=141 texmf-dist/doc/man/man1/fmtutil-sys.1 texmf-dist/doc/man/man1/fmtutil-sys.man1.pdf diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 index 543f8984f6..b0959d91c8 100644 --- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 +++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 @@ -1 +1 @@ -4c6c8f0ffd2398a1a399d04caceb719a texlive.tlpdb +d505ae673b2d67e70cdcfc0db69142f2 texlive.tlpdb diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 index d056211ed2..362641681d 100644 --- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 +++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 @@ -1 +1 @@ -df71ccb336c7a53630496d32dbfe8890ead8f5914ada56273857aa4a61f099520de5c76217e25f73a52f5afe726014b7eaa20ca7d01bc03eeccceb53a63fa912 texlive.tlpdb +699c713e0ef69696d7d2bc1be0ed1bf31f9e3cab6a096feec10f156de4a91fc25c4493d958139b3f2ec4b367d22f211b764bebe9e012fbd8923a9e4dbe60f3e3 texlive.tlpdb diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc index a322e30a18..9fc7ff51f6 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----- -iQEcBAEBCgAGBQJetfEXAAoJEEzhh34ZQ4xwBoAH/3tgAqybhwU9oJ0t4pI9MvzK -2C1jJiUCCBHXlQ4MC+A/JIAXxFGicjowJsmoO9xsAOF64mFL7QA5zXNwxbiBkWWs -YpPdcPPX57oLOmqvmL9V4g74u5aiJqD5FQ2l1zmrjtx6gwb2hgpykLNI60syU1kj -cqpzgyBC3Q7NBsPqitk5TlG71oDeUHAMgNYXFZ0V4CNjnFK3FINMQfASohaWI2N9 -ig1gFrzuPrLRWDPNmTF41O2CuCAewlPMbuQqPDvb2p/Ty8ridlm9TJjHcjp+keqP -rlj5bW84X2tsTxnaKch6gouNEycgSiqrWoFa7256J99VDihzhTudE37mTVj/1eQ= -=kkwV +iQEcBAEBCgAGBQJet0KkAAoJEEzhh34ZQ4xwm2QH/0ABRdu03vm5BoZQDRKliyHq +6CZPbSUkUxTU3+3/skkBImMjaiW7XNl1QqRaeLrpM399sl+hXfHZ+TZXHg0Ky4CI +2qW6iZ7jpwXiURdRn4K7hIxIY8S1gcVMMZqSwUj4GsJnTvrRweKlwRW5hAaTZsdj +cHRQfH9qPWOZk9mY/EvUhTdhnYQfiKmWXJwtX7Ue+n+Gl+Wxr+9i8ibaGMnx1rH4 +npDOHBnojmZ6Is3CNW/3WcoJNATNLp68mYhFWHI2DvKv72E295Sbs84rIbZgIN4/ +JCN7BPS2m5PgkM6oSnqHl2xVhRyznJpYWbit7rvAq2CK5twLRYhRozHKHkBjTuI= +=C3sd -----END PGP SIGNATURE----- diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz index 5a3cca1c72..76a9385830 100644 Binary files a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz and b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz differ diff --git a/systems/win32/miktex/tm/packages/next/pr.ini b/systems/win32/miktex/tm/packages/next/pr.ini index 0de451d2fd..69d4c86986 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=1588968895 +date=1589055281 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=220cdc849e36be98600ee071fdffa50c +lstdigest=de7b23f80bbae9c7d04e03a5179e61eb numpkg=3901 relstate=next -version=7433 +version=7434 ;;;;This configuration file is signed by a MiKTeX maintainer. The signature follows. ;;;;-----BEGIN MIKTEX SIGNATURE----- -;;;; signature/miktex: TEOBnYg3zjDIT8N4qDMHeEEj+zPs32rCZi/0xC/sgo4MuZi6Y51IZO/zV7sgwgsTesJyrn9eIARyOifEPlFDgngA1mLgWj9pmyCJ3oF81h2dQSIm37+xHSut91aKaCoktBUtCbRfmhUxbJE2zi0zzkl6KPZbV4Gf+rt4ispmMv9Usf6W7qHp9PhlJfWCX9jjzngg4poOqHNIok3MJioevZuDt4zVIeUM4z9oIAX9NXtpvhh/KyyqLj1HfDsseDhaemvlFoglroRzyOBN5GZYoX9LM/Q+entBILAgwQuc8FEb0dW5DtdGuqJ5uCOIfWsTg06V6I+6Bp7WpoAcWQ/WlQ== +;;;; signature/miktex: S7CKq3jbIxId33HALDIpHHucjgCDCh00HdllQ+EWp5MTJjHwRUrn1Gv0cchYRPxPBpE+OSZECqZIa2AgKbbX3LoO7HhaIBE1/Uct7ZKEqoTBBmmXWFR7sDrI4ZOjg5g4D0KK38iqnkoEDzsfzkpx/rdnpez/V+Y9XoUj37mGNY1pHmkdMYK/3+EB8KGteqYwsPXrCpjNuHvbYedIxXZKXYc5jLKELH7MyyZNN4u0rhevDnZEQKdxORSS0KFxhbCG0EFAd8aRFmAifcHXK20saRG7iMMFGqe6TawqWj2E1YcvCY/B3TOpGhU3xoUFbEPZ9UafNd2omkZITpPfDdBy6Q== ;;;;-----END MIKTEX SIGNATURE----- diff --git a/systems/win32/miktex/tm/packages/pr.ini b/systems/win32/miktex/tm/packages/pr.ini index ea0d3f51d9..49070669cb 100644 --- a/systems/win32/miktex/tm/packages/pr.ini +++ b/systems/win32/miktex/tm/packages/pr.ini @@ -1,13 +1,13 @@ [repository] -date=1588968677 +date=1589055069 lastupd=achemso animate beamer endofproofwd jfmutil libertinus media9 optex abnt acmart acro apa7 babel babel-portuges biblatex-apa6 biblatex-ext biblatex-software chemfig comicneue ctex -lstdigest=d5cd4753317a3c371321b8e73029c0bb +lstdigest=ff8930dec621fbe227b64df94bb49e15 numpkg=3901 relstate=stable -version=7433 +version=7434 ;;;;This configuration file is signed by a MiKTeX maintainer. The signature follows. ;;;;-----BEGIN MIKTEX SIGNATURE----- -;;;; signature/miktex: e/Qwvg4FlodHLEbygZG9QLKEVGSoAXiZBy1tKmfOSSAHwkVPX9HFazIcq6rLGWBeH19YUARwWj0HtGmEiUx5b3cR9SPQ6DZTopjSgcKdp7r2dFug2aDp095CUHzScWaK2DsBpn+eEKOHBZp7eyEXrQ0x/SHJ8XCqkgmcNGPypN9ak8L4cITqXBM9pLUhkoVQPyTGGRqFfBQNSflUp45a5n31pjAiihMUZStuyZy4Ki7fAIwp0b0xyz+1XW6DxsDgf0XCrkDXiV9+ZOtie/PEjXAnmjpYa01K12sw1YainfY9+3KtlkvRQfXYlcFmNN1+iopfaAQXcDJFDsI9jXlt6Q== +;;;; signature/miktex: azZ6qjLqUQWbAPjZaMjCZaiaXzeF4iH2sd29WQnby7ppm4OwbapshtlrjAjSal1rQx6Kil9MxzR/CxJmFXfDe9ACkJeblaNROo1Ncs11aNhoC03Jr5k872W+t7C9geNlp0psS/JBcim20kQmQkPOytxO7VXXAGTJRNxhDZwCC7UpMtA6RXBtTnJJEUL+9A+Cjg2lxyxwIkFoqsvDKulMDu1Mp9gLiEFH4FyU5XDQz1BC+houx7hXVidDxwM8gE/jFZqGKKs4+tiTCnVn1dJOvhnSlYqDLtpaYcmTukzquZrEMOqVhd6G8EjEGy9O3lsICL6P1LzniszdeqXAmo+xdQ== ;;;;-----END MIKTEX SIGNATURE----- diff --git a/systems/win32/w32tex/ChangeLog b/systems/win32/w32tex/ChangeLog index e5fe42f3e2..95f3763ac4 100644 --- a/systems/win32/w32tex/ChangeLog +++ b/systems/win32/w32tex/ChangeLog @@ -1,5 +1,35 @@ W32TeX (x86 & x64) ChangeLog +[2020/05/09] +(01) context.tar.xz + ConTeXt version: 2020.05.08 20:46. +(02) luajittex-dev-w32.tar.xz + Update lluajittex.dll, and luajithbtex.dll. +(03) luajittex-exp-w32.tar.xz + Update lluajittex.dll, and luajithbtex.dll. +(04) luajittex-w32.tar.xz + Update lluajittex.dll, and luajithbtex.dll. +(05) luatex-dev-w32.tar.xz + Update luatex.dll, and luahbtex.dll. +(06) luatex-exp-w32.tar.xz + Update luatex.dll, and luahbtex.dll. +(07) luatex-w32.tar.xz + Update luatex.dll, and luahbtex.dll. +(08) win64/context-w64.tar.xz + Update mtxrun.lua. +(09) win64/luajittex-dev-w64.tar.xz + Update lluajittex.dll, and luajithbtex.dll. +(10) win64/luajittex-exp-w64.tar.xz + Update lluajittex.dll, and luajithbtex.dll. +(11) win64/luajittex-w64.tar.xz + Update lluajittex.dll, and luajithbtex.dll. +(12) win64/luatex-dev-w64.tar.xz + Update luatex.dll, and luahbtex.dll. +(13) win64/luatex-exp-w64.tar.xz + Update luatex.dll, and luahbtex.dll. +(14) win64/luatex-w64.tar.xz + Update luatex.dll, and luahbtex.dll. + [2020/05/08] (01) aleph-w32.tar.xz Update format files. diff --git a/timestamp b/timestamp index 3fe95bf7c6..abb4aca85e 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: -2020-05-09-02-02 +2020-05-10-02-02 -- cgit v1.2.3