summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--FILES.byname554
-rw-r--r--FILES.byname.gzbin2335539 -> 2335603 bytes
-rw-r--r--FILES.last07days523
-rw-r--r--graphics/pstricks/contrib/pst-geo/Changes1
-rw-r--r--graphics/pstricks/contrib/pst-geo/README7
-rw-r--r--graphics/pstricks/contrib/pst-geo/data/README.data (renamed from graphics/pstricks/contrib/pst-geo/data/README)0
-rw-r--r--graphics/pstricks/contrib/pst-geo/doc/pst-geo-doc.bib32
-rw-r--r--graphics/pstricks/contrib/pst-geo/doc/pst-geo-doc.pdfbin63444975 -> 63597939 bytes
-rw-r--r--graphics/pstricks/contrib/pst-geo/doc/pst-geo-doc.tex9
-rw-r--r--graphics/pstricks/contrib/pst-geo/tex/pst-geo.tex39
-rw-r--r--macros/latex/contrib/covington/README5
-rw-r--r--macros/latex/contrib/covington/covington.pdfbin487245 -> 495582 bytes
-rw-r--r--macros/latex/contrib/covington/covington.sty28
-rw-r--r--macros/latex/contrib/covington/covington.tex42
-rw-r--r--macros/latex/contrib/styledcmd/styledcmd.dtx87
-rw-r--r--macros/latex/contrib/styledcmd/styledcmd.pdfbin333336 -> 338113 bytes
-rw-r--r--macros/latex/contrib/tabularray/tabularray-2021.sty955
-rw-r--r--macros/latex/contrib/tabularray/tabularray.pdfbin680990 -> 725112 bytes
-rw-r--r--macros/latex/contrib/tabularray/tabularray.sty640
-rw-r--r--macros/latex/contrib/tabularray/tabularray.tex264
-rw-r--r--macros/latex/contrib/uni-titlepage/README.md2
-rw-r--r--macros/latex/contrib/uni-titlepage/titlepage-DHBW.pdfbin43998 -> 43998 bytes
-rw-r--r--macros/latex/contrib/uni-titlepage/titlepage-JT-Aufsaetze.pdfbin41265 -> 41265 bytes
-rw-r--r--macros/latex/contrib/uni-titlepage/titlepage-JT-Geschichte.pdfbin38251 -> 38251 bytes
-rw-r--r--macros/latex/contrib/uni-titlepage/titlepage-JT-Typography.pdfbin26903 -> 26903 bytes
-rw-r--r--macros/latex/contrib/uni-titlepage/titlepage-KIT.pdfbin42149 -> 42149 bytes
-rw-r--r--macros/latex/contrib/uni-titlepage/titlepage-KOMAScript.pdfbin166494 -> 166494 bytes
-rw-r--r--macros/latex/contrib/uni-titlepage/titlepage-Markus-1.pdfbin119780 -> 119780 bytes
-rw-r--r--macros/latex/contrib/uni-titlepage/titlepage-Markus-2.pdfbin128796 -> 128796 bytes
-rw-r--r--macros/latex/contrib/uni-titlepage/titlepage-Spacer.pdfbin127996 -> 127996 bytes
-rw-r--r--macros/latex/contrib/uni-titlepage/titlepage-TU-DD.pdfbin40396 -> 40396 bytes
-rw-r--r--macros/latex/contrib/uni-titlepage/titlepage-TU-HH.pdfbin54017 -> 54017 bytes
-rw-r--r--macros/latex/contrib/uni-titlepage/titlepage-UKoLa.pdfbin0 -> 103389 bytes
-rw-r--r--macros/latex/contrib/uni-titlepage/titlepage-WWUM.pdfbin58935 -> 58935 bytes
-rw-r--r--macros/latex/contrib/uni-titlepage/uni-titlepage.dtx480
-rw-r--r--macros/latex/contrib/uni-titlepage/uni-titlepage.pdfbin841219 -> 865279 bytes
-rw-r--r--macros/latex/contrib/univie-ling/README9
-rw-r--r--macros/latex/contrib/univie-ling/biblatex-univie-ling/univie-ling.bbx71
-rw-r--r--macros/latex/contrib/univie-ling/biblatex-univie-ling/univie-ling.cbx2
-rw-r--r--macros/latex/contrib/univie-ling/doc/univie-ling-expose.pdfbin444398 -> 454611 bytes
-rw-r--r--macros/latex/contrib/univie-ling/doc/univie-ling-expose.tex4
-rw-r--r--macros/latex/contrib/univie-ling/doc/univie-ling-paper.pdfbin438985 -> 449239 bytes
-rw-r--r--macros/latex/contrib/univie-ling/doc/univie-ling-paper.tex16
-rw-r--r--macros/latex/contrib/univie-ling/doc/univie-ling-thesis.pdfbin442828 -> 452978 bytes
-rw-r--r--macros/latex/contrib/univie-ling/doc/univie-ling-thesis.tex4
-rw-r--r--macros/latex/contrib/univie-ling/doc/univie-ling-wlg.pdfbin331535 -> 340523 bytes
-rw-r--r--macros/latex/contrib/univie-ling/doc/univie-ling-wlg.tex3
-rw-r--r--macros/latex/contrib/univie-ling/tex/univie-ling-expose.cls2
-rw-r--r--macros/latex/contrib/univie-ling/tex/univie-ling-paper.cls7
-rw-r--r--macros/latex/contrib/univie-ling/tex/univie-ling-thesis.cls2
-rw-r--r--macros/latex/contrib/univie-ling/tex/univie-ling-wlg.cfg2
-rw-r--r--macros/latex/contrib/univie-ling/tex/univie-ling-wlg.cls2
-rw-r--r--systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl1
-rw-r--r--systems/texlive/tlnet/tlpkg/texlive.tlpdb161
-rw-r--r--systems/texlive/tlnet/tlpkg/texlive.tlpdb.md52
-rw-r--r--systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha5122
-rw-r--r--systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc14
-rw-r--r--systems/texlive/tlnet/tlpkg/texlive.tlpdb.xzbin2332120 -> 2332764 bytes
-rw-r--r--systems/win32/TLW64/00README.TLW6453
-rw-r--r--systems/win32/miktex/tm/packages/next/pr.ini8
-rw-r--r--systems/win32/miktex/tm/packages/pr.ini8
-rw-r--r--timestamp2
62 files changed, 2741 insertions, 1302 deletions
diff --git a/FILES.byname b/FILES.byname
index a1200a8b14..6079892c3e 100644
--- a/FILES.byname
+++ b/FILES.byname
@@ -5105,7 +5105,7 @@
1990/10/02 | 5440 | dviware/vutex/vaxvms.hlp
1990/10/02 | 812 | dviware/vutex/vaxvms.ins
1990/10/02 | 127576 | dviware/vutex/vutex.web
-2021/08/31 | 75773 | FILES.last07days
+2021/09/01 | 89274 | FILES.last07days
2021/07/24 | 1139410 | fonts/aboensis/Aboensis.glyphs
2021/07/24 | 18907382 | fonts/aboensis/aboensis.pdf
2021/07/24 | 137860 | fonts/aboensis/Aboensis-Regular.otf
@@ -147146,7 +147146,7 @@
2014/07/14 | 800 | graphics/pstricks/contrib/pst-gantt/README
2014/12/14 | 7447 | graphics/pstricks/contrib/pst-gantt/tex/pst-gantt.tex
2014/12/15 | 95865 | graphics/pstricks/contrib/pst-gantt.zip
-2016/12/08 | 589 | graphics/pstricks/contrib/pst-geo/Changes
+2021/09/01 | 636 | graphics/pstricks/contrib/pst-geo/Changes
2016/12/08 | 430869 | graphics/pstricks/contrib/pst-geo/data/africa-bdy_II.dat
2016/12/08 | 1208423 | graphics/pstricks/contrib/pst-geo/data/africa-cil_II.dat
2016/12/08 | 2190429 | graphics/pstricks/contrib/pst-geo/data/africa-riv_II.dat
@@ -147183,7 +147183,7 @@
2016/12/08 | 43780 | graphics/pstricks/contrib/pst-geo/data/plake.dat
2016/12/08 | 10852 | graphics/pstricks/contrib/pst-geo/data/pst-geo-compress.pl
2016/12/08 | 3244 | graphics/pstricks/contrib/pst-geo/data/pst-geo-decompress.pl
-2016/12/08 | 3273 | graphics/pstricks/contrib/pst-geo/data/README
+2016/12/08 | 3273 | graphics/pstricks/contrib/pst-geo/data/README.data
2016/12/08 | 24948 | graphics/pstricks/contrib/pst-geo/data/rhone.dat
2016/12/08 | 20669 | graphics/pstricks/contrib/pst-geo/data/ridge.dat
2016/12/08 | 155831 | graphics/pstricks/contrib/pst-geo/data/river.dat
@@ -147228,11 +147228,11 @@
2016/12/08 | 507 | graphics/pstricks/contrib/pst-geo/doc/examples/EuropeII.tex
2016/12/08 | 49413 | graphics/pstricks/contrib/pst-geo/doc/examples/Greek.pdf
2016/12/08 | 837 | graphics/pstricks/contrib/pst-geo/doc/examples/Greek.tex
-2016/12/08 | 5408 | graphics/pstricks/contrib/pst-geo/doc/pst-geo-doc.bib
-2016/12/08 | 63444975 | graphics/pstricks/contrib/pst-geo/doc/pst-geo-doc.pdf
-2016/12/08 | 37447 | graphics/pstricks/contrib/pst-geo/doc/pst-geo-doc.tex
+2021/09/01 | 4757 | graphics/pstricks/contrib/pst-geo/doc/pst-geo-doc.bib
+2021/09/01 | 63597939 | graphics/pstricks/contrib/pst-geo/doc/pst-geo-doc.pdf
+2021/09/01 | 37423 | graphics/pstricks/contrib/pst-geo/doc/pst-geo-doc.tex
2016/12/07 | 24810 | graphics/pstricks/contrib/pst-geo/dvips/pst-geo.pro
-2016/12/08 | 371 | graphics/pstricks/contrib/pst-geo/latex/pst-geo.sty
+2020/06/07 | 371 | graphics/pstricks/contrib/pst-geo/latex/pst-geo.sty
2017/09/16 | 101 | graphics/pstricks/contrib/pst-geometrictools/Changes.txt
2017/09/16 | 214485 | graphics/pstricks/contrib/pst-geometrictools/pst-geometrictools-doc.pdf
2017/09/16 | 16985 | graphics/pstricks/contrib/pst-geometrictools/pst-geometrictools-doc.tex
@@ -147242,9 +147242,9 @@
2017/09/16 | 51994 | graphics/pstricks/contrib/pst-geometrictools/pst-geometrictools.tex
2017/09/16 | 1042 | graphics/pstricks/contrib/pst-geometrictools/README.md
2017/09/16 | 424849 | graphics/pstricks/contrib/pst-geometrictools.zip
-2016/12/07 | 341 | graphics/pstricks/contrib/pst-geo/README
-2016/12/08 | 42834 | graphics/pstricks/contrib/pst-geo/tex/pst-geo.tex
-2016/12/13 | 157359651 | graphics/pstricks/contrib/pst-geo.zip
+2021/09/01 | 538 | graphics/pstricks/contrib/pst-geo/README
+2021/09/01 | 43110 | graphics/pstricks/contrib/pst-geo/tex/pst-geo.tex
+2021/09/01 | 157496858 | graphics/pstricks/contrib/pst-geo.zip
2005/09/12 | 631 | graphics/pstricks/contrib/pst-gr3d/Changes
2005/09/12 | 32456 | graphics/pstricks/contrib/pst-gr3d/pst-gr3d.dtx
2004/12/07 | 1134 | graphics/pstricks/contrib/pst-gr3d/pst-gr3d.ins
@@ -196215,11 +196215,11 @@
2006/02/23 | 75218 | macros/latex/contrib/coverpage/SimpleSample.pdf
2006/02/23 | 1521 | macros/latex/contrib/coverpage/SimpleSample.tex
2006/02/24 | 300614 | macros/latex/contrib/coverpage.zip
-2021/05/19 | 487245 | macros/latex/contrib/covington/covington.pdf
-2021/05/19 | 32844 | macros/latex/contrib/covington/covington.sty
-2021/05/19 | 57656 | macros/latex/contrib/covington/covington.tex
-2021/05/19 | 5016 | macros/latex/contrib/covington/README
-2021/05/19 | 510313 | macros/latex/contrib/covington.zip
+2021/09/01 | 495582 | macros/latex/contrib/covington/covington.pdf
+2021/09/01 | 33548 | macros/latex/contrib/covington/covington.sty
+2021/09/01 | 59167 | macros/latex/contrib/covington/covington.tex
+2021/09/01 | 5258 | macros/latex/contrib/covington/README
+2021/09/01 | 519091 | macros/latex/contrib/covington.zip
2011/01/27 | 37617 | macros/latex/contrib/cprotect/cprotect.dtx
2011/01/27 | 623268 | macros/latex/contrib/cprotect/cprotect.pdf
2011/01/27 | 1224 | macros/latex/contrib/cprotect/README
@@ -213555,10 +213555,10 @@
2017/03/16 | 325682 | macros/latex/contrib/studenthandouts.zip
2021/08/21 | 32423 | macros/latex/contrib/styledcmd/LICENSE
2021/08/30 | 1564 | macros/latex/contrib/styledcmd/README.md
-2021/08/30 | 17040 | macros/latex/contrib/styledcmd/styledcmd.dtx
+2021/09/01 | 19490 | macros/latex/contrib/styledcmd/styledcmd.dtx
2021/08/30 | 2216 | macros/latex/contrib/styledcmd/styledcmd.ins
-2021/08/30 | 333336 | macros/latex/contrib/styledcmd/styledcmd.pdf
-2021/08/30 | 349022 | macros/latex/contrib/styledcmd.zip
+2021/09/01 | 338113 | macros/latex/contrib/styledcmd/styledcmd.pdf
+2021/09/01 | 354436 | macros/latex/contrib/styledcmd.zip
2007/09/03 | 405 | macros/latex/contrib/subdepth/README
2007/09/03 | 8199 | macros/latex/contrib/subdepth/subdepth.dtx
2007/09/03 | 1653 | macros/latex/contrib/subdepth/subdepth.ins
@@ -214068,11 +214068,11 @@
2009/06/01 | 170381 | macros/latex/contrib/tabularew/tabularew.pdf
2009/06/01 | 150930 | macros/latex/contrib/tabularew.zip
2021/06/10 | 267 | macros/latex/contrib/tabularray/README
-2021/05/25 | 145587 | macros/latex/contrib/tabularray/tabularray-2021.sty
-2021/08/01 | 680990 | macros/latex/contrib/tabularray/tabularray.pdf
-2021/08/01 | 208553 | macros/latex/contrib/tabularray/tabularray.sty
-2021/08/01 | 68115 | macros/latex/contrib/tabularray/tabularray.tex
-2021/08/01 | 637617 | macros/latex/contrib/tabularray.zip
+2021/06/05 | 158209 | macros/latex/contrib/tabularray/tabularray-2021.sty
+2021/09/01 | 725112 | macros/latex/contrib/tabularray/tabularray.pdf
+2021/09/01 | 226421 | macros/latex/contrib/tabularray/tabularray.sty
+2021/09/01 | 74198 | macros/latex/contrib/tabularray/tabularray.tex
+2021/09/01 | 681366 | macros/latex/contrib/tabularray.zip
2005/10/21 | 169 | macros/latex/contrib/tabulary/README
2014/06/21 | 29652 | macros/latex/contrib/tabulary/tabulary.dtx
2003/11/26 | 156 | macros/latex/contrib/tabulary/tabulary.ins
@@ -220976,23 +220976,24 @@
2019/12/15 | 20033 | macros/latex/contrib/uniquecounter/uniquecounter.dtx
2019/12/15 | 291049 | macros/latex/contrib/uniquecounter/uniquecounter.pdf
2019/12/17 | 293276 | macros/latex/contrib/uniquecounter.zip
-2021/08/16 | 1081 | macros/latex/contrib/uni-titlepage/LICENSE.md
-2021/08/16 | 3991 | macros/latex/contrib/uni-titlepage/README.md
-2021/08/16 | 43998 | macros/latex/contrib/uni-titlepage/titlepage-DHBW.pdf
-2021/08/16 | 41265 | macros/latex/contrib/uni-titlepage/titlepage-JT-Aufsaetze.pdf
-2021/08/16 | 38251 | macros/latex/contrib/uni-titlepage/titlepage-JT-Geschichte.pdf
-2021/08/16 | 26903 | macros/latex/contrib/uni-titlepage/titlepage-JT-Typography.pdf
-2021/08/16 | 42149 | macros/latex/contrib/uni-titlepage/titlepage-KIT.pdf
-2021/08/16 | 166494 | macros/latex/contrib/uni-titlepage/titlepage-KOMAScript.pdf
-2021/08/16 | 119780 | macros/latex/contrib/uni-titlepage/titlepage-Markus-1.pdf
-2021/08/16 | 128796 | macros/latex/contrib/uni-titlepage/titlepage-Markus-2.pdf
-2021/08/16 | 127996 | macros/latex/contrib/uni-titlepage/titlepage-Spacer.pdf
-2021/08/16 | 40396 | macros/latex/contrib/uni-titlepage/titlepage-TU-DD.pdf
-2021/08/16 | 54017 | macros/latex/contrib/uni-titlepage/titlepage-TU-HH.pdf
-2021/08/16 | 58935 | macros/latex/contrib/uni-titlepage/titlepage-WWUM.pdf
-2021/08/16 | 117770 | macros/latex/contrib/uni-titlepage/uni-titlepage.dtx
-2021/08/16 | 841219 | macros/latex/contrib/uni-titlepage/uni-titlepage.pdf
-2021/08/16 | 1675826 | macros/latex/contrib/uni-titlepage.zip
+2021/09/01 | 1081 | macros/latex/contrib/uni-titlepage/LICENSE.md
+2021/09/01 | 3991 | macros/latex/contrib/uni-titlepage/README.md
+2021/09/01 | 43998 | macros/latex/contrib/uni-titlepage/titlepage-DHBW.pdf
+2021/09/01 | 41265 | macros/latex/contrib/uni-titlepage/titlepage-JT-Aufsaetze.pdf
+2021/09/01 | 38251 | macros/latex/contrib/uni-titlepage/titlepage-JT-Geschichte.pdf
+2021/09/01 | 26903 | macros/latex/contrib/uni-titlepage/titlepage-JT-Typography.pdf
+2021/09/01 | 42149 | macros/latex/contrib/uni-titlepage/titlepage-KIT.pdf
+2021/09/01 | 166494 | macros/latex/contrib/uni-titlepage/titlepage-KOMAScript.pdf
+2021/09/01 | 119780 | macros/latex/contrib/uni-titlepage/titlepage-Markus-1.pdf
+2021/09/01 | 128796 | macros/latex/contrib/uni-titlepage/titlepage-Markus-2.pdf
+2021/09/01 | 127996 | macros/latex/contrib/uni-titlepage/titlepage-Spacer.pdf
+2021/09/01 | 40396 | macros/latex/contrib/uni-titlepage/titlepage-TU-DD.pdf
+2021/09/01 | 54017 | macros/latex/contrib/uni-titlepage/titlepage-TU-HH.pdf
+2021/09/01 | 103389 | macros/latex/contrib/uni-titlepage/titlepage-UKoLa.pdf
+2021/09/01 | 58935 | macros/latex/contrib/uni-titlepage/titlepage-WWUM.pdf
+2021/09/01 | 128651 | macros/latex/contrib/uni-titlepage/uni-titlepage.dtx
+2021/09/01 | 865279 | macros/latex/contrib/uni-titlepage/uni-titlepage.pdf
+2021/09/01 | 1798920 | macros/latex/contrib/uni-titlepage.zip
2017/10/22 | 466 | macros/latex/contrib/unitn-bimrep/examples/example_bib.bib
2017/10/22 | 354791 | macros/latex/contrib/unitn-bimrep/examples/example_bib.pdf
2017/10/22 | 90526 | macros/latex/contrib/unitn-bimrep/examples/example_bib.png
@@ -221029,8 +221030,8 @@
1998/08/05 | 1143 | macros/latex/contrib/units/units.ins
2005/07/30 | 220961 | macros/latex/contrib/units/units.pdf
2005/07/30 | 216905 | macros/latex/contrib/units.zip
-2020/11/11 | 24225 | macros/latex/contrib/univie-ling/biblatex-univie-ling/univie-ling.bbx
-2020/11/11 | 3545 | macros/latex/contrib/univie-ling/biblatex-univie-ling/univie-ling.cbx
+2021/09/01 | 24259 | macros/latex/contrib/univie-ling/biblatex-univie-ling/univie-ling.bbx
+2021/09/01 | 3545 | macros/latex/contrib/univie-ling/biblatex-univie-ling/univie-ling.cbx
2019/02/15 | 111387 | macros/latex/contrib/univie-ling/doc/templates/template-expose-deutsch.pdf
2019/02/15 | 5231 | macros/latex/contrib/univie-ling/doc/templates/template-expose-deutsch.tex
2019/02/15 | 106622 | macros/latex/contrib/univie-ling/doc/templates/template-expose-english.pdf
@@ -221047,23 +221048,23 @@
2018/02/12 | 2942 | macros/latex/contrib/univie-ling/doc/templates/template-thesis-english.xmpdata
2020/11/11 | 242469 | macros/latex/contrib/univie-ling/doc/templates/template-wlg-article.pdf
2020/11/11 | 1958 | macros/latex/contrib/univie-ling/doc/templates/template-wlg-article.tex
-2020/06/25 | 444398 | macros/latex/contrib/univie-ling/doc/univie-ling-expose.pdf
-2020/06/25 | 24038 | macros/latex/contrib/univie-ling/doc/univie-ling-expose.tex
-2020/06/25 | 438985 | macros/latex/contrib/univie-ling/doc/univie-ling-paper.pdf
-2020/06/25 | 26260 | macros/latex/contrib/univie-ling/doc/univie-ling-paper.tex
-2020/06/25 | 442828 | macros/latex/contrib/univie-ling/doc/univie-ling-thesis.pdf
-2020/06/25 | 29099 | macros/latex/contrib/univie-ling/doc/univie-ling-thesis.tex
-2020/11/11 | 331535 | macros/latex/contrib/univie-ling/doc/univie-ling-wlg.pdf
-2020/11/11 | 11936 | macros/latex/contrib/univie-ling/doc/univie-ling-wlg.tex
-2020/11/11 | 6370 | macros/latex/contrib/univie-ling/README
-2020/11/11 | 20333 | macros/latex/contrib/univie-ling/tex/univie-ling-expose.cls
-2020/11/11 | 23410 | macros/latex/contrib/univie-ling/tex/univie-ling-paper.cls
-2020/11/11 | 22585 | macros/latex/contrib/univie-ling/tex/univie-ling-thesis.cls
-2020/11/11 | 305 | macros/latex/contrib/univie-ling/tex/univie-ling-wlg.cfg
-2020/11/11 | 29726 | macros/latex/contrib/univie-ling/tex/univie-ling-wlg.cls
+2021/09/01 | 454611 | macros/latex/contrib/univie-ling/doc/univie-ling-expose.pdf
+2021/09/01 | 24148 | macros/latex/contrib/univie-ling/doc/univie-ling-expose.tex
+2021/09/01 | 449239 | macros/latex/contrib/univie-ling/doc/univie-ling-paper.pdf
+2021/09/01 | 26371 | macros/latex/contrib/univie-ling/doc/univie-ling-paper.tex
+2021/09/01 | 452978 | macros/latex/contrib/univie-ling/doc/univie-ling-thesis.pdf
+2021/09/01 | 29207 | macros/latex/contrib/univie-ling/doc/univie-ling-thesis.tex
+2021/09/01 | 340523 | macros/latex/contrib/univie-ling/doc/univie-ling-wlg.pdf
+2021/09/01 | 11990 | macros/latex/contrib/univie-ling/doc/univie-ling-wlg.tex
+2021/09/01 | 6663 | macros/latex/contrib/univie-ling/README
+2021/09/01 | 20333 | macros/latex/contrib/univie-ling/tex/univie-ling-expose.cls
+2021/09/01 | 23493 | macros/latex/contrib/univie-ling/tex/univie-ling-paper.cls
+2021/09/01 | 22585 | macros/latex/contrib/univie-ling/tex/univie-ling-thesis.cls
+2021/09/01 | 291 | macros/latex/contrib/univie-ling/tex/univie-ling-wlg.cfg
+2021/09/01 | 29726 | macros/latex/contrib/univie-ling/tex/univie-ling-wlg.cls
2017/01/25 | 93530 | macros/latex/contrib/univie-ling/tex/univie-ling-wlg-logo.pdf
2016/02/11 | 25365 | macros/latex/contrib/univie-ling/tex/univielogo-sw.pdf
-2020/11/11 | 2898872 | macros/latex/contrib/univie-ling.zip
+2021/09/01 | 2933464 | macros/latex/contrib/univie-ling.zip
2019/07/14 | 30359 | macros/latex/contrib/unizgklasa/example.pdf
2019/07/14 | 4187 | macros/latex/contrib/unizgklasa/example.tex
2019/07/14 | 1729 | macros/latex/contrib/unizgklasa/README.md
@@ -264178,10 +264179,11 @@
2021/08/01 | 4655 | support/wp2latex/html2latex.htm
2007/07/22 | 600 | support/wp2latex/readme.1st
2021/08/01 | 7401 | support/wp2latex/readme.txt
-2019/04/17 | 3867842 | support/wp2latex/wp2latex-3.81.zip
+2019/05/22 | 3910264 | support/wp2latex/wp2latex-3.82.zip
+2019/06/14 | 609733 | support/wp2latex/wp2latex_deb-3.82.tgz
2018/01/26 | 45297 | support/wp2latex/wp2latex.doc.htm
2018/01/26 | 7259 | support/wp2latex/wp2latex.faq
-2019/04/11 | 893954 | support/wp2latex/WP2LaTeX_Installer-3.81.exe
+2019/05/22 | 898897 | support/wp2latex/WP2LaTeX_Installer-3.82.exe
2021/08/01 | 1241 | support/wp2latex/wp2latex.lsm
2018/01/26 | 35145 | support/wp2latex/wp2latex_pas-2.3.zip
2000/02/22 | 481 | support/wsuipa2tipa/README
@@ -267569,8 +267571,8 @@
2019/02/28 | 16432 | systems/texlive/tlnet/archive/biblatex-dw.r42649.tar.xz
2019/02/28 | 2284 | systems/texlive/tlnet/archive/biblatex-enc.doc.r44627.tar.xz
2019/02/28 | 8476 | systems/texlive/tlnet/archive/biblatex-enc.r44627.tar.xz
-2021/06/10 | 866312 | systems/texlive/tlnet/archive/biblatex-ext.doc.r59532.tar.xz
-2021/06/10 | 27124 | systems/texlive/tlnet/archive/biblatex-ext.r59532.tar.xz
+2021/09/01 | 865704 | systems/texlive/tlnet/archive/biblatex-ext.doc.r60379.tar.xz
+2021/09/01 | 27144 | systems/texlive/tlnet/archive/biblatex-ext.r60379.tar.xz
2019/02/28 | 595408 | systems/texlive/tlnet/archive/biblatex-fiwi.doc.r45876.tar.xz
2019/02/28 | 16768 | systems/texlive/tlnet/archive/biblatex-fiwi.r45876.tar.xz
2021/08/21 | 1603644 | systems/texlive/tlnet/archive/biblatex-gb7714-2015.doc.r60286.tar.xz
@@ -268808,8 +268810,8 @@
2019/02/28 | 70668 | systems/texlive/tlnet/archive/context-transliterator.r47085.tar.xz
2019/02/28 | 77364 | systems/texlive/tlnet/archive/context-typearea.doc.r47085.tar.xz
2019/02/28 | 1796 | systems/texlive/tlnet/archive/context-typearea.r47085.tar.xz
-2019/02/28 | 648 | systems/texlive/tlnet/archive/context-typescripts.doc.r47085.tar.xz
-2019/02/28 | 9224 | systems/texlive/tlnet/archive/context-typescripts.r47085.tar.xz
+2021/09/01 | 644 | systems/texlive/tlnet/archive/context-typescripts.doc.r60378.tar.xz
+2021/09/01 | 7436 | systems/texlive/tlnet/archive/context-typescripts.r60378.tar.xz
2021/02/25 | 472 | systems/texlive/tlnet/archive/context.universal-darwin.r57908.tar.xz
2021/07/24 | 10808 | systems/texlive/tlnet/archive/context-vim.doc.r60025.tar.xz
2021/07/24 | 10116 | systems/texlive/tlnet/archive/context-vim.r60025.tar.xz
@@ -274281,16 +274283,16 @@
2019/02/28 | 364 | systems/texlive/tlnet/archive/musixtex.amd64-freebsd.r37026.tar.xz
2019/02/28 | 364 | systems/texlive/tlnet/archive/musixtex.amd64-netbsd.r37026.tar.xz
2019/02/28 | 364 | systems/texlive/tlnet/archive/musixtex.armhf-linux.r37026.tar.xz
-2021/08/30 | 2359792 | systems/texlive/tlnet/archive/musixtex.doc.r60367.tar.xz
-2021/06/08 | 105336 | systems/texlive/tlnet/archive/musixtex-fonts.doc.r59507.tar.xz
-2021/06/08 | 4600340 | systems/texlive/tlnet/archive/musixtex-fonts.r59507.tar.xz
+2021/09/01 | 2151512 | systems/texlive/tlnet/archive/musixtex.doc.r60382.tar.xz
+2021/09/01 | 312992 | systems/texlive/tlnet/archive/musixtex-fonts.doc.r60381.tar.xz
+2021/09/01 | 5066212 | systems/texlive/tlnet/archive/musixtex-fonts.r60381.tar.xz
2019/02/28 | 360 | systems/texlive/tlnet/archive/musixtex.i386-cygwin.r37026.tar.xz
2019/02/28 | 364 | systems/texlive/tlnet/archive/musixtex.i386-freebsd.r37026.tar.xz
2019/02/28 | 360 | systems/texlive/tlnet/archive/musixtex.i386-linux.r37026.tar.xz
2019/02/28 | 360 | systems/texlive/tlnet/archive/musixtex.i386-netbsd.r37026.tar.xz
2019/02/28 | 364 | systems/texlive/tlnet/archive/musixtex.i386-solaris.r22187.tar.xz
-2021/08/30 | 572980 | systems/texlive/tlnet/archive/musixtex.r60367.tar.xz
-2021/08/30 | 9012 | systems/texlive/tlnet/archive/musixtex.source.r60367.tar.xz
+2021/09/01 | 104420 | systems/texlive/tlnet/archive/musixtex.r60382.tar.xz
+2021/09/01 | 9012 | systems/texlive/tlnet/archive/musixtex.source.r60382.tar.xz
2021/02/25 | 360 | systems/texlive/tlnet/archive/musixtex.universal-darwin.r57908.tar.xz
2019/02/28 | 704 | systems/texlive/tlnet/archive/musixtex.win32.r37026.tar.xz
2019/02/28 | 364 | systems/texlive/tlnet/archive/musixtex.x86_64-cygwin.r37026.tar.xz
@@ -275588,8 +275590,8 @@
2019/02/28 | 378272 | systems/texlive/tlnet/archive/productbox.doc.r20886.tar.xz
2019/02/28 | 4944 | systems/texlive/tlnet/archive/productbox.r20886.tar.xz
2019/02/28 | 15512 | systems/texlive/tlnet/archive/productbox.source.r20886.tar.xz
-2021/08/23 | 4735516 | systems/texlive/tlnet/archive/profcollege.doc.r60301.tar.xz
-2021/08/23 | 99500 | systems/texlive/tlnet/archive/profcollege.r60301.tar.xz
+2021/09/01 | 5107464 | systems/texlive/tlnet/archive/profcollege.doc.r60380.tar.xz
+2021/09/01 | 102072 | systems/texlive/tlnet/archive/profcollege.r60380.tar.xz
2019/02/28 | 49880 | systems/texlive/tlnet/archive/program.doc.r44214.tar.xz
2019/02/28 | 11780 | systems/texlive/tlnet/archive/program.r44214.tar.xz
2019/02/28 | 86236 | systems/texlive/tlnet/archive/progressbar.doc.r33822.tar.xz
@@ -277657,7 +277659,7 @@
2020/05/17 | 592 | systems/texlive/tlnet/archive/texlive-scripts.amd64-freebsd.r55172.tar.xz
2020/05/17 | 588 | systems/texlive/tlnet/archive/texlive-scripts.amd64-netbsd.r55172.tar.xz
2020/05/17 | 592 | systems/texlive/tlnet/archive/texlive-scripts.armhf-linux.r55172.tar.xz
-2021/08/31 | 400004 | systems/texlive/tlnet/archive/texlive-scripts.doc.r60371.tar.xz
+2021/09/01 | 399980 | systems/texlive/tlnet/archive/texlive-scripts.doc.r60377.tar.xz
2020/01/27 | 916 | systems/texlive/tlnet/archive/texlive-scripts-extra.aarch64-linux.r53577.tar.xz
2020/01/27 | 924 | systems/texlive/tlnet/archive/texlive-scripts-extra.amd64-freebsd.r53577.tar.xz
2020/01/27 | 916 | systems/texlive/tlnet/archive/texlive-scripts-extra.amd64-netbsd.r53577.tar.xz
@@ -277681,7 +277683,7 @@
2020/05/17 | 588 | systems/texlive/tlnet/archive/texlive-scripts.i386-linux.r55172.tar.xz
2020/05/17 | 592 | systems/texlive/tlnet/archive/texlive-scripts.i386-netbsd.r55172.tar.xz
2020/05/17 | 588 | systems/texlive/tlnet/archive/texlive-scripts.i386-solaris.r55172.tar.xz
-2021/08/31 | 108284 | systems/texlive/tlnet/archive/texlive-scripts.r60371.tar.xz
+2021/09/01 | 108292 | systems/texlive/tlnet/archive/texlive-scripts.r60377.tar.xz
2021/02/25 | 572 | systems/texlive/tlnet/archive/texlive-scripts.universal-darwin.r57908.tar.xz
2021/04/12 | 36308 | systems/texlive/tlnet/archive/texlive-scripts.win32.r58829.tar.xz
2020/05/17 | 588 | systems/texlive/tlnet/archive/texlive-scripts.x86_64-cygwin.r55172.tar.xz
@@ -279405,16 +279407,16 @@
2020/07/18 | 47816 | systems/texlive/tlnet/archive/zztex.doc.r55862.tar.xz
2020/07/18 | 101724 | systems/texlive/tlnet/archive/zztex.r55862.tar.xz
2021/05/02 | 105152 | systems/texlive/tlnet/install-tl
-2021/08/31 | 6810931 | systems/texlive/tlnet/install-tl-unx.tar.gz
-2021/08/31 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
-2021/08/31 | 455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
+2021/09/01 | 6811617 | systems/texlive/tlnet/install-tl-unx.tar.gz
+2021/09/01 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
+2021/09/01 | 455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
2021/04/11 | 4945 | systems/texlive/tlnet/install-tl-windows.bat
-2021/08/31 | 20810837 | systems/texlive/tlnet/install-tl-windows.exe
-2021/08/31 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
-2021/08/31 | 455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
-2021/08/31 | 25585285 | systems/texlive/tlnet/install-tl.zip
-2021/08/31 | 145 | systems/texlive/tlnet/install-tl.zip.sha512
-2021/08/31 | 455 | systems/texlive/tlnet/install-tl.zip.sha512.asc
+2021/09/01 | 20808881 | systems/texlive/tlnet/install-tl-windows.exe
+2021/09/01 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
+2021/09/01 | 455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
+2021/09/01 | 25585308 | systems/texlive/tlnet/install-tl.zip
+2021/09/01 | 145 | systems/texlive/tlnet/install-tl.zip.sha512
+2021/09/01 | 455 | systems/texlive/tlnet/install-tl.zip.sha512.asc
2021/04/01 | 1229 | systems/texlive/tlnet/README.md
2021/04/01 | 0 | systems/texlive/tlnet/TEXLIVE_2021
2021/07/03 | 7181 | systems/texlive/tlnet/tlpkg/gpg/pubring.gpg
@@ -279424,7 +279426,7 @@
2021/07/03 | 1280 | systems/texlive/tlnet/tlpkg/gpg/trustdb.gpg
2021/07/02 | 49348 | systems/texlive/tlnet/tlpkg/installer/config.guess
2010/11/11 | 11651 | systems/texlive/tlnet/tlpkg/installer/COPYING.MinGW-runtime.txt
-2021/08/30 | 6787 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
+2021/08/31 | 6875 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
2020/04/15 | 223687 | systems/texlive/tlnet/tlpkg/installer/curl/curl-ca-bundle.crt
2020/04/15 | 2606592 | systems/texlive/tlnet/tlpkg/installer/curl/curl.exe
2017/04/16 | 2629 | systems/texlive/tlnet/tlpkg/installer/installer-options.txt
@@ -279466,12 +279468,12 @@
2021/05/16 | 20371 | systems/texlive/tlnet/tlpkg/TeXLive/TLCrypto.pm
2021/05/16 | 5402 | systems/texlive/tlnet/tlpkg/TeXLive/TLDownload.pm
2021/05/16 | 27555 | systems/texlive/tlnet/tlpkg/TeXLive/TLPaper.pm
-2021/08/31 | 17378780 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
-2021/08/31 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
+2021/09/01 | 17377013 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
+2021/09/01 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
2021/05/16 | 86511 | systems/texlive/tlnet/tlpkg/TeXLive/TLPDB.pm
-2021/08/31 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
-2021/08/31 | 455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
-2021/08/31 | 2331404 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
+2021/09/01 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
+2021/09/01 | 455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
+2021/09/01 | 2332120 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
2021/05/16 | 58801 | systems/texlive/tlnet/tlpkg/TeXLive/TLPOBJ.pm
2021/05/16 | 42084 | systems/texlive/tlnet/tlpkg/TeXLive/TLPSRC.pm
2021/05/16 | 16103 | systems/texlive/tlnet/tlpkg/TeXLive/TLTREE.pm
@@ -284365,7 +284367,7 @@
2020/10/03 | 318630 | systems/win32/miktex/tm/packages/filehook.tar.lzma
2012/12/04 | 924573 | systems/win32/miktex/tm/packages/fileinfo.tar.lzma
2011/09/21 | 281409 | systems/win32/miktex/tm/packages/filemod.tar.lzma
-2021/08/31 | 594022 | systems/win32/miktex/tm/packages/files.csv.lzma
+2021/09/01 | 594022 | 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
@@ -285734,9 +285736,9 @@
2018/01/12 | 157226 | systems/win32/miktex/tm/packages/miktex-zip-bin-x64.tar.lzma
2021/08/07 | 39000 | systems/win32/miktex/tm/packages/miktex-zlib-bin-2.9.tar.lzma
2021/08/07 | 43393 | systems/win32/miktex/tm/packages/miktex-zlib-bin-x64-2.9.tar.lzma
-2021/08/31 | 237396 | systems/win32/miktex/tm/packages/miktex-zzdb1-2.9.tar.lzma
-2021/08/31 | 1332865 | systems/win32/miktex/tm/packages/miktex-zzdb2-2.9.tar.lzma
-2021/08/31 | 1238269 | systems/win32/miktex/tm/packages/miktex-zzdb3-2.9.tar.lzma
+2021/09/01 | 237357 | systems/win32/miktex/tm/packages/miktex-zzdb1-2.9.tar.lzma
+2021/09/01 | 1333835 | systems/win32/miktex/tm/packages/miktex-zzdb2-2.9.tar.lzma
+2021/09/01 | 1238157 | systems/win32/miktex/tm/packages/miktex-zzdb3-2.9.tar.lzma
2021/08/07 | 13446 | systems/win32/miktex/tm/packages/miktex-zzip-bin-2.9.tar.lzma
2021/08/07 | 14327 | 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
@@ -285940,189 +285942,189 @@
2018/04/09 | 400132 | systems/win32/miktex/tm/packages/newunicodechar.tar.lzma
2011/09/19 | 101312 | systems/win32/miktex/tm/packages/newvbtm.tar.lzma
2021/03/17 | 232249 | systems/win32/miktex/tm/packages/newverbs.tar.lzma
-2021/08/31 | 594204 | systems/win32/miktex/tm/packages/next/files.csv.lzma
-2021/08/31 | 51113 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-2.9.tar.lzma
-2021/08/31 | 56476 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-x64-2.9.tar.lzma
-2021/08/31 | 975019 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-2.9.tar.lzma
-2021/08/31 | 1077990 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-x64-2.9.tar.lzma
-2021/08/31 | 29038 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-2.9.tar.lzma
-2021/08/31 | 31351 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-x64-2.9.tar.lzma
-2021/08/31 | 29842 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-2.9.tar.lzma
-2021/08/31 | 34664 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-x64-2.9.tar.lzma
-2021/08/31 | 50151 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-2.9.tar.lzma
-2021/08/31 | 57547 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-x64-2.9.tar.lzma
-2021/08/31 | 83540 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-2.9.tar.lzma
-2021/08/31 | 95402 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-x64-2.9.tar.lzma
-2021/08/31 | 67818 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-2.9.tar.lzma
-2021/08/31 | 75791 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-x64-2.9.tar.lzma
-2021/08/31 | 27198 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-2.9.tar.lzma
-2021/08/31 | 30823 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-x64-2.9.tar.lzma
-2021/08/31 | 330787 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-2.9.tar.lzma
-2021/08/31 | 392794 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-x64-2.9.tar.lzma
-2021/08/31 | 32673 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-2.9.tar.lzma
-2021/08/31 | 36627 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-x64-2.9.tar.lzma
-2021/08/31 | 51310 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-2.9.tar.lzma
-2021/08/31 | 56684 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-x64-2.9.tar.lzma
-2021/08/31 | 241810 | systems/win32/miktex/tm/packages/next/miktex-console-bin-2.9.tar.lzma
-2021/08/31 | 263959 | systems/win32/miktex/tm/packages/next/miktex-console-bin-x64-2.9.tar.lzma
-2021/08/31 | 180010 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-2.9.tar.lzma
-2021/08/31 | 195635 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-x64-2.9.tar.lzma
-2021/08/31 | 54630 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-2.9.tar.lzma
-2021/08/31 | 61813 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-x64-2.9.tar.lzma
-2021/08/31 | 21225 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-2.9.tar.lzma
-2021/08/31 | 23365 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-x64-2.9.tar.lzma
-2021/08/31 | 461811 | systems/win32/miktex/tm/packages/next/miktex-doc.tar.lzma
-2021/08/31 | 45905 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-2.9.tar.lzma
-2021/08/31 | 51201 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-x64-2.9.tar.lzma
-2021/08/31 | 284580 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-2.9.tar.lzma
-2021/08/31 | 325042 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-x64-2.9.tar.lzma
-2021/08/31 | 41194 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-2.9.tar.lzma
-2021/08/31 | 45311 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-x64-2.9.tar.lzma
-2021/08/31 | 119819 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-2.9.tar.lzma
-2021/08/31 | 133863 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-x64-2.9.tar.lzma
-2021/08/31 | 1291299 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-2.9.tar.lzma
-2021/08/31 | 1421868 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-x64-2.9.tar.lzma
-2021/08/31 | 100624 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-2.9.tar.lzma
-2021/08/31 | 112983 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-x64-2.9.tar.lzma
-2021/08/31 | 43028 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-2.9.tar.lzma
-2021/08/31 | 48252 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-x64-2.9.tar.lzma
-2021/08/31 | 25020 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-2.9.tar.lzma
-2021/08/31 | 28179 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-x64-2.9.tar.lzma
-2021/08/31 | 56317 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-2.9.tar.lzma
-2021/08/31 | 62785 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-x64-2.9.tar.lzma
-2021/08/31 | 136817 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-2.9.tar.lzma
-2021/08/31 | 154424 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-x64-2.9.tar.lzma
-2021/08/31 | 73196 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-2.9.tar.lzma
-2021/08/31 | 77951 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-x64-2.9.tar.lzma
-2021/08/31 | 71667 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-2.9.tar.lzma
-2021/08/31 | 80449 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-x64-2.9.tar.lzma
-2021/08/31 | 258880 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-2.9.tar.lzma
-2021/08/31 | 295203 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-x64-2.9.tar.lzma
-2021/08/31 | 22048 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-2.9.tar.lzma
-2021/08/31 | 24993 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-x64-2.9.tar.lzma
-2021/08/31 | 97338 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-2.9.tar.lzma
-2021/08/31 | 112086 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-x64-2.9.tar.lzma
-2021/08/31 | 64426 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-2.9.tar.lzma
-2021/08/31 | 73146 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-x64-2.9.tar.lzma
-2021/08/31 | 96631 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-2.9.tar.lzma
-2021/08/31 | 115351 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-x64-2.9.tar.lzma
-2021/08/31 | 38140 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-2.9.tar.lzma
-2021/08/31 | 43002 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-x64-2.9.tar.lzma
-2021/08/31 | 483652 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-2.9.tar.lzma
-2021/08/31 | 566530 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-x64-2.9.tar.lzma
-2021/08/31 | 147371 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-2.9.tar.lzma
-2021/08/31 | 159578 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-x64-2.9.tar.lzma
-2021/08/31 | 94798 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-2.9.tar.lzma
-2021/08/31 | 109030 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-x64-2.9.tar.lzma
-2021/08/31 | 16356 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-2.9.tar.lzma
-2021/08/31 | 17979 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-x64-2.9.tar.lzma
-2021/08/31 | 28389 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-2.9.tar.lzma
-2021/08/31 | 30058 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-x64-2.9.tar.lzma
-2021/08/31 | 629397 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-2.9.tar.lzma
-2021/08/31 | 681253 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-x64-2.9.tar.lzma
-2021/08/31 | 531854 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-2.9.tar.lzma
-2021/08/31 | 596931 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-x64-2.9.tar.lzma
-2021/08/31 | 476919 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-2.9.tar.lzma
-2021/08/31 | 510587 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-x64-2.9.tar.lzma
-2021/08/31 | 94311 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-2.9.tar.lzma
-2021/08/31 | 103399 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-x64-2.9.tar.lzma
-2021/08/31 | 1713895 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-2.9.tar.lzma
-2021/08/31 | 2009905 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-x64-2.9.tar.lzma
-2021/08/31 | 67619 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-2.9.tar.lzma
-2021/08/31 | 74210 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-x64-2.9.tar.lzma
-2021/08/31 | 27358 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-2.9.tar.lzma
-2021/08/31 | 31620 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-x64-2.9.tar.lzma
-2021/08/31 | 7721 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-2.9.tar.lzma
-2021/08/31 | 8768 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-x64-2.9.tar.lzma
-2021/08/31 | 196872 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-2.9.tar.lzma
-2021/08/31 | 215248 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-x64-2.9.tar.lzma
-2021/08/31 | 250265 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-2.9.tar.lzma
-2021/08/31 | 284025 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-x64-2.9.tar.lzma
-2021/08/31 | 98380 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-2.9.tar.lzma
-2021/08/31 | 103204 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-x64-2.9.tar.lzma
-2021/08/31 | 60637 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-2.9.tar.lzma
-2021/08/31 | 68023 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-x64-2.9.tar.lzma
-2021/08/31 | 124282 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-2.9.tar.lzma
-2021/08/31 | 136822 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-x64-2.9.tar.lzma
-2021/08/31 | 178353 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-2.9.tar.lzma
-2021/08/31 | 196742 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-x64-2.9.tar.lzma
-2021/08/31 | 199732 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-2.9.tar.lzma
-2021/08/31 | 180120 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-x64-2.9.tar.lzma
-2021/08/31 | 67484 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-2.9.tar.lzma
-2021/08/31 | 76826 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-x64-2.9.tar.lzma
-2021/08/31 | 31230 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-2.9.tar.lzma
-2021/08/31 | 35085 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-x64-2.9.tar.lzma
-2021/08/31 | 37806 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-2.9.tar.lzma
-2021/08/31 | 42711 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-x64-2.9.tar.lzma
-2021/08/31 | 42891 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-2.9.tar.lzma
-2021/08/31 | 46906 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-x64-2.9.tar.lzma
-2021/08/31 | 45970 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-2.9.tar.lzma
-2021/08/31 | 52522 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-x64-2.9.tar.lzma
-2021/08/31 | 194381 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-2.9.tar.lzma
-2021/08/31 | 206604 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-x64-2.9.tar.lzma
-2021/08/31 | 35691 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin.tar.lzma
-2021/08/31 | 40229 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin-x64.tar.lzma
-2021/08/31 | 744116 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-2.9.tar.lzma
-2021/08/31 | 815240 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-x64-2.9.tar.lzma
-2021/08/31 | 198169 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-2.9.tar.lzma
-2021/08/31 | 202796 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-x64-2.9.tar.lzma
-2021/08/31 | 208045 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-2.9.tar.lzma
-2021/08/31 | 243425 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-x64-2.9.tar.lzma
-2021/08/31 | 78774 | systems/win32/miktex/tm/packages/next/miktex-png-bin-2.9.tar.lzma
-2021/08/31 | 87777 | systems/win32/miktex/tm/packages/next/miktex-png-bin-x64-2.9.tar.lzma
-2021/08/31 | 1169717 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-2.9.tar.lzma
-2021/08/31 | 1301193 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-x64-2.9.tar.lzma
-2021/08/31 | 20137 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-2.9.tar.lzma
-2021/08/31 | 23903 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-x64-2.9.tar.lzma
-2021/08/31 | 31536 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-2.9.tar.lzma
-2021/08/31 | 37241 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-x64-2.9.tar.lzma
-2021/08/31 | 64185 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-2.9.tar.lzma
-2021/08/31 | 72205 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-x64-2.9.tar.lzma
-2021/08/31 | 50395 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-2.9.tar.lzma
-2021/08/31 | 57730 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-x64-2.9.tar.lzma
-2021/08/31 | 1340929 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-2.9.tar.lzma
-2021/08/31 | 1464204 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-x64-2.9.tar.lzma
-2021/08/31 | 42386 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-2.9.tar.lzma
-2021/08/31 | 51748 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-x64-2.9.tar.lzma
-2021/08/31 | 56515 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin.tar.lzma
-2021/08/31 | 60039 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-x64.tar.lzma
-2021/08/31 | 25290 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-2.9.tar.lzma
-2021/08/31 | 27390 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-x64-2.9.tar.lzma
-2021/08/31 | 16414 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-2.9.tar.lzma
-2021/08/31 | 18176 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-x64-2.9.tar.lzma
-2021/08/31 | 63776 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-2.9.tar.lzma
-2021/08/31 | 69914 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-x64-2.9.tar.lzma
-2021/08/31 | 154805 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-2.9.tar.lzma
-2021/08/31 | 169242 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-x64-2.9.tar.lzma
-2021/08/31 | 57012 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-2.9.tar.lzma
-2021/08/31 | 65786 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-x64-2.9.tar.lzma
-2021/08/31 | 98263 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-2.9.tar.lzma
-2021/08/31 | 105220 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-x64-2.9.tar.lzma
-2021/08/31 | 2672612 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-2.9.tar.lzma
-2021/08/31 | 2796725 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-x64-2.9.tar.lzma
-2021/08/31 | 56355 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-2.9.tar.lzma
-2021/08/31 | 62229 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-x64-2.9.tar.lzma
-2021/08/31 | 33545 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin.tar.lzma
-2021/08/31 | 37360 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin-x64.tar.lzma
-2021/08/31 | 27729 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-2.9.tar.lzma
-2021/08/31 | 33632 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-x64-2.9.tar.lzma
-2021/08/31 | 65620 | systems/win32/miktex/tm/packages/next/miktex-web-bin-2.9.tar.lzma
-2021/08/31 | 70648 | systems/win32/miktex/tm/packages/next/miktex-web-bin-x64-2.9.tar.lzma
-2021/08/31 | 312108 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-2.9.tar.lzma
-2021/08/31 | 345737 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-x64-2.9.tar.lzma
-2021/08/31 | 55498 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin.tar.lzma
-2021/08/31 | 57138 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin-x64.tar.lzma
-2021/08/31 | 589844 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-2.9.tar.lzma
-2021/08/31 | 624653 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-x64-2.9.tar.lzma
-2021/08/31 | 39128 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-2.9.tar.lzma
-2021/08/31 | 43425 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-x64-2.9.tar.lzma
-2021/08/31 | 237470 | systems/win32/miktex/tm/packages/next/miktex-zzdb1-2.9.tar.lzma
-2021/08/31 | 1332680 | systems/win32/miktex/tm/packages/next/miktex-zzdb2-2.9.tar.lzma
-2021/08/31 | 1237768 | systems/win32/miktex/tm/packages/next/miktex-zzdb3-2.9.tar.lzma
-2021/08/31 | 13466 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-2.9.tar.lzma
-2021/08/31 | 14348 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-x64-2.9.tar.lzma
+2021/09/01 | 594204 | systems/win32/miktex/tm/packages/next/files.csv.lzma
+2021/09/01 | 51113 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-2.9.tar.lzma
+2021/09/01 | 56475 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-x64-2.9.tar.lzma
+2021/09/01 | 975020 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-2.9.tar.lzma
+2021/09/01 | 1077990 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-x64-2.9.tar.lzma
+2021/09/01 | 29036 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-2.9.tar.lzma
+2021/09/01 | 31350 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-x64-2.9.tar.lzma
+2021/09/01 | 29840 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-2.9.tar.lzma
+2021/09/01 | 34664 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-x64-2.9.tar.lzma
+2021/09/01 | 50153 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-2.9.tar.lzma
+2021/09/01 | 57548 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-x64-2.9.tar.lzma
+2021/09/01 | 83541 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-2.9.tar.lzma
+2021/09/01 | 95401 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-x64-2.9.tar.lzma
+2021/09/01 | 67820 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-2.9.tar.lzma
+2021/09/01 | 75792 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-x64-2.9.tar.lzma
+2021/09/01 | 27199 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-2.9.tar.lzma
+2021/09/01 | 30824 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-x64-2.9.tar.lzma
+2021/09/01 | 330787 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-2.9.tar.lzma
+2021/09/01 | 392791 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-x64-2.9.tar.lzma
+2021/09/01 | 32673 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-2.9.tar.lzma
+2021/09/01 | 36628 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-x64-2.9.tar.lzma
+2021/09/01 | 51310 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-2.9.tar.lzma
+2021/09/01 | 56685 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-x64-2.9.tar.lzma
+2021/09/01 | 241812 | systems/win32/miktex/tm/packages/next/miktex-console-bin-2.9.tar.lzma
+2021/09/01 | 263958 | systems/win32/miktex/tm/packages/next/miktex-console-bin-x64-2.9.tar.lzma
+2021/09/01 | 180010 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-2.9.tar.lzma
+2021/09/01 | 195636 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-x64-2.9.tar.lzma
+2021/09/01 | 54632 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-2.9.tar.lzma
+2021/09/01 | 61813 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-x64-2.9.tar.lzma
+2021/09/01 | 21225 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-2.9.tar.lzma
+2021/09/01 | 23365 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-x64-2.9.tar.lzma
+2021/09/01 | 461810 | systems/win32/miktex/tm/packages/next/miktex-doc.tar.lzma
+2021/09/01 | 45906 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-2.9.tar.lzma
+2021/09/01 | 51203 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-x64-2.9.tar.lzma
+2021/09/01 | 284581 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-2.9.tar.lzma
+2021/09/01 | 325043 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-x64-2.9.tar.lzma
+2021/09/01 | 41192 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-2.9.tar.lzma
+2021/09/01 | 45310 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-x64-2.9.tar.lzma
+2021/09/01 | 119821 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-2.9.tar.lzma
+2021/09/01 | 133864 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-x64-2.9.tar.lzma
+2021/09/01 | 1291301 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-2.9.tar.lzma
+2021/09/01 | 1421867 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-x64-2.9.tar.lzma
+2021/09/01 | 100624 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-2.9.tar.lzma
+2021/09/01 | 112983 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-x64-2.9.tar.lzma
+2021/09/01 | 43028 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-2.9.tar.lzma
+2021/09/01 | 48253 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-x64-2.9.tar.lzma
+2021/09/01 | 25020 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-2.9.tar.lzma
+2021/09/01 | 28180 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-x64-2.9.tar.lzma
+2021/09/01 | 56317 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-2.9.tar.lzma
+2021/09/01 | 62787 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-x64-2.9.tar.lzma
+2021/09/01 | 136816 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-2.9.tar.lzma
+2021/09/01 | 154428 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-x64-2.9.tar.lzma
+2021/09/01 | 73196 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-2.9.tar.lzma
+2021/09/01 | 77952 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-x64-2.9.tar.lzma
+2021/09/01 | 71669 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-2.9.tar.lzma
+2021/09/01 | 80450 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-x64-2.9.tar.lzma
+2021/09/01 | 258882 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-2.9.tar.lzma
+2021/09/01 | 295203 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-x64-2.9.tar.lzma
+2021/09/01 | 22049 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-2.9.tar.lzma
+2021/09/01 | 24995 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-x64-2.9.tar.lzma
+2021/09/01 | 97339 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-2.9.tar.lzma
+2021/09/01 | 112089 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-x64-2.9.tar.lzma
+2021/09/01 | 64426 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-2.9.tar.lzma
+2021/09/01 | 73147 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-x64-2.9.tar.lzma
+2021/09/01 | 96633 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-2.9.tar.lzma
+2021/09/01 | 115351 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-x64-2.9.tar.lzma
+2021/09/01 | 38141 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-2.9.tar.lzma
+2021/09/01 | 43003 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-x64-2.9.tar.lzma
+2021/09/01 | 483654 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-2.9.tar.lzma
+2021/09/01 | 566529 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-x64-2.9.tar.lzma
+2021/09/01 | 147373 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-2.9.tar.lzma
+2021/09/01 | 159578 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-x64-2.9.tar.lzma
+2021/09/01 | 94799 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-2.9.tar.lzma
+2021/09/01 | 109032 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-x64-2.9.tar.lzma
+2021/09/01 | 16357 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-2.9.tar.lzma
+2021/09/01 | 17981 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-x64-2.9.tar.lzma
+2021/09/01 | 28391 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-2.9.tar.lzma
+2021/09/01 | 30058 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-x64-2.9.tar.lzma
+2021/09/01 | 629399 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-2.9.tar.lzma
+2021/09/01 | 681252 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-x64-2.9.tar.lzma
+2021/09/01 | 531852 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-2.9.tar.lzma
+2021/09/01 | 596929 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-x64-2.9.tar.lzma
+2021/09/01 | 476918 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-2.9.tar.lzma
+2021/09/01 | 510587 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-x64-2.9.tar.lzma
+2021/09/01 | 94310 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-2.9.tar.lzma
+2021/09/01 | 103399 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-x64-2.9.tar.lzma
+2021/09/01 | 1713893 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-2.9.tar.lzma
+2021/09/01 | 2009904 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-x64-2.9.tar.lzma
+2021/09/01 | 67619 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-2.9.tar.lzma
+2021/09/01 | 74210 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-x64-2.9.tar.lzma
+2021/09/01 | 27359 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-2.9.tar.lzma
+2021/09/01 | 31619 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-x64-2.9.tar.lzma
+2021/09/01 | 7721 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-2.9.tar.lzma
+2021/09/01 | 8768 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-x64-2.9.tar.lzma
+2021/09/01 | 196872 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-2.9.tar.lzma
+2021/09/01 | 215249 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-x64-2.9.tar.lzma
+2021/09/01 | 250264 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-2.9.tar.lzma
+2021/09/01 | 284026 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-x64-2.9.tar.lzma
+2021/09/01 | 98381 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-2.9.tar.lzma
+2021/09/01 | 103204 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-x64-2.9.tar.lzma
+2021/09/01 | 60638 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-2.9.tar.lzma
+2021/09/01 | 68024 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-x64-2.9.tar.lzma
+2021/09/01 | 124281 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-2.9.tar.lzma
+2021/09/01 | 136821 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-x64-2.9.tar.lzma
+2021/09/01 | 178355 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-2.9.tar.lzma
+2021/09/01 | 196741 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-x64-2.9.tar.lzma
+2021/09/01 | 199732 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-2.9.tar.lzma
+2021/09/01 | 180120 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-x64-2.9.tar.lzma
+2021/09/01 | 67483 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-2.9.tar.lzma
+2021/09/01 | 76826 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-x64-2.9.tar.lzma
+2021/09/01 | 31231 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-2.9.tar.lzma
+2021/09/01 | 35087 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-x64-2.9.tar.lzma
+2021/09/01 | 37807 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-2.9.tar.lzma
+2021/09/01 | 42711 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-x64-2.9.tar.lzma
+2021/09/01 | 42890 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-2.9.tar.lzma
+2021/09/01 | 46907 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-x64-2.9.tar.lzma
+2021/09/01 | 45971 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-2.9.tar.lzma
+2021/09/01 | 52523 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-x64-2.9.tar.lzma
+2021/09/01 | 194383 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-2.9.tar.lzma
+2021/09/01 | 206604 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-x64-2.9.tar.lzma
+2021/09/01 | 35692 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin.tar.lzma
+2021/09/01 | 40229 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin-x64.tar.lzma
+2021/09/01 | 744117 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-2.9.tar.lzma
+2021/09/01 | 815244 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-x64-2.9.tar.lzma
+2021/09/01 | 198170 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-2.9.tar.lzma
+2021/09/01 | 202796 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-x64-2.9.tar.lzma
+2021/09/01 | 208049 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-2.9.tar.lzma
+2021/09/01 | 243427 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-x64-2.9.tar.lzma
+2021/09/01 | 78773 | systems/win32/miktex/tm/packages/next/miktex-png-bin-2.9.tar.lzma
+2021/09/01 | 87776 | systems/win32/miktex/tm/packages/next/miktex-png-bin-x64-2.9.tar.lzma
+2021/09/01 | 1169719 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-2.9.tar.lzma
+2021/09/01 | 1301192 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-x64-2.9.tar.lzma
+2021/09/01 | 20137 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-2.9.tar.lzma
+2021/09/01 | 23902 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-x64-2.9.tar.lzma
+2021/09/01 | 31539 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-2.9.tar.lzma
+2021/09/01 | 37240 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-x64-2.9.tar.lzma
+2021/09/01 | 64184 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-2.9.tar.lzma
+2021/09/01 | 72205 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-x64-2.9.tar.lzma
+2021/09/01 | 50393 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-2.9.tar.lzma
+2021/09/01 | 57729 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-x64-2.9.tar.lzma
+2021/09/01 | 1340930 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-2.9.tar.lzma
+2021/09/01 | 1464203 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-x64-2.9.tar.lzma
+2021/09/01 | 42384 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-2.9.tar.lzma
+2021/09/01 | 51750 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-x64-2.9.tar.lzma
+2021/09/01 | 56514 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin.tar.lzma
+2021/09/01 | 60039 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-x64.tar.lzma
+2021/09/01 | 25290 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-2.9.tar.lzma
+2021/09/01 | 27388 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-x64-2.9.tar.lzma
+2021/09/01 | 16413 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-2.9.tar.lzma
+2021/09/01 | 18176 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-x64-2.9.tar.lzma
+2021/09/01 | 63778 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-2.9.tar.lzma
+2021/09/01 | 69914 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-x64-2.9.tar.lzma
+2021/09/01 | 154805 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-2.9.tar.lzma
+2021/09/01 | 169242 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-x64-2.9.tar.lzma
+2021/09/01 | 57012 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-2.9.tar.lzma
+2021/09/01 | 65786 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-x64-2.9.tar.lzma
+2021/09/01 | 98263 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-2.9.tar.lzma
+2021/09/01 | 105223 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-x64-2.9.tar.lzma
+2021/09/01 | 2672610 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-2.9.tar.lzma
+2021/09/01 | 2796725 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-x64-2.9.tar.lzma
+2021/09/01 | 56356 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-2.9.tar.lzma
+2021/09/01 | 62227 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-x64-2.9.tar.lzma
+2021/09/01 | 33545 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin.tar.lzma
+2021/09/01 | 37360 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin-x64.tar.lzma
+2021/09/01 | 27732 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-2.9.tar.lzma
+2021/09/01 | 33631 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-x64-2.9.tar.lzma
+2021/09/01 | 65621 | systems/win32/miktex/tm/packages/next/miktex-web-bin-2.9.tar.lzma
+2021/09/01 | 70648 | systems/win32/miktex/tm/packages/next/miktex-web-bin-x64-2.9.tar.lzma
+2021/09/01 | 312108 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-2.9.tar.lzma
+2021/09/01 | 345739 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-x64-2.9.tar.lzma
+2021/09/01 | 55499 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin.tar.lzma
+2021/09/01 | 57139 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin-x64.tar.lzma
+2021/09/01 | 589845 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-2.9.tar.lzma
+2021/09/01 | 624652 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-x64-2.9.tar.lzma
+2021/09/01 | 39127 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-2.9.tar.lzma
+2021/09/01 | 43426 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-x64-2.9.tar.lzma
+2021/09/01 | 237426 | systems/win32/miktex/tm/packages/next/miktex-zzdb1-2.9.tar.lzma
+2021/09/01 | 1332762 | systems/win32/miktex/tm/packages/next/miktex-zzdb2-2.9.tar.lzma
+2021/09/01 | 1238628 | systems/win32/miktex/tm/packages/next/miktex-zzdb3-2.9.tar.lzma
+2021/09/01 | 13464 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-2.9.tar.lzma
+2021/09/01 | 14349 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-x64-2.9.tar.lzma
2019/03/12 | 1412 | systems/win32/miktex/tm/packages/nextpage.tar.lzma
-2021/08/31 | 1153 | systems/win32/miktex/tm/packages/next/pr.ini
+2021/09/01 | 1153 | systems/win32/miktex/tm/packages/next/pr.ini
2018/07/06 | 145915 | systems/win32/miktex/tm/packages/nexus-otf.tar.lzma
2017/03/30 | 191149 | systems/win32/miktex/tm/packages/nfssext-cfr.tar.lzma
2012/12/20 | 612251 | systems/win32/miktex/tm/packages/nicefilelist.tar.lzma
@@ -286506,7 +286508,7 @@
2020/10/20 | 342254 | systems/win32/miktex/tm/packages/preview.tar.lzma
2019/06/20 | 375963 | systems/win32/miktex/tm/packages/prftree.tar.lzma
2021/04/23 | 274028 | systems/win32/miktex/tm/packages/principia.tar.lzma
-2021/08/31 | 956 | systems/win32/miktex/tm/packages/pr.ini
+2021/09/01 | 956 | 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
@@ -287847,6 +287849,8 @@
2007/02/12 | 217429 | systems/win32/texshell32/WinTeXShell32src.zip
2007/02/12 | 6896 | systems/win32/texshell32/WinTeXShell32.txt
2007/02/12 | 395234 | systems/win32/texshell32/WinTeXShell32.zip
+2021/08/29 | 1984 | systems/win32/TLW64/00README.TLW64
+2021/08/29 | 99341137 | systems/win32/TLW64/tl-win64.zip
1996/11/26 | 1822 | systems/win32/tsconfig/readme
1996/11/26 | 30343 | systems/win32/tsconfig/tsconfig.zip
1998/01/20 | 766976 | systems/win32/util/cmdsh110.exe
@@ -288082,7 +288086,7 @@
2004/06/04 | 404 | tds/tds.sed
2004/06/23 | 65418 | tds/tds.tex
2019/05/29 | 304264 | tds.zip
-2021/09/01 | 186 | timestamp
+2021/09/02 | 186 | timestamp
2002/08/26 | 61898 | usergrps/dante/antrag.pdf
2002/08/26 | 118217 | usergrps/dante/antrag.ps
2021/08/04 | 917 | usergrps/dante/dtk/doc/beispiel.bib
diff --git a/FILES.byname.gz b/FILES.byname.gz
index 9e2a594e34..837e6ff35e 100644
--- a/FILES.byname.gz
+++ b/FILES.byname.gz
Binary files differ
diff --git a/FILES.last07days b/FILES.last07days
index 64ca3b3608..91b01338cd 100644
--- a/FILES.last07days
+++ b/FILES.last07days
@@ -1,50 +1,292 @@
-2021/08/31 | 98380 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-2.9.tar.lzma
-2021/08/31 | 98263 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-2.9.tar.lzma
-2021/08/31 | 975019 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-2.9.tar.lzma
-2021/08/31 | 97338 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-2.9.tar.lzma
-2021/08/31 | 96631 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-2.9.tar.lzma
+2021/09/01 | 98381 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-2.9.tar.lzma
+2021/09/01 | 98263 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-2.9.tar.lzma
+2021/09/01 | 975020 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-2.9.tar.lzma
+2021/09/01 | 97339 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-2.9.tar.lzma
+2021/09/01 | 96633 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-2.9.tar.lzma
+2021/09/01 | 956 | systems/win32/miktex/tm/packages/pr.ini
+2021/09/01 | 95401 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-x64-2.9.tar.lzma
+2021/09/01 | 94799 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-2.9.tar.lzma
+2021/09/01 | 94310 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-2.9.tar.lzma
+2021/09/01 | 9012 | systems/texlive/tlnet/archive/musixtex.source.r60382.tar.xz
+2021/09/01 | 87776 | systems/win32/miktex/tm/packages/next/miktex-png-bin-x64-2.9.tar.lzma
+2021/09/01 | 8768 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-x64-2.9.tar.lzma
+2021/09/01 | 865704 | systems/texlive/tlnet/archive/biblatex-ext.doc.r60379.tar.xz
+2021/09/01 | 865279 | macros/latex/contrib/uni-titlepage/uni-titlepage.pdf
+2021/09/01 | 83541 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-2.9.tar.lzma
+2021/09/01 | 815244 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-x64-2.9.tar.lzma
+2021/09/01 | 80450 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-x64-2.9.tar.lzma
+2021/09/01 | 78773 | systems/win32/miktex/tm/packages/next/miktex-png-bin-2.9.tar.lzma
+2021/09/01 | 77952 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-x64-2.9.tar.lzma
+2021/09/01 | 7721 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-2.9.tar.lzma
+2021/09/01 | 76826 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-x64-2.9.tar.lzma
+2021/09/01 | 75792 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-x64-2.9.tar.lzma
+2021/09/01 | 744117 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-2.9.tar.lzma
+2021/09/01 | 7436 | systems/texlive/tlnet/archive/context-typescripts.r60378.tar.xz
+2021/09/01 | 74210 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-x64-2.9.tar.lzma
+2021/09/01 | 74198 | macros/latex/contrib/tabularray/tabularray.tex
+2021/09/01 | 73196 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-2.9.tar.lzma
+2021/09/01 | 73147 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-x64-2.9.tar.lzma
+2021/09/01 | 725112 | macros/latex/contrib/tabularray/tabularray.pdf
+2021/09/01 | 72205 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-x64-2.9.tar.lzma
+2021/09/01 | 71669 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-2.9.tar.lzma
+2021/09/01 | 70648 | systems/win32/miktex/tm/packages/next/miktex-web-bin-x64-2.9.tar.lzma
+2021/09/01 | 69914 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-x64-2.9.tar.lzma
+2021/09/01 | 681366 | macros/latex/contrib/tabularray.zip
+2021/09/01 | 681252 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-x64-2.9.tar.lzma
+2021/09/01 | 6811617 | systems/texlive/tlnet/install-tl-unx.tar.gz
+2021/09/01 | 68024 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-x64-2.9.tar.lzma
+2021/09/01 | 67820 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-2.9.tar.lzma
+2021/09/01 | 67619 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-2.9.tar.lzma
+2021/09/01 | 67483 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-2.9.tar.lzma
+2021/09/01 | 6663 | macros/latex/contrib/univie-ling/README
+2021/09/01 | 65786 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-x64-2.9.tar.lzma
+2021/09/01 | 65621 | systems/win32/miktex/tm/packages/next/miktex-web-bin-2.9.tar.lzma
+2021/09/01 | 644 | systems/texlive/tlnet/archive/context-typescripts.doc.r60378.tar.xz
+2021/09/01 | 64426 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-2.9.tar.lzma
+2021/09/01 | 64184 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-2.9.tar.lzma
+2021/09/01 | 63778 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-2.9.tar.lzma
+2021/09/01 | 636 | graphics/pstricks/contrib/pst-geo/Changes
+2021/09/01 | 63597939 | graphics/pstricks/contrib/pst-geo/doc/pst-geo-doc.pdf
+2021/09/01 | 629399 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-2.9.tar.lzma
+2021/09/01 | 62787 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-x64-2.9.tar.lzma
+2021/09/01 | 624652 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-x64-2.9.tar.lzma
+2021/09/01 | 62227 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-x64-2.9.tar.lzma
+2021/09/01 | 61813 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-x64-2.9.tar.lzma
+2021/09/01 | 60638 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-2.9.tar.lzma
+2021/09/01 | 60039 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-x64.tar.lzma
+2021/09/01 | 596929 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-x64-2.9.tar.lzma
+2021/09/01 | 594204 | systems/win32/miktex/tm/packages/next/files.csv.lzma
+2021/09/01 | 594022 | systems/win32/miktex/tm/packages/files.csv.lzma
+2021/09/01 | 59167 | macros/latex/contrib/covington/covington.tex
+2021/09/01 | 589845 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-2.9.tar.lzma
+2021/09/01 | 58935 | macros/latex/contrib/uni-titlepage/titlepage-WWUM.pdf
+2021/09/01 | 57729 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-x64-2.9.tar.lzma
+2021/09/01 | 57548 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-x64-2.9.tar.lzma
+2021/09/01 | 57139 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin-x64.tar.lzma
+2021/09/01 | 57012 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-2.9.tar.lzma
+2021/09/01 | 56685 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-x64-2.9.tar.lzma
+2021/09/01 | 566529 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-x64-2.9.tar.lzma
+2021/09/01 | 56514 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin.tar.lzma
+2021/09/01 | 56475 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-x64-2.9.tar.lzma
+2021/09/01 | 56356 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-2.9.tar.lzma
+2021/09/01 | 56317 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-2.9.tar.lzma
+2021/09/01 | 55499 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin.tar.lzma
+2021/09/01 | 54632 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-2.9.tar.lzma
+2021/09/01 | 54017 | macros/latex/contrib/uni-titlepage/titlepage-TU-HH.pdf
+2021/09/01 | 538 | graphics/pstricks/contrib/pst-geo/README
+2021/09/01 | 531852 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-2.9.tar.lzma
+2021/09/01 | 5258 | macros/latex/contrib/covington/README
+2021/09/01 | 52523 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-x64-2.9.tar.lzma
+2021/09/01 | 519091 | macros/latex/contrib/covington.zip
+2021/09/01 | 51750 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-x64-2.9.tar.lzma
+2021/09/01 | 51310 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-2.9.tar.lzma
+2021/09/01 | 51203 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-x64-2.9.tar.lzma
+2021/09/01 | 51113 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-2.9.tar.lzma
+2021/09/01 | 5107464 | systems/texlive/tlnet/archive/profcollege.doc.r60380.tar.xz
+2021/09/01 | 510587 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-x64-2.9.tar.lzma
+2021/09/01 | 5066212 | systems/texlive/tlnet/archive/musixtex-fonts.r60381.tar.xz
+2021/09/01 | 50393 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-2.9.tar.lzma
+2021/09/01 | 50153 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-2.9.tar.lzma
+2021/09/01 | 495582 | macros/latex/contrib/covington/covington.pdf
+2021/09/01 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
+2021/09/01 | 483654 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-2.9.tar.lzma
+2021/09/01 | 48253 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-x64-2.9.tar.lzma
+2021/09/01 | 476918 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-2.9.tar.lzma
+2021/09/01 | 4757 | graphics/pstricks/contrib/pst-geo/doc/pst-geo-doc.bib
+2021/09/01 | 46907 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-x64-2.9.tar.lzma
+2021/09/01 | 461810 | systems/win32/miktex/tm/packages/next/miktex-doc.tar.lzma
+2021/09/01 | 45971 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-2.9.tar.lzma
+2021/09/01 | 45906 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-2.9.tar.lzma
+2021/09/01 | 455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
+2021/09/01 | 455 | systems/texlive/tlnet/install-tl.zip.sha512.asc
+2021/09/01 | 455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
+2021/09/01 | 455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
+2021/09/01 | 454611 | macros/latex/contrib/univie-ling/doc/univie-ling-expose.pdf
+2021/09/01 | 45310 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-x64-2.9.tar.lzma
+2021/09/01 | 452978 | macros/latex/contrib/univie-ling/doc/univie-ling-thesis.pdf
+2021/09/01 | 449239 | macros/latex/contrib/univie-ling/doc/univie-ling-paper.pdf
+2021/09/01 | 43998 | macros/latex/contrib/uni-titlepage/titlepage-DHBW.pdf
+2021/09/01 | 43426 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-x64-2.9.tar.lzma
+2021/09/01 | 43110 | graphics/pstricks/contrib/pst-geo/tex/pst-geo.tex
+2021/09/01 | 43028 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-2.9.tar.lzma
+2021/09/01 | 43003 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-x64-2.9.tar.lzma
+2021/09/01 | 42890 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-2.9.tar.lzma
+2021/09/01 | 42711 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-x64-2.9.tar.lzma
+2021/09/01 | 42384 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-2.9.tar.lzma
+2021/09/01 | 42149 | macros/latex/contrib/uni-titlepage/titlepage-KIT.pdf
+2021/09/01 | 41265 | macros/latex/contrib/uni-titlepage/titlepage-JT-Aufsaetze.pdf
+2021/09/01 | 41192 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-2.9.tar.lzma
+2021/09/01 | 40396 | macros/latex/contrib/uni-titlepage/titlepage-TU-DD.pdf
+2021/09/01 | 40229 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin-x64.tar.lzma
+2021/09/01 | 399980 | systems/texlive/tlnet/archive/texlive-scripts.doc.r60377.tar.xz
+2021/09/01 | 3991 | macros/latex/contrib/uni-titlepage/README.md
+2021/09/01 | 392791 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-x64-2.9.tar.lzma
+2021/09/01 | 39127 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-2.9.tar.lzma
+2021/09/01 | 38251 | macros/latex/contrib/uni-titlepage/titlepage-JT-Geschichte.pdf
+2021/09/01 | 38141 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-2.9.tar.lzma
+2021/09/01 | 37807 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-2.9.tar.lzma
+2021/09/01 | 37423 | graphics/pstricks/contrib/pst-geo/doc/pst-geo-doc.tex
+2021/09/01 | 37360 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin-x64.tar.lzma
+2021/09/01 | 37240 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-x64-2.9.tar.lzma
+2021/09/01 | 36628 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-x64-2.9.tar.lzma
+2021/09/01 | 35692 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin.tar.lzma
+2021/09/01 | 3545 | macros/latex/contrib/univie-ling/biblatex-univie-ling/univie-ling.cbx
+2021/09/01 | 354436 | macros/latex/contrib/styledcmd.zip
+2021/09/01 | 35087 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-x64-2.9.tar.lzma
+2021/09/01 | 34664 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-x64-2.9.tar.lzma
+2021/09/01 | 345739 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-x64-2.9.tar.lzma
+2021/09/01 | 340523 | macros/latex/contrib/univie-ling/doc/univie-ling-wlg.pdf
+2021/09/01 | 338113 | macros/latex/contrib/styledcmd/styledcmd.pdf
+2021/09/01 | 33631 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-x64-2.9.tar.lzma
+2021/09/01 | 33548 | macros/latex/contrib/covington/covington.sty
+2021/09/01 | 33545 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin.tar.lzma
+2021/09/01 | 330787 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-2.9.tar.lzma
+2021/09/01 | 32673 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-2.9.tar.lzma
+2021/09/01 | 325043 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-x64-2.9.tar.lzma
+2021/09/01 | 31619 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-x64-2.9.tar.lzma
+2021/09/01 | 31539 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-2.9.tar.lzma
+2021/09/01 | 31350 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-x64-2.9.tar.lzma
+2021/09/01 | 312992 | systems/texlive/tlnet/archive/musixtex-fonts.doc.r60381.tar.xz
+2021/09/01 | 31231 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-2.9.tar.lzma
+2021/09/01 | 312108 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-2.9.tar.lzma
+2021/09/01 | 30824 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-x64-2.9.tar.lzma
+2021/09/01 | 30058 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-x64-2.9.tar.lzma
+2021/09/01 | 29840 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-2.9.tar.lzma
+2021/09/01 | 29726 | macros/latex/contrib/univie-ling/tex/univie-ling-wlg.cls
+2021/09/01 | 295203 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-x64-2.9.tar.lzma
+2021/09/01 | 2933464 | macros/latex/contrib/univie-ling.zip
+2021/09/01 | 29207 | macros/latex/contrib/univie-ling/doc/univie-ling-thesis.tex
+2021/09/01 | 291 | macros/latex/contrib/univie-ling/tex/univie-ling-wlg.cfg
+2021/09/01 | 29036 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-2.9.tar.lzma
+2021/09/01 | 284581 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-2.9.tar.lzma
+2021/09/01 | 284026 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-x64-2.9.tar.lzma
+2021/09/01 | 28391 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-2.9.tar.lzma
+2021/09/01 | 28180 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-x64-2.9.tar.lzma
+2021/09/01 | 2796725 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-x64-2.9.tar.lzma
+2021/09/01 | 27732 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-2.9.tar.lzma
+2021/09/01 | 27388 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-x64-2.9.tar.lzma
+2021/09/01 | 27359 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-2.9.tar.lzma
+2021/09/01 | 27199 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-2.9.tar.lzma
+2021/09/01 | 27144 | systems/texlive/tlnet/archive/biblatex-ext.r60379.tar.xz
+2021/09/01 | 26903 | macros/latex/contrib/uni-titlepage/titlepage-JT-Typography.pdf
+2021/09/01 | 2672610 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-2.9.tar.lzma
+2021/09/01 | 263958 | systems/win32/miktex/tm/packages/next/miktex-console-bin-x64-2.9.tar.lzma
+2021/09/01 | 26371 | macros/latex/contrib/univie-ling/doc/univie-ling-paper.tex
+2021/09/01 | 258882 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-2.9.tar.lzma
+2021/09/01 | 25585308 | systems/texlive/tlnet/install-tl.zip
+2021/09/01 | 25290 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-2.9.tar.lzma
+2021/09/01 | 250264 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-2.9.tar.lzma
+2021/09/01 | 25020 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-2.9.tar.lzma
+2021/09/01 | 24995 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-x64-2.9.tar.lzma
+2021/09/01 | 243427 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-x64-2.9.tar.lzma
+2021/09/01 | 24259 | macros/latex/contrib/univie-ling/biblatex-univie-ling/univie-ling.bbx
+2021/09/01 | 241812 | systems/win32/miktex/tm/packages/next/miktex-console-bin-2.9.tar.lzma
+2021/09/01 | 24148 | macros/latex/contrib/univie-ling/doc/univie-ling-expose.tex
+2021/09/01 | 23902 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-x64-2.9.tar.lzma
+2021/09/01 | 237426 | systems/win32/miktex/tm/packages/next/miktex-zzdb1-2.9.tar.lzma
+2021/09/01 | 237357 | systems/win32/miktex/tm/packages/miktex-zzdb1-2.9.tar.lzma
+2021/09/01 | 23493 | macros/latex/contrib/univie-ling/tex/univie-ling-paper.cls
+2021/09/01 | 23365 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-x64-2.9.tar.lzma
+2021/09/01 | 2332120 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
+2021/09/01 | 226421 | macros/latex/contrib/tabularray/tabularray.sty
+2021/09/01 | 22585 | macros/latex/contrib/univie-ling/tex/univie-ling-thesis.cls
+2021/09/01 | 22049 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-2.9.tar.lzma
+2021/09/01 | 215249 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-x64-2.9.tar.lzma
+2021/09/01 | 2151512 | systems/texlive/tlnet/archive/musixtex.doc.r60382.tar.xz
+2021/09/01 | 21225 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-2.9.tar.lzma
+2021/09/01 | 20808881 | systems/texlive/tlnet/install-tl-windows.exe
+2021/09/01 | 208049 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-2.9.tar.lzma
+2021/09/01 | 206604 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-x64-2.9.tar.lzma
+2021/09/01 | 20333 | macros/latex/contrib/univie-ling/tex/univie-ling-expose.cls
+2021/09/01 | 202796 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-x64-2.9.tar.lzma
+2021/09/01 | 20137 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-2.9.tar.lzma
+2021/09/01 | 2009904 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-x64-2.9.tar.lzma
+2021/09/01 | 199732 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-2.9.tar.lzma
+2021/09/01 | 198170 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-2.9.tar.lzma
+2021/09/01 | 196872 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-2.9.tar.lzma
+2021/09/01 | 196741 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-x64-2.9.tar.lzma
+2021/09/01 | 195636 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-x64-2.9.tar.lzma
+2021/09/01 | 19490 | macros/latex/contrib/styledcmd/styledcmd.dtx
+2021/09/01 | 194383 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-2.9.tar.lzma
+2021/09/01 | 18176 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-x64-2.9.tar.lzma
+2021/09/01 | 180120 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-x64-2.9.tar.lzma
+2021/09/01 | 180010 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-2.9.tar.lzma
+2021/09/01 | 1798920 | macros/latex/contrib/uni-titlepage.zip
+2021/09/01 | 17981 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-x64-2.9.tar.lzma
+2021/09/01 | 178355 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-2.9.tar.lzma
+2021/09/01 | 17377013 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
+2021/09/01 | 1713893 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-2.9.tar.lzma
+2021/09/01 | 169242 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-x64-2.9.tar.lzma
+2021/09/01 | 166494 | macros/latex/contrib/uni-titlepage/titlepage-KOMAScript.pdf
+2021/09/01 | 16413 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-2.9.tar.lzma
+2021/09/01 | 16357 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-2.9.tar.lzma
+2021/09/01 | 159578 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-x64-2.9.tar.lzma
+2021/09/01 | 157496858 | graphics/pstricks/contrib/pst-geo.zip
+2021/09/01 | 154805 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-2.9.tar.lzma
+2021/09/01 | 154428 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-x64-2.9.tar.lzma
+2021/09/01 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
+2021/09/01 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
+2021/09/01 | 147373 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-2.9.tar.lzma
+2021/09/01 | 1464203 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-x64-2.9.tar.lzma
+2021/09/01 | 145 | systems/texlive/tlnet/install-tl.zip.sha512
+2021/09/01 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
+2021/09/01 | 14349 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-x64-2.9.tar.lzma
+2021/09/01 | 1421867 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-x64-2.9.tar.lzma
+2021/09/01 | 136821 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-x64-2.9.tar.lzma
+2021/09/01 | 136816 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-2.9.tar.lzma
+2021/09/01 | 13464 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-2.9.tar.lzma
+2021/09/01 | 1340930 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-2.9.tar.lzma
+2021/09/01 | 133864 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-x64-2.9.tar.lzma
+2021/09/01 | 1333835 | systems/win32/miktex/tm/packages/miktex-zzdb2-2.9.tar.lzma
+2021/09/01 | 1332762 | systems/win32/miktex/tm/packages/next/miktex-zzdb2-2.9.tar.lzma
+2021/09/01 | 1301192 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-x64-2.9.tar.lzma
+2021/09/01 | 1291301 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-2.9.tar.lzma
+2021/09/01 | 128796 | macros/latex/contrib/uni-titlepage/titlepage-Markus-2.pdf
+2021/09/01 | 128651 | macros/latex/contrib/uni-titlepage/uni-titlepage.dtx
+2021/09/01 | 127996 | macros/latex/contrib/uni-titlepage/titlepage-Spacer.pdf
+2021/09/01 | 124281 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-2.9.tar.lzma
+2021/09/01 | 1238628 | systems/win32/miktex/tm/packages/next/miktex-zzdb3-2.9.tar.lzma
+2021/09/01 | 1238157 | systems/win32/miktex/tm/packages/miktex-zzdb3-2.9.tar.lzma
+2021/09/01 | 11990 | macros/latex/contrib/univie-ling/doc/univie-ling-wlg.tex
+2021/09/01 | 119821 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-2.9.tar.lzma
+2021/09/01 | 119780 | macros/latex/contrib/uni-titlepage/titlepage-Markus-1.pdf
+2021/09/01 | 1169719 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-2.9.tar.lzma
+2021/09/01 | 1153 | systems/win32/miktex/tm/packages/next/pr.ini
+2021/09/01 | 115351 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-x64-2.9.tar.lzma
+2021/09/01 | 112983 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-x64-2.9.tar.lzma
+2021/09/01 | 112089 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-x64-2.9.tar.lzma
+2021/09/01 | 109032 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-x64-2.9.tar.lzma
+2021/09/01 | 108292 | systems/texlive/tlnet/archive/texlive-scripts.r60377.tar.xz
+2021/09/01 | 1081 | macros/latex/contrib/uni-titlepage/LICENSE.md
+2021/09/01 | 1077990 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-x64-2.9.tar.lzma
+2021/09/01 | 105223 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-x64-2.9.tar.lzma
+2021/09/01 | 104420 | systems/texlive/tlnet/archive/musixtex.r60382.tar.xz
+2021/09/01 | 103399 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-x64-2.9.tar.lzma
+2021/09/01 | 103389 | macros/latex/contrib/uni-titlepage/titlepage-UKoLa.pdf
+2021/09/01 | 103204 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-x64-2.9.tar.lzma
+2021/09/01 | 102072 | systems/texlive/tlnet/archive/profcollege.r60380.tar.xz
+2021/09/01 | 100624 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-2.9.tar.lzma
2021/08/31 | 957498 | macros/latex/contrib/biblatex-contrib/biblatex-ext.zip
-2021/08/31 | 956 | systems/win32/miktex/tm/packages/pr.ini
-2021/08/31 | 95402 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-x64-2.9.tar.lzma
2021/08/31 | 9516 | macros/latex/contrib/biblatex-contrib/biblatex-ext/blxextdoiapi.lua
-2021/08/31 | 94798 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-2.9.tar.lzma
2021/08/31 | 947793 | install/macros/generic/markdown.tds.zip
-2021/08/31 | 94311 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-2.9.tar.lzma
2021/08/31 | 9414 | macros/generic/markdown/README.md
2021/08/31 | 9108 | macros/generic/markdown/markdown.md
2021/08/31 | 892662 | macros/generic/markdown.zip
-2021/08/31 | 87777 | systems/win32/miktex/tm/packages/next/miktex-png-bin-x64-2.9.tar.lzma
-2021/08/31 | 8768 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-x64-2.9.tar.lzma
2021/08/31 | 8766 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-icomp.cbx
-2021/08/31 | 83540 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-2.9.tar.lzma
2021/08/31 | 834577 | macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext.pdf
2021/08/31 | 8316 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-comp.cbx
2021/08/31 | 83112 | systems/texlive/tlnet/archive/footnotehyper.doc.r60374.tar.xz
-2021/08/31 | 815240 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-x64-2.9.tar.lzma
2021/08/31 | 80743 | macros/latex/contrib/easybook/easybook.tex
-2021/08/31 | 80449 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-x64-2.9.tar.lzma
2021/08/31 | 7975 | macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oasymb-l3draw.sty
2021/08/31 | 79667 | macros/latex/contrib/easybook/easybook.dtx
-2021/08/31 | 78774 | systems/win32/miktex/tm/packages/next/miktex-png-bin-2.9.tar.lzma
-2021/08/31 | 77951 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-x64-2.9.tar.lzma
-2021/08/31 | 7721 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-2.9.tar.lzma
-2021/08/31 | 76826 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-x64-2.9.tar.lzma
-2021/08/31 | 75791 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-x64-2.9.tar.lzma
-2021/08/31 | 744116 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-2.9.tar.lzma
-2021/08/31 | 74210 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-x64-2.9.tar.lzma
-2021/08/31 | 73196 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-2.9.tar.lzma
-2021/08/31 | 73146 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-x64-2.9.tar.lzma
2021/08/31 | 7242853 | macros/latex/contrib/profcollege.zip
-2021/08/31 | 72205 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-x64-2.9.tar.lzma
2021/08/31 | 718 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-inote.cbx
-2021/08/31 | 71667 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-2.9.tar.lzma
2021/08/31 | 715 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-note.cbx
2021/08/31 | 715 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic-verb.bbx
2021/08/31 | 713 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad3.cbx
2021/08/31 | 713 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad2.cbx
2021/08/31 | 713 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad1.cbx
2021/08/31 | 710 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-ibid.cbx
-2021/08/31 | 70648 | systems/win32/miktex/tm/packages/next/miktex-web-bin-x64-2.9.tar.lzma
2021/08/31 | 705 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ticomp.bbx
2021/08/31 | 702 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tiecomp.bbx
2021/08/31 | 702 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-terse.bbx
@@ -54,7 +296,6 @@
2021/08/31 | 699 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tecomp.bbx
2021/08/31 | 699 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ibid.bbx
2021/08/31 | 699 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-comp.bbx
-2021/08/31 | 69914 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-x64-2.9.tar.lzma
2021/08/31 | 698 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-icomp.bbx
2021/08/31 | 697 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tcomp.bbx
2021/08/31 | 695 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose.cbx
@@ -63,21 +304,12 @@
2021/08/31 | 692 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-terse.bbx
2021/08/31 | 691 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-iecomp.bbx
2021/08/31 | 688 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ecomp.bbx
+2021/08/31 | 6875 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
2021/08/31 | 684 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle.bbx
-2021/08/31 | 681253 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-x64-2.9.tar.lzma
-2021/08/31 | 6810931 | systems/texlive/tlnet/install-tl-unx.tar.gz
-2021/08/31 | 68023 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-x64-2.9.tar.lzma
-2021/08/31 | 67818 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-2.9.tar.lzma
2021/08/31 | 677 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear.bbx
-2021/08/31 | 67619 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-2.9.tar.lzma
-2021/08/31 | 67484 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-2.9.tar.lzma
2021/08/31 | 6671 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tiecomp.cbx
2021/08/31 | 664748 | macros/latex/contrib/profcollege/latex/ProfCollege.sty
-2021/08/31 | 65786 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-x64-2.9.tar.lzma
-2021/08/31 | 65620 | systems/win32/miktex/tm/packages/next/miktex-web-bin-2.9.tar.lzma
2021/08/31 | 6444 | systems/texlive/tlnet/archive/collection-latexextra.r60375.tar.xz
-2021/08/31 | 64426 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-2.9.tar.lzma
-2021/08/31 | 64185 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-2.9.tar.lzma
2021/08/31 | 640 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad3.bbx
2021/08/31 | 640 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad2.bbx
2021/08/31 | 640 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad1.bbx
@@ -86,246 +318,78 @@
2021/08/31 | 637 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-ibid.bbx
2021/08/31 | 637 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-verb.bbx
2021/08/31 | 637 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-comp.bbx
-2021/08/31 | 63776 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-2.9.tar.lzma
2021/08/31 | 631925 | macros/latex/contrib/easybook.zip
-2021/08/31 | 629397 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-2.9.tar.lzma
2021/08/31 | 628 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic.bbx
2021/08/31 | 628207 | macros/generic/markdown/markdown.pdf
-2021/08/31 | 62785 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-x64-2.9.tar.lzma
-2021/08/31 | 624653 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-x64-2.9.tar.lzma
2021/08/31 | 622 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose.bbx
-2021/08/31 | 62229 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-x64-2.9.tar.lzma
2021/08/31 | 619 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric.bbx
-2021/08/31 | 61813 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-x64-2.9.tar.lzma
2021/08/31 | 6171 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tecomp.cbx
2021/08/31 | 6137 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-icomp.cbx
2021/08/31 | 6130 | macros/latex/contrib/biblatex-contrib/biblatex-ext/README.md
2021/08/31 | 6074 | macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oasymb-tikz.sty
-2021/08/31 | 60637 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-2.9.tar.lzma
-2021/08/31 | 60039 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-x64.tar.lzma
-2021/08/31 | 596931 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-x64-2.9.tar.lzma
-2021/08/31 | 594204 | systems/win32/miktex/tm/packages/next/files.csv.lzma
-2021/08/31 | 594022 | systems/win32/miktex/tm/packages/files.csv.lzma
2021/08/31 | 590672 | macros/latex/contrib/easybook/easybook.pdf
-2021/08/31 | 589844 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-2.9.tar.lzma
2021/08/31 | 5834 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ibid.cbx
2021/08/31 | 5833 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-comp.cbx
2021/08/31 | 5773 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ticomp.cbx
-2021/08/31 | 57730 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-x64-2.9.tar.lzma
-2021/08/31 | 57547 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-x64-2.9.tar.lzma
-2021/08/31 | 57138 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin-x64.tar.lzma
-2021/08/31 | 57012 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-2.9.tar.lzma
-2021/08/31 | 56684 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-x64-2.9.tar.lzma
-2021/08/31 | 566530 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-x64-2.9.tar.lzma
-2021/08/31 | 56515 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin.tar.lzma
-2021/08/31 | 56476 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-x64-2.9.tar.lzma
-2021/08/31 | 56355 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-2.9.tar.lzma
-2021/08/31 | 56317 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-2.9.tar.lzma
2021/08/31 | 5586 | macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oasymb-pict2e.sty
2021/08/31 | 558270 | macros/generic/markdown/markdown.html
-2021/08/31 | 55498 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin.tar.lzma
2021/08/31 | 5533 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-common.bbx
2021/08/31 | 5505 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear.cbx
-2021/08/31 | 54630 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-2.9.tar.lzma
2021/08/31 | 54612 | systems/texlive/tlnet/archive/acmart.source.r60372.tar.xz
2021/08/31 | 5336 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tcomp.cbx
-2021/08/31 | 531854 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-2.9.tar.lzma
-2021/08/31 | 52522 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-x64-2.9.tar.lzma
2021/08/31 | 519788 | macros/generic/markdown/markdown.dtx
-2021/08/31 | 51748 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-x64-2.9.tar.lzma
-2021/08/31 | 51310 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-2.9.tar.lzma
-2021/08/31 | 51201 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-x64-2.9.tar.lzma
-2021/08/31 | 51113 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-2.9.tar.lzma
-2021/08/31 | 510587 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-x64-2.9.tar.lzma
-2021/08/31 | 50395 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-2.9.tar.lzma
2021/08/31 | 5016 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ibid.cbx
-2021/08/31 | 50151 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-2.9.tar.lzma
-2021/08/31 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
2021/08/31 | 4852 | systems/texlive/tlnet/archive/styledcmd.source.r60375.tar.xz
-2021/08/31 | 483652 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-2.9.tar.lzma
-2021/08/31 | 48252 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-x64-2.9.tar.lzma
2021/08/31 | 4798 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle.cbx
-2021/08/31 | 476919 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-2.9.tar.lzma
2021/08/31 | 4757 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-comp.cbx
-2021/08/31 | 46906 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-x64-2.9.tar.lzma
-2021/08/31 | 461811 | systems/win32/miktex/tm/packages/next/miktex-doc.tar.lzma
-2021/08/31 | 45970 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-2.9.tar.lzma
-2021/08/31 | 45905 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-2.9.tar.lzma
2021/08/31 | 4576 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ticomp.cbx
-2021/08/31 | 455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
-2021/08/31 | 455 | systems/texlive/tlnet/install-tl.zip.sha512.asc
-2021/08/31 | 455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
-2021/08/31 | 455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
-2021/08/31 | 45311 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-x64-2.9.tar.lzma
2021/08/31 | 4530 | macros/generic/markdown/markdown.css
-2021/08/31 | 43425 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-x64-2.9.tar.lzma
-2021/08/31 | 43028 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-2.9.tar.lzma
-2021/08/31 | 43002 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-x64-2.9.tar.lzma
-2021/08/31 | 42891 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-2.9.tar.lzma
-2021/08/31 | 42711 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-x64-2.9.tar.lzma
-2021/08/31 | 42386 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-2.9.tar.lzma
-2021/08/31 | 41194 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-2.9.tar.lzma
2021/08/31 | 4111 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric.cbx
-2021/08/31 | 40229 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin-x64.tar.lzma
-2021/08/31 | 400004 | systems/texlive/tlnet/archive/texlive-scripts.doc.r60371.tar.xz
2021/08/31 | 3985 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-tcomp.cbx
-2021/08/31 | 392794 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-x64-2.9.tar.lzma
-2021/08/31 | 39128 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-2.9.tar.lzma
2021/08/31 | 38688 | systems/texlive/tlnet/archive/acmart.r60372.tar.xz
2021/08/31 | 3867643 | macros/latex/contrib/profcollege/doc/ProfCollege-doc.zip
2021/08/31 | 38625 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-standard.bbx
-2021/08/31 | 38140 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-2.9.tar.lzma
2021/08/31 | 3811 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic.cbx
2021/08/31 | 38037 | macros/context/contrib/context-typescripts.zip
-2021/08/31 | 37806 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-2.9.tar.lzma
-2021/08/31 | 37360 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin-x64.tar.lzma
-2021/08/31 | 37241 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-x64-2.9.tar.lzma
2021/08/31 | 3692 | systems/texlive/tlnet/archive/footnotehyper.r60374.tar.xz
2021/08/31 | 3672 | systems/texlive/tlnet/archive/exesheet.r60373.tar.xz
-2021/08/31 | 36627 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-x64-2.9.tar.lzma
2021/08/31 | 3632 | macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oa-doiapi.sty
2021/08/31 | 3604456 | macros/latex/contrib/profcollege/doc/ProfCollege-doc.pdf
-2021/08/31 | 35691 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin.tar.lzma
2021/08/31 | 3568140 | systems/texlive/tlnet/archive/acmart.doc.r60372.tar.xz
2021/08/31 | 3548 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-verb.cbx
-2021/08/31 | 35085 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-x64-2.9.tar.lzma
-2021/08/31 | 34664 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-x64-2.9.tar.lzma
-2021/08/31 | 345737 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-x64-2.9.tar.lzma
2021/08/31 | 344440 | systems/texlive/tlnet/archive/styledcmd.doc.r60375.tar.xz
-2021/08/31 | 33632 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-x64-2.9.tar.lzma
-2021/08/31 | 33545 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin.tar.lzma
-2021/08/31 | 330787 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-2.9.tar.lzma
-2021/08/31 | 32673 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-2.9.tar.lzma
-2021/08/31 | 325042 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-x64-2.9.tar.lzma
2021/08/31 | 3249 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic-verb.cbx
-2021/08/31 | 31620 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-x64-2.9.tar.lzma
-2021/08/31 | 31536 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-2.9.tar.lzma
-2021/08/31 | 31351 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-x64-2.9.tar.lzma
-2021/08/31 | 31230 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-2.9.tar.lzma
-2021/08/31 | 312108 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-2.9.tar.lzma
-2021/08/31 | 30823 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-x64-2.9.tar.lzma
-2021/08/31 | 30058 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-x64-2.9.tar.lzma
2021/08/31 | 2995 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-common.cbx
-2021/08/31 | 29842 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-2.9.tar.lzma
-2021/08/31 | 295203 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-x64-2.9.tar.lzma
2021/08/31 | 2942 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-dashed-common.bbx
2021/08/31 | 2921 | macros/generic/markdown/examples/example.md
-2021/08/31 | 29038 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-2.9.tar.lzma
-2021/08/31 | 284580 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-2.9.tar.lzma
-2021/08/31 | 284025 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-x64-2.9.tar.lzma
-2021/08/31 | 28389 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-2.9.tar.lzma
-2021/08/31 | 28179 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-x64-2.9.tar.lzma
-2021/08/31 | 2796725 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-x64-2.9.tar.lzma
-2021/08/31 | 27729 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-2.9.tar.lzma
-2021/08/31 | 27390 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-x64-2.9.tar.lzma
-2021/08/31 | 27358 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-2.9.tar.lzma
-2021/08/31 | 27198 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-2.9.tar.lzma
-2021/08/31 | 2672612 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-2.9.tar.lzma
-2021/08/31 | 263959 | systems/win32/miktex/tm/packages/next/miktex-console-bin-x64-2.9.tar.lzma
-2021/08/31 | 258880 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-2.9.tar.lzma
-2021/08/31 | 25585285 | systems/texlive/tlnet/install-tl.zip
-2021/08/31 | 25290 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-2.9.tar.lzma
-2021/08/31 | 250265 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-2.9.tar.lzma
-2021/08/31 | 25020 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-2.9.tar.lzma
-2021/08/31 | 24993 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-x64-2.9.tar.lzma
-2021/08/31 | 243425 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-x64-2.9.tar.lzma
-2021/08/31 | 241810 | systems/win32/miktex/tm/packages/next/miktex-console-bin-2.9.tar.lzma
-2021/08/31 | 23903 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-x64-2.9.tar.lzma
-2021/08/31 | 237470 | systems/win32/miktex/tm/packages/next/miktex-zzdb1-2.9.tar.lzma
-2021/08/31 | 237396 | systems/win32/miktex/tm/packages/miktex-zzdb1-2.9.tar.lzma
-2021/08/31 | 23365 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-x64-2.9.tar.lzma
-2021/08/31 | 2331404 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
-2021/08/31 | 22048 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-2.9.tar.lzma
-2021/08/31 | 215248 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-x64-2.9.tar.lzma
-2021/08/31 | 21225 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-2.9.tar.lzma
2021/08/31 | 2104 | systems/texlive/tlnet/archive/styledcmd.r60375.tar.xz
2021/08/31 | 2086 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-terse.cbx
-2021/08/31 | 20810837 | systems/texlive/tlnet/install-tl-windows.exe
-2021/08/31 | 208045 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-2.9.tar.lzma
-2021/08/31 | 206604 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-x64-2.9.tar.lzma
-2021/08/31 | 202796 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-x64-2.9.tar.lzma
-2021/08/31 | 20137 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-2.9.tar.lzma
-2021/08/31 | 2009905 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-x64-2.9.tar.lzma
-2021/08/31 | 199732 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-2.9.tar.lzma
-2021/08/31 | 198169 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-2.9.tar.lzma
-2021/08/31 | 196872 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-2.9.tar.lzma
-2021/08/31 | 196742 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-x64-2.9.tar.lzma
-2021/08/31 | 195635 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-x64-2.9.tar.lzma
-2021/08/31 | 194381 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-2.9.tar.lzma
2021/08/31 | 1848 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-terse.cbx
-2021/08/31 | 18176 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-x64-2.9.tar.lzma
-2021/08/31 | 180120 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-x64-2.9.tar.lzma
-2021/08/31 | 180010 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-2.9.tar.lzma
-2021/08/31 | 17979 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-x64-2.9.tar.lzma
2021/08/31 | 179344 | systems/texlive/tlnet/archive/exesheet.doc.r60373.tar.xz
-2021/08/31 | 178353 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-2.9.tar.lzma
-2021/08/31 | 17378780 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
-2021/08/31 | 1713895 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-2.9.tar.lzma
-2021/08/31 | 169242 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-x64-2.9.tar.lzma
2021/08/31 | 16481 | macros/latex/contrib/xmpincl/xmpincl.dtx
-2021/08/31 | 16414 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-2.9.tar.lzma
2021/08/31 | 16360 | systems/texlive/tlnet/archive/exesheet.source.r60373.tar.xz
-2021/08/31 | 16356 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-2.9.tar.lzma
2021/08/31 | 16008 | systems/texlive/tlnet/archive/footnotehyper.source.r60374.tar.xz
2021/08/31 | 159964 | macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext.tex
-2021/08/31 | 159578 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-x64-2.9.tar.lzma
-2021/08/31 | 154805 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-2.9.tar.lzma
-2021/08/31 | 154424 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-x64-2.9.tar.lzma
-2021/08/31 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
-2021/08/31 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
2021/08/31 | 15162 | macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oa.sty
-2021/08/31 | 147371 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-2.9.tar.lzma
-2021/08/31 | 1464204 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-x64-2.9.tar.lzma
-2021/08/31 | 145 | systems/texlive/tlnet/install-tl.zip.sha512
-2021/08/31 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
-2021/08/31 | 14348 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-x64-2.9.tar.lzma
-2021/08/31 | 1421868 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-x64-2.9.tar.lzma
2021/08/31 | 1402 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-note-common.cbx
2021/08/31 | 1391 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-common.bbx
-2021/08/31 | 136822 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-x64-2.9.tar.lzma
-2021/08/31 | 136817 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-2.9.tar.lzma
-2021/08/31 | 13466 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-2.9.tar.lzma
-2021/08/31 | 1340929 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-2.9.tar.lzma
-2021/08/31 | 133863 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-x64-2.9.tar.lzma
-2021/08/31 | 1332865 | systems/win32/miktex/tm/packages/miktex-zzdb2-2.9.tar.lzma
-2021/08/31 | 1332680 | systems/win32/miktex/tm/packages/next/miktex-zzdb2-2.9.tar.lzma
-2021/08/31 | 1301193 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-x64-2.9.tar.lzma
-2021/08/31 | 1291299 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-2.9.tar.lzma
2021/08/31 | 1285 | macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-examples.bib
2021/08/31 | 12772 | macros/latex/contrib/biblatex-contrib/biblatex-ext/CHANGES.md
-2021/08/31 | 124282 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-2.9.tar.lzma
2021/08/31 | 12403 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-biblatex-aux.def
-2021/08/31 | 1238269 | systems/win32/miktex/tm/packages/miktex-zzdb3-2.9.tar.lzma
-2021/08/31 | 1237768 | systems/win32/miktex/tm/packages/next/miktex-zzdb3-2.9.tar.lzma
2021/08/31 | 12189 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-iecomp.cbx
-2021/08/31 | 119819 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-2.9.tar.lzma
2021/08/31 | 11724 | macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ecomp.cbx
-2021/08/31 | 1169717 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-2.9.tar.lzma
-2021/08/31 | 1153 | systems/win32/miktex/tm/packages/next/pr.ini
-2021/08/31 | 115351 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-x64-2.9.tar.lzma
-2021/08/31 | 112983 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-x64-2.9.tar.lzma
-2021/08/31 | 112086 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-x64-2.9.tar.lzma
-2021/08/31 | 109030 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-x64-2.9.tar.lzma
-2021/08/31 | 108284 | systems/texlive/tlnet/archive/texlive-scripts.r60371.tar.xz
2021/08/31 | 10823 | macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-tabular.sty
-2021/08/31 | 1077990 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-x64-2.9.tar.lzma
2021/08/31 | 107158 | macros/latex/contrib/xmpincl.zip
2021/08/31 | 1060 | macros/generic/markdown/examples/context.tex
2021/08/31 | 1052 | macros/generic/markdown/examples/latex.tex
-2021/08/31 | 105220 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-x64-2.9.tar.lzma
-2021/08/31 | 103399 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-x64-2.9.tar.lzma
-2021/08/31 | 103204 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-x64-2.9.tar.lzma
-2021/08/31 | 100624 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-2.9.tar.lzma
2021/08/30 | 9937601 | macros/latex/contrib/acmart.zip
2021/08/30 | 98708 | macros/latex/contrib/footnotehyper.zip
-2021/08/30 | 9012 | systems/texlive/tlnet/archive/musixtex.source.r60367.tar.xz
2021/08/30 | 89982 | macros/latex/contrib/acmart/ACM-Reference-Format.bst
2021/08/30 | 876423 | macros/latex/contrib/acmart/acmart.pdf
2021/08/30 | 7968 | systems/texlive/tlnet/archive/babel-dutch.source.r60362.tar.xz
2021/08/30 | 768577 | macros/latex/contrib/acmart/samples/sample-lualatex.pdf
2021/08/30 | 6901 | macros/musixtex/doc/musixtex-install.tex
2021/08/30 | 681608 | systems/texlive/tlnet/archive/pm-isomath.doc.r60368.tar.xz
-2021/08/30 | 6787 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
2021/08/30 | 653979 | macros/latex/contrib/acmart/samples/sample-xelatex.pdf
2021/08/30 | 6038058 | install/fonts/musixtex-fonts.tds.zip
2021/08/30 | 6014554 | fonts/musixtex-fonts.zip
@@ -333,7 +397,6 @@
2021/08/30 | 598308 | macros/latex/contrib/acmart/samples/sample-manuscript.pdf
2021/08/30 | 596255 | macros/latex/contrib/acmart/samples/sample-acmsmall.pdf
2021/08/30 | 586403 | macros/latex/contrib/acmart/samples/sample-acmlarge.pdf
-2021/08/30 | 572980 | systems/texlive/tlnet/archive/musixtex.r60367.tar.xz
2021/08/30 | 543940 | macros/latex/contrib/acmart/samples/sample-acmtog.pdf
2021/08/30 | 5432 | systems/texlive/tlnet/archive/secnum.source.r60365.tar.xz
2021/08/30 | 46896 | systems/texlive/tlnet/archive/tagpdf.source.r60366.tar.xz
@@ -342,9 +405,7 @@
2021/08/30 | 418944 | systems/texlive/tlnet/archive/secnum.doc.r60365.tar.xz
2021/08/30 | 417944 | macros/latex/contrib/acmart/acmguide.pdf
2021/08/30 | 3497 | fonts/musixtex-fonts/doc/musixtex-fonts-install.tex
-2021/08/30 | 349022 | macros/latex/contrib/styledcmd.zip
2021/08/30 | 348116 | systems/texlive/tlnet/archive/etl.doc.r60364.tar.xz
-2021/08/30 | 333336 | macros/latex/contrib/styledcmd/styledcmd.pdf
2021/08/30 | 332125 | fonts/musixtex-fonts/type1/MuseJazzText.pfb
2021/08/30 | 3131 | macros/musixtex/README
2021/08/30 | 306 | macros/musixtex/doc/ChangeLog-135.txt
@@ -355,13 +416,11 @@
2021/08/30 | 250735 | macros/latex/contrib/acmart/acmart.dtx
2021/08/30 | 2488591 | macros/musixtex.zip
2021/08/30 | 2380 | fonts/musixtex-fonts/README
-2021/08/30 | 2359792 | systems/texlive/tlnet/archive/musixtex.doc.r60367.tar.xz
2021/08/30 | 2353 | fonts/musixtex-fonts/map/musix.map
2021/08/30 | 2216 | macros/latex/contrib/styledcmd/styledcmd.ins
2021/08/30 | 2096 | systems/texlive/tlnet/archive/secnum.r60365.tar.xz
2021/08/30 | 196756 | systems/texlive/tlnet/archive/clrstrip.doc.r60363.tar.xz
2021/08/30 | 19428 | systems/texlive/tlnet/archive/pm-isomath.source.r60368.tar.xz
-2021/08/30 | 17040 | macros/latex/contrib/styledcmd/styledcmd.dtx
2021/08/30 | 1624 | systems/texlive/tlnet/archive/clrstrip.r60363.tar.xz
2021/08/30 | 1583512 | systems/texlive/tlnet/archive/tagpdf.doc.r60366.tar.xz
2021/08/30 | 157392 | systems/texlive/tlnet/archive/babel-dutch.doc.r60362.tar.xz
@@ -375,6 +434,7 @@
2021/08/30 | 1028168 | macros/latex/contrib/acmart/samples/sample-sigplan.pdf
2021/08/30 | 1022898 | macros/latex/contrib/acmart/samples/sample-authordraft.pdf
2021/08/30 | 1019091 | macros/latex/contrib/acmart/samples/sample-sigconf.pdf
+2021/08/29 | 99341137 | systems/win32/TLW64/tl-win64.zip
2021/08/29 | 8488156 | systems/texlive/tlnet/archive/pdfmanagement-testphase.doc.r60347.tar.xz
2021/08/29 | 795 | macros/latex/contrib/acmart/samples/samples.ins
2021/08/29 | 742404 | systems/texlive/tlnet/archive/l3build.doc.r60344.tar.xz
@@ -434,6 +494,7 @@
2021/08/29 | 2047 | macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-imp-ubuntu.mkiv
2021/08/29 | 202822 | macros/latex/contrib/exesheet.zip
2021/08/29 | 199637 | macros/latex/contrib/clrstrip.zip
+2021/08/29 | 1984 | systems/win32/TLW64/00README.TLW64
2021/08/29 | 1962 | macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-imp-kontrapunkt.mkiv
2021/08/29 | 1915 | macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-imp-axel.mkiv
2021/08/29 | 1718 | macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-imp-fertigo.mkiv
@@ -1059,45 +1120,3 @@
2021/08/26 | 1086 | graphics/pstricks/base/doc/pst-doc.ist
2021/08/26 | 103548 | graphics/pstricks/base/doc/pst-news13.pdf
2021/08/26 | 1004 | graphics/pstricks/base/generic/pstricks-xetex.def
-2021/08/25 | 9865 | macros/latex/contrib/polski/czytaj.txt
-2021/08/25 | 86160 | macros/latex/contrib/polski/sample-polski.pdf
-2021/08/25 | 7605 | macros/latex/contrib/huawei/huawei.tex
-2021/08/25 | 7396 | macros/latex/contrib/polski/polski.ins
-2021/08/25 | 630351 | macros/generic/tokcycle/tokcycle-examples.pdf
-2021/08/25 | 627435 | macros/generic/tokcycle/tokcycle-doc.pdf
-2021/08/25 | 600780 | macros/latex/contrib/huawei.zip
-2021/08/25 | 562 | graphics/pstricks/contrib/pst-arrow/README
-2021/08/25 | 54079 | macros/latex/contrib/polski/polski.dtx
-2021/08/25 | 533 | graphics/pstricks/contrib/pst-arrow/Changes
-2021/08/25 | 527 | graphics/pstricks/contrib/pst-arrow/latex/pst-arrow.sty
-2021/08/25 | 4524 | macros/latex/contrib/polski/conowego.txt
-2021/08/25 | 403 | macros/latex/contrib/huawei/DEPENDS.txt
-2021/08/25 | 3732 | macros/context/contrib/context-filter/tex/context/third/filter/t-module-catcodes.mkii
-2021/08/25 | 35633 | macros/context/contrib/context-filter/doc/context/third/filter/filter.txt
-2021/08/25 | 3557191 | dviware/dvisvgm.zip
-2021/08/25 | 333239 | macros/latex/contrib/huawei/huawei.pdf
-2021/08/25 | 3296 | macros/context/contrib/context-filter/tex/context/third/filter/t-module-catcodes.mkiv
-2021/08/25 | 322788 | macros/latex/contrib/polski.zip
-2021/08/25 | 3204 | graphics/pstricks/contrib/pst-arrow/doc/pst-arrow-doc.bib
-2021/08/25 | 31168 | graphics/pstricks/contrib/pst-arrow/doc/pst-arrow-doc.tex
-2021/08/25 | 253724 | macros/latex/contrib/huawei/huawei-cover-picture.pdf
-2021/08/25 | 222065 | graphics/pstricks/contrib/pst-arrow/doc/pst-arrow-doc.pdf
-2021/08/25 | 20588 | macros/context/contrib/context-filter/tex/context/third/filter/t-filter.mkxl
-2021/08/25 | 2057 | macros/latex/contrib/huawei/samples/huawei-charter.tex
-2021/08/25 | 20415 | macros/context/contrib/context-filter/tex/context/third/filter/t-filter.mkiv
-2021/08/25 | 1947 | macros/latex/contrib/huawei/samples/huawei-cfp.tex
-2021/08/25 | 191317 | macros/latex/contrib/polski/polski.pdf
-2021/08/25 | 18774 | graphics/pstricks/base/doc/pst-doc.cls
-2021/08/25 | 18738 | macros/generic/tokcycle/tokcycle.tex
-2021/08/25 | 18112 | macros/context/contrib/context-filter/tex/context/third/filter/t-filter.mkii
-2021/08/25 | 17491 | macros/latex/contrib/huawei/huawei.cls
-2021/08/25 | 16980 | macros/latex/contrib/polski/strony.dtx
-2021/08/25 | 161445 | support/TeX4ht/source/ChangeLog
-2021/08/25 | 151742 | graphics/pstricks/contrib/pst-arrow.zip
-2021/08/25 | 1497 | macros/latex/contrib/huawei/README.md
-2021/08/25 | 1461 | macros/latex/contrib/huawei/samples/huawei-main.bib
-2021/08/25 | 1436 | macros/latex/contrib/polski/README
-2021/08/25 | 1223986 | macros/generic/tokcycle.zip
-2021/08/25 | 11 | macros/context/contrib/context-filter/VERSION
-2021/08/25 | 1094861 | support/TeX4ht/source/tex4ht-4ht.tex
-2021/08/25 | 10422 | graphics/pstricks/contrib/pst-arrow/tex/pst-arrow.tex
diff --git a/graphics/pstricks/contrib/pst-geo/Changes b/graphics/pstricks/contrib/pst-geo/Changes
index e690c8e591..c2b754f5e9 100644
--- a/graphics/pstricks/contrib/pst-geo/Changes
+++ b/graphics/pstricks/contrib/pst-geo/Changes
@@ -1,4 +1,5 @@
..... pst-geo.tex
+0.07 2021-09-01 - load tx@geoDict for arccos
0.06 2016-12-08 - bugfix for \psepicenter
- changed default for borders=true
0.05 2016-12-07 - bugfix for borderss->borders
diff --git a/graphics/pstricks/contrib/pst-geo/README b/graphics/pstricks/contrib/pst-geo/README
index e96c8b35fa..9ff20b37bf 100644
--- a/graphics/pstricks/contrib/pst-geo/README
+++ b/graphics/pstricks/contrib/pst-geo/README
@@ -7,6 +7,11 @@ pst-geo.sty main LaTeX file
Install all files as usual and update
the TeX database with texhash or mktexlsr, if needed.
-
Links:
<a href="http://frmas.free.fr/li_1.htm">Data</a>
+
+%% 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.
+
+hvoss@tug.org \ No newline at end of file
diff --git a/graphics/pstricks/contrib/pst-geo/data/README b/graphics/pstricks/contrib/pst-geo/data/README.data
index bd25910dd4..bd25910dd4 100644
--- a/graphics/pstricks/contrib/pst-geo/data/README
+++ b/graphics/pstricks/contrib/pst-geo/data/README.data
diff --git a/graphics/pstricks/contrib/pst-geo/doc/pst-geo-doc.bib b/graphics/pstricks/contrib/pst-geo/doc/pst-geo-doc.bib
index d7ec06279c..3c0e00ec36 100644
--- a/graphics/pstricks/contrib/pst-geo/doc/pst-geo-doc.bib
+++ b/graphics/pstricks/contrib/pst-geo/doc/pst-geo-doc.bib
@@ -17,7 +17,7 @@
@Book{PSTricks2,
author = {Herbert Vo\ss},
title = {{\PST} {G}rafik f\"ur \TeX{} und \LaTeX},
- edition = {forth},
+ edition = {7},
publisher = {DANTE -- Lehmanns},
year = {2007},
address = {Heidelberg/Hamburg}
@@ -26,7 +26,7 @@
@Book{companion04,
author = {Frank Mittelbach and Michel Goosens et al},
title = {The {\LaTeX} {C}ompanion},
- edition = {second},
+ edition = {2},
publisher = {Addison-Wesley Publishing Company},
year = {2004},
address = {Boston}
@@ -35,7 +35,7 @@
@Book{begleiter05,
author = {Frank Mittelbach and Michel Goosens et al},
title = {Der {\LaTeX} {B}egleiter},
- edition = {zweite},
+ edition = {2},
publisher = {Pearson Education},
year = {2005},
address = {M\"unchen}
@@ -95,19 +95,11 @@
author = {Michel Goosens and Frank Mittelbach and Sebastian Rahtz and Denis Roegel and Herbert Vo{\ss}},
title = {The {\LaTeX} {G}raphics {C}ompanion},
publisher = {{Addison-Wesley Publishing Company}},
- edition = second,
+ edition = 2,
year = {2007},
address = {Reading, Mass.}
}
-@Book{voss:chaos,
- author = {Herbert Vo{\ss}},
- title = {Chaos und {F}raktale selbst programmieren: von {M}andelbrotmengen {\"u}ber {F}arbmanipulationen zur perfekten Darstellung},
- publisher = {{Franzis Verlag}},
- year = {1994},
- address = {Poing}
-}
-
@Article{girou:01:,
author = {Denis Girou},
title = {Pr\'esentation de {PST}ricks},
@@ -164,18 +156,4 @@
year = 1997
}
-@MISC{xkeyval,
- author = {Hendri Adriaens},
- title = {xkeyval package},
- howpublished = {\url{CTAN:/macros/latex/contrib/xkeyval}},
- year = 2004
-}
-
-@book{voss06,
- Title = {\LaTeX{} in {N}aturwissenschaften \&{} {M}athematik},
- Author = {Herbert Vo\ss},
- Publisher = {Franzis Verlag},
- Edition= {first},
- Address= {M\"unchen},
- Year= {2006},
-}
+y \ No newline at end of file
diff --git a/graphics/pstricks/contrib/pst-geo/doc/pst-geo-doc.pdf b/graphics/pstricks/contrib/pst-geo/doc/pst-geo-doc.pdf
index 53bcc1ad36..fbd48e7e48 100644
--- a/graphics/pstricks/contrib/pst-geo/doc/pst-geo-doc.pdf
+++ b/graphics/pstricks/contrib/pst-geo/doc/pst-geo-doc.pdf
Binary files differ
diff --git a/graphics/pstricks/contrib/pst-geo/doc/pst-geo-doc.tex b/graphics/pstricks/contrib/pst-geo/doc/pst-geo-doc.tex
index 0fbc289c7b..9e06b2088f 100644
--- a/graphics/pstricks/contrib/pst-geo/doc/pst-geo-doc.tex
+++ b/graphics/pstricks/contrib/pst-geo/doc/pst-geo-doc.tex
@@ -1,7 +1,6 @@
%% $Id: pst-geo-doc.tex 918 2014-05-19 12:32:37Z herbert $
\documentclass[11pt,french,BCOR10mm,DIV12,bibliography=totoc,parskip=false,
smallheadings, headexclude,footexclude,oneside]{pst-doc}
-\usepackage[utf8]{inputenc}
\usepackage{pstricks,url}
\usepackage{ragged2e,xspace}
@@ -17,6 +16,9 @@
\renewcommand\bgImage{}%
\definecolor{ocean}{rgb}{0.5,0.8,0.8}
+\addbibresource{pst-geo-doc.bib}
+
+
\begin{document}
\title{\texttt{pst-geo}}
@@ -1074,10 +1076,9 @@ améliorer ces package : \texttt{pst-geo}, n'hésitez pas à vous manifester\ldo
\xkvview{family=pst-geo,columns={key,type,default}}
\bgroup
-\raggedright
+\RaggedRight
\nocite{*}
-\bibliographystyle{plain}
-\bibliography{\jobname}
+\printbibliography
\egroup
\printindex
diff --git a/graphics/pstricks/contrib/pst-geo/tex/pst-geo.tex b/graphics/pstricks/contrib/pst-geo/tex/pst-geo.tex
index 7e7f2ee3bb..8d9135c6c4 100644
--- a/graphics/pstricks/contrib/pst-geo/tex/pst-geo.tex
+++ b/graphics/pstricks/contrib/pst-geo/tex/pst-geo.tex
@@ -5,11 +5,12 @@
%%
%% Package `pst-geo'
%%
+%% Copyright 2016, 2021
%% Manuel Luque <Mluque5130@aol.com> (France)
%% Giuseppe Matarazzo <joematara@hotmail.com> (Italy)
%% Herbert Voss <hvoss@tug.org> (Germany)
%%
-%% December 07, 2016
+%% September 1, 2021
%%
%% This program can be redistributed and/or modified under the terms
%% of the LaTeX Project Public License Distributed from CTAN archives
@@ -30,16 +31,16 @@
%
\edef\PstAtCode{\the\catcode`\@} \catcode`\@=11\relax
-
\pst@addfams{pst-geo}
%
-\def\fileversion{0.06}
-\def\filedate{2016/12/08}
+\def\fileversion{0.07}
+\def\filedate{2021/09/01}
\message{`PST-geo' v\fileversion, \filedate\space (ML/HV)}
%
\pstheader{pst-geo.pro}
\define@key[psset]{pst-geo}{path}[data]{\def\psk@geo@Path{#1}} % chemin des données
+\define@key[psset]{pst-geo}{specialData}[]{\def\psk@geo@specialData{#1}}
\define@key[psset]{pst-geo}{level}[1]{\def\psk@geo@level{#1}}
\define@key[psset]{pst-geo}{type}[1]{\def\psk@geo@type{#1}}
% type=1 ==> Mercator
@@ -50,7 +51,7 @@
% type=6 ==> Babinet
% type=7 ==> Collignon
% type=8 ==> Bonne
-\psset{path=data,level=1,type=1}
+\psset{path=data,level=1,type=1,specialData={}}
\define@key[psset]{pst-geo}{n}[n]{\def\psk@geo@n{#1}}
\psset{n=1.77245} % sqrt(pi) % pour Collignon
\define@key[psset]{pst-geo}{limiteL}[180]{\def\psk@geo@limiteL{#1}}
@@ -393,7 +394,7 @@
\geo@variablesMap{0}
/Y #2 def
/X #1 def
- X CoeffX 20 div Y CoeffY 20 div){#3}%
+ X CoeffX 20 div Y CoeffY 20 div ){#3}%
}
%
%------------------- hv 2004-05-08 ----------------------
@@ -403,27 +404,28 @@
\def\mapput{\@ifnextchar[{\mapput@i}{\mapput@i[90]}}
\def\mapput@i[#1](#2,#3){\@ifnextchar[{\mapput@iii[#1](#2,#3)}{\mapput@ii[#1](#2,#3)}}
\def\mapput@ii[#1](#2,#3)#4{\mapput@iii[#1](#2,#3)[#4]{#4}}
+%
\def\mapput@iii[#1](#2,#3)[#4]#5{%
\@ifnextchar[{\mapput@iv[#1](#2,#3)[#4]#5}{\mapput@iv[#1](#2,#3)[#4]#5[\@empty]}}
\def\mapput@iv[#1](#2,#3)[#4]#5[#6]{{%
% [angle](longitude,lattitude)[node name]{node label}[country]
- \def\pst@tempb{all}
+ \def\pst@tempb{all}%
\ifx\pst@tempb\psk@geo@mapCountry
- \mapput@v[#1](#2,#3)[#4]{#5}
+ \mapput@v[#1](#2,#3)[#4]{#5}%
\else
- \def\pst@tempb{#6}
+ \def\pst@tempb{#6}%
% \typeout{Compare \pst@tempb{} with \psk@geo@mapCountry}
\ifx\pst@tempb\psk@geo@mapCountry
- \mapput@v[#1](#2,#3)[#4]{#5}
- \fi%
- \fi%
+ \mapput@v[#1](#2,#3)[#4]{#5}%
+ \fi
+ \fi
}}
\def\mapput@v[#1](#2,#3)[#4]#5{{%
- \pnodeMap(#2,#3){#4}
+ \pnodeMap(#2,#3){#4}%
% \typeout{Node: #4}
\pst@dima=\psk@geo@nodeWidth
- \pscircle[style=psNodeMapStyle](#4){\pst@dima}
- \pscircle*(#4){0.5\pst@dima}
+ \pscircle[style=psNodeMapStyle](#4){\pst@dima}%
+ \pscircle*(#4){0.5\pst@dima}%
\uput{1.2\pst@dima}[#1](#4){\psframebox[style=psNodeMapStyle]{\psNodeLabelStyle #5}}%
}}
@@ -612,6 +614,11 @@
DrawBdy
\fi
\fi
+ \ifx\psk@geo@specialData\@empty\else
+ (\psk@geo@specialData.dat) run
+ \psk@geo@specialData\space
+ DrawRivers
+ \fi
%
\ifPst@geo@maillage
% meridiens
@@ -834,7 +841,7 @@
/julien BB CC add DD add day add 1720994.5 add def
/hour \psk@geo@hour\space def
/jours julien 2454367 sub def
- /AngleRayonsSoleil latitude_parallel 23.5 sin 360 jours mul 365.25 div sin mul arccos sub def
+ /AngleRayonsSoleil latitude_parallel 23.5 sin 360 jours mul 365.25 div sin mul tx@geoDict begin arccos end sub def
/u1 0 def /u2 AngleRayonsSoleil cos def /u3 AngleRayonsSoleil sin def
% /Julien jd hour 24 div add def
%
diff --git a/macros/latex/contrib/covington/README b/macros/latex/contrib/covington/README
index 327cb913a5..3a1ac7016a 100644
--- a/macros/latex/contrib/covington/README
+++ b/macros/latex/contrib/covington/README
@@ -31,6 +31,11 @@ The package consists of the following files:
== CHANGES ==
+* Version 2.7 (2021-09-01):
+ - Add postamble gloss macro option for arbitrary text that is appended to the free
+ translation line (after closing quotation marks).
+ - Add glosslinepostamble command to markup this text.
+
* Version 2.6 (2021-05-19):
- New length \exampleind to adjust (increase/decrease) the indentation (left margin)
of examples.
diff --git a/macros/latex/contrib/covington/covington.pdf b/macros/latex/contrib/covington/covington.pdf
index 5a56381da2..002771af5d 100644
--- a/macros/latex/contrib/covington/covington.pdf
+++ b/macros/latex/contrib/covington/covington.pdf
Binary files differ
diff --git a/macros/latex/contrib/covington/covington.sty b/macros/latex/contrib/covington/covington.sty
index 79601a2eba..687e496155 100644
--- a/macros/latex/contrib/covington/covington.sty
+++ b/macros/latex/contrib/covington/covington.sty
@@ -42,8 +42,8 @@
%%% Metadata
%%%
-\def\filedate{2021/05/19}
-\def\fileversion{2.6}
+\def\filedate{2021/09/01}
+\def\fileversion{2.7}
\def\filename{covington.sty}
% Force redefinition of environments?
@@ -413,6 +413,10 @@
\def\cov@glp{}
\newcommand*\glosspreamble[1]{\def\cov@glp{#1}}
+% 2021-09-01: optional trailing gloss text (non-interlinearized)
+\newcommand*\glosslinepostamble[1]{#1}
+\def\cov@glpst{}
+
\def\gll{% % Introduces 2-line text-and-gloss.
\begin{flushleft}
\vskip\baselineskip% % Added 1992 Nov 8 to force single spacing
@@ -473,6 +477,7 @@
\def\glend{%
\end{flushleft}%
\def\cov@glp{}%
+ \def\cov@glpst{}%
} % Ends the gloss environment.
% The following TeX code is adapted, with permission, from:
@@ -719,6 +724,11 @@
\define@key{covington}{preamble}{\def\cov@lglp{#1}}
\define@key{gcovington}{preamble}{\def\cov@gglp{#1}}
%
+% 5. Gloss postamble text
+\def\cov@gglpst{}
+\define@key{covington}{postamble}{\def\cov@lglpst{#1}}
+\define@key{gcovington}{postamble}{\def\cov@gglpst{#1}}
+%
% General setting option
\newcommand*\setglossoptions[1]{\setkeys{gcovington}{#1}}
%
@@ -743,13 +753,16 @@
\@ifundefined{lglosslinethree}{}{\def\glosslinethree{\lglosslinethree}}%
\@ifundefined{cov@lglp}{}{\def\cov@gglp{\cov@lglp}}%
\ifx\cov@gglp\empty\else\def\cov@glp{\cov@gglp}\fi%
+ \@ifundefined{cov@lglpst}{}{\def\cov@gglpst{\cov@lglpst}}%
+ \ifx\cov@gglpst\empty\else\def\cov@glpst{\cov@gglpst}\fi%
\xgll #2\xgle
#3\xgle
\ifgtright
- \gln #4
+ \gln #4%
\else
- \glot{#4}
+ \glot{#4}%
\fi
+ \ifx\cov@glpst\empty\else\glosslinepostamble{\cov@glpst}\cov@nopagebreak\fi%
\glend
\ifgexample
\end{covexample}
@@ -781,14 +794,17 @@
\@ifundefined{lglosslinethree}{}{\def\glosslinethree{\lglosslinethree}}%
\@ifundefined{cov@lglp}{}{\def\cov@gglp{\cov@lglp}}%
\ifx\cov@gglp\empty\else\def\cov@glp{\cov@gglp}\fi%
+ \@ifundefined{cov@lglpst}{}{\def\cov@gglpst{\cov@lglpst}}%
+ \ifx\cov@gglpst\empty\else\def\cov@glpst{\cov@gglpst}\fi%
\xglll #2\xgle
#3\xgle
#4\xgle
\ifgtright
- \gln #5
+ \gln #5%
\else
- \glot{#5}
+ \glot{#5}%
\fi
+ \ifx\cov@glpst\empty\else\glosslinepostamble{\cov@glpst}\cov@nopagebreak\fi%
\glend
\ifgexample
\end{covexample}
diff --git a/macros/latex/contrib/covington/covington.tex b/macros/latex/contrib/covington/covington.tex
index 74cc19f33d..5b99e5a73c 100644
--- a/macros/latex/contrib/covington/covington.tex
+++ b/macros/latex/contrib/covington/covington.tex
@@ -94,8 +94,8 @@
%
% Titling
%
-\def\pversion{Version 2.6}
-\def\pdate{May 19, 2021}
+\def\pversion{Version 2.7}
+\def\pdate{September 1, 2021}
\title{\textbf{The \cvt\ Package\\Macros for Linguistics}}
\author{Michael A. Covington \and J\"urgen Spitzm\"uller\thanks{Current maintainer.
@@ -565,12 +565,16 @@ Note that:
Valid values are \LaTeX\ font switches such as \jfcsmacro{itshape}, \jfcsmacro{bfseries} etc.
\item[\joption{preamble=\{\jparam{arbitrary text}\}}] Arbitrary text that is inserted on an own line
before the interlinearized gloss. This might be useful, for instance, to give context information,
- to specify the language or the source in case of cited glosses.
+ to specify the language or the source in case of cited glosses.
The advantages over just adding a line manually above the gloss are that you can globally set the
markup (see sec.~\ref{sec:glossfc}), and that such lines are kept on the same page than the gloss
with the option \joption{noglossbreaks} (at least as long as preamble does not exceed one line).
Furthermore, this option is the only way to add such text when the \joption{ex} option is used.
+
+ \item[\joption{postamble=\{\jparam{arbitrary text}\}}] Arbitrary text that is appended to the translation line, but after
+ the closing quotation mark. This might be useful to add a footnote or some additional text to the translation
+ line, after the actual translation.
\end{description}
%
If given as optional arguments to a \jcsmacro{digloss} or \jcsmacro{trigloss} macro, the options will only apply to
@@ -709,10 +713,16 @@ If not, a fallback quotation (using English single quotation marks) is used. The
The markup of the preamble line (which is not marked up at all by default) can be customized
by redefining the macro:
-\begin{lstlisting}[moretexcs={glosslinetrans,covenquote}]
+\begin{lstlisting}[moretexcs={glosslinepreamble}]
\newcommand*\glosslinepreamble[1]{#1}
\end{lstlisting}
+Analogously, the markup of the postamble text (which is not marked up at all by default either)
+can be customized by redefining the macro:
+\begin{lstlisting}[moretexcs={glosslinepostamble}]
+\newcommand*\glosslinepostamble[1]{#1}
+\end{lstlisting}
+
\subsection{Examples}\label{sec:glossex}
@@ -767,7 +777,7 @@ although you could also construct it manually as:
\end{example}
\end{lstlisting}
%
-And finally, an example that uses the \emph{Leipzig glossing rules} (\cite{leipzig},
+Here is an example that uses the \emph{Leipzig glossing rules} (\cite{leipzig},
cited example: p.~2) and also exemplifies the use of \joption{preamble}:
\digloss[ex, preamble={Lezgian (Haspelmath 1993:207)}]
{Gila abur-u-n ferma hami¨alu\v{g} gü\v{g}üna amuq'-da-\v{c}.}
@@ -786,6 +796,20 @@ Also, if you adhere to the \emph{Leipzig glossing rules}, you might want to chec
\LaTeX\ package \cite{leipzig-ltx} that facilitates the use of the gloss abbreviations that have
been entered and marked-up manually here.
+The final example exemplifies the use of \joption{postamble}. In what follows we add a footnote to the
+translation line, but outside the translation (as marked-up by quotation marks):
+\digloss[ex, postamble={\footnote{Yes, really!}}]
+{Mein Luftkissenboot ist voller Aale}
+{My hovercraft is {full of} eels}
+{Do you have matches?}
+This has been input as follows:
+\begin{lstlisting}[moretexcs={digloss},basicstyle={\footnotesize\ttfamily}]
+\digloss[ex, postamble={\footnote{Yes, really!}}]
+ {Mein Luftkissenboot ist voller Aale}
+ {My hovercraft is {full of} eels}
+ {Do you have matches?}
+\end{lstlisting}
+
\section{Phrase structure rules}
@@ -1104,6 +1128,14 @@ it.
\section{Release history}
+\subsection*{2.7 (2021 September 1)}
+
+\begin{itemize}
+\item Add \joption{postamble} gloss macro option for arbitrary text that is appended to the free
+ translation line (after closing quotation marks). See sec.~\ref{sec:gmacros}.
+\item Add \jcsmacro{glosslinepostamble} command to markup this text. See sec.~\ref{sec:glossfc}.
+\end{itemize}
+
\subsection*{2.6 (2021 May 19)}
\begin{itemize}
diff --git a/macros/latex/contrib/styledcmd/styledcmd.dtx b/macros/latex/contrib/styledcmd/styledcmd.dtx
index d09c077bb4..79da85718a 100644
--- a/macros/latex/contrib/styledcmd/styledcmd.dtx
+++ b/macros/latex/contrib/styledcmd/styledcmd.dtx
@@ -22,11 +22,11 @@
%
% \iffalse
%<*driver>
-\ProvidesFile{styledcmd.dtx}[2021/08/20 1.0 Command with different styles]
+\ProvidesFile{styledcmd.dtx}[2021/08/20 1.1 Command with different styles]
%</driver>
%<package>\NeedsTeXFormat{LaTeX2e}
%<package>\RequirePackage{expl3}[2018-04-12]
-%<package>\ProvidesExplPackage{styledcmd}{2021/08/20}{1.0}{Command with different styles}
+%<package>\ProvidesExplPackage{styledcmd}{2021/08/20}{1.1}{Command with different styles}
%<package>\RequirePackage{xparse}
%<*driver>
\documentclass[full]{l3doc}
@@ -62,7 +62,7 @@
%
%\section{How do you use it?}
%You can create a formatted macro via the following command
-%\begin{function}{\newstyledcmd}
+%\begin{function}{\newstyledcmd, \renewstyledcmd, \providestyledcmd}
%\begin{syntax}
%|\newstyledcmd| \marg{macro name} \marg{format name} \oarg{number of arguments} \marg{code}
%\end{syntax}
@@ -79,7 +79,7 @@
% \saluto[informal]{uncle}
% \saluto[formal]{uncle}
%\end{verbatim}
-%will be expanded respectively as \saluto{uncle}, \saluto[informal]{uncle}, \saluto[formal]{uncle}.
+%will be expanded respectively as \saluto{uncle}, \saluto[informal]{uncle}, \saluto[formal]{uncle}. With the same syntax you can use \tn{renewstyledcmd} and \tn{providestyledcmd} with the same meaning of \tn{renewcommand} and \tn{providecommand} respectively.
%
%\section{How do you change the default style?}
%In order to change the default style (the one used when you don't choose explicitily a format) you need to execute the following command
@@ -95,7 +95,7 @@
%\section{Customize parameters with \pkg{xparse}}
%\thpkg{} loads automatically the \pkg{xparse} package for internal reasons. You can also define new styled commands with the same syntax used by \tn{NewDocumentCommand} with the following command
%
-%\begin{function}{\NewDocStyledCMD}
+%\begin{function}{\NewDocStyledCMD, \RenewDocStyledCMD, \ProvideDocStyledCMD}
%\begin{syntax}
%|\NewDocStyledCMD| \marg{command name} \marg{format name} \marg{arguments format} \marg{code}
%\end{syntax}
@@ -203,6 +203,28 @@
%
%You can also pass an optional argument for the style name you want to use, in particular \verb+\ciao[formal]{Enrico}+ will be always expanded as \ciao[formal]{Enrico}.
%
+%\section{Generate more styled commands}
+%Suppose now that you've created your own version of \tn{newcommand} or \tn{NewDocumentCommand} in order to generate some classes of commands. Suppose that your function name is \tn{mynewcommand} and it accepts, like \tn{newcommand}, the new macro as its first argument. Then you can create styled commands with your own macro by using this function
+%\begin{function}{\stycmd_generate:NN, \stycmd_generate_renew:NN}
+%\begin{syntax}
+%|\stycmd_generate:NN| \meta{new generator name} \meta{generator name}
+%\end{syntax}
+%\end{function}
+%So for example executing
+%\begin{verbatim}
+% \stycmd_generate:NN\mynewstyledcommand\mynewcommand
+%\end{verbatim}
+%you'll create the new macro \tn{mynewstyledcommand} that accepts the command you want to define as first argument, the style you want to use as second argument and the remaining arguments are the same needed by \tn{mynewcommand}.
+%
+%Notice that \tn{newstyledcmd} is defined internally as
+%\begin{verbatim}
+% \stycmd_generate:NN \newstyledcmd \newcommand
+%\end{verbatim}
+%
+%Notice that \tn{mynewcommand} first argument has to be the macro you want to define, otherwise \cs{stycmd_generate:NN} will have undefined behaviour. The \cs{stycmd_generate_renew:NN} function should be used only for ''renew`` type commands that requires a preceding declaration, like \tn{renewcommand} and \tn{RenewDocumentCommand}.
+%
+%Actually there isn't any analogue proceeding for defining customized versions for \tn{newGstyledcmd} and \tn{NewGDocStyledCMD}.
+%
%\end{documentation}
%
%\begin{implementation}
@@ -251,7 +273,7 @@
% \end{macrocode}
%\end{macro}
%
-%\begin{macro}{\__stycmd_erroring:nn, \__stycmd_erroring:nV}
+%\begin{macro}{\__stycmd_erroring:nn, \__stycmd_erroring:nV, \__stycmd_erroring:VV}
%Error messages for undefined styles.
% \begin{macrocode}
\msg_new:nnn { stycmd } { noformat }
@@ -265,7 +287,7 @@
{ \msg_error:nnnn { stycmd } { noformat } {#1} {#2} }
}
-\cs_generate_variant:Nn \@@_erroring:nn { nV }
+\cs_generate_variant:Nn \@@_erroring:nn { nV, VV }
% \end{macrocode}
%\end{macro}
%
@@ -302,7 +324,7 @@
%\end{macro}
%
%\begin{macro}{\__stycmd_macro_overwrite:nn, \__stycmd_macro_overwrite:VV}
-%Overwrite the default style.
+%Overwrite the default style, not the command associated to that style.
% \begin{macrocode}
\cs_new_protected:Npn \@@_macro_overwrite:nn #1#2
{
@@ -354,38 +376,47 @@
% \end{macrocode}
%\end{macro}
%
-%\begin{macro}{\newstyledcmd}
-%Declare a new macro with the specified style name.
+%\begin{macro}{\stycmd_generate:NN, \stycmd_generate_renew:NN}
+%Declare the styled version \verb+#1+ of the macro generator command \verb+#2+. the \verb+_renew+ variant requires a preceding declaration
% \begin{macrocode}
-\NewDocumentCommand \newstyledcmd { m m o +m }
+\cs_new_protected:Npn \stycmd_generate:NN #1#2
{
- \@@_init_vars:Nn { #1 } { #2 }
- \IfNoValueTF {#3}
+ \NewDocumentCommand #1 {m m}
{
- \exp_args:Nc \newcommand { \@@_cmd: } {#4}
+ \@@_init_vars:Nn { ##1 } { ##2 }
+ \@@_macro_default:VV \l_@@_cexp_str \l_@@_fexp_str
+ \@@_macro_declaration:V \l_@@_cexp_str
+ \exp_args:Nc #2 { \@@_cmd: }
}
+ }
+
+\cs_new_protected:Npn \stycmd_generate_renew:NN #1#2
+ {
+ \NewDocumentCommand #1 {m m}
{
- \exp_args:Nc \newcommand { \@@_cmd: } [#3] {#4}
+ \@@_init_vars:Nn { ##1 } { ##2 }
+ \@@_erroring:VV \l_@@_cexp_str \l_@@_fexp_str
+ \exp_args:Nc #2 { \@@_cmd: }
}
-
- \@@_macro_default:VV \l_@@_cexp_str \l_@@_fexp_str
- \@@_macro_declaration:V \l_@@_cexp_str
}
% \end{macrocode}
%\end{macro}
%
-%\begin{macro}{\NewDocStyledCMD}
+%\begin{macro}{\newstyledcmd, \renewstyledcmd, \providestyledcmd}
+%Declare a new macro with the specified style name.
+% \begin{macrocode}
+\stycmd_generate:NN \newstyledcmd \newcommand
+\stycmd_generate_renew:NN \renewstyledcmd \renewcommand
+\stycmd_generate:NN \providestyledcmd \providecommand
+% \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\NewDocStyledCMD, \RenewDocStyledCMD, \ProvideDocStyledCMD}
%Declare a new styled macro with the \tn{NewDocumentCommand} syntax.
% \begin{macrocode}
-\NewDocumentCommand \NewDocStyledCMD {m m m +m}
- {
- \@@_init_vars:Nn { #1 } { #2 }
-
- \exp_args:Nc \NewDocumentCommand { \@@_cmd: } {#3} {#4}
-
- \@@_macro_default:VV \l_@@_cexp_str \l_@@_fexp_str
- \@@_macro_declaration:V \l_@@_cexp_str
- }
+\stycmd_generate:NN \NewDocStyledCMD \NewDocumentCommand
+\stycmd_generate_renew:NN \RenewDocStyledCMD \RenewDocumentCommand
+\stycmd_generate:NN \ProvideDocStyledCMD \ProvideDocumentCommand
% \end{macrocode}
%\end{macro}
%
diff --git a/macros/latex/contrib/styledcmd/styledcmd.pdf b/macros/latex/contrib/styledcmd/styledcmd.pdf
index d552446b58..34d9942d43 100644
--- a/macros/latex/contrib/styledcmd/styledcmd.pdf
+++ b/macros/latex/contrib/styledcmd/styledcmd.pdf
Binary files differ
diff --git a/macros/latex/contrib/tabularray/tabularray-2021.sty b/macros/latex/contrib/tabularray/tabularray-2021.sty
index 90ddaadd34..8e5c2b9369 100644
--- a/macros/latex/contrib/tabularray/tabularray-2021.sty
+++ b/macros/latex/contrib/tabularray/tabularray-2021.sty
@@ -12,7 +12,7 @@
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\ProvidesExplPackage{tabularray}{2021-05-25}{2021J}
+\ProvidesExplPackage{tabularray}{2021-06-05}{2021K}
{Typeset tabulars and arrays with LaTeX3}
\RequirePackage{xparse}
@@ -97,60 +97,78 @@
\box_new:N \l__tblr_c_box % for cell box
\box_new:N \l__tblr_d_box
+%% Some counters for row and column numbering
+\newcounter{rownum}
+\newcounter{colnum}
+\newcounter{rowcount}
+\newcounter{colcount}
+
%%% --------------------------------------------------------
%% \section{Data Structures Based on Property Lists}
%%% --------------------------------------------------------
\int_new:N \g_tblr_level_int % store table nesting level
+\cs_new_protected:Npn \__tblr_clear_prop_lists:
+ {
+ \prop_gclear_new:c { g__tblr_text_ \int_use:N \g_tblr_level_int _prop }
+ \prop_gclear_new:c { g__tblr_command_ \int_use:N \g_tblr_level_int _prop }
+ \prop_gclear_new:c { g__tblr_table_ \int_use:N \g_tblr_level_int _prop }
+ \prop_gclear_new:c { g__tblr_row_ \int_use:N \g_tblr_level_int _prop }
+ \prop_gclear_new:c { g__tblr_column_ \int_use:N \g_tblr_level_int _prop }
+ \prop_gclear_new:c { g__tblr_cell_ \int_use:N \g_tblr_level_int _prop }
+ \prop_gclear_new:c { g__tblr_hline_ \int_use:N \g_tblr_level_int _prop }
+ \prop_gclear_new:c { g__tblr_vline_ \int_use:N \g_tblr_level_int _prop }
+ }
+
\cs_new_protected:Npn \__tblr_prop_gput:nnn #1 #2 #3
{
\prop_gput:cnn
- { g_tblr_#1_ \int_use:N \g_tblr_level_int _prop } { #2 } { #3 }
+ { g__tblr_#1_ \int_use:N \g_tblr_level_int _prop } { #2 } { #3 }
}
\cs_generate_variant:Nn \__tblr_prop_gput:nnn { nnx, nnV, nxn, nxx, nxV }
\cs_new:Npn \__tblr_prop_item:nn #1 #2
{
- \prop_item:cn { g_tblr_#1_ \int_use:N \g_tblr_level_int _prop } { #2 }
+ \prop_item:cn { g__tblr_#1_ \int_use:N \g_tblr_level_int _prop } { #2 }
}
\cs_generate_variant:Nn \__tblr_prop_item:nn { ne }
\cs_new_protected:Npn \__tblr_prop_if_in:nnT #1
{
- \prop_if_in:cnT { g_tblr_#1_ \int_use:N \g_tblr_level_int _prop }
+ \prop_if_in:cnT { g__tblr_#1_ \int_use:N \g_tblr_level_int _prop }
}
\cs_new_protected:Npn \__tblr_prop_if_in:nnF #1
{
- \prop_if_in:cnF { g_tblr_#1_ \int_use:N \g_tblr_level_int _prop }
+ \prop_if_in:cnF { g__tblr_#1_ \int_use:N \g_tblr_level_int _prop }
}
\cs_new_protected:Npn \__tblr_prop_if_in:nnTF #1
{
- \prop_if_in:cnTF { g_tblr_#1_ \int_use:N \g_tblr_level_int _prop }
+ \prop_if_in:cnTF { g__tblr_#1_ \int_use:N \g_tblr_level_int _prop }
}
\prg_generate_conditional_variant:Nnn \__tblr_prop_if_in:nn { nx } { T, F, TF }
\cs_new_protected:Npn \__tblr_prop_log:n #1
{
- \prop_log:c { g_tblr_#1_ \int_use:N \g_tblr_level_int _prop }
+ \prop_log:c { g__tblr_#1_ \int_use:N \g_tblr_level_int _prop }
}
\cs_new_protected:Npn \__tblr_prop_map_inline:nn #1 #2
{
- \prop_map_inline:cn { g_tblr_#1_ \int_use:N \g_tblr_level_int _prop } {#2}
+ \prop_map_inline:cn { g__tblr_#1_ \int_use:N \g_tblr_level_int _prop } {#2}
}
\cs_new_protected:Npn \__tblr_prop_gput_if_larger:nnn #1 #2 #3
{
\__tblr_gput_if_larger:cnn
- { g_tblr_#1_ \int_use:N \g_tblr_level_int _prop } { #2 } { #3 }
+ { g__tblr_#1_ \int_use:N \g_tblr_level_int _prop } { #2 } { #3 }
}
\cs_generate_variant:Nn \__tblr_prop_gput_if_larger:nnn { nnx, nnV, nxn, nxx, nxV }
\cs_new_protected:Npn \__tblr_prop_gadd_dimen_value:nnn #1 #2 #3
{
\__tblr_gadd_dimen_value:cnn
- { g_tblr_#1_ \int_use:N \g_tblr_level_int _prop } { #2 } { #3 }
+ { g__tblr_#1_ \int_use:N \g_tblr_level_int _prop } { #2 } { #3 }
}
\cs_generate_variant:Nn \__tblr_prop_gadd_dimen_value:nnn { nnx, nnV, nxn, nxx }
@@ -193,27 +211,90 @@
}
\cs_generate_variant:Nn \__tblr_gadd_dimen_value:Nnn { cnn }
-%% Some counters for row and column numbering
-\newcounter{rownum}
-\newcounter{colnum}
-\newcounter{rowcount}
-\newcounter{colcount}
+%%% --------------------------------------------------------
+%% \section{Data Structures Based on Token Lists}
+%%% --------------------------------------------------------
+
+\cs_new_protected:Npn \__tblr_clear_text_lists:
+ {
+ \__tblr_clear_one_text_lists:n { text }
+ \__tblr_clear_one_text_lists:n { hline }
+ \__tblr_clear_one_text_lists:n { vline }
+ }
+
+\cs_new_protected:Npn \__tblr_clear_one_text_lists:n #1
+ {
+ \clist_if_exist:cTF { g__tblr_#1_ \int_use:N \g_tblr_level_int _clist }
+ {
+ \clist_map_inline:cn { g__tblr_#1_ \int_use:N \g_tblr_level_int _clist }
+ {
+ \tl_gclear:c { g__tblr_text_ \int_use:N \g_tblr_level_int _#1_##1_tl }
+ }
+ }
+ { \clist_new:c { g__tblr_#1_ \int_use:N \g_tblr_level_int _clist } }
+ }
+
+\cs_new_protected:Npn \__tblr_text_gput:nnn #1 #2 #3
+ {
+ \tl_gset:cn
+ { g__tblr_text_ \int_use:N \g_tblr_level_int _#1_#2_tl } {#3}
+ \clist_gput_right:cx { g__tblr_#1_ \int_use:N \g_tblr_level_int _clist } {#2}
+ }
+\cs_generate_variant:Nn \__tblr_text_gput:nnn { nne, nnV, nen, nee, neV }
+
+\cs_new:Npn \__tblr_text_item:nn #1 #2
+ {
+ \tl_if_exist:cT { g__tblr_text_ \int_use:N \g_tblr_level_int _#1_#2_tl }
+ {
+ \exp_args:Nv \exp_not:n
+ { g__tblr_text_ \int_use:N \g_tblr_level_int _#1_#2_tl }
+ }
+ }
+\cs_generate_variant:Nn \__tblr_text_item:nn { ne }
+
+\cs_new_protected:Npn \__tblr_text_gput_if_larger:nnn #1 #2 #3
+ {
+ \tl_set:Nx \l__tblr_put_if_larger_tl { \__tblr_text_item:nn {#1} {#2} }
+ \bool_lazy_or:nnT
+ { \tl_if_empty_p:N \l__tblr_put_if_larger_tl }
+ { \dim_compare_p:nNn {#3} > { \l__tblr_put_if_larger_tl } }
+ { \__tblr_text_gput:nnn {#1} {#2} {#3} }
+ }
+\cs_generate_variant:Nn \__tblr_text_gput_if_larger:nnn { nne, nnV, nen, nee, neV }
+
+\cs_new_protected:Npn \__tblr_text_log:n #1
+ {
+ \clist_gremove_duplicates:c
+ { g__tblr_#1_ \int_use:N \g_tblr_level_int _clist }
+ \tl_log:n { ----------~----------~----------~----------~---------- }
+ \clist_map_inline:cn { g__tblr_#1_ \int_use:N \g_tblr_level_int _clist }
+ {
+ \tl_log:x
+ {
+ \space { #1 ##1 } ~\space=>~\space { \__tblr_text_item:nn {#1} {##1} }
+ }
+ }
+ }
%%% --------------------------------------------------------
%% \section{Data Structures Based on Integer Arrays}
%%% --------------------------------------------------------
-\int_new:N \g__tblr_array_int
+\msg_new:nnn { tabularray } { intarray-beyond-bound }
+ { Position ~ #2 ~ is ~ beyond ~ the ~ bound ~ of ~ intarray ~ #1.}
-\cs_new_protected:Npn \__tblr_initial_table_data:
+\cs_new_protected:Npn \__tblr_intarray_gset:Nnn #1 #2 #3
{
- \int_gincr:N \g__tblr_array_int
- \intarray_new:cn { g__tblr_row_ \int_use:N \g__tblr_array_int _intarray }
- { \g__tblr_data_row_key_count_int * \c@rowcount }
- \cs_set_eq:cc { g__tblr_row_ \int_use:N \g_tblr_level_int _intarray }
- { g__tblr_row_ \int_use:N \g__tblr_array_int _intarray }
- %\intarray_log:c { g__tblr_row_ \int_use:N \g_tblr_level_int _intarray }
+ \bool_lazy_or:nnTF
+ { \int_compare_p:nNn {#2} < {0} }
+ { \int_compare_p:nNn {#2} > {\intarray_count:N #1} }
+ {
+ \bool_if:NT \g__tblr_tracing_intarray_bool
+ { \msg_warning:nnnn { tabularray } { intarray-beyond-bound } {#1} {#2} }
+ }
+ { \intarray_gset:Nnn #1 {#2} {#3} }
}
+\cs_generate_variant:Nn \__tblr_intarray_gset:Nnn { cnn }
%% #1: data name; #2: key name; #3: value type
\cs_new_protected:Npn \__tblr_data_new_key:nnn #1 #2 #3
@@ -231,7 +312,6 @@
}
\int_new:N \g__tblr_data_row_key_count_int
-
\__tblr_data_new_key:nnn { row } { height } { dim }
\__tblr_data_new_key:nnn { row } { coefficient } { dec }
\__tblr_data_new_key:nnn { row } { abovesep } { dim }
@@ -242,6 +322,52 @@
\__tblr_data_new_key:nnn { row } { @row-upper } { dim }
\__tblr_data_new_key:nnn { row } { @row-lower } { dim }
+\int_new:N \g__tblr_data_column_key_count_int
+\__tblr_data_new_key:nnn { column } { width } { dim }
+\__tblr_data_new_key:nnn { column } { coefficient } { dec }
+\__tblr_data_new_key:nnn { column } { leftsep } { dim }
+\__tblr_data_new_key:nnn { column } { rightsep } { dim }
+\__tblr_data_new_key:nnn { column } { @col-width } { dim }
+
+\int_new:N \g__tblr_data_cell_key_count_int
+\__tblr_data_new_key:nnn { cell } { width } { dim }
+\__tblr_data_new_key:nnn { cell } { rowspan } { int }
+\__tblr_data_new_key:nnn { cell } { colspan } { int }
+\__tblr_data_new_key:nnn { cell } { halign } { str }
+\__tblr_data_new_key:nnn { cell } { valign } { str }
+\__tblr_data_new_key:nnn { cell } { background } { str }
+\__tblr_data_new_key:nnn { cell } { omit } { int }
+\__tblr_data_new_key:nnn { cell } { @cell-width } { dim }
+\__tblr_data_new_key:nnn { cell } { @cell-height } { dim }
+\__tblr_data_new_key:nnn { cell } { @cell-depth } { dim }
+
+\clist_const:Nn \g__tblr_data_clist { row, column, cell }
+\tl_const:Nn \g__tblr_data_row_count_tl { \c@rowcount }
+\tl_const:Nn \g__tblr_data_column_count_tl { \c@colcount }
+\tl_const:Nn \g__tblr_data_cell_count_tl { \c@rowcount * \c@colcount }
+\tl_const:Nn \g__tblr_data_row_index_number_tl {1}
+\tl_const:Nn \g__tblr_data_column_index_number_tl {1}
+\tl_const:Nn \g__tblr_data_cell_index_number_tl {2}
+\int_new:N \g__tblr_array_int
+
+\cs_new_protected:Npn \__tblr_initial_table_data:
+ {
+ \clist_map_function:NN \g__tblr_data_clist \__tblr_initial_one_data:n
+ }
+
+\cs_new_protected:Npn \__tblr_initial_one_data:n #1
+ {
+ \int_gincr:N \g__tblr_array_int
+ \intarray_new:cn { g__tblr_#1_ \int_use:N \g__tblr_array_int _intarray }
+ {
+ \int_use:c { g__tblr_data_#1_key_count_int }
+ * \tl_use:c { g__tblr_data_#1_count_tl }
+ }
+ \cs_set_eq:cc { g__tblr_#1_ \int_use:N \g_tblr_level_int _intarray }
+ { g__tblr_#1_ \int_use:N \g__tblr_array_int _intarray }
+ %\intarray_log:c { g__tblr_#1_ \int_use:N \g_tblr_level_int _intarray }
+ }
+
%% #1: data name; #2: data index; #3: key name
\cs_new:Npn \__tblr_data_key_to_int:nnn #1 #2 #3
{
@@ -249,8 +375,17 @@
+ \tl_use:c { g__tblr_data_#1_key_number_#3_tl }
}
+%% #1: data name; #2: data index 1; #3: data index 2; #4: key name
+\cs_new:Npn \__tblr_data_key_to_int:nnnn #1 #2 #3 #4
+ {
+ ( #2 - 1 ) * \c@colcount * \int_use:c { g__tblr_data_#1_key_count_int }
+ + ( #3 - 1 ) * \int_use:c { g__tblr_data_#1_key_count_int }
+ + \tl_use:c { g__tblr_data_#1_key_number_#4_tl }
+ }
+
\int_new:N \l__tblr_key_count_int
\int_new:N \l__tblr_key_quotient_int
+\int_new:N \l__tblr_key_quotient_two_int
\int_new:N \l__tblr_key_remainder_int
%% #1: data name; #2: array position;
@@ -275,11 +410,50 @@
{ g__tblr_data_#1_key_name_ \int_use:N \l__tblr_key_remainder_int _tl }
}
+%% #1: data name; #2: array position;
+%% #3: returning tl with index 1; #4: returning tl with index 2;
+%% #5: returning tl with key name
+\cs_new:Npn \__tblr_data_int_to_key:nnNNN #1 #2 #3 #4 #5
+ {
+ \int_set_eq:Nc \l__tblr_key_count_int { g__tblr_data_#1_key_count_int }
+ \int_set:Nn \l__tblr_key_quotient_int
+ {
+ \int_div_truncate:nn
+ { #2 + \l__tblr_key_count_int - 1 } { \l__tblr_key_count_int }
+ }
+ \int_set:Nn \l__tblr_key_remainder_int
+ {
+ #2 + \l__tblr_key_count_int
+ - \l__tblr_key_quotient_int * \l__tblr_key_count_int
+ }
+ \int_compare:nNnT { \l__tblr_key_remainder_int } = { 0 }
+ { \int_set_eq:NN \l__tblr_key_remainder_int \l__tblr_key_count_int }
+ \tl_set_eq:Nc #5
+ { g__tblr_data_#1_key_name_ \int_use:N \l__tblr_key_remainder_int _tl }
+ \int_set:Nn \l__tblr_key_quotient_two_int
+ {
+ \int_div_truncate:nn
+ { \l__tblr_key_quotient_int + \c@colcount - 1 } { \c@colcount }
+ }
+ \int_set:Nn \l__tblr_key_remainder_int
+ {
+ \l__tblr_key_quotient_int + \c@colcount
+ - \l__tblr_key_quotient_two_int * \c@colcount
+ }
+ \int_compare:nNnT { \l__tblr_key_remainder_int } = { 0 }
+ { \int_set_eq:NN \l__tblr_key_remainder_int \c@colcount }
+ \tl_set:Nx #4 { \int_use:N \l__tblr_key_remainder_int }
+ \tl_set:Nx #3 { \int_use:N \l__tblr_key_quotient_two_int }
+ }
+
+\tl_new:N \g__tblr_data_int_from_value_tl
+
%% #1: data name; #2: key name; #3: value
-\cs_new:Npn \__tblr_data_value_to_int:nnn #1 #2 #3
+%% The result will be stored in \g__tblr_data_int_from_value_tl
+\cs_new_protected:Npn \__tblr_data_int_from_value:nnn #1 #2 #3
{
\cs:w
- __tblr_data_ \tl_use:c { g__tblr_data_#1_key_type_#2_tl } _to_int:n
+ __tblr_data_int_from_ \tl_use:c { g__tblr_data_#1_key_type_#2_tl } :n
\cs_end:
{#3}
}
@@ -294,9 +468,19 @@
}
\cs_generate_variant:Nn \__tblr_data_int_to_value:nnn { nne, nVe }
-\cs_new:Npn \__tblr_data_dim_to_int:n #1
+\cs_new_protected:Npn \__tblr_data_int_from_int:n #1
{
- \dim_to_decimal_in_sp:n {#1}
+ \tl_gset:Nn \g__tblr_data_int_from_value_tl {#1}
+ }
+
+\cs_new:Npn \__tblr_data_int_to_int:n #1
+ {
+ #1
+ }
+
+\cs_new_protected:Npn \__tblr_data_int_from_dim:n #1
+ {
+ \tl_gset:Nx \g__tblr_data_int_from_value_tl { \dim_to_decimal_in_sp:n {#1} }
}
%% Return a dimension in pt so that it's easier to understand in tracing messages
@@ -307,9 +491,10 @@
\dim_to_decimal:n { #1 sp } pt
}
-\cs_new:Npn \__tblr_data_dec_to_int:n #1
+\cs_new_protected:Npn \__tblr_data_int_from_dec:n #1
{
- \dim_to_decimal_in_sp:n {#1 pt}
+ \tl_gset:Nx \g__tblr_data_int_from_value_tl
+ { \dim_to_decimal_in_sp:n {#1 pt} }
}
\cs_new:Npn \__tblr_data_int_to_dec:n #1
@@ -317,17 +502,57 @@
\dim_to_decimal:n {#1 sp}
}
+\int_new:N \g__tblr_data_str_value_count_int
+\tl_set:cn { g__tblr_data_0_to_str_tl } { }
+
+\cs_new_protected:Npn \__tblr_data_int_from_str:n #1
+ {
+ \tl_if_exist:cTF { g__tblr_data_#1_to_int_tl }
+ {
+ \tl_gset_eq:Nc \g__tblr_data_int_from_value_tl
+ { g__tblr_data_#1_to_int_tl }
+ }
+ {
+ \int_gincr:N \g__tblr_data_str_value_count_int
+ \tl_gset:cx { g__tblr_data_#1_to_int_tl }
+ { \int_use:N \g__tblr_data_str_value_count_int }
+ \tl_gset:cx
+ { g__tblr_data_ \int_use:N \g__tblr_data_str_value_count_int _to_str_tl }
+ { #1 }
+ \tl_gset:Nx \g__tblr_data_int_from_value_tl
+ { \int_use:N \g__tblr_data_str_value_count_int }
+ }
+ }
+
+\cs_new:Npn \__tblr_data_int_to_str:n #1
+ {
+ \tl_use:c { g__tblr_data_#1_to_str_tl }
+ }
+
%% #1: data name; #2: data index; #3: key; #4: value
\cs_new_protected:Npn \__tblr_data_gput:nnnn #1 #2 #3 #4
{
- \intarray_gset:cnn
+ \__tblr_data_int_from_value:nnn {#1} {#3} {#4}
+ \__tblr_intarray_gset:cnn
{ g__tblr_#1_ \int_use:N \g_tblr_level_int _intarray }
{ \__tblr_data_key_to_int:nnn {#1} {#2} {#3} }
- { \__tblr_data_value_to_int:nnn {#1} {#3} {#4} }
+ { \g__tblr_data_int_from_value_tl }
}
\cs_generate_variant:Nn \__tblr_data_gput:nnnn
{ nnne, nnnV, nenn, nene, nenV, nVnn }
+%% #1: data name; #2: data index 1; #3: data index 2; #4: key; #5: value
+\cs_new_protected:Npn \__tblr_data_gput:nnnnn #1 #2 #3 #4 #5
+ {
+ \__tblr_data_int_from_value:nnn {#1} {#4} {#5}
+ \__tblr_intarray_gset:cnn
+ { g__tblr_#1_ \int_use:N \g_tblr_level_int _intarray }
+ { \__tblr_data_key_to_int:nnnn {#1} {#2} {#3} {#4} }
+ { \g__tblr_data_int_from_value_tl }
+ }
+\cs_generate_variant:Nn \__tblr_data_gput:nnnnn
+ { nnnne, nnnnV, neenn, neene, neenV, neeen, nVVnn }
+
%% #1: data name; #2: data index; #3: key
\cs_new:Npn \__tblr_data_item:nnn #1 #2 #3
{
@@ -339,13 +564,32 @@
}
\cs_generate_variant:Nn \__tblr_data_item:nnn { nen }
+%% #1: data name; #2: data index 1; #3: data index 2; #4: key
+\cs_new:Npn \__tblr_data_item:nnnn #1 #2 #3 #4
+ {
+ \__tblr_data_int_to_value:nne {#1} {#4}
+ {
+ \intarray_item:cn { g__tblr_#1_ \int_use:N \g_tblr_level_int _intarray }
+ { \__tblr_data_key_to_int:nnnn {#1} {#2} {#3} {#4} }
+ }
+ }
+\cs_generate_variant:Nn \__tblr_data_item:nnnn { neen }
+
\tl_new:N \l__tblr_data_key_tl
\tl_new:N \l__tblr_data_index_tl
+\tl_new:N \l__tblr_data_index_two_tl
\cs_new_protected:Npn \__tblr_data_log:n #1
{
+ \use:c { __tblr_data_log_ \use:c { g__tblr_data_#1_index_number_tl } :n } {#1}
+ \__tblr_prop_log:n {#1}
+ }
+
+\cs_new_protected:cpn { __tblr_data_log_1:n } #1
+ {
%\intarray_log:c { g__tblr_#1_ \int_use:N \g_tblr_level_int _intarray }
\tl_set:Nx \l_tmpa_tl { g__tblr_#1_ \int_use:N \g_tblr_level_int _intarray }
+ \tl_log:n { ----------~----------~----------~----------~---------- }
\int_step_inline:nn
{ \intarray_count:c { \l_tmpa_tl } }
{
@@ -353,52 +597,80 @@
\l__tblr_data_index_tl \l__tblr_data_key_tl
\tl_log:x
{
+ \space
{ #1 [\l__tblr_data_index_tl] / \l__tblr_data_key_tl }
- \space = \space
+ ~\space => ~\space
+ {
+ \__tblr_data_int_to_value:nVe {#1} \l__tblr_data_key_tl
+ { \intarray_item:cn { \l_tmpa_tl } {##1} }
+ }
+ }
+ }
+ }
+
+\cs_new_protected:cpn { __tblr_data_log_2:n } #1
+ {
+ %\intarray_log:c { g__tblr_#1_ \int_use:N \g_tblr_level_int _intarray }
+ \tl_set:Nx \l_tmpa_tl { g__tblr_#1_ \int_use:N \g_tblr_level_int _intarray }
+ \tl_log:n { ----------~----------~----------~----------~---------- }
+ \int_step_inline:nn
+ { \intarray_count:c { \l_tmpa_tl } }
+ {
+ \__tblr_data_int_to_key:nnNNN {#1} {##1}
+ \l__tblr_data_index_tl \l__tblr_data_index_two_tl \l__tblr_data_key_tl
+ \tl_log:x
+ {
+ \space
+ {
+ #1 [\l__tblr_data_index_tl][\l__tblr_data_index_two_tl]
+ / \l__tblr_data_key_tl
+ }
+ ~\space => ~\space
{
\__tblr_data_int_to_value:nVe {#1} \l__tblr_data_key_tl
{ \intarray_item:cn { \l_tmpa_tl } {##1} }
}
}
}
- \__tblr_prop_log:n {#1}
}
%% #1: data name; #2: row index; #3: key; #4: value
\cs_new_protected:Npn \__tblr_data_gput_if_larger:nnnn #1 #2 #3 #4
{
+ \__tblr_data_int_from_value:nnn {#1} {#3} {#4}
\__tblr_array_gput_if_larger:cnn
{ g__tblr_#1_ \int_use:N \g_tblr_level_int _intarray }
{ \__tblr_data_key_to_int:nnn {#1} {#2} {#3} }
- { \__tblr_data_value_to_int:nnn {#1} {#3} {#4} }
+ { \g__tblr_data_int_from_value_tl }
}
\cs_generate_variant:Nn \__tblr_data_gput_if_larger:nnnn { nnne, nnnV, nene, nenV }
\cs_new_protected:Npn \__tblr_array_gput_if_larger:Nnn #1 #2 #3
{
\int_compare:nNnT {#3} > { \intarray_item:Nn #1 {#2} }
- { \intarray_gset:Nnn #1 {#2} {#3} }
+ { \__tblr_intarray_gset:Nnn #1 {#2} {#3} }
}
\cs_generate_variant:Nn \__tblr_array_gput_if_larger:Nnn { cnn }
%% #1: data name; #2: data index; #3: key; #4: value
\cs_new_protected:Npn \__tblr_data_gadd_dimen_value:nnnn #1 #2 #3 #4
{
+ \__tblr_data_int_from_value:nnn {#1} {#3} {#4}
\__tblr_array_gadd_value:cnn
{ g__tblr_#1_ \int_use:N \g_tblr_level_int _intarray }
{ \__tblr_data_key_to_int:nnn {#1} {#2} {#3} }
- { \__tblr_data_value_to_int:nnn {#1} {#3} {#4} }
+ { \g__tblr_data_int_from_value_tl }
}
\cs_generate_variant:Nn \__tblr_data_gadd_dimen_value:nnnn { nnne, nnnV, nene }
\cs_new_protected:Npn \__tblr_array_gadd_value:Nnn #1 #2 #3
{
- \intarray_gset:Nnn #1 {#2} { \intarray_item:Nn #1 {#2} + #3 }
+ \__tblr_intarray_gset:Nnn #1 {#2} { \intarray_item:Nn #1 {#2} + #3 }
}
\cs_generate_variant:Nn \__tblr_array_gadd_value:Nnn { cnn }
\bool_new:N \g__tblr_use_intarray_bool
-%\bool_set_true:N \g__tblr_use_intarray_bool
+\bool_set_true:N \g__tblr_use_intarray_bool
\AtBeginDocument
{
@@ -408,10 +680,18 @@
{
\__tblr_prop_gput:nnn {#1} { [#2] / #3 } {#4}
}
+ \cs_set_protected:Npn \__tblr_data_gput:nnnnn #1 #2 #3 #4 #5
+ {
+ \__tblr_prop_gput:nnn {#1} { [#2][#3] / #4 } {#5}
+ }
\cs_set:Npn \__tblr_data_item:nnn #1 #2 #3
{
\__tblr_prop_item:nn {#1} { [#2] / #3 }
}
+ \cs_set:Npn \__tblr_data_item:nnnn #1 #2 #3 #4
+ {
+ \__tblr_prop_item:nn {#1} { [#2][#3] / #4 }
+ }
\cs_set_protected:Npn \__tblr_data_log:n #1
{
\__tblr_prop_log:n {#1}
@@ -420,10 +700,18 @@
{
\__tblr_prop_gput_if_larger:nnn {#1} { [#2] / #3 } {#4}
}
+ \cs_set_protected:Npn \__tblr_data_gput_if_larger:nnnnn #1 #2 #3 #4 #5
+ {
+ \__tblr_prop_gput_if_larger:nnn {#1} { [#2][#3] / #4 } {#5}
+ }
\cs_set_protected:Npn \__tblr_data_gadd_dimen_value:nnnn #1 #2 #3 #4
{
\__tblr_prop_gadd_dimen_value:nnn {#1} { [#2] / #3 } {#4}
}
+ \cs_set_protected:Npn \__tblr_data_gadd_dimen_value:nnnnn #1 #2 #3 #4 #5
+ {
+ \__tblr_prop_gadd_dimen_value:nnn {#1} { [#2][#3] / #4 } {#5}
+ }
}
}
@@ -490,7 +778,6 @@
\regex_const:Nn \c__tblr_split_selector_name_regex { ^ ( [A-Za-z] {2,} ) ( . * ) }
\seq_new:N \l__tblr_childs_split_seq
\seq_new:N \l__tblr_childs_regex_seq
-\tl_new:N \l__tblr_childs_end_tl
\tl_new:N \l__tblr_childs_selector_tl
%% #1, child specifications; #2, total number.
@@ -524,15 +811,16 @@
{
\seq_set_split:Nnn \l__tblr_childs_split_seq {,} {#1}
\seq_map_inline:Nn \l__tblr_childs_split_seq
- { \__tblr_get_childs_normal_aux:w ##1 - s \scan_stop }
+ {
+ \tl_if_in:nnTF {##1} {-}
+ { \__tblr_get_childs_normal_aux:w ##1 \scan_stop }
+ { \__tblr_get_childs_normal_aux:w ##1 - ##1 \scan_stop }
+ }
}
-\cs_new_protected_nopar:Npn \__tblr_get_childs_normal_aux:w #1 - #2 #3 \scan_stop
+\cs_new_protected_nopar:Npn \__tblr_get_childs_normal_aux:w #1 - #2 \scan_stop
{
- \tl_if_eq:nnTF {#2} {s}
- { \tl_set:Nn \l__tblr_childs_end_tl {#1} }
- { \tl_set:Nn \l__tblr_childs_end_tl {#2} }
- \int_step_inline:nnn {#1} { \l__tblr_childs_end_tl }
+ \int_step_inline:nnn {#1} {#2}
{ \clist_put_right:Nn \l_tblr_childs_clist {##1} }
}
@@ -780,11 +1068,12 @@
{
\tl_clear:N \l__tblr_hline_num_tl
\tl_set:Nx \l__tblr_hline_count_tl
- { \__tblr_prop_item:ne { hline } { [\int_use:N \c@rownum] / @hline-count } }
- \tl_if_empty:NTF \l__tblr_hline_count_tl
+ { \__tblr_text_item:ne { hline } { [\int_use:N \c@rownum] / @hline-count } }
+ %% \l__tblr_hline_count_tl may be empty when rowspec has extra |'s
+ \int_compare:nNnTF { \l__tblr_hline_count_tl + 0 } = {0}
{
\tl_set:Nx \l__tblr_hline_num_tl { 1 }
- \__tblr_prop_gput:nxx { hline }
+ \__tblr_text_gput:nen { hline }
{ [\int_use:N \c@rownum] / @hline-count } { 1 }
}
{
@@ -806,7 +1095,7 @@
{
\tl_set:Nx \l__tblr_hline_count_tl
{ \int_eval:n { \l__tblr_hline_count_tl + 1 } }
- \__tblr_prop_gput:nxx { hline }
+ \__tblr_text_gput:nee { hline }
{ [\int_use:N \c@rownum] / @hline-count } { \l__tblr_hline_count_tl }
\tl_set_eq:NN \l__tblr_hline_num_tl \l__tblr_hline_count_tl
}
@@ -842,18 +1131,18 @@
\__tblr_get_childs:nx {#1} { \int_use:N \c@colcount }
\clist_map_inline:Nn \l_tblr_childs_clist
{
- \__tblr_prop_gput:nxx { hline }
+ \__tblr_text_gput:nee { hline }
{ [\int_use:N \c@rownum][##1](\l__tblr_hline_num_tl) / @dash }
{ \l__tblr_hline_dash_tl }
\tl_if_empty:NF \l__tblr_hline_wd_tl
{
- \__tblr_prop_gput:nxx { hline }
+ \__tblr_text_gput:nee { hline }
{ [\int_use:N \c@rownum][##1](\l__tblr_hline_num_tl) / wd }
{ \l__tblr_hline_wd_tl }
}
\tl_if_empty:NF \l__tblr_hline_fg_tl
{
- \__tblr_prop_gput:nxx { hline }
+ \__tblr_text_gput:nee { hline }
{ [\int_use:N \c@rownum][##1](\l__tblr_hline_num_tl) / fg }
{ \l__tblr_hline_fg_tl }
}
@@ -978,11 +1267,12 @@
{
\tl_clear:N \l__tblr_vline_num_tl
\tl_set:Nx \l__tblr_vline_count_tl
- { \__tblr_prop_item:ne { vline } { [\int_use:N \c@colnum] / @vline-count } }
- \tl_if_empty:NTF \l__tblr_vline_count_tl
+ { \__tblr_text_item:ne { vline } { [\int_use:N \c@colnum] / @vline-count } }
+ %% \l__tblr_vline_count_tl may be empty when colspec has extra |'s
+ \int_compare:nNnTF { \l__tblr_vline_count_tl + 0 } = {0}
{
\tl_set:Nx \l__tblr_vline_num_tl { 1 }
- \__tblr_prop_gput:nxx { vline }
+ \__tblr_text_gput:nen { vline }
{ [\int_use:N \c@colnum] / @vline-count } { 1 }
}
{
@@ -1004,7 +1294,7 @@
{
\tl_set:Nx \l__tblr_vline_count_tl
{ \int_eval:n { \l__tblr_vline_count_tl + 1 } }
- \__tblr_prop_gput:nxx { vline }
+ \__tblr_text_gput:nee { vline }
{ [\int_use:N \c@colnum] / @vline-count } { \l__tblr_vline_count_tl }
\tl_set_eq:NN \l__tblr_vline_num_tl \l__tblr_vline_count_tl
}
@@ -1039,18 +1329,18 @@
\__tblr_get_childs:nx {#1} { \int_use:N \c@rowcount }
\clist_map_inline:Nn \l_tblr_childs_clist
{
- \__tblr_prop_gput:nxx { vline }
+ \__tblr_text_gput:nee { vline }
{ [##1][\int_use:N \c@colnum](\l__tblr_vline_num_tl) / @dash }
{ \l__tblr_vline_dash_tl }
\tl_if_empty:NF \l__tblr_vline_wd_tl
{
- \__tblr_prop_gput:nxx { vline }
+ \__tblr_text_gput:nee { vline }
{ [##1][\int_use:N \c@colnum](\l__tblr_vline_num_tl) / wd }
{ \l__tblr_vline_wd_tl }
}
\tl_if_empty:NF \l__tblr_vline_fg_tl
{
- \__tblr_prop_gput:nxx { vline }
+ \__tblr_text_gput:nee { vline }
{ [##1][\int_use:N \c@colnum](\l__tblr_vline_num_tl) / fg }
{ \l__tblr_vline_fg_tl }
}
@@ -1150,42 +1440,77 @@
\keys_define:nn { tblr-cell-spec }
{
- l .code:n = \__tblr_prop_gput:nxx {cell}
- {[\int_use:N \c@rownum][\int_use:N \c@colnum] / halign} {l},
- c .code:n = \__tblr_prop_gput:nxx {cell}
- {[\int_use:N \c@rownum][\int_use:N \c@colnum] / halign} {c},
- r .code:n = \__tblr_prop_gput:nxx {cell}
- {[\int_use:N \c@rownum][\int_use:N \c@colnum] / halign} {r},
- t .code:n = \__tblr_prop_gput:nxx {cell}
- {[\int_use:N \c@rownum][\int_use:N \c@colnum] / valign} {t},
- p .code:n = \__tblr_prop_gput:nxx {cell}
- {[\int_use:N \c@rownum][\int_use:N \c@colnum] / valign} {t},
- m .code:n = \__tblr_prop_gput:nxx {cell}
- {[\int_use:N \c@rownum][\int_use:N \c@colnum] / valign} {m},
- b .code:n = \__tblr_prop_gput:nxx {cell}
- {[\int_use:N \c@rownum][\int_use:N \c@colnum] / valign} {b},
- h .code:n = \__tblr_prop_gput:nxx {cell}
- {[\int_use:N \c@rownum][\int_use:N \c@colnum] / valign} {h},
- f .code:n = \__tblr_prop_gput:nxx {cell}
- {[\int_use:N \c@rownum][\int_use:N \c@colnum] / valign} {f},
- wd .code:n = \__tblr_prop_gput:nxx {cell}
- {[\int_use:N \c@rownum][\int_use:N \c@colnum] / width} {#1},
- bg .code:n = \__tblr_prop_gput:nxx {cell}
- {[\int_use:N \c@rownum][\int_use:N \c@colnum] / background} {#1},
+ l .code:n = \__tblr_data_gput:neenn { cell }
+ { \int_use:N \c@rownum } { \int_use:N \c@colnum } { halign } {l},
+ c .code:n = \__tblr_data_gput:neenn { cell }
+ { \int_use:N \c@rownum } { \int_use:N \c@colnum } { halign } {c},
+ r .code:n = \__tblr_data_gput:neenn { cell }
+ { \int_use:N \c@rownum } { \int_use:N \c@colnum } { halign } {r},
+ t .code:n = \__tblr_data_gput:neenn { cell }
+ { \int_use:N \c@rownum } { \int_use:N \c@colnum } { valign} {t},
+ p .code:n = \__tblr_data_gput:neenn { cell }
+ { \int_use:N \c@rownum } { \int_use:N \c@colnum } { valign} {t},
+ m .code:n = \__tblr_data_gput:neenn { cell }
+ { \int_use:N \c@rownum } { \int_use:N \c@colnum } { valign} {m},
+ b .code:n = \__tblr_data_gput:neenn { cell }
+ { \int_use:N \c@rownum } { \int_use:N \c@colnum } { valign} {b},
+ h .code:n = \__tblr_data_gput:neenn { cell }
+ { \int_use:N \c@rownum } { \int_use:N \c@colnum } { valign} {h},
+ f .code:n = \__tblr_data_gput:neenn { cell }
+ { \int_use:N \c@rownum } { \int_use:N \c@colnum } { valign} {f},
+ wd .code:n = \__tblr_data_gput:neene { cell }
+ { \int_use:N \c@rownum } { \int_use:N \c@colnum } { width } {#1},
+ bg .code:n = \__tblr_data_gput:neene { cell }
+ { \int_use:N \c@rownum } { \int_use:N \c@colnum }
+ { background } {#1},
+ preto .code:n = \__tblr_cell_preto_text:n {#1},
+ appto .code:n = \__tblr_cell_appto_text:n {#1},
+ fg .code:n = \__tblr_cell_preto_text:n { \color{#1} },
+ font .code:n = \__tblr_cell_preto_text:n { #1 \selectfont },
unknown .code:n = \__tblr_cell_unknown_key:V \l_keys_key_str,
}
+\tl_new:N \l__tblr_cell_text_tl
+
+\cs_new_protected:Npn \__tblr_cell_preto_text:n #1
+ {
+ \__tblr_cell_preto_text:een
+ { \int_use:N \c@rownum } { \int_use:N \c@colnum } {#1}
+ }
+
+\cs_new_protected:Npn \__tblr_cell_preto_text:nnn #1 #2 #3
+ {
+ \tl_set:Nx \l__tblr_cell_text_tl { \__tblr_text_item:nn { text } { [#1][#2] } }
+ \tl_put_left:Nn \l__tblr_cell_text_tl {#3}
+ \__tblr_text_gput:nnV { text } { [#1][#2] } \l__tblr_cell_text_tl
+ }
+\cs_generate_variant:Nn \__tblr_cell_preto_text:nnn { nen, enn, een }
+
+\cs_new_protected:Npn \__tblr_cell_appto_text:n #1
+ {
+ \__tblr_cell_appto_text:een
+ { \int_use:N \c@rownum } { \int_use:N \c@colnum } {#1}
+ }
+
+\cs_new_protected:Npn \__tblr_cell_appto_text:nnn #1 #2 #3
+ {
+ \tl_set:Nx \l__tblr_cell_text_tl { \__tblr_text_item:ne { text } { [#1][#2] } }
+ \tl_put_right:Nn \l__tblr_cell_text_tl {#3}
+ \__tblr_text_gput:neV { text } { [#1][#2] } \l__tblr_cell_text_tl
+ }
+\cs_generate_variant:Nn \__tblr_cell_appto_text:nnn { nen, enn, een }
+
\cs_new_protected:Npn \__tblr_cell_unknown_key:n #1
{
\regex_match:NnTF \c__tblr_is_color_key_regex {#1}
{
- \__tblr_prop_gput:nxx {cell}
- {[\int_use:N \c@rownum][\int_use:N \c@colnum] / background} {#1}
+ \__tblr_data_gput:neene { cell }
+ { \int_use:N \c@rownum } { \int_use:N \c@colnum } { background } {#1}
}
{
\tl_set_rescan:Nnn \l__tblr_v_tl {} {#1}
- \__tblr_prop_gput:nxx {cell}
- { [\int_use:N \c@rownum][\int_use:N \c@colnum] / width }
+ \__tblr_data_gput:neene { cell }
+ { \int_use:N \c@rownum } { \int_use:N \c@colnum } { width }
{ \dim_eval:n { \l__tblr_v_tl } }
}
}
@@ -1196,14 +1521,14 @@
\int_compare:nNnT { #1 } > { 1 }
{
\__tblr_prop_gput:nnn {table} {rowspan} {true}
- \__tblr_prop_gput:nxn {cell}
- { [\int_use:N \c@rownum][\int_use:N \c@colnum] / rowspan } { #1 }
+ \__tblr_data_gput:neenn { cell }
+ { \int_use:N \c@rownum } { \int_use:N \c@colnum } { rowspan } {#1}
}
\int_compare:nNnT { #2 } > { 1 }
{
\__tblr_prop_gput:nnn {table} {colspan} {true}
- \__tblr_prop_gput:nxn {cell}
- { [\int_use:N \c@rownum][\int_use:N \c@colnum] / colspan } { #2 }
+ \__tblr_data_gput:neenn { cell }
+ { \int_use:N \c@rownum } { \int_use:N \c@colnum } { colspan } {#2}
}
\int_step_variable:nnNn
{ \int_use:N \c@rownum } { \int_eval:n { \c@rownum + #1 - 1 } } \l__tblr_i_tl
@@ -1216,17 +1541,17 @@
{ \int_compare_p:nNn { \l__tblr_i_tl } = { \c@rownum } }
{ \int_compare_p:nNn { \l__tblr_j_tl } = { \c@colnum } }
{
- \__tblr_prop_gput:nxx {cell}
- { [\l__tblr_i_tl][\l__tblr_j_tl] / omit } {true}
+ \__tblr_data_gput:neenn { cell }
+ { \l__tblr_i_tl } { \l__tblr_j_tl } { omit } {1}
}
\int_compare:nNnF { \l__tblr_i_tl } = { \c@rownum }
{
- \__tblr_prop_gput:nxx {hline}
+ \__tblr_text_gput:nen { hline }
{ [\l__tblr_i_tl][\l__tblr_j_tl] / omit } {true}
}
\int_compare:nNnF { \l__tblr_j_tl } = { \c@colnum }
{
- \__tblr_prop_gput:nxx {vline}
+ \__tblr_text_gput:nee { vline }
{ [\l__tblr_i_tl][\l__tblr_j_tl] / omit } {true}
}
}
@@ -1373,19 +1698,21 @@
{ \int_use:N \c@colnum } { valign } {f},
bg .code:n = \__tblr_set_key_for_every_column_cell:nnn
{ \int_use:N \c@colnum } { background } {#1},
- wd .code:n = \__tblr_prop_gput:nxx { column }
- { [\int_use:N \c@colnum] / width } { \dim_eval:n {#1} },
- co .code:n = \__tblr_prop_gput:nxx { column }
- { [\int_use:N \c@colnum] / coefficient } {#1},
- leftsep .code:n = \__tblr_prop_gput:nxx { column }
- { [\int_use:N \c@colnum] / leftsep } { \dim_eval:n {#1} },
- rightsep .code:n = \__tblr_prop_gput:nxx { column }
- { [\int_use:N \c@colnum] / rightsep } { \dim_eval:n {#1} },
+ fg .code:n = \__tblr_preto_text_for_every_column_cell:n { \color{#1} },
+ font .code:n = \__tblr_preto_text_for_every_column_cell:n { #1 \selectfont },
+ wd .code:n = \__tblr_data_gput:nene { column }
+ { \int_use:N \c@colnum } { width } { \dim_eval:n {#1} },
+ co .code:n = \__tblr_data_gput:nene { column }
+ { \int_use:N \c@colnum } { coefficient } {#1},
+ leftsep .code:n = \__tblr_data_gput:nene { column }
+ { \int_use:N \c@colnum } { leftsep } { \dim_eval:n {#1} },
+ rightsep .code:n = \__tblr_data_gput:nene { column }
+ { \int_use:N \c@colnum } { rightsep } { \dim_eval:n {#1} },
colsep .meta:n = { leftsep = #1, rightsep = #1},
- leftsep+ .code:n = \__tblr_prop_gadd_dimen_value:nxx { column }
- { [\int_use:N \c@colnum] / leftsep } { \dim_eval:n {#1} },
- rightsep+ .code:n = \__tblr_prop_gadd_dimen_value:nxx { column }
- { [\int_use:N \c@colnum] / rightsep } { \dim_eval:n {#1} },
+ leftsep+ .code:n = \__tblr_data_gadd_dimen_value:nene { column }
+ { \int_use:N \c@colnum } { leftsep } { \dim_eval:n {#1} },
+ rightsep+ .code:n = \__tblr_data_gadd_dimen_value:nene { column }
+ { \int_use:N \c@colnum } { rightsep } { \dim_eval:n {#1} },
colsep+ .meta:n = { leftsep+ = #1, rightsep+ = #1},
unknown .code:n = \__tblr_column_unknown_key:V \l_keys_key_str,
}
@@ -1395,7 +1722,23 @@
{
\int_step_inline:nn { \c@rowcount }
{
- \__tblr_prop_gput:nxn {cell} { [##1][#1] / #2 } {#3}
+ \__tblr_data_gput:neenn { cell } {##1} {#1} {#2} {#3}
+ }
+ }
+
+\cs_new_protected:Npn \__tblr_preto_text_for_every_column_cell:n #1
+ {
+ \int_step_inline:nn { \c@rowcount }
+ {
+ \__tblr_cell_preto_text:nen {##1} { \int_use:N \c@colnum } {#1}
+ }
+ }
+
+\cs_new_protected:Npn \__tblr_appto_text_for_every_column_cell:n #1
+ {
+ \int_step_inline:nn { \c@rowcount }
+ {
+ \__tblr_cell_appto_text:nen {##1} { \int_use:N \c@colnum } {#1}
}
}
@@ -1405,8 +1748,8 @@
{
\regex_match:NnTF \c__tblr_is_number_key_regex {#1}
{
- \__tblr_prop_gput:nxx { column }
- { [\int_use:N \c@colnum] / coefficient } {#1}
+ \__tblr_data_gput:nene { column }
+ { \int_use:N \c@colnum } { coefficient } {#1}
}
{
\regex_match:NnTF \c__tblr_is_color_key_regex {#1}
@@ -1416,8 +1759,8 @@
}
{
\tl_set_rescan:Nnn \l__tblr_v_tl {} {#1}
- \__tblr_prop_gput:nxx { column }
- { [\int_use:N \c@colnum] / width } { \dim_eval:n { \l__tblr_v_tl } }
+ \__tblr_data_gput:nene { column }
+ { \int_use:N \c@colnum } { width } { \dim_eval:n { \l__tblr_v_tl } }
}
}
}
@@ -1507,6 +1850,8 @@
{ \int_use:N \c@rownum } { valign } {f},
bg .code:n = \__tblr_set_key_for_every_row_cell:nnn
{ \int_use:N \c@rownum } { background } {#1},
+ fg .code:n = \__tblr_preto_text_for_every_row_cell:n { \color{#1} },
+ font .code:n = \__tblr_preto_text_for_every_row_cell:n { #1 \selectfont },
ht .code:n = \__tblr_data_gput:nene { row } { \int_use:N \c@rownum }
{ height } { \dim_eval:n {#1} },
co .code:n = \__tblr_data_gput:nene { row } { \int_use:N \c@rownum }
@@ -1531,7 +1876,23 @@
{
\int_step_inline:nn { \c@colcount }
{
- \__tblr_prop_gput:nxn {cell} { [#1][##1] / #2 } {#3}
+ \__tblr_data_gput:neenn { cell } {#1} {##1} {#2} {#3}
+ }
+ }
+
+\cs_new_protected:Npn \__tblr_preto_text_for_every_row_cell:n #1
+ {
+ \int_step_inline:nn { \c@colcount }
+ {
+ \__tblr_cell_preto_text:enn { \int_use:N \c@rownum } {##1} {#1}
+ }
+ }
+
+\cs_new_protected:Npn \__tblr_appto_text_for_every_row_cell:n #1
+ {
+ \int_step_inline:nn { \c@colcount }
+ {
+ \__tblr_cell_appto_text:enn { \int_use:N \c@rownum } {##1} {#1}
}
}
@@ -1614,26 +1975,16 @@
\exp_args:Nc \NewDocumentCommand { tblr_primitive_column_type_ > } { O{} m }
{
- \tl_if_blank:nF { #1 }
+ \tl_if_blank:nF {#1}
{
- \__tblr_prop_gput:nxx
+ \__tblr_data_gput:nene
{ column }
- { [\int_use:N \c@colnum] / leftsep}
- { \dim_eval:n { #1 } }
+ { \int_use:N \c@colnum } { leftsep }
+ { \dim_eval:n {#1} }
}
- \tl_if_blank:nF { #2 }
+ \tl_if_blank:nF {#2}
{
- \int_step_variable:nNn { \c@rowcount } \l__tblr_i_tl
- {
- \tl_set:Nx \l_tmpa_tl
- {
- \__tblr_prop_item:ne {text}
- { [\l__tblr_i_tl][\int_use:N \c@colnum] }
- }
- \tl_put_left:Nn \l_tmpa_tl { #2 }
- \__tblr_prop_gput:nxV {text}
- { [\l__tblr_i_tl][\int_use:N \c@colnum] } \l_tmpa_tl
- }
+ \__tblr_preto_text_for_every_column_cell:n {#2}
}
\__tblr_execute_colrow_spec_next:N
}
@@ -1645,24 +1996,14 @@
\exp_args:Nc \NewDocumentCommand { tblr_primitive_row_type_ > } { O{} m }
{
- \tl_if_blank:nF { #1 }
+ \tl_if_blank:nF {#1}
{
\__tblr_data_gput:nene { row } { \int_use:N \c@rownum }
{ abovesep } { \dim_eval:n { #1 } }
}
- \tl_if_blank:nF { #2 }
+ \tl_if_blank:nF {#2}
{
- \int_step_variable:nNn { \c@colcount } \l__tblr_j_tl
- {
- \tl_set:Nx \l_tmpa_tl
- {
- \__tblr_prop_item:ne {text}
- { [\int_use:N \c@rownum][\l__tblr_j_tl] }
- }
- \tl_put_left:Nn \l_tmpa_tl { #2 }
- \__tblr_prop_gput:nxV {text}
- { [\int_use:N \c@rownum][\l__tblr_j_tl] } \l_tmpa_tl
- }
+ \__tblr_preto_text_for_every_row_cell:n {#2}
}
\__tblr_execute_colrow_spec_next:N
}
@@ -1674,26 +2015,17 @@
\exp_args:Nc \NewDocumentCommand { tblr_primitive_column_type_ < } { O{} m }
{
- \tl_if_blank:nF { #1 }
+ \tl_if_blank:nF {#1}
{
- \__tblr_prop_gput:nxx
- { column }
- { [\int_eval:n {\c@colnum - 1}] / rightsep }
- { \dim_eval:n { #1 } }
+ \__tblr_data_gput:nene { column }
+ { \int_eval:n {\c@colnum - 1} } { rightsep } { \dim_eval:n {#1} }
}
- \tl_if_blank:nF { #2 }
+ \tl_if_blank:nF {#2}
{
- \int_step_variable:nNn { \c@rowcount } \l__tblr_i_tl
- {
- \tl_set:Nx \l_tmpa_tl
- {
- \__tblr_prop_item:ne {text}
- { [\l__tblr_i_tl][\int_eval:n {\c@colnum - 1}] }
- }
- \tl_put_right:Nn \l_tmpa_tl { #2 }
- \__tblr_prop_gput:nxV {text}
- { [\l__tblr_i_tl][\int_eval:n {\c@colnum - 1}] } \l_tmpa_tl
- }
+ \group_begin:
+ \int_decr:N \c@colnum
+ \__tblr_appto_text_for_every_column_cell:n {#2}
+ \group_end:
}
\__tblr_execute_colrow_spec_next:N
}
@@ -1705,24 +2037,17 @@
\exp_args:Nc \NewDocumentCommand { tblr_primitive_row_type_ < } { O{} m }
{
- \tl_if_blank:nF { #1 }
+ \tl_if_blank:nF {#1}
{
\__tblr_data_gput:nene { row } { \int_eval:n {\c@rownum - 1} }
{ belowsep } { \dim_eval:n {#1} }
}
- \tl_if_blank:nF { #2 }
+ \tl_if_blank:nF {#2}
{
- \int_step_variable:nNn { \c@colcount } \l__tblr_j_tl
- {
- \tl_set:Nx \l_tmpa_tl
- {
- \__tblr_prop_item:ne {text}
- { [\int_eval:n {\c@rownum - 1}][\l__tblr_j_tl] }
- }
- \tl_put_right:Nn \l_tmpa_tl { #2 }
- \__tblr_prop_gput:nxV {text}
- { [\int_eval:n {\c@rownum - 1}][\l__tblr_j_tl] } \l_tmpa_tl
- }
+ \group_begin:
+ \int_decr:N \c@rownum
+ \__tblr_appto_text_for_every_row_cell:n {#2}
+ \group_end:
}
\__tblr_execute_colrow_spec_next:N
}
@@ -1902,6 +2227,7 @@
\mode_leave_vertical:
\int_gincr:N \g_tblr_level_int
\__tblr_clear_prop_lists:
+ \__tblr_clear_text_lists:
\__tblr_enable_table_commands:
\__tblr_split_table:n { #3 }
\LogTblrTracing { command }
@@ -1916,18 +2242,6 @@
\int_gdecr:N \g_tblr_level_int
}
-\cs_new_protected:Npn \__tblr_clear_prop_lists:
- {
- \prop_gclear_new:c { g_tblr_text_ \int_use:N \g_tblr_level_int _prop }
- \prop_gclear_new:c { g_tblr_command_ \int_use:N \g_tblr_level_int _prop }
- \prop_gclear_new:c { g_tblr_table_ \int_use:N \g_tblr_level_int _prop }
- \prop_gclear_new:c { g_tblr_row_ \int_use:N \g_tblr_level_int _prop }
- \prop_gclear_new:c { g_tblr_column_ \int_use:N \g_tblr_level_int _prop }
- \prop_gclear_new:c { g_tblr_cell_ \int_use:N \g_tblr_level_int _prop }
- \prop_gclear_new:c { g_tblr_hline_ \int_use:N \g_tblr_level_int _prop }
- \prop_gclear_new:c { g_tblr_vline_ \int_use:N \g_tblr_level_int _prop }
- }
-
%% Insert and remove braces for nesting environments inside cells
%% These make line split and cell split workable
%% We need to replace N times for N level nestings
@@ -2034,7 +2348,7 @@
\__tblr_remove_braces:N \l_tmpa_tl
\int_incr:N \c@colnum
\__tblr_extract_table_commands:N \l_tmpa_tl
- \__tblr_prop_gput:nxV {text} { [#1][\int_use:N \c@colnum] } \l_tmpa_tl
+ \__tblr_text_gput:neV { text } { [#1][\int_use:N \c@colnum] } \l_tmpa_tl
\__tblr_add_multicolumn_empty_cell:
}
%% Decrease row count by 1 if the last row has only one empty cell text
@@ -2059,7 +2373,7 @@
\int_step_inline:nn { \l__multicolumn_cell_number_int - 1 }
{
\int_incr:N \c@colnum
- \__tblr_prop_gput:nxn {text}
+ \__tblr_text_gput:nen { text }
{ [\int_use:N \c@rownum][\int_use:N \c@colnum] } { }
}
}
@@ -2175,6 +2489,7 @@
\prop_gset_from_keyval:Nn \g__tblr_default_tblr_table_prop
{
stretch = 1,
+ rulesep = 2pt,
}
\prop_gset_from_keyval:Nn \g__tblr_default_tblr_rows_prop
@@ -2192,6 +2507,8 @@
{
leftsep = 6pt,
rightsep = 6pt,
+ width = -1pt, % column width unset
+ coefficient = 0, % column coefficient unset
@col-width = 0pt,
}
@@ -2199,16 +2516,20 @@
{
halign = l,
valign = t,
+ width = -1pt, % cell width unset
+ rowspan = 1,
+ colspan = 1,
+ omit = 0,
}
\prop_gset_from_keyval:Nn \g__tblr_default_tblr_hlines_prop
{
- rulesep = 2pt,
+ @hline-count = 0,
}
\prop_gset_from_keyval:Nn \g__tblr_default_tblr_vlines_prop
{
- rulesep = 2pt,
+ @vline-count = 0,
}
\cs_new_protected:Npn \__tblr_initial_table_spec:
@@ -2225,37 +2546,37 @@
}
\prop_map_inline:cn { g__tblr_default_ \l__tblr_env_name_tl _hlines_prop }
{
- \__tblr_prop_gput:nxn { hline } { [\l__tblr_i_tl] / ##1 } {##2}
+ \__tblr_text_gput:nen { hline } { [\l__tblr_i_tl] / ##1 } {##2}
}
\int_step_variable:nNn { \c@colcount } \l__tblr_j_tl
{
\prop_map_inline:cn
{ g__tblr_default_ \l__tblr_env_name_tl _cells_prop }
{
- \__tblr_prop_gput:nxn { cell }
- { [\l__tblr_i_tl][\l__tblr_j_tl] / ##1 } {##2}
+ \__tblr_data_gput:neeen { cell }
+ { \l__tblr_i_tl } { \l__tblr_j_tl } {##1} {##2}
}
}
}
\prop_map_inline:cn { g__tblr_default_ \l__tblr_env_name_tl _hlines_prop }
{
- \__tblr_prop_gput:nxn { hline }
+ \__tblr_text_gput:nen { hline }
{ [\int_eval:n { \c@rowcount + 1}] / ##1 } {##2}
}
\int_step_variable:nNn { \c@colcount } \l__tblr_j_tl
{
\prop_map_inline:cn { g__tblr_default_ \l__tblr_env_name_tl _columns_prop }
{
- \__tblr_prop_gput:nxn { column } { [\l__tblr_j_tl] / ##1 } {##2}
+ \__tblr_data_gput:nenn { column } { \l__tblr_j_tl } {##1} {##2}
}
\prop_map_inline:cn { g__tblr_default_ \l__tblr_env_name_tl _vlines_prop }
{
- \__tblr_prop_gput:nxn { vline } { [\l__tblr_j_tl] / ##1 } {##2}
+ \__tblr_text_gput:nen { vline } { [\l__tblr_j_tl] / ##1 } {##2}
}
}
\prop_map_inline:cn { g__tblr_default_ \l__tblr_env_name_tl _vlines_prop }
{
- \__tblr_prop_gput:nxn { vline }
+ \__tblr_text_gput:nen { vline }
{ [\int_eval:n { \c@colcount + 1}] / ##1 } {##2}
}
\keys_set:nv { tblr } { l__tblr_default_ \l__tblr_env_name_tl _tl }
@@ -2279,7 +2600,7 @@
{
long, colspec, rowspec, width, hspan, stretch,
column, row, cell, vline, hline, columns, rows, cells, vlines, hlines,
- leftsep, rightsep, colsep, abovesep, belowsep, rowsep,
+ leftsep, rightsep, colsep, abovesep, belowsep, rowsep, rulesep,
}
\bool_new:N \l__tblr_long_table_bool
@@ -2303,6 +2624,7 @@
abovesep .code:n = \tblr_set_every_row:nn { } { abovesep = #1 },
belowsep .code:n = \tblr_set_every_row:nn { } { belowsep = #1 },
rowsep .meta:n = { abovesep = #1, belowsep = #1 },
+ rulesep .code:n = \__tblr_keys_gput:nn { rulesep } {#1},
unknown .code:n = \__tblr_table_special_key:Vn \l_keys_key_str {#1},
}
@@ -2403,11 +2725,11 @@
{
\dim_zero:N \l__tblr_w_dim
\tl_set:Nx \l__tblr_n_tl
- { \__tblr_prop_item:ne { vline } { [#2] / @vline-count } }
- \tl_if_empty:NF \l__tblr_n_tl
+ { \__tblr_text_item:ne { vline } { [#2] / @vline-count } }
+ \int_compare:nNnT { \l__tblr_n_tl } > {0}
{
\tl_set:Nx \l__tblr_s_tl
- { \__tblr_prop_item:ne { vline } { [#2] / rulesep } }
+ { \__tblr_prop_item:ne { table } { rulesep } }
\int_step_inline:nn { \l__tblr_n_tl }
{
\vbox_set_to_ht:Nnn \l__tblr_b_box {1pt}
@@ -2416,14 +2738,14 @@
{#1} {#2} {##1} {1pt} {1pt}
}
\tl_set:Nx \l__tblr_w_tl { \dim_eval:n { \box_wd:N \l__tblr_b_box } }
- \__tblr_prop_gput_if_larger:nxx { vline }
+ \__tblr_text_gput_if_larger:nee { vline }
{ [#2](##1) / @vline-width } { \l__tblr_w_tl }
\dim_add:Nn \l__tblr_w_dim { \l__tblr_w_tl }
\dim_add:Nn \l__tblr_w_dim { \l__tblr_s_tl }
}
\dim_add:Nn \l__tblr_w_dim { - \l__tblr_s_tl }
}
- \__tblr_prop_gput_if_larger:nxx { vline }
+ \__tblr_text_gput_if_larger:nee { vline }
{ [#2]/ @vline-width } { \dim_use:N \l__tblr_w_dim }
}
@@ -2434,10 +2756,10 @@
{
\group_begin:
\tl_set:Nx \l__tblr_w_tl
- { \__tblr_prop_item:ne { vline } { [#1][#2](#3) / wd } }
+ { \__tblr_text_item:ne { vline } { [#1][#2](#3) / wd } }
\tl_if_empty:NF \l__tblr_w_tl { \dim_set:Nn \rulewidth { \l__tblr_w_tl } }
\tl_set:Nx \l__tblr_d_tl
- { \__tblr_prop_item:ne { vline } { [#1][#2](#3) / @dash } }
+ { \__tblr_text_item:ne { vline } { [#1][#2](#3) / @dash } }
\tl_set:Nx \l__tblr_a_tl { \tl_head:N \l__tblr_d_tl }
\tl_set:Nx \l__tblr_b_tl { \tl_tail:N \l__tblr_d_tl }
\exp_args:NV \tl_if_eq:NNTF \l__tblr_a_tl \@tblr@dash
@@ -2461,11 +2783,11 @@
{
\dim_zero:N \l__tblr_h_dim
\tl_set:Nx \l__tblr_n_tl
- { \__tblr_prop_item:ne { hline } { [#1] / @hline-count } }
- \tl_if_empty:NF \l__tblr_n_tl
+ { \__tblr_text_item:ne { hline } { [#1] / @hline-count } }
+ \int_compare:nNnT { \l__tblr_n_tl } > {0}
{
\tl_set:Nx \l__tblr_s_tl
- { \__tblr_prop_item:ne { hline } { [#1] / rulesep } }
+ { \__tblr_prop_item:ne { table } { rulesep } }
\int_step_inline:nn { \l__tblr_n_tl }
{
\hbox_set_to_wd:Nnn \l__tblr_b_box {1pt}
@@ -2475,14 +2797,14 @@
\dim_eval:n
{ \box_ht:N \l__tblr_b_box + \box_dp:N \l__tblr_b_box }
}
- \__tblr_prop_gput_if_larger:nxx { hline }
+ \__tblr_text_gput_if_larger:nee { hline }
{ [#1](##1) / @hline-height } { \l__tblr_h_tl }
\dim_add:Nn \l__tblr_h_dim { \l__tblr_h_tl }
\dim_add:Nn \l__tblr_h_dim { \l__tblr_s_tl }
}
\dim_add:Nn \l__tblr_h_dim { - \l__tblr_s_tl }
}
- \__tblr_prop_gput_if_larger:nxx { hline }
+ \__tblr_text_gput_if_larger:nee { hline }
{ [#1] / @hline-height } { \dim_use:N \l__tblr_h_dim }
}
@@ -2492,10 +2814,10 @@
{
\group_begin:
\tl_set:Nx \l__tblr_w_tl
- { \__tblr_prop_item:ne { hline } { [#1][#2](#3) / wd } }
+ { \__tblr_text_item:ne { hline } { [#1][#2](#3) / wd } }
\tl_if_empty:NF \l__tblr_w_tl { \dim_set:Nn \rulewidth { \l__tblr_w_tl } }
\tl_set:Nx \l__tblr_d_tl
- { \__tblr_prop_item:ne { hline } { [#1][#2](#3) / @dash } }
+ { \__tblr_text_item:ne { hline } { [#1][#2](#3) / @dash } }
\tl_set:Nx \l__tblr_a_tl { \tl_head:N \l__tblr_d_tl }
\tl_set:Nx \l__tblr_b_tl { \tl_tail:N \l__tblr_d_tl }
\exp_args:NV \tl_if_eq:NNTF \l__tblr_a_tl \@tblr@dash
@@ -2527,9 +2849,9 @@
{
\group_begin:
\tl_gset:Nx \g__tblr_cell_halign_tl
- { \__tblr_prop_item:ne { cell } { [#1][#2] / halign } }
+ { \__tblr_data_item:neen { cell } {#1} {#2} { halign } }
\tl_set:Nx \l__tblr_v_tl
- { \__tblr_prop_item:ne { cell } { [#1][#2] / valign } }
+ { \__tblr_data_item:neen { cell } {#1} {#2} { valign } }
\tl_case:NnF \l__tblr_v_tl
{
\c__tblr_valign_t_tl
@@ -2607,7 +2929,7 @@
%% #1: row number, #2: column number
\cs_new_protected:Npn \__tblr_get_cell_text:nn #1 #2
{
- \__tblr_prop_if_in:nxTF {cell} { [#1][#2] / omit }
+ \int_compare:nNnTF { \__tblr_data_item:neen { cell } {#1} {#2} { omit } } > {0}
{
\dim_gzero:N \g__tblr_cell_wd_dim
\dim_gzero:N \g__tblr_cell_ht_dim
@@ -2623,18 +2945,19 @@
\cs_new_protected:Npn \__tblr_get_cell_text_real:nn #1 #2
{
\group_begin:
- \tl_set:Nx \l__tblr_c_tl { \__tblr_prop_item:ne {text} {[#1][#2]} }
+ \tl_set:Nx \l__tblr_c_tl { \__tblr_text_item:ne { text } {[#1][#2]} }
\tl_set:Nx \l__tblr_w_tl
- { \__tblr_prop_item:ne { cell } { [#1][#2] / width } }
- \tl_if_empty:NT \l__tblr_w_tl
+ { \__tblr_data_item:neen { cell } {#1} {#2} { width } }
+ \dim_compare:nNnT { \l__tblr_w_tl } < { 0pt } % cell width unset
{
- \__tblr_prop_if_in:nxF { cell } { [#1][#2] / colspan }
+ \int_compare:nNnT
+ { \__tblr_data_item:neen { cell } {#1} {#2} { colspan } } < {2}
{
\tl_set:Nx \l__tblr_w_tl
- { \__tblr_prop_item:ne { column } { [#2] / width } }
+ { \__tblr_data_item:nen { column } {#2} { width } }
}
}
- \tl_if_empty:NT \l__tblr_w_tl
+ \dim_compare:nNnT { \l__tblr_w_tl } < { 0pt } % column width unset
{
\bool_if:NTF \l__tblr_math_mode_bool
{
@@ -2757,15 +3080,15 @@
{
\group_begin:
\tl_set:Nx \l__tblr_c_tl
- { \__tblr_prop_item:ne {cell} { [#1][#2] / colspan } }
- \tl_if_empty:NF \l__tblr_c_tl
+ { \__tblr_data_item:neen { cell } {#1} {#2} { colspan } }
+ \int_compare:nNnT { \l__tblr_c_tl } > {1}
{
- \__tblr_prop_gput:nxx {cell} { [#1][#2] / @cell-width } { \dim_use:N #3 }
+ \__tblr_data_gput:neene { cell } {#1} {#2} { @cell-width } {\dim_use:N #3}
\dim_gzero:N #3 % don't affect column width
}
\tl_set:Nx \l__tblr_r_tl
- { \__tblr_prop_item:ne {cell} { [#1][#2] / rowspan } }
- \tl_if_empty:NF \l__tblr_r_tl
+ { \__tblr_data_item:neen { cell } {#1} {#2} { rowspan } }
+ \int_compare:nNnT { \l__tblr_r_tl } > {1}
{
\tl_case:Nn \g__tblr_cell_valign_tl
{
@@ -2794,8 +3117,8 @@
#4 #5 #6 \l__tblr_u_tl \l__tblr_v_tl
}
}
- \__tblr_prop_gput:nxV {cell} { [#1][#2] / @cell-height } \l__tblr_u_tl
- \__tblr_prop_gput:nxV {cell} { [#1][#2] / @cell-depth } \l__tblr_v_tl
+ \__tblr_data_gput:neenV { cell } {#1} {#2} { @cell-height } \l__tblr_u_tl
+ \__tblr_data_gput:neenV { cell } {#1} {#2} { @cell-depth } \l__tblr_v_tl
%% Don't affect row sizes
\dim_gzero:N #4
\dim_gzero:N #5
@@ -2876,12 +3199,12 @@
\cs_new_protected:Npn \__tblr_update_col_size:nN #1 #2
{
\tl_set:Nx \l_tmpb_tl
- { \__tblr_prop_item:ne {column} { [#1] / @col-width } }
+ { \__tblr_data_item:nen { column } {#1} { @col-width } }
\bool_lazy_or:nnT
{ \tl_if_empty_p:N \l_tmpb_tl }
{ \dim_compare_p:nNn { \dim_use:N #2 } > { \l_tmpb_tl } }
{
- \__tblr_prop_gput:nxx {column} { [#1] / @col-width } { \dim_use:N #2 }
+ \__tblr_data_gput:nene { column } {#1} { @col-width } { \dim_use:N #2 }
}
}
@@ -2925,14 +3248,14 @@
\int_step_variable:nNn { \c@colcount } \l__tblr_j_tl
{
\tl_set:Nx \l__tblr_a_tl
- { \__tblr_prop_item:ne {column} { [\l__tblr_j_tl] / width } }
+ { \__tblr_data_item:nen { column } { \l__tblr_j_tl } { width } }
\tl_set:Nx \l__tblr_b_tl
- { \__tblr_prop_item:ne {column} { [\l__tblr_j_tl] / coefficient } }
+ { \__tblr_data_item:nen { column } { \l__tblr_j_tl } { coefficient } }
\tl_set:Nx \l__tblr_c_tl
- { \__tblr_prop_item:ne {column} { [\l__tblr_j_tl] / @col-width } }
- \tl_if_empty:NTF \l__tblr_a_tl
+ { \__tblr_data_item:nen { column } { \l__tblr_j_tl } { @col-width } }
+ \dim_compare:nNnTF { \l__tblr_a_tl } < { 0pt } % column width unset
{
- \tl_if_empty:NTF \l__tblr_b_tl
+ \dim_compare:nNnTF { \l__tblr_b_tl pt } = { 0pt }
{ \dim_sub:Nn \l__column_target_dim { \l__tblr_c_tl } }
{
\prop_put:Nxx \l__column_coefficient_prop
@@ -2948,17 +3271,17 @@
}
{ \dim_sub:Nn \l__column_target_dim { \l__tblr_a_tl } }
\tl_set:Nx \l__tblr_a_tl
- { \__tblr_prop_item:ne {vline} { [\l__tblr_j_tl] / @vline-width } }
+ { \__tblr_text_item:ne { vline } { [\l__tblr_j_tl] / @vline-width } }
\tl_set:Nx \l__tblr_b_tl
- { \__tblr_prop_item:ne {column} { [\l__tblr_j_tl] / leftsep} }
+ { \__tblr_data_item:nen { column } { \l__tblr_j_tl } { leftsep } }
\tl_set:Nx \l__tblr_c_tl
- { \__tblr_prop_item:ne {column} { [\l__tblr_j_tl] / rightsep } }
+ { \__tblr_data_item:nen { column } { \l__tblr_j_tl } { rightsep } }
\dim_set:Nn \l__column_target_dim
{ \l__column_target_dim - \l__tblr_a_tl - \l__tblr_b_tl - \l__tblr_c_tl }
}
\tl_set:Nx \l__tblr_a_tl
{
- \__tblr_prop_item:ne {vline}
+ \__tblr_text_item:ne { vline }
{ [\int_eval:n {\c@colcount + 1}] / @vline-width }
}
\tl_if_empty:NF \l__tblr_a_tl
@@ -2979,8 +3302,8 @@
}
\prop_map_inline:Nn \l__column_computed_width_prop
{
- \__tblr_prop_gput:nnx {column} { [##1] / width } { ##2 }
- \__tblr_prop_gput:nnn {column} { [##1] / @col-width } { 0pt }
+ \__tblr_data_gput:nnne { column } {##1} { width } {##2}
+ \__tblr_data_gput:nnnn { column } {##1} { @col-width } { 0pt }
}
\__tblr_calculate_cell_sizes:
}
@@ -3067,7 +3390,7 @@
\__tblr_collect_span_widths:
\__tblr_set_column_widths_from_span_widths:
}
- \LogTblrTracing {column}
+ \LogTblrTracing { column }
\__tblr_calculate_cell_sizes:
}
\__tblr_prop_if_in:nnT {table} {rowspan}
@@ -3095,14 +3418,13 @@
{
\dim_eval:n
{
- \__tblr_prop_item:ne {column}
- { [\int_eval:n { \l__tblr_j_tl - 1 }] / rightsep }
+ \__tblr_data_item:nen { column }
+ { \int_eval:n { \l__tblr_j_tl - 1 } } { rightsep }
+
- \__tblr_prop_item:ne {vline}
+ \__tblr_text_item:ne { vline }
{ [\l__tblr_j_tl] / @vline-width }
+
- \__tblr_prop_item:ne {column}
- { [\l__tblr_j_tl] / leftsep}
+ \__tblr_data_item:nen { column } { \l__tblr_j_tl } { leftsep }
}
}
}
@@ -3111,7 +3433,7 @@
{ 0pt }
}
\prop_put:Nxx \l__tblr_col_item_skip_size_prop { item[\l__tblr_j_tl] }
- { \__tblr_prop_item:ne {column} { [\l__tblr_j_tl] / @col-width } }
+ { \__tblr_data_item:nen { column } { \l__tblr_j_tl } { @col-width } }
}
\__tblr_do_if_tracing:nn { cellspan }
{ \prop_log:N \l__tblr_col_item_skip_size_prop }
@@ -3131,7 +3453,7 @@
\__tblr_data_item:nen { row }
{ \int_eval:n {\l__tblr_i_tl - 1} } { belowsep }
+
- \__tblr_prop_item:ne {hline}
+ \__tblr_text_item:ne { hline }
{ [\l__tblr_i_tl] / @hline-height }
+
\__tblr_data_item:nen { row } { \l__tblr_i_tl } { abovesep }
@@ -3165,10 +3487,10 @@
{
\tl_set:Nx \l__tblr_a_tl
{
- \__tblr_prop_item:ne {cell}
- { [\l__tblr_i_tl][\l__tblr_j_tl] / colspan }
+ \__tblr_data_item:neen { cell }
+ { \l__tblr_i_tl } { \l__tblr_j_tl } { colspan }
}
- \tl_if_empty:NF \l__tblr_a_tl
+ \int_compare:nNnT { \l__tblr_a_tl } > {1}
{
\__tblr_put_if_larger:Nxx \l__tblr_col_span_size_prop
{
@@ -3176,8 +3498,8 @@
\int_eval:n {\l__tblr_j_tl + \l__tblr_a_tl - 1} )
}
{
- \__tblr_prop_item:ne {cell}
- { [\l__tblr_i_tl][\l__tblr_j_tl] / @cell-width }
+ \__tblr_data_item:neen { cell }
+ { \l__tblr_i_tl } { \l__tblr_j_tl } { @cell-width }
}
}
}
@@ -3198,15 +3520,15 @@
{
\tl_set:Nx \l__tblr_a_tl
{
- \__tblr_prop_item:ne {cell}
- { [\l__tblr_i_tl][\l__tblr_j_tl] / rowspan }
+ \__tblr_data_item:neen { cell }
+ { \l__tblr_i_tl } { \l__tblr_j_tl } { rowspan }
}
- \tl_if_empty:NF \l__tblr_a_tl
+ \int_compare:nNnT { \l__tblr_a_tl } > {1}
{
\tl_set:Nx \l__tblr_v_tl
{
- \__tblr_prop_item:ne {cell}
- { [\l__tblr_i_tl][\l__tblr_j_tl] / valign }
+ \__tblr_data_item:neen { cell }
+ { \l__tblr_i_tl } { \l__tblr_j_tl } { valign }
}
\tl_if_eq:NnT \l__tblr_v_tl { h }
{
@@ -3215,8 +3537,8 @@
\__tblr_data_item:nen { row }
{ \l__tblr_i_tl } { @row-head }
}
- \__tblr_prop_gput:nxV {cell}
- { [\l__tblr_i_tl][\l__tblr_j_tl] / @cell-height }
+ \__tblr_data_gput:neenV { cell }
+ { \l__tblr_i_tl } { \l__tblr_j_tl } { @cell-height }
\l__tblr_h_tl
}
\tl_if_eq:NnT \l__tblr_v_tl { f }
@@ -3228,8 +3550,8 @@
{ \int_eval:n { \l__tblr_i_tl + \l__tblr_a_tl - 1 } }
{ @row-foot }
}
- \__tblr_prop_gput:nxV {cell}
- { [\l__tblr_i_tl][\l__tblr_j_tl] / @cell-depth }
+ \__tblr_data_gput:neenV { cell }
+ { \l__tblr_i_tl } { \l__tblr_j_tl } { @cell-depth }
\l__tblr_d_tl
}
\__tblr_put_if_larger:Nxx \l__tblr_row_span_size_prop
@@ -3240,11 +3562,11 @@
{
\dim_eval:n
{
- \__tblr_prop_item:ne {cell}
- { [\l__tblr_i_tl][\l__tblr_j_tl] / @cell-height }
+ \__tblr_data_item:neen { cell }
+ { \l__tblr_i_tl } { \l__tblr_j_tl } { @cell-height }
+
- \__tblr_prop_item:ne {cell}
- { [\l__tblr_i_tl][\l__tblr_j_tl] / @cell-depth }
+ \__tblr_data_item:neen { cell }
+ { \l__tblr_i_tl } { \l__tblr_j_tl } { @cell-depth }
}
}
\prop_put:Nxx \l__tblr_row_span_to_row_prop
@@ -3340,8 +3662,8 @@
{
\int_step_variable:nNn { \c@colcount } \l__tblr_j_tl
{
- \__tblr_prop_gput:nxx {column}
- { [\l__tblr_j_tl] / @col-width }
+ \__tblr_data_gput:nene { column }
+ { \l__tblr_j_tl } { @col-width }
{ \prop_item:Ne \l__tblr_col_item_skip_size_prop { item[\l__tblr_j_tl] } }
}
}
@@ -3383,17 +3705,17 @@
{
\tl_set:Nx \l__tblr_a_tl
{
- \__tblr_prop_item:ne {cell}
- { [\l__tblr_i_tl][\l__tblr_j_tl] / colspan }
+ \__tblr_data_item:neen { cell }
+ { \l__tblr_i_tl } { \l__tblr_j_tl } { colspan }
}
- \tl_if_empty:NF \l__tblr_a_tl
+ \int_compare:nNnT { \l__tblr_a_tl } > {1}
{
\__tblr_calc_span_widths:xxN
{ \l__tblr_j_tl }
{ \int_eval:n { \l__tblr_j_tl + \l__tblr_a_tl - 1 } }
\l__tblr_w_dim
- \__tblr_prop_gput:nxx {cell}
- { [\l__tblr_i_tl][\l__tblr_j_tl] / width }
+ \__tblr_data_gput:neene { cell }
+ { \l__tblr_i_tl } { \l__tblr_j_tl } { width }
{ \dim_use:N \l__tblr_w_dim }
}
}
@@ -3448,7 +3770,7 @@
{
\dim_set:Nn \l_tmpa_dim
{
- \__tblr_prop_item:ne { hline } { [\l__tblr_i_tl] / @hline-height }
+ \__tblr_text_item:ne { hline } { [\l__tblr_i_tl] / @hline-height }
+
\__tblr_data_item:nen { row } { \l__tblr_i_tl } { abovesep }
+
@@ -3546,7 +3868,7 @@
\cs_new_protected:Npn \__tblr_valign_whole_top:N #1
{
\tl_set:Nx \l__tblr_a_tl
- { \__tblr_prop_item:ne { hline } { [1] / @hline-height } }
+ { \__tblr_text_item:ne { hline } { [1] / @hline-height } }
%% Note that \l__tblr_b_tl may be empty
\tl_set:Nx \l__tblr_b_tl
{ \__tblr_prop_item:ne { table } { baseline } }
@@ -3580,7 +3902,7 @@
{
\tl_set:Nx \l__tblr_a_tl
{
- \__tblr_prop_item:ne { hline }
+ \__tblr_text_item:ne { hline }
{ [\int_eval:n {\c@rowcount + 1}] / @hline-height }
}
%% Note that \l__tblr_b_tl may be empty
@@ -3630,14 +3952,14 @@
\cs_new_protected:Npn \__tblr_build_hline_segment:nn #1 #2
{
\tl_set:Nx \l__tblr_n_tl
- { \__tblr_prop_item:ne { hline } { [#1] / @hline-count } }
+ { \__tblr_text_item:ne { hline } { [#1] / @hline-count } }
\tl_set:Nx \l__tblr_o_tl
- { \__tblr_prop_item:ne { hline } { [#1][#2] / omit } }
+ { \__tblr_text_item:ne { hline } { [#1][#2] / omit } }
\__tblr_get_col_outer_width_border_width:nNN {#2}
\l__tblr_col_o_wd_dim \l__tblr_col_b_wd_dim
\tl_if_empty:NTF \l__tblr_o_tl
{
- \tl_if_empty:NF \l__tblr_n_tl
+ \int_compare:nNnT { \l__tblr_n_tl } > {0}
{ \__tblr_build_hline_segment_real:nn {#1} {#2} }
}
{ \__tblr_build_hline_segment_omit:nn {#1} {#2} }
@@ -3653,7 +3975,7 @@
\cs_new_protected:Npn \__tblr_build_hline_segment_real:nn #1 #2
{
\tl_set:Nx \l__tblr_s_tl
- { \__tblr_prop_item:ne { hline } { [#1] / rulesep } }
+ { \__tblr_prop_item:ne { table } { rulesep } }
\vbox_set:Nn \l__tblr_c_box
{
%% add an empty hbox to support vbox width
@@ -3661,12 +3983,12 @@
\int_step_inline:nn { \l__tblr_n_tl }
{
\tl_set:Nx \l__tblr_h_tl
- { \__tblr_prop_item:ne { hline } { [#1](##1) / @hline-height } }
+ { \__tblr_text_item:ne { hline } { [#1](##1) / @hline-height } }
\hrule height ~ 0pt % remove lineskip
\hbox_set_to_wd:Nnn \l__tblr_b_box { \l__tblr_col_o_wd_dim }
{
\tl_set:Nx \l__tblr_f_tl
- { \__tblr_prop_item:ne { hline } { [#1][#2](##1) / fg } }
+ { \__tblr_text_item:ne { hline } { [#1][#2](##1) / fg } }
\tl_if_empty:NF \l__tblr_f_tl { \color{\l__tblr_f_tl} }
\__tblr_get_hline_segment_child:nnn {#1} {#2} {##1}
}
@@ -3687,16 +4009,16 @@
\cs_new_protected:Npn \__tblr_get_col_outer_width_border_width:nNN #1 #2 #3
{
\dim_set:Nn #3
- { \__tblr_prop_item:ne {vline} { [\int_eval:n {#1 + 1}] / @vline-width } }
+ { \__tblr_text_item:ne { vline } { [\int_eval:n {#1 + 1}] / @vline-width } }
\dim_set:Nn #2
{
- \__tblr_prop_item:ne {vline} { [#1] / @vline-width }
+ \__tblr_text_item:ne { vline } { [#1] / @vline-width }
+
- \__tblr_prop_item:ne {column} { [#1] / leftsep }
+ \__tblr_data_item:nen { column } {#1} { leftsep }
+
- \__tblr_prop_item:ne {column} { [#1] / @col-width }
+ \__tblr_data_item:nen { column } {#1} { @col-width }
+
- \__tblr_prop_item:ne {column} { [#1] / rightsep }
+ \__tblr_data_item:nen { column } {#1} { rightsep }
+
#3
}
@@ -3756,12 +4078,12 @@
\cs_new_protected:Npn \__tblr_build_vline_segment:nn #1 #2
{
\tl_set:Nx \l__tblr_n_tl
- { \__tblr_prop_item:ne { vline } { [#2] / @vline-count } }
+ { \__tblr_text_item:ne { vline } { [#2] / @vline-count } }
\tl_set:Nx \l__tblr_o_tl
- { \__tblr_prop_item:ne { vline } { [#1][#2] / omit } }
+ { \__tblr_text_item:ne { vline } { [#1][#2] / omit } }
\tl_if_empty:NTF \l__tblr_o_tl
{
- \tl_if_empty:NF \l__tblr_n_tl
+ \int_compare:nNnT { \l__tblr_n_tl } > {0}
{ \__tblr_build_vline_segment_real:nn {#1} {#2} }
}
{ \__tblr_build_vline_segment_omit:nn {#1} {#2} }
@@ -3771,7 +4093,7 @@
\cs_new_protected:Npn \__tblr_build_vline_segment_omit:nn #1 #2
{
\tl_set:Nx \l__tblr_w_tl
- { \__tblr_prop_item:ne { vline } { [#2] / @vline-width } }
+ { \__tblr_text_item:ne { vline } { [#2] / @vline-width } }
\skip_horizontal:N \l__tblr_w_tl
}
@@ -3781,10 +4103,10 @@
\cs_new_protected:Npn \__tblr_build_vline_segment_real:nn #1 #2
{
\tl_set:Nx \l__tblr_s_tl
- { \__tblr_prop_item:ne { vline } { [#2] / rulesep } }
+ { \__tblr_prop_item:ne { table } { rulesep } }
\tl_set:Nx \l__tblr_b_tl
{
- \__tblr_prop_item:ne { hline }
+ \__tblr_text_item:ne { hline }
{ [\int_eval:n{#1 + 1}](1) / @hline-height }
}
\tl_if_empty:NT \l__tblr_b_tl { \tl_set:Nn \l__tblr_b_tl { 0pt } }
@@ -3793,12 +4115,12 @@
\int_step_inline:nn { \l__tblr_n_tl }
{
\tl_set:Nx \l__tblr_w_tl
- { \__tblr_prop_item:ne { vline } { [#2](##1) / @vline-width } }
+ { \__tblr_text_item:ne { vline } { [#2](##1) / @vline-width } }
\vbox_set_to_ht:Nnn \l__tblr_b_box
{ \dim_eval:n { \l__tblr_row_ht_dim + \l__tblr_row_dp_dim } }
{
\tl_set:Nx \l__tblr_f_tl
- { \__tblr_prop_item:ne { vline } { [#1][#2](##1) / fg } }
+ { \__tblr_text_item:ne { vline } { [#1][#2](##1) / fg } }
\tl_if_empty:NF \l__tblr_f_tl { \color{\l__tblr_f_tl} }
\__tblr_get_vline_segment_child:nnnxx {#1} {#2} {##1}
{ \dim_eval:n { \l__tblr_row_ht_dim } }
@@ -3828,24 +4150,24 @@
\int_set:Nn \c@colnum {#2}
\group_begin:
\tl_set:Nx \l__tblr_w_tl
- { \__tblr_prop_item:ne { column } { [#2] / @col-width } }
+ { \__tblr_data_item:nen { column } {#2} { @col-width } }
\tl_set:Nx \l__tblr_h_tl
{ \__tblr_data_item:nen { row } {#1} { @row-height } }
\tl_set:Nx \l__tblr_x_tl
- { \__tblr_prop_item:ne { column } { [#2] / leftsep} }
+ { \__tblr_data_item:nen { column } {#2} { leftsep} }
\tl_set:Nx \l__tblr_y_tl
- { \__tblr_prop_item:ne { column } { [#2] / rightsep } }
+ { \__tblr_data_item:nen { column } {#2} { rightsep } }
\tl_set:Nx \l__tblr_cell_colspan_tl
- { \__tblr_prop_item:ne { cell } { [#1][#2] / colspan } }
- \tl_if_empty:NTF \l__tblr_cell_colspan_tl
+ { \__tblr_data_item:neen { cell } {#1} {#2} { colspan } }
+ \int_compare:nNnTF { \l__tblr_cell_colspan_tl } < {2}
{ \dim_set:Nn \l__tblr_cell_wd_dim { \l__tblr_w_tl } }
{
\__tblr_get_span_horizontal_sizes:NNNNN #1 #2
\l__tblr_o_dim \l__tblr_cell_wd_dim \l__tblr_q_dim
}
\tl_set:Nx \l__tblr_cell_rowspan_tl
- { \__tblr_prop_item:ne { cell } { [#1][#2] / rowspan } }
- \tl_if_empty:NTF \l__tblr_cell_rowspan_tl
+ { \__tblr_data_item:neen { cell } {#1} {#2} { rowspan } }
+ \int_compare:nNnTF { \l__tblr_cell_rowspan_tl } < {2}
{ \dim_set:Nn \l__tblr_cell_ht_dim { \l__tblr_h_tl } }
{
\__tblr_get_span_vertical_sizes:NNNNN #1 #2
@@ -3872,7 +4194,7 @@
\c__tblr_valign_m_tl
{
\vfil
- \tl_if_empty:NT \l__tblr_cell_rowspan_tl
+ \int_compare:nNnT { \l__tblr_cell_rowspan_tl } < {2}
{
\box_set_ht:Nn \l__tblr_a_box
{ \__tblr_data_item:nen { row } {#1} { @row-upper } }
@@ -3892,7 +4214,7 @@
\c__tblr_valign_f_tl
{
\vfil
- \tl_if_empty:NTF \l__tblr_cell_rowspan_tl
+ \int_compare:nNnTF { \l__tblr_cell_rowspan_tl } < {2}
{
\box_set_dp:Nn \l__tblr_a_box
{ \__tblr_data_item:nen { row } {#1} { @row-foot } }
@@ -3924,11 +4246,11 @@
\cs_new_protected:Npn \__tblr_build_cell_background:NN #1 #2
{
- \__tblr_prop_if_in:nxF {cell} { [#1][#2] / omit }
+ \int_compare:nNnT { \__tblr_data_item:neen { cell } {#1} {#2} { omit } } = {0}
{
\group_begin:
\tl_set:Nx \l__tblr_b_tl
- { \__tblr_prop_item:ne { cell } { [#1][#2] / background } }
+ { \__tblr_data_item:neen { cell } {#1} {#2} { background } }
\tl_if_empty:NF \l__tblr_b_tl
{
\__tblr_get_cell_background_width:NNN #1 #2 \l_tmpa_dim
@@ -3946,7 +4268,7 @@
%% #1: row number; #2: column number; #3 resulting dimension
\cs_new_protected:Npn \__tblr_get_cell_background_width:NNN #1 #2 #3
{
- \tl_if_empty:NTF \l__tblr_cell_colspan_tl
+ \int_compare:nNnTF { \l__tblr_cell_colspan_tl } < {2}
{ \dim_set:Nn #3 { \l__tblr_x_tl + \l__tblr_w_tl + \l__tblr_y_tl } }
{
\dim_set:Nn #3 { \l__tblr_o_dim + \l__tblr_cell_wd_dim + \l__tblr_q_dim }
@@ -3956,7 +4278,7 @@
%% #1: row number; #2: column number; #3 resulting dimension
\cs_new_protected:Npn \__tblr_get_cell_background_depth:NNN #1 #2 #3
{
- \tl_if_empty:NTF \l__tblr_cell_rowspan_tl
+ \int_compare:nNnTF { \l__tblr_cell_rowspan_tl } < {2}
{ \dim_set_eq:NN #3 \l__tblr_row_dp_dim }
{
\dim_set:Nn #3
@@ -4014,7 +4336,7 @@
\cs_new_protected:Npn \__tblr_get_span_horizontal_sizes:NNNNN #1 #2 #3 #4 #5
{
\dim_set:Nn #3
- { \__tblr_prop_item:ne { column } { [#2] / leftsep} }
+ { \__tblr_data_item:nen { column } {#2} { leftsep } }
\dim_zero:N #4
\int_step_inline:nnn { #2 } { #2 + \l__tblr_cell_colspan_tl - 2 }
{
@@ -4033,8 +4355,8 @@
}
\dim_set:Nn #5
{
- \__tblr_prop_item:ne { column }
- { [\int_eval:n {#2 + \l__tblr_cell_colspan_tl - 1}] / rightsep }
+ \__tblr_data_item:nen { column }
+ { \int_eval:n {#2 + \l__tblr_cell_colspan_tl - 1} } { rightsep }
}
%\tl_log:x { cell[#1][#2] ~:~ \dim_use:N #3, \dim_use:N #4, \dim_use:N #5 }
}
@@ -4061,6 +4383,7 @@
\bool_new:N \g__tblr_tracing_rowspec_bool
\bool_new:N \g__tblr_tracing_target_bool
\bool_new:N \g__tblr_tracing_cellspan_bool
+\bool_new:N \g__tblr_tracing_intarray_bool
\keys_define:nn { tblr-set-tracing }
{
@@ -4088,6 +4411,8 @@
-target .code:n = \bool_gset_false:N \g__tblr_tracing_target_bool,
+cellspan .code:n = \bool_gset_true:N \g__tblr_tracing_cellspan_bool,
-cellspan .code:n = \bool_gset_false:N \g__tblr_tracing_cellspan_bool,
+ +intarray .code:n = \bool_gset_true:N \g__tblr_tracing_intarray_bool,
+ -intarray .code:n = \bool_gset_false:N \g__tblr_tracing_intarray_bool,
all .code:n = \__tblr_enable_all_tracings:,
none .code:n = \__tblr_disable_all_tracings:,
}
@@ -4106,6 +4431,7 @@
\bool_gset_true:N \g__tblr_tracing_rowspec_bool
\bool_gset_true:N \g__tblr_tracing_target_bool
\bool_gset_true:N \g__tblr_tracing_cellspan_bool
+ \bool_gset_true:N \g__tblr_tracing_intarray_bool
}
\cs_new_protected_nopar:Npn \__tblr_disable_all_tracings:
@@ -4122,6 +4448,7 @@
\bool_gset_false:N \g__tblr_tracing_rowspec_bool
\bool_gset_false:N \g__tblr_tracing_target_bool
\bool_gset_false:N \g__tblr_tracing_cellspan_bool
+ \bool_gset_false:N \g__tblr_tracing_intarray_bool
}
\NewDocumentCommand \LogTabularrayTracing { m }
@@ -4143,7 +4470,7 @@
\cs_new_protected:Npn \__tblr_log_tracing_text:
{
- \__tblr_prop_log:n { text }
+ \__tblr_text_log:n { text }
}
\cs_new_protected:Npn \__tblr_log_tracing_command:
@@ -4158,7 +4485,7 @@
\cs_new_protected:Npn \__tblr_log_tracing_column:
{
- \__tblr_prop_log:n { column }
+ \__tblr_data_log:n { column }
}
\cs_new_protected:Npn \__tblr_log_tracing_row:
@@ -4168,17 +4495,17 @@
\cs_new_protected:Npn \__tblr_log_tracing_cell:
{
- \__tblr_prop_log:n { cell }
+ \__tblr_data_log:n { cell }
}
\cs_new_protected:Npn \__tblr_log_tracing_vline:
{
- \__tblr_prop_log:n { vline }
+ \__tblr_text_log:n { vline }
}
\cs_new_protected:Npn \__tblr_log_tracing_hline:
{
- \__tblr_prop_log:n { hline }
+ \__tblr_text_log:n { hline }
}
\cs_new_protected:Npn \__tblr_log_tracing_colspec:
diff --git a/macros/latex/contrib/tabularray/tabularray.pdf b/macros/latex/contrib/tabularray/tabularray.pdf
index c7b3de29ca..198b6fd211 100644
--- a/macros/latex/contrib/tabularray/tabularray.pdf
+++ b/macros/latex/contrib/tabularray/tabularray.pdf
Binary files differ
diff --git a/macros/latex/contrib/tabularray/tabularray.sty b/macros/latex/contrib/tabularray/tabularray.sty
index 4717992539..2e3fa4eb5d 100644
--- a/macros/latex/contrib/tabularray/tabularray.sty
+++ b/macros/latex/contrib/tabularray/tabularray.sty
@@ -12,18 +12,12 @@
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\ProvidesExplPackage{tabularray}{2021-08-01}{2021M}
+\ProvidesExplPackage{tabularray}{2021-09-01}{2021N}
{Typeset tabulars and arrays with LaTeX3}
\RequirePackage{xparse}
-\AtBeginDocument
- {
- \@ifpackageloaded{xcolor}{\RequirePackage{ninecolors}}{}
- \@ifpackageloaded{hyperref}{\hypersetup{pdfborder={0 0 0}}}{}
- }
-
-\ExplSyntaxOn
+\AtBeginDocument{\@ifpackageloaded{xcolor}{\RequirePackage{ninecolors}}{}}
%% Backport \tl_if_eq:NnTF for old texlive 2020
\cs_if_exist:NF \tl_if_eq:NnTF
@@ -1114,11 +1108,18 @@
\tl_new:N \l__tblr_hline_dash_tl % dash style
\tl_new:N \l__tblr_hline_fg_tl % dash foreground
\tl_new:N \l__tblr_hline_wd_tl % dash width
+\tl_new:N \l__tblr_hline_leftpos_tl % left position
+\tl_new:N \l__tblr_hline_rightpos_tl % right position
+\bool_new:N \l__tblr_hline_endpos_bool % whether set positions only for both ends
\NewTableCommand \cline [2] [] { \SetHline [=] {#2} {#1} }
\NewTableCommand \hline [1] [] { \SetHline [+] {-} {#1} }
+%% Some keys can be set by any hline, such as abovespace and belowspace keys.
+%% Using special hline of index 0, you can set these keys without adding any hlines.
+\NewTableCommand \SetVspace [1] { \SetHline [0] {-} {#1} }
+
%% #1: the index of the hline (may be + or =)
%% #2: which columns of the hline, separate by commas
%% #3: key=value pairs
@@ -1132,13 +1133,19 @@
\cs_new_protected:Npn \tblr_set_hline:nnn #1 #2 #3
{
\group_begin:
- \keys_set_groups:nnn { tblr-hline } { text } {#3}
- \tl_if_eq:NnF \l__tblr_hline_dash_tl { \exp_not:N \@tblr@text }
+ %% We can not use \int_compare:nNnTF here since #1 may be + or = .
+ %% Also we treat hline of index 0 specially, not adding hline count.
+ \tl_if_eq:nnTF {#1} {0}
+ { \keys_set:nn { tblr-hline } {#3} }
{
- \__tblr_set_hline_num:n {#1}
- \tl_clear:N \l__tblr_hline_dash_tl
- \keys_set:nn { tblr-hline } { dash = solid, #3 }
- \__tblr_set_hline_cmd:n {#2}
+ \keys_set_groups:nnn { tblr-hline } { text } {#3}
+ \tl_if_eq:NnF \l__tblr_hline_dash_tl { \exp_not:N \@tblr@text }
+ {
+ \__tblr_set_hline_num:n {#1}
+ \tl_clear:N \l__tblr_hline_dash_tl
+ \keys_set:nn { tblr-hline } { dash = solid, #3 }
+ \__tblr_set_hline_cmd:n {#2}
+ }
}
\group_end:
}
@@ -1215,6 +1222,21 @@
wd .code:n = \tl_set:Nn \l__tblr_hline_wd_tl { \dim_eval:n {#1} },
fg .code:n = \tl_set:Nn \l__tblr_hline_fg_tl {#1},
baseline .code:n = \__tblr_hline_set_baseline:n {#1},
+ leftpos .code:n = \tl_set:Nx \l__tblr_hline_leftpos_tl {#1},
+ rightpos .code:n = \tl_set:Nx \l__tblr_hline_rightpos_tl {#1},
+ l .meta:n = { leftpos = #1 },
+ l .default:n = { -0.8 },
+ r .meta:n = { rightpos = #1 },
+ r .default:n = { -0.8 },
+ lr .meta:n = { leftpos = #1, rightpos = #1 },
+ lr .default:n = { -0.8 },
+ endpos .bool_set:N = \l__tblr_hline_endpos_bool,
+ abovespace .code:n = \__tblr_row_gput_above:ne { belowsep } { \dim_eval:n {#1} },
+ belowspace .code:n = \__tblr_row_gput:ne { abovesep } { \dim_eval:n {#1} },
+ abovespace+ .code:n = \__tblr_row_gadd_dimen_above:ne
+ { belowsep } { \dim_eval:n {#1} },
+ belowspace+ .code:n = \__tblr_row_gadd_dimen:ne
+ { abovesep } { \dim_eval:n {#1} },
unknown .code:n = \__tblr_hline_unknown_key:V \l_keys_key_str,
}
@@ -1238,24 +1260,59 @@
\__tblr_get_childs:nx {#1} { \int_use:N \c@colcount }
\clist_map_inline:Nn \l_tblr_childs_clist
{
- \__tblr_spec_gput:nee { hline }
- { [\int_use:N \c@rownum][##1](\l__tblr_hline_num_tl) / @dash }
- { \l__tblr_hline_dash_tl }
+ \__tblr_set_hline_option:nnn { ##1 } { @dash } { \l__tblr_hline_dash_tl }
\tl_if_empty:NF \l__tblr_hline_wd_tl
{
- \__tblr_spec_gput:nee { hline }
- { [\int_use:N \c@rownum][##1](\l__tblr_hline_num_tl) / wd }
- { \l__tblr_hline_wd_tl }
+ \__tblr_set_hline_option:nnn { ##1 } { wd } { \l__tblr_hline_wd_tl }
}
\tl_if_empty:NF \l__tblr_hline_fg_tl
{
- \__tblr_spec_gput:nee { hline }
- { [\int_use:N \c@rownum][##1](\l__tblr_hline_num_tl) / fg }
- { \l__tblr_hline_fg_tl }
+ \__tblr_set_hline_option:nnn { ##1 } { fg } { \l__tblr_hline_fg_tl }
+ }
+ }
+ \tl_if_empty:NF \l__tblr_hline_leftpos_tl
+ {
+ \bool_if:NTF \l__tblr_hline_endpos_bool
+ {
+ \__tblr_set_hline_option:nnn
+ { \clist_item:Nn \l_tblr_childs_clist {1} }
+ { leftpos }
+ { \l__tblr_hline_leftpos_tl }
+ }
+ {
+ \clist_map_inline:Nn \l_tblr_childs_clist
+ {
+ \__tblr_set_hline_option:nnn
+ { ##1 } { leftpos } { \l__tblr_hline_leftpos_tl }
+ }
+ }
+ }
+ \tl_if_empty:NF \l__tblr_hline_rightpos_tl
+ {
+ \bool_if:NTF \l__tblr_hline_endpos_bool
+ {
+ \__tblr_set_hline_option:nnn
+ { \clist_item:Nn \l_tblr_childs_clist {-1} }
+ { rightpos }
+ { \l__tblr_hline_rightpos_tl }
+ }
+ {
+ \clist_map_inline:Nn \l_tblr_childs_clist
+ {
+ \__tblr_set_hline_option:nnn
+ { ##1 } { rightpos } { \l__tblr_hline_rightpos_tl }
+ }
}
}
}
+%% #1: column; #2: key; #3: value
+\cs_new_protected_nopar:Npn \__tblr_set_hline_option:nnn #1 #2 #3
+ {
+ \__tblr_spec_gput:nee { hline }
+ { [\int_use:N \c@rownum][#1](\l__tblr_hline_num_tl) / #2 } { #3 }
+ }
+
\NewTableCommand \firsthline [1] [] { \SetHline [+] {-} { #1, baseline=below } }
\NewTableCommand \lasthline [1] [] { \SetHline [+] {-} { #1, baseline=above } }
@@ -1313,6 +1370,8 @@
\tl_new:N \l__tblr_vline_dash_tl % dash style
\tl_new:N \l__tblr_vline_fg_tl % dash foreground
\tl_new:N \l__tblr_vline_wd_tl % dash width
+\tl_new:N \l__tblr_vline_abovepos_tl % above position
+\tl_new:N \l__tblr_vline_belowpos_tl % below position
\NewTableCommand \rline [2] [] { \SetVline [=] {#2} {#1} }
@@ -1413,6 +1472,8 @@
text .groups:n = { text },
wd .code:n = \tl_set:Nn \l__tblr_vline_wd_tl { \dim_eval:n {#1} },
fg .code:n = \tl_set:Nn \l__tblr_vline_fg_tl {#1},
+ abovepos .code:n = \tl_set:Nx \l__tblr_vline_abovepos_tl {#1},
+ belowpos .code:n = \tl_set:Nx \l__tblr_vline_belowpos_tl {#1},
unknown .code:n = \__tblr_vline_unknown_key:V \l_keys_key_str,
}
@@ -1451,6 +1512,18 @@
{ [##1][\int_use:N \c@colnum](\l__tblr_vline_num_tl) / fg }
{ \l__tblr_vline_fg_tl }
}
+ \tl_if_empty:NF \l__tblr_vline_abovepos_tl
+ {
+ \__tblr_spec_gput:nee { vline }
+ { [##1][\int_use:N \c@colnum](\l__tblr_vline_num_tl) / abovepos }
+ { \l__tblr_vline_abovepos_tl }
+ }
+ \tl_if_empty:NF \l__tblr_vline_belowpos_tl
+ {
+ \__tblr_spec_gput:nee { vline }
+ { [##1][\int_use:N \c@colnum](\l__tblr_vline_num_tl) / belowpos }
+ { \l__tblr_vline_belowpos_tl }
+ }
}
}
@@ -1549,6 +1622,7 @@
{
halign .code:n = \__tblr_cell_gput:nn { halign } {#1},
valign .code:n = \__tblr_cell_gput:nn { valign } {#1},
+ j .meta:n = { halign = j },
l .meta:n = { halign = l },
c .meta:n = { halign = c },
r .meta:n = { halign = r },
@@ -1685,6 +1759,23 @@
}
}
}
+ %% Make continuous borders for multirow cells
+ \tl_set:Nx \l__tblr_n_tl
+ {
+ \int_max:nn
+ {
+ \__tblr_spec_item:ne { vline } { [\int_use:N \c@colnum] / @vline-count }
+ }
+ { 1 }
+ }
+ \int_step_variable:nnNn
+ { \c@rownum } { \int_eval:n { \c@rownum + #1 -1 } } \l__tblr_i_tl
+ {
+ \__tblr_spec_gput:nee { vline }
+ { [\l__tblr_i_tl][\int_use:N \c@colnum](\l__tblr_n_tl) / belowpos } {1}
+ \__tblr_spec_gput:nee { vline }
+ { [\l__tblr_i_tl][\int_eval:n {\c@colnum + #2}](1) / belowpos } {1}
+ }
}
\cs_generate_variant:Nn \__tblr_set_span_spec:nn { VV }
@@ -1809,6 +1900,7 @@
{
halign .code:n = \__tblr_column_gput_cell:nn { halign } {#1},
valign .code:n = \__tblr_column_gput_cell:nn { valign } {#1},
+ j .meta:n = { halign = j },
l .meta:n = { halign = l },
c .meta:n = { halign = c },
r .meta:n = { halign = r },
@@ -1968,6 +2060,7 @@
{
halign .code:n = \__tblr_row_gput_cell:nn { halign } {#1},
valign .code:n = \__tblr_row_gput_cell:nn { valign } {#1},
+ j .meta:n = { halign = j },
l .meta:n = { halign = l },
c .meta:n = { halign = c },
r .meta:n = { halign = r },
@@ -2004,12 +2097,25 @@
}
\cs_generate_variant:Nn \__tblr_row_gput:nn { ne }
+\cs_new_protected:Npn \__tblr_row_gput_above:nn #1 #2
+ {
+ \__tblr_data_gput:nenn { row } { \int_eval:n { \c@rownum - 1 } } {#1} {#2}
+ }
+\cs_generate_variant:Nn \__tblr_row_gput_above:nn { ne }
+
\cs_new_protected:Npn \__tblr_row_gadd_dimen:nn #1 #2
{
\__tblr_data_gadd_dimen_value:nenn { row } { \int_use:N \c@rownum } {#1} {#2}
}
\cs_generate_variant:Nn \__tblr_row_gadd_dimen:nn { ne }
+\cs_new_protected:Npn \__tblr_row_gadd_dimen_above:nn #1 #2
+ {
+ \__tblr_data_gadd_dimen_value:nenn { row }
+ { \int_eval:n { \c@rownum - 1 } } {#1} {#2}
+ }
+\cs_generate_variant:Nn \__tblr_row_gadd_dimen_above:nn { ne }
+
%% #1: key; #2: value
\cs_new_protected:Npn \__tblr_row_gput_cell:nn #1 #2
{
@@ -2271,6 +2377,7 @@
\NewColumnRowType { l } { Q[l] }
\NewColumnRowType { c } { Q[c] }
\NewColumnRowType { r } { Q[r] }
+\NewColumnRowType { j } { Q[j] }
\NewColumnType { t } [1] { Q[t,wd=#1] }
\NewColumnType { p } [1] { Q[p,wd=#1] }
@@ -2333,7 +2440,10 @@
}
{
\str_if_in:cnTF { g_tblr_used_ \g__tblr_column_or_row_tl _types_str } {#1}
- { \cs:w tblr_ \g__tblr_column_or_row_tl _type_ #1 \cs_end: }
+ {
+ %% Note that #1 may be an active character (see issue #58)
+ \cs:w tblr_ \g__tblr_column_or_row_tl _type_ \token_to_str:N #1 \cs_end:
+ }
{
\msg_error:nnVn { tabularray } { unknown-colrow-type }
\g__tblr_column_or_row_tl {#1}
@@ -2578,8 +2688,10 @@
{
\tl_set:Nn \l_tmpa_tl { ##1 }
\__tblr_remove_braces:N \l_tmpa_tl
+ \__tblr_trim_par_space_tokens:N \l_tmpa_tl
\int_incr:N \c@colnum
\__tblr_extract_table_commands:N \l_tmpa_tl
+ \__tblr_trim_par_space_tokens:N \l_tmpa_tl
\__tblr_spec_gput:neV { text } { [#1][\int_use:N \c@colnum] } \l_tmpa_tl
\__tblr_add_multicolumn_empty_cell:
}
@@ -2599,6 +2711,15 @@
}
}
+\regex_const:Nn \c__tblr_trim_left_par_space_regex { ^ \c{par} ? \s * }
+\regex_const:Nn \c__tblr_trim_right_space_par_regex { \s * \c{par} ? $ }
+
+\cs_new_protected:Npn \__tblr_trim_par_space_tokens:N #1
+ {
+ \regex_replace_once:NnN \c__tblr_trim_left_par_space_regex {} #1
+ \regex_replace_once:NnN \c__tblr_trim_right_space_par_regex {} #1
+ }
+
%% Add empty cells after the \multicolumn span cell
\cs_new_protected:Npn \__tblr_add_multicolumn_empty_cell:
{
@@ -2627,7 +2748,7 @@
\tl_clear:N \l__tblr_saved_table_commands_before_cell_text_tl
\tl_clear:N \l__tblr_saved_cell_text_after_table_commands_tl
\int_set:Nn \l__multicolumn_cell_number_int {1}
- \exp_last_unbraced:NV \__tblr_extract_table_commands_next:w #1 \q_stop
+ \exp_last_unbraced:NV \__tblr_extract_table_commands_next:n #1 \q_stop
\tl_if_empty:NF \l__tblr_saved_table_commands_before_cell_text_tl
{
\__tblr_prop_gput:nxV { command }
@@ -2637,26 +2758,26 @@
\tl_set_eq:NN #1 \l__tblr_saved_cell_text_after_table_commands_tl
}
-%% #1 maybe a single token or multiple tokens given in braces
-\cs_new_protected:Npn \__tblr_extract_table_commands_next:w #1
+%% #1 maybe a single token or multiple tokens from a pair of braces
+\cs_new_protected:Npn \__tblr_extract_table_commands_next:n #1
{
- \clist_if_in:NnTF \g__tblr_table_commands_clist { #1 }
+ \tl_if_single_token:nTF {#1}
{
- \clist_if_in:NnTF \g__tblr_table_commands_unbrace_next_clist { #1 }
- { \bool_set_true:N \l__tblr_table_command_unbrace_next_bool }
- { \bool_set_false:N \l__tblr_table_command_unbrace_next_bool }
- \token_if_eq_meaning:NNTF #1 \multicolumn
- { \__tblr_extract_multicolumn_command:Nn #1 }
- { \__tblr_extract_one_table_command:N #1 }
- }
- {
- \tl_if_single_token:nTF {#1}
+ \clist_if_in:NnTF \g__tblr_table_commands_clist { #1 }
+ {
+ \clist_if_in:NnTF \g__tblr_table_commands_unbrace_next_clist { #1 }
+ { \bool_set_true:N \l__tblr_table_command_unbrace_next_bool }
+ { \bool_set_false:N \l__tblr_table_command_unbrace_next_bool }
+ \token_if_eq_meaning:NNTF #1 \multicolumn
+ { \__tblr_extract_multicolumn_command:Nn #1 }
+ { \__tblr_extract_one_table_command:N #1 }
+ }
{
\token_if_eq_meaning:NNF #1 \q_stop
{ \__tblr_save_real_cell_text:w #1 }
}
- { \__tblr_save_real_cell_text:w {#1} }
}
+ { \__tblr_save_real_cell_text:w {#1} }
}
\cs_new_protected:Npn \__tblr_extract_multicolumn_command:Nn #1 #2
@@ -2701,8 +2822,8 @@
}
{
\bool_if:NTF \l__tblr_table_command_unbrace_next_bool
- { \__tblr_last_unbraced:Nn \__tblr_extract_table_commands_next:w }
- { \__tblr_extract_table_commands_next:w }
+ { \__tblr_last_unbraced:Nn \__tblr_extract_table_commands_next:n }
+ { \__tblr_extract_table_commands_next:n }
}
}
@@ -2764,6 +2885,7 @@
@vline-count = 0,
}
+\tl_new:N \l__tblr_inner_spec_measure_tl
\tl_new:N \l__tblr_inner_spec_verb_tl
\cs_new_protected:Npn \__tblr_init_table_inner_spec:
@@ -2812,6 +2934,7 @@
\__tblr_spec_gput:nen { vline }
{ [\int_eval:n { \c@colcount + 1}] / ##1 } {##2}
}
+ \tl_clear:N \l__tblr_inner_spec_measure_tl
\tl_clear:N \l__tblr_inner_spec_verb_tl
\keys_set:nv { tblr } { l__tblr_default_ \l__tblr_env_name_tl _inner_tl }
}
@@ -3091,10 +3214,13 @@
\xleaders \l__tblr_b_tl \vfil
}
{
+ %% When using text as vline, we need to omit abovepos and belowpos.
+ \unskip
\hbox_set:Nn \l__tblr_d_box { \l__tblr_b_tl }
\box_set_ht:Nn \l__tblr_d_box {#4}
\box_set_dp:Nn \l__tblr_d_box {#5}
\box_use:N \l__tblr_d_box
+ \vss
}
\group_end:
}
@@ -3317,21 +3443,7 @@
\tl_set:Nx \l__tblr_w_tl { \box_wd:N \l_tmpa_box }
}
{
- \tl_set_eq:NN \l_tmpb_tl \l__tblr_c_tl
- \__tblr_insert_braces:N \l_tmpb_tl
- \seq_set_split:NnV \l_tmpa_seq { \\ } \l_tmpb_tl
- \tl_set:Nn \l__tblr_w_tl { 0pt }
- \seq_map_variable:NNn \l_tmpa_seq \l_tmpa_tl
- {
- \__tblr_remove_braces:N \l_tmpa_tl
- \hbox_set:Nn \l_tmpa_box
- {
- \l__tblr_f_tl
- \__tblr_rescan_cell_tokens:N \l_tmpa_tl
- }
- \tl_set:Nx \l__tblr_w_tl
- { \dim_max:nn { \l__tblr_w_tl } { \box_wd:N \l_tmpa_box } }
- }
+ \__tblr_get_cell_size_with_box:
}
}
\tl_put_left:NV \l__tblr_c_tl \l__tblr_f_tl
@@ -3339,6 +3451,54 @@
\group_end:
}
+\cs_new_protected:Npn \__tblr_get_cell_size_with_box:
+ {
+ \tl_if_eq:NnTF \l__tblr_inner_spec_measure_tl { vbox }
+ { \__tblr_get_cell_size_with_vbox: }
+ { \__tblr_get_cell_size_with_hbox: }
+ }
+
+%% Varwidth won't work as expected when \color command occurs in it,
+%% and we can not fix this problem with \leavevmode command.
+%% See https://tex.stackexchange.com/q/460489.
+%% But we need to use \color command for fg option,
+%% or users may use it in the middle of the cell text,
+%% so we have redefine \color command and disable it before measuring cell.
+
+\NewDocumentCommand \__tblr_fake_color_command:w { o m } { }
+
+\cs_new_protected:Npn \__tblr_get_cell_size_with_vbox:
+ {
+ \hbox_set:Nn \l_tmpa_box
+ {
+ \cs_set_eq:NN \color \__tblr_fake_color_command:w
+ \begin{varwidth}{\paperwidth}
+ \l__tblr_f_tl
+ \__tblr_rescan_cell_tokens:N \l__tblr_c_tl
+ \end{varwidth}
+ }
+ \tl_set:Nx \l__tblr_w_tl { \box_wd:N \l_tmpa_box }
+ }
+
+\cs_new_protected:Npn \__tblr_get_cell_size_with_hbox:
+ {
+ \tl_set_eq:NN \l_tmpb_tl \l__tblr_c_tl
+ \__tblr_insert_braces:N \l_tmpb_tl
+ \seq_set_split:NnV \l_tmpa_seq { \\ } \l_tmpb_tl
+ \tl_set:Nn \l__tblr_w_tl { 0pt }
+ \seq_map_variable:NNn \l_tmpa_seq \l_tmpa_tl
+ {
+ \__tblr_remove_braces:N \l_tmpa_tl
+ \hbox_set:Nn \l_tmpa_box
+ {
+ \l__tblr_f_tl
+ \__tblr_rescan_cell_tokens:N \l_tmpa_tl
+ }
+ \tl_set:Nx \l__tblr_w_tl
+ { \dim_max:nn { \l__tblr_w_tl } { \box_wd:N \l_tmpa_box } }
+ }
+ }
+
%% #1: cell text; #2: box width
\cs_new_protected:Npn \__tblr_get_vcell_and_sizes:NN #1 #2
{
@@ -3401,13 +3561,18 @@
\box_use:N \l__tblr_strut_dp_box
}
+%% When using verb option, there is an end-of-line character at the end.
+%% This character causes extra horizontal space at the end when "measure=hbox",
+%% or causes extra vertical space at the end with "measure=vbox".
+%% Therefore we have to use an \empty to remove it.
+%% See https://tex.stackexchange.com/q/213659
\cs_new_protected:Npn \__tblr_rescan_cell_tokens:N #1
{
\tl_if_empty:NTF \l__tblr_inner_spec_verb_tl
{ #1 }
{
\regex_replace_all:nnN { . } { \c{string} \0 } #1
- \tl_set:Nx #1 { #1 }
+ \tl_set:Nx #1 { #1 \noexpand \empty }
\exp_args:NV \tex_scantokens:D #1
}
}
@@ -3657,7 +3822,8 @@
}
%% If all columns have negative coefficients and small natural widths,
-%% \l__column_coefficient_prop will be empty after one or more rounds
+%% \l__column_coefficient_prop will be empty after one or more rounds.
+%% We reset @row-height, etc for \linewidth graphics in X columns (issue #80)
\cs_new_protected:Npn \__tblr_adjust_extendable_column_width:
{
\bool_while_do:nn
@@ -3672,6 +3838,14 @@
\__tblr_data_gput:nnne { column } {##1} { width } {##2}
\__tblr_data_gput:nnnn { column } {##1} { @col-width } { 0pt }
}
+ \int_step_inline:nn { \c@rowcount }
+ {
+ \__tblr_data_gput:nnnn { row } {##1} { @row-height } { 0pt }
+ \__tblr_data_gput:nnnn { row } {##1} { @row-head } { 0pt }
+ \__tblr_data_gput:nnnn { row } {##1} { @row-foot } { 0pt }
+ \__tblr_data_gput:nnnn { row } {##1} { @row-upper } { 0pt }
+ \__tblr_data_gput:nnnn { row } {##1} { @row-lower } { 0pt }
+ }
\__tblr_calculate_cell_sizes:
}
@@ -4154,8 +4328,8 @@
%% Cell is spanned from col #1 to col #2, #3 is the return dim
\cs_new_protected:Npn \__tblr_calc_span_widths:nnN #1 #2 #3
{
- \dim_zero:N #3
- \int_step_inline:nnn { #1 } { #2 }
+ \dim_set:Nn #3 { \prop_item:Ne \l__tblr_col_item_skip_size_prop { item[#1] } }
+ \int_step_inline:nnn { #1 + 1 } { #2 }
{
\tl_set:Nx \l_tmpa_tl
{ \prop_item:Ne \l__tblr_col_item_skip_size_prop { skip[##1] } }
@@ -4535,6 +4709,17 @@
\par
}
}
+\DefTblrTemplate { caption } { simple }
+ {
+ \UseTblrAlign { caption }
+ \UseTblrIndent { caption }
+ \UseTblrHang { caption }
+ \leavevmode
+ \UseTblrTemplate { caption-tag } { default }
+ \UseTblrTemplate { caption-sep } { default }
+ \UseTblrTemplate { caption-text } { default }
+ \par
+ }
\SetTblrTemplate { caption } { normal }
\DefTblrTemplate { capcont } { empty } { }
@@ -4592,6 +4777,19 @@
\par
}
}
+\DefTblrTemplate { capcont } { simple }
+ {
+ \UseTblrAlign { caption }
+ \UseTblrIndent { caption }
+ \UseTblrHang { caption }
+ \leavevmode
+ \UseTblrTemplate { caption-tag } { default }
+ \UseTblrTemplate { caption-sep } { default }
+ \UseTblrTemplate { caption-text } { default }
+ \space
+ \UseTblrTemplate { conthead-text } { default }
+ \par
+ }
\SetTblrTemplate { capcont} { normal }
%%% --------------------------------------------------------
@@ -4627,8 +4825,19 @@
{ #2 }
}
+\DefTblrTemplate { note-border } { empty }
+ {
+ \hypersetup { pdfborder = { 0 ~ 0 ~ 0 } }
+ }
+\DefTblrTemplate { note-border } { normal }
+ {
+ \hypersetup { pdfborder = { 0 ~ 0 ~ 1 } }
+ }
+\SetTblrTemplate { note-border } { empty }
+
\NewDocumentCommand \TblrNote { m }
{
+ \cs_if_exist:NT \hypersetup { \ExpTblrTemplate { note-border }{ default } }
\__tblr_hyper_link:nn {#1}
{ \textsuperscript { \sffamily \UseTblrFont { note-tag } #1 } }
}
@@ -5005,9 +5214,10 @@
{ \skip_vertical:n { \__tblr_spec_item:nn { outer } { presep } } }
\LogTblrTracing { page }
\nointerlineskip
- \mode_leave_vertical:
+ \mode_leave_vertical: % enter horizontal mode to update \pagetotal
\LogTblrTracing { page }
\hrule height ~ 0pt
+ \nobreak % prevent page break after \hrule (see issue #42)
\LogTblrTracing { page }
\int_set:Nn \l__tblr_table_page_int {1}
\__tblr_build_head_foot:
@@ -5024,16 +5234,25 @@
\l_tmpa_dim \l__tblr_page_break_curr_bool
\__tblr_check_table_page_break:NNN
\l__tblr_remain_height_dim \l_tmpa_dim \l__tblr_page_break_prev_bool
+ \__tblr_do_if_tracing:nn { page } { \int_log:N \l__tblr_curr_i_int }
\bool_if:NTF \l__tblr_page_break_prev_bool
{
- \__tblr_do_if_tracing:nn { page } { \int_log:N \l__tblr_curr_i_int }
- \int_compare:nNnF
- { \l__tblr_prev_i_int - \l__tblr_long_from_int } < {0}
+ \int_compare:nNnTF
+ { \l__tblr_long_from_int } > { \l__tblr_prev_i_int }
+ {
+ % See issue #42: if longtblr starts at the bottom of a page,
+ % \pagetotal maybe exceed \pagegoal after adding presep,
+ % or after adding rowhead or rowfoot of the table.
+ % In these cases, we will not typeset table in this page,
+ % but rather do some negative \vskip and execute \newpage.
+ \skip_vertical:n { \pagegoal - \pagetotal }
+ }
{
\__tblr_build_page_table:nnx {#1}
{ \int_use:N \l__tblr_long_from_int }
{ \int_use:N \l__tblr_prev_i_int }
\int_incr:N \l__tblr_table_page_int
+ \int_set:Nn \l__tblr_long_from_int { \l__tblr_prev_i_int + 1 }
}
\newpage
\hbox{}\kern-\topskip\nobreak
@@ -5041,7 +5260,6 @@
\LogTblrTracing { page }
\dim_set:Nn \l__tblr_remain_height_dim
{ \pagegoal - \pagetotal - \l__tblr_row_head_foot_dim - \l_tmpa_dim }
- \int_set:Nn \l__tblr_long_from_int { \l__tblr_prev_i_int + 1 }
}
{
\bool_if:NTF \l__tblr_page_break_curr_bool
@@ -5073,7 +5291,10 @@
\__tblr_build_page_table:nnn {#1}
{ \int_use:N \l__tblr_long_from_int } { \int_use:N \l__tblr_long_to_int }
\skip_vertical:n { \__tblr_spec_item:nn { outer } { postsep } }
- \hrule height ~ 0pt
+ % In the past we used "\hrule height ~ 0pt" to get strict postsep,
+ % but the postsep was not discarded when page breaks, see issue #39.
+ % Therefore we use \nointerlineskip here.
+ \nointerlineskip
}
\cs_generate_variant:Nn \__tblr_build_long_table:n { e }
@@ -5225,10 +5446,16 @@
\bool_new:N \l__tblr_build_last_hline_bool
\bool_set_true:N \l__tblr_build_first_hline_bool
\bool_set_true:N \l__tblr_build_last_hline_bool
+\box_new:N \l__tblr_table_hlines_box
+\box_new:N \l__tblr_hline_box
+\box_new:N \l__tblr_row_box
%% #1: row from; #2: row to
+%% To fix disappeared hlines with colorful tables in Adobe Reader (see #76),
+%% we collect all hlines and draw them at the end of the table.
\cs_new_protected:Npn \__tblr_build_one_table:nn #1 #2
{
+ \box_clear:N \l__tblr_table_hlines_box
\vbox_set:Nn \l__tblr_table_box
{
\int_step_variable:nnNn {#1} {#2} \l__tblr_i_tl
@@ -5236,18 +5463,50 @@
\bool_lazy_or:nnT
{ \int_compare_p:nNn { \l__tblr_i_tl } > {#1} }
{ \bool_if_p:N \l__tblr_build_first_hline_bool }
- { \hbox:n { \__tblr_build_hline:V \l__tblr_i_tl } }
+ { \__tblr_put_one_hline:n { \__tblr_build_hline:V \l__tblr_i_tl } }
\hrule height ~ 0pt % remove lineskip between hlines and rows
- \hbox:n { \__tblr_build_row:N \l__tblr_i_tl }
+ \__tblr_put_one_row:n { \__tblr_build_row:N \l__tblr_i_tl }
\hrule height ~ 0pt
}
\bool_if:NT \l__tblr_build_last_hline_bool
- { \hbox:n { \__tblr_build_hline:n { \int_eval:n {#2 + 1} } } }
+ {
+ \__tblr_put_one_hline:n
+ { \__tblr_build_hline:n { \int_eval:n {#2 + 1} } }
+ }
+ \skip_vertical:n
+ {
+ - \box_ht:N \l__tblr_table_hlines_box
+ - \box_dp:N \l__tblr_table_hlines_box
+ }
+ \box_use:N \l__tblr_table_hlines_box
}
\bool_set_true:N \l__tblr_build_first_hline_bool
\bool_set_true:N \l__tblr_build_last_hline_bool
}
+\cs_new_protected:Npn \__tblr_put_one_hline:n #1
+ {
+ \hbox_set:Nn \l__tblr_hline_box {#1}
+ \skip_vertical:n { \box_ht:N \l__tblr_hline_box + \box_dp:N \l__tblr_hline_box }
+ \vbox_set:Nn \l__tblr_table_hlines_box
+ {
+ \vbox_unpack:N \l__tblr_table_hlines_box
+ \box_use:N \l__tblr_hline_box
+ }
+ }
+
+\cs_new_protected:Npn \__tblr_put_one_row:n #1
+ {
+ \hbox_set:Nn \l__tblr_row_box {#1}
+ \vbox_set:Nn \l__tblr_table_hlines_box
+ {
+ \vbox_unpack:N \l__tblr_table_hlines_box
+ \skip_vertical:n
+ { \box_ht:N \l__tblr_row_box + \box_dp:N \l__tblr_row_box }
+ }
+ \box_use:N \l__tblr_row_box
+ }
+
%% #1: hline number
\cs_new_protected:Npn \__tblr_build_one_hline:n #1
{
@@ -5411,10 +5670,13 @@
\hrule height ~ 0pt % remove lineskip
\hbox_set_to_wd:Nnn \l__tblr_b_box { \l__tblr_col_o_wd_dim }
{
+ \__tblr_get_hline_left_right_skips:nnn {#1} {#2} {##1}
+ \skip_horizontal:N \l__tblr_hline_leftskip_dim
\tl_set:Nx \l__tblr_f_tl
{ \__tblr_spec_item:ne { hline } { [#1][#2](##1) / fg } }
\tl_if_empty:NF \l__tblr_f_tl { \color{\l__tblr_f_tl} }
\__tblr_get_hline_segment_child:nnn {#1} {#2} {##1}
+ \skip_horizontal:N \l__tblr_hline_rightskip_dim
}
\box_set_ht:Nn \l__tblr_b_box { \l__tblr_h_tl }
\box_set_dp:Nn \l__tblr_b_box { 0pt }
@@ -5448,12 +5710,69 @@
}
}
+\dim_new:N \l__tblr_hline_leftskip_dim
+\dim_new:N \l__tblr_hline_rightskip_dim
+
+%% Calculate left and right skips from leftpos and rightpos specifications
+%% #1: row number; #2: column number; #3: hline index;
+\cs_new_protected:Npn \__tblr_get_hline_left_right_skips:nnn #1 #2 #3
+ {
+ \tl_set:Nx \l__tblr_hline_leftpos_tl
+ { \__tblr_spec_item:ne { hline } { [#1][#2](#3) / leftpos } }
+ \tl_if_empty:NT \l__tblr_hline_leftpos_tl
+ { \tl_set:Nn \l__tblr_hline_leftpos_tl {1} } % default position
+ \tl_set:Nx \l__tblr_hline_rightpos_tl
+ { \__tblr_spec_item:ne { hline } { [#1][#2](#3) / rightpos } }
+ \tl_if_empty:NT \l__tblr_hline_rightpos_tl
+ { \tl_set:Nn \l__tblr_hline_rightpos_tl {1} } % default position
+ \fp_compare:nNnT { \l__tblr_hline_leftpos_tl } < {1}
+ {
+ \dim_set:Nn \l_tmpa_dim
+ { \__tblr_spec_item:ne { vline } { [#2] / @vline-width } }
+ \dim_set:Nn \l_tmpb_dim
+ { \__tblr_data_item:nen { column } {#2} { leftsep } }
+ \fp_compare:nNnTF { \l__tblr_hline_leftpos_tl } < {0}
+ {
+ \dim_set:Nn \l__tblr_hline_leftskip_dim
+ { \l_tmpa_dim - \l__tblr_hline_leftpos_tl \l_tmpb_dim }
+ }
+ {
+ \dim_set:Nn \l__tblr_hline_leftskip_dim
+ { \l_tmpa_dim - \l__tblr_hline_leftpos_tl \l_tmpa_dim }
+ }
+ }
+ \fp_compare:nNnT { \l__tblr_hline_rightpos_tl } < {1}
+ {
+ \dim_set:Nn \l_tmpa_dim
+ {
+ \__tblr_spec_item:ne { vline }
+ { [\int_eval:n { #2 + 1 }] / @vline-width }
+ }
+ \dim_set:Nn \l_tmpb_dim
+ { \__tblr_data_item:nen { column } {#2} { rightsep } }
+ \fp_compare:nNnTF { \l__tblr_hline_rightpos_tl } < {0}
+ {
+ \dim_set:Nn \l__tblr_hline_rightskip_dim
+ { \l_tmpa_dim - \l__tblr_hline_rightpos_tl \l_tmpb_dim }
+ }
+ {
+ \dim_set:Nn \l__tblr_hline_rightskip_dim
+ { \l_tmpa_dim - \l__tblr_hline_rightpos_tl \l_tmpa_dim }
+ }
+ }
+ }
+
\dim_new:N \l__tblr_row_ht_dim
\dim_new:N \l__tblr_row_dp_dim
\dim_new:N \l__tblr_row_abovesep_dim
\dim_new:N \l__tblr_row_belowsep_dim
+\box_new:N \l__tblr_row_vlines_box
+\box_new:N \l__tblr_vline_box
+\box_new:N \l__tblr_cell_box
%% Build current row, #1: row number
+%% To fix disappeared vlines with colorful tables in Adobe Reader (see #76),
+%% we collect all vlines and draw them at the end of the row.
\cs_new_protected:Npn \__tblr_build_row:N #1
{
\int_set:Nn \c@rownum {#1}
@@ -5462,12 +5781,21 @@
\l__tblr_row_ht_dim \l__tblr_row_dp_dim
\l__tblr_row_abovesep_dim \l__tblr_row_belowsep_dim
\vrule width ~ 0pt ~ height ~ \l__tblr_row_ht_dim ~ depth ~ \l__tblr_row_dp_dim
+ \hbox_set:Nn \l__tblr_row_vlines_box
+ {
+ \vrule width ~ 0pt ~ height ~ \l__tblr_row_ht_dim
+ ~ depth ~ \l__tblr_row_dp_dim
+ }
\int_step_variable:nNn { \c@colcount } \l__tblr_j_tl
{
- \__tblr_build_vline_segment:nn {#1} { \l__tblr_j_tl }
- \__tblr_build_cell:NN #1 \l__tblr_j_tl
+ \__tblr_put_one_vline:n
+ { \__tblr_build_vline_segment:nn {#1} { \l__tblr_j_tl } }
+ \__tblr_put_one_cell:n { \__tblr_build_cell:NN #1 \l__tblr_j_tl }
}
- \__tblr_build_vline_segment:nn {#1} { \int_eval:n {\c@colcount + 1} }
+ \__tblr_put_one_vline:n
+ { \__tblr_build_vline_segment:nn {#1} { \int_eval:n {\c@colcount + 1} } }
+ \skip_horizontal:n { - \box_wd:N \l__tblr_row_vlines_box }
+ \box_use:N \l__tblr_row_vlines_box
}
%% Read from table specifications and calculate inner height/depth of the row
@@ -5500,6 +5828,28 @@
}
\cs_generate_variant:Nn \__tblr_get_row_inner_height_depth:nNNNN { V }
+\cs_new_protected:Npn \__tblr_put_one_vline:n #1
+ {
+ \hbox_set:Nn \l__tblr_vline_box {#1}
+ \skip_horizontal:n { \box_wd:N \l__tblr_vline_box }
+ \hbox_set:Nn \l__tblr_row_vlines_box
+ {
+ \hbox_unpack:N \l__tblr_row_vlines_box
+ \box_use:N \l__tblr_vline_box
+ }
+ }
+
+\cs_new_protected:Npn \__tblr_put_one_cell:n #1
+ {
+ \hbox_set:Nn \l__tblr_cell_box {#1}
+ \hbox_set:Nn \l__tblr_row_vlines_box
+ {
+ \hbox_unpack:N \l__tblr_row_vlines_box
+ \skip_horizontal:n { \box_wd:N \l__tblr_cell_box }
+ }
+ \box_use:N \l__tblr_cell_box
+ }
+
%% #1: row number, #2: column number
\cs_new_protected:Npn \__tblr_build_vline_segment:nn #1 #2
{
@@ -5530,12 +5880,6 @@
{
\tl_set:Nx \l__tblr_s_tl
{ \__tblr_prop_item:ne { inner } { rulesep } }
- \tl_set:Nx \l__tblr_b_tl
- {
- \__tblr_spec_item:ne { hline }
- { [\int_eval:n{#1 + 1}](1) / @hline-height }
- }
- \tl_if_empty:NT \l__tblr_b_tl { \tl_set:Nn \l__tblr_b_tl { 0pt } }
\hbox_set:Nn \l__tblr_a_box
{
\int_step_inline:nn { \l__tblr_n_tl }
@@ -5548,10 +5892,12 @@
\tl_set:Nx \l__tblr_f_tl
{ \__tblr_spec_item:ne { vline } { [#1][#2](##1) / fg } }
\tl_if_empty:NF \l__tblr_f_tl { \color{\l__tblr_f_tl} }
+ \__tblr_get_vline_above_below_skips:nnn {#1} {#2} {##1}
+ \skip_vertical:N \l__tblr_vline_aboveskip_dim
\__tblr_get_vline_segment_child:nnnxx {#1} {#2} {##1}
{ \dim_eval:n { \l__tblr_row_ht_dim } }
- { \dim_eval:n { \l__tblr_row_dp_dim + \l__tblr_b_tl } }
- \skip_vertical:n { - \l__tblr_b_tl }
+ { \dim_eval:n { \l__tblr_row_dp_dim } }
+ \skip_vertical:N \l__tblr_vline_belowskip_dim
}
\box_set_wd:Nn \l__tblr_b_box { \l__tblr_w_tl }
\box_use:N \l__tblr_b_box
@@ -5565,6 +5911,68 @@
\box_use:N \l__tblr_c_box
}
+\dim_new:N \l__tblr_vline_aboveskip_dim
+\dim_new:N \l__tblr_vline_belowskip_dim
+
+%% Calculate above and below skips from abovepos and belowpos specifications
+%% #1: row number; #2: column number; #3: vline index;
+\cs_new_protected:Npn \__tblr_get_vline_above_below_skips:nnn #1 #2 #3
+ {
+ \tl_set:Nx \l__tblr_vline_abovepos_tl
+ { \__tblr_spec_item:ne { vline } { [#1][#2](#3) / abovepos } }
+ \tl_if_empty:NT \l__tblr_vline_abovepos_tl
+ {
+ \tl_set:Nn \l__tblr_vline_abovepos_tl {0} % default position
+ }
+ \tl_set:Nx \l__tblr_vline_belowpos_tl
+ { \__tblr_spec_item:ne { vline } { [#1][#2](#3) / belowpos } }
+ \tl_if_empty:NT \l__tblr_vline_belowpos_tl
+ {
+ \tl_set:Nn \l__tblr_vline_belowpos_tl {0} % default position
+ }
+ \fp_compare:nNnF { \l__tblr_vline_abovepos_tl } = {0}
+ {
+ \dim_set:Nn \l_tmpa_dim
+ { \__tblr_spec_item:ne { hline } { [#1] / @hline-height } }
+ \fp_compare:nNnTF { \l__tblr_vline_abovepos_tl } < {0}
+ {
+ \dim_set:Nn \l__tblr_vline_aboveskip_dim
+ { - \l__tblr_vline_abovepos_tl \l__tblr_row_abovesep_dim }
+ }
+ {
+ \dim_set:Nn \l__tblr_vline_aboveskip_dim
+ { - \l__tblr_vline_abovepos_tl \l_tmpa_dim }
+ }
+ }
+ %% To join two vline segment above and below a cline,
+ %% we choose to extend every vline downwards a little (#55).
+ \fp_compare:nNnTF { \l__tblr_vline_belowpos_tl } = {0}
+ {
+ \dim_set:Nn \l__tblr_vline_belowskip_dim
+ {
+ - \__tblr_spec_item:ne { hline }
+ { [\int_eval:n { #1 + 1 }](1) / @hline-height }
+ + 0pt
+ }
+ }
+ {
+ \dim_set:Nn \l_tmpa_dim
+ {
+ \__tblr_spec_item:ne { hline }
+ { [\int_eval:n { #1 + 1 }] / @hline-height }
+ }
+ \fp_compare:nNnTF { \l__tblr_vline_belowpos_tl } < {0}
+ {
+ \dim_set:Nn \l__tblr_vline_belowskip_dim
+ { - \l__tblr_vline_belowpos_tl \l__tblr_row_belowsep_dim }
+ }
+ {
+ \dim_set:Nn \l__tblr_vline_belowskip_dim
+ { - \l__tblr_vline_belowpos_tl \l_tmpa_dim }
+ }
+ }
+ }
+
\tl_new:N \l__tblr_cell_rowspan_tl
\tl_new:N \l__tblr_cell_colspan_tl
\dim_new:N \l__tblr_cell_wd_dim
@@ -5609,9 +6017,13 @@
{
\hbox_set_to_wd:Nnn \l__tblr_a_box { \l__tblr_cell_wd_dim }
{
- \tl_if_eq:NnF \g__tblr_cell_halign_tl {l} { \hfil }
- \__tblr_get_cell_text:nn {#1} {#2}
- \tl_if_eq:NnF \g__tblr_cell_halign_tl {r} { \hfil }
+ \tl_if_eq:NnTF \g__tblr_cell_halign_tl {j}
+ { \__tblr_get_cell_text:nn {#1} {#2} }
+ {
+ \tl_if_eq:NnF \g__tblr_cell_halign_tl {l} { \hfil }
+ \__tblr_get_cell_text:nn {#1} {#2}
+ \tl_if_eq:NnF \g__tblr_cell_halign_tl {r} { \hfil }
+ }
}
\vbox_set_to_ht:Nnn \l__tblr_b_box { \l__tblr_cell_ht_dim }
{
@@ -6043,10 +6455,56 @@
\NewTblrLibrary { booktabs }
{
- \NewTableCommand \toprule [1] [] { \hline [0.08em, ##1] }
- \NewTableCommand \midrule [1] [] { \hline [0.05em, ##1] }
- \NewTableCommand \bottomrule [1] [] { \hline [0.08em, ##1] }
- \NewTableCommand \cmidrule [2] [] { \cline [0.03em, ##1] { ##2 } }
+ % We only use dimensions \aboverulesep and \belowrulesep in booktabs package
+ \RequirePackage { booktabs }
+ \newcommand \tblr@booktabs@hline [1] [] { \hline [##1] }
+ \newcommand \tblr@booktabs@oldhline [1] [] {
+ \hline [abovespace = \aboverulesep, belowspace = \belowrulesep, ##1]
+ }
+ \newcommand \tblr@booktabs@cline [2] [] { \cline [##1] {##2} }
+ \newcommand \tblr@booktabs@oldcline [2] [] {
+ \cline [abovespace = \aboverulesep, belowspace = \belowrulesep, ##1] {##2}
+ }
+ \newcommand \tblr@booktabs@cline@more [2] [] { \SetHline [+] {##2} {##1} }
+ \newcommand \tblr@booktabs@oldcline@more [2] [] {
+ \SetHline [+] {##2} {
+ abovespace = \aboverulesep, belowspace = \belowrulesep, ##1
+ }
+ }
+ \NewTableCommand \toprule [1] [] {
+ \tblr@booktabs@hline [wd=\heavyrulewidth, ##1]
+ }
+ \NewTableCommand \midrule [1] [] {
+ \tblr@booktabs@hline [wd=\lightrulewidth, ##1]
+ }
+ \NewTableCommand \bottomrule [1] [] {
+ \tblr@booktabs@hline [wd=\heavyrulewidth, ##1]
+ }
+ \NewTableCommand \cmidrule [2] [] {
+ \tblr@booktabs@cline [wd=\cmidrulewidth, endpos, ##1] {##2}
+ }
+ \NewTableCommand \cmidrulemore [2] [] {
+ \tblr@booktabs@cline@more [wd=\cmidrulewidth, endpos, ##1] {##2}
+ }
+ \newcommand \tblr@booktabs@change@more [1] { \cmidrulemore }
+ \NewTableCommand \morecmidrules {
+ \peek_meaning:NTF \cmidrule { \tblr@booktabs@change@more } { \relax }
+ }
+ \NewTblrEnviron { booktabs }
+ \SetTblrInner [ booktabs ] { rowsep = 0pt }
+ \RequirePackage { etoolbox }
+ \AtBeginEnvironment { booktabs }
+ {
+ \let \tblr@booktabs@hline = \tblr@booktabs@oldhline
+ \let \tblr@booktabs@cline = \tblr@booktabs@oldcline
+ \let \tblr@booktabs@cline@more = \tblr@booktabs@oldcline@more
+ }
+ \NewTableCommand \specialrule [3]
+ { \hline [##1, abovespace = ##2, belowspace = ##3] }
+ \NewTableCommand \addrowspace [1] [\defaultaddspace]
+ { \SetVspace { abovespace+ = (##1) / 2, belowspace+ = (##1) / 2 } }
+ \NewTableCommand \addlinespace [1] [\defaultaddspace]
+ { \SetVspace { abovespace+ = (##1) / 2, belowspace+ = (##1) / 2 } }
}
%% Library diagbox and command \diagbox
@@ -6136,4 +6594,12 @@
}
}
-\ExplSyntaxOff
+%% Library varwidth and measure option
+
+\NewTblrLibrary { varwidth }
+ {
+ \RequirePackage { varwidth }
+ \clist_gput_left:Nn \g__tblr_table_known_keys_clist { measure }
+ \keys_define:nn { tblr } { measure .tl_set:N = \l__tblr_inner_spec_measure_tl }
+ }
+
diff --git a/macros/latex/contrib/tabularray/tabularray.tex b/macros/latex/contrib/tabularray/tabularray.tex
index 1e5b4a104e..0d502f3bbc 100644
--- a/macros/latex/contrib/tabularray/tabularray.tex
+++ b/macros/latex/contrib/tabularray/tabularray.tex
@@ -11,7 +11,7 @@
\usepackage[firstpage=true]{background}
\backgroundsetup{contents={}}
-\UseTblrLibrary{booktabs,diagbox,siunitx}
+\UseTblrLibrary{booktabs,diagbox,siunitx,varwidth}
\usepackage{hyperref}
\hypersetup{
@@ -24,6 +24,7 @@
\tcbset{sharp corners, boxrule=0.5pt, colback=red9}
\usepackage{float}
+%\usepackage{enumerate}
\setcounter{tocdepth}{1}
@@ -59,7 +60,7 @@
\renewcommand*{\thefootnote}{*}
-\newcommand*{\myversion}{2021M}
+\newcommand*{\myversion}{2021N}
\newcommand*{\mylpad}[1]{\ifnum#1<10 0\the#1\else\the#1\fi}
\colorlet{highback}{azure9}
@@ -112,7 +113,7 @@
\noindent
\begin{tblr}{
- colspec = {lX}, colsep = 12mm, hlines = {2pt, white},
+ colspec = {rX}, colsep = 8mm, hlines = {2pt, white},
row{odd} = {azure8}, row{even} = {gray8},
row{1} = {6em,azure2,fg=white,font=\LARGE\bfseries\sffamily},
row{2-Z} = {3em,font=\Large},
@@ -122,13 +123,14 @@
Version & \myversion\ (\the\year-\mylpad\month-\mylpad\day) \\
Code & \url{https://github.com/lvjr/tabularray} \\
Code & \url{https://bitbucket.org/lvjr/tabularray} \\
- Issue & \url{https://github.com/lvjr/tabularray/issues} \\
Forum & \url{https://github.com/lvjr/tabularray/discussions} \\
+ Forum & \url{https://tex.stackexchange.com/questions/tagged/tabularray} \\
+ Issue & \url{https://github.com/lvjr/tabularray/issues} \\
\end{tblr}
-\begin{codehigh}[boxsep=6mm]
+\begin{codehigh}[boxsep=4mm]
\begin{tblr}{
- colspec = {lX}, colsep = 12mm, hlines = {2pt, white},
+ colspec = {rX}, colsep = 8mm, hlines = {2pt, white},
row{odd} = {azure8}, row{even} = {gray8},
row{1} = {6em,azure2,fg=white,font=\LARGE\bfseries\sffamily},
row{2-Z} = {3em,font=\Large},
@@ -138,8 +140,9 @@
Version & \myversion\ (\the\year-\mylpad\month-\mylpad\day) \\
Code & \url{https://github.com/lvjr/tabularray} \\
Code & \url{https://bitbucket.org/lvjr/tabularray} \\
- Issue & \url{https://github.com/lvjr/tabularray/issues} \\
Forum & \url{https://github.com/lvjr/tabularray/discussions} \\
+ Forum & \url{https://tex.stackexchange.com/questions/tagged/tabularray} \\
+ Issue & \url{https://github.com/lvjr/tabularray/issues} \\
\end{tblr}
\end{codehigh}
@@ -565,7 +568,7 @@ With \verb!tabularray! package, you can change the styles of tables via old inte
The old interfaces consist of some table commands inside the table contents.
Same as \verb!tabular! and \verb!array! environments,
-all table commands \textcolor{red3}{must} be put at the beginning ot the cell text.
+all table commands \textcolor{red3}{must} be put at the beginning of the cell text.
Also, new table commands \textcolor{red3}{must} be defined with \verb!\NewTableCommand!.
The new interfaces consist of some options inside the mandatory argument,
@@ -590,18 +593,38 @@ hence totally separating the styles and the contents of tables.
\section{Hlines and Vlines}
-All available keys for hlines and vlines are described in Table \ref{key:hvline}.
+All available keys for hlines and vlines are described in Table \ref{key:hline} and Table \ref{key:vline}.
\begin{spectblr}[
- caption = {Keys for Hlines and Vlines},
- label = {key:hvline},
+ caption = {Keys for Hlines},
+ label = {key:hline},
+ remark{Note} = {In most cases, you can omit the underlined key names and write only their values.}
+]{}
+ Key & Description and Values & Initial Value \\
+ \underline{\K{dash}} & dash style: \V{solid}, \V{dashed} or \V{dotted} & \V{solid} \\
+ \K{text} & replace hline with text (like \V{!} specifier in \K{rowspec}) & \None \\
+ \underline{\K{wd}} & rule width dimension & \V{0.4pt} \\
+ \underline{\K{fg}} & rule color name & \None \\
+ \K{leftpos} & crossing or trimming position at the left side & \V{1} \\
+ \K{rightpos} & crossing or trimming position at the right side & \V{1} \\
+ \K{abovespace} & set \V{belowsep} of previous row (see Table \ref{key:row}) & \V{2pt} \\
+ \K{belowspace} & set \V{abovesep} of current row (see Table \ref{key:row}) & \V{2pt} \\
+ \K{abovespace+} & increase \V{belowsep} of previous row & \None \\
+ \K{belowspace+} & increase \V{abovesep} of current row & \None \\
+\end{spectblr}
+\vspace{-2em}
+\begin{spectblr}[
+ caption = {Keys for Vlines},
+ label = {key:vline},
remark{Note} = {In most cases, you can omit the underlined key names and write only their values.}
]{}
Key & Description and Values & Initial Value \\
\underline{\K{dash}} & dash style: \V{solid}, \V{dashed} or \V{dotted} & \V{solid} \\
- \K{text} & replace hline/vline with text (like \V{!} specifier in \K{colspec}) & \None \\
- \underline{\K{wd}} & rule width dimension & \None \\
+ \K{text} & replace vline with text (like \V{!} specifier in \K{colspec}) & \None \\
+ \underline{\K{wd}} & rule width dimension & \V{0.4pt} \\
\underline{\K{fg}} & rule color name & \None \\
+ \K{abovepos} & crossing or trimming position at the above side & \V{0} \\
+ \K{belowpos} & crossing or trimming position at the below side & \V{0} \\
\end{spectblr}
\subsection{Hlines and Vlines in New Interfaces}
@@ -675,8 +698,10 @@ Another pair of braces before will draw more hlines/vlines (in which \verb!-! st
\end{tblr}
\end{demohigh}
+Note that you \underline{must} use indexes in order: first 1, then 2, etc.
+
Options \verb!hline{i}! and \verb!vline{j}! are for setting some hlines and vlines, respectively.
-Their values are the same as options \verb!hliness! and \verb!vlines!:
+Their values are the same as options \verb!hlines! and \verb!vlines!:
\begin{demohigh}
\begin{tblr}{
@@ -731,10 +756,49 @@ Now we show the usage of \verb!text! key by the following example%
You need to load \verb!chemmacros! package for the \verb!\ch! command.
+The \verb!leftpos! and \verb!rightpos! keys specify crossing or trimming positions for hlines.
+The possible values for them are decimal numbers between \verb!-1! and \verb!1!.
+Their initial values are \verb!1!.
+
+\begin{center}
+\begin{tblr}{width=0.5\textwidth,colspec={rX[l]},hlines}
+ -1 & the hline is trimmed by \V{colsep} \\
+ 0 & the hline only touches the first vline \\
+ 1 & the hline touches all the vlines \\
+\end{tblr}
+\end{center}
+
+The \verb!abovepos! and \verb!belowpos! keys for vlines have similar meanings.
+But their initial values are \verb!0!.
+
+\begin{center}
+\begin{tblr}{width=0.5\textwidth,colspec={rX[l]},hlines}
+ -1 & the vline is trimmed by \V{rowsep} \\
+ 0 & the vline only touches the first hline \\
+ 1 & the vline touches all the hlines \\
+\end{tblr}
+\end{center}
+
+Here is an example for these four keys:
+
+\begin{demohigh}
+\begin{tblr}{
+ hline{1,4} = {1}{-}{},
+ hline{1,4} = {2}{-}{},
+ hline{2,3} = {1}{-}{leftpos = -1, rightpos = -1},
+ hline{2,3} = {2}{-}{leftpos = -1, rightpos = -1},
+ vline{1,4} = {abovepos = 1, belowpos = 1},
+}
+ Alpha & Beta & Gamma \\
+ Epsilon & Zeta & Eta \\
+ Iota & Kappa & Lambda \\
+\end{tblr}
+\end{demohigh}
+
\subsection{Hlines and Vlines in Old Interfaces}
The \verb!\hline! command has an optional argument which accepts key-value options.
-The available keys are described in Table \ref{key:hvline}.
+The available keys are described in Table \ref{key:hline}.
\begin{demohigh}
\begin{tblr}{llll}
@@ -821,7 +885,7 @@ All available keys for cells are described in Table \ref{key:cell} and Table \re
]{}
Key & Description and Values & Initial Value \\
\underline{\K{halign}}
- & horizontal alignment: \V{l} (left), \V{c} (center), or \V{r} (right)
+ & horizontal alignment: \V{l} (left), \V{c} (center), \V{r} (right) or \V{j} (justify)
& \V{l} \\
\underline{\K{valign}}
& vertical alignment: \V{t} (top), \V{m} (middle), \V{b} (bottom),
@@ -2022,8 +2086,9 @@ To avoid potential conflict, you need to enable them with \verb!\UseTblrLibrary!
\section{Library \texttt{booktabs}}
-When you write \verb!\UseTblrLibrary{booktabs}!,
-\verb!tabularray! package will define commands \verb!\toprule!, \verb!\midrule!,
+With \verb!\UseTblrLibrary{booktabs}! in the preamble of the document,
+\verb!tabularray! will load \verb!booktabs! package,
+and define \verb!\toprule!, \verb!\midrule!,
\verb!\bottomrule! and \verb!\cmidrule! inside \verb!tblr! environment.
\begin{demohigh}
@@ -2040,24 +2105,113 @@ When you write \verb!\UseTblrLibrary{booktabs}!,
\end{tblr}
\end{demohigh}
-At this moment, \verb!trim! options for \verb!\cmidrule! command are not supported.
-(As a workaround, you may insert an empty column to separate two \verb!\cmidrule!'s.)
-But rule colors are possible just like \verb!\hline! and \verb!\cline! commands.
+Just like \verb!\hline! and \verb!\cline! commands,
+you can also specify rule width and color in the optional argument of any of these commands.
\begin{demohigh}
\begin{tblr}{llll}
-\toprule[purple3]
- Alpha & Beta & Gamma & Delta \\
+\toprule[2pt,purple3]
+ Alpha & Beta & Gamma & Delta \\
\midrule[blue3]
+ Epsilon & Zeta & Eta & Theta \\
+\cmidrule[azure3]{2-3}
+ Iota & Kappa & Lambda & Mu \\
+\bottomrule[2pt,purple3]
+\end{tblr}
+\end{demohigh}
+
+If you need more than one cmidrules, you can use \verb!\cmidrulemore! command.
+
+\begin{demohigh}
+\begin{tblr}{llll}
+\toprule
+ Alpha & Beta & Gamma & Delta \\
+\cmidrule{1-3} \cmidrulemore{2-4}
Epsilon & Zeta & Eta & Theta \\
-\cmidrule[azure3]{1-3}
+\cmidrule{1-3} \morecmidrules \cmidrule{2-4}
Iota & Kappa & Lambda & Mu \\
-\cmidrule[azure3]{2-4}
- Nu & Xi & Omicron & Pi \\
-\bottomrule[purple3]
+\bottomrule
\end{tblr}
\end{demohigh}
+From version \verb!2021N!, trim options (\verb!l!, \verb!r!, \verb!lr!)
+for \verb!\cmidrule! command are also supported.
+
+\begin{demohigh}
+\begin{tblr}{llll}
+\toprule
+ Alpha & Beta & Gamma & Delta \\
+\cmidrule[lr]{1-2} \cmidrule[lr=-0.4]{3-4}
+ Epsilon & Zeta & Eta & Theta \\
+\cmidrule[r]{1-2} \cmidrule[l]{3-4}
+ Iota & Kappa & Lambda & Mu \\
+\bottomrule
+\end{tblr}
+\end{demohigh}
+
+Note that you need to put \verb!l!, \verb!r! or \verb!lr! option into
+the \underline{\color{red3}square brackets}.
+and the possible values are decimal numbers between \verb!-1! and \verb!0!,
+where \verb!-1! means trimming the whole colsep, and \verb!0! means no trimming.
+The default value is \verb!-0.8!, which makes similar result as \verb!booktabs! package does.
+
+There is also a \verb!booktabs! environment for you. With this environment,
+the default \verb!rowsep=0pt!, but extra vertical space will be added by
+\verb!\toprule!, \verb!\midrule!, \verb!\bottomrule! and \verb!\cmidrule! commands.
+The sizes of vertical space are determined by \verb!\aboverulesep! and \verb!\belowrulesep! dimensions.
+
+\begin{demohigh}
+\begin{booktabs}{
+ colspec = lcccc,
+ cell{1}{1} = {r=2}{}, cell{1}{2,4} = {c=2}{},
+}
+\toprule
+ Sample & I & & II & \\
+\cmidrule[lr]{2-3} \cmidrule[lr]{4-5}
+ & A & B & C & D \\
+\midrule
+ S1 & 5 & 6 & 7 & 8 \\
+ S2 & 6 & 7 & 8 & 5 \\
+ S3 & 7 & 8 & 5 & 6 \\
+\bottomrule
+\end{booktabs}
+\end{demohigh}
+% S4 & 8 & 5 & 6 & 7 \\
+
+You can also use \verb!\specialrule! command.
+The second argument sets \verb!belowsep! of previous row,
+and the third argument sets \verb!abovesep! of current row,
+
+\begin{demohigh}
+\begin{booktabs}{row{2}={olive9}}
+\toprule
+ Alpha & Beta & Gamma & Delta \\
+\specialrule{0.5pt}{4pt}{6pt}
+ Epsilon & Zeta & Eta & Theta \\
+\specialrule{0.8pt,blue3}{3pt}{2pt}
+ Iota & Kappa & Lambda & Mu \\
+\bottomrule
+\end{booktabs}
+\end{demohigh}
+
+At last, there is also an \verb!\addlinespace! command.
+You can specify the size of vertical space to be added in its optional argument,
+and the default size is \verb!0.5em!.
+This command adds one half of the space to \verb!belowsep! of previous row,
+and the other half to \verb!abovesep! of current row.
+
+\begin{demohigh}
+\begin{booktabs}{row{2}={olive9}}
+\toprule
+ Alpha & Beta & Gamma & Delta \\
+\addlinespace
+ Epsilon & Zeta & Eta & Theta \\
+\addlinespace[1em]
+ Iota & Kappa & Lambda & Mu \\
+\bottomrule
+\end{booktabs}
+\end{demohigh}
+
\section{Library \texttt{diagbox}}
When writing \verb!\UseTblrLibrary{diagbox}! in the preamble of the document,
@@ -2102,39 +2256,31 @@ and defines \verb!S! column as \verb!Q! column with \verb!si! key.
\begin{demohigh}
\begin{tblr}{
hlines, vlines,
- colspec={
- S[table-format=3.2]
- S[table-format=3.2]
- S[table-format=3.2]
- }
+ colspec={S[table-format=3.2]S[table-format=3.2]},
}
- {{{Head}}} & {{{Head}}} & {{{Head}}} \\
- 111 & 111 & 111 \\
- 2.1 & 2.2 & 2.3 \\
- 33.11 & 33.22 & 33.33 \\
+ {{{Head}}} & {{{Head}}} \\
+ 111 & 111 \\
+ 2.1 & 2.2 \\
+ 33.11 & 33.22 \\
\end{tblr}
\end{demohigh}
\begin{demohigh}
\begin{tblr}{
hlines, vlines,
- colspec={
- Q[si={table-format=3.2},c]
- Q[si={table-format=3.2},c]
- Q[si={table-format=3.2},c]
- }
+ colspec={Q[si={table-format=3.2},c]Q[si={table-format=3.2},c]}
}
- {{{Head}}} & {{{Head}}} & {{{Head}}} \\
- 111 & 111 & 111 \\
- 2.1 & 2.2 & 2.3 \\
- 33.11 & 33.22 & 33.33 \\
+ {{{Head}}} & {{{Head}}} \\
+ 111 & 111 \\
+ 2.1 & 2.2 \\
+ 33.11 & 33.22 \\
\end{tblr}
\end{demohigh}
-Note that you need to use \underline{triple} pairs of braces to guard non-numeric cells.
+Note that you need to use \underline{\color{red3}triple} pairs of braces to guard non-numeric cells.
Also you must use \verb!l!, \verb!c! or \verb!r! to set horizontal alignment for non-numeric cells:
-
+\nopagebreak
\begin{demohigh}
\begin{tblr}{
hlines, vlines, columns={6em},
@@ -2157,6 +2303,30 @@ Both \verb!S! and \verb!s! columns are supported. In fact, These two columns are
\NewColumnType{s}[1][]{Q[si={##1},c,cmd=\TblrUnit]}
\end{codehigh}
+\section{Library \texttt{varwidth}}
+
+To build a nice table, \verb!tabularray! need to measure the widths of cells.
+By default, it uses \verb!\hbox! to measure the sizes.
+This causes an error if a cell contains some vertical material, such as lists or display maths.
+
+With \verb!\UseTblrLibrary{varwidth}! in the preamble of the document,
+\verb!tabularray! loads \verb!varwidth! package,
+and adds a new inner specification \verb!measure! for tables.
+After setting \verb!measure=vbox!, it will use \verb!\vbox! to measure cell widths.
+
+\begin{demohigh}
+\begin{tblr}{measure=vbox}
+\hline
+ Text Text Text Text Text Text Text
+ \begin{itemize}
+ \item List List List List List List
+ \item List List List List List List List
+ \end{itemize}
+ Text Text Text Text Text Text Text \\
+\hline
+\end{tblr}
+\end{demohigh}
+
\chapter{The Source Code}
%\CodeHigh{lite}
diff --git a/macros/latex/contrib/uni-titlepage/README.md b/macros/latex/contrib/uni-titlepage/README.md
index 1ba65bc61f..9386dbe962 100644
--- a/macros/latex/contrib/uni-titlepage/README.md
+++ b/macros/latex/contrib/uni-titlepage/README.md
@@ -2,7 +2,7 @@
Copyright (c) Markus Kohm <komascript at gmx.info>
-Release: 2021/08/16 v0.6
+Release: 2021/09/01 v0.7
License: LPPL 1.3c
diff --git a/macros/latex/contrib/uni-titlepage/titlepage-DHBW.pdf b/macros/latex/contrib/uni-titlepage/titlepage-DHBW.pdf
index c3d9bc881d..02068b9734 100644
--- a/macros/latex/contrib/uni-titlepage/titlepage-DHBW.pdf
+++ b/macros/latex/contrib/uni-titlepage/titlepage-DHBW.pdf
Binary files differ
diff --git a/macros/latex/contrib/uni-titlepage/titlepage-JT-Aufsaetze.pdf b/macros/latex/contrib/uni-titlepage/titlepage-JT-Aufsaetze.pdf
index 518b266acd..2f566a32fd 100644
--- a/macros/latex/contrib/uni-titlepage/titlepage-JT-Aufsaetze.pdf
+++ b/macros/latex/contrib/uni-titlepage/titlepage-JT-Aufsaetze.pdf
Binary files differ
diff --git a/macros/latex/contrib/uni-titlepage/titlepage-JT-Geschichte.pdf b/macros/latex/contrib/uni-titlepage/titlepage-JT-Geschichte.pdf
index 7eaaed4be7..7e0707a6e5 100644
--- a/macros/latex/contrib/uni-titlepage/titlepage-JT-Geschichte.pdf
+++ b/macros/latex/contrib/uni-titlepage/titlepage-JT-Geschichte.pdf
Binary files differ
diff --git a/macros/latex/contrib/uni-titlepage/titlepage-JT-Typography.pdf b/macros/latex/contrib/uni-titlepage/titlepage-JT-Typography.pdf
index f54dfb332e..f4624aa528 100644
--- a/macros/latex/contrib/uni-titlepage/titlepage-JT-Typography.pdf
+++ b/macros/latex/contrib/uni-titlepage/titlepage-JT-Typography.pdf
Binary files differ
diff --git a/macros/latex/contrib/uni-titlepage/titlepage-KIT.pdf b/macros/latex/contrib/uni-titlepage/titlepage-KIT.pdf
index 15008ef21c..fe2204f7bc 100644
--- a/macros/latex/contrib/uni-titlepage/titlepage-KIT.pdf
+++ b/macros/latex/contrib/uni-titlepage/titlepage-KIT.pdf
Binary files differ
diff --git a/macros/latex/contrib/uni-titlepage/titlepage-KOMAScript.pdf b/macros/latex/contrib/uni-titlepage/titlepage-KOMAScript.pdf
index 9e6254c1f6..fef8094c68 100644
--- a/macros/latex/contrib/uni-titlepage/titlepage-KOMAScript.pdf
+++ b/macros/latex/contrib/uni-titlepage/titlepage-KOMAScript.pdf
Binary files differ
diff --git a/macros/latex/contrib/uni-titlepage/titlepage-Markus-1.pdf b/macros/latex/contrib/uni-titlepage/titlepage-Markus-1.pdf
index c29fe66bce..0df124c56a 100644
--- a/macros/latex/contrib/uni-titlepage/titlepage-Markus-1.pdf
+++ b/macros/latex/contrib/uni-titlepage/titlepage-Markus-1.pdf
Binary files differ
diff --git a/macros/latex/contrib/uni-titlepage/titlepage-Markus-2.pdf b/macros/latex/contrib/uni-titlepage/titlepage-Markus-2.pdf
index 62980fb613..0a3da486d0 100644
--- a/macros/latex/contrib/uni-titlepage/titlepage-Markus-2.pdf
+++ b/macros/latex/contrib/uni-titlepage/titlepage-Markus-2.pdf
Binary files differ
diff --git a/macros/latex/contrib/uni-titlepage/titlepage-Spacer.pdf b/macros/latex/contrib/uni-titlepage/titlepage-Spacer.pdf
index 0cef72436d..4d81e0f293 100644
--- a/macros/latex/contrib/uni-titlepage/titlepage-Spacer.pdf
+++ b/macros/latex/contrib/uni-titlepage/titlepage-Spacer.pdf
Binary files differ
diff --git a/macros/latex/contrib/uni-titlepage/titlepage-TU-DD.pdf b/macros/latex/contrib/uni-titlepage/titlepage-TU-DD.pdf
index f57767dbe2..b3e01d9bfa 100644
--- a/macros/latex/contrib/uni-titlepage/titlepage-TU-DD.pdf
+++ b/macros/latex/contrib/uni-titlepage/titlepage-TU-DD.pdf
Binary files differ
diff --git a/macros/latex/contrib/uni-titlepage/titlepage-TU-HH.pdf b/macros/latex/contrib/uni-titlepage/titlepage-TU-HH.pdf
index ff2ea43f52..19afe66206 100644
--- a/macros/latex/contrib/uni-titlepage/titlepage-TU-HH.pdf
+++ b/macros/latex/contrib/uni-titlepage/titlepage-TU-HH.pdf
Binary files differ
diff --git a/macros/latex/contrib/uni-titlepage/titlepage-UKoLa.pdf b/macros/latex/contrib/uni-titlepage/titlepage-UKoLa.pdf
new file mode 100644
index 0000000000..0eafc0d6f3
--- /dev/null
+++ b/macros/latex/contrib/uni-titlepage/titlepage-UKoLa.pdf
Binary files differ
diff --git a/macros/latex/contrib/uni-titlepage/titlepage-WWUM.pdf b/macros/latex/contrib/uni-titlepage/titlepage-WWUM.pdf
index 1b63a2e183..50eb4a7abd 100644
--- a/macros/latex/contrib/uni-titlepage/titlepage-WWUM.pdf
+++ b/macros/latex/contrib/uni-titlepage/titlepage-WWUM.pdf
Binary files differ
diff --git a/macros/latex/contrib/uni-titlepage/uni-titlepage.dtx b/macros/latex/contrib/uni-titlepage/uni-titlepage.dtx
index e5cea81704..cb5d3bf669 100644
--- a/macros/latex/contrib/uni-titlepage/uni-titlepage.dtx
+++ b/macros/latex/contrib/uni-titlepage/uni-titlepage.dtx
@@ -63,6 +63,7 @@
%<JT-Geschichte> -JT-Geschichte%
%<JT-Typography> -JT-Typography%
%<WWUM> -WWUM%
+%<UKoLa> -UKoLa%
%<*dtx>
.dtx%
%</dtx>
@@ -80,10 +81,10 @@
}[%
%</!README>
%<README>
-%<README>Release: 2021/08/16 v0.6
+%<README>Release: 2021/09/01 v0.7
%<README>
%<README>License: LPPL 1.3c
-%<!README>2021/08/16 v0.6
+%<!README>2021/09/01 v0.7
%<README>
KOMA presents the title page project
%<*!README>
@@ -176,88 +177,96 @@ KOMA presents the title page project
% \endfoot
% \bottomrule
% \endlastfoot
-% advisor & TU-DD & if your personal advisor differs from the
+% advisor & TU-DD, UKoLa & if your personal advisor differs from the
% advising professor, this is the name of
% the advisor
% \\
% author & \normalfont\emph{every style}
% & the authors, with some styles (currently
-% not with \texttt{DHBW}) you may seperate
-% multiple authors by \cs{and}
+% not with \texttt{DHBW} or \texttt{UKoLa})
+% you may seperate multiple authors by
+% \cs{and}
% \tabularnewline
-% chair & TU-DD, KIT, WWUM & the chair of the faculty of the university
-% where you've made or presented your work
+% chair & TU-DD, KIT, WWUM, UKoLa
+% & the chair or institure of the faculty of
+% the university where you've made or
+% presented your work
% \tabularnewline
% company & DHBW & some works are made not only at a
% university but in cooperation with a
% company; at Duale Hochschule
% Baden-W\"urttemberg this is the default
% case
-% \\
+% \tabularnewline
% course & DHBW & the shortcut for your discipline or course
-% \\
+% \tabularnewline
% date & DHBW, KIT, KOMAScript, Markus-1, Markus-2, Spacer, TU-HH,
% TU-DD, JT-Typography, WWUM
% & the documents main date, this may by,
% e.\,g., the release date, the semester of a
% thesis or any other most valid date
-% \\
+% \tabularnewline
% dedication & KOMAScript, Markus-1, Markus-2, Spacer
% & sometimes it is nice to dedicate the work
% to someone, e.g., your wife, your
% children, your grandmother or your first
% love
-% \\
+% \tabularnewline
% academicgrade
-% & DHBW, TU-HH, WUMM & the academic grade or degree you
+% & DHBW, TU-HH, WUMM, UKoLa
+% & the academic grade or degree you
% reach with the work
-% \\
+% \tabularnewline
% discipline & DHBW, TU-DD, WUMM & the discipline in which you've made your
% work or reach your academic grade
-% \\
+% \tabularnewline
% duration & DHBW & the processing time for your work
-% \\
+% \tabularnewline
% faculty & TU-DD, KIT, WUMM & the faculty of the university where you've
% made or presented your work
-% \\
+% \tabularnewline
% homepage & KIT & the www-address of the homepage
-% \\
-% mainlogo & DHBW, KIT & a logo at the main title (currently used
+% \tabularnewline
+% mainlogo & DHBW, KIT, UKoLa & a logo at the main title (currently used
% for the DHBW or the KIT logo at the
-% default of \texttt{titlehead})
-% \\
+% default of \texttt{titlehead} and the
+% main logo of style \texttt{UKoLa})
+% \tabularnewline
+% secondlogo & UKoLa & a secondary logo
+% \tabularnewline
% matriculationnumber
% & DHBW, TU-DD & if you were a student while you've made
% the work, this is you number
-% \\
+% \tabularnewline
% oralexaminationdate
% & TU-HH, WUMM & sometimes the date of the oral examination
% is not the main date but has to be shown
% too
-% \\
-% place & DHBW, TU-HH, JT-Geschichte, JT-Typography, WUMM
+% \tabularnewline
+% place & DHBW, TU-HH, JT-Geschichte, JT-Typography, WUMM, UKoLa
% & the place, in general the city, where
% you've made the work or where the Duale
% Hochschule or the publisher resides
-% \\
+% \tabularnewline
% professor & TU-DD, WUMM & the name of the professor who advised you
% during your work
-% \\
+% \tabularnewline
% publisher & KOMAScript, Markus-1, Markus-2, Spacer, JT-Aufsaetze,
% JT-Geschichte, JT-Typography
% & most written works have a publisher
-% \\
-% referee & DHBW, TU-HH & every academic work will be referred;
+% \tabularnewline
+% referee & DHBW, TU-HH, UKoLa & every academic work will be referred;
% with some styles (currently
-% \texttt{TU-HH}, \texttt{WWUM}) multiple
+% \texttt{TU-HH}, \texttt{WWUM},
+% \texttt{UKoLa}) multiple
% referees may be seperated with \cs{and}
-% \\
+% \tabularnewline
% sience & WWUM & kind of sience,
% e.\,g., ``Naturwissenschaften''
-% \\
+% \tabularnewline
% student & \normalfont\emph{see \texttt{author}}
% & same like \texttt{author}
-% \\
+% \tabularnewline
% subject & \normalfont\emph{every style}
% & the kind of work, there are special
% predefined subjects; if you use one of
@@ -268,21 +277,21 @@ KOMA presents the title page project
% a language dependend replacement will
% be done; to avoid this, you may set the
% value in parentesis
-% \\
+% \tabularnewline
% subtitle & KOMAScript, Markus-1, Markus-2, Spacer, TU-HH
% & the sub-title of the document
-% \\
+% \tabularnewline
% title & \normalfont\emph{every style}
% & the main title of the document
-% \\
+% \tabularnewline
% titlehead & DHBW, KOMAScript, Markus-2, Spacer, KIT
% & page head over the main title of the
% document
-% \\
+% \tabularnewline
% university & DHBW, TU-DD, TU-HH, KIT, WWUM
% & the university where you've made or
% presented your work
-% \\
+% \tabularnewline
% \end{xltabular}
%
% Let's have a look at the already defined title page styles. You should find
@@ -693,7 +702,35 @@ KOMA presents the title page project
% \frame{\includegraphics[page=3,width=.5\textwidth]{titlepage-WWUM}}%^^A
% \frame{\includegraphics[page=4,width=.5\textwidth]{titlepage-WWUM}}%^^A
% \end{flushleft}
-
+%
+% \clearpage
+% \subsection{Style \File{UKoLa}}
+% \label{sec:Style-UKoLa}
+% \changes{v0.7}{2021/08/18}{new style \texttt{UKoLa}}
+%
+% In 2007 several students asked me for the title of the Universität
+% Koblenz-Landau. At that time, I've made a package for the title they asked
+% for. The package has been published at
+% \url{https://komascript.de/unikoblenzlandau} only. In 2021, after I've
+% published \Package{uni-titlepage}, it was time to implement this title also
+% as a title style definition. Note, this is not an official style of the
+% University Koblenz-Landau. Several referees can be separated by
+% \cs{and}. Female referees should be prefixed by \textsf{[f]}.
+% \begin{flushleft}
+% \parbox[b][.707\linewidth][t]{.475\linewidth}{\footnotesize The
+% page (in example \File{titlepage-UKoLa.tex}) is:
+% \begin{enumerate}
+% \item main title page with \texttt{mainlogo}, \texttt{secondlogo},
+% \texttt{title}, \texttt{subject}, \texttt{academicgrade},
+% \texttt{chair}, \texttt{dicipline}, \texttt{place}, \texttt{author},
+% \texttt{referee}, and \texttt{date}.
+% \end{enumerate}
+% }\hspace{0.025\linewidth}\nobreak
+% \frame{\includegraphics[page=1,width=.475\linewidth]{titlepage-UKoLa}}
+% \end{flushleft}
+% Note: The upper left corner is the logo placeholder. If you'd download the
+% logo from \url{http://www.uni-koblenz-landau.de/logo.png} and save it with
+% the name \verb|uni-koblenz-landau.png|, it would be used automaticly.
%
% \clearpage
%
@@ -854,6 +891,7 @@ You may however distribute the file `uni-titlepage.dtx' without this file.
\file{title-JT-Geschichte.def}{\from{uni-titlepage.dtx}{driver,JT-Geschichte}}%
\file{title-JT-Typography.def}{\from{uni-titlepage.dtx}{driver,JT-Typography}}%
\file{title-WWUM.def}{\from{uni-titlepage.dtx}{driver,WWUM}}%
+ \file{title-UKoLa.def}{\from{uni-titlepage.dtx}{driver,UKoLa}}%
\file{titlepage-DHBW.tex}{\from{uni-titlepage.dtx}{doc,example,DHBW}}%
\file{titlepage-KOMAScript.tex}{\from{uni-titlepage.dtx}{doc,example,KOMAScript}}%
\file{titlepage-Markus-1.tex}{\from{uni-titlepage.dtx}{doc,example,Markus,1}}%
@@ -866,6 +904,7 @@ You may however distribute the file `uni-titlepage.dtx' without this file.
\file{titlepage-JT-Geschichte.tex}{\from{uni-titlepage.dtx}{doc,example,JT-Geschichte}}%
\file{titlepage-JT-Typography.tex}{\from{uni-titlepage.dtx}{doc,example,JT-Typography}}%
\file{titlepage-WWUM.tex}{\from{uni-titlepage.dtx}{doc,example,WWUM}}%
+ \file{titlepage-UKoLa.tex}{\from{uni-titlepage.dtx}{doc,example,UKoLa}}%
\nopreamble\nopostamble
\file{README.md}{\from{uni-titlepage.dtx}{README}}%
}%
@@ -1410,6 +1449,18 @@ You may however distribute the file `uni-titlepage.dtx' without this file.
% \end{option}
% \end{macro}
% \end{macro}
+% \begin{macro}{\secondlogo}
+% \changes{v0.7}{2021/08/18}{new}
+% \begin{macro}{\@secondlogo}
+% \changes{v0.7}{2021/08/18}{new (internal)}
+% \begin{option}{secondlogo}
+% \changes{v0.7}{2021/08/18}{new}
+% \begin{macrocode}
+\DefineSimpleTitleKey{secondlogo}
+% \end{macrocode}
+% \end{option}
+% \end{macro}
+% \end{macro}
% \begin{macro}{\oralexaminationdate}
% \begin{macro}{\@oralexaminationdate}
% \begin{option}{oralexaminationdate}
@@ -1556,51 +1607,57 @@ You may however distribute the file `uni-titlepage.dtx' without this file.
% \end{macrocode}
%
% \begin{macro}{\chairmanname}
-% \changes{v0.5}{2016/06/21}{new}%^^A
-% \changes{v0.5c}{2019/05/27}{not needed \cs{AtBeginDocument} removed}%^^A
+% \changes{v0.5}{2016/06/21}{new}
+% \changes{v0.5c}{2019/05/27}{not needed \cs{AtBeginDocument} removed}
% \begin{macro}{\projectpapername}
-% \changes{v0.5c}{2019/05/27}{not needed \cs{AtBeginDocument} removed}%^^A
+% \changes{v0.5c}{2019/05/27}{not needed \cs{AtBeginDocument} removed}
% \begin{macro}{\seminarpapername}
-% \changes{v0.5c}{2019/05/27}{not needed \cs{AtBeginDocument} removed}%^^A
+% \changes{v0.5c}{2019/05/27}{not needed \cs{AtBeginDocument} removed}
% \begin{macro}{\studentreserchname}
-% \changes{v0.5c}{2019/05/27}{not needed \cs{AtBeginDocument} removed}%^^A
+% \changes{v0.5c}{2019/05/27}{not needed \cs{AtBeginDocument} removed}
% \begin{macro}{\diplomathesisname}
-% \changes{v0.5c}{2019/05/27}{not needed \cs{AtBeginDocument} removed}%^^A
+% \changes{v0.5c}{2019/05/27}{not needed \cs{AtBeginDocument} removed}
% \begin{macro}{\degreethesisname}
-% \changes{v0.5c}{2019/05/27}{not needed \cs{AtBeginDocument} removed}%^^A
+% \changes{v0.5c}{2019/05/27}{not needed \cs{AtBeginDocument} removed}
% \begin{macro}{\masterthesisname}
-% \changes{v0.5c}{2019/05/27}{not needed \cs{AtBeginDocument} removed}%^^A
+% \changes{v0.5c}{2019/05/27}{not needed \cs{AtBeginDocument} removed}
% \begin{macro}{\bachelorthesisname}
-% \changes{v0.5c}{2019/05/27}{not needed \cs{AtBeginDocument} removed}%^^A
+% \changes{v0.5c}{2019/05/27}{not needed \cs{AtBeginDocument} removed}
% \begin{macro}{\presentedbyname}
-% \changes{v0.5c}{2019/05/27}{not needed \cs{AtBeginDocument} removed}%^^A
+% \changes{v0.5c}{2019/05/27}{not needed \cs{AtBeginDocument} removed}
% \begin{macro}{\advisorname}
-% \changes{v0.5c}{2019/05/27}{not needed \cs{AtBeginDocument} removed}%^^A
+% \changes{v0.5c}{2019/05/27}{not needed \cs{AtBeginDocument} removed}
% \begin{macro}{\thename}
-% \changes{v0.5c}{2019/05/27}{not needed \cs{AtBeginDocument} removed}%^^A
+% \changes{v0.5c}{2019/05/27}{not needed \cs{AtBeginDocument} removed}
% \begin{macro}{\ofthename}
-% \changes{v0.5c}{2019/05/27}{not needed \cs{AtBeginDocument} removed}%^^A
+% \changes{v0.5c}{2019/05/27}{not needed \cs{AtBeginDocument} removed}
% \begin{macro}{\fromname}
-% \changes{v0.5c}{2019/05/27}{not needed \cs{AtBeginDocument} removed}%^^A
+% \changes{v0.5c}{2019/05/27}{not needed \cs{AtBeginDocument} removed}
% \begin{macro}{\fromplacename}
-% \changes{v0.5c}{2019/05/27}{not needed \cs{AtBeginDocument} removed}%^^A
+% \changes{v0.5c}{2019/05/27}{not needed \cs{AtBeginDocument} removed}
% \begin{macro}{\malerefereename}
-% \changes{v0.5}{2016/06/21}{new}%^^A
-% \changes{v0.5c}{2019/05/27}{not needed \cs{AtBeginDocument} removed}%^^A
+% \changes{v0.5}{2016/06/21}{new}
+% \changes{v0.5c}{2019/05/27}{not needed \cs{AtBeginDocument} removed}
% \begin{macro}{\femalerefereename}
-% \changes{v0.5}{2016/06/21}{new}%^^A
-% \changes{v0.5c}{2019/05/27}{not needed \cs{AtBeginDocument} removed}%^^A
+% \changes{v0.5}{2016/06/21}{new}
+% \changes{v0.5c}{2019/05/27}{not needed \cs{AtBeginDocument} removed}
+% \begin{macro}{\ordinalmalerefereename}
+% \changes{v0.7}{2021/08/18}{new}
+% \begin{macro}{\ordinalfemalerefereename}
+% \changes{v0.7}{2021/08/18}{new}
% \begin{macro}{\refereename}
-% \changes{v0.5c}{2019/05/27}{not needed \cs{AtBeginDocument} removed}%^^A
+% \changes{v0.5c}{2019/05/27}{not needed \cs{AtBeginDocument} removed}
% \begin{macro}{\oralexaminationdatename}
-% \changes{v0.5c}{2019/05/27}{not needed \cs{AtBeginDocument} removed}%^^A
+% \changes{v0.5c}{2019/05/27}{not needed \cs{AtBeginDocument} removed}
% \begin{macro}{\ordinal}
-% \changes{v0.5c}{2019/05/27}{not needed \cs{AtBeginDocument} removed}%^^A
+% \changes{v0.5c}{2019/05/27}{not needed \cs{AtBeginDocument} removed}
% \begin{macro}{\maleordinal}
-% \changes{v0.5}{2016/06/21}{new}%^^A
+% \changes{v0.5}{2016/06/21}{new}
% \begin{macro}{\femaleordinal}
-% \changes{v0.5}{2016/06/21}{new}%^^A
-% \changes{v0.5c}{2019/05/27}{not needed \cs{AtBeginDocument} removed}%^^A
+% \changes{v0.5}{2016/06/21}{new}
+% \changes{v0.5c}{2019/05/27}{not needed \cs{AtBeginDocument} removed}
+% \begin{macro}{\indatename}
+% \changes{v0.7}{2021/08/18}{new}
% Language dependent terms:
% \begin{macrocode}
\providecommand*{\chairmanname}{Chairman}
@@ -1620,6 +1677,8 @@ You may however distribute the file `uni-titlepage.dtx' without this file.
\providecommand*{\refereename}{Referee}
\providecommand*{\femalerefereename}{\refereename}
\providecommand*{\malerefereename}{\refereename}
+\providecommand*{\ordinalmalerefereename}{\englishordinalmalerefereename}
+\providecommand*{\ordinalfemalerefereename}{\englishordinalfemalerefereename}
\providecommand*{\oralexaminationdatename}{Date of Oral Examination}
\providecommand*{\atthename}{at}
\providecommand*{\durationname}{Processing Time}
@@ -1631,6 +1690,7 @@ You may however distribute the file `uni-titlepage.dtx' without this file.
\newcommand*{\ordinal}{\englishordinal}
\newcommand*{\femaleordinal}{\ordinal}
\newcommand*{\maleordinal}{\ordinal}
+\providecommand*{\indatename}{in}
\providecaptionname{american,australian,british,canadian,%
english,newzealand,UKenglish,USenglish}{\chairmanname}{Chairmain}%
\providecaptionname{american,australian,british,canadian,%
@@ -1666,6 +1726,12 @@ You may however distribute the file `uni-titlepage.dtx' without this file.
\providecaptionname{american,australian,british,canadian,%
english,newzealand,UKenglish,USenglish}{\refereename}{Referee}%
\providecaptionname{american,australian,british,canadian,%
+ english,newzealand,UKenglish,USenglish}{\ordinalmalerefereename}{%
+ \englishordinalmalerefereename}%
+\providecaptionname{american,australian,british,canadian,%
+ english,newzealand,UKenglish,USenglish}{\ordinalfemalerefereename}{%
+ \englishordinalfemalerefereename}%
+\providecaptionname{american,australian,british,canadian,%
english,newzealand,UKenglish,USenglish}{\oralexaminationdatename}{Date of
Oral Examination}%
\providecaptionname{american,australian,british,canadian,%
@@ -1681,6 +1747,8 @@ You may however distribute the file `uni-titlepage.dtx' without this file.
\providecaptionname{american,australian,british,canadian,%
english,newzealand,UKenglish,USenglish}{\examinationdatename}{Date of
Examination}%
+\providecaptionname{american,australian,british,canadian,%
+ english,newzealand,UKenglish,USenglish}{\indatename}{in}%
\providecaptionname{german,ngerman,austrian,naustrian,%
swissgerman,nswissgerman}{\chairmanname}{Dekan/Dekanin}%
\providecaptionname{german,ngerman,austrian,naustrian,%
@@ -1718,6 +1786,12 @@ You may however distribute the file `uni-titlepage.dtx' without this file.
\providecaptionname{german,ngerman,austrian,naustrian,%
swissgerman,nswissgerman}{\refereename}{Gutachter}%
\providecaptionname{german,ngerman,austrian,naustrian,%
+ swissgerman,nswissgerman}{\ordinalmalerefereename}{%
+ \germanordinalmalerefereename}%
+\providecaptionname{german,ngerman,austrian,naustrian,%
+ swissgerman,nswissgerman}{\ordinalfemalerefereename}{%
+ \germanordinalfemalerefereename}%
+\providecaptionname{german,ngerman,austrian,naustrian,%
swissgerman,nswissgerman}{\femalerefereename}{Gutachterin}%
\providecaptionname{german,ngerman,austrian,naustrian,%
swissgerman,nswissgerman}{\oralexaminationdatename}{Datum der m\"undlichen
@@ -1734,7 +1808,75 @@ You may however distribute the file `uni-titlepage.dtx' without this file.
swissgerman,nswissgerman}{\examinationname}{Pr\"ufung}%
\providecaptionname{german,ngerman,austrian,naustrian,%
swissgerman,nswissgerman}{\examinationdatename}{Tag der Pr\"ufung}%
+\providecaptionname{german,ngerman,austrian,naustrian,%
+ swissgerman,nswissgerman}{\indatename}{im}%
% \end{macrocode}
+% \begin{macro}{\englishordinalmalerefereename}
+% \changes{v0.7}{2021/08/18}{new}
+% \begin{macrocode}
+\newcommand*{\englishordinalmalerefereename}[1]{%
+ \englishordinal{#1} \refereename%
+}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\englishordinalfemalerefereename}
+% \changes{v0.7}{2021/08/18}{new}
+% \begin{macrocode}
+\newcommand*{\englishordinalfemalerefereename}[1]{%
+ \englishordinalmalereferename{#1}%
+}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\germanordinalmalerefereename}
+% \changes{v0.7}{2021/08/18}{new}
+% \begin{macrocode}
+\newcommand*{\germanordinalmalerefereename}[1]{%
+ \ifnum #1<\@ne
+ \PackageError{uni-titlepage}{Ordinal of `#1' not defined}{%
+ This package does only define German ordinal names for referees from 1}%
+ \else
+ \ifcase #1\or Erstgutachter\or Zweitgutachter\or Drittgutachter%
+ \or Viertgutachter\else
+ \PackageError{uni-titlepage}{Ordinal of `#1' not defined}{%
+ This package does only define German ordinal names for referees up
+ to 4}%
+ \fi
+}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\germanordinalfemalerefereename}
+% \changes{v0.7}{2021/08/18}{new}
+% \begin{macrocode}
+\newcommand*{\germanordinalfemalerefereename}[1]{%
+ \germanordinalfemalerefereename{#1}in%
+}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\germanordinalmalecorrectorname}
+% \changes{v0.7}{2021/08/18}{new}
+% \begin{macrocode}
+\newcommand*{\germanordinalmalecorrectorname}[1]{%
+ \ifnum #1<\@ne
+ \PackageError{uni-titlepage}{Ordinal of `#1' not defined}{%
+ This package does only define German ordinal names for correctors from 1}%
+ \else
+ \ifcase #1\or Erstkorrektor\or Zweitkorrektor\or Drittkorrektor%
+ \or Viertkorrektor\else
+ \PackageError{uni-titlepage}{Ordinal of `#1' not defined}{%
+ This package does only define German ordinal names for correctors up
+ to 6}%
+ \fi
+}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\germanordinalfemalecorrectorname}
+% \changes{v0.7}{2021/08/18}{new}
+% \begin{macrocode}
+\newcommand*{\germanordinalfemalecorrectorname}[1]{%
+ \germanordinalmalecorrectorname{#1}in%
+}
+% \end{macrocode}
+% \end{macro}
% \begin{macro}{\englishordinal}
% \begin{macrocode}
\newcommand*{\englishordinal}[1]{%
@@ -1743,12 +1885,12 @@ You may however distribute the file `uni-titlepage.dtx' without this file.
\else
\ifnum #1<\@ne
\PackageError{uni-titlepage}{Ordinal of `#1' not defined}{%
- This package does only define english ordinals from 1}%
+ This package does only define English ordinals from 1}%
\else
\ifcase #1\or 1st\or 2nd\or 3rd\or 4th\or 5th\or 6th\or 7th\or 8th\or
9th\or 10th\else
\PackageError{uni-titlepage}{Ordinal of `#1' not defined}{%
- This package does only define english ordinals from 1 to
+ This package does only define English ordinals from 1 to
10.\MessageBreak
You may load package `engord' to improve support of english
ordinals}%
@@ -1815,6 +1957,9 @@ You may however distribute the file `uni-titlepage.dtx' without this file.
% \end{macro}
% \end{macro}
% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
%
% \iffalse meta-comment
%</package>
@@ -1860,6 +2005,7 @@ You may however distribute the file `uni-titlepage.dtx' without this file.
%<JT-Geschichte> title-JT-Geschichte.def%
%<JT-Typography> title-JT-Typography.def%
%<WWUM> title-WWUM.def%
+%<UKoLA> title-UKoLa.def%
}%
\fi
\endgroup
@@ -1882,18 +2028,19 @@ You may however distribute the file `uni-titlepage.dtx' without this file.
%<JT-Geschichte> JT-Geschichte%
%<JT-Typography> JT-Typography%
%<WWUM> WWUM%
+%<UKoLa> UKoLa%
]{title}
% \end{macrocode}
%
-% Nevertheless some style has their own switches:
+% Nevertheless some styles have their own switches:
% \begin{option}{blackborder}
-% \emph{Trauerrand} at style \File{TU-DD}:
+% \emph{Trauerrand} at style \File{TU-DD}:
% \begin{macrocode}
%<TU-DD>\FamilyBoolKey[TU-DD]{title}{blackborder}{blackborder}
% \end{macrocode}
% \end{option}
% \begin{option}{final}
-% Style \File{TU-HH} distinguishes between drafts and final thesis.
+% Style \File{TU-HH} distinguishes between drafts and final thesis.
% \begin{macrocode}
%<TU-HH>\FamilyBoolKey[TU-HH]{title}{final}{final}
% \end{macrocode}
@@ -1902,7 +2049,7 @@ You may however distribute the file `uni-titlepage.dtx' without this file.
% \begin{macro}{\title@rulewidth}
% \begin{option}{rulesep}
% \begin{macro}{\title@rulesep}
-% Some styles have some variable rules at the title:
+% Some styles have some variable rules at the title:
% \begin{macrocode}
%<*Spacer|JT-Aufsaetze|JT-Geschichte|Markus&2>
\providecommand*{\title@rulewidth}{%
@@ -1939,23 +2086,44 @@ You may however distribute the file `uni-titlepage.dtx' without this file.
% \end{option}
%
% An some has their own terms:
+% \begin{macro}{\presentationinformationUKoLA}
+% \changes{v0.7}{2021/08/18}{new}
% \begin{macro}{\presentationinformationWWUM}
-% \changes{v0.5}{2016/06/21}{new style WWUM}
+% \changes{v0.5}{2016/06/21}{new style WWUM}
% \begin{macro}{\presentationinformationTUHH}
-% \changes{v0.5}{2016/06/21}{\cs{NowButAfterBeginDocument} not needed any
-% more}^^A
-% \changes{v0.5}{2016/06/21}{provide sevaral English and German
-% languages}^^A
+% \changes{v0.5}{2016/06/21}{\cs{NowButAfterBeginDocument} not needed any
+% more}
+% \changes{v0.5}{2016/06/21}{provide sevaral English and German
+% languages}
% \begin{macro}{\presentationinformationDHBW}
% \changes{v0.5}{2016/06/21}{\cs{NowButAfterBeginDocument} not needed any
-% more}^^A
-% \changes{v0.5}{2016/06/21}{provide sevaral English and German languages}^^A
+% more}
+% \changes{v0.5}{2016/06/21}{provide sevaral English and German languages}
% \changes{0.5e}{2019/11/20}{\cs{if} replaced by \cs{ifx}}
% \begin{macro}{\presentationinformationKIT}
% \changes{v0.5}{2016/06/21}{\cs{NowButAfterBeginDocument} not needed any
-% more}^^A
-% \changes{v0.5}{2016/06/21}{provide sevaral English and German languages}^^A
+% more}
+% \changes{v0.5}{2016/06/21}{provide sevaral English and German languages}
% \begin{macrocode}
+%<*UKoLa>
+\providecommand*{\presentationinformationUKoLa}{%
+ to optain the degree\\
+ \@academicgrade\\
+ of \@discipline\\
+}
+\providecaptionname{american,australian,british,canadian,%
+ english,newzealand,UKenglish,USenglish}{\presentationinformationUKoLa}{%
+ to optain the degree\\
+ \@academicgrade\\
+ of \@discipline\\
+}%
+\providecaptionname{german,ngerman,austrian,naustrian,%
+ swissgerman,nswissgerman}{\presentationinformationUKoLa}{%
+ zur Erlangung des Grades eines\\
+ \@academicgrade\\
+ im Studiengang \@discipline\\
+}%
+%</UKoLa>
%<*DHBW>
\providecommand*{\presentationinformationDHBW}{%
for the \examinationname{} of\\[.5\baselineskip]
@@ -2048,6 +2216,7 @@ You may however distribute the file `uni-titlepage.dtx' without this file.
% \end{macro}
% \end{macro}
% \end{macro}
+% \end{macro}
% \begin{macro}{\KITlongname}
% \changes{v0.5}{2016/06/21}{\cs{NowButAfterBeginDocument} not needed any
% more}^^A
@@ -2115,39 +2284,69 @@ You may however distribute the file `uni-titlepage.dtx' without this file.
% \end{macro}
% \end{macro}
% \end{macro}
+%
% \begin{macro}{\presentedbyname}
-% \changes{v0.5}{2016/06/21}{changed value for `WWUM'}%^^A
+% \changes{v0.5}{2016/06/21}{changed value for \texttt{WWUM}}
% \changes{v0.5a}{2016/06/22}{fixed \texttt{swissgerman} instead of
-% \texttt{swiss}}%^^A
-% \changes{v0.5b}{2018/08/31}{changes have to be delayed}%^^A
-% \begin{macrocode}
-%<*WWUM>
+% \texttt{swiss}}
+% \changes{v0.5b}{2018/08/31}{changes have to be delayed}
+% \changes{v0.7}{2021/08/18}{changed value also for \texttt{UKoLa}}
+% \begin{macro}{\ordinalmalerefereename}
+% \changes{v0.7}{2021/08/18}{changed value for \texttt{UKoLa}}
+% \begin{macro}{\ordinalfemalerefereename}
+% \changes{v0.7}{2021/08/18}{changed value for \texttt{UKoLa}}
+% \begin{macrocode}
+%<*WWUM|UKoLa>
\NowButAfterBeginDocument
{%
\providecaptionname{german,ngerman,austrian,naustrian,
swissgerman,nswissgerman}{\presentedbyname}{vorgelegt von}%
\scr@ifundefinedorrelax{captionsgerman}{}{%
\renewcaptionname{german}{\presentedbyname}{vorgelegt von}%
+ \renewcaptionname{german}{\ordinalfemalerefereename}{%
+ \ordinalfemalecorrectorname}%
}%
\scr@ifundefinedorrelax{captionsngerman}{}{%
\renewcaptionname{ngerman}{\presentedbyname}{vorgelegt von}%
+ \renewcaptionname{ngerman}{\ordinalmalerefereename}{%
+ \germanordinalmalecorrectorname}%
+ \renewcaptionname{ngerman}{\ordinalfemalerefereename}{%
+ \germanordinalfemalecorrectorname}%
}%
\scr@ifundefinedorrelax{captionsaustrian}{}{%
\renewcaptionname{austrian}{\presentedbyname}{vorgelegt von}%
+ \renewcaptionname{austrian}{\ordinalmalerefereeename}{%
+ \germanordinalmalecorrectorname}%
+ \renewcaptionname{austrian}{\ordinalfemalerefereeename}{%
+ \germanordinalfemalecorrectorname}%
}%
\scr@ifundefinedorrelax{captionsnaustrian}{}{%
\renewcaptionname{naustrian}{\presentedbyname}{vorgelegt von}%
+ \renewcaptionname{naustrian}{\ordinalmalerefereename}{%
+ \germanordinalmalecorrectorname}%
+ \renewcaptionname{naustrian}{\ordinalfemalerefereename}{%
+ \germanordinalfemalecorrectorname}%
}%
\scr@ifundefinedorrelax{captionsswissgerman}{}{%
\renewcaptionname{swissgerman}{\presentedbyname}{vorgelegt von}%
+ \renewcaptionname{swissgerman}{\ordinalmalerefereename}{%
+ \germanordinalmalecorrectorname}%
+ \renewcaptionname{swissgerman}{\ordinalfemalerefereename}{%
+ \germanordinalfemalecorrectorname}%
}%
\scr@ifundefinedorrelax{captionsnswissgerman}{}{%
\renewcaptionname{nswissgerman}{\presentedbyname}{vorgelegt von}%
+ \renewcaptionname{nswissgerman}{\ordinalmalerefereename}{%
+ \germanordinalmalecorrectorname}%
+ \renewcaptionname{nswissgerman}{\ordinalfemalerefereename}{%
+ \germanordinalfemalecorrectorname}%
}%
}
-%</WWUM>
+%</WWUM|UKoLa>
% \end{macrocode}
% \end{macro}
+% \end{macro}
+% \end{macro}
%
% While style initialization, something may change:
% \begin{macrocode}
@@ -2164,8 +2363,8 @@ You may however distribute the file `uni-titlepage.dtx' without this file.
\renewcommand*{\@makefnmark}{\rlap\@oldmakefnmark}%
%</KOMAScript>
% \end{macrocode}
-% styles \File{DHBW}, \File{TU-DD}, \File{TU-HH}, and \File{KIT} sets some
-% variable if not already done
+% styles \File{DHBW}, \File{TU-DD}, \File{TU-HH}, \File{KIT}, and \File{UKoLa}
+% set some variable if not already done
% \begin{macrocode}
%<*DHBW|TU-DD|TU-HH|KIT|WWUM>
\ifx\@university\@empty
@@ -2178,6 +2377,8 @@ You may however distribute the file `uni-titlepage.dtx' without this file.
%<WWUM> Westf\"alischen Wilhelms-Universit\"at M\"unster%
}%
\fi
+%</DHBW|TU-DD|TU-HH|KIT|WWUM>
+%<*DHBW|TU-DD|TU-HH|KIT|WWUM|UKoLa>
\ifx\@place\@empty
\place{%
%<DHBW> Baden-W\"urttemberg%
@@ -2189,29 +2390,44 @@ You may however distribute the file `uni-titlepage.dtx' without this file.
Style `WWUM' needs the birth place of\MessageBreak
the student}%
%</WWUM>
+%<UKoLa> Koblenz%
}
\fi
-%<*DHBW>
+%<*DHBW|UKoLa>
\ifx\@mainlogo\@empty
- \IfFileExists{DHBW_d_MOS_195x95_rgb_300.jpg}{%
+%<DHBW> \IfFileExists{DHBW_d_MOS_195x95_rgb_300.jpg}{%
+%<UKoLa> \IfFileExists{uni-koblenz-landau.png}{%
\scr@ifundefinedorrelax{includegraphics}{%
\if@atdocument\else\RequirePackage{graphicx}\fi
}{}%
\scr@ifundefinedorrelax{includegraphics}{}{%
\mainlogo{%
- \includegraphics[width=57mm,height=27mm]%
+%<*DHBW>
+ \includegraphics[width=57mm,height=27mm]
{DHBW_d_MOS_195x95_rgb_300.jpg}%
+%</DHBW>
+%<*UKoLa>
+ \includegraphics[width=63mm,height=10mm]
+ {uni-koblenz-landau.png}
+%</UKoLa>
}%
}%
}{}%
\fi
+%</DHBW|UKoLa>
+%<*DHBW>
\ifx\@titlehead\@empty
\titlehead{\hspace*{\fill}\@mainlogo}%
\fi
+%</DHBW>
+%<*DHBW|UKoLa>
\ifx\@titlepagefont\@empty
- \renewcommand*{\@titlepagefont}{\normalfont\sffamily}%
+ \renewcommand*{\@titlepagefont}{%
+%<DHBW> \normalfont\sffamily
+%<UKoLa> \normalfont
+ }%
\fi
-%</DHBW>
+%</DHBW|UKoLa>
%<*KIT>
\ifx\@homepage\@empty
\homepage{\KITurl}%
@@ -2255,7 +2471,7 @@ You may however distribute the file `uni-titlepage.dtx' without this file.
\renewcommand*{\@titlepagefont}{\normalfont\large}%
\fi
%</WWUM>
-%</DHBW|TU-DD|TU-HH|KIT|WWUM>
+%</DHBW|TU-DD|TU-HH|KIT|WWUM|UKoLa>
% \end{macrocode}
% style \File{Markus-2} uses it's own pagestyle at the first title page
% \begin{macrocode}
@@ -2315,9 +2531,9 @@ You may however distribute the file `uni-titlepage.dtx' without this file.
\renewcommand*{\makemaintitle}{%
\begin{%
%<DHBW|TU-DD|TU-HH|KIT> fullsizetitle}
-%<*KOMAScript|Markus|Spacer|JT-Aufsaetze|JT-Geschichte|JT-Typography|WWUM>
+%<*KOMAScript|Markus|Spacer|JT-Aufsaetze|JT-Geschichte|JT-Typography|WWUM|UKoLa>
titlepage}
-%</KOMAScript|Markus|Spacer|JT-Aufsaetze|JT-Geschichte|JT-Typography|WWUM>
+%</KOMAScript|Markus|Spacer|JT-Aufsaetze|JT-Geschichte|JT-Typography|WWUM|UKoLa>
\setlength{\parskip}{\z@}%
\setlength{\parindent}{\z@}%
\setlength{\parfillskip}{\z@\@plus 1fil}%
@@ -2609,11 +2825,43 @@ You may however distribute the file `uni-titlepage.dtx' without this file.
\MakeUppercase{\@publisher}%
\fi}
%</JT-Typography>
+%<*UKoLa>
+ \begin{tabular}[t]{@{}c@{}}
+ \raisebox{\dimexpr\ht\strutbox-\height}{\@mainlogo}\\
+ \@chair\\
+ \end{tabular}\hfill
+ \begin{tabular}[r]{@{}c@{}}
+ \raisebox{\dimexpr\ht\strutbox-\height}{\@secondlogo}\\
+ \end{tabular}\par
+ \vspace{5\baselineskip}
+ \centering
+ {\LARGE\bfseries\titlefont{\@title\par}}%
+ \vspace{5\baselineskip}
+ {\Large\subject@font{\@subject\par}}%
+ \vspace{\baselineskip}
+ \presentationinformationUKoLa\par
+ \vspace{5\baselineskip}
+ \presentedbyname\\[\baselineskip]
+ {\Large\csname @authorfont\endcsname{\@author\par}}%
+ \vfill
+ \raggedright
+ \@hangfrom{\advisorname: }{\@advisor\par}%
+ \newcommand*{\test@male@female}[1][m]{%
+ \global\advance\@tempcnta by\@ne
+ \Ifstr{##1}{f}{\def\fe@male{female}}{\def\fe@male{male}}%
+ \@hangfrom{\csname ordinal\fe@male refereename\endcsname{\@tempcnta}: }%
+ \def\and{\par\test@male@female}%
+ }%
+ \@tempcnta \z@
+ \expandafter\test@male@female\@referee\par
+ \vspace{3\baselineskip}
+ \@place, \Ifstr{\indatename}{}{}{\indatename\ }\@date\par
+%</UKoLa>
\end{%
%<DHBW|TU-DD|TU-HH|KIT> fullsizetitle}
-%<*KOMAScript|Markus|Spacer|JT-Aufsaetze|JT-Geschichte|JT-Typography|WWUM>
+%<*KOMAScript|Markus|Spacer|JT-Aufsaetze|JT-Geschichte|JT-Typography|WWUM|UKoLa>
titlepage}
-%</KOMAScript|Markus|Spacer|JT-Aufsaetze|JT-Geschichte|JT-Typography|WWUM>
+%</KOMAScript|Markus|Spacer|JT-Aufsaetze|JT-Geschichte|JT-Typography|WWUM|UKoLa>
}
% \end{macrocode}
% \end{macro}
@@ -2854,16 +3102,16 @@ You may however distribute the file `uni-titlepage.dtx' without this file.
%<*doc|README>
%<*example>
% \fi^^A meta-comment
+% \changes{v0.7}{2021/08/18}{don't use \Package{inputenc} any longer}
% \begin{macrocode}
\documentclass[a4paper,pagesize]{scrbook}
-\usepackage[utf8]{inputenc}
\usepackage[ngerman]{babel}
\usepackage[T1]{fontenc}
\usepackage{lmodern}
%<JT-Geschichte>\usepackage{microtype}
%<TU-HH|TU-DD>\usepackage{mathpazo}
%<TU-HH|TU-DD>\usepackage[scaled]{helvet}
-%<DHBW|Spacer|KIT>\usepackage[demo]{graphicx}% remove option demo if you have the logo
+%<DHBW|Spacer|KIT|UKoLa>\usepackage[demo]{graphicx}% remove option demo if you have the logo
\usepackage{xcolor}
%<JT-Geschichte|JT-Typography>\colorlet{RED}{red}% because of \MakeUppercase{\textcolor{red}{…}}
\usepackage{uni-titlepage}
@@ -3090,6 +3338,44 @@ You may however distribute the file `uni-titlepage.dtx' without this file.
professor={\textcolor{red}{Klaus Naseschwarz}}
]
%</WWUM>
+%<*UKoLa>
+\TitlePageStyle{UKoLa}
+\maketitle[%
+ titlefont=\sffamily,
+ mainlogo=\textcolor{red}{{%
+ \includegraphics[height=10mm,width=63mm]%
+ {uni-koblenz-landau}%
+ }},
+ chair=\textcolor{red}{Nummer des Instituts:
+ Name des Instituts},
+ secondlogo=\textcolor{red}{Optionales weiteres Logo},
+ title=\textcolor{red}{Titel der Studien-, Bachelor-, Master- oder Diplomarbeit},
+ subject=\textcolor{red}{Diplomarbeit},
+ academicgrade=\textcolor{red}{Diplom-Informatikers},
+ discipline=\textcolor{red}{Name des Studiengangs},
+ place={\textcolor{red}{Koblenz}},
+ author=\textcolor{red}{Vorname und Nachname des Absolventen / der
+ Absolventin},
+ advisor=\textcolor{red}{Title{}
+ Vorname{}
+ Name,
+ Institut, Fachbereich innerhalb der Universität /
+ Institution außerhalb der Universität},
+ referee={\textcolor{red}{Title{}
+ Vorname{}
+ Name,
+ Institut, Fachbereich innerhalb der Universität /
+ Institution außerhalb der Universität}%
+ \and[f]\textcolor{red}{Title{}
+ Vorname{}
+ Name,
+ Institut, Fachbereich innerhalb der Universität /
+ Institution außerhalb der Universität}%
+ },%
+ date=\textcolor{red}{Abgabemonat},
+]
+
+%</UKoLa>
\end{document}
% \end{macrocode}
%
diff --git a/macros/latex/contrib/uni-titlepage/uni-titlepage.pdf b/macros/latex/contrib/uni-titlepage/uni-titlepage.pdf
index 29db357407..4df09a5ca2 100644
--- a/macros/latex/contrib/uni-titlepage/uni-titlepage.pdf
+++ b/macros/latex/contrib/uni-titlepage/uni-titlepage.pdf
Binary files differ
diff --git a/macros/latex/contrib/univie-ling/README b/macros/latex/contrib/univie-ling/README
index 1670d15cae..87baa1affc 100644
--- a/macros/latex/contrib/univie-ling/README
+++ b/macros/latex/contrib/univie-ling/README
@@ -80,6 +80,15 @@ also have a look at the example files.
== CHANGES ==
+V. 1.14 (2021-09-01)
+ - univie-ling-paper.cls:
+ * Do not overwrite user-set \texttype with default value.
+ - univie-ling.bbx:
+ * Sentence-case journal issue title and online title.
+ * Emphasize journal subtitle.
+ - univie-ling-wlg.cfg:
+ * Update editorial board.
+
V. 1.13 (2020-11-11)
- univie-ling.bbx:
* Fix whitespace issue in thematic issue string.
diff --git a/macros/latex/contrib/univie-ling/biblatex-univie-ling/univie-ling.bbx b/macros/latex/contrib/univie-ling/biblatex-univie-ling/univie-ling.bbx
index c88d648c0c..0862f1f1f4 100644
--- a/macros/latex/contrib/univie-ling/biblatex-univie-ling/univie-ling.bbx
+++ b/macros/latex/contrib/univie-ling/biblatex-univie-ling/univie-ling.bbx
@@ -36,7 +36,7 @@
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\ProvidesFile{univie-ling.bbx}[2020/11/11 v1.13 biblatex bibliography style]
+\ProvidesFile{univie-ling.bbx}[2021/09/01 v1.14 biblatex bibliography style]
% Load base style (authoryear)
\RequireBibliographyStyle{authoryear}
@@ -67,8 +67,11 @@
This is a fatal error. I'm aborting now}%
\endinput}
-% Option "issueeditor": Output journal issue editor
-% (false by default)
+%
+% OPTIONS
+%
+
+% Option "issueeditor": Output journal issue editor (false by default)
\newtoggle{issueeditor}
\DeclareBibliographyOption{issueeditor}[false]{%
\settoggle{issueeditor}{#1}}
@@ -143,6 +146,23 @@
{}
{\printdate}}%
+\renewbibmacro*{issue}{%
+ \ifboolexpr{
+ test {\iffieldundef{issuetitle}}
+ and
+ test {\iffieldundef{issuesubtitle}}
+ }
+ {}
+ {\printtext{%
+ \printfield[issuetitle]{issuetitle}%
+ \iffieldundef{issuesubtitle}{}{
+ \setunit{\subtitlepunct}%
+ \printfield[issuetitle]{issuesubtitle}%
+ }%
+ }%
+ }%
+}
+
\renewbibmacro*{issue+date}{%
\ifboolexpr{
test {\iffieldundef{issue}}
@@ -202,10 +222,10 @@
\usebibmacro{#1}%
}%
\clearname{editor}%
- \newunit}% period instead of space
+ \newunit}% period instead of space
{\global\undef\bbx@lasthash
\usebibmacro{labeltitle}%
- \newunit}% period instead of space
+ \newunit}% period instead of space
\usebibmacro{date+extradate}}
\renewbibmacro*{translator}{%
@@ -225,10 +245,10 @@
\usebibmacro{bbx:savehash}}%
\usebibmacro{translator+othersstrg}%
\clearname{translator}%
- \newunit}% period instead of space
+ \newunit}% period instead of space
{\global\undef\bbx@lasthash
\usebibmacro{labeltitle}%
- \newunit}% period instead of space
+ \newunit}% period instead of space
\usebibmacro{date+extradate}}
@@ -238,7 +258,7 @@
\renewbibmacro*{journal}{%
\iffieldundef{journaltitle}
{}
- {\printtext{%
+ {\printtext[issuetitle]{%
\printfield{journaltitle}%
\setunit{\subtitlepunct}%
\printfield{journalsubtitle}}}}
@@ -256,10 +276,7 @@
\usebibmacro{issue+date}%
\setunit{\addcolon\space}%
\usebibmacro{issue}%
- % The following three lines were originally not included inside of
- % the journal+issuetitle bibmacro. They have been moved inside of
- % this macro in order to allow them to be controlled by the toggle
- % `issueeditor` that is defined at the top of this style file.
+ % Output journal issue editors only if requested by 'issueeditor' option
\iftoggle{issueeditor}
{%
\newunit
@@ -414,7 +431,8 @@
\iffieldundef{urlyear}%
{}%
{\setunit*{\addspace}%
- \printtext[parens]{\bibstring{urlseen} \mkbibdateunified{urlyear}{urlmonth}{urlday}}}%
+ \printtext[parens]{\bibstring{urlseen}
+ \mkbibdateunified{urlyear}{urlmonth}{urlday}}}%
}
\renewbibmacro*{series+number}{%
@@ -431,7 +449,7 @@
{}
{\printnames[byeditor]{editor}%
\setunit{\addspace}%
- \printtext[parens]{\usebibmacro{editor+othersstrg}}% putting (ed.) or (eds.) after editors of books
+ \printtext[parens]{\usebibmacro{editor+othersstrg}}%
\clearname{editor}%
\newunit}%
\usebibmacro{byeditorx}}
@@ -579,13 +597,24 @@
% FIELD FORMATS
%
-\DeclareFieldFormat[article,book,mvbook,inbook,collection,mvcollection,incollection,inproceedings,thesis,unpublished]{titlecase}{\MakeSentenceCase*{#1}}%
+% Sentence-case all variable (non-serial) English titles
+\DeclareFieldFormat[article,book,mvbook,collection,mvcollection,
+ inbook,incollection,inproceedings,
+ thesis,unpublished,online]{titlecase}{\MakeSentenceCase*{#1}}%
+
+% Thematic issue title is non-serial as well
+\DeclareFieldFormat[periodical]{issuetitle}{\MakeSentenceCase*{#1}}
-\DeclareFieldFormat[article,inbook,incollection,inproceedings,patent,thesis,unpublished]{title}{#1}
+% Plain (recte) shape for these
+\DeclareFieldFormat[article,inbook,incollection,inproceedings,
+ patent,thesis,unpublished]{title}{#1}
+% Emphasize thesis title
\DeclareFieldFormat[thesis]{title}{\mkbibemph{#1}}
-\DeclareFieldFormat{pages}{#1} % no pp. prefix, took \mkpageprefix out [kvf]
+% no pp. prefix
+\DeclareFieldFormat{pages}{#1}
+
\DeclareFieldFormat{doi}{%
\ifhyperref
{\href{https://doi.org/#1}{\nolinkurl{https://doi.org/#1}}}
@@ -594,9 +623,6 @@
\DeclareFieldFormat{volume:unified:proc-as-article}{#1}
-\DeclareFieldFormat[periodical]{issuetitle}{#1}
-
-
%
% DRIVERS
%
@@ -615,9 +641,8 @@
\newunit\newblock
\printfield{version}%
\newunit\newblock
-% \usebibmacro{in:}% We don't use "In: " before journal titles
\usebibmacro{journal+issuetitle+editor}%
- \newblock% \newblock ensures period before pages
+ \newblock%
\usebibmacro{note+pages}%
\newunit\newblock
\iftoggle{bbx:isbn}
@@ -659,7 +684,7 @@
{}%
\newunit
\printfield{volumes}%
- \setunit{\addspace}% crucial difference from standard.bbx: space and then (Series + number)
+ \setunit{\addspace}%
\usebibmacro{series+number}%
\newunit\newblock
\printfield{note}%
diff --git a/macros/latex/contrib/univie-ling/biblatex-univie-ling/univie-ling.cbx b/macros/latex/contrib/univie-ling/biblatex-univie-ling/univie-ling.cbx
index 8f9720a39a..6939d0adaa 100644
--- a/macros/latex/contrib/univie-ling/biblatex-univie-ling/univie-ling.cbx
+++ b/macros/latex/contrib/univie-ling/biblatex-univie-ling/univie-ling.cbx
@@ -34,7 +34,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\ProvidesFile{univie-ling.cbx}[2020/11/11 v1.13 biblatex citation style]
+\ProvidesFile{univie-ling.cbx}[2021/09/01 v1.14 biblatex citation style]
\RequireCitationStyle{authoryear}
diff --git a/macros/latex/contrib/univie-ling/doc/univie-ling-expose.pdf b/macros/latex/contrib/univie-ling/doc/univie-ling-expose.pdf
index 72a30b20f7..4cda010d9a 100644
--- a/macros/latex/contrib/univie-ling/doc/univie-ling-expose.pdf
+++ b/macros/latex/contrib/univie-ling/doc/univie-ling-expose.pdf
Binary files differ
diff --git a/macros/latex/contrib/univie-ling/doc/univie-ling-expose.tex b/macros/latex/contrib/univie-ling/doc/univie-ling-expose.tex
index 03fbb262fb..db86a378ae 100644
--- a/macros/latex/contrib/univie-ling/doc/univie-ling-expose.tex
+++ b/macros/latex/contrib/univie-ling/doc/univie-ling-expose.tex
@@ -63,7 +63,7 @@
\author{\texorpdfstring{Jürgen Spitzmüller%
\thanks{Please report issues via \protect\url{https://github.com/jspitz/univie-ling}.}}{Jürgen Spitzmüller}}
-\date{Version 1.12, 2020/06/25}
+\date{Version 1.14, 2021/09/01}
\maketitle
@@ -319,6 +319,8 @@ Templates are provided as well:
\section{Release History}
\begin{description}
+ \item 2021/09/01 (v.\,1.14) No change to this class.
+ \item 2020/11/11 (v.\,1.13) No change to this class.
\item 2020/06/25 (v.\,1.12) No change to this class.
\item 2020/05/05 (v.\,1.11) New option \joption{polyglossia}.
\item 2020/05/01 (v.\,1.10) No change to this class.
diff --git a/macros/latex/contrib/univie-ling/doc/univie-ling-paper.pdf b/macros/latex/contrib/univie-ling/doc/univie-ling-paper.pdf
index 7410cc1b98..36e277eb0c 100644
--- a/macros/latex/contrib/univie-ling/doc/univie-ling-paper.pdf
+++ b/macros/latex/contrib/univie-ling/doc/univie-ling-paper.pdf
Binary files differ
diff --git a/macros/latex/contrib/univie-ling/doc/univie-ling-paper.tex b/macros/latex/contrib/univie-ling/doc/univie-ling-paper.tex
index 596cf2b7e3..1526c3304a 100644
--- a/macros/latex/contrib/univie-ling/doc/univie-ling-paper.tex
+++ b/macros/latex/contrib/univie-ling/doc/univie-ling-paper.tex
@@ -59,7 +59,7 @@
\author{\texorpdfstring{Jürgen Spitzmüller%
\thanks{Please report issues via \protect\url{https://github.com/jspitz/univie-ling}.}}{Jürgen Spitzmüller}}
-\date{Version 1.12, 2020/06/25}
+\date{Version 1.14, 2021/09/01}
\maketitle
@@ -243,7 +243,7 @@ given that you have specified the following data in the preamble.
\joption{vo} (Vorlesung), \joption{ue} (\"Ubung), \joption{ko} (Kolloquium) or \joption{pv} (Privatissimum).
\item{\jcsmacro{semester\{<semester type>\}\{<year>\}}}: Type and year of the current semester. Type must be either \joption{ss} (summer term) or \joption{ws} (winter term).
\item{\jcsmacro{instructor\{<name>\}}}: Title and name of your instructor (\emph{Dozent}).
- \item{\jcsmacro{texttype\{<text type>\}}}: Text type (such as \emph{Forschungsbericht}). For \joption{ps} and \joption{se} course types, this is automatically set.
+ \item{\jcsmacro{texttype\{<text type>\}}}: Text type (such as \emph{Forschungsbericht}). For \joption{ps} and \joption{se} course types, this is automatically set (but can be overwritten with this macro).
\end{description}
\section{Declaration}
@@ -343,6 +343,8 @@ Templates are provided as well:
\section{Release History}
\begin{itemize}
+ \item 2021/09/01 (v.\,1.14) Do not overwrite \jmacro{texttype} set by user with default value.
+ \item 2020/11/11 (v.\,1.13) No change to this class.
\item 2020/06/25 (v.\,1.12) No change to this class.
\item 2020/05/05 (v.\,1.11) New option \joption{polyglossia}.
\item 2020/05/01 (v.\,1.10) No change to this class.
@@ -361,14 +363,8 @@ Templates are provided as well:
\item Switch default bibliography style (from APA to Unified).
\item Initial release to CTAN.
\end{itemize}
- \item 2016/09/07 (v.\,0.8)
- \begin{itemize}
- \item Improve \jcsmacro{makedeclaration} output.
- \end{itemize}
- \item 2016/05/05 (v.\,0.7)
- \begin{itemize}
- \item Fix comma after \emph{et al.} with \textsf{biblatex-apa}.
- \end{itemize}
+ \item 2016/09/07 (v.\,0.8) Improve \jcsmacro{makedeclaration} output.
+ \item 2016/05/05 (v.\,0.7) Fix comma after \emph{et al.} with \textsf{biblatex-apa}.
\item 2016/04/30 (v.\,0.6)
\begin{itemize}
\item Reset the alignment after declaration.
diff --git a/macros/latex/contrib/univie-ling/doc/univie-ling-thesis.pdf b/macros/latex/contrib/univie-ling/doc/univie-ling-thesis.pdf
index 5d8379f109..e734f2514b 100644
--- a/macros/latex/contrib/univie-ling/doc/univie-ling-thesis.pdf
+++ b/macros/latex/contrib/univie-ling/doc/univie-ling-thesis.pdf
Binary files differ
diff --git a/macros/latex/contrib/univie-ling/doc/univie-ling-thesis.tex b/macros/latex/contrib/univie-ling/doc/univie-ling-thesis.tex
index 0b2e25f613..dec3028054 100644
--- a/macros/latex/contrib/univie-ling/doc/univie-ling-thesis.tex
+++ b/macros/latex/contrib/univie-ling/doc/univie-ling-thesis.tex
@@ -59,7 +59,7 @@
\author{\texorpdfstring{Jürgen Spitzmüller%
\thanks{Please report issues via \protect\url{https://github.com/jspitz/univie-ling}.}}{Jürgen Spitzmüller}}
-\date{Version 1.12, 2020/06/25}
+\date{Version 1.14, 2021/09/01}
\maketitle
@@ -367,6 +367,8 @@ Templates are provided as well:
\section{Release History}
\begin{itemize}
+ \item 2021/09/01 (v.\,1.14) No change to this class.
+ \item 2020/11/11 (v.\,1.13) No change to this class.
\item 2020/06/25 (v.\,1.12) No change to this class.
\item 2020/05/05 (v.\,1.11)\begin{itemize}
\item New option \joption{polyglossia}.
diff --git a/macros/latex/contrib/univie-ling/doc/univie-ling-wlg.pdf b/macros/latex/contrib/univie-ling/doc/univie-ling-wlg.pdf
index 523eac6312..a4ea625bf3 100644
--- a/macros/latex/contrib/univie-ling/doc/univie-ling-wlg.pdf
+++ b/macros/latex/contrib/univie-ling/doc/univie-ling-wlg.pdf
Binary files differ
diff --git a/macros/latex/contrib/univie-ling/doc/univie-ling-wlg.tex b/macros/latex/contrib/univie-ling/doc/univie-ling-wlg.tex
index 627a7fe84e..8bc27ee14e 100644
--- a/macros/latex/contrib/univie-ling/doc/univie-ling-wlg.tex
+++ b/macros/latex/contrib/univie-ling/doc/univie-ling-wlg.tex
@@ -59,7 +59,7 @@
\author{\texorpdfstring{Jürgen Spitzmüller%
\thanks{Please report issues via \protect\url{https://github.com/jspitz/univie-ling}.}}{Jürgen Spitzmüller}}
-\date{Version 1.13, 2020/11/11}
+\date{Version 1.14, 2021/09/01}
\maketitle
@@ -232,6 +232,7 @@ A template is provided as well: \url{https://github.com/jspitz/univie-ling/raw/m
\raggedright
\begin{itemize}
+ \item 2021/09/01 (v.\,1.14) Update editorial board.
\item 2020/11/11 (v.\,1.13)
\begin{itemize}
\item Use \textsf{totpages} package rather than \textsf{lastpage} in order to fix
diff --git a/macros/latex/contrib/univie-ling/tex/univie-ling-expose.cls b/macros/latex/contrib/univie-ling/tex/univie-ling-expose.cls
index d283f4f3d0..796f0f503c 100644
--- a/macros/latex/contrib/univie-ling/tex/univie-ling-expose.cls
+++ b/macros/latex/contrib/univie-ling/tex/univie-ling-expose.cls
@@ -31,7 +31,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{univie-ling-expose}[2020/11/11 v1.13 Univie Linguistic Exposes (JSp)]
+\ProvidesPackage{univie-ling-expose}[2021/09/01 v1.14 Univie Linguistic Exposes (JSp)]
\RequirePackage{xkeyval}
diff --git a/macros/latex/contrib/univie-ling/tex/univie-ling-paper.cls b/macros/latex/contrib/univie-ling/tex/univie-ling-paper.cls
index a9ad7ed788..a342dd5c4b 100644
--- a/macros/latex/contrib/univie-ling/tex/univie-ling-paper.cls
+++ b/macros/latex/contrib/univie-ling/tex/univie-ling-paper.cls
@@ -31,7 +31,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{univie-ling-paper}[2020/11/11 v1.13 Univie Linguistic Papers (JSp)]
+\ProvidesPackage{univie-ling-paper}[2021/09/01 v1.14 Univie Linguistic Papers (JSp)]
\RequirePackage{xkeyval}
@@ -299,7 +299,7 @@ This includes all drawings, sketches, graphics and internet sources.}
}{}
\def\lectype{\csuse{lectype@#1}}%
\def\lectypeverb{\csuse{lectypeverb@#1}}%
- \def\@texttype{\csuse{texttype@#1}}
+ \iftoggle{customtexttype}{}{\def\@texttype{\csuse{texttype@#1}}}
}%
}
@@ -315,7 +315,8 @@ This includes all drawings, sketches, graphics and internet sources.}
}
\def\@texttype{Seminararbeit}
-\newcommand\texttype[1]{\def\@texttype{#1}}
+\newtoggle{customtexttype}
+\newcommand\texttype[1]{\def\@texttype{#1}\toggletrue{customtexttype}}
\def\@course{}
\newcommand\course[2]{\setkeys{lec}{lectype=#1}\def\@course{#2}}
\def\@instructor{}
diff --git a/macros/latex/contrib/univie-ling/tex/univie-ling-thesis.cls b/macros/latex/contrib/univie-ling/tex/univie-ling-thesis.cls
index 364d8519a1..8fc0eab3aa 100644
--- a/macros/latex/contrib/univie-ling/tex/univie-ling-thesis.cls
+++ b/macros/latex/contrib/univie-ling/tex/univie-ling-thesis.cls
@@ -31,7 +31,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{univie-ling-thesis}[2020/11/11 v1.13 Univie Linguistic Theses (JSp)]
+\ProvidesPackage{univie-ling-thesis}[2021/09/01 v1.14 Univie Linguistic Theses (JSp)]
\RequirePackage{xkeyval}
diff --git a/macros/latex/contrib/univie-ling/tex/univie-ling-wlg.cfg b/macros/latex/contrib/univie-ling/tex/univie-ling-wlg.cfg
index 5e6bfc32a7..09e106800f 100644
--- a/macros/latex/contrib/univie-ling/tex/univie-ling-wlg.cfg
+++ b/macros/latex/contrib/univie-ling/tex/univie-ling-wlg.cfg
@@ -8,7 +8,7 @@
% General Linguistics
\edboardGL{Markus P\"ochtrager}
% Applied Linguistics
-\edboardAL{Mi-Cha Flubacher, Jonas Hassemer \& Sabine Lehner}%
+\edboardAL{Mi-Cha Flubacher \& Florian Grosser}%
% Historical Linguistics
\edboardHL{Stefan Schumacher}
diff --git a/macros/latex/contrib/univie-ling/tex/univie-ling-wlg.cls b/macros/latex/contrib/univie-ling/tex/univie-ling-wlg.cls
index c9b73cc905..972b527319 100644
--- a/macros/latex/contrib/univie-ling/tex/univie-ling-wlg.cls
+++ b/macros/latex/contrib/univie-ling/tex/univie-ling-wlg.cls
@@ -32,7 +32,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{univie-ling-wlg}[2020/11/11 v1.13 WLG journal layout (JSp)]
+\ProvidesPackage{univie-ling-wlg}[2021/09/01 v1.14 WLG journal layout (JSp)]
%% ============================================================
diff --git a/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl b/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
index 9fe923c154..74b501dacc 100644
--- a/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
+++ b/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
@@ -113,7 +113,6 @@ $mirrors = {
'https://packages.oth-regensburg.de/ctan/' => 1,
},
'Greece' => {
- 'http://ftp.ntua.gr/mirror/ctan/' => 1,
'https://ftp.cc.uoc.gr/mirrors/CTAN/' => 1,
},
'Hungary' => {
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb b/systems/texlive/tlnet/tlpkg/texlive.tlpdb
index 015c2f1e52..3ea371ed70 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb
@@ -26,11 +26,11 @@ depend container_split_src_files/1
depend frozen/0
depend minrelease/2016
depend release/2021
-depend revision/60382
+depend revision/60395
name 00texlive.image
category TLCore
-revision 60382
+revision 60385
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
@@ -4452,7 +4452,7 @@ depend setting_available_architectures:aarch64-linux amd64-freebsd amd64-netbsd
name 00texlive.installer
category TLCore
-revision 60377
+revision 60384
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
@@ -77842,7 +77842,7 @@ catalogue-topics geometry context
name context-typescripts
category ConTeXt
-revision 60378
+revision 60395
shortdesc Small modules to load various fonts for use in ConTeXt
relocated 1
longdesc The package provides files offering interfaces to 33 publicly
@@ -77850,9 +77850,9 @@ longdesc available fonts (or collections of fonts from the same
longdesc foundry); each is available in a .mkii and a .mkiv version.
depend context
containersize 7436
-containerchecksum 2a43c9e3dd615462239ad4df6a32aaa825e911eaf3143aae8f38df0daf39f2cf9935e137af6b1017e3315229cff1339a68c60b8ea3911b6ff0d3717c4d277127
-doccontainersize 644
-doccontainerchecksum 464a1c546b5aa96eeb742c811569e4f833596269b3426a128f9049d882d9594cbbb33df3f6c57a4681e9f829d5a205b86c10520ee90cddd3d13de74aa76096c8
+containerchecksum c7795b867795af95c5220ab8d3bc659c8057283facfa43762739f6489e33307345a2eb65a46beadb2dbfeba9a99f089a5ac958474c2d5c81c2b0c62def7b93ab
+doccontainersize 648
+doccontainerchecksum c3077f18e53ce76243baa236194ab0dddcadbe78758ec9e5502a9f4317cab60bb8bc132123d38e7fb45be4fcc2d1952dd074ee3e29b43b0a48f8e4582fe78894
docfiles size=2
RELOC/doc/context/third/typescripts/README details="Readme"
RELOC/doc/context/third/typescripts/VERSION
@@ -80332,18 +80332,18 @@ catalogue-version 1.01
name covington
category Package
-revision 59266
+revision 60388
shortdesc Linguistic support
relocated 1
longdesc Numerous minor LaTeX enhancements for linguistics, including
longdesc multiple accents on the same letter, interline glosses
longdesc (word-by-word translations), Discourse Representation
longdesc Structures, and example numbering.
-containersize 8600
-containerchecksum a236775eecae63740ca8035ded2a58ffd84a61cbd71ccb0a5bd1eba530c709c26d91db08dbcdceb94e0e1e22e6552f645c5aa024efdf7d41d8caae3f853bfaf4
-doccontainersize 500844
-doccontainerchecksum e76c0cdde0381baea852974a5d191853dd5d32597564ab066be49b465a30a0db6fc167f7343c1b247cd5bb1d89ec893649e0a244a4d93a7598ab63160303d141
-docfiles size=136
+containersize 8684
+containerchecksum f1eb01e6c178fe46c73b119ae05abd8defc28e2e3f8778a364917540961d530d09ce7b5fb3dde7a82882a8c526dbecae369edc0aa1223207ae322e9e9b915a85
+doccontainersize 509468
+doccontainerchecksum 0793a3fb9c025a139420eeaf4cd5c6b2c119f1c6efbe767ec19fdb28cb184e3fb838e3d8a5fa741de709b637fbaf3c62803f1075b3768c60dc5fc169476e6b51
+docfiles size=138
RELOC/doc/latex/covington/README details="Readme"
RELOC/doc/latex/covington/covington.pdf details="Package documentation" language="en"
RELOC/doc/latex/covington/covington.tex
@@ -80355,7 +80355,7 @@ catalogue-contact-repository https://github.com/jspitz/covington
catalogue-ctan /macros/latex/contrib/covington
catalogue-license lppl1.3
catalogue-topics linguistic
-catalogue-version 2.6
+catalogue-version 2.7
name cprotect
category Package
@@ -99102,21 +99102,21 @@ catalogue-topics notes editorial
name easybook
category Package
-revision 60330
+revision 60393
shortdesc Typeset Chinese theses or books
relocated 1
longdesc Easybook is a minimalist style template based on the ctexbook
longdesc book document class.
-containersize 17208
-containerchecksum 5b8f71fb3db3e38832fed4155c3032fc4b9fb70b568ddc1c15531c909ddba020a9d0159b5ed8f0ca20bc72fae1b01ff18ceed2ad70d0385bc8f00f0534c67fa2
-doccontainersize 611448
-doccontainerchecksum 71f246efcafd244e5b0bc81daa59a4fc11b4c3b642014accb694e0a3758530d5d5f75d5162731fa70a2706427dbdbdf6ae62b8d96bb5259ca0827e7f2c8c7a9a
+containersize 17276
+containerchecksum 05bcac6ff6ff43b6cf56fd43d76f65cc2371be67d2543024752bc8f5790f1699604a813baecb69141b59fd071878cb1dd0f4cdcf3229931a6642643592ad8fff
+doccontainersize 611480
+doccontainerchecksum 11efcd3165b59674cd9869d837767aa7ce75f5aa40d19719425e05b45ad10e11fc53050900252161eed4b5ea17c45ffd380ce0344e4c631e231880b791db3a4a
docfiles size=166
RELOC/doc/latex/easybook/README.md details="Readme"
RELOC/doc/latex/easybook/easybook.pdf details="Package documentation" language="zh"
RELOC/doc/latex/easybook/easybook.tex
-srccontainersize 17264
-srccontainerchecksum b519a3430dc20bd851dd62092055ce47844497f436d74807fa73211feb43c91bbad8c6aa302aef4d8bf075e03fa071bbf1a590f1cfa2d3b18ba6add9374b37d8
+srccontainersize 17312
+srccontainerchecksum 988547f1b0f91db227cd96fa9f2011d7fe80eb9e5077900488ecdb273a87e75c21eda1eef35509073ad8b86eef5102398d9924896eb77caa3dd2e066b4574076
srcfiles size=21
RELOC/source/latex/easybook/easybook.dtx
RELOC/source/latex/easybook/easybook.ins
@@ -99129,7 +99129,7 @@ catalogue-contact-repository https://gitee.com/texl3/easybook
catalogue-ctan /macros/latex/contrib/easybook
catalogue-license lppl1.3c
catalogue-topics book-pub class chinese expl3
-catalogue-version 1.29e
+catalogue-version 1.29h
name easyfig
category Package
@@ -190390,7 +190390,7 @@ catalogue-version 1.4b
name markdown
category Package
-revision 60182
+revision 60394
shortdesc A package for converting and rendering markdown documents inside TeX
relocated 1
longdesc The package provides facilities for the conversion of markdown
@@ -190403,11 +190403,11 @@ longdesc down and rewritten for the needs of the package. Lunamark
longdesc provides speedy markdown parsing for the rest of the package.
longdesc On top of Lunamark sits code for the plain TeX, LaTeX, and
longdesc ConTeXt formats by Vit Novotny.
-containersize 33684
-containerchecksum 72afe1bd3d835001af6d2ff178d1ed4d846bba03119225258a776e6b57897377de0b8227b5f538d8b1739dd2c1e48194c808e4856898e592529735a6b745b495
-doccontainersize 778980
-doccontainerchecksum 51e6bc4cfeb602648b121f300ccc3e0d0c5291b15a1d8df3aac89c4f53184142b35d31835ccc5ce96bf04443950c9bdc2e56c8a2a19bee395c6928b8ada0da87
-docfiles size=349
+containersize 33808
+containerchecksum e821b4097bc93f5fc93dfd6133bb8a54a9651cb96ef775b9a26e043350642152570ed85187a552ad57dec105a30051ba480c6b559d133af5b081fed255259edd
+doccontainersize 775388
+doccontainerchecksum 69446b572f5053ab969dbd0eeee1d1a4e488e576066ae71f9fc14e39dfb79e5b79c4c06d9a936b8496fb02d791ea35b73a3481a22065118e5bfd2cf8f9a5d9f3
+docfiles size=340
RELOC/doc/context/third/markdown/examples/context.tex
RELOC/doc/context/third/markdown/examples/example.md
RELOC/doc/context/third/markdown/examples/scientists.csv
@@ -190420,13 +190420,13 @@ docfiles size=349
RELOC/doc/latex/markdown/examples/example.md
RELOC/doc/latex/markdown/examples/latex.tex
RELOC/doc/latex/markdown/examples/scientists.csv
-srccontainersize 76040
-srccontainerchecksum 94ad915bff765de9457a4d70e52f077514bad7b77afd799a4a560907da3a45098895784bd080f7f24e23724c7b86ebb0c509362aaab99b9d323a15f7e6a51dfb
+srccontainersize 76152
+srccontainerchecksum 5a75eab449d43007fc1cd6c43539903042afc36bd75e482a1f9dbfdf83a6d655642d089fda54ac2a73f0cbc9940d290a7562771c4b8551dd5e8c0a4b8722a7dd
srcfiles size=130
RELOC/source/generic/markdown/docstrip.cfg
RELOC/source/generic/markdown/markdown.dtx
RELOC/source/generic/markdown/markdown.ins
-runfiles size=54
+runfiles size=55
RELOC/scripts/markdown/markdown-cli.lua
RELOC/tex/context/third/markdown/t-markdown.tex
RELOC/tex/generic/markdown/markdown.tex
@@ -190442,7 +190442,7 @@ catalogue-contact-repository https://github.com/Witiko/markdown
catalogue-ctan /macros/generic/markdown
catalogue-license lppl1.3
catalogue-topics markup
-catalogue-version 2.10.0
+catalogue-version 2.10.1
name marvosym
category Package
@@ -254968,7 +254968,7 @@ catalogue-version 0.22a
name pst-geo
category Package
-revision 46273
+revision 60387
shortdesc Geographical Projections
relocated 1
longdesc The package offers a set of PSTricks related packages for
@@ -254984,11 +254984,11 @@ longdesc provided, in an (internally) compressed format. Decompression
longdesc happens on-the-fly as a document using the data is displayed,
longdesc printed or converted to PDF format. A Perl script is provided
longdesc for the user to do the decompression, if the need should arise.
-containersize 24297428
-containerchecksum 2b559409de635cd04e9b128bf44ef5f92ee765d4ccaf2132e3014d9a75ee61867de1724de2c36752bcc600014767f058c3799a5387aa4029268d5fa9dff4e0e9
-doccontainersize 63308472
-doccontainerchecksum 762140a38d7f39875d2d4d25aff57187d32daf017d5be19f7fde14c482d9128c4b2e911f67446cd47a28cd655ebcffe485dc4b6326d41bf3b0693072647cac0e
-docfiles size=15522
+containersize 24297652
+containerchecksum 4e97b80679129df2cf52a8998e1b131b7ed5ebd21046219843af1ca81272a84c3a8fca72810622a7215385207eb541cd2bfac65b791920da61c233f969423c3b
+doccontainersize 63447148
+doccontainerchecksum 7dde4c2584eb3c538a21fadfb9c49db02ad190b0778b64a4a51be7b777b4971302151a4f6ee7c5fb29f6c156c34a420b1734471f550d541bd2eb87877ab1543e
+docfiles size=15559
RELOC/doc/generic/pst-geo/Changes
RELOC/doc/generic/pst-geo/README details="Readme"
RELOC/doc/generic/pst-geo/examples/Africa.tex
@@ -255011,7 +255011,7 @@ docfiles size=15522
RELOC/doc/generic/pst-geo/pst-geo-doc.tex
runfiles size=6064
RELOC/dvips/pst-geo/pst-geo.pro
- RELOC/tex/generic/pst-geo/data/README
+ RELOC/tex/generic/pst-geo/data/README.data
RELOC/tex/generic/pst-geo/data/Staedte3dJG.tex
RELOC/tex/generic/pst-geo/data/africa-bdy_II.dat
RELOC/tex/generic/pst-geo/data/africa-cil_II.dat
@@ -255069,7 +255069,7 @@ runfiles size=6064
catalogue-ctan /graphics/pstricks/contrib/pst-geo
catalogue-license lppl
catalogue-topics cartography pstricks
-catalogue-version 0.06
+catalogue-version 0.07
name pst-geometrictools
category Package
@@ -288898,7 +288898,7 @@ catalogue-version 0.1
name tabularray
category Package
-revision 60140
+revision 60389
shortdesc Typeset tabulars and arrays with LaTeX3
relocated 1
longdesc LaTeX tables are implemented using TeX commands such as
@@ -288913,15 +288913,15 @@ longdesc typeset the entire table. Under the premise of being compatible
longdesc with the basic syntax of LaTeX2 tables, this macro package will
longdesc completely separate the content and style of the table, and the
longdesc style of the table can be completely set in keyval way.
-containersize 30172
-containerchecksum aa402e878a350c197419b2cd77688a8d7d7342962b74be34ad7ce5023b309ba620443730e91873cdeed6eafc0c558b6ed14d0f1f2d58e6b77aa042020d243ba6
-doccontainersize 573668
-doccontainerchecksum 29223d5c5c5a83c6d68b2a7e384dbdb309b70dd95cd884f8a6cede0720a3596764e28406dc7fdeede2cfe8389a9d07b306af5204b240ead93e062196c8986607
-docfiles size=185
+containersize 32116
+containerchecksum 1732f96f152683896928d6986fcdcc9a713fc5d8a603cc86d388ef1360d7f513f7188fddcc2591d08442e41b0d1b2934052fe627a78c9974de5a7a5be11d43f5
+doccontainersize 611736
+doccontainerchecksum 7b5d76202d08b6eac77d573f545c2b9e766321ed4e8351f885020f2f5dab323cba6c1926064e2f779d31a85cebf346873d68e3d451f964fc40c9858ed1a92a7d
+docfiles size=198
RELOC/doc/latex/tabularray/README details="Readme"
RELOC/doc/latex/tabularray/tabularray.pdf details="Package documentation"
RELOC/doc/latex/tabularray/tabularray.tex
-runfiles size=87
+runfiles size=95
RELOC/tex/latex/tabularray/tabularray-2021.sty
RELOC/tex/latex/tabularray/tabularray.sty
catalogue-contact-bugs https://github.com/lvjr/tabularray/issues
@@ -288931,7 +288931,7 @@ catalogue-contact-support https://github.com/lvjr/tabularray/discussions
catalogue-ctan /macros/latex/contrib/tabularray
catalogue-license lppl1.3
catalogue-topics table table-long expl3
-catalogue-version 2021M
+catalogue-version 2021N
name tabulary
category Package
@@ -301810,7 +301810,7 @@ docfiles size=376
name texlive-scripts
category TLCore
-revision 60377
+revision 60385
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.
@@ -301818,10 +301818,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 108292
-containerchecksum 48eaa0135e83a11e6fa26782d31382965edd7d002d7e8f7e59f00a9a354f8adc51d0c708849010fe9b0c5d8ea8896376e8d47076a88a2157618d46194e2abff8
-doccontainersize 399980
-doccontainerchecksum 1eeca4fe5dc2a69d24cdd01b18cdcf357abed1752c9815148dbc43422918f30f9818d1b0fa0e667ab6b787e308e04c58f456cdcd0f4f2571a607421d5c666286
+containersize 108280
+containerchecksum e6b87f999fc6f26a98e8e314b9070bcdd14ccfda16c7de0f0ee4688740d30d730228affbc067d8e09aa1bba93bb48c04743ff98ff360097bcde6cf4afebdfc17
+doccontainersize 400048
+doccontainerchecksum d80520666af17b6b3167d9dd1e3f4a7407aea9da675d73ea4d3cc8dc0d2ea2435d80fa6b265624a0389d68dcc4dda398210376566b2ddec99ac9c12ba3d4c3c4
docfiles size=495
doc.html
texmf-dist/doc/man/man1/fmtutil-sys.1
@@ -324175,7 +324175,7 @@ catalogue-topics font-ttf korean
name uni-titlepage
category Package
-revision 60254
+revision 60390
shortdesc Universal titlepages with configuration options and predefined styles
relocated 1
longdesc Creation of title pages is something most authors should not
@@ -324185,11 +324185,11 @@ longdesc the title instead of only one -- at least five are typical for
longdesc a thesis! --, it also provides a bunch of predefined titlepage
longdesc styles with several standard elements, and optionally
longdesc additional elements.
-containersize 9636
-containerchecksum e1fdaaaf9b74b7e9b5bed491c91100b833b48eabdca8951d8585be73d610767981d6bbe20f5b3272868aa52de7e38f2114664ca2002ff32aaab91adc684c7557
-doccontainersize 1455788
-doccontainerchecksum 1d6b89f4d52bff541e2df23421bca8934ad47d4f98379717a45596f3dd629e686e2995d76d4137e75c32e53c4a236a9a94ba5fd0f1b9cb72cd26b77db9cd8a75
-docfiles size=444
+containersize 10268
+containerchecksum 6d3660d832e7f06b0e344ae2677e0a0859d4032a02a18eb719b9ba8ea16079028eefea28e726230912e85df04268b664dfc1bdb1176f3bf10b5faa316e3f492e
+doccontainersize 1595708
+doccontainerchecksum 00bb841f79b5b2fe88f8721b9b81428d85167cc2370b61f726bb3748fd3260aefadf4dffb43c83a21a729343ec752ec7a5c69ace1fc2bd1e2ef7c5237b4a3af9
+docfiles size=477
RELOC/doc/latex/uni-titlepage/LICENSE.md
RELOC/doc/latex/uni-titlepage/README.md details="Readme"
RELOC/doc/latex/uni-titlepage/titlepage-DHBW.pdf details="Example of use (style DHBW)"
@@ -324214,15 +324214,17 @@ docfiles size=444
RELOC/doc/latex/uni-titlepage/titlepage-TU-DD.tex
RELOC/doc/latex/uni-titlepage/titlepage-TU-HH.pdf details="Example of use (style TU-HH)"
RELOC/doc/latex/uni-titlepage/titlepage-TU-HH.tex
+ RELOC/doc/latex/uni-titlepage/titlepage-UKoLa.pdf
+ RELOC/doc/latex/uni-titlepage/titlepage-UKoLa.tex
RELOC/doc/latex/uni-titlepage/titlepage-WWUM.pdf details="Example of use (style WWUM)"
RELOC/doc/latex/uni-titlepage/titlepage-WWUM.tex
RELOC/doc/latex/uni-titlepage/uni-titlepage.pdf details="Package documentation"
-srccontainersize 22368
-srccontainerchecksum a9bafa5f4e960c9e3777c21022e72a7ca1fa4bbf2b4104e037e5169546a8d2da874968f95b21b495e5d322b092c8edad68db545faa49b2827160940850cb77f3
-srcfiles size=30
+srccontainersize 23620
+srccontainerchecksum ece1069eecf5accab38571d6eecb71123b359f3514164b89d953b642ba5dd898f691831945b9959182bba684b9764b5c0c32691754e7862b2af5d8d7ad2e613c
+srcfiles size=33
RELOC/source/latex/uni-titlepage/uni-titlepage.drv
RELOC/source/latex/uni-titlepage/uni-titlepage.dtx
-runfiles size=26
+runfiles size=29
RELOC/tex/latex/uni-titlepage/title-DHBW.def
RELOC/tex/latex/uni-titlepage/title-JT-Aufsaetze.def
RELOC/tex/latex/uni-titlepage/title-JT-Geschichte.def
@@ -324234,6 +324236,7 @@ runfiles size=26
RELOC/tex/latex/uni-titlepage/title-Spacer.def
RELOC/tex/latex/uni-titlepage/title-TU-DD.def
RELOC/tex/latex/uni-titlepage/title-TU-HH.def
+ RELOC/tex/latex/uni-titlepage/title-UKoLa.def
RELOC/tex/latex/uni-titlepage/title-WWUM.def
RELOC/tex/latex/uni-titlepage/uni-titlepage.sty
catalogue-contact-announce https://github.com/komascript/uni-titlepage/releases
@@ -324244,7 +324247,7 @@ catalogue-contact-repository https://github.com/komascript/uni-titlepage.git
catalogue-ctan /macros/latex/contrib/uni-titlepage
catalogue-license lppl1.3c
catalogue-topics titlepage
-catalogue-version 0.6
+catalogue-version 0.7
name uni-wtal-ger
category Package
@@ -325099,7 +325102,7 @@ catalogue-topics font font-otf font-type1 font-sans
name univie-ling
category Package
-revision 56913
+revision 60391
shortdesc Papers, theses and research proposals in (Applied) Linguistics at Vienna University
relocated 1
longdesc This bundle provides LaTeX2e classes, BibLaTeX files, and
@@ -325113,11 +325116,11 @@ longdesc context. The classes can also be used for General and
longdesc Historical Linguistics as well as for other fields of study at
longdesc Vienna University. In this case, however, some settings may
longdesc have to be adjusted.
-containersize 131944
-containerchecksum d4c0a0d760fc6d9c5fb2a56a7040b37a2fd5e20c13761374fb8e83763e0e01090ba3079a589cd6544c707148c17c389e377598f420d73cb942da591ddeffb943
-doccontainersize 2110564
-doccontainerchecksum ded1f91665ad5a8e13bdbc5b01fad86f73efa77d144b946f8049fa6876b26cf237f645250137899e06d93bb19117120be9fd8d9651857bcc0a19df49ce87b664
-docfiles size=720
+containersize 131880
+containerchecksum 552538a31ee6371e075676b771a2128c58d6afe0047fff66e5dc2838191a31d6184bd99464da7941cead25a4f330a452d65624335088865e99e82961220f39dd
+doccontainersize 2120656
+doccontainerchecksum a74d06e6a7585482317e9b0c9e143380eae8d3857a0ff98b05ec459b9394fd5c8aa4a196083b6bcbe2220e34ed8a81b2b9fe060a575e91385553e21555610058
+docfiles size=729
RELOC/doc/latex/univie-ling/README details="Readme"
RELOC/doc/latex/univie-ling/templates/template-expose-deutsch.pdf
RELOC/doc/latex/univie-ling/templates/template-expose-deutsch.tex
@@ -325158,7 +325161,7 @@ catalogue-contact-repository https://github.com/jspitz/univie-ling
catalogue-ctan /macros/latex/contrib/univie-ling
catalogue-license lppl1.3
catalogue-topics linguistic class dissertation article-like misc-paper std-conform
-catalogue-version 1.13
+catalogue-version 1.14
name unizgklasa
category Package
@@ -340722,7 +340725,7 @@ runfiles size=2
name xmpincl
category Package
-revision 15878
+revision 60392
shortdesc Include eXtensible Metadata Platform data in pdfLaTeX
relocated 1
longdesc The XMP (eXtensible Metadata platform) is a framework to add
@@ -340735,17 +340738,17 @@ longdesc embed licensing information in the files he created. The
longdesc license the author chose is one of the Creative Commons
longdesc licenses, and their web-site offers this information in a valid
longdesc XML-file, suitable for direct inclusion.
-containersize 1828
-containerchecksum 8d9a895a1efe8ce5eac190b8242c7f3e3bff7e433e1336aa7143894fbc5691c7b4fd791bae67fcefe97d16ff131b533f8b0c629580d7b5f9420e9216e932b860
+containersize 1808
+containerchecksum 05d6369c261fb856b70707396665a6b8ab249ad0667e221212bceb1ee5f0e47e012e4d6cf0b4078947250320c7c1c38acd6581e6e3b2a3739af1812ed5bf9d0b
doccontainersize 98416
-doccontainerchecksum 2757de1bfcbfe9df02d5e667564b1a69205ab86c31f7bcc8ec3f37db0fb1a1f4bb21d7360dbfd771aeafaffa4599becc801df81e339b6f49adafeb38bc1ff5af
+doccontainerchecksum 90637b45ab4816b770212721576361404612cac8babbbdfbd336d955d2cef9651f016eada1d5eff5348464727c2c690d2b91356812484d8cbe2540a67a7a34e7
docfiles size=31
RELOC/doc/latex/xmpincl/README details="Package Readme"
RELOC/doc/latex/xmpincl/license.xmp
RELOC/doc/latex/xmpincl/xmpincl.pdf details="Package documentation"
-srccontainersize 6572
-srccontainerchecksum 92cdd556f60d8a4186f64800ef5c8a27e331e394ac0120d3e07065688d454ea821839eaaf167bb15980223552160e161cb3c559feffbc4d6657af1019f7c14a2
-srcfiles size=5
+srccontainersize 6636
+srccontainerchecksum 7d8f691bd3fa45f3f5a66a489c01d38f4e23c65e03481afa06142656e879f501e9a52cf3a755d914924df00b8cffe0a4e7db7ed77e7c0bd6ce2e791a38a7aef5
+srcfiles size=6
RELOC/source/latex/xmpincl/xmpincl.dtx
RELOC/source/latex/xmpincl/xmpincl.ins
runfiles size=1
@@ -340753,7 +340756,7 @@ runfiles size=1
catalogue-ctan /macros/latex/contrib/xmpincl
catalogue-license gpl
catalogue-topics metadata pdf-feat
-catalogue-version 2.2
+catalogue-version 2.3
name xmuthesis
category Package
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
index 3c44ed434c..24b6c45057 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
@@ -1 +1 @@
-9a6eebab3a08428b2b79dd85650316d1 texlive.tlpdb
+c7e297187782be8c86551ff401d8d1c4 texlive.tlpdb
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
index b8c00a6528..3cf6178fa1 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
@@ -1 +1 @@
-cc4af6ece6580e5eff45b2d66500fd7bf0353c9343898311fd0218b270486add3bc7867ae0414418ad94b85e4f89702765df266be1a0d4f9988af742e925b87a texlive.tlpdb
+63e5f2183989738fcc9c24f1fe21ba16a8c54b58b339ec4396247cb1b0c08119e1b15a979f42557d80174e90d9e5e7f92a28fa02fb24def932c6e573eec56a5b texlive.tlpdb
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
index 6b3c0651fc..5772a8023f 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-----
-iQEcBAEBCgAGBQJhLsOPAAoJEEzhh34ZQ4xwTicH/R9EyP9xdVF3gW4LZVlwYxfX
-JvHB5Yn0wdtP0FVbvlzNfACByb7GW3Kk1YbVEPEpdgpU/3L1T2xRjXe+D13vNhyJ
-UoI4gAAluQEGd4jm6Rgt+4pkeQ0E+QTZ3LgYpSecYRTMJUbu5YQKT/OFSaKklPaZ
-4uH0lK8rpkq7L1NisnA0dvxG0OXjaFmFQ/JbW1p0gIkeRKbOPPAmxYAxEuO5xhX0
-ndANDUMOprg7LJWfQ7Qz6bBxsDvOqULgeA8alUoH2AeQILKtNJyAFyACIUuL1ItX
-HzCNqLAN4zLqFMM1puypuiq7WjZsC917jy1+eZKSdq1YPNtfDJyYFtHIXuF3Uyk=
-=9jJ6
+iQEcBAEBCgAGBQJhMBMjAAoJEEzhh34ZQ4xwMKAH/jN7garAy6ileroRSS9c1HKp
+T5qttF8LeUbAco+vJjr//IVHSPw4ErPy7tJV5MZnVG9uB0IytKbpIP1ZZ+UIsnyE
+QIQhRqfVfro/nQ8jP6mxs/8ajT9P6hwhVvFcbQt04jWG+9UYDTp/e34SdtiygZLG
+bj+bTN1xbtQJtSHnf7szTtQj4kjC23Ndx6Fxj7jU3yJSmC3mZ6PU19VG7MQeycea
+NCzNkkCvVF4XdDbTbDHh0J3Oo7OHdyu+SjQ1IftsAMK3PU6c58FgNlZSKsJy+xVD
+hY00mbWZ4ZRWOh/NBr3HwA4dlhbNjNt5y7lAYzqZEQGx+ka4tEEPqb26nI3GnYQ=
+=HhxA
-----END PGP SIGNATURE-----
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
index 7a240821d2..af808c5774 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
Binary files differ
diff --git a/systems/win32/TLW64/00README.TLW64 b/systems/win32/TLW64/00README.TLW64
new file mode 100644
index 0000000000..afa596823e
--- /dev/null
+++ b/systems/win32/TLW64/00README.TLW64
@@ -0,0 +1,53 @@
+ How to install 64bit binaries for TeX Live on Windows
+
+
+In the following, $INSTALLDIR is $SELFAUTOPARENT in the TeX Live,
+that is, the parent directory of "texmf-dist". Actually the
+directory $INSTALLDIR is shown by a command:
+
+ kpsewhich --var-value=SELFAUTOPARENT
+
+
+(1) Expand the file tl-win64.zip in $INSTALLDIR.
+ In the case of update, remove all files in $INSTALLDIR/bin/win64
+ before expanding tl-win64.zip, because it is possible that
+ some files are deleted in a new tl-win64.zip.
+
+(2) After expanding tl-win64.zip in $INSTALLDIR,
+ change related command PATH from
+ $INSTALLDIR\bin\win32
+ to
+ $INSTALLDIR\bin\win64;$INSTALLDIR\bin\win32
+
+ Note that the following 32bit binaries in $INSTALLDIR\bin\win32
+ are still used on WOW64:
+
+ jbig2.exe latexindent.exe psviewer.exe tex2xindy.exe
+ texindy.exe tlaunch.exe tlshell.exe unzip.exe
+ xindy.exe xindy-lisp.exe xindy.mem zip.exe
+
+ Moreover, tlmgr.bat does not exist in $INSTALLDIR\bin\win64
+ due to an obvious reason.
+
+ Thus $INSTALLDIR\bin\win32 is necessary "after"
+ $INSTALLDIR\bin\win64.
+
+ If there are problems in 64bit binaries, it is easy to recover
+ the original TeX Live win32, by changing back the PATH:
+ $INSTALLDIR\bin\win64;$INSTALLDIR\bin\win32 --->
+ $INSTALLDIR\bin\win32
+
+(3) Ghostscript is assumed to be 64bit. The dvisvgm.exe searches
+ for gsdll64.dll by reading registry, and gsftopk.exe searches
+ for gsdll64.dll in the command PATH. Therefore users should
+ install 64bit Ghostscript and set the command PATH for the
+ Ghostscript. However, don't define TEXLIVE_WINDOWS_EXTERNAL_GS
+ in texmf.cnf, because the preinstalled 32bit Ghostscript is
+ also used in several cases.
+
+ From TeX Live 2020, the version of 64bit binaries will be
+ synchronized with that of 32bit binaries. It is expected that
+ common format files can be usable for 32bit/64bit binaries.
+
+--
+Akira Kakuto
diff --git a/systems/win32/miktex/tm/packages/next/pr.ini b/systems/win32/miktex/tm/packages/next/pr.ini
index eaab09b5d4..5a7db5ccf4 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=1630440914
+date=1630527311
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=5d1f82655a41bd897be7e6aec90afe49
+lstdigest=6b70255c5c6011264995a84df6d1932a
numpkg=4721
relstate=next
-version=7913
+version=7914
;;;;This configuration file is signed by a MiKTeX maintainer. The signature follows.
;;;;-----BEGIN MIKTEX SIGNATURE-----
-;;;; signature/miktex: N4iuUsW1g/9AsHl03QckAVd9PoA7/j/+8WAy072QhZKurB5rqoKtGwPa+pD3T3U2Wxp/5RSFNxInLPidvUn/yikmPbR4/CZPqfozWPbJYpLe3DezvZgxOU1yyiMx6L9EYF3KcdMG9N2gOH/vQAxi40uoGhgYlhArjZyyXmqE+put+//3F6gvlefqJtMB9Z/mhRaS95TfteJzGVygl7xrI5oE+pD17Ds0E1uBx+3YEWHmv0mILVg5zipqA29D3/L/nCbNbHDkFXLzXNJgVpjNvmsiQdaq0QvOeudppUHWxlG44oMefKoBzopbIOsHmuiB+uO6beZYXN8u8quXiw+lMA==
+;;;; signature/miktex: aDkdT2AsFjSv1Z+Sz2U7X3KKf5x0UDG2vxg9Qq5+07FJfI47crjw9L22i49AhIpc5XUose4QE5EOTZ0QAuM+8lJ6noFZ03rPl7j969bpT3PTlCIx/mZUcAipWy23WPkr8DKUSCOSYGBVrvKVvNQZkArB6Yr+7sYtzOOJ4Z0avdTN/JLrI/mxyZ6PZuuvfPgdhDB1fFchYw7DaN33hjc47NBZWhGF2fslWvbF3jVF9g4TU5YA4ibR6uEfdoJfqhEKg4RaAXKpLbGsvEv/1QGE1vWKFuRBcTnk1+mzu3ODTVdTioS3z45O7qK9HrhCnf0Z7IxgLQrnDTxJK+3qrsTm8A==
;;;;-----END MIKTEX SIGNATURE-----
diff --git a/systems/win32/miktex/tm/packages/pr.ini b/systems/win32/miktex/tm/packages/pr.ini
index 083ff20abd..16de1bb5f2 100644
--- a/systems/win32/miktex/tm/packages/pr.ini
+++ b/systems/win32/miktex/tm/packages/pr.ini
@@ -1,13 +1,13 @@
[repository]
-date=1630440681
+date=1630527074
lastupd=animate animate__doc animate__source biblatex-gb7714-2015 biblatex-gb7714-2015__doc biblatex-gb7714-2015__source biblatex-lncs biblatex-lncs__doc biblatex-lncs__source cascade cascade__doc cascade__source charissil charissil__doc easybook easybook__doc easybook__source etl etl__doc etl__source
-lstdigest=34926f66378d4f7cb4b0f6623fe8cabc
+lstdigest=1973c9fce83cb992cab45e795d2b0a2e
numpkg=4721
relstate=stable
-version=7913
+version=7914
;;;;This configuration file is signed by a MiKTeX maintainer. The signature follows.
;;;;-----BEGIN MIKTEX SIGNATURE-----
-;;;; signature/miktex: IM9igIHN4Qu4NPt5m4TAbr7lDcX49/Vobe8u5bBM83mtSeUkPBou/dyRbTo/c0FtcxAPjAagzUvBdkhAFprYs3N5tRDjhJQRLD1tKBY3d8LlAmr1RxGXupLoCptpGLtIUpYzh8hMc/HTm1grZEVjNP8xJexmZ4tSI3s/q2pw4qFRJMQG4VzA5G7s7iYAN/ewUM5R5cyzpZAgiF6kZTendQKwEhf7gx1PLr3RlgylnCrDzegUVPSRCho3VW+kLo/niWV/z8Jik0CXUkNf9+tF/9cUVy7L1v4l0iY3E0OdZDJTDjCwjwIynSB7wApToi4wyV3KLAQjZh4GQ+Y06kLUsA==
+;;;; signature/miktex: jxMC1Ep9SXWBGflwa5/VKcbdRj2nVNsDISYDB8xDqEk/zuhKkw43L3lSxldcCEJvrf4ENpEJzwkaX+AlcAWmwYdjFJHHMlAq7EOVL9ByzFd27BLw3NNV6kQmKI/zhVpMzcCTVnsfO5KQAReWlOKqxupoXnovSrvuRIeaAjxkigAXKFvCW/ggYLFvU03g54Hm55/5GEjenhCRhxEagyP6m7IunsMD8s5DJCwE6Welq3R41gfB/SdDNiHvrN5KLIP02jp7sBvBAd/ENDVd0uPYMLkGwE+C7JyBKvGi+DO4h0At7KfolIw1niCIjf2faCt+Gx3Q2w/LusKm+D8Aay1NnA==
;;;;-----END MIKTEX SIGNATURE-----
diff --git a/timestamp b/timestamp
index 125fdf2e17..fde4ebceb7 100644
--- a/timestamp
+++ b/timestamp
@@ -2,4 +2,4 @@
# The source CTAN of this site's material:
dante.ctan.org
# The year-month-day-hour-minute of this site's material:
-2021-09-01-02-02
+2021-09-02-02-02