CTAN sync 202104090302

57 files changed, 4087 insertions, 2145 deletions

diff --git a/FILES.byname b/FILES.byname
index 3355a98936..df08f05764 100644
--- a/FILES.byname
+++ b/FILES.byname
@@ -5087,7 +5087,7 @@
 1990/10/02 |       5440 | dviware/vutex/vaxvms.hlp
 1990/10/02 |        812 | dviware/vutex/vaxvms.ins
 1990/10/02 |     127576 | dviware/vutex/vutex.web
-2021/04/07 |     158105 | FILES.last07days
+2021/04/08 |     103868 | FILES.last07days
 2020/08/14 |     104065 | fonts/academicons/academicons.pdf
 2020/08/14 |      17247 | fonts/academicons/academicons.sty
 2020/08/14 |       6546 | fonts/academicons/academicons.tex
@@ -172511,7 +172511,7 @@
 2012/05/03 |     406018 | install/macros/latex/contrib/lstaddons.tds.zip
 2011/03/25 |      10183 | install/macros/latex/contrib/ltxdockit.tds.zip
 2021/02/18 |     340623 | install/macros/latex/contrib/luacolor.tds.zip
-2021/02/18 |    4177298 | install/macros/latex/contrib/lwarp.tds.zip
+2021/04/08 |    4221936 | install/macros/latex/contrib/lwarp.tds.zip
 2019/11/29 |     336437 | install/macros/latex/contrib/magicnum.tds.zip
 2009/09/03 |     125014 | install/macros/latex/contrib/makecmds.tds.zip
 2018/08/09 |     330020 | install/macros/latex/contrib/marginnote.tds.zip
@@ -189914,14 +189914,14 @@
 2020/01/13 |       6908 | macros/latex/contrib/apa6/samples/longsample.tex
 2020/01/13 |       6249 | macros/latex/contrib/apa6/samples/shortsample.tex
 2020/01/13 |     627172 | macros/latex/contrib/apa6.zip
-2021/04/06 |     144283 | macros/latex/contrib/apa7/apa7.dtx
-2021/04/06 |       6535 | macros/latex/contrib/apa7/apa7.ins
-2021/04/06 |     530991 | macros/latex/contrib/apa7/apa7.pdf
-2021/04/06 |       1278 | macros/latex/contrib/apa7/README.txt
+2021/04/08 |     144551 | macros/latex/contrib/apa7/apa7.dtx
+2021/04/08 |       6535 | macros/latex/contrib/apa7/apa7.ins
+2021/04/08 |     530896 | macros/latex/contrib/apa7/apa7.pdf
+2021/04/08 |       1278 | macros/latex/contrib/apa7/README.txt
 2020/06/20 |       5068 | macros/latex/contrib/apa7/samples/Figure1.pdf
-2021/04/06 |     196588 | macros/latex/contrib/apa7/samples/longsample.pdf
-2021/04/06 |      65352 | macros/latex/contrib/apa7/samples/shortsample.pdf
-2021/04/06 |     830645 | macros/latex/contrib/apa7.zip
+2021/04/08 |     196588 | macros/latex/contrib/apa7/samples/longsample.pdf
+2021/04/08 |      65352 | macros/latex/contrib/apa7/samples/shortsample.pdf
+2021/04/08 |     830595 | macros/latex/contrib/apa7.zip
 2008/12/09 |      58148 | macros/latex/contrib/apa/apa.cls
 2008/12/09 |      37023 | macros/latex/contrib/apa/apacls.html
 2008/12/23 |      15056 | macros/latex/contrib/apa/apacls.txt
@@ -196896,13 +196896,13 @@
 2021/04/07 |       4241 | macros/latex/contrib/easybook/doc/chapter1.tex
 2021/04/04 |       3872 | macros/latex/contrib/easybook/doc/chapter2.tex
 2021/04/03 |       2539 | macros/latex/contrib/easybook/doc/chapter3.tex
-2021/04/07 |     262451 | macros/latex/contrib/easybook/doc/easybook-demo.pdf
-2021/04/07 |       2629 | macros/latex/contrib/easybook/doc/easybook-demo.tex
-2021/04/07 |     425118 | macros/latex/contrib/easybook/doc/easybook.pdf
+2021/04/08 |     262454 | macros/latex/contrib/easybook/doc/easybook-demo.pdf
+2021/04/08 |       2644 | macros/latex/contrib/easybook/doc/easybook-demo.tex
+2021/04/08 |     438594 | macros/latex/contrib/easybook/doc/easybook.pdf
 2021/02/23 |        830 | macros/latex/contrib/easybook/doc/refs.bib
-2021/04/07 |      93059 | macros/latex/contrib/easybook/easybook.dtx
+2021/04/08 |      95417 | macros/latex/contrib/easybook/easybook.dtx
 2021/04/01 |       2497 | macros/latex/contrib/easybook/README.md
-2021/04/07 |     712481 | macros/latex/contrib/easybook.zip
+2021/04/08 |     726845 | macros/latex/contrib/easybook.zip
 2009/06/17 |      82589 | macros/latex/contrib/easy/doc/docbib.pdf
 2009/06/17 |      78378 | macros/latex/contrib/easy/doc/docbmat.pdf
 2009/06/17 |      99132 | macros/latex/contrib/easy/doc/doceqn.pdf
@@ -204340,15 +204340,15 @@
 1999/06/10 |        980 | macros/latex/contrib/lucold/t1hlos.fd
 1999/05/25 |        407 | macros/latex/contrib/lucold/test.tex
 2005/04/30 |      25682 | macros/latex/contrib/lucold.zip
-2021/02/18 |        719 | macros/latex/contrib/lwarp/lwarp_baseline_marker.eps
-2021/02/18 |         89 | macros/latex/contrib/lwarp/lwarp_baseline_marker.png
-2021/02/18 |    2669496 | macros/latex/contrib/lwarp/lwarp.dtx
-2021/02/18 |      32529 | macros/latex/contrib/lwarp/lwarp.ins
-2021/02/18 |      29001 | macros/latex/contrib/lwarp/lwarpmk.lua
-2021/02/18 |    3153568 | macros/latex/contrib/lwarp/lwarp.pdf
-2021/02/18 |       2947 | macros/latex/contrib/lwarp/lwarp_tutorial.txt
-2021/02/18 |       1624 | macros/latex/contrib/lwarp/README.txt
-2021/02/18 |    3608279 | macros/latex/contrib/lwarp.zip
+2021/04/08 |        719 | macros/latex/contrib/lwarp/lwarp_baseline_marker.eps
+2021/04/08 |         89 | macros/latex/contrib/lwarp/lwarp_baseline_marker.png
+2021/04/08 |    2713677 | macros/latex/contrib/lwarp/lwarp.dtx
+2021/04/08 |      32733 | macros/latex/contrib/lwarp/lwarp.ins
+2021/04/08 |      29001 | macros/latex/contrib/lwarp/lwarpmk.lua
+2021/04/08 |    3184136 | macros/latex/contrib/lwarp/lwarp.pdf
+2021/04/08 |       2947 | macros/latex/contrib/lwarp/lwarp_tutorial.txt
+2021/04/08 |       1624 | macros/latex/contrib/lwarp/README.txt
+2021/04/08 |    3645731 | macros/latex/contrib/lwarp.zip
 2006/09/11 |       4093 | macros/latex/contrib/lyx/sikumuna/article-sikumuna.layout
 2006/09/11 |        781 | macros/latex/contrib/lyx/sikumuna/README
 2006/09/11 |       1806 | macros/latex/contrib/lyx/sikumuna.zip
@@ -206228,13 +206228,13 @@
 1996/03/22 |      18862 | macros/latex/contrib/niceframe/umrandb.mf
 2015/01/17 |       1370 | macros/latex/contrib/niceframe/umrand.mf
 2015/01/17 |     287910 | macros/latex/contrib/niceframe.zip
-2021/03/23 |     584789 | macros/latex/contrib/nicematrix/nicematrix.dtx
-2021/03/23 |     426449 | macros/latex/contrib/nicematrix/nicematrix-french.pdf
-2021/03/23 |     159373 | macros/latex/contrib/nicematrix/nicematrix-french.tex
+2021/04/08 |     590475 | macros/latex/contrib/nicematrix/nicematrix.dtx
+2021/04/08 |     455133 | macros/latex/contrib/nicematrix/nicematrix-french.pdf
+2021/04/08 |     163392 | macros/latex/contrib/nicematrix/nicematrix-french.tex
 2021/01/07 |       1423 | macros/latex/contrib/nicematrix/nicematrix.ins
-2021/03/23 |    1183755 | macros/latex/contrib/nicematrix/nicematrix.pdf
+2021/04/08 |    1212783 | macros/latex/contrib/nicematrix/nicematrix.pdf
 2020/06/07 |       1005 | macros/latex/contrib/nicematrix/README.md
-2021/03/23 |    1717739 | macros/latex/contrib/nicematrix.zip
+2021/04/08 |    1776772 | macros/latex/contrib/nicematrix.zip
 2015/11/21 |        217 | macros/latex/contrib/nicetext/ANNOUNCE.txt
 2012/03/18 |     254582 | macros/latex/contrib/nicetext/demo/arseneau.pdf
 2011/09/14 |         10 | macros/latex/contrib/nicetext/demo/iso.txt
@@ -230964,20 +230964,20 @@
 2019/04/24 |      32119 | macros/xetex/generic/xesearch/xesearch.sty
 2019/04/24 |     101421 | macros/xetex/generic/xesearch/xesearch.tex
 2019/08/17 |     620010 | macros/xetex/generic/xesearch.zip
-2021/03/22 |       7066 | macros/xetex/generic/xetexko/ChangeLog
-2021/03/22 |       1812 | macros/xetex/generic/xetexko/hanjacom_hangul.tab
-2021/03/22 |      39492 | macros/xetex/generic/xetexko/hanjaexa_hangul.tab
-2021/03/22 |     125412 | macros/xetex/generic/xetexko/hanja_hangul.tab
-2021/03/22 |       3471 | macros/xetex/generic/xetexko/README
-2021/03/22 |     244622 | macros/xetex/generic/xetexko/xetexko-doc.pdf
-2021/03/22 |      32261 | macros/xetex/generic/xetexko/xetexko-doc.tex
-2021/03/22 |        639 | macros/xetex/generic/xetexko/xetexko-font.sty
-2021/03/22 |        668 | macros/xetex/generic/xetexko/xetexko-hanging.sty
-2021/03/22 |        639 | macros/xetex/generic/xetexko/xetexko-josa.sty
-2021/03/22 |        641 | macros/xetex/generic/xetexko/xetexko-space.sty
-2021/03/22 |      85415 | macros/xetex/generic/xetexko/xetexko.sty
-2021/03/22 |        647 | macros/xetex/generic/xetexko/xetexko-vertical.sty
-2021/03/22 |     322152 | macros/xetex/generic/xetexko.zip
+2021/04/08 |       7354 | macros/xetex/generic/xetexko/ChangeLog
+2021/04/08 |       1812 | macros/xetex/generic/xetexko/hanjacom_hangul.tab
+2021/04/08 |      39492 | macros/xetex/generic/xetexko/hanjaexa_hangul.tab
+2021/04/08 |     125412 | macros/xetex/generic/xetexko/hanja_hangul.tab
+2021/04/08 |       3471 | macros/xetex/generic/xetexko/README
+2021/04/08 |     251319 | macros/xetex/generic/xetexko/xetexko-doc.pdf
+2021/04/08 |      33738 | macros/xetex/generic/xetexko/xetexko-doc.tex
+2021/04/08 |        639 | macros/xetex/generic/xetexko/xetexko-font.sty
+2021/04/08 |        668 | macros/xetex/generic/xetexko/xetexko-hanging.sty
+2021/04/08 |        639 | macros/xetex/generic/xetexko/xetexko-josa.sty
+2021/04/08 |        641 | macros/xetex/generic/xetexko/xetexko-space.sty
+2021/04/08 |      85632 | macros/xetex/generic/xetexko/xetexko.sty
+2021/04/08 |        647 | macros/xetex/generic/xetexko/xetexko-vertical.sty
+2021/04/08 |     329513 | macros/xetex/generic/xetexko.zip
 2008/02/10 |      19110 | macros/xetex/generic/xevlna/License.txt
 2017/03/25 |       1072 | macros/xetex/generic/xevlna/README
 2017/03/25 |       7267 | macros/xetex/generic/xevlna/xevlna-inc.tex
@@ -264499,7 +264499,7 @@
 2021/02/27 |      40340 | systems/texlive/tlnet/archive/afm2pl.i386-solaris.r57938.tar.xz
 2020/03/04 |       9616 | systems/texlive/tlnet/archive/afm2pl.r54074.tar.xz
 2021/02/25 |      83320 | systems/texlive/tlnet/archive/afm2pl.universal-darwin.r57908.tar.xz
-2021/02/25 |      14732 | systems/texlive/tlnet/archive/afm2pl.win32.r57883.tar.xz
+2021/04/08 |      14732 | systems/texlive/tlnet/archive/afm2pl.win32.r58783.tar.xz
 2021/03/16 |      14404 | systems/texlive/tlnet/archive/afm2pl.x86_64-cygwin.r58387.tar.xz
 2021/03/09 |      40656 | systems/texlive/tlnet/archive/afm2pl.x86_64-darwinlegacy.r58231.tar.xz
 2021/02/24 |      44016 | systems/texlive/tlnet/archive/afm2pl.x86_64-linuxmusl.r57878.tar.xz
@@ -264557,7 +264557,7 @@
 2021/03/16 |     221708 | systems/texlive/tlnet/archive/aleph.i386-solaris.r58388.tar.xz
 2021/02/28 |        540 | systems/texlive/tlnet/archive/aleph.r57972.tar.xz
 2021/03/17 |     561720 | systems/texlive/tlnet/archive/aleph.universal-darwin.r58418.tar.xz
-2021/03/13 |     181348 | systems/texlive/tlnet/archive/aleph.win32.r58289.tar.xz
+2021/04/08 |     181380 | systems/texlive/tlnet/archive/aleph.win32.r58783.tar.xz
 2021/03/16 |     224656 | systems/texlive/tlnet/archive/aleph.x86_64-cygwin.r58387.tar.xz
 2021/03/16 |     230240 | systems/texlive/tlnet/archive/aleph.x86_64-darwinlegacy.r58388.tar.xz
 2021/03/16 |     254656 | systems/texlive/tlnet/archive/aleph.x86_64-linuxmusl.r58378.tar.xz
@@ -264710,9 +264710,9 @@
 2019/02/28 |       8492 | systems/texlive/tlnet/archive/apa6e.source.r23350.tar.xz
 2020/01/15 |      13760 | systems/texlive/tlnet/archive/apa6.r53406.tar.xz
 2020/01/15 |      37360 | systems/texlive/tlnet/archive/apa6.source.r53406.tar.xz
-2021/03/05 |     730700 | systems/texlive/tlnet/archive/apa7.doc.r58121.tar.xz
-2021/03/05 |      14088 | systems/texlive/tlnet/archive/apa7.r58121.tar.xz
-2021/03/05 |      32552 | systems/texlive/tlnet/archive/apa7.source.r58121.tar.xz
+2021/04/08 |     730884 | systems/texlive/tlnet/archive/apa7.doc.r58787.tar.xz
+2021/04/08 |      14096 | systems/texlive/tlnet/archive/apa7.r58787.tar.xz
+2021/04/08 |      32592 | systems/texlive/tlnet/archive/apa7.source.r58787.tar.xz
 2020/03/04 |     641176 | systems/texlive/tlnet/archive/apacite.doc.r54080.tar.xz
 2020/03/04 |      42736 | systems/texlive/tlnet/archive/apacite.r54080.tar.xz
 2020/03/04 |     162688 | systems/texlive/tlnet/archive/apacite.source.r54080.tar.xz
@@ -264984,7 +264984,7 @@
 2021/02/27 |      20372 | systems/texlive/tlnet/archive/autosp.i386-solaris.r57938.tar.xz
 2021/03/08 |        696 | systems/texlive/tlnet/archive/autosp.r58211.tar.xz
 2021/02/25 |      46348 | systems/texlive/tlnet/archive/autosp.universal-darwin.r57908.tar.xz
-2021/02/25 |      20456 | systems/texlive/tlnet/archive/autosp.win32.r57883.tar.xz
+2021/04/08 |      20484 | systems/texlive/tlnet/archive/autosp.win32.r58783.tar.xz
 2021/03/16 |      20876 | systems/texlive/tlnet/archive/autosp.x86_64-cygwin.r58387.tar.xz
 2021/03/09 |      19792 | systems/texlive/tlnet/archive/autosp.x86_64-darwinlegacy.r58231.tar.xz
 2021/02/24 |      20932 | systems/texlive/tlnet/archive/autosp.x86_64-linuxmusl.r57878.tar.xz
@@ -265601,7 +265601,7 @@
 2021/02/27 |      76908 | systems/texlive/tlnet/archive/bibtex8.i386-solaris.r57938.tar.xz
 2019/11/19 |       9216 | systems/texlive/tlnet/archive/bibtex8.r52851.tar.xz
 2021/02/25 |     164264 | systems/texlive/tlnet/archive/bibtex8.universal-darwin.r57908.tar.xz
-2021/02/25 |     144272 | systems/texlive/tlnet/archive/bibtex8.win32.r57883.tar.xz
+2021/04/08 |     143584 | systems/texlive/tlnet/archive/bibtex8.win32.r58783.tar.xz
 2021/03/16 |      52696 | systems/texlive/tlnet/archive/bibtex8.x86_64-cygwin.r58387.tar.xz
 2021/03/09 |      82776 | systems/texlive/tlnet/archive/bibtex8.x86_64-darwinlegacy.r58231.tar.xz
 2021/02/24 |      87072 | systems/texlive/tlnet/archive/bibtex8.x86_64-linuxmusl.r57878.tar.xz
@@ -265633,13 +265633,13 @@
 2021/02/25 |     177164 | systems/texlive/tlnet/archive/bibtex.universal-darwin.r57908.tar.xz
 2019/11/19 |        292 | systems/texlive/tlnet/archive/bibtexu.r52851.tar.xz
 2021/02/25 |   11424936 | systems/texlive/tlnet/archive/bibtexu.universal-darwin.r57908.tar.xz
-2021/02/25 |     586596 | systems/texlive/tlnet/archive/bibtexu.win32.r57883.tar.xz
+2021/04/08 |     586696 | systems/texlive/tlnet/archive/bibtexu.win32.r58783.tar.xz
 2021/03/16 |    5555712 | systems/texlive/tlnet/archive/bibtexu.x86_64-cygwin.r58387.tar.xz
 2021/03/09 |    5536668 | systems/texlive/tlnet/archive/bibtexu.x86_64-darwinlegacy.r58231.tar.xz
 2021/02/24 |    5665972 | systems/texlive/tlnet/archive/bibtexu.x86_64-linuxmusl.r57878.tar.xz
 2021/02/24 |    5665232 | systems/texlive/tlnet/archive/bibtexu.x86_64-linux.r57878.tar.xz
 2021/02/27 |    5910900 | systems/texlive/tlnet/archive/bibtexu.x86_64-solaris.r57938.tar.xz
-2021/02/25 |      41676 | systems/texlive/tlnet/archive/bibtex.win32.r57883.tar.xz
+2021/04/08 |      41688 | systems/texlive/tlnet/archive/bibtex.win32.r58783.tar.xz
 2021/03/16 |      49300 | systems/texlive/tlnet/archive/bibtex.x86_64-cygwin.r58387.tar.xz
 2021/03/09 |      75464 | systems/texlive/tlnet/archive/bibtex.x86_64-darwinlegacy.r58231.tar.xz
 2021/02/24 |      79040 | systems/texlive/tlnet/archive/bibtex.x86_64-linuxmusl.r57878.tar.xz
@@ -266243,7 +266243,7 @@
 2021/02/27 |      53748 | systems/texlive/tlnet/archive/chktex.i386-solaris.r57938.tar.xz
 2019/11/19 |       9944 | systems/texlive/tlnet/archive/chktex.r52851.tar.xz
 2021/02/25 |     104632 | systems/texlive/tlnet/archive/chktex.universal-darwin.r57908.tar.xz
-2021/02/25 |      44888 | systems/texlive/tlnet/archive/chktex.win32.r57883.tar.xz
+2021/04/08 |      44920 | systems/texlive/tlnet/archive/chktex.win32.r58783.tar.xz
 2021/03/16 |      26212 | systems/texlive/tlnet/archive/chktex.x86_64-cygwin.r58387.tar.xz
 2021/03/09 |      54100 | systems/texlive/tlnet/archive/chktex.x86_64-darwinlegacy.r58231.tar.xz
 2021/02/24 |      60236 | systems/texlive/tlnet/archive/chktex.x86_64-linuxmusl.r57878.tar.xz
@@ -266329,7 +266329,7 @@
 2021/02/27 |      48096 | systems/texlive/tlnet/archive/cjkutils.i386-solaris.r57938.tar.xz
 2019/11/19 |       2016 | systems/texlive/tlnet/archive/cjkutils.r52851.tar.xz
 2021/02/25 |     102196 | systems/texlive/tlnet/archive/cjkutils.universal-darwin.r57908.tar.xz
-2021/02/25 |      23228 | systems/texlive/tlnet/archive/cjkutils.win32.r57883.tar.xz
+2021/04/08 |      23216 | systems/texlive/tlnet/archive/cjkutils.win32.r58783.tar.xz
 2021/03/16 |      20144 | systems/texlive/tlnet/archive/cjkutils.x86_64-cygwin.r58387.tar.xz
 2021/03/09 |      46788 | systems/texlive/tlnet/archive/cjkutils.x86_64-darwinlegacy.r58231.tar.xz
 2021/02/24 |      51008 | systems/texlive/tlnet/archive/cjkutils.x86_64-linuxmusl.r57878.tar.xz
@@ -267007,7 +267007,7 @@
 2021/02/27 |      34268 | systems/texlive/tlnet/archive/ctie.i386-solaris.r57938.tar.xz
 2021/02/28 |        384 | systems/texlive/tlnet/archive/ctie.r57972.tar.xz
 2021/02/25 |      66028 | systems/texlive/tlnet/archive/ctie.universal-darwin.r57908.tar.xz
-2021/02/25 |       6848 | systems/texlive/tlnet/archive/ctie.win32.r57883.tar.xz
+2021/04/08 |       6920 | systems/texlive/tlnet/archive/ctie.win32.r58783.tar.xz
 2021/03/16 |       6792 | systems/texlive/tlnet/archive/ctie.x86_64-cygwin.r58387.tar.xz
 2021/03/09 |      33740 | systems/texlive/tlnet/archive/ctie.x86_64-darwinlegacy.r58231.tar.xz
 2021/02/24 |      37116 | systems/texlive/tlnet/archive/ctie.x86_64-linuxmusl.r57878.tar.xz
@@ -267063,7 +267063,7 @@
 2019/02/28 |       9720 | systems/texlive/tlnet/archive/cweb-old.r49271.tar.xz
 2021/02/28 |      23440 | systems/texlive/tlnet/archive/cweb.r57972.tar.xz
 2021/03/06 |     243276 | systems/texlive/tlnet/archive/cweb.universal-darwin.r58157.tar.xz
-2021/02/26 |      72236 | systems/texlive/tlnet/archive/cweb.win32.r57934.tar.xz
+2021/04/08 |      72252 | systems/texlive/tlnet/archive/cweb.win32.r58783.tar.xz
 2021/03/16 |      80848 | systems/texlive/tlnet/archive/cweb.x86_64-cygwin.r58387.tar.xz
 2021/03/09 |     104596 | systems/texlive/tlnet/archive/cweb.x86_64-darwinlegacy.r58231.tar.xz
 2021/03/05 |     117428 | systems/texlive/tlnet/archive/cweb.x86_64-linuxmusl.r58136.tar.xz
@@ -267329,7 +267329,7 @@
 2021/02/27 |      47096 | systems/texlive/tlnet/archive/detex.i386-solaris.r57938.tar.xz
 2021/02/28 |        592 | systems/texlive/tlnet/archive/detex.r57972.tar.xz
 2021/02/25 |      85748 | systems/texlive/tlnet/archive/detex.universal-darwin.r57908.tar.xz
-2021/02/25 |      17436 | systems/texlive/tlnet/archive/detex.win32.r57883.tar.xz
+2021/04/08 |      17368 | systems/texlive/tlnet/archive/detex.win32.r58783.tar.xz
 2021/03/16 |      21396 | systems/texlive/tlnet/archive/detex.x86_64-cygwin.r58387.tar.xz
 2021/03/09 |      45432 | systems/texlive/tlnet/archive/detex.x86_64-darwinlegacy.r58231.tar.xz
 2021/02/24 |      50660 | systems/texlive/tlnet/archive/detex.x86_64-linuxmusl.r57878.tar.xz
@@ -267557,7 +267557,7 @@
 2021/02/27 |      20508 | systems/texlive/tlnet/archive/dtl.i386-solaris.r57938.tar.xz
 2019/11/19 |        580 | systems/texlive/tlnet/archive/dtl.r52851.tar.xz
 2021/02/25 |      45740 | systems/texlive/tlnet/archive/dtl.universal-darwin.r57908.tar.xz
-2021/02/25 |      16048 | systems/texlive/tlnet/archive/dtl.win32.r57883.tar.xz
+2021/04/08 |      16116 | systems/texlive/tlnet/archive/dtl.win32.r58783.tar.xz
 2021/03/16 |      17660 | systems/texlive/tlnet/archive/dtl.x86_64-cygwin.r58387.tar.xz
 2021/03/09 |      20424 | systems/texlive/tlnet/archive/dtl.x86_64-darwinlegacy.r58231.tar.xz
 2021/02/24 |      22244 | systems/texlive/tlnet/archive/dtl.x86_64-linuxmusl.r57878.tar.xz
@@ -267618,7 +267618,7 @@
 2021/02/27 |      68128 | systems/texlive/tlnet/archive/dvi2tty.i386-solaris.r57938.tar.xz
 2019/11/19 |        504 | systems/texlive/tlnet/archive/dvi2tty.r52851.tar.xz
 2021/02/25 |     125356 | systems/texlive/tlnet/archive/dvi2tty.universal-darwin.r57908.tar.xz
-2021/02/25 |      88256 | systems/texlive/tlnet/archive/dvi2tty.win32.r57883.tar.xz
+2021/04/08 |      88180 | systems/texlive/tlnet/archive/dvi2tty.win32.r58783.tar.xz
 2021/03/16 |      24952 | systems/texlive/tlnet/archive/dvi2tty.x86_64-cygwin.r58387.tar.xz
 2021/03/09 |      68424 | systems/texlive/tlnet/archive/dvi2tty.x86_64-darwinlegacy.r58231.tar.xz
 2021/02/24 |      71884 | systems/texlive/tlnet/archive/dvi2tty.x86_64-linuxmusl.r57878.tar.xz
@@ -267654,7 +267654,7 @@
 2021/02/27 |      53412 | systems/texlive/tlnet/archive/dvicopy.i386-solaris.r57938.tar.xz
 2021/02/28 |        588 | systems/texlive/tlnet/archive/dvicopy.r57972.tar.xz
 2021/02/25 |     111180 | systems/texlive/tlnet/archive/dvicopy.universal-darwin.r57908.tar.xz
-2021/02/25 |      24376 | systems/texlive/tlnet/archive/dvicopy.win32.r57883.tar.xz
+2021/04/08 |      24368 | systems/texlive/tlnet/archive/dvicopy.win32.r58783.tar.xz
 2021/03/16 |      26052 | systems/texlive/tlnet/archive/dvicopy.x86_64-cygwin.r58387.tar.xz
 2021/03/09 |      54932 | systems/texlive/tlnet/archive/dvicopy.x86_64-darwinlegacy.r58231.tar.xz
 2021/02/24 |      59156 | systems/texlive/tlnet/archive/dvicopy.x86_64-linuxmusl.r57878.tar.xz
@@ -267672,7 +267672,7 @@
 2021/02/27 |       8900 | systems/texlive/tlnet/archive/dvidvi.i386-solaris.r57938.tar.xz
 2019/11/19 |        468 | systems/texlive/tlnet/archive/dvidvi.r52851.tar.xz
 2021/02/25 |      22292 | systems/texlive/tlnet/archive/dvidvi.universal-darwin.r57908.tar.xz
-2021/02/25 |      10660 | systems/texlive/tlnet/archive/dvidvi.win32.r57883.tar.xz
+2021/04/08 |      10632 | systems/texlive/tlnet/archive/dvidvi.win32.r58783.tar.xz
 2021/03/16 |       9468 | systems/texlive/tlnet/archive/dvidvi.x86_64-cygwin.r58387.tar.xz
 2021/03/09 |       7968 | systems/texlive/tlnet/archive/dvidvi.x86_64-darwinlegacy.r58231.tar.xz
 2021/02/24 |       8580 | systems/texlive/tlnet/archive/dvidvi.x86_64-linuxmusl.r57878.tar.xz
@@ -267710,7 +267710,7 @@
 2021/02/27 |      86800 | systems/texlive/tlnet/archive/dviljk.i386-solaris.r57938.tar.xz
 2019/11/19 |        532 | systems/texlive/tlnet/archive/dviljk.r52851.tar.xz
 2021/02/25 |     174900 | systems/texlive/tlnet/archive/dviljk.universal-darwin.r57908.tar.xz
-2021/02/25 |      45396 | systems/texlive/tlnet/archive/dviljk.win32.r57883.tar.xz
+2021/04/08 |      45424 | systems/texlive/tlnet/archive/dviljk.win32.r58783.tar.xz
 2021/03/16 |      42876 | systems/texlive/tlnet/archive/dviljk.x86_64-cygwin.r58387.tar.xz
 2021/03/09 |      83184 | systems/texlive/tlnet/archive/dviljk.x86_64-darwinlegacy.r58231.tar.xz
 2021/02/24 |      85284 | systems/texlive/tlnet/archive/dviljk.x86_64-linuxmusl.r57878.tar.xz
@@ -267728,7 +267728,7 @@
 2021/02/27 |      73472 | systems/texlive/tlnet/archive/dviout-util.i386-solaris.r57938.tar.xz
 2019/11/19 |        248 | systems/texlive/tlnet/archive/dviout-util.r52851.tar.xz
 2021/02/25 |     131672 | systems/texlive/tlnet/archive/dviout-util.universal-darwin.r57908.tar.xz
-2021/02/25 |      90076 | systems/texlive/tlnet/archive/dviout-util.win32.r57883.tar.xz
+2021/04/08 |      90188 | systems/texlive/tlnet/archive/dviout-util.win32.r58783.tar.xz
 2021/03/16 |      27284 | systems/texlive/tlnet/archive/dviout-util.x86_64-cygwin.r58387.tar.xz
 2021/03/09 |      70968 | systems/texlive/tlnet/archive/dviout-util.x86_64-darwinlegacy.r58231.tar.xz
 2021/02/24 |      75888 | systems/texlive/tlnet/archive/dviout-util.x86_64-linuxmusl.r57878.tar.xz
@@ -267747,7 +267747,7 @@
 2021/03/19 |     413492 | systems/texlive/tlnet/archive/dvipdfmx.i386-solaris.r58500.tar.xz
 2021/03/23 |      27124 | systems/texlive/tlnet/archive/dvipdfmx.r58645.tar.xz
 2021/03/19 |     791336 | systems/texlive/tlnet/archive/dvipdfmx.universal-darwin.r58528.tar.xz
-2021/03/18 |     332424 | systems/texlive/tlnet/archive/dvipdfmx.win32.r58491.tar.xz
+2021/04/08 |     331744 | systems/texlive/tlnet/archive/dvipdfmx.win32.r58783.tar.xz
 2021/03/19 |     403400 | systems/texlive/tlnet/archive/dvipdfmx.x86_64-cygwin.r58498.tar.xz
 2021/03/19 |     405060 | systems/texlive/tlnet/archive/dvipdfmx.x86_64-darwinlegacy.r58501.tar.xz
 2021/03/20 |     451244 | systems/texlive/tlnet/archive/dvipdfmx.x86_64-linuxmusl.r58535.tar.xz
@@ -267765,7 +267765,7 @@
 2021/02/27 |     451896 | systems/texlive/tlnet/archive/dvipng.i386-solaris.r57938.tar.xz
 2021/02/28 |        916 | systems/texlive/tlnet/archive/dvipng.r57972.tar.xz
 2021/02/25 |     882028 | systems/texlive/tlnet/archive/dvipng.universal-darwin.r57908.tar.xz
-2021/02/25 |     395912 | systems/texlive/tlnet/archive/dvipng.win32.r57883.tar.xz
+2021/04/08 |     395916 | systems/texlive/tlnet/archive/dvipng.win32.r58783.tar.xz
 2021/03/16 |     445440 | systems/texlive/tlnet/archive/dvipng.x86_64-cygwin.r58387.tar.xz
 2021/03/09 |     447096 | systems/texlive/tlnet/archive/dvipng.x86_64-darwinlegacy.r58231.tar.xz
 2021/02/24 |     497484 | systems/texlive/tlnet/archive/dvipng.x86_64-linuxmusl.r57878.tar.xz
@@ -267783,7 +267783,7 @@
 2021/02/27 |      45468 | systems/texlive/tlnet/archive/dvipos.i386-solaris.r57938.tar.xz
 2019/11/19 |        296 | systems/texlive/tlnet/archive/dvipos.r52851.tar.xz
 2021/02/25 |      89848 | systems/texlive/tlnet/archive/dvipos.universal-darwin.r57908.tar.xz
-2021/02/25 |      16888 | systems/texlive/tlnet/archive/dvipos.win32.r57883.tar.xz
+2021/04/08 |      16884 | systems/texlive/tlnet/archive/dvipos.win32.r58783.tar.xz
 2021/03/16 |      18408 | systems/texlive/tlnet/archive/dvipos.x86_64-cygwin.r58387.tar.xz
 2021/03/09 |      46064 | systems/texlive/tlnet/archive/dvipos.x86_64-darwinlegacy.r58231.tar.xz
 2021/02/24 |      50636 | systems/texlive/tlnet/archive/dvipos.x86_64-linuxmusl.r57878.tar.xz
@@ -267802,7 +267802,7 @@
 2021/02/27 |     140624 | systems/texlive/tlnet/archive/dvips.i386-solaris.r57938.tar.xz
 2021/02/28 |      58080 | systems/texlive/tlnet/archive/dvips.r57972.tar.xz
 2021/02/25 |     293556 | systems/texlive/tlnet/archive/dvips.universal-darwin.r57908.tar.xz
-2021/02/25 |      94292 | systems/texlive/tlnet/archive/dvips.win32.r57883.tar.xz
+2021/04/08 |      94208 | systems/texlive/tlnet/archive/dvips.win32.r58783.tar.xz
 2021/03/16 |     117036 | systems/texlive/tlnet/archive/dvips.x86_64-cygwin.r58387.tar.xz
 2021/03/09 |     142652 | systems/texlive/tlnet/archive/dvips.x86_64-darwinlegacy.r58231.tar.xz
 2021/02/24 |     155124 | systems/texlive/tlnet/archive/dvips.x86_64-linuxmusl.r57878.tar.xz
@@ -267820,7 +267820,7 @@
 2021/02/27 |    1930708 | systems/texlive/tlnet/archive/dvisvgm.i386-solaris.r57938.tar.xz
 2021/02/28 |        880 | systems/texlive/tlnet/archive/dvisvgm.r57972.tar.xz
 2021/02/25 |    2614756 | systems/texlive/tlnet/archive/dvisvgm.universal-darwin.r57908.tar.xz
-2021/02/25 |    1472172 | systems/texlive/tlnet/archive/dvisvgm.win32.r57883.tar.xz
+2021/04/08 |    1470972 | systems/texlive/tlnet/archive/dvisvgm.win32.r58783.tar.xz
 2021/03/16 |    1718340 | systems/texlive/tlnet/archive/dvisvgm.x86_64-cygwin.r58387.tar.xz
 2021/03/09 |    1488204 | systems/texlive/tlnet/archive/dvisvgm.x86_64-darwinlegacy.r58231.tar.xz
 2021/02/24 |    1787968 | systems/texlive/tlnet/archive/dvisvgm.x86_64-linuxmusl.r57878.tar.xz
@@ -267840,9 +267840,9 @@
 2021/01/25 |       1828 | systems/texlive/tlnet/archive/ean13isbn.r57514.tar.xz
 2019/02/28 |        948 | systems/texlive/tlnet/archive/ean.doc.r20851.tar.xz
 2019/02/28 |       3148 | systems/texlive/tlnet/archive/ean.r20851.tar.xz
-2021/04/07 |     686152 | systems/texlive/tlnet/archive/easybook.doc.r58775.tar.xz
-2021/04/07 |      11188 | systems/texlive/tlnet/archive/easybook.r58775.tar.xz
-2021/04/07 |      22608 | systems/texlive/tlnet/archive/easybook.source.r58775.tar.xz
+2021/04/08 |     687304 | systems/texlive/tlnet/archive/easybook.doc.r58788.tar.xz
+2021/04/08 |      11224 | systems/texlive/tlnet/archive/easybook.r58788.tar.xz
+2021/04/08 |      22784 | systems/texlive/tlnet/archive/easybook.source.r58788.tar.xz
 2019/02/28 |       4540 | systems/texlive/tlnet/archive/easy.doc.r19440.tar.xz
 2020/09/08 |     175976 | systems/texlive/tlnet/archive/easyfig.doc.r56291.tar.xz
 2020/09/08 |       1936 | systems/texlive/tlnet/archive/easyfig.r56291.tar.xz
@@ -268812,7 +268812,7 @@
 2021/02/27 |     103632 | systems/texlive/tlnet/archive/fontware.i386-solaris.r57938.tar.xz
 2021/02/28 |        656 | systems/texlive/tlnet/archive/fontware.r57972.tar.xz
 2021/02/25 |     209092 | systems/texlive/tlnet/archive/fontware.universal-darwin.r57908.tar.xz
-2021/02/25 |      58192 | systems/texlive/tlnet/archive/fontware.win32.r57883.tar.xz
+2021/04/08 |      58216 | systems/texlive/tlnet/archive/fontware.win32.r58783.tar.xz
 2021/03/16 |      64356 | systems/texlive/tlnet/archive/fontware.x86_64-cygwin.r58387.tar.xz
 2021/03/09 |     100428 | systems/texlive/tlnet/archive/fontware.x86_64-darwinlegacy.r58231.tar.xz
 2021/02/24 |     106092 | systems/texlive/tlnet/archive/fontware.x86_64-linuxmusl.r57878.tar.xz
@@ -269323,7 +269323,7 @@
 2021/03/14 |   17281028 | systems/texlive/tlnet/archive/gregoriotex.r58331.tar.xz
 2021/03/14 |   23972788 | systems/texlive/tlnet/archive/gregoriotex.source.r58331.tar.xz
 2021/03/17 |     235016 | systems/texlive/tlnet/archive/gregoriotex.universal-darwin.r58418.tar.xz
-2021/03/15 |     282488 | systems/texlive/tlnet/archive/gregoriotex.win32.r58345.tar.xz
+2021/04/08 |     282616 | systems/texlive/tlnet/archive/gregoriotex.win32.r58783.tar.xz
 2021/03/16 |     102772 | systems/texlive/tlnet/archive/gregoriotex.x86_64-cygwin.r58387.tar.xz
 2021/03/16 |     123256 | systems/texlive/tlnet/archive/gregoriotex.x86_64-darwinlegacy.r58388.tar.xz
 2021/03/16 |     139864 | systems/texlive/tlnet/archive/gregoriotex.x86_64-linuxmusl.r58378.tar.xz
@@ -269373,7 +269373,7 @@
 2021/02/27 |      39980 | systems/texlive/tlnet/archive/gsftopk.i386-solaris.r57938.tar.xz
 2019/11/19 |       3548 | systems/texlive/tlnet/archive/gsftopk.r52851.tar.xz
 2021/02/25 |      79608 | systems/texlive/tlnet/archive/gsftopk.universal-darwin.r57908.tar.xz
-2021/02/25 |      12972 | systems/texlive/tlnet/archive/gsftopk.win32.r57883.tar.xz
+2021/04/08 |      12972 | systems/texlive/tlnet/archive/gsftopk.win32.r58783.tar.xz
 2021/03/16 |      12208 | systems/texlive/tlnet/archive/gsftopk.x86_64-cygwin.r58387.tar.xz
 2021/03/09 |      39648 | systems/texlive/tlnet/archive/gsftopk.x86_64-darwinlegacy.r58231.tar.xz
 2021/02/24 |      42780 | systems/texlive/tlnet/archive/gsftopk.x86_64-linuxmusl.r57878.tar.xz
@@ -270175,7 +270175,7 @@
 2021/02/27 |      41332 | systems/texlive/tlnet/archive/kpathsea.i386-solaris.r57938.tar.xz
 2021/03/22 |      32484 | systems/texlive/tlnet/archive/kpathsea.r58622.tar.xz
 2021/02/25 |      83712 | systems/texlive/tlnet/archive/kpathsea.universal-darwin.r57908.tar.xz
-2021/02/27 |     487236 | systems/texlive/tlnet/archive/kpathsea.win32.r57942.tar.xz
+2021/04/08 |     487512 | systems/texlive/tlnet/archive/kpathsea.win32.r58783.tar.xz
 2021/03/16 |      45992 | systems/texlive/tlnet/archive/kpathsea.x86_64-cygwin.r58387.tar.xz
 2021/03/09 |      39540 | systems/texlive/tlnet/archive/kpathsea.x86_64-darwinlegacy.r58231.tar.xz
 2021/02/24 |      44140 | systems/texlive/tlnet/archive/kpathsea.x86_64-linuxmusl.r57878.tar.xz
@@ -270497,13 +270497,13 @@
 2019/02/28 |        344 | systems/texlive/tlnet/archive/latexindent.amd64-freebsd.r32150.tar.xz
 2019/02/28 |        344 | systems/texlive/tlnet/archive/latexindent.amd64-netbsd.r32150.tar.xz
 2019/02/28 |        344 | systems/texlive/tlnet/archive/latexindent.armhf-linux.r32150.tar.xz
-2021/03/22 |     981124 | systems/texlive/tlnet/archive/latexindent.doc.r58595.tar.xz
+2021/04/08 |     982572 | systems/texlive/tlnet/archive/latexindent.doc.r58790.tar.xz
 2019/02/28 |        340 | systems/texlive/tlnet/archive/latexindent.i386-cygwin.r32150.tar.xz
 2019/02/28 |        344 | systems/texlive/tlnet/archive/latexindent.i386-freebsd.r32150.tar.xz
 2019/02/28 |        344 | systems/texlive/tlnet/archive/latexindent.i386-linux.r32150.tar.xz
 2019/02/28 |        344 | systems/texlive/tlnet/archive/latexindent.i386-netbsd.r32150.tar.xz
 2019/02/28 |        344 | systems/texlive/tlnet/archive/latexindent.i386-solaris.r32150.tar.xz
-2021/03/22 |      60244 | systems/texlive/tlnet/archive/latexindent.r58595.tar.xz
+2021/04/08 |      60252 | systems/texlive/tlnet/archive/latexindent.r58790.tar.xz
 2021/02/25 |        344 | systems/texlive/tlnet/archive/latexindent.universal-darwin.r57908.tar.xz
 2021/03/22 |    3057588 | systems/texlive/tlnet/archive/latexindent.win32.r58595.tar.xz
 2019/02/28 |        344 | systems/texlive/tlnet/archive/latexindent.x86_64-cygwin.r33557.tar.xz
@@ -270618,7 +270618,7 @@
 2021/02/27 |     824320 | systems/texlive/tlnet/archive/lcdftypetools.i386-solaris.r57938.tar.xz
 2019/11/19 |       1004 | systems/texlive/tlnet/archive/lcdftypetools.r52851.tar.xz
 2021/02/25 |    1290584 | systems/texlive/tlnet/archive/lcdftypetools.universal-darwin.r57908.tar.xz
-2021/02/25 |     702584 | systems/texlive/tlnet/archive/lcdftypetools.win32.r57883.tar.xz
+2021/04/08 |     703488 | systems/texlive/tlnet/archive/lcdftypetools.win32.r58783.tar.xz
 2021/03/16 |     588000 | systems/texlive/tlnet/archive/lcdftypetools.x86_64-cygwin.r58387.tar.xz
 2021/03/09 |     630700 | systems/texlive/tlnet/archive/lcdftypetools.x86_64-darwinlegacy.r58231.tar.xz
 2021/02/24 |     769440 | systems/texlive/tlnet/archive/lcdftypetools.x86_64-linuxmusl.r57878.tar.xz
@@ -271082,7 +271082,7 @@
 2021/03/19 |    2032704 | systems/texlive/tlnet/archive/luahbtex.i386-solaris.r58500.tar.xz
 2021/02/28 |        460 | systems/texlive/tlnet/archive/luahbtex.r57972.tar.xz
 2021/03/18 |    3566288 | systems/texlive/tlnet/archive/luahbtex.universal-darwin.r58466.tar.xz
-2021/03/17 |    1559620 | systems/texlive/tlnet/archive/luahbtex.win32.r58459.tar.xz
+2021/04/08 |    1560056 | systems/texlive/tlnet/archive/luahbtex.win32.r58783.tar.xz
 2021/03/19 |    2040188 | systems/texlive/tlnet/archive/luahbtex.x86_64-cygwin.r58498.tar.xz
 2021/03/19 |    1876756 | systems/texlive/tlnet/archive/luahbtex.x86_64-darwinlegacy.r58501.tar.xz
 2021/03/20 |    2307392 | systems/texlive/tlnet/archive/luahbtex.x86_64-linuxmusl.r58535.tar.xz
@@ -271112,7 +271112,7 @@
 2021/03/19 |    2418436 | systems/texlive/tlnet/archive/luajittex.i386-solaris.r58500.tar.xz
 2021/02/28 |        484 | systems/texlive/tlnet/archive/luajittex.r57972.tar.xz
 2021/03/18 |    6524976 | systems/texlive/tlnet/archive/luajittex.universal-darwin.r58466.tar.xz
-2021/03/17 |    2202016 | systems/texlive/tlnet/archive/luajittex.win32.r58459.tar.xz
+2021/04/08 |    2202076 | systems/texlive/tlnet/archive/luajittex.win32.r58783.tar.xz
 2021/03/19 |    2491716 | systems/texlive/tlnet/archive/luajittex.x86_64-cygwin.r58498.tar.xz
 2021/03/19 |    2245096 | systems/texlive/tlnet/archive/luajittex.x86_64-darwinlegacy.r58501.tar.xz
 2021/03/20 |    3841984 | systems/texlive/tlnet/archive/luajittex.x86_64-linuxmusl.r58535.tar.xz
@@ -271194,7 +271194,7 @@
 2019/02/28 |       1056 | systems/texlive/tlnet/archive/luatextra.r20747.tar.xz
 2019/02/28 |       3492 | systems/texlive/tlnet/archive/luatextra.source.r20747.tar.xz
 2021/03/18 |    3000268 | systems/texlive/tlnet/archive/luatex.universal-darwin.r58466.tar.xz
-2021/03/17 |    1822900 | systems/texlive/tlnet/archive/luatex.win32.r58459.tar.xz
+2021/04/08 |    1822840 | systems/texlive/tlnet/archive/luatex.win32.r58783.tar.xz
 2021/03/19 |    1739320 | systems/texlive/tlnet/archive/luatex.x86_64-cygwin.r58498.tar.xz
 2021/03/19 |    1592608 | systems/texlive/tlnet/archive/luatex.x86_64-darwinlegacy.r58501.tar.xz
 2021/03/20 |    1886152 | systems/texlive/tlnet/archive/luatex.x86_64-linuxmusl.r58535.tar.xz
@@ -271334,7 +271334,7 @@
 2021/02/27 |      45984 | systems/texlive/tlnet/archive/makeindex.i386-solaris.r57938.tar.xz
 2019/11/19 |       4628 | systems/texlive/tlnet/archive/makeindex.r52851.tar.xz
 2021/02/25 |      92848 | systems/texlive/tlnet/archive/makeindex.universal-darwin.r57908.tar.xz
-2021/02/25 |      18208 | systems/texlive/tlnet/archive/makeindex.win32.r57883.tar.xz
+2021/04/08 |      18204 | systems/texlive/tlnet/archive/makeindex.win32.r58783.tar.xz
 2021/03/16 |      21556 | systems/texlive/tlnet/archive/makeindex.x86_64-cygwin.r58387.tar.xz
 2021/03/09 |      46448 | systems/texlive/tlnet/archive/makeindex.x86_64-darwinlegacy.r58231.tar.xz
 2021/02/24 |      51364 | systems/texlive/tlnet/archive/makeindex.x86_64-linuxmusl.r57878.tar.xz
@@ -271577,7 +271577,7 @@
 2021/03/16 |     184368 | systems/texlive/tlnet/archive/metafont.i386-solaris.r58388.tar.xz
 2021/02/28 |       8756 | systems/texlive/tlnet/archive/metafont.r57972.tar.xz
 2021/03/17 |     470728 | systems/texlive/tlnet/archive/metafont.universal-darwin.r58418.tar.xz
-2021/03/13 |     145276 | systems/texlive/tlnet/archive/metafont.win32.r58289.tar.xz
+2021/04/08 |     145408 | systems/texlive/tlnet/archive/metafont.win32.r58783.tar.xz
 2021/03/16 |     179188 | systems/texlive/tlnet/archive/metafont.x86_64-cygwin.r58387.tar.xz
 2021/03/16 |     154696 | systems/texlive/tlnet/archive/metafont.x86_64-darwinlegacy.r58388.tar.xz
 2021/03/16 |     202044 | systems/texlive/tlnet/archive/metafont.x86_64-linuxmusl.r58378.tar.xz
@@ -271613,7 +271613,7 @@
 2021/02/27 |     842644 | systems/texlive/tlnet/archive/metapost.i386-solaris.r57938.tar.xz
 2021/02/28 |      73764 | systems/texlive/tlnet/archive/metapost.r57972.tar.xz
 2021/02/25 |    1698780 | systems/texlive/tlnet/archive/metapost.universal-darwin.r57908.tar.xz
-2021/02/25 |     820792 | systems/texlive/tlnet/archive/metapost.win32.r57883.tar.xz
+2021/04/08 |     820616 | systems/texlive/tlnet/archive/metapost.win32.r58783.tar.xz
 2021/03/16 |     893096 | systems/texlive/tlnet/archive/metapost.x86_64-cygwin.r58387.tar.xz
 2021/03/09 |     826888 | systems/texlive/tlnet/archive/metapost.x86_64-darwinlegacy.r58231.tar.xz
 2021/02/24 |     957800 | systems/texlive/tlnet/archive/metapost.x86_64-linuxmusl.r57878.tar.xz
@@ -271693,7 +271693,7 @@
 2021/03/16 |     741596 | systems/texlive/tlnet/archive/mflua.i386-solaris.r58388.tar.xz
 2020/03/04 |      31672 | systems/texlive/tlnet/archive/mflua.r54074.tar.xz
 2021/03/17 |    1480588 | systems/texlive/tlnet/archive/mflua.universal-darwin.r58418.tar.xz
-2021/03/13 |    1041540 | systems/texlive/tlnet/archive/mflua.win32.r58289.tar.xz
+2021/04/08 |    1041076 | systems/texlive/tlnet/archive/mflua.win32.r58783.tar.xz
 2021/03/19 |     485588 | systems/texlive/tlnet/archive/mflua.x86_64-cygwin.r58498.tar.xz
 2021/03/16 |     722036 | systems/texlive/tlnet/archive/mflua.x86_64-darwinlegacy.r58388.tar.xz
 2021/03/16 |     868284 | systems/texlive/tlnet/archive/mflua.x86_64-linuxmusl.r58378.tar.xz
@@ -271723,7 +271723,7 @@
 2021/02/27 |     124616 | systems/texlive/tlnet/archive/mfware.i386-solaris.r57938.tar.xz
 2021/02/28 |       3184 | systems/texlive/tlnet/archive/mfware.r57972.tar.xz
 2021/02/25 |     247192 | systems/texlive/tlnet/archive/mfware.universal-darwin.r57908.tar.xz
-2021/02/25 |      58888 | systems/texlive/tlnet/archive/mfware.win32.r57883.tar.xz
+2021/04/08 |      58956 | systems/texlive/tlnet/archive/mfware.win32.r58783.tar.xz
 2021/03/16 |      63536 | systems/texlive/tlnet/archive/mfware.x86_64-cygwin.r58387.tar.xz
 2021/03/09 |     116748 | systems/texlive/tlnet/archive/mfware.x86_64-darwinlegacy.r58231.tar.xz
 2021/02/24 |     127072 | systems/texlive/tlnet/archive/mfware.x86_64-linuxmusl.r57878.tar.xz
@@ -272138,7 +272138,7 @@
 2019/02/28 |       8032 | systems/texlive/tlnet/archive/musixtnt.i386-solaris.r46829.tar.xz
 2019/02/28 |       1480 | systems/texlive/tlnet/archive/musixtnt.r40307.tar.xz
 2021/02/25 |      19960 | systems/texlive/tlnet/archive/musixtnt.universal-darwin.r57908.tar.xz
-2021/02/25 |       6384 | systems/texlive/tlnet/archive/musixtnt.win32.r57883.tar.xz
+2021/04/08 |       6384 | systems/texlive/tlnet/archive/musixtnt.win32.r58783.tar.xz
 2021/03/16 |       6060 | systems/texlive/tlnet/archive/musixtnt.x86_64-cygwin.r58387.tar.xz
 2021/03/09 |       7220 | systems/texlive/tlnet/archive/musixtnt.x86_64-darwinlegacy.r58231.tar.xz
 2020/03/13 |       8164 | systems/texlive/tlnet/archive/musixtnt.x86_64-linuxmusl.r54264.tar.xz
@@ -272479,7 +272479,7 @@
 2021/02/27 |     258104 | systems/texlive/tlnet/archive/omegaware.i386-solaris.r57938.tar.xz
 2021/02/28 |        600 | systems/texlive/tlnet/archive/omegaware.r57972.tar.xz
 2021/02/25 |     538480 | systems/texlive/tlnet/archive/omegaware.universal-darwin.r57908.tar.xz
-2021/02/26 |     170600 | systems/texlive/tlnet/archive/omegaware.win32.r57934.tar.xz
+2021/04/08 |     170692 | systems/texlive/tlnet/archive/omegaware.win32.r58783.tar.xz
 2021/03/16 |     187544 | systems/texlive/tlnet/archive/omegaware.x86_64-cygwin.r58387.tar.xz
 2021/03/09 |     255788 | systems/texlive/tlnet/archive/omegaware.x86_64-darwinlegacy.r58231.tar.xz
 2021/02/24 |     269568 | systems/texlive/tlnet/archive/omegaware.x86_64-linuxmusl.r57878.tar.xz
@@ -272665,7 +272665,7 @@
 2021/02/27 |      20408 | systems/texlive/tlnet/archive/patgen.i386-solaris.r57938.tar.xz
 2021/02/28 |        780 | systems/texlive/tlnet/archive/patgen.r57972.tar.xz
 2021/02/25 |      48464 | systems/texlive/tlnet/archive/patgen.universal-darwin.r57908.tar.xz
-2021/02/25 |      12848 | systems/texlive/tlnet/archive/patgen.win32.r57883.tar.xz
+2021/04/08 |      13120 | systems/texlive/tlnet/archive/patgen.win32.r58783.tar.xz
 2021/03/16 |      15092 | systems/texlive/tlnet/archive/patgen.x86_64-cygwin.r58387.tar.xz
 2021/03/09 |      21036 | systems/texlive/tlnet/archive/patgen.x86_64-darwinlegacy.r58231.tar.xz
 2021/02/24 |      22192 | systems/texlive/tlnet/archive/patgen.x86_64-linuxmusl.r57878.tar.xz
@@ -272860,7 +272860,7 @@
 2019/02/28 |        340 | systems/texlive/tlnet/archive/pdftex-quiet.x86_64-solaris.r49140.tar.xz
 2021/02/28 |      36956 | systems/texlive/tlnet/archive/pdftex.r57973.tar.xz
 2021/03/18 |    1682500 | systems/texlive/tlnet/archive/pdftex.universal-darwin.r58466.tar.xz
-2021/03/17 |     710168 | systems/texlive/tlnet/archive/pdftex.win32.r58459.tar.xz
+2021/04/08 |     709764 | systems/texlive/tlnet/archive/pdftex.win32.r58783.tar.xz
 2021/03/19 |     831968 | systems/texlive/tlnet/archive/pdftex.x86_64-cygwin.r58498.tar.xz
 2021/03/19 |     774964 | systems/texlive/tlnet/archive/pdftex.x86_64-darwinlegacy.r58501.tar.xz
 2021/03/20 |     888216 | systems/texlive/tlnet/archive/pdftex.x86_64-linuxmusl.r58535.tar.xz
@@ -272878,7 +272878,7 @@
 2021/02/27 |     419432 | systems/texlive/tlnet/archive/pdftosrc.i386-solaris.r57938.tar.xz
 2021/02/28 |        380 | systems/texlive/tlnet/archive/pdftosrc.r57972.tar.xz
 2021/02/25 |     697228 | systems/texlive/tlnet/archive/pdftosrc.universal-darwin.r57908.tar.xz
-2021/02/26 |     320132 | systems/texlive/tlnet/archive/pdftosrc.win32.r57934.tar.xz
+2021/04/08 |     320592 | systems/texlive/tlnet/archive/pdftosrc.win32.r58783.tar.xz
 2021/03/16 |     371500 | systems/texlive/tlnet/archive/pdftosrc.x86_64-cygwin.r58387.tar.xz
 2021/03/09 |     344496 | systems/texlive/tlnet/archive/pdftosrc.x86_64-darwinlegacy.r58231.tar.xz
 2021/02/24 |     411320 | systems/texlive/tlnet/archive/pdftosrc.x86_64-linuxmusl.r57878.tar.xz
@@ -273434,7 +273434,7 @@
 2021/02/27 |      85244 | systems/texlive/tlnet/archive/ps2pk.i386-solaris.r57938.tar.xz
 2019/11/19 |        504 | systems/texlive/tlnet/archive/ps2pk.r52851.tar.xz
 2021/02/25 |     174516 | systems/texlive/tlnet/archive/ps2pk.universal-darwin.r57908.tar.xz
-2021/02/25 |      59228 | systems/texlive/tlnet/archive/ps2pk.win32.r57883.tar.xz
+2021/04/08 |      59264 | systems/texlive/tlnet/archive/ps2pk.win32.r58783.tar.xz
 2021/03/16 |      61576 | systems/texlive/tlnet/archive/ps2pk.x86_64-cygwin.r58387.tar.xz
 2021/03/09 |      85048 | systems/texlive/tlnet/archive/ps2pk.x86_64-darwinlegacy.r58231.tar.xz
 2021/02/24 |      93484 | systems/texlive/tlnet/archive/ps2pk.x86_64-linuxmusl.r57878.tar.xz
@@ -273562,8 +273562,8 @@
 2019/02/28 |       7608 | systems/texlive/tlnet/archive/pst-fr3d.source.r15878.tar.xz
 2020/03/18 |   21911456 | systems/texlive/tlnet/archive/pst-fractal.doc.r54376.tar.xz
 2020/03/18 |      10416 | systems/texlive/tlnet/archive/pst-fractal.r54376.tar.xz
-2020/06/07 |    3436496 | systems/texlive/tlnet/archive/pst-func.doc.r55439.tar.xz
-2020/06/07 |      18760 | systems/texlive/tlnet/archive/pst-func.r55439.tar.xz
+2021/04/08 |    3516060 | systems/texlive/tlnet/archive/pst-func.doc.r58786.tar.xz
+2021/04/08 |      20116 | systems/texlive/tlnet/archive/pst-func.r58786.tar.xz
 2019/02/28 |     380444 | systems/texlive/tlnet/archive/pst-fun.doc.r17909.tar.xz
 2019/02/28 |      24440 | systems/texlive/tlnet/archive/pst-fun.r17909.tar.xz
 2019/02/28 |        932 | systems/texlive/tlnet/archive/pst-fun.source.r17909.tar.xz
@@ -273744,7 +273744,7 @@
 2021/02/27 |      66228 | systems/texlive/tlnet/archive/psutils.i386-solaris.r57938.tar.xz
 2019/11/19 |       5388 | systems/texlive/tlnet/archive/psutils.r52851.tar.xz
 2021/02/25 |     133464 | systems/texlive/tlnet/archive/psutils.universal-darwin.r57908.tar.xz
-2021/02/25 |      24976 | systems/texlive/tlnet/archive/psutils.win32.r57883.tar.xz
+2021/04/08 |      24936 | systems/texlive/tlnet/archive/psutils.win32.r58783.tar.xz
 2021/03/16 |      23120 | systems/texlive/tlnet/archive/psutils.x86_64-cygwin.r58387.tar.xz
 2021/03/09 |      62080 | systems/texlive/tlnet/archive/psutils.x86_64-darwinlegacy.r58231.tar.xz
 2021/02/24 |      72356 | systems/texlive/tlnet/archive/psutils.x86_64-linuxmusl.r57878.tar.xz
@@ -273807,7 +273807,7 @@
 2019/02/28 |      56200 | systems/texlive/tlnet/archive/ptext.doc.r30171.tar.xz
 2019/02/28 |      21740 | systems/texlive/tlnet/archive/ptext.r30171.tar.xz
 2021/03/17 |    3096412 | systems/texlive/tlnet/archive/ptex.universal-darwin.r58418.tar.xz
-2021/03/22 |    1384340 | systems/texlive/tlnet/archive/ptex.win32.r58615.tar.xz
+2021/04/08 |    1384712 | systems/texlive/tlnet/archive/ptex.win32.r58783.tar.xz
 2021/03/16 |    1400968 | systems/texlive/tlnet/archive/ptex.x86_64-cygwin.r58387.tar.xz
 2021/03/16 |    1343288 | systems/texlive/tlnet/archive/ptex.x86_64-darwinlegacy.r58388.tar.xz
 2021/03/16 |    1512304 | systems/texlive/tlnet/archive/ptex.x86_64-linuxmusl.r58378.tar.xz
@@ -274377,7 +274377,7 @@
 2021/02/27 |      37360 | systems/texlive/tlnet/archive/seetexk.i386-solaris.r57938.tar.xz
 2021/02/28 |        616 | systems/texlive/tlnet/archive/seetexk.r57972.tar.xz
 2021/02/25 |      66780 | systems/texlive/tlnet/archive/seetexk.universal-darwin.r57908.tar.xz
-2021/02/25 |      26808 | systems/texlive/tlnet/archive/seetexk.win32.r57883.tar.xz
+2021/04/08 |      26656 | systems/texlive/tlnet/archive/seetexk.win32.r58783.tar.xz
 2021/03/16 |      26016 | systems/texlive/tlnet/archive/seetexk.x86_64-cygwin.r58387.tar.xz
 2021/03/09 |      29888 | systems/texlive/tlnet/archive/seetexk.x86_64-darwinlegacy.r58231.tar.xz
 2021/02/24 |      31228 | systems/texlive/tlnet/archive/seetexk.x86_64-linuxmusl.r57878.tar.xz
@@ -274978,7 +274978,7 @@
 2021/03/06 |      69152 | systems/texlive/tlnet/archive/synctex.i386-solaris.r58156.tar.xz
 2020/03/04 |        464 | systems/texlive/tlnet/archive/synctex.r54074.tar.xz
 2021/03/06 |     133616 | systems/texlive/tlnet/archive/synctex.universal-darwin.r58157.tar.xz
-2021/03/06 |     133296 | systems/texlive/tlnet/archive/synctex.win32.r58144.tar.xz
+2021/04/08 |     133472 | systems/texlive/tlnet/archive/synctex.win32.r58783.tar.xz
 2021/03/16 |      72148 | systems/texlive/tlnet/archive/synctex.x86_64-cygwin.r58387.tar.xz
 2021/03/09 |      67524 | systems/texlive/tlnet/archive/synctex.x86_64-darwinlegacy.r58231.tar.xz
 2021/03/05 |      74536 | systems/texlive/tlnet/archive/synctex.x86_64-linuxmusl.r58136.tar.xz
@@ -275182,7 +275182,7 @@
 2021/02/27 |      83896 | systems/texlive/tlnet/archive/tex4ht.i386-solaris.r57938.tar.xz
 2021/03/15 |     905708 | systems/texlive/tlnet/archive/tex4ht.r58348.tar.xz
 2021/02/25 |     185088 | systems/texlive/tlnet/archive/tex4ht.universal-darwin.r57908.tar.xz
-2021/02/25 |      57780 | systems/texlive/tlnet/archive/tex4ht.win32.r57883.tar.xz
+2021/04/08 |      57760 | systems/texlive/tlnet/archive/tex4ht.win32.r58783.tar.xz
 2021/03/16 |      58360 | systems/texlive/tlnet/archive/tex4ht.x86_64-cygwin.r58387.tar.xz
 2021/03/09 |      84832 | systems/texlive/tlnet/archive/tex4ht.x86_64-darwinlegacy.r58231.tar.xz
 2021/02/24 |      94868 | systems/texlive/tlnet/archive/tex4ht.x86_64-linuxmusl.r57878.tar.xz
@@ -275358,8 +275358,8 @@
 2020/03/24 |        280 | systems/texlive/tlnet/archive/texlive-cz.r54496.tar.xz
 2021/03/23 |    1554012 | systems/texlive/tlnet/archive/texlive-de.doc.r58648.tar.xz
 2021/03/23 |        272 | systems/texlive/tlnet/archive/texlive-de.r58648.tar.xz
-2021/04/07 |     174316 | systems/texlive/tlnet/archive/texlive-docindex.doc.r58766.tar.xz
-2021/04/07 |        388 | systems/texlive/tlnet/archive/texlive-docindex.r58766.tar.xz
+2021/04/08 |     174312 | systems/texlive/tlnet/archive/texlive-docindex.doc.r58780.tar.xz
+2021/04/08 |        392 | systems/texlive/tlnet/archive/texlive-docindex.r58780.tar.xz
 2021/03/22 |    1937220 | systems/texlive/tlnet/archive/texlive-en.doc.r58572.tar.xz
 2021/03/22 |        272 | systems/texlive/tlnet/archive/texlive-en.r58572.tar.xz
 2021/03/09 |    3667820 | systems/texlive/tlnet/archive/texlive-es.doc.r58221.tar.xz
@@ -275388,7 +275388,7 @@
 2021/03/23 |        276 | systems/texlive/tlnet/archive/texlive-it.r58653.tar.xz
 2021/03/22 |    1845596 | systems/texlive/tlnet/archive/texlive-ja.doc.r58581.tar.xz
 2021/03/22 |        276 | systems/texlive/tlnet/archive/texlive-ja.r58581.tar.xz
-2021/04/02 |     141504 | systems/texlive/tlnet/archive/texlive-msg-translations.r58693.tar.xz
+2021/04/08 |     141480 | systems/texlive/tlnet/archive/texlive-msg-translations.r58781.tar.xz
 2019/02/28 |        344 | systems/texlive/tlnet/archive/texliveonfly.aarch64-linux.r46208.tar.xz
 2019/02/28 |        344 | systems/texlive/tlnet/archive/texliveonfly.amd64-freebsd.r24062.tar.xz
 2019/02/28 |        344 | systems/texlive/tlnet/archive/texliveonfly.amd64-netbsd.r30191.tar.xz
@@ -275415,7 +275415,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/04/07 |     211612 | systems/texlive/tlnet/archive/texlive-scripts.doc.r58769.tar.xz
+2021/04/08 |     211616 | systems/texlive/tlnet/archive/texlive-scripts.doc.r58791.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
@@ -275428,7 +275428,7 @@
 2020/01/27 |        920 | systems/texlive/tlnet/archive/texlive-scripts-extra.i386-solaris.r53577.tar.xz
 2020/04/15 |      23540 | systems/texlive/tlnet/archive/texlive-scripts-extra.r54744.tar.xz
 2021/02/25 |        900 | systems/texlive/tlnet/archive/texlive-scripts-extra.universal-darwin.r57908.tar.xz
-2021/02/25 |       4728 | systems/texlive/tlnet/archive/texlive-scripts-extra.win32.r57883.tar.xz
+2021/04/08 |       4732 | systems/texlive/tlnet/archive/texlive-scripts-extra.win32.r58783.tar.xz
 2020/01/27 |        916 | systems/texlive/tlnet/archive/texlive-scripts-extra.x86_64-cygwin.r53577.tar.xz
 2020/01/27 |        924 | systems/texlive/tlnet/archive/texlive-scripts-extra.x86_64-darwinlegacy.r53577.tar.xz
 2020/01/27 |        916 | systems/texlive/tlnet/archive/texlive-scripts-extra.x86_64-linuxmusl.r53577.tar.xz
@@ -275439,9 +275439,9 @@
 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/04/07 |     107044 | systems/texlive/tlnet/archive/texlive-scripts.r58769.tar.xz
+2021/04/08 |     107036 | systems/texlive/tlnet/archive/texlive-scripts.r58791.tar.xz
 2021/02/25 |        572 | systems/texlive/tlnet/archive/texlive-scripts.universal-darwin.r57908.tar.xz
-2021/02/25 |      36372 | systems/texlive/tlnet/archive/texlive-scripts.win32.r57883.tar.xz
+2021/04/08 |      36304 | systems/texlive/tlnet/archive/texlive-scripts.win32.r58783.tar.xz
 2020/05/17 |        588 | systems/texlive/tlnet/archive/texlive-scripts.x86_64-cygwin.r55172.tar.xz
 2020/05/12 |        592 | systems/texlive/tlnet/archive/texlive-scripts.x86_64-darwinlegacy.r55117.tar.xz
 2020/05/17 |        596 | systems/texlive/tlnet/archive/texlive-scripts.x86_64-linuxmusl.r55172.tar.xz
@@ -275536,9 +275536,9 @@
 2021/02/28 |        896 | systems/texlive/tlnet/archive/tex.r57972.tar.xz
 2021/01/08 |     423944 | systems/texlive/tlnet/archive/tex-refs.doc.r57349.tar.xz
 2021/01/08 |        488 | systems/texlive/tlnet/archive/tex-refs.r57349.tar.xz
-2019/02/28 |     714020 | systems/texlive/tlnet/archive/texshade.doc.r46559.tar.xz
-2019/02/28 |      58772 | systems/texlive/tlnet/archive/texshade.r46559.tar.xz
-2019/02/28 |     134816 | systems/texlive/tlnet/archive/texshade.source.r46559.tar.xz
+2021/04/08 |     921548 | systems/texlive/tlnet/archive/texshade.doc.r58789.tar.xz
+2021/04/08 |      61740 | systems/texlive/tlnet/archive/texshade.r58789.tar.xz
+2021/04/08 |     152840 | systems/texlive/tlnet/archive/texshade.source.r58789.tar.xz
 2019/02/28 |        324 | systems/texlive/tlnet/archive/texsis.aarch64-linux.r46208.tar.xz
 2019/02/28 |        324 | systems/texlive/tlnet/archive/texsis.amd64-freebsd.r16472.tar.xz
 2019/02/28 |        324 | systems/texlive/tlnet/archive/texsis.amd64-netbsd.r30191.tar.xz
@@ -275601,13 +275601,13 @@
 2021/02/27 |      50728 | systems/texlive/tlnet/archive/texware.i386-solaris.r57938.tar.xz
 2021/02/28 |        636 | systems/texlive/tlnet/archive/texware.r57972.tar.xz
 2021/02/25 |     102656 | systems/texlive/tlnet/archive/texware.universal-darwin.r57908.tar.xz
-2021/02/25 |      18880 | systems/texlive/tlnet/archive/texware.win32.r57883.tar.xz
+2021/04/08 |      18864 | systems/texlive/tlnet/archive/texware.win32.r58783.tar.xz
 2021/03/16 |      20628 | systems/texlive/tlnet/archive/texware.x86_64-cygwin.r58387.tar.xz
 2021/03/09 |      50592 | systems/texlive/tlnet/archive/texware.x86_64-darwinlegacy.r58231.tar.xz
 2021/02/24 |      55484 | systems/texlive/tlnet/archive/texware.x86_64-linuxmusl.r57878.tar.xz
 2021/02/24 |      50156 | systems/texlive/tlnet/archive/texware.x86_64-linux.r57878.tar.xz
 2021/02/27 |      56068 | systems/texlive/tlnet/archive/texware.x86_64-solaris.r57938.tar.xz
-2021/03/13 |     133112 | systems/texlive/tlnet/archive/tex.win32.r58289.tar.xz
+2021/04/08 |     133108 | systems/texlive/tlnet/archive/tex.win32.r58783.tar.xz
 2020/03/04 |        736 | systems/texlive/tlnet/archive/texworks.doc.r54074.tar.xz
 2020/03/04 |        492 | systems/texlive/tlnet/archive/texworks.r54074.tar.xz
 2021/03/13 |   17923264 | systems/texlive/tlnet/archive/texworks.win32.r58285.tar.xz
@@ -275714,7 +275714,7 @@
 2021/02/27 |      32556 | systems/texlive/tlnet/archive/tie.i386-solaris.r57938.tar.xz
 2021/02/28 |        476 | systems/texlive/tlnet/archive/tie.r57972.tar.xz
 2021/02/25 |      63324 | systems/texlive/tlnet/archive/tie.universal-darwin.r57908.tar.xz
-2021/02/26 |       5972 | systems/texlive/tlnet/archive/tie.win32.r57934.tar.xz
+2021/04/08 |       5980 | systems/texlive/tlnet/archive/tie.win32.r58783.tar.xz
 2021/03/16 |       5204 | systems/texlive/tlnet/archive/tie.x86_64-cygwin.r58387.tar.xz
 2021/03/09 |      31928 | systems/texlive/tlnet/archive/tie.x86_64-darwinlegacy.r58231.tar.xz
 2021/02/24 |      35684 | systems/texlive/tlnet/archive/tie.x86_64-linuxmusl.r57878.tar.xz
@@ -275913,13 +275913,13 @@
 2019/07/06 |        344 | systems/texlive/tlnet/archive/tlshell.amd64-freebsd.r45015.tar.xz
 2019/07/06 |        340 | systems/texlive/tlnet/archive/tlshell.amd64-netbsd.r45015.tar.xz
 2019/07/06 |        340 | systems/texlive/tlnet/archive/tlshell.armhf-linux.r45015.tar.xz
-2021/03/11 |        668 | systems/texlive/tlnet/archive/tlshell.doc.r58251.tar.xz
+2021/04/08 |        668 | systems/texlive/tlnet/archive/tlshell.doc.r58792.tar.xz
 2019/07/06 |        340 | systems/texlive/tlnet/archive/tlshell.i386-cygwin.r45015.tar.xz
 2019/07/06 |        340 | systems/texlive/tlnet/archive/tlshell.i386-freebsd.r45015.tar.xz
 2019/07/06 |        340 | systems/texlive/tlnet/archive/tlshell.i386-linux.r45015.tar.xz
 2019/07/06 |        340 | systems/texlive/tlnet/archive/tlshell.i386-netbsd.r45015.tar.xz
 2019/07/06 |        340 | systems/texlive/tlnet/archive/tlshell.i386-solaris.r45015.tar.xz
-2021/03/11 |      28964 | systems/texlive/tlnet/archive/tlshell.r58251.tar.xz
+2021/04/08 |      29504 | systems/texlive/tlnet/archive/tlshell.r58792.tar.xz
 2021/02/25 |        340 | systems/texlive/tlnet/archive/tlshell.universal-darwin.r57908.tar.xz
 2021/03/04 |    2787672 | systems/texlive/tlnet/archive/tlshell.win32.r58093.tar.xz
 2019/07/06 |        340 | systems/texlive/tlnet/archive/tlshell.x86_64-cygwin.r45015.tar.xz
@@ -276069,7 +276069,7 @@
 2021/02/27 |     405500 | systems/texlive/tlnet/archive/ttfutils.i386-solaris.r57938.tar.xz
 2021/02/28 |     108728 | systems/texlive/tlnet/archive/ttfutils.r57972.tar.xz
 2021/02/25 |     802700 | systems/texlive/tlnet/archive/ttfutils.universal-darwin.r57908.tar.xz
-2021/02/25 |     336812 | systems/texlive/tlnet/archive/ttfutils.win32.r57883.tar.xz
+2021/04/08 |     336752 | systems/texlive/tlnet/archive/ttfutils.win32.r58783.tar.xz
 2021/03/16 |     368256 | systems/texlive/tlnet/archive/ttfutils.x86_64-cygwin.r58387.tar.xz
 2021/03/09 |     404300 | systems/texlive/tlnet/archive/ttfutils.x86_64-darwinlegacy.r58231.tar.xz
 2021/02/24 |     453820 | systems/texlive/tlnet/archive/ttfutils.x86_64-linuxmusl.r57878.tar.xz
@@ -276376,7 +276376,7 @@
 2021/03/16 |    7359204 | systems/texlive/tlnet/archive/uptex.i386-solaris.r58388.tar.xz
 2021/02/28 |        912 | systems/texlive/tlnet/archive/uptex.r57972.tar.xz
 2021/03/17 |   14666316 | systems/texlive/tlnet/archive/uptex.universal-darwin.r58418.tar.xz
-2021/03/22 |    1855948 | systems/texlive/tlnet/archive/uptex.win32.r58615.tar.xz
+2021/04/08 |    1855788 | systems/texlive/tlnet/archive/uptex.win32.r58783.tar.xz
 2021/03/16 |    7080292 | systems/texlive/tlnet/archive/uptex.x86_64-cygwin.r58387.tar.xz
 2021/03/16 |    7009564 | systems/texlive/tlnet/archive/uptex.x86_64-darwinlegacy.r58388.tar.xz
 2021/03/16 |    7321468 | systems/texlive/tlnet/archive/uptex.x86_64-linuxmusl.r58378.tar.xz
@@ -276636,7 +276636,7 @@
 2019/03/17 |        336 | systems/texlive/tlnet/archive/webquiz.x86_64-solaris.r50419.tar.xz
 2021/02/28 |        500 | systems/texlive/tlnet/archive/web.r57972.tar.xz
 2021/02/25 |     162244 | systems/texlive/tlnet/archive/web.universal-darwin.r57908.tar.xz
-2021/02/25 |      39200 | systems/texlive/tlnet/archive/web.win32.r57883.tar.xz
+2021/04/08 |      39168 | systems/texlive/tlnet/archive/web.win32.r58783.tar.xz
 2021/03/16 |      44864 | systems/texlive/tlnet/archive/web.x86_64-cygwin.r58387.tar.xz
 2021/03/09 |      75068 | systems/texlive/tlnet/archive/web.x86_64-darwinlegacy.r58231.tar.xz
 2021/02/24 |      84236 | systems/texlive/tlnet/archive/web.x86_64-linuxmusl.r57878.tar.xz
@@ -276654,8 +276654,8 @@
 2020/04/25 |       6284 | systems/texlive/tlnet/archive/willowtreebook.r54866.tar.xz
 2021/02/01 |     488640 | systems/texlive/tlnet/archive/windycity.doc.r57577.tar.xz
 2021/02/01 |      19476 | systems/texlive/tlnet/archive/windycity.r57577.tar.xz
-2021/03/09 |     998700 | systems/texlive/tlnet/archive/wintools.win32.doc.r58232.tar.xz
-2021/03/09 |    5339724 | systems/texlive/tlnet/archive/wintools.win32.r58232.tar.xz
+2021/04/08 |     998704 | systems/texlive/tlnet/archive/wintools.win32.doc.r58783.tar.xz
+2021/04/08 |    5338756 | systems/texlive/tlnet/archive/wintools.win32.r58783.tar.xz
 2019/11/05 |     475336 | systems/texlive/tlnet/archive/withargs.doc.r52641.tar.xz
 2019/11/05 |       6100 | systems/texlive/tlnet/archive/withargs.r52641.tar.xz
 2021/03/05 |     916488 | systems/texlive/tlnet/archive/witharrows.doc.r58120.tar.xz
@@ -276828,7 +276828,7 @@
 2019/02/28 |       1204 | systems/texlive/tlnet/archive/xetex-tibetan.doc.r28847.tar.xz
 2019/02/28 |       7048 | systems/texlive/tlnet/archive/xetex-tibetan.r28847.tar.xz
 2021/03/17 |   13815156 | systems/texlive/tlnet/archive/xetex.universal-darwin.r58418.tar.xz
-2021/03/13 |    9412792 | systems/texlive/tlnet/archive/xetex.win32.r58289.tar.xz
+2021/04/08 |    9412692 | systems/texlive/tlnet/archive/xetex.win32.r58783.tar.xz
 2021/03/16 |    7024160 | systems/texlive/tlnet/archive/xetex.x86_64-cygwin.r58387.tar.xz
 2021/03/16 |    6660724 | systems/texlive/tlnet/archive/xetex.x86_64-darwinlegacy.r58388.tar.xz
 2021/03/16 |    7145000 | systems/texlive/tlnet/archive/xetex.x86_64-linuxmusl.r58378.tar.xz
@@ -276914,7 +276914,7 @@
 2021/02/27 |      47552 | systems/texlive/tlnet/archive/xml2pmx.i386-solaris.r57938.tar.xz
 2021/02/28 |        496 | systems/texlive/tlnet/archive/xml2pmx.r57972.tar.xz
 2021/02/25 |      68108 | systems/texlive/tlnet/archive/xml2pmx.universal-darwin.r57908.tar.xz
-2021/02/27 |     100732 | systems/texlive/tlnet/archive/xml2pmx.win32.r57942.tar.xz
+2021/04/08 |     100788 | systems/texlive/tlnet/archive/xml2pmx.win32.r58785.tar.xz
 2021/03/16 |      46920 | systems/texlive/tlnet/archive/xml2pmx.x86_64-cygwin.r58387.tar.xz
 2021/03/09 |      46304 | systems/texlive/tlnet/archive/xml2pmx.x86_64-darwinlegacy.r58231.tar.xz
 2021/02/24 |      48080 | systems/texlive/tlnet/archive/xml2pmx.x86_64-linuxmusl.r57878.tar.xz
@@ -277128,16 +277128,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/03/24 |     105293 | systems/texlive/tlnet/install-tl
-2021/04/07 |    6191401 | systems/texlive/tlnet/install-tl-unx.tar.gz
-2021/04/07 |        152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
-2021/04/07 |        455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
+2021/04/08 |    6192746 | systems/texlive/tlnet/install-tl-unx.tar.gz
+2021/04/08 |        152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
+2021/04/08 |        455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
 2020/08/23 |       4889 | systems/texlive/tlnet/install-tl-windows.bat
-2021/04/07 |   20132481 | systems/texlive/tlnet/install-tl-windows.exe
-2021/04/07 |        153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
-2021/04/07 |        455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
-2021/04/07 |   24961619 | systems/texlive/tlnet/install-tl.zip
-2021/04/07 |        145 | systems/texlive/tlnet/install-tl.zip.sha512
-2021/04/07 |        455 | systems/texlive/tlnet/install-tl.zip.sha512.asc
+2021/04/08 |   20131872 | systems/texlive/tlnet/install-tl-windows.exe
+2021/04/08 |        153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
+2021/04/08 |        455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
+2021/04/08 |   24962217 | systems/texlive/tlnet/install-tl.zip
+2021/04/08 |        145 | systems/texlive/tlnet/install-tl.zip.sha512
+2021/04/08 |        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/03/15 |       6571 | systems/texlive/tlnet/tlpkg/gpg/pubring.gpg
@@ -277147,13 +277147,13 @@
 2021/03/15 |       1280 | systems/texlive/tlnet/tlpkg/gpg/trustdb.gpg
 2021/01/27 |      49446 | systems/texlive/tlnet/tlpkg/installer/config.guess
 2010/11/11 |      11651 | systems/texlive/tlnet/tlpkg/installer/COPYING.MinGW-runtime.txt
-2021/04/05 |       6598 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
+2021/04/07 |       6719 | 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
 2021/02/27 |       5390 | systems/texlive/tlnet/tlpkg/installer/install-menu-extl.pl
 2021/02/27 |      33392 | systems/texlive/tlnet/tlpkg/installer/install-menu-text.pl
-2021/04/06 |      65175 | systems/texlive/tlnet/tlpkg/installer/install-tl-gui.tcl
+2021/04/07 |      65140 | systems/texlive/tlnet/tlpkg/installer/install-tl-gui.tcl
 2020/03/16 |     240640 | systems/texlive/tlnet/tlpkg/installer/tar.exe
 2018/07/06 |      26224 | systems/texlive/tlnet/tlpkg/installer/texlion.gif
 2016/04/07 |        423 | systems/texlive/tlnet/tlpkg/installer/tl-cmd.bat
@@ -277190,12 +277190,12 @@
 2021/04/03 |      20365 | systems/texlive/tlnet/tlpkg/TeXLive/TLCrypto.pm
 2021/02/20 |       5400 | systems/texlive/tlnet/tlpkg/TeXLive/TLDownload.pm
 2020/09/22 |      27563 | systems/texlive/tlnet/tlpkg/TeXLive/TLPaper.pm
-2021/04/07 |   17176050 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
-2021/04/07 |         48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
+2021/04/08 |   17176042 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
+2021/04/08 |         48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
 2020/05/13 |      86417 | systems/texlive/tlnet/tlpkg/TeXLive/TLPDB.pm
-2021/04/07 |        144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
-2021/04/07 |        455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
-2021/04/07 |    2295036 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
+2021/04/08 |        144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
+2021/04/08 |        455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
+2021/04/08 |    2294592 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
 2021/03/15 |      58775 | systems/texlive/tlnet/tlpkg/TeXLive/TLPOBJ.pm
 2021/03/17 |      42077 | systems/texlive/tlnet/tlpkg/TeXLive/TLPSRC.pm
 2020/05/11 |      15010 | systems/texlive/tlnet/tlpkg/TeXLive/TLTREE.pm
@@ -279892,27 +279892,27 @@
 2020/03/17 |      26075 | systems/texlive/tlnet/tlpkg/tltcl/lib/tk8.6/xmfbox.tcl
 2021/03/02 |       3531 | systems/texlive/tlnet/tlpkg/tltcl/lib/tkConfig.sh
 2018/11/30 |       1310 | systems/texlive/tlnet/tlpkg/tltcl/tlmgr.gif
-2021/03/10 |      22643 | systems/texlive/tlnet/tlpkg/tltcl/tltcl.tcl
-2021/03/24 |      81245 | systems/texlive/tlnet/tlpkg/translations/cs.po
-2021/03/24 |      88734 | systems/texlive/tlnet/tlpkg/translations/de.po
+2021/04/07 |      24937 | systems/texlive/tlnet/tlpkg/tltcl/tltcl.tcl
+2021/04/07 |      81245 | systems/texlive/tlnet/tlpkg/translations/cs.po
+2021/04/07 |      88734 | systems/texlive/tlnet/tlpkg/translations/de.po
 2021/03/10 |      78688 | systems/texlive/tlnet/tlpkg/translations/es.po
-2021/03/24 |      93175 | systems/texlive/tlnet/tlpkg/translations/fr.po
+2021/04/07 |      93175 | systems/texlive/tlnet/tlpkg/translations/fr.po
 2021/03/23 |      86826 | systems/texlive/tlnet/tlpkg/translations/it.po
-2021/03/24 |      61672 | systems/texlive/tlnet/tlpkg/translations/ja.po
-2021/03/24 |      46389 | systems/texlive/tlnet/tlpkg/translations/messages.pot
-2021/03/24 |      57096 | systems/texlive/tlnet/tlpkg/translations/nl.po
-2021/03/24 |      66231 | systems/texlive/tlnet/tlpkg/translations/pl.po
+2021/04/07 |      61672 | systems/texlive/tlnet/tlpkg/translations/ja.po
+2021/04/07 |      46389 | systems/texlive/tlnet/tlpkg/translations/messages.pot
+2021/04/07 |      57096 | systems/texlive/tlnet/tlpkg/translations/nl.po
+2021/04/07 |      66231 | systems/texlive/tlnet/tlpkg/translations/pl.po
 2021/03/10 |      81373 | systems/texlive/tlnet/tlpkg/translations/pt_BR.po
 2019/03/25 |        430 | systems/texlive/tlnet/tlpkg/translations/README
 2021/03/10 |     105281 | systems/texlive/tlnet/tlpkg/translations/ru.po
-2021/03/24 |      88080 | systems/texlive/tlnet/tlpkg/translations/sk.po
+2021/04/07 |      88080 | systems/texlive/tlnet/tlpkg/translations/sk.po
 2021/03/10 |      68876 | systems/texlive/tlnet/tlpkg/translations/sl.po
 2021/03/10 |     102597 | systems/texlive/tlnet/tlpkg/translations/sr.po
 2019/03/28 |        847 | systems/texlive/tlnet/tlpkg/translations/translators
 2021/03/10 |      79702 | systems/texlive/tlnet/tlpkg/translations/uk.po
-2021/03/24 |      89718 | systems/texlive/tlnet/tlpkg/translations/vi.po
-2021/03/24 |      62686 | systems/texlive/tlnet/tlpkg/translations/zh_CN.po
-2021/03/24 |      52617 | systems/texlive/tlnet/tlpkg/translations/zh_TW.po
+2021/04/07 |      89718 | systems/texlive/tlnet/tlpkg/translations/vi.po
+2021/04/07 |      62686 | systems/texlive/tlnet/tlpkg/translations/zh_CN.po
+2021/04/07 |      52617 | systems/texlive/tlnet/tlpkg/translations/zh_TW.po
 2021/03/25 |    4032421 | systems/texlive/tlnet/update-tlmgr-r58646.exe
 2021/03/25 |        154 | systems/texlive/tlnet/update-tlmgr-r58646.exe.sha512
 2021/03/25 |        455 | systems/texlive/tlnet/update-tlmgr-r58646.exe.sha512.asc
@@ -279937,13 +279937,13 @@
 2020/12/04 |       7438 | systems/unix/tex-fpc/dvips/Makefile
 2020/11/30 |       1355 | systems/unix/tex-fpc/dvips/README
 2021/01/30 |       6470 | systems/unix/tex-fpc/dvitype.ch
-2020/10/30 |       1799 | systems/unix/tex-fpc/fpcbugs
+2021/04/08 |       1800 | systems/unix/tex-fpc/fpcbugs
 2021/01/30 |       2933 | systems/unix/tex-fpc/gftopk.ch
 2021/01/30 |       3623 | systems/unix/tex-fpc/gftype.ch
-2021/02/01 |       4914 | systems/unix/tex-fpc/history
+2021/04/08 |       5015 | systems/unix/tex-fpc/history
 2021/01/19 |       1301 | systems/unix/tex-fpc/license
 2020/12/24 |       1146 | systems/unix/tex-fpc/local.mf
-2021/02/15 |      21485 | systems/unix/tex-fpc/mf.ch
+2021/04/08 |      21903 | systems/unix/tex-fpc/mf.ch
 2020/11/23 |         30 | systems/unix/tex-fpc/MFT/iby/agr.tex
 2020/11/23 |        662 | systems/unix/tex-fpc/MFT/iby/getiby
 2020/11/23 |        269 | systems/unix/tex-fpc/MFT/iby/getlevy
@@ -279953,7 +279953,7 @@
 2020/11/23 |        531 | systems/unix/tex-fpc/MFT/iby/sappho.tex
 2016/07/20 |       2740 | systems/unix/tex-fpc/MFT/iby/test.tex
 2021/02/06 |         61 | systems/unix/tex-fpc/MFT/logmacfonts
-2021/02/06 |        326 | systems/unix/tex-fpc/MFT/manfonts
+2021/02/25 |        395 | systems/unix/tex-fpc/MFT/manfonts
 2021/02/06 |        124 | systems/unix/tex-fpc/MFT/mfwebfonts
 2021/02/14 |       1091 | systems/unix/tex-fpc/MFT/plainfonts
 2021/02/06 |         60 | systems/unix/tex-fpc/MFT/webfonts
@@ -279965,7 +279965,7 @@
 2020/10/29 |        221 | systems/unix/tex-fpc/mp/mpx
 2020/10/29 |       6007 | systems/unix/tex-fpc/mp/readme
 2020/11/07 |       1678 | systems/unix/tex-fpc/pltotf.ch
-2021/02/15 |      14071 | systems/unix/tex-fpc/README
+2021/04/08 |      14141 | systems/unix/tex-fpc/README
 2020/11/21 |        304 | systems/unix/tex-fpc/shell/itgl
 2020/11/28 |        590 | systems/unix/tex-fpc/shell/MakeTeXPK
 2021/02/06 |        361 | systems/unix/tex-fpc/shell/mkfont
@@ -279981,8 +279981,8 @@
 2020/11/23 |        727 | systems/unix/tex-fpc/tech/mktech
 2020/10/24 |       1072 | systems/unix/tex-fpc/tech/readme
 2020/10/24 |       3364 | systems/unix/tex-fpc/tech/test.tex
-2021/02/15 |      41796 | systems/unix/tex-fpc/tex.ch
-2021/02/15 |     189125 | systems/unix/tex-fpc/tex-fpc.pdf
+2021/04/08 |      42212 | systems/unix/tex-fpc/tex.ch
+2021/04/08 |     613445 | systems/unix/tex-fpc/tex-fpc.pdf
 2020/11/07 |       1893 | systems/unix/tex-fpc/tftopl.ch
 2020/10/19 |        202 | systems/unix/tex-fpc/trap/diff_trap.fot
 2020/10/20 |        405 | systems/unix/tex-fpc/trap/diff_trapin.log
@@ -279996,7 +279996,10 @@
 2020/11/16 |       1266 | systems/unix/tex-fpc/trip/diff_trip.log300
 2021/02/06 |        142 | systems/unix/tex-fpc/trip/diff_trip.typ
 2021/02/06 |       2000 | systems/unix/tex-fpc/trip/report
-2021/02/01 |       4885 | systems/unix/tex-fpc/weave.ch
+2021/04/08 |       2094 | systems/unix/tex-fpc/twebmac/patch.sh
+2021/04/08 |        763 | systems/unix/tex-fpc/twebmac/README
+2021/04/08 |       4179 | systems/unix/tex-fpc/twebmac/report
+2021/02/16 |       4894 | systems/unix/tex-fpc/weave.ch
 2021/02/15 |        492 | systems/unix/tex-fpc/webmac-fpc.tex
 2020/09/09 |        410 | systems/unix/tex-fpc/xdvi/config
 2020/10/06 |        271 | systems/unix/tex-fpc/xdvi/configdiff
@@ -280004,7 +280007,7 @@
 2009/11/29 |      36493 | systems/unix/tex-fpc/xdvi/macxdvi.h
 2020/12/25 |       1731 | systems/unix/tex-fpc/xdvi/README
 2020/09/08 |        359 | systems/unix/tex-fpc/xdvi/Xdvi
-2021/02/15 |     254612 | systems/unix/tex-fpc.zip
+2021/04/08 |     637761 | systems/unix/tex-fpc.zip
 2008/08/29 |       1984 | systems/unix/tex-gpc/dvipsnk/dvipsmanfonts
 2009/10/04 |       7438 | systems/unix/tex-gpc/dvipsnk/Makefile
 2008/08/29 |        590 | systems/unix/tex-gpc/dvipsnk/MakeTeXPK
@@ -281877,7 +281880,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/04/07 |     574321 | systems/win32/miktex/tm/packages/files.csv.lzma
+2021/04/08 |     574321 | 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
@@ -283075,9 +283078,9 @@
 2018/01/12 |     157226 | systems/win32/miktex/tm/packages/miktex-zip-bin-x64.tar.lzma
 2021/03/15 |      39247 | systems/win32/miktex/tm/packages/miktex-zlib-bin-2.9.tar.lzma
 2021/03/15 |      43386 | systems/win32/miktex/tm/packages/miktex-zlib-bin-x64-2.9.tar.lzma
-2021/04/07 |     208854 | systems/win32/miktex/tm/packages/miktex-zzdb1-2.9.tar.lzma
-2021/04/07 |    1266588 | systems/win32/miktex/tm/packages/miktex-zzdb2-2.9.tar.lzma
-2021/04/07 |    1183705 | systems/win32/miktex/tm/packages/miktex-zzdb3-2.9.tar.lzma
+2021/04/08 |     208844 | systems/win32/miktex/tm/packages/miktex-zzdb1-2.9.tar.lzma
+2021/04/08 |    1267329 | systems/win32/miktex/tm/packages/miktex-zzdb2-2.9.tar.lzma
+2021/04/08 |    1183054 | systems/win32/miktex/tm/packages/miktex-zzdb3-2.9.tar.lzma
 2021/03/15 |      13447 | systems/win32/miktex/tm/packages/miktex-zzip-bin-2.9.tar.lzma
 2021/03/15 |      14320 | 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
@@ -283238,190 +283241,190 @@
 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/04/07 |     573897 | systems/win32/miktex/tm/packages/next/files.csv.lzma
-2021/04/07 |      50847 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-2.9.tar.lzma
-2021/04/07 |      56456 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-x64-2.9.tar.lzma
-2021/04/07 |     968701 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-2.9.tar.lzma
-2021/04/07 |    1078878 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-x64-2.9.tar.lzma
-2021/04/07 |      29055 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-2.9.tar.lzma
-2021/04/07 |      31343 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-x64-2.9.tar.lzma
-2021/04/07 |      29867 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-2.9.tar.lzma
-2021/04/07 |      34634 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-x64-2.9.tar.lzma
-2021/04/07 |      49973 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-2.9.tar.lzma
-2021/04/07 |      57597 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-x64-2.9.tar.lzma
-2021/04/07 |      84772 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-2.9.tar.lzma
-2021/04/07 |      94736 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-x64-2.9.tar.lzma
-2021/04/07 |      67679 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-2.9.tar.lzma
-2021/04/07 |      75419 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-x64-2.9.tar.lzma
-2021/04/07 |      27183 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-2.9.tar.lzma
-2021/04/07 |      30885 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-x64-2.9.tar.lzma
-2021/04/07 |     330235 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-2.9.tar.lzma
-2021/04/07 |     392597 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-x64-2.9.tar.lzma
-2021/04/07 |      32744 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-2.9.tar.lzma
-2021/04/07 |      36680 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-x64-2.9.tar.lzma
-2021/04/07 |      51431 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-2.9.tar.lzma
-2021/04/07 |      56716 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-x64-2.9.tar.lzma
-2021/04/07 |       4707 | systems/win32/miktex/tm/packages/next/miktex-config-2.9.tar.lzma
-2021/04/07 |     239478 | systems/win32/miktex/tm/packages/next/miktex-console-bin-2.9.tar.lzma
-2021/04/07 |     261962 | systems/win32/miktex/tm/packages/next/miktex-console-bin-x64-2.9.tar.lzma
-2021/04/07 |     179379 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-2.9.tar.lzma
-2021/04/07 |     195666 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-x64-2.9.tar.lzma
-2021/04/07 |      52476 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-2.9.tar.lzma
-2021/04/07 |      59145 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-x64-2.9.tar.lzma
-2021/04/07 |      21129 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-2.9.tar.lzma
-2021/04/07 |      23291 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-x64-2.9.tar.lzma
-2021/04/07 |     461399 | systems/win32/miktex/tm/packages/next/miktex-doc.tar.lzma
-2021/04/07 |      45648 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-2.9.tar.lzma
-2021/04/07 |      51160 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-x64-2.9.tar.lzma
-2021/04/07 |     282106 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-2.9.tar.lzma
-2021/04/07 |     321894 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-x64-2.9.tar.lzma
-2021/04/07 |      41103 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-2.9.tar.lzma
-2021/04/07 |      45278 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-x64-2.9.tar.lzma
-2021/04/07 |     116931 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-2.9.tar.lzma
-2021/04/07 |     131490 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-x64-2.9.tar.lzma
-2021/04/07 |    1281104 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-2.9.tar.lzma
-2021/04/07 |    1425980 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-x64-2.9.tar.lzma
-2021/04/07 |      87638 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-2.9.tar.lzma
-2021/04/07 |      99605 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-x64-2.9.tar.lzma
-2021/04/07 |      43058 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-2.9.tar.lzma
-2021/04/07 |      47877 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-x64-2.9.tar.lzma
-2021/04/07 |      25156 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-2.9.tar.lzma
-2021/04/07 |      28008 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-x64-2.9.tar.lzma
-2021/04/07 |      55823 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-2.9.tar.lzma
-2021/04/07 |      62800 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-x64-2.9.tar.lzma
-2021/04/07 |     135005 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-2.9.tar.lzma
-2021/04/07 |     152762 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-x64-2.9.tar.lzma
-2021/04/07 |      73182 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-2.9.tar.lzma
-2021/04/07 |      77858 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-x64-2.9.tar.lzma
-2021/04/07 |      71569 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-2.9.tar.lzma
-2021/04/07 |      80661 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-x64-2.9.tar.lzma
-2021/04/07 |     258665 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-2.9.tar.lzma
-2021/04/07 |     295553 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-x64-2.9.tar.lzma
-2021/04/07 |      22039 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-2.9.tar.lzma
-2021/04/07 |      25001 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-x64-2.9.tar.lzma
-2021/04/07 |      97491 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-2.9.tar.lzma
-2021/04/07 |     112251 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-x64-2.9.tar.lzma
-2021/04/07 |      63836 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-2.9.tar.lzma
-2021/04/07 |      72862 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-x64-2.9.tar.lzma
-2021/04/07 |      96146 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-2.9.tar.lzma
-2021/04/07 |     115468 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-x64-2.9.tar.lzma
-2021/04/07 |      38070 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-2.9.tar.lzma
-2021/04/07 |      42628 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-x64-2.9.tar.lzma
-2021/04/07 |     484054 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-2.9.tar.lzma
-2021/04/07 |     567625 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-x64-2.9.tar.lzma
-2021/04/07 |     147139 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-2.9.tar.lzma
-2021/04/07 |     159968 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-x64-2.9.tar.lzma
-2021/04/07 |      94803 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-2.9.tar.lzma
-2021/04/07 |     109276 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-x64-2.9.tar.lzma
-2021/04/07 |      16327 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-2.9.tar.lzma
-2021/04/07 |      17958 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-x64-2.9.tar.lzma
-2021/04/07 |      28119 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-2.9.tar.lzma
-2021/04/07 |      30037 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-x64-2.9.tar.lzma
-2021/04/07 |     625283 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-2.9.tar.lzma
-2021/04/07 |     680049 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-x64-2.9.tar.lzma
-2021/04/07 |     532038 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-2.9.tar.lzma
-2021/04/07 |     594870 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-x64-2.9.tar.lzma
-2021/04/07 |     475935 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-2.9.tar.lzma
-2021/04/07 |     511634 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-x64-2.9.tar.lzma
-2021/04/07 |      94269 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-2.9.tar.lzma
-2021/04/07 |     103323 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-x64-2.9.tar.lzma
-2021/04/07 |    1725550 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-2.9.tar.lzma
-2021/04/07 |    2009489 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-x64-2.9.tar.lzma
-2021/04/07 |      67651 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-2.9.tar.lzma
-2021/04/07 |      74165 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-x64-2.9.tar.lzma
-2021/04/07 |      27362 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-2.9.tar.lzma
-2021/04/07 |      31593 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-x64-2.9.tar.lzma
-2021/04/07 |       7746 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-2.9.tar.lzma
-2021/04/07 |       8775 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-x64-2.9.tar.lzma
-2021/04/07 |     195565 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-2.9.tar.lzma
-2021/04/07 |     214103 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-x64-2.9.tar.lzma
-2021/04/07 |     250211 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-2.9.tar.lzma
-2021/04/07 |     283977 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-x64-2.9.tar.lzma
-2021/04/07 |      97132 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-2.9.tar.lzma
-2021/04/07 |     101760 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-x64-2.9.tar.lzma
-2021/04/07 |      60552 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-2.9.tar.lzma
-2021/04/07 |      67930 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-x64-2.9.tar.lzma
-2021/04/07 |     124972 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-2.9.tar.lzma
-2021/04/07 |     136426 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-x64-2.9.tar.lzma
-2021/04/07 |     147151 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-2.9.tar.lzma
-2021/04/07 |     163655 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-x64-2.9.tar.lzma
-2021/04/07 |     199700 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-2.9.tar.lzma
-2021/04/07 |     180047 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-x64-2.9.tar.lzma
-2021/04/07 |      67450 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-2.9.tar.lzma
-2021/04/07 |      77487 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-x64-2.9.tar.lzma
-2021/04/07 |      31193 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-2.9.tar.lzma
-2021/04/07 |      35063 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-x64-2.9.tar.lzma
-2021/04/07 |      38065 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-2.9.tar.lzma
-2021/04/07 |      42574 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-x64-2.9.tar.lzma
-2021/04/07 |      42924 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-2.9.tar.lzma
-2021/04/07 |      47008 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-x64-2.9.tar.lzma
-2021/04/07 |      45937 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-2.9.tar.lzma
-2021/04/07 |      52454 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-x64-2.9.tar.lzma
-2021/04/07 |     193715 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-2.9.tar.lzma
-2021/04/07 |     211053 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-x64-2.9.tar.lzma
-2021/04/07 |      35462 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin.tar.lzma
-2021/04/07 |      39691 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin-x64.tar.lzma
-2021/04/07 |     748362 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-2.9.tar.lzma
-2021/04/07 |     816071 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-x64-2.9.tar.lzma
-2021/04/07 |     198129 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-2.9.tar.lzma
-2021/04/07 |     202556 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-x64-2.9.tar.lzma
-2021/04/07 |     208181 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-2.9.tar.lzma
-2021/04/07 |     243479 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-x64-2.9.tar.lzma
-2021/04/07 |      78745 | systems/win32/miktex/tm/packages/next/miktex-png-bin-2.9.tar.lzma
-2021/04/07 |      87704 | systems/win32/miktex/tm/packages/next/miktex-png-bin-x64-2.9.tar.lzma
-2021/04/07 |    1171731 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-2.9.tar.lzma
-2021/04/07 |    1307722 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-x64-2.9.tar.lzma
-2021/04/07 |      20121 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-2.9.tar.lzma
-2021/04/07 |      23882 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-x64-2.9.tar.lzma
-2021/04/07 |      31543 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-2.9.tar.lzma
-2021/04/07 |      37244 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-x64-2.9.tar.lzma
-2021/04/07 |      64016 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-2.9.tar.lzma
-2021/04/07 |      72150 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-x64-2.9.tar.lzma
-2021/04/07 |      43677 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-2.9.tar.lzma
-2021/04/07 |      51978 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-x64-2.9.tar.lzma
-2021/04/07 |    1295413 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-2.9.tar.lzma
-2021/04/07 |    1424812 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-x64-2.9.tar.lzma
-2021/04/07 |      42389 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-2.9.tar.lzma
-2021/04/07 |      51797 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-x64-2.9.tar.lzma
-2021/04/07 |      56222 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin.tar.lzma
-2021/04/07 |      59831 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-x64.tar.lzma
-2021/04/07 |      25341 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-2.9.tar.lzma
-2021/04/07 |      27275 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-x64-2.9.tar.lzma
-2021/04/07 |      16111 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-2.9.tar.lzma
-2021/04/07 |      18097 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-x64-2.9.tar.lzma
-2021/04/07 |      63674 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-2.9.tar.lzma
-2021/04/07 |      70110 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-x64-2.9.tar.lzma
-2021/04/07 |     153889 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-2.9.tar.lzma
-2021/04/07 |     167906 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-x64-2.9.tar.lzma
-2021/04/07 |      56909 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-2.9.tar.lzma
-2021/04/07 |      65322 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-x64-2.9.tar.lzma
-2021/04/07 |      98519 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-2.9.tar.lzma
-2021/04/07 |     104625 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-x64-2.9.tar.lzma
-2021/04/07 |    2499400 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-2.9.tar.lzma
-2021/04/07 |    2616931 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-x64-2.9.tar.lzma
-2021/04/07 |      55219 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-2.9.tar.lzma
-2021/04/07 |      62227 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-x64-2.9.tar.lzma
-2021/04/07 |      33441 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin.tar.lzma
-2021/04/07 |      37293 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin-x64.tar.lzma
-2021/04/07 |      27198 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-2.9.tar.lzma
-2021/04/07 |      33154 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-x64-2.9.tar.lzma
-2021/04/07 |      65732 | systems/win32/miktex/tm/packages/next/miktex-web-bin-2.9.tar.lzma
-2021/04/07 |      70326 | systems/win32/miktex/tm/packages/next/miktex-web-bin-x64-2.9.tar.lzma
-2021/04/07 |     311191 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-2.9.tar.lzma
-2021/04/07 |     345366 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-x64-2.9.tar.lzma
-2021/04/07 |      55563 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin.tar.lzma
-2021/04/07 |      57067 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin-x64.tar.lzma
-2021/04/07 |     583628 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-2.9.tar.lzma
-2021/04/07 |     618763 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-x64-2.9.tar.lzma
-2021/04/07 |      39564 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-2.9.tar.lzma
-2021/04/07 |      43391 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-x64-2.9.tar.lzma
-2021/04/07 |     208854 | systems/win32/miktex/tm/packages/next/miktex-zzdb1-2.9.tar.lzma
-2021/04/07 |    1267530 | systems/win32/miktex/tm/packages/next/miktex-zzdb2-2.9.tar.lzma
-2021/04/07 |    1183249 | systems/win32/miktex/tm/packages/next/miktex-zzdb3-2.9.tar.lzma
-2021/04/07 |      13470 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-2.9.tar.lzma
-2021/04/07 |      14353 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-x64-2.9.tar.lzma
+2021/04/08 |     573897 | systems/win32/miktex/tm/packages/next/files.csv.lzma
+2021/04/08 |      50848 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-2.9.tar.lzma
+2021/04/08 |      56457 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-x64-2.9.tar.lzma
+2021/04/08 |     968698 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-2.9.tar.lzma
+2021/04/08 |    1078877 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-x64-2.9.tar.lzma
+2021/04/08 |      29053 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-2.9.tar.lzma
+2021/04/08 |      31344 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-x64-2.9.tar.lzma
+2021/04/08 |      29870 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-2.9.tar.lzma
+2021/04/08 |      34635 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-x64-2.9.tar.lzma
+2021/04/08 |      49972 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-2.9.tar.lzma
+2021/04/08 |      57599 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-x64-2.9.tar.lzma
+2021/04/08 |      84772 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-2.9.tar.lzma
+2021/04/08 |      94738 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-x64-2.9.tar.lzma
+2021/04/08 |      67680 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-2.9.tar.lzma
+2021/04/08 |      75418 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-x64-2.9.tar.lzma
+2021/04/08 |      27183 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-2.9.tar.lzma
+2021/04/08 |      30887 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-x64-2.9.tar.lzma
+2021/04/08 |     330232 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-2.9.tar.lzma
+2021/04/08 |     392596 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-x64-2.9.tar.lzma
+2021/04/08 |      32745 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-2.9.tar.lzma
+2021/04/08 |      36681 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-x64-2.9.tar.lzma
+2021/04/08 |      51432 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-2.9.tar.lzma
+2021/04/08 |      56718 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-x64-2.9.tar.lzma
+2021/04/08 |       4707 | systems/win32/miktex/tm/packages/next/miktex-config-2.9.tar.lzma
+2021/04/08 |     239479 | systems/win32/miktex/tm/packages/next/miktex-console-bin-2.9.tar.lzma
+2021/04/08 |     261963 | systems/win32/miktex/tm/packages/next/miktex-console-bin-x64-2.9.tar.lzma
+2021/04/08 |     179379 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-2.9.tar.lzma
+2021/04/08 |     195664 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-x64-2.9.tar.lzma
+2021/04/08 |      52476 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-2.9.tar.lzma
+2021/04/08 |      59144 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-x64-2.9.tar.lzma
+2021/04/08 |      21130 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-2.9.tar.lzma
+2021/04/08 |      23290 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-x64-2.9.tar.lzma
+2021/04/08 |     461400 | systems/win32/miktex/tm/packages/next/miktex-doc.tar.lzma
+2021/04/08 |      45648 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-2.9.tar.lzma
+2021/04/08 |      51159 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-x64-2.9.tar.lzma
+2021/04/08 |     282106 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-2.9.tar.lzma
+2021/04/08 |     321895 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-x64-2.9.tar.lzma
+2021/04/08 |      41104 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-2.9.tar.lzma
+2021/04/08 |      45276 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-x64-2.9.tar.lzma
+2021/04/08 |     116931 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-2.9.tar.lzma
+2021/04/08 |     131490 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-x64-2.9.tar.lzma
+2021/04/08 |    1281103 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-2.9.tar.lzma
+2021/04/08 |    1425980 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-x64-2.9.tar.lzma
+2021/04/08 |      87636 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-2.9.tar.lzma
+2021/04/08 |      99606 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-x64-2.9.tar.lzma
+2021/04/08 |      43059 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-2.9.tar.lzma
+2021/04/08 |      47878 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-x64-2.9.tar.lzma
+2021/04/08 |      25155 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-2.9.tar.lzma
+2021/04/08 |      28010 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-x64-2.9.tar.lzma
+2021/04/08 |      55821 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-2.9.tar.lzma
+2021/04/08 |      62802 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-x64-2.9.tar.lzma
+2021/04/08 |     135003 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-2.9.tar.lzma
+2021/04/08 |     152763 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-x64-2.9.tar.lzma
+2021/04/08 |      73181 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-2.9.tar.lzma
+2021/04/08 |      77859 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-x64-2.9.tar.lzma
+2021/04/08 |      71567 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-2.9.tar.lzma
+2021/04/08 |      80660 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-x64-2.9.tar.lzma
+2021/04/08 |     258665 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-2.9.tar.lzma
+2021/04/08 |     295554 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-x64-2.9.tar.lzma
+2021/04/08 |      22040 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-2.9.tar.lzma
+2021/04/08 |      25002 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-x64-2.9.tar.lzma
+2021/04/08 |      97491 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-2.9.tar.lzma
+2021/04/08 |     112252 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-x64-2.9.tar.lzma
+2021/04/08 |      63836 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-2.9.tar.lzma
+2021/04/08 |      72859 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-x64-2.9.tar.lzma
+2021/04/08 |      96146 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-2.9.tar.lzma
+2021/04/08 |     115470 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-x64-2.9.tar.lzma
+2021/04/08 |      38071 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-2.9.tar.lzma
+2021/04/08 |      42627 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-x64-2.9.tar.lzma
+2021/04/08 |     484052 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-2.9.tar.lzma
+2021/04/08 |     567628 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-x64-2.9.tar.lzma
+2021/04/08 |     147139 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-2.9.tar.lzma
+2021/04/08 |     159969 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-x64-2.9.tar.lzma
+2021/04/08 |      94802 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-2.9.tar.lzma
+2021/04/08 |     109275 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-x64-2.9.tar.lzma
+2021/04/08 |      16328 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-2.9.tar.lzma
+2021/04/08 |      17959 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-x64-2.9.tar.lzma
+2021/04/08 |      28119 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-2.9.tar.lzma
+2021/04/08 |      30038 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-x64-2.9.tar.lzma
+2021/04/08 |     625281 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-2.9.tar.lzma
+2021/04/08 |     680051 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-x64-2.9.tar.lzma
+2021/04/08 |     532039 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-2.9.tar.lzma
+2021/04/08 |     594869 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-x64-2.9.tar.lzma
+2021/04/08 |     475935 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-2.9.tar.lzma
+2021/04/08 |     511634 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-x64-2.9.tar.lzma
+2021/04/08 |      94270 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-2.9.tar.lzma
+2021/04/08 |     103324 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-x64-2.9.tar.lzma
+2021/04/08 |    1725548 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-2.9.tar.lzma
+2021/04/08 |    2009491 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-x64-2.9.tar.lzma
+2021/04/08 |      67650 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-2.9.tar.lzma
+2021/04/08 |      74164 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-x64-2.9.tar.lzma
+2021/04/08 |      27362 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-2.9.tar.lzma
+2021/04/08 |      31594 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-x64-2.9.tar.lzma
+2021/04/08 |       7747 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-2.9.tar.lzma
+2021/04/08 |       8775 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-x64-2.9.tar.lzma
+2021/04/08 |     195567 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-2.9.tar.lzma
+2021/04/08 |     214104 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-x64-2.9.tar.lzma
+2021/04/08 |     250213 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-2.9.tar.lzma
+2021/04/08 |     283977 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-x64-2.9.tar.lzma
+2021/04/08 |      97136 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-2.9.tar.lzma
+2021/04/08 |     101763 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-x64-2.9.tar.lzma
+2021/04/08 |      60553 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-2.9.tar.lzma
+2021/04/08 |      67930 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-x64-2.9.tar.lzma
+2021/04/08 |     124973 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-2.9.tar.lzma
+2021/04/08 |     136427 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-x64-2.9.tar.lzma
+2021/04/08 |     147151 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-2.9.tar.lzma
+2021/04/08 |     163657 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-x64-2.9.tar.lzma
+2021/04/08 |     199701 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-2.9.tar.lzma
+2021/04/08 |     180048 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-x64-2.9.tar.lzma
+2021/04/08 |      67452 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-2.9.tar.lzma
+2021/04/08 |      77487 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-x64-2.9.tar.lzma
+2021/04/08 |      31192 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-2.9.tar.lzma
+2021/04/08 |      35062 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-x64-2.9.tar.lzma
+2021/04/08 |      38065 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-2.9.tar.lzma
+2021/04/08 |      42574 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-x64-2.9.tar.lzma
+2021/04/08 |      42925 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-2.9.tar.lzma
+2021/04/08 |      47008 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-x64-2.9.tar.lzma
+2021/04/08 |      45937 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-2.9.tar.lzma
+2021/04/08 |      52453 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-x64-2.9.tar.lzma
+2021/04/08 |     193715 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-2.9.tar.lzma
+2021/04/08 |     211055 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-x64-2.9.tar.lzma
+2021/04/08 |      35461 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin.tar.lzma
+2021/04/08 |      39691 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin-x64.tar.lzma
+2021/04/08 |     748363 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-2.9.tar.lzma
+2021/04/08 |     816072 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-x64-2.9.tar.lzma
+2021/04/08 |     198130 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-2.9.tar.lzma
+2021/04/08 |     202559 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-x64-2.9.tar.lzma
+2021/04/08 |     208182 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-2.9.tar.lzma
+2021/04/08 |     243479 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-x64-2.9.tar.lzma
+2021/04/08 |      78746 | systems/win32/miktex/tm/packages/next/miktex-png-bin-2.9.tar.lzma
+2021/04/08 |      87704 | systems/win32/miktex/tm/packages/next/miktex-png-bin-x64-2.9.tar.lzma
+2021/04/08 |    1171732 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-2.9.tar.lzma
+2021/04/08 |    1307723 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-x64-2.9.tar.lzma
+2021/04/08 |      20121 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-2.9.tar.lzma
+2021/04/08 |      23882 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-x64-2.9.tar.lzma
+2021/04/08 |      31543 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-2.9.tar.lzma
+2021/04/08 |      37245 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-x64-2.9.tar.lzma
+2021/04/08 |      64016 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-2.9.tar.lzma
+2021/04/08 |      72151 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-x64-2.9.tar.lzma
+2021/04/08 |      43677 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-2.9.tar.lzma
+2021/04/08 |      51979 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-x64-2.9.tar.lzma
+2021/04/08 |    1295415 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-2.9.tar.lzma
+2021/04/08 |    1424814 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-x64-2.9.tar.lzma
+2021/04/08 |      42389 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-2.9.tar.lzma
+2021/04/08 |      51798 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-x64-2.9.tar.lzma
+2021/04/08 |      56223 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin.tar.lzma
+2021/04/08 |      59831 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-x64.tar.lzma
+2021/04/08 |      25341 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-2.9.tar.lzma
+2021/04/08 |      27275 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-x64-2.9.tar.lzma
+2021/04/08 |      16109 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-2.9.tar.lzma
+2021/04/08 |      18097 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-x64-2.9.tar.lzma
+2021/04/08 |      63675 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-2.9.tar.lzma
+2021/04/08 |      70110 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-x64-2.9.tar.lzma
+2021/04/08 |     153889 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-2.9.tar.lzma
+2021/04/08 |     167905 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-x64-2.9.tar.lzma
+2021/04/08 |      56909 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-2.9.tar.lzma
+2021/04/08 |      65323 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-x64-2.9.tar.lzma
+2021/04/08 |      98517 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-2.9.tar.lzma
+2021/04/08 |     104625 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-x64-2.9.tar.lzma
+2021/04/08 |    2499401 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-2.9.tar.lzma
+2021/04/08 |    2616930 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-x64-2.9.tar.lzma
+2021/04/08 |      55219 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-2.9.tar.lzma
+2021/04/08 |      62227 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-x64-2.9.tar.lzma
+2021/04/08 |      33440 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin.tar.lzma
+2021/04/08 |      37294 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin-x64.tar.lzma
+2021/04/08 |      27198 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-2.9.tar.lzma
+2021/04/08 |      33153 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-x64-2.9.tar.lzma
+2021/04/08 |      65731 | systems/win32/miktex/tm/packages/next/miktex-web-bin-2.9.tar.lzma
+2021/04/08 |      70323 | systems/win32/miktex/tm/packages/next/miktex-web-bin-x64-2.9.tar.lzma
+2021/04/08 |     311189 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-2.9.tar.lzma
+2021/04/08 |     345367 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-x64-2.9.tar.lzma
+2021/04/08 |      55563 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin.tar.lzma
+2021/04/08 |      57066 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin-x64.tar.lzma
+2021/04/08 |     583628 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-2.9.tar.lzma
+2021/04/08 |     618766 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-x64-2.9.tar.lzma
+2021/04/08 |      39564 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-2.9.tar.lzma
+2021/04/08 |      43393 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-x64-2.9.tar.lzma
+2021/04/08 |     208816 | systems/win32/miktex/tm/packages/next/miktex-zzdb1-2.9.tar.lzma
+2021/04/08 |    1267142 | systems/win32/miktex/tm/packages/next/miktex-zzdb2-2.9.tar.lzma
+2021/04/08 |    1184246 | systems/win32/miktex/tm/packages/next/miktex-zzdb3-2.9.tar.lzma
+2021/04/08 |      13471 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-2.9.tar.lzma
+2021/04/08 |      14354 | 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/04/07 |       1153 | systems/win32/miktex/tm/packages/next/pr.ini
+2021/04/08 |       1153 | systems/win32/miktex/tm/packages/next/pr.ini
 2018/07/06 |     145915 | systems/win32/miktex/tm/packages/nexus-otf.tar.lzma
 2017/03/30 |     191149 | systems/win32/miktex/tm/packages/nfssext-cfr.tar.lzma
 2012/12/20 |     612251 | systems/win32/miktex/tm/packages/nicefilelist.tar.lzma
@@ -283754,7 +283757,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/03/03 |     372362 | systems/win32/miktex/tm/packages/principia.tar.lzma
-2021/04/07 |        889 | systems/win32/miktex/tm/packages/pr.ini
+2021/04/08 |        889 | 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
@@ -284934,10 +284937,10 @@
 2010/01/14 |     955365 | systems/win32/visualtex/vx-setup-399.exe
 2019/08/12 |      14654 | systems/win32/w32tex/00FILES.euc
 2019/08/12 |      14654 | systems/win32/w32tex/00FILES.sjis
-2021/03/25 |    5524928 | systems/win32/w32tex/aleph-w32.tar.xz
+2021/04/07 |    5531000 | systems/win32/w32tex/aleph-w32.tar.xz
 2021/04/03 |   63643560 | systems/win32/w32tex/biblatex-biber.tar.xz
 2016/12/13 |   65971452 | systems/win32/w32tex/cbfonts.tar.xz
-2021/04/06 |     811715 | systems/win32/w32tex/ChangeLog
+2021/04/07 |     812499 | systems/win32/w32tex/ChangeLog
 2009/08/03 |     141221 | systems/win32/w32tex/ChangeLog.0
 2009/08/03 |     221890 | systems/win32/w32tex/ChangeLog.1
 2009/08/03 |     116462 | systems/win32/w32tex/ChangeLog.2
@@ -284945,56 +284948,56 @@
 2017/06/24 |     644754 | systems/win32/w32tex/ChangeLog.4
 2021/03/22 |   23474308 | systems/win32/w32tex/cjkzr.tar.xz
 2013/04/27 |   15858676 | systems/win32/w32tex/context-doc.tar.xz
-2021/04/01 |  144907064 | systems/win32/w32tex/context.tar.xz
-2021/04/05 |     911480 | systems/win32/w32tex/cweb-w32.tar.xz
+2021/04/07 |  144901876 | systems/win32/w32tex/context.tar.xz
+2021/04/07 |     911644 | systems/win32/w32tex/cweb-w32.tar.xz
 2021/03/22 |    6433932 | systems/win32/w32tex/datetime2.tar.xz
-2021/02/19 |     845892 | systems/win32/w32tex/dvi2ps-w32.tar.xz
-2021/02/19 |     484028 | systems/win32/w32tex/dvi2tty-w32.tar.xz
-2021/04/03 |    4662964 | systems/win32/w32tex/dvipdfm-w32.tar.xz
-2021/02/19 |    4551728 | systems/win32/w32tex/dvipsk-w32.tar.xz
-2021/02/19 |    2652744 | systems/win32/w32tex/dvitools-w32.tar.xz
+2021/04/07 |     846020 | systems/win32/w32tex/dvi2ps-w32.tar.xz
+2021/04/07 |     484144 | systems/win32/w32tex/dvi2tty-w32.tar.xz
+2021/04/07 |    4662792 | systems/win32/w32tex/dvipdfm-w32.tar.xz
+2021/04/07 |    4551584 | systems/win32/w32tex/dvipsk-w32.tar.xz
+2021/04/07 |    2652392 | systems/win32/w32tex/dvitools-w32.tar.xz
 2021/04/02 |    1182048 | systems/win32/w32tex/extractpdfmark-w32.tar.xz
-2021/03/14 |   17377200 | systems/win32/w32tex/gregorio-w32.tar.xz
+2021/04/07 |   17377260 | systems/win32/w32tex/gregorio-w32.tar.xz
 2009/08/03 |    1072620 | systems/win32/w32tex/gtftex.zip
-2021/03/25 |    1861108 | systems/win32/w32tex/jtex-w32.tar.xz
+2021/04/07 |    1860732 | systems/win32/w32tex/jtex-w32.tar.xz
 2021/04/03 |   51134536 | systems/win32/w32tex/latex-dev.tar.xz
 2021/03/21 |   34776716 | systems/win32/w32tex/latex.tar.xz
-2021/02/19 |    1007832 | systems/win32/w32tex/lcdf-typetools-w32.tar.xz
+2021/04/07 |    1007424 | systems/win32/w32tex/lcdf-typetools-w32.tar.xz
 2021/03/30 |  421014648 | systems/win32/w32tex/ltxpkgdocs.tar.xz
 2021/04/06 |   35183908 | systems/win32/w32tex/ltxpkgs.tar.xz
-2021/04/05 |    3852056 | systems/win32/w32tex/luajittex-dev-w32.tar.xz
-2021/04/05 |    3820356 | systems/win32/w32tex/luajittex-exp-w32.tar.xz
-2021/04/05 |    3848172 | systems/win32/w32tex/luajittex-w32.tar.xz
+2021/04/07 |    3851380 | systems/win32/w32tex/luajittex-dev-w32.tar.xz
+2021/04/07 |    3817452 | systems/win32/w32tex/luajittex-exp-w32.tar.xz
+2021/04/07 |    3852020 | systems/win32/w32tex/luajittex-w32.tar.xz
 2021/03/26 |     838276 | systems/win32/w32tex/luasec-w32.tar.xz
-2021/04/05 |   18900792 | systems/win32/w32tex/luatex-dev-w32.tar.xz
-2021/04/05 |   18908220 | systems/win32/w32tex/luatex-exp-w32.tar.xz
+2021/04/07 |   18880316 | systems/win32/w32tex/luatex-dev-w32.tar.xz
+2021/04/07 |   18903092 | systems/win32/w32tex/luatex-exp-w32.tar.xz
 2021/03/21 |   69078272 | systems/win32/w32tex/luatexja.tar.xz
-2021/04/05 |   18898248 | systems/win32/w32tex/luatex-w32.tar.xz
-2021/03/22 |    1609076 | systems/win32/w32tex/makeindex-w32.tar.xz
+2021/04/07 |   18891780 | systems/win32/w32tex/luatex-w32.tar.xz
+2021/04/07 |    1609484 | systems/win32/w32tex/makeindex-w32.tar.xz
 2021/03/28 |    5371984 | systems/win32/w32tex/manual.tar.xz
-2021/02/19 |     439144 | systems/win32/w32tex/mftools.tar.xz
-2021/02/19 |     524780 | systems/win32/w32tex/mftrace-w32.tar.xz
+2021/04/07 |     439524 | systems/win32/w32tex/mftools.tar.xz
+2021/04/07 |     525008 | systems/win32/w32tex/mftrace-w32.tar.xz
 2018/07/14 |    6364952 | systems/win32/w32tex/minitoc.tar.xz
 2020/01/19 |     882832 | systems/win32/w32tex/m-tx.tar.xz
 2021/03/29 |    9811732 | systems/win32/w32tex/newtxpx-boondoxfonts.tar.xz
-2021/02/19 |    1235524 | systems/win32/w32tex/omegaj-w32.tar.xz
+2021/04/07 |    1246480 | systems/win32/w32tex/omegaj-w32.tar.xz
 2020/11/16 |     324540 | systems/win32/w32tex/otfbeta.tar.xz
-2021/04/02 |   22231236 | systems/win32/w32tex/pdftex-w32.tar.xz
+2021/04/07 |   22245216 | systems/win32/w32tex/pdftex-w32.tar.xz
 2021/04/05 |   93698752 | systems/win32/w32tex/pgfcontrib.tar.xz
 2015/01/26 |     189072 | systems/win32/w32tex/plain2-2.54-w32.tar.xz
 2021/02/14 |    2826912 | systems/win32/w32tex/platex.tar.xz
-2021/02/19 |    1725864 | systems/win32/w32tex/pmx.tar.xz
-2021/02/19 |    1170948 | systems/win32/w32tex/pstoedit-w32.tar.xz
+2021/04/07 |    1726052 | systems/win32/w32tex/pmx.tar.xz
+2021/04/07 |    1170892 | systems/win32/w32tex/pstoedit-w32.tar.xz
 2021/03/31 |  274224548 | systems/win32/w32tex/pstricks.tar.xz
-2021/02/19 |     517744 | systems/win32/w32tex/psutils-w32.tar.xz
-2021/04/04 |    6761856 | systems/win32/w32tex/ptex-ng-w32.tar.xz
-2021/04/03 |   10682588 | systems/win32/w32tex/ptex-w32.tar.xz
+2021/04/07 |     518092 | systems/win32/w32tex/psutils-w32.tar.xz
+2021/04/07 |    6762112 | systems/win32/w32tex/ptex-ng-w32.tar.xz
+2021/04/07 |   10701360 | systems/win32/w32tex/ptex-w32.tar.xz
 2019/04/15 |     499188 | systems/win32/w32tex/sam2p-w32.tar.xz
 2021/03/23 |   87955068 | systems/win32/w32tex/t1fonts.tar.xz
 2020/10/31 |     142032 | systems/win32/w32tex/t1utils-w32.tar.xz
-2021/03/21 |    2607448 | systems/win32/w32tex/tex4htk-w32.tar.xz
+2021/04/07 |    2611928 | systems/win32/w32tex/tex4htk-w32.tar.xz
 2018/06/20 |   15940044 | systems/win32/w32tex/tex-gyre.tar.xz
-2021/02/26 |    4485384 | systems/win32/w32tex/texinfo-w32.tar.xz
+2021/04/07 |    4485428 | systems/win32/w32tex/texinfo-w32.tar.xz
 2021/01/03 |    2050496 | systems/win32/w32tex/texinstwin.zip
 2020/01/19 |      97168 | systems/win32/w32tex/tiff2png-w32.tar.xz
 2013/04/08 |     308444 | systems/win32/w32tex/timesnew.tar.xz
@@ -285002,66 +285005,66 @@
 2020/12/12 |   18579551 | systems/win32/w32tex/TLARM64W/gs9533arm64full-gpl.exe
 2021/01/23 |   58692234 | systems/win32/w32tex/TLARM64W/tl-arm64-windows.zip
 2020/06/06 |       2168 | systems/win32/w32tex/TLTEXINFO/00README-TEXINFO.TL
-2021/02/25 |    4291445 | systems/win32/w32tex/TLTEXINFO/tl-texinfo.zip
+2021/04/07 |    4291444 | systems/win32/w32tex/TLTEXINFO/tl-texinfo.zip
 2021/01/03 |       2023 | systems/win32/w32tex/TLW64/00README.TLW64
-2021/03/23 |   99962915 | systems/win32/w32tex/TLW64/tl-win64.zip
-2021/02/19 |     826656 | systems/win32/w32tex/ttf2pk-w32.tar.xz
-2021/02/19 |     838512 | systems/win32/w32tex/ttf2pt1-w32.tar.xz
+2021/04/07 |   99972126 | systems/win32/w32tex/TLW64/tl-win64.zip
+2021/04/07 |     826840 | systems/win32/w32tex/ttf2pk-w32.tar.xz
+2021/04/07 |     838272 | systems/win32/w32tex/ttf2pt1-w32.tar.xz
 2017/10/13 |    1773368 | systems/win32/w32tex/tuftelatex.tar.xz
 2020/05/30 |    7205464 | systems/win32/w32tex/txpx-pazofonts.tar.xz
 2020/01/19 |       5856 | systems/win32/w32tex/txtutil.tar.xz
 2013/04/08 |      71588 | systems/win32/w32tex/ums.tar.xz
 2012/05/28 |     233472 | systems/win32/w32tex/unzip.exe
-2021/04/03 |    8602952 | systems/win32/w32tex/uptex-w32.tar.xz
+2021/04/07 |    8605328 | systems/win32/w32tex/uptex-w32.tar.xz
 2013/04/08 |     722652 | systems/win32/w32tex/utf.tar.xz
 2013/04/08 |      13748 | systems/win32/w32tex/vf-n2bk.tar.xz
 2021/03/24 |   53260516 | systems/win32/w32tex/w32tex-src.tar.xz
 2021/04/06 |  130665440 | systems/win32/w32tex/web2c-lib.tar.xz
-2021/04/05 |   45563372 | systems/win32/w32tex/web2c-w32.tar.xz
-2021/03/12 |     811112 | systems/win32/w32tex/win64/aleph-w64.tar.xz
+2021/04/07 |   45549708 | systems/win32/w32tex/web2c-w32.tar.xz
+2021/04/07 |     811472 | systems/win32/w32tex/win64/aleph-w64.tar.xz
 2020/08/20 |   22351540 | systems/win32/w32tex/win64/biblatex-biber-w64.tar.xz
-2021/04/01 |    2216432 | systems/win32/w32tex/win64/context-w64.tar.xz
-2021/04/06 |     440276 | systems/win32/w32tex/win64/cweb-w64.tar.xz
-2021/02/19 |     758536 | systems/win32/w32tex/win64/dvi2ps-w64.tar.xz
-2021/02/19 |     448196 | systems/win32/w32tex/win64/dvi2tty-w64.tar.xz
-2021/04/03 |     808672 | systems/win32/w32tex/win64/dvipdfm-w64.tar.xz
-2021/02/19 |     759820 | systems/win32/w32tex/win64/dvipsk-w64.tar.xz
-2021/02/19 |    2367292 | systems/win32/w32tex/win64/dvitools-w64.tar.xz
+2021/04/07 |    2216488 | systems/win32/w32tex/win64/context-w64.tar.xz
+2021/04/07 |     440372 | systems/win32/w32tex/win64/cweb-w64.tar.xz
+2021/04/07 |     758972 | systems/win32/w32tex/win64/dvi2ps-w64.tar.xz
+2021/04/07 |     448472 | systems/win32/w32tex/win64/dvi2tty-w64.tar.xz
+2021/04/07 |     808552 | systems/win32/w32tex/win64/dvipdfm-w64.tar.xz
+2021/04/07 |     760008 | systems/win32/w32tex/win64/dvipsk-w64.tar.xz
+2021/04/07 |    2365232 | systems/win32/w32tex/win64/dvitools-w64.tar.xz
 2021/04/02 |    1085612 | systems/win32/w32tex/win64/extractpdfmark-w64.tar.xz
-2021/03/14 |     307052 | systems/win32/w32tex/win64/gregorio-w64.tar.xz
-2021/02/19 |     587952 | systems/win32/w32tex/win64/jtex-w64.tar.xz
+2021/04/07 |     306956 | systems/win32/w32tex/win64/gregorio-w64.tar.xz
+2021/04/07 |     588136 | systems/win32/w32tex/win64/jtex-w64.tar.xz
 2019/11/11 |       2568 | systems/win32/w32tex/win64/latex-dev-w64.tar.xz
-2021/02/19 |     800468 | systems/win32/w32tex/win64/lcdf-typetools-w64.tar.xz
-2021/04/05 |    3457384 | systems/win32/w32tex/win64/luajittex-dev-w64.tar.xz
-2021/04/05 |    3453592 | systems/win32/w32tex/win64/luajittex-exp-w64.tar.xz
-2021/04/05 |    3459624 | systems/win32/w32tex/win64/luajittex-w64.tar.xz
+2021/04/07 |     800472 | systems/win32/w32tex/win64/lcdf-typetools-w64.tar.xz
+2021/04/07 |    3448296 | systems/win32/w32tex/win64/luajittex-dev-w64.tar.xz
+2021/04/07 |    3439196 | systems/win32/w32tex/win64/luajittex-exp-w64.tar.xz
+2021/04/07 |    3450828 | systems/win32/w32tex/win64/luajittex-w64.tar.xz
 2021/03/26 |     936184 | systems/win32/w32tex/win64/luasec-w64.tar.xz
-2021/04/05 |    3120720 | systems/win32/w32tex/win64/luatex-dev-w64.tar.xz
-2021/04/05 |    3118996 | systems/win32/w32tex/win64/luatex-exp-w64.tar.xz
-2021/04/05 |    3118720 | systems/win32/w32tex/win64/luatex-w64.tar.xz
-2021/03/22 |    1079480 | systems/win32/w32tex/win64/makeindex-w64.tar.xz
-2021/02/19 |     431372 | systems/win32/w32tex/win64/mftools-w64.tar.xz
-2021/02/19 |     376736 | systems/win32/w32tex/win64/mftrace-w64.tar.xz
+2021/04/07 |    3109896 | systems/win32/w32tex/win64/luatex-dev-w64.tar.xz
+2021/04/07 |    3120296 | systems/win32/w32tex/win64/luatex-exp-w64.tar.xz
+2021/04/07 |    3122192 | systems/win32/w32tex/win64/luatex-w64.tar.xz
+2021/04/07 |    1079108 | systems/win32/w32tex/win64/makeindex-w64.tar.xz
+2021/04/07 |     431500 | systems/win32/w32tex/win64/mftools-w64.tar.xz
+2021/04/07 |     377008 | systems/win32/w32tex/win64/mftrace-w64.tar.xz
 2020/01/18 |     362540 | systems/win32/w32tex/win64/m-tx-w64.tar.xz
-2021/02/19 |     407292 | systems/win32/w32tex/win64/omegaj-w64.tar.xz
-2021/04/02 |    6933696 | systems/win32/w32tex/win64/pdftex-w64.tar.xz
+2021/04/07 |     407412 | systems/win32/w32tex/win64/omegaj-w64.tar.xz
+2021/04/07 |    6926868 | systems/win32/w32tex/win64/pdftex-w64.tar.xz
 2015/01/26 |      41440 | systems/win32/w32tex/win64/plain2-2.54-w64.tar.xz
-2021/02/19 |     651616 | systems/win32/w32tex/win64/pmx-w64.tar.xz
-2021/02/19 |     790948 | systems/win32/w32tex/win64/pstoedit-w64.tar.xz
-2021/02/19 |     386344 | systems/win32/w32tex/win64/psutils-w64.tar.xz
-2021/04/04 |    1690572 | systems/win32/w32tex/win64/ptex-ng-w64.tar.xz
-2021/04/03 |    1873492 | systems/win32/w32tex/win64/ptex-w64.tar.xz
+2021/04/07 |     651552 | systems/win32/w32tex/win64/pmx-w64.tar.xz
+2021/04/07 |     791152 | systems/win32/w32tex/win64/pstoedit-w64.tar.xz
+2021/04/07 |     386496 | systems/win32/w32tex/win64/psutils-w64.tar.xz
+2021/04/07 |    1690844 | systems/win32/w32tex/win64/ptex-ng-w64.tar.xz
+2021/04/07 |    1873540 | systems/win32/w32tex/win64/ptex-w64.tar.xz
 2021/01/03 |     329592 | systems/win32/w32tex/win64/sam2p-w64.tar.xz
 2020/10/31 |      40588 | systems/win32/w32tex/win64/t1utils-w64.tar.xz
-2021/02/19 |     419716 | systems/win32/w32tex/win64/tex4htk-w64.tar.xz
+2021/04/07 |     420176 | systems/win32/w32tex/win64/tex4htk-w64.tar.xz
 2020/01/18 |      96788 | systems/win32/w32tex/win64/tiff2png-w64.tar.xz
-2021/02/19 |     734700 | systems/win32/w32tex/win64/ttf2pk-w64.tar.xz
-2021/02/19 |     696140 | systems/win32/w32tex/win64/ttf2pt1-w64.tar.xz
+2021/04/07 |     734912 | systems/win32/w32tex/win64/ttf2pk-w64.tar.xz
+2021/04/07 |     696196 | systems/win32/w32tex/win64/ttf2pt1-w64.tar.xz
 2020/01/18 |      42768 | systems/win32/w32tex/win64/txtutil-w64.tar.xz
-2021/04/03 |    1806444 | systems/win32/w32tex/win64/uptex-w64.tar.xz
-2021/04/05 |    3756440 | systems/win32/w32tex/win64/web2c-w64.tar.xz
-2021/04/05 |   11081804 | systems/win32/w32tex/win64/xetex-w64.tar.xz
-2021/04/05 |   49392484 | systems/win32/w32tex/xetex-w32.tar.xz
+2021/04/07 |    1806132 | systems/win32/w32tex/win64/uptex-w64.tar.xz
+2021/04/07 |    3755164 | systems/win32/w32tex/win64/web2c-w64.tar.xz
+2021/04/07 |   11080560 | systems/win32/w32tex/win64/xetex-w64.tar.xz
+2021/04/07 |   49394668 | systems/win32/w32tex/xetex-w32.tar.xz
 2020/05/29 |    2936068 | systems/win32/w32tex/xindy-w32.tar.xz
 2013/11/19 |   11356248 | systems/win32/w32tex/xymtex.tar.xz
 2016/09/09 |    4334636 | systems/win32/w32tex/xypic.tar.xz
@@ -285158,7 +285161,7 @@
 2004/06/04 |        404 | tds/tds.sed
 2004/06/23 |      65418 | tds/tds.tex
 2019/05/29 |     304264 | tds.zip
-2021/04/08 |        186 | timestamp
+2021/04/09 |        186 | timestamp
 2002/08/26 |      61898 | usergrps/dante/antrag.pdf
 2002/08/26 |     118217 | usergrps/dante/antrag.ps
 2017/06/30 |        917 | usergrps/dante/dtk/doc/beispiel.bib
diff --git a/FILES.byname.gz b/FILES.byname.gz
index 5fe8607e60..ea05985a5c 100644
--- a/FILES.byname.gz
+++ b/FILES.byname.gz
diff --git a/FILES.last07days b/FILES.last07days
index adf2cd3b45..516ace7fbf 100644
--- a/FILES.last07days
+++ b/FILES.last07days
@@ -1,314 +1,515 @@
-2021/04/07 |      99605 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-x64-2.9.tar.lzma
-2021/04/07 |      98519 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-2.9.tar.lzma
-2021/04/07 |      97491 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-2.9.tar.lzma
-2021/04/07 |      97132 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-2.9.tar.lzma
-2021/04/07 |     968701 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-2.9.tar.lzma
-2021/04/07 |      96146 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-2.9.tar.lzma
+2021/04/08 |     998704 | systems/texlive/tlnet/archive/wintools.win32.doc.r58783.tar.xz
+2021/04/08 |      99606 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-x64-2.9.tar.lzma
+2021/04/08 |      98517 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-2.9.tar.lzma
+2021/04/08 |     982572 | systems/texlive/tlnet/archive/latexindent.doc.r58790.tar.xz
+2021/04/08 |      97491 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-2.9.tar.lzma
+2021/04/08 |      97136 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-2.9.tar.lzma
+2021/04/08 |     968698 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-2.9.tar.lzma
+2021/04/08 |      96146 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-2.9.tar.lzma
+2021/04/08 |      95417 | macros/latex/contrib/easybook/easybook.dtx
+2021/04/08 |      94802 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-2.9.tar.lzma
+2021/04/08 |      94738 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-x64-2.9.tar.lzma
+2021/04/08 |      94270 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-2.9.tar.lzma
+2021/04/08 |      94208 | systems/texlive/tlnet/archive/dvips.win32.r58783.tar.xz
+2021/04/08 |    9412692 | systems/texlive/tlnet/archive/xetex.win32.r58783.tar.xz
+2021/04/08 |     921548 | systems/texlive/tlnet/archive/texshade.doc.r58789.tar.xz
+2021/04/08 |      90188 | systems/texlive/tlnet/archive/dviout-util.win32.r58783.tar.xz
+2021/04/08 |         89 | macros/latex/contrib/lwarp/lwarp_baseline_marker.png
+2021/04/08 |        889 | systems/win32/miktex/tm/packages/pr.ini
+2021/04/08 |      88180 | systems/texlive/tlnet/archive/dvi2tty.win32.r58783.tar.xz
+2021/04/08 |       8775 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-x64-2.9.tar.lzma
+2021/04/08 |      87704 | systems/win32/miktex/tm/packages/next/miktex-png-bin-x64-2.9.tar.lzma
+2021/04/08 |      87636 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-2.9.tar.lzma
+2021/04/08 |      85632 | macros/xetex/generic/xetexko/xetexko.sty
+2021/04/08 |      84772 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-2.9.tar.lzma
+2021/04/08 |     830595 | macros/latex/contrib/apa7.zip
+2021/04/08 |     820616 | systems/texlive/tlnet/archive/metapost.win32.r58783.tar.xz
+2021/04/08 |     816072 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-x64-2.9.tar.lzma
+2021/04/08 |      80660 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-x64-2.9.tar.lzma
+2021/04/08 |      78746 | systems/win32/miktex/tm/packages/next/miktex-png-bin-2.9.tar.lzma
+2021/04/08 |      77859 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-x64-2.9.tar.lzma
+2021/04/08 |      77487 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-x64-2.9.tar.lzma
+2021/04/08 |       7747 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-2.9.tar.lzma
+2021/04/08 |        763 | systems/unix/tex-fpc/twebmac/README
+2021/04/08 |      75418 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-x64-2.9.tar.lzma
+2021/04/08 |     748363 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-2.9.tar.lzma
+2021/04/08 |      74164 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-x64-2.9.tar.lzma
+2021/04/08 |       7354 | macros/xetex/generic/xetexko/ChangeLog
+2021/04/08 |      73181 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-2.9.tar.lzma
+2021/04/08 |     730884 | systems/texlive/tlnet/archive/apa7.doc.r58787.tar.xz
+2021/04/08 |      72859 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-x64-2.9.tar.lzma
+2021/04/08 |     726845 | macros/latex/contrib/easybook.zip
+2021/04/08 |      72252 | systems/texlive/tlnet/archive/cweb.win32.r58783.tar.xz
+2021/04/08 |      72151 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-x64-2.9.tar.lzma
+2021/04/08 |        719 | macros/latex/contrib/lwarp/lwarp_baseline_marker.eps
+2021/04/08 |      71567 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-2.9.tar.lzma
+2021/04/08 |     709764 | systems/texlive/tlnet/archive/pdftex.win32.r58783.tar.xz
+2021/04/08 |     703488 | systems/texlive/tlnet/archive/lcdftypetools.win32.r58783.tar.xz
+2021/04/08 |      70323 | systems/win32/miktex/tm/packages/next/miktex-web-bin-x64-2.9.tar.lzma
+2021/04/08 |      70110 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-x64-2.9.tar.lzma
+2021/04/08 |       6920 | systems/texlive/tlnet/archive/ctie.win32.r58783.tar.xz
+2021/04/08 |     687304 | systems/texlive/tlnet/archive/easybook.doc.r58788.tar.xz
+2021/04/08 |     680051 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-x64-2.9.tar.lzma
+2021/04/08 |      67930 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-x64-2.9.tar.lzma
+2021/04/08 |      67680 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-2.9.tar.lzma
+2021/04/08 |      67650 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-2.9.tar.lzma
+2021/04/08 |      67452 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-2.9.tar.lzma
+2021/04/08 |        668 | systems/texlive/tlnet/archive/tlshell.doc.r58792.tar.xz
+2021/04/08 |        668 | macros/xetex/generic/xetexko/xetexko-hanging.sty
+2021/04/08 |      65731 | systems/win32/miktex/tm/packages/next/miktex-web-bin-2.9.tar.lzma
+2021/04/08 |       6535 | macros/latex/contrib/apa7/apa7.ins
+2021/04/08 |      65352 | macros/latex/contrib/apa7/samples/shortsample.pdf
+2021/04/08 |      65323 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-x64-2.9.tar.lzma
+2021/04/08 |        647 | macros/xetex/generic/xetexko/xetexko-vertical.sty
+2021/04/08 |        641 | macros/xetex/generic/xetexko/xetexko-space.sty
+2021/04/08 |      64016 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-2.9.tar.lzma
+2021/04/08 |        639 | macros/xetex/generic/xetexko/xetexko-josa.sty
+2021/04/08 |        639 | macros/xetex/generic/xetexko/xetexko-font.sty
+2021/04/08 |       6384 | systems/texlive/tlnet/archive/musixtnt.win32.r58783.tar.xz
+2021/04/08 |      63836 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-2.9.tar.lzma
+2021/04/08 |     637761 | systems/unix/tex-fpc.zip
+2021/04/08 |      63675 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-2.9.tar.lzma
+2021/04/08 |      62802 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-x64-2.9.tar.lzma
+2021/04/08 |     625281 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-2.9.tar.lzma
+2021/04/08 |      62227 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-x64-2.9.tar.lzma
+2021/04/08 |    6192746 | systems/texlive/tlnet/install-tl-unx.tar.gz
+2021/04/08 |     618766 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-x64-2.9.tar.lzma
+2021/04/08 |      61740 | systems/texlive/tlnet/archive/texshade.r58789.tar.xz
+2021/04/08 |     613445 | systems/unix/tex-fpc/tex-fpc.pdf
+2021/04/08 |      60553 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-2.9.tar.lzma
+2021/04/08 |      60252 | systems/texlive/tlnet/archive/latexindent.r58790.tar.xz
+2021/04/08 |      59831 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-x64.tar.lzma
+2021/04/08 |       5980 | systems/texlive/tlnet/archive/tie.win32.r58783.tar.xz
+2021/04/08 |     594869 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-x64-2.9.tar.lzma
+2021/04/08 |      59264 | systems/texlive/tlnet/archive/ps2pk.win32.r58783.tar.xz
+2021/04/08 |      59144 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-x64-2.9.tar.lzma
+2021/04/08 |     590475 | macros/latex/contrib/nicematrix/nicematrix.dtx
+2021/04/08 |      58956 | systems/texlive/tlnet/archive/mfware.win32.r58783.tar.xz
+2021/04/08 |     586696 | systems/texlive/tlnet/archive/bibtexu.win32.r58783.tar.xz
+2021/04/08 |     583628 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-2.9.tar.lzma
+2021/04/08 |      58216 | systems/texlive/tlnet/archive/fontware.win32.r58783.tar.xz
+2021/04/08 |      57760 | systems/texlive/tlnet/archive/tex4ht.win32.r58783.tar.xz
+2021/04/08 |      57599 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-x64-2.9.tar.lzma
+2021/04/08 |     574321 | systems/win32/miktex/tm/packages/files.csv.lzma
+2021/04/08 |     573897 | systems/win32/miktex/tm/packages/next/files.csv.lzma
+2021/04/08 |      57066 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin-x64.tar.lzma
+2021/04/08 |      56909 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-2.9.tar.lzma
+2021/04/08 |     567628 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-x64-2.9.tar.lzma
+2021/04/08 |      56718 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-x64-2.9.tar.lzma
+2021/04/08 |      56457 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-x64-2.9.tar.lzma
+2021/04/08 |      56223 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin.tar.lzma
+2021/04/08 |      55821 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-2.9.tar.lzma
+2021/04/08 |      55563 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin.tar.lzma
+2021/04/08 |      55219 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-2.9.tar.lzma
+2021/04/08 |    5338756 | systems/texlive/tlnet/archive/wintools.win32.r58783.tar.xz
+2021/04/08 |     532039 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-2.9.tar.lzma
+2021/04/08 |     530896 | macros/latex/contrib/apa7/apa7.pdf
+2021/04/08 |      52476 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-2.9.tar.lzma
+2021/04/08 |      52453 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-x64-2.9.tar.lzma
+2021/04/08 |      51979 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-x64-2.9.tar.lzma
+2021/04/08 |      51798 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-x64-2.9.tar.lzma
+2021/04/08 |      51432 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-2.9.tar.lzma
+2021/04/08 |     511634 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-x64-2.9.tar.lzma
+2021/04/08 |      51159 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-x64-2.9.tar.lzma
+2021/04/08 |      50848 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-2.9.tar.lzma
+2021/04/08 |       5015 | systems/unix/tex-fpc/history
+2021/04/08 |      49972 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-2.9.tar.lzma
+2021/04/08 |         48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
+2021/04/08 |     487512 | systems/texlive/tlnet/archive/kpathsea.win32.r58783.tar.xz
+2021/04/08 |     484052 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-2.9.tar.lzma
+2021/04/08 |      47878 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-x64-2.9.tar.lzma
+2021/04/08 |     475935 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-2.9.tar.lzma
+2021/04/08 |       4732 | systems/texlive/tlnet/archive/texlive-scripts-extra.win32.r58783.tar.xz
+2021/04/08 |       4707 | systems/win32/miktex/tm/packages/next/miktex-config-2.9.tar.lzma
+2021/04/08 |      47008 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-x64-2.9.tar.lzma
+2021/04/08 |     461400 | systems/win32/miktex/tm/packages/next/miktex-doc.tar.lzma
+2021/04/08 |      45937 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-2.9.tar.lzma
+2021/04/08 |      45648 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-2.9.tar.lzma
+2021/04/08 |        455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
+2021/04/08 |        455 | systems/texlive/tlnet/install-tl.zip.sha512.asc
+2021/04/08 |        455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
+2021/04/08 |        455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
+2021/04/08 |     455133 | macros/latex/contrib/nicematrix/nicematrix-french.pdf
+2021/04/08 |      45424 | systems/texlive/tlnet/archive/dviljk.win32.r58783.tar.xz
+2021/04/08 |      45276 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-x64-2.9.tar.lzma
+2021/04/08 |      44920 | systems/texlive/tlnet/archive/chktex.win32.r58783.tar.xz
+2021/04/08 |     438594 | macros/latex/contrib/easybook/doc/easybook.pdf
+2021/04/08 |      43677 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-2.9.tar.lzma
+2021/04/08 |      43393 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-x64-2.9.tar.lzma
+2021/04/08 |      43059 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-2.9.tar.lzma
+2021/04/08 |      42925 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-2.9.tar.lzma
+2021/04/08 |      42627 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-x64-2.9.tar.lzma
+2021/04/08 |      42574 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-x64-2.9.tar.lzma
+2021/04/08 |      42389 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-2.9.tar.lzma
+2021/04/08 |    4221936 | install/macros/latex/contrib/lwarp.tds.zip
+2021/04/08 |      42212 | systems/unix/tex-fpc/tex.ch
+2021/04/08 |       4179 | systems/unix/tex-fpc/twebmac/report
+2021/04/08 |      41688 | systems/texlive/tlnet/archive/bibtex.win32.r58783.tar.xz
+2021/04/08 |      41104 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-2.9.tar.lzma
+2021/04/08 |      39691 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin-x64.tar.lzma
+2021/04/08 |     395916 | systems/texlive/tlnet/archive/dvipng.win32.r58783.tar.xz
+2021/04/08 |      39564 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-2.9.tar.lzma
+2021/04/08 |      39492 | macros/xetex/generic/xetexko/hanjaexa_hangul.tab
+2021/04/08 |        392 | systems/texlive/tlnet/archive/texlive-docindex.r58780.tar.xz
+2021/04/08 |     392596 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-x64-2.9.tar.lzma
+2021/04/08 |      39168 | systems/texlive/tlnet/archive/web.win32.r58783.tar.xz
+2021/04/08 |      38071 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-2.9.tar.lzma
+2021/04/08 |      38065 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-2.9.tar.lzma
+2021/04/08 |      37294 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin-x64.tar.lzma
+2021/04/08 |      37245 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-x64-2.9.tar.lzma
+2021/04/08 |      36681 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-x64-2.9.tar.lzma
+2021/04/08 |    3645731 | macros/latex/contrib/lwarp.zip
+2021/04/08 |      36304 | systems/texlive/tlnet/archive/texlive-scripts.win32.r58783.tar.xz
+2021/04/08 |      35461 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin.tar.lzma
+2021/04/08 |    3516060 | systems/texlive/tlnet/archive/pst-func.doc.r58786.tar.xz
+2021/04/08 |      35062 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-x64-2.9.tar.lzma
+2021/04/08 |       3471 | macros/xetex/generic/xetexko/README
+2021/04/08 |      34635 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-x64-2.9.tar.lzma
+2021/04/08 |     345367 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-x64-2.9.tar.lzma
+2021/04/08 |      33738 | macros/xetex/generic/xetexko/xetexko-doc.tex
+2021/04/08 |     336752 | systems/texlive/tlnet/archive/ttfutils.win32.r58783.tar.xz
+2021/04/08 |      33440 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin.tar.lzma
+2021/04/08 |     331744 | systems/texlive/tlnet/archive/dvipdfmx.win32.r58783.tar.xz
+2021/04/08 |      33153 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-x64-2.9.tar.lzma
+2021/04/08 |     330232 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-2.9.tar.lzma
+2021/04/08 |     329513 | macros/xetex/generic/xetexko.zip
+2021/04/08 |      32745 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-2.9.tar.lzma
+2021/04/08 |      32733 | macros/latex/contrib/lwarp/lwarp.ins
+2021/04/08 |      32592 | systems/texlive/tlnet/archive/apa7.source.r58787.tar.xz
+2021/04/08 |     321895 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-x64-2.9.tar.lzma
+2021/04/08 |     320592 | systems/texlive/tlnet/archive/pdftosrc.win32.r58783.tar.xz
+2021/04/08 |    3184136 | macros/latex/contrib/lwarp/lwarp.pdf
+2021/04/08 |      31594 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-x64-2.9.tar.lzma
+2021/04/08 |      31543 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-2.9.tar.lzma
+2021/04/08 |      31344 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-x64-2.9.tar.lzma
+2021/04/08 |      31192 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-2.9.tar.lzma
+2021/04/08 |     311189 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-2.9.tar.lzma
+2021/04/08 |      30887 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-x64-2.9.tar.lzma
+2021/04/08 |      30038 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-x64-2.9.tar.lzma
+2021/04/08 |      29870 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-2.9.tar.lzma
+2021/04/08 |     295554 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-x64-2.9.tar.lzma
+2021/04/08 |      29504 | systems/texlive/tlnet/archive/tlshell.r58792.tar.xz
+2021/04/08 |       2947 | macros/latex/contrib/lwarp/lwarp_tutorial.txt
+2021/04/08 |      29053 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-2.9.tar.lzma
+2021/04/08 |      29001 | macros/latex/contrib/lwarp/lwarpmk.lua
+2021/04/08 |     283977 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-x64-2.9.tar.lzma
+2021/04/08 |     282616 | systems/texlive/tlnet/archive/gregoriotex.win32.r58783.tar.xz
+2021/04/08 |     282106 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-2.9.tar.lzma
+2021/04/08 |      28119 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-2.9.tar.lzma
+2021/04/08 |      28010 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-x64-2.9.tar.lzma
+2021/04/08 |      27362 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-2.9.tar.lzma
+2021/04/08 |      27275 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-x64-2.9.tar.lzma
+2021/04/08 |      27198 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-2.9.tar.lzma
+2021/04/08 |      27183 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-2.9.tar.lzma
+2021/04/08 |    2713677 | macros/latex/contrib/lwarp/lwarp.dtx
+2021/04/08 |      26656 | systems/texlive/tlnet/archive/seetexk.win32.r58783.tar.xz
+2021/04/08 |       2644 | macros/latex/contrib/easybook/doc/easybook-demo.tex
+2021/04/08 |     262454 | macros/latex/contrib/easybook/doc/easybook-demo.pdf
+2021/04/08 |     261963 | systems/win32/miktex/tm/packages/next/miktex-console-bin-x64-2.9.tar.lzma
+2021/04/08 |    2616930 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-x64-2.9.tar.lzma
+2021/04/08 |     258665 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-2.9.tar.lzma
+2021/04/08 |      25341 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-2.9.tar.lzma
+2021/04/08 |      25155 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-2.9.tar.lzma
+2021/04/08 |     251319 | macros/xetex/generic/xetexko/xetexko-doc.pdf
+2021/04/08 |     250213 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-2.9.tar.lzma
+2021/04/08 |      25002 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-x64-2.9.tar.lzma
+2021/04/08 |    2499401 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-2.9.tar.lzma
+2021/04/08 |   24962217 | systems/texlive/tlnet/install-tl.zip
+2021/04/08 |      24936 | systems/texlive/tlnet/archive/psutils.win32.r58783.tar.xz
+2021/04/08 |      24368 | systems/texlive/tlnet/archive/dvicopy.win32.r58783.tar.xz
+2021/04/08 |     243479 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-x64-2.9.tar.lzma
+2021/04/08 |     239479 | systems/win32/miktex/tm/packages/next/miktex-console-bin-2.9.tar.lzma
+2021/04/08 |      23882 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-x64-2.9.tar.lzma
+2021/04/08 |      23290 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-x64-2.9.tar.lzma
+2021/04/08 |      23216 | systems/texlive/tlnet/archive/cjkutils.win32.r58783.tar.xz
+2021/04/08 |    2294592 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
+2021/04/08 |      22784 | systems/texlive/tlnet/archive/easybook.source.r58788.tar.xz
+2021/04/08 |      22040 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-2.9.tar.lzma
+2021/04/08 |    2202076 | systems/texlive/tlnet/archive/luajittex.win32.r58783.tar.xz
+2021/04/08 |      21903 | systems/unix/tex-fpc/mf.ch
+2021/04/08 |     214104 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-x64-2.9.tar.lzma
+2021/04/08 |     211616 | systems/texlive/tlnet/archive/texlive-scripts.doc.r58791.tar.xz
+2021/04/08 |      21130 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-2.9.tar.lzma
+2021/04/08 |     211055 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-x64-2.9.tar.lzma
+2021/04/08 |       2094 | systems/unix/tex-fpc/twebmac/patch.sh
+2021/04/08 |     208844 | systems/win32/miktex/tm/packages/miktex-zzdb1-2.9.tar.lzma
+2021/04/08 |     208816 | systems/win32/miktex/tm/packages/next/miktex-zzdb1-2.9.tar.lzma
+2021/04/08 |     208182 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-2.9.tar.lzma
+2021/04/08 |      20484 | systems/texlive/tlnet/archive/autosp.win32.r58783.tar.xz
+2021/04/08 |     202559 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-x64-2.9.tar.lzma
+2021/04/08 |   20131872 | systems/texlive/tlnet/install-tl-windows.exe
+2021/04/08 |      20121 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-2.9.tar.lzma
+2021/04/08 |      20116 | systems/texlive/tlnet/archive/pst-func.r58786.tar.xz
+2021/04/08 |    2009491 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-x64-2.9.tar.lzma
+2021/04/08 |     199701 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-2.9.tar.lzma
+2021/04/08 |     198130 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-2.9.tar.lzma
+2021/04/08 |     196588 | macros/latex/contrib/apa7/samples/longsample.pdf
+2021/04/08 |     195664 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-x64-2.9.tar.lzma
+2021/04/08 |     195567 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-2.9.tar.lzma
+2021/04/08 |     193715 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-2.9.tar.lzma
+2021/04/08 |      18864 | systems/texlive/tlnet/archive/texware.win32.r58783.tar.xz
+2021/04/08 |    1855788 | systems/texlive/tlnet/archive/uptex.win32.r58783.tar.xz
+2021/04/08 |    1822840 | systems/texlive/tlnet/archive/luatex.win32.r58783.tar.xz
+2021/04/08 |      18204 | systems/texlive/tlnet/archive/makeindex.win32.r58783.tar.xz
+2021/04/08 |     181380 | systems/texlive/tlnet/archive/aleph.win32.r58783.tar.xz
+2021/04/08 |       1812 | macros/xetex/generic/xetexko/hanjacom_hangul.tab
+2021/04/08 |      18097 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-x64-2.9.tar.lzma
+2021/04/08 |       1800 | systems/unix/tex-fpc/fpcbugs
+2021/04/08 |     180048 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-x64-2.9.tar.lzma
+2021/04/08 |      17959 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-x64-2.9.tar.lzma
+2021/04/08 |     179379 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-2.9.tar.lzma
+2021/04/08 |    1776772 | macros/latex/contrib/nicematrix.zip
+2021/04/08 |     174312 | systems/texlive/tlnet/archive/texlive-docindex.doc.r58780.tar.xz
+2021/04/08 |      17368 | systems/texlive/tlnet/archive/detex.win32.r58783.tar.xz
+2021/04/08 |    1725548 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-2.9.tar.lzma
+2021/04/08 |   17176042 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
+2021/04/08 |     170692 | systems/texlive/tlnet/archive/omegaware.win32.r58783.tar.xz
+2021/04/08 |      16884 | systems/texlive/tlnet/archive/dvipos.win32.r58783.tar.xz
+2021/04/08 |     167905 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-x64-2.9.tar.lzma
+2021/04/08 |     163657 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-x64-2.9.tar.lzma
+2021/04/08 |     163392 | macros/latex/contrib/nicematrix/nicematrix-french.tex
+2021/04/08 |      16328 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-2.9.tar.lzma
+2021/04/08 |       1624 | macros/latex/contrib/lwarp/README.txt
+2021/04/08 |      16116 | systems/texlive/tlnet/archive/dtl.win32.r58783.tar.xz
+2021/04/08 |      16109 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-2.9.tar.lzma
+2021/04/08 |     159969 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-x64-2.9.tar.lzma
+2021/04/08 |    1560056 | systems/texlive/tlnet/archive/luahbtex.win32.r58783.tar.xz
+2021/04/08 |        153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
+2021/04/08 |     153889 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-2.9.tar.lzma
+2021/04/08 |        152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
+2021/04/08 |     152840 | systems/texlive/tlnet/archive/texshade.source.r58789.tar.xz
+2021/04/08 |     152763 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-x64-2.9.tar.lzma
+2021/04/08 |      14732 | systems/texlive/tlnet/archive/afm2pl.win32.r58783.tar.xz
+2021/04/08 |     147151 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-2.9.tar.lzma
+2021/04/08 |     147139 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-2.9.tar.lzma
+2021/04/08 |    1470972 | systems/texlive/tlnet/archive/dvisvgm.win32.r58783.tar.xz
+2021/04/08 |        145 | systems/texlive/tlnet/install-tl.zip.sha512
+2021/04/08 |     145408 | systems/texlive/tlnet/archive/metafont.win32.r58783.tar.xz
+2021/04/08 |        144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
+2021/04/08 |     144551 | macros/latex/contrib/apa7/apa7.dtx
+2021/04/08 |     143584 | systems/texlive/tlnet/archive/bibtex8.win32.r58783.tar.xz
+2021/04/08 |      14354 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-x64-2.9.tar.lzma
+2021/04/08 |    1425980 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-x64-2.9.tar.lzma
+2021/04/08 |    1424814 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-x64-2.9.tar.lzma
+2021/04/08 |     141480 | systems/texlive/tlnet/archive/texlive-msg-translations.r58781.tar.xz
+2021/04/08 |      14141 | systems/unix/tex-fpc/README
+2021/04/08 |      14096 | systems/texlive/tlnet/archive/apa7.r58787.tar.xz
+2021/04/08 |    1384712 | systems/texlive/tlnet/archive/ptex.win32.r58783.tar.xz
+2021/04/08 |     136427 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-x64-2.9.tar.lzma
+2021/04/08 |     135003 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-2.9.tar.lzma
+2021/04/08 |      13471 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-2.9.tar.lzma
+2021/04/08 |     133472 | systems/texlive/tlnet/archive/synctex.win32.r58783.tar.xz
+2021/04/08 |     133108 | systems/texlive/tlnet/archive/tex.win32.r58783.tar.xz
+2021/04/08 |     131490 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-x64-2.9.tar.lzma
+2021/04/08 |      13120 | systems/texlive/tlnet/archive/patgen.win32.r58783.tar.xz
+2021/04/08 |    1307723 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-x64-2.9.tar.lzma
+2021/04/08 |      12972 | systems/texlive/tlnet/archive/gsftopk.win32.r58783.tar.xz
+2021/04/08 |    1295415 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-2.9.tar.lzma
+2021/04/08 |    1281103 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-2.9.tar.lzma
+2021/04/08 |       1278 | macros/latex/contrib/apa7/README.txt
+2021/04/08 |    1267329 | systems/win32/miktex/tm/packages/miktex-zzdb2-2.9.tar.lzma
+2021/04/08 |    1267142 | systems/win32/miktex/tm/packages/next/miktex-zzdb2-2.9.tar.lzma
+2021/04/08 |     125412 | macros/xetex/generic/xetexko/hanja_hangul.tab
+2021/04/08 |     124973 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-2.9.tar.lzma
+2021/04/08 |    1212783 | macros/latex/contrib/nicematrix/nicematrix.pdf
+2021/04/08 |    1184246 | systems/win32/miktex/tm/packages/next/miktex-zzdb3-2.9.tar.lzma
+2021/04/08 |    1183054 | systems/win32/miktex/tm/packages/miktex-zzdb3-2.9.tar.lzma
+2021/04/08 |    1171732 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-2.9.tar.lzma
+2021/04/08 |     116931 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-2.9.tar.lzma
+2021/04/08 |     115470 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-x64-2.9.tar.lzma
+2021/04/08 |       1153 | systems/win32/miktex/tm/packages/next/pr.ini
+2021/04/08 |     112252 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-x64-2.9.tar.lzma
+2021/04/08 |      11224 | systems/texlive/tlnet/archive/easybook.r58788.tar.xz
+2021/04/08 |     109275 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-x64-2.9.tar.lzma
+2021/04/08 |    1078877 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-x64-2.9.tar.lzma
+2021/04/08 |     107036 | systems/texlive/tlnet/archive/texlive-scripts.r58791.tar.xz
+2021/04/08 |      10632 | systems/texlive/tlnet/archive/dvidvi.win32.r58783.tar.xz
+2021/04/08 |     104625 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-x64-2.9.tar.lzma
+2021/04/08 |    1041076 | systems/texlive/tlnet/archive/mflua.win32.r58783.tar.xz
+2021/04/08 |     103324 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-x64-2.9.tar.lzma
+2021/04/08 |     101763 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-x64-2.9.tar.lzma
+2021/04/08 |     100788 | systems/texlive/tlnet/archive/xml2pmx.win32.r58785.tar.xz
+2021/04/07 |   99972126 | systems/win32/w32tex/TLW64/tl-win64.zip
 2021/04/07 |      95995 | systems/win32/miktex/tm/packages/dtk.tar.lzma
-2021/04/07 |      94803 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-2.9.tar.lzma
-2021/04/07 |      94736 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-x64-2.9.tar.lzma
-2021/04/07 |      94269 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-2.9.tar.lzma
 2021/04/07 |     942634 | systems/win32/miktex/tm/packages/mcf2graph.tar.lzma
-2021/04/07 |      93059 | macros/latex/contrib/easybook/easybook.dtx
+2021/04/07 |      93175 | systems/texlive/tlnet/tlpkg/translations/fr.po
 2021/04/07 |       9288 | systems/texlive/tlnet/archive/expkv-opt.source.r58772.tar.xz
 2021/04/07 |     915893 | systems/win32/miktex/tm/packages/buctthesis.tar.lzma
-2021/04/07 |        889 | systems/win32/miktex/tm/packages/pr.ini
-2021/04/07 |       8775 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-x64-2.9.tar.lzma
-2021/04/07 |      87704 | systems/win32/miktex/tm/packages/next/miktex-png-bin-x64-2.9.tar.lzma
-2021/04/07 |      87638 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-2.9.tar.lzma
+2021/04/07 |     911644 | systems/win32/w32tex/cweb-w32.tar.xz
+2021/04/07 |      89718 | systems/texlive/tlnet/tlpkg/translations/vi.po
+2021/04/07 |      88734 | systems/texlive/tlnet/tlpkg/translations/de.po
+2021/04/07 |      88080 | systems/texlive/tlnet/tlpkg/translations/sk.po
 2021/04/07 |     874108 | systems/win32/miktex/tm/packages/dynkin-diagrams.tar.lzma
+2021/04/07 |    8605328 | systems/win32/w32tex/uptex-w32.tar.xz
 2021/04/07 |      85812 | systems/texlive/tlnet/archive/missaali.r58771.tar.xz
-2021/04/07 |      84772 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-2.9.tar.lzma
+2021/04/07 |     846020 | systems/win32/w32tex/dvi2ps-w32.tar.xz
+2021/04/07 |     838272 | systems/win32/w32tex/ttf2pt1-w32.tar.xz
 2021/04/07 |     836560 | systems/win32/miktex/tm/packages/knowledge.tar.lzma
+2021/04/07 |     826840 | systems/win32/w32tex/ttf2pk-w32.tar.xz
 2021/04/07 |     826256 | macros/latex/required/babel/base/babel.pdf
 2021/04/07 |     816803 | systems/win32/miktex/tm/packages/ekdosis.tar.lzma
-2021/04/07 |     816071 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-x64-2.9.tar.lzma
-2021/04/07 |      80661 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-x64-2.9.tar.lzma
+2021/04/07 |     812499 | systems/win32/w32tex/ChangeLog
+2021/04/07 |      81245 | systems/texlive/tlnet/tlpkg/translations/cs.po
+2021/04/07 |     811472 | systems/win32/w32tex/win64/aleph-w64.tar.xz
+2021/04/07 |     808552 | systems/win32/w32tex/win64/dvipdfm-w64.tar.xz
+2021/04/07 |     800472 | systems/win32/w32tex/win64/lcdf-typetools-w64.tar.xz
+2021/04/07 |     791152 | systems/win32/w32tex/win64/pstoedit-w64.tar.xz
 2021/04/07 |      79033 | systems/win32/miktex/tm/packages/gckanbun.tar.lzma
 2021/04/07 |       7892 | systems/texlive/tlnet/archive/changes.r58773.tar.xz
-2021/04/07 |      78745 | systems/win32/miktex/tm/packages/next/miktex-png-bin-2.9.tar.lzma
 2021/04/07 |     781099 | macros/latex/required/babel/base/locale.zip
 2021/04/07 |     780399 | systems/win32/miktex/tm/packages/apa7.tar.lzma
-2021/04/07 |      77858 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-x64-2.9.tar.lzma
 2021/04/07 |     777246 | systems/win32/miktex/tm/packages/siunitx.tar.lzma
 2021/04/07 |     776876 | info/install-latex-guide-zh-cn.zip
-2021/04/07 |      77487 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-x64-2.9.tar.lzma
-2021/04/07 |       7746 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-2.9.tar.lzma
-2021/04/07 |      75419 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-x64-2.9.tar.lzma
+2021/04/07 |     760008 | systems/win32/w32tex/win64/dvipsk-w64.tar.xz
+2021/04/07 |     758972 | systems/win32/w32tex/win64/dvi2ps-w64.tar.xz
 2021/04/07 |    7534587 | systems/win32/miktex/tm/packages/pstricks.tar.lzma
-2021/04/07 |     748362 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-2.9.tar.lzma
-2021/04/07 |      74165 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-x64-2.9.tar.lzma
 2021/04/07 |       7392 | macros/latex/required/babel/base/babel.ins
 2021/04/07 |     737963 | info/install-latex-guide-zh-cn/install-latex-guide-zh-cn.pdf
 2021/04/07 |      73597 | systems/win32/miktex/tm/packages/polexpr.tar.lzma
-2021/04/07 |      73182 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-2.9.tar.lzma
-2021/04/07 |      72862 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-x64-2.9.tar.lzma
+2021/04/07 |     734912 | systems/win32/w32tex/win64/ttf2pk-w64.tar.xz
 2021/04/07 |     723257 | systems/win32/miktex/tm/packages/easybook.tar.lzma
-2021/04/07 |      72150 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-x64-2.9.tar.lzma
-2021/04/07 |      71569 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-2.9.tar.lzma
-2021/04/07 |     712481 | macros/latex/contrib/easybook.zip
-2021/04/07 |      70326 | systems/win32/miktex/tm/packages/next/miktex-web-bin-x64-2.9.tar.lzma
-2021/04/07 |      70110 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-x64-2.9.tar.lzma
+2021/04/07 |     696196 | systems/win32/w32tex/win64/ttf2pt1-w64.tar.xz
 2021/04/07 |     695052 | macros/latex/required/babel/base/babel.dtx
-2021/04/07 |     686152 | systems/texlive/tlnet/archive/easybook.doc.r58775.tar.xz
-2021/04/07 |     680049 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-x64-2.9.tar.lzma
-2021/04/07 |      67930 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-x64-2.9.tar.lzma
-2021/04/07 |      67679 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-2.9.tar.lzma
-2021/04/07 |      67651 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-2.9.tar.lzma
-2021/04/07 |      67450 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-2.9.tar.lzma
-2021/04/07 |      65732 | systems/win32/miktex/tm/packages/next/miktex-web-bin-2.9.tar.lzma
+2021/04/07 |    6926868 | systems/win32/w32tex/win64/pdftex-w64.tar.xz
+2021/04/07 |    6762112 | systems/win32/w32tex/ptex-ng-w32.tar.xz
+2021/04/07 |       6719 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
+2021/04/07 |      66231 | systems/texlive/tlnet/tlpkg/translations/pl.po
 2021/04/07 |    6543957 | systems/win32/miktex/tm/packages/newtx.tar.lzma
-2021/04/07 |      65322 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-x64-2.9.tar.lzma
-2021/04/07 |      64016 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-2.9.tar.lzma
-2021/04/07 |      63836 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-2.9.tar.lzma
-2021/04/07 |      63674 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-2.9.tar.lzma
+2021/04/07 |     651552 | systems/win32/w32tex/win64/pmx-w64.tar.xz
+2021/04/07 |      65140 | systems/texlive/tlnet/tlpkg/installer/install-tl-gui.tcl
 2021/04/07 |     632606 | systems/win32/miktex/tm/packages/notomath.tar.lzma
 2021/04/07 |       6316 | systems/texlive/tlnet/archive/collection-latexextra.r58777.tar.xz
-2021/04/07 |      62800 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-x64-2.9.tar.lzma
-2021/04/07 |     625283 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-2.9.tar.lzma
-2021/04/07 |      62227 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-x64-2.9.tar.lzma
-2021/04/07 |    6191401 | systems/texlive/tlnet/install-tl-unx.tar.gz
-2021/04/07 |     618763 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-x64-2.9.tar.lzma
-2021/04/07 |      60552 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-2.9.tar.lzma
-2021/04/07 |      59831 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-x64.tar.lzma
-2021/04/07 |     594870 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-x64-2.9.tar.lzma
-2021/04/07 |      59145 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-x64-2.9.tar.lzma
+2021/04/07 |      62686 | systems/texlive/tlnet/tlpkg/translations/zh_CN.po
+2021/04/07 |      61672 | systems/texlive/tlnet/tlpkg/translations/ja.po
+2021/04/07 |     588136 | systems/win32/w32tex/win64/jtex-w64.tar.xz
 2021/04/07 |     586284 | systems/win32/miktex/tm/packages/beamertheme-trigon.tar.lzma
-2021/04/07 |     583628 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-2.9.tar.lzma
 2021/04/07 |     581282 | systems/win32/miktex/tm/packages/yquant.tar.lzma
-2021/04/07 |      57597 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-x64-2.9.tar.lzma
-2021/04/07 |     574321 | systems/win32/miktex/tm/packages/files.csv.lzma
-2021/04/07 |     573897 | systems/win32/miktex/tm/packages/next/files.csv.lzma
-2021/04/07 |      57067 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin-x64.tar.lzma
-2021/04/07 |      56909 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-2.9.tar.lzma
-2021/04/07 |     567625 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-x64-2.9.tar.lzma
-2021/04/07 |      56716 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-x64-2.9.tar.lzma
+2021/04/07 |      57096 | systems/texlive/tlnet/tlpkg/translations/nl.po
 2021/04/07 |    5659073 | fonts/nimbus15.zip
-2021/04/07 |      56456 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-x64-2.9.tar.lzma
 2021/04/07 |     563363 | systems/win32/miktex/tm/packages/biblatex-ieee.tar.lzma
-2021/04/07 |      56222 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin.tar.lzma
-2021/04/07 |      55823 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-2.9.tar.lzma
-2021/04/07 |      55563 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin.tar.lzma
-2021/04/07 |      55219 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-2.9.tar.lzma
-2021/04/07 |     532038 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-2.9.tar.lzma
-2021/04/07 |      52476 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-2.9.tar.lzma
-2021/04/07 |      52454 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-x64-2.9.tar.lzma
+2021/04/07 |    5531000 | systems/win32/w32tex/aleph-w32.tar.xz
+2021/04/07 |      52617 | systems/texlive/tlnet/tlpkg/translations/zh_TW.po
+2021/04/07 |     525008 | systems/win32/w32tex/mftrace-w32.tar.xz
 2021/04/07 |       5224 | systems/texlive/tlnet/archive/dimnum.source.r58774.tar.xz
-2021/04/07 |      51978 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-x64-2.9.tar.lzma
-2021/04/07 |      51797 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-x64-2.9.tar.lzma
-2021/04/07 |      51431 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-2.9.tar.lzma
-2021/04/07 |     511634 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-x64-2.9.tar.lzma
-2021/04/07 |      51160 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-x64-2.9.tar.lzma
-2021/04/07 |      50847 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-2.9.tar.lzma
-2021/04/07 |      49973 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-2.9.tar.lzma
-2021/04/07 |         48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
-2021/04/07 |     484054 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-2.9.tar.lzma
-2021/04/07 |      47877 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-x64-2.9.tar.lzma
-2021/04/07 |     475935 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-2.9.tar.lzma
-2021/04/07 |       4707 | systems/win32/miktex/tm/packages/next/miktex-config-2.9.tar.lzma
-2021/04/07 |      47008 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-x64-2.9.tar.lzma
-2021/04/07 |     461399 | systems/win32/miktex/tm/packages/next/miktex-doc.tar.lzma
-2021/04/07 |      45937 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-2.9.tar.lzma
-2021/04/07 |      45648 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-2.9.tar.lzma
-2021/04/07 |        455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
-2021/04/07 |        455 | systems/texlive/tlnet/install-tl.zip.sha512.asc
-2021/04/07 |        455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
-2021/04/07 |        455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
-2021/04/07 |      45278 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-x64-2.9.tar.lzma
+2021/04/07 |     518092 | systems/win32/w32tex/psutils-w32.tar.xz
+2021/04/07 |   49394668 | systems/win32/w32tex/xetex-w32.tar.xz
+2021/04/07 |     484144 | systems/win32/w32tex/dvi2tty-w32.tar.xz
+2021/04/07 |    4662792 | systems/win32/w32tex/dvipdfm-w32.tar.xz
+2021/04/07 |      46389 | systems/texlive/tlnet/tlpkg/translations/messages.pot
+2021/04/07 |   45549708 | systems/win32/w32tex/web2c-w32.tar.xz
+2021/04/07 |    4551584 | systems/win32/w32tex/dvipsk-w32.tar.xz
+2021/04/07 |    4485428 | systems/win32/w32tex/texinfo-w32.tar.xz
+2021/04/07 |     448472 | systems/win32/w32tex/win64/dvi2tty-w64.tar.xz
 2021/04/07 |     446952 | systems/win32/miktex/tm/packages/pkuthss.tar.lzma
-2021/04/07 |      43677 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-2.9.tar.lzma
-2021/04/07 |      43391 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-x64-2.9.tar.lzma
+2021/04/07 |     440372 | systems/win32/w32tex/win64/cweb-w64.tar.xz
+2021/04/07 |     439524 | systems/win32/w32tex/mftools.tar.xz
 2021/04/07 |       4321 | info/install-latex-guide-zh-cn/appendix/mirror.tex
+2021/04/07 |     431500 | systems/win32/w32tex/win64/mftools-w64.tar.xz
 2021/04/07 |       4308 | systems/texlive/tlnet/archive/babel-romanian.source.r58776.tar.xz
-2021/04/07 |      43058 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-2.9.tar.lzma
-2021/04/07 |      42924 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-2.9.tar.lzma
-2021/04/07 |      42628 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-x64-2.9.tar.lzma
-2021/04/07 |      42574 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-x64-2.9.tar.lzma
-2021/04/07 |     425118 | macros/latex/contrib/easybook/doc/easybook.pdf
+2021/04/07 |    4291444 | systems/win32/w32tex/TLTEXINFO/tl-texinfo.zip
 2021/04/07 |       4241 | macros/latex/contrib/easybook/doc/chapter1.tex
-2021/04/07 |      42389 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-2.9.tar.lzma
 2021/04/07 |    4228031 | systems/win32/miktex/tm/packages/tudscr.tar.lzma
-2021/04/07 |      41103 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-2.9.tar.lzma
+2021/04/07 |     420176 | systems/win32/w32tex/win64/tex4htk-w64.tar.xz
 2021/04/07 |       4079 | info/install-latex-guide-zh-cn/appendix/updateinfo.tex
-2021/04/07 |      39691 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin-x64.tar.lzma
-2021/04/07 |      39564 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-2.9.tar.lzma
-2021/04/07 |     392597 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-x64-2.9.tar.lzma
-2021/04/07 |        388 | systems/texlive/tlnet/archive/texlive-docindex.r58766.tar.xz
+2021/04/07 |     407412 | systems/win32/w32tex/win64/omegaj-w64.tar.xz
+2021/04/07 |     386496 | systems/win32/w32tex/win64/psutils-w64.tar.xz
+2021/04/07 |    3852020 | systems/win32/w32tex/luajittex-w32.tar.xz
+2021/04/07 |    3851380 | systems/win32/w32tex/luajittex-dev-w32.tar.xz
 2021/04/07 |       3832 | info/install-latex-guide-zh-cn/chapter/overleaf.tex
 2021/04/07 |    3823851 | systems/win32/miktex/tm/packages/profcollege.tar.lzma
-2021/04/07 |      38070 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-2.9.tar.lzma
-2021/04/07 |      38065 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-2.9.tar.lzma
-2021/04/07 |      37293 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin-x64.tar.lzma
-2021/04/07 |      37244 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-x64-2.9.tar.lzma
-2021/04/07 |      36680 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-x64-2.9.tar.lzma
+2021/04/07 |    3817452 | systems/win32/w32tex/luajittex-exp-w32.tar.xz
+2021/04/07 |     377008 | systems/win32/w32tex/win64/mftrace-w64.tar.xz
+2021/04/07 |    3755164 | systems/win32/w32tex/win64/web2c-w64.tar.xz
 2021/04/07 |     366693 | systems/win32/miktex/tm/packages/figchild.tar.lzma
-2021/04/07 |      35462 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin.tar.lzma
 2021/04/07 |    3536132 | systems/win32/miktex/tm/packages/pst-func.tar.lzma
 2021/04/07 |       3526 | macros/latex/required/babel/base/bbidxglo.dtx
-2021/04/07 |      35063 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-x64-2.9.tar.lzma
-2021/04/07 |      34634 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-x64-2.9.tar.lzma
-2021/04/07 |     345366 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-x64-2.9.tar.lzma
-2021/04/07 |      33441 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin.tar.lzma
-2021/04/07 |      33154 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-x64-2.9.tar.lzma
-2021/04/07 |     330235 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-2.9.tar.lzma
-2021/04/07 |      32744 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-2.9.tar.lzma
-2021/04/07 |     321894 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-x64-2.9.tar.lzma
-2021/04/07 |      31593 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-x64-2.9.tar.lzma
-2021/04/07 |      31543 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-2.9.tar.lzma
-2021/04/07 |      31343 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-x64-2.9.tar.lzma
-2021/04/07 |      31193 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-2.9.tar.lzma
-2021/04/07 |     311191 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-2.9.tar.lzma
-2021/04/07 |      30885 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-x64-2.9.tar.lzma
-2021/04/07 |      30037 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-x64-2.9.tar.lzma
-2021/04/07 |      29867 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-2.9.tar.lzma
-2021/04/07 |     295553 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-x64-2.9.tar.lzma
+2021/04/07 |    3450828 | systems/win32/w32tex/win64/luajittex-w64.tar.xz
+2021/04/07 |    3448296 | systems/win32/w32tex/win64/luajittex-dev-w64.tar.xz
+2021/04/07 |    3439196 | systems/win32/w32tex/win64/luajittex-exp-w64.tar.xz
+2021/04/07 |    3122192 | systems/win32/w32tex/win64/luatex-w64.tar.xz
+2021/04/07 |    3120296 | systems/win32/w32tex/win64/luatex-exp-w64.tar.xz
+2021/04/07 |    3109896 | systems/win32/w32tex/win64/luatex-dev-w64.tar.xz
+2021/04/07 |     306956 | systems/win32/w32tex/win64/gregorio-w64.tar.xz
 2021/04/07 |    2926629 | systems/win32/miktex/tm/packages/biblatex-chicago.tar.lzma
 2021/04/07 |       2924 | systems/texlive/tlnet/archive/beamerthemelalic.r58777.tar.xz
 2021/04/07 |       2908 | systems/texlive/tlnet/archive/expkv-opt.r58772.tar.xz
 2021/04/07 |    2906455 | systems/win32/miktex/tm/packages/cochineal.tar.lzma
-2021/04/07 |      29055 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-2.9.tar.lzma
-2021/04/07 |     283977 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-x64-2.9.tar.lzma
-2021/04/07 |     282106 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-2.9.tar.lzma
-2021/04/07 |      28119 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-2.9.tar.lzma
-2021/04/07 |      28008 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-x64-2.9.tar.lzma
 2021/04/07 |    2781436 | install/macros/latex/required/babel-base.tds.zip
 2021/04/07 |     276959 | systems/win32/miktex/tm/packages/expkv-opt.tar.lzma
-2021/04/07 |      27362 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-2.9.tar.lzma
-2021/04/07 |      27275 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-x64-2.9.tar.lzma
-2021/04/07 |      27198 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-2.9.tar.lzma
-2021/04/07 |      27183 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-2.9.tar.lzma
+2021/04/07 |    2652392 | systems/win32/w32tex/dvitools-w32.tar.xz
 2021/04/07 |      26436 | systems/win32/miktex/tm/packages/xesoul.tar.lzma
 2021/04/07 |    2643461 | systems/win32/miktex/tm/packages/stix2-otf.tar.lzma
 2021/04/07 |     264172 | systems/texlive/tlnet/archive/expkv-opt.doc.r58772.tar.xz
-2021/04/07 |       2629 | macros/latex/contrib/easybook/doc/easybook-demo.tex
-2021/04/07 |     262451 | macros/latex/contrib/easybook/doc/easybook-demo.pdf
-2021/04/07 |     261962 | systems/win32/miktex/tm/packages/next/miktex-console-bin-x64-2.9.tar.lzma
-2021/04/07 |    2616931 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-x64-2.9.tar.lzma
-2021/04/07 |     258665 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-2.9.tar.lzma
+2021/04/07 |    2611928 | systems/win32/w32tex/tex4htk-w32.tar.xz
 2021/04/07 |     257174 | systems/win32/miktex/tm/packages/scrlayer-fancyhdr.tar.lzma
-2021/04/07 |      25341 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-2.9.tar.lzma
 2021/04/07 |    2529221 | systems/win32/miktex/tm/packages/xcharter.tar.lzma
-2021/04/07 |      25156 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-2.9.tar.lzma
 2021/04/07 |       2508 | systems/texlive/tlnet/archive/dimnum.r58774.tar.xz
-2021/04/07 |     250211 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-2.9.tar.lzma
-2021/04/07 |      25001 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-x64-2.9.tar.lzma
-2021/04/07 |    2499400 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-2.9.tar.lzma
-2021/04/07 |   24961619 | systems/texlive/tlnet/install-tl.zip
+2021/04/07 |      24937 | systems/texlive/tlnet/tlpkg/tltcl/tltcl.tcl
 2021/04/07 |    2459441 | systems/win32/miktex/tm/packages/changes.tar.lzma
-2021/04/07 |     243479 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-x64-2.9.tar.lzma
 2021/04/07 |    2433612 | systems/texlive/tlnet/archive/changes.doc.r58773.tar.xz
 2021/04/07 |    2423613 | systems/win32/miktex/tm/packages/xint.tar.lzma
 2021/04/07 |     240371 | systems/win32/miktex/tm/packages/abraces.tar.lzma
-2021/04/07 |     239478 | systems/win32/miktex/tm/packages/next/miktex-console-bin-2.9.tar.lzma
-2021/04/07 |      23882 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-x64-2.9.tar.lzma
 2021/04/07 |     238218 | systems/win32/miktex/tm/packages/gridpapers.tar.lzma
+2021/04/07 |    2365232 | systems/win32/w32tex/win64/dvitools-w64.tar.xz
 2021/04/07 |     236420 | systems/win32/miktex/tm/packages/foliono.tar.lzma
 2021/04/07 |     234098 | systems/win32/miktex/tm/packages/physconst.tar.lzma
-2021/04/07 |      23291 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-x64-2.9.tar.lzma
-2021/04/07 |    2295036 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
 2021/04/07 |       2290 | macros/latex/required/babel/base/README.md
 2021/04/07 |     227582 | systems/win32/miktex/tm/packages/beamerthemelalic.tar.lzma
-2021/04/07 |      22608 | systems/texlive/tlnet/archive/easybook.source.r58775.tar.xz
 2021/04/07 |     224372 | systems/texlive/tlnet/archive/beamerthemelalic.doc.r58777.tar.xz
+2021/04/07 |   22245216 | systems/win32/w32tex/pdftex-w32.tar.xz
 2021/04/07 |    2222920 | systems/win32/miktex/tm/packages/scholax.tar.lzma
-2021/04/07 |      22039 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-2.9.tar.lzma
+2021/04/07 |    2216488 | systems/win32/w32tex/win64/context-w64.tar.xz
 2021/04/07 |       2197 | fonts/nimbus15/README
 2021/04/07 |      21890 | macros/latex/required/babel/base/bbcompat.dtx
 2021/04/07 |     215017 | systems/win32/miktex/tm/packages/dimnum.tar.lzma
-2021/04/07 |     214103 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-x64-2.9.tar.lzma
 2021/04/07 |       2124 | systems/texlive/tlnet/archive/babel-romanian.r58776.tar.xz
 2021/04/07 |     211756 | systems/win32/miktex/tm/packages/marathi.tar.lzma
-2021/04/07 |     211612 | systems/texlive/tlnet/archive/texlive-scripts.doc.r58769.tar.xz
-2021/04/07 |      21129 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-2.9.tar.lzma
-2021/04/07 |     211053 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-x64-2.9.tar.lzma
 2021/04/07 |    2092201 | systems/win32/miktex/tm/packages/newpx.tar.lzma
-2021/04/07 |     208854 | systems/win32/miktex/tm/packages/next/miktex-zzdb1-2.9.tar.lzma
-2021/04/07 |     208854 | systems/win32/miktex/tm/packages/miktex-zzdb1-2.9.tar.lzma
-2021/04/07 |     208181 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-2.9.tar.lzma
 2021/04/07 |     207688 | systems/texlive/tlnet/archive/dimnum.doc.r58774.tar.xz
-2021/04/07 |     202556 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-x64-2.9.tar.lzma
-2021/04/07 |   20132481 | systems/texlive/tlnet/install-tl-windows.exe
-2021/04/07 |      20121 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-2.9.tar.lzma
-2021/04/07 |    2009489 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-x64-2.9.tar.lzma
-2021/04/07 |     199700 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-2.9.tar.lzma
 2021/04/07 |     198715 | systems/win32/miktex/tm/packages/suppose.tar.lzma
-2021/04/07 |     198129 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-2.9.tar.lzma
-2021/04/07 |     195666 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-x64-2.9.tar.lzma
-2021/04/07 |     195565 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-2.9.tar.lzma
 2021/04/07 |     194827 | systems/win32/miktex/tm/packages/unitipa.tar.lzma
 2021/04/07 |      19421 | info/install-latex-guide-zh-cn/chapter/windows.tex
-2021/04/07 |     193715 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-2.9.tar.lzma
 2021/04/07 |     189888 | systems/win32/miktex/tm/packages/tikztosvg.tar.lzma
-2021/04/07 |      18097 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-x64-2.9.tar.lzma
-2021/04/07 |     180047 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-x64-2.9.tar.lzma
-2021/04/07 |      17958 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-x64-2.9.tar.lzma
-2021/04/07 |     179379 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-2.9.tar.lzma
+2021/04/07 |   18903092 | systems/win32/w32tex/luatex-exp-w32.tar.xz
+2021/04/07 |   18891780 | systems/win32/w32tex/luatex-w32.tar.xz
+2021/04/07 |   18880316 | systems/win32/w32tex/luatex-dev-w32.tar.xz
+2021/04/07 |    1873540 | systems/win32/w32tex/win64/ptex-w64.tar.xz
+2021/04/07 |    1860732 | systems/win32/w32tex/jtex-w32.tar.xz
+2021/04/07 |    1806132 | systems/win32/w32tex/win64/uptex-w64.tar.xz
 2021/04/07 |    1789813 | macros/latex/required/babel/base.zip
 2021/04/07 |     176187 | systems/win32/miktex/tm/packages/fontools.tar.lzma
-2021/04/07 |     174316 | systems/texlive/tlnet/archive/texlive-docindex.doc.r58766.tar.xz
-2021/04/07 |    1725550 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-2.9.tar.lzma
-2021/04/07 |   17176050 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
+2021/04/07 |   17377260 | systems/win32/w32tex/gregorio-w32.tar.xz
+2021/04/07 |    1726052 | systems/win32/w32tex/pmx.tar.xz
 2021/04/07 |      16908 | systems/texlive/tlnet/archive/changes.source.r58773.tar.xz
-2021/04/07 |     167906 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-x64-2.9.tar.lzma
+2021/04/07 |    1690844 | systems/win32/w32tex/win64/ptex-ng-w64.tar.xz
 2021/04/07 |    1673605 | systems/win32/miktex/tm/packages/thuthesis.tar.lzma
 2021/04/07 |    1645822 | systems/win32/miktex/tm/packages/biblatex-gb7714-2015.tar.lzma
-2021/04/07 |     163655 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-x64-2.9.tar.lzma
-2021/04/07 |      16327 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-2.9.tar.lzma
-2021/04/07 |      16111 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-2.9.tar.lzma
-2021/04/07 |     159968 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-x64-2.9.tar.lzma
+2021/04/07 |    1609484 | systems/win32/w32tex/makeindex-w32.tar.xz
 2021/04/07 |     155457 | systems/win32/miktex/tm/packages/srdp-mathematik.tar.lzma
-2021/04/07 |        153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
-2021/04/07 |     153889 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-2.9.tar.lzma
-2021/04/07 |        152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
-2021/04/07 |     152762 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-x64-2.9.tar.lzma
-2021/04/07 |     147151 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-2.9.tar.lzma
-2021/04/07 |     147139 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-2.9.tar.lzma
-2021/04/07 |        145 | systems/texlive/tlnet/install-tl.zip.sha512
-2021/04/07 |        144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
-2021/04/07 |      14353 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-x64-2.9.tar.lzma
+2021/04/07 |  144901876 | systems/win32/w32tex/context.tar.xz
 2021/04/07 |   14331476 | systems/win32/miktex/tm/packages/missaali.tar.lzma
-2021/04/07 |    1425980 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-x64-2.9.tar.lzma
-2021/04/07 |    1424812 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-x64-2.9.tar.lzma
 2021/04/07 |   14130560 | systems/texlive/tlnet/archive/missaali.doc.r58771.tar.xz
 2021/04/07 |     139277 | systems/win32/miktex/tm/packages/rec-thy.tar.lzma
 2021/04/07 |    1392001 | systems/win32/miktex/tm/packages/circuitikz.tar.lzma
 2021/04/07 |     137628 | systems/win32/miktex/tm/packages/dynbrackets.tar.lzma
 2021/04/07 |      13753 | info/install-latex-guide-zh-cn/chapter/ubuntu.tex
-2021/04/07 |     136426 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-x64-2.9.tar.lzma
-2021/04/07 |     135005 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-2.9.tar.lzma
-2021/04/07 |      13470 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-2.9.tar.lzma
-2021/04/07 |     131490 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-x64-2.9.tar.lzma
-2021/04/07 |    1307722 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-x64-2.9.tar.lzma
-2021/04/07 |    1295413 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-2.9.tar.lzma
-2021/04/07 |    1281104 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-2.9.tar.lzma
-2021/04/07 |    1267530 | systems/win32/miktex/tm/packages/next/miktex-zzdb2-2.9.tar.lzma
-2021/04/07 |    1266588 | systems/win32/miktex/tm/packages/miktex-zzdb2-2.9.tar.lzma
 2021/04/07 |       1261 | fonts/nimbus15/tex/T2ANimbusSerif.fd
 2021/04/07 |   12511444 | systems/win32/miktex/tm/packages/arara.tar.lzma
-2021/04/07 |     124972 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-2.9.tar.lzma
+2021/04/07 |    1246480 | systems/win32/w32tex/omegaj-w32.tar.xz
 2021/04/07 |     119519 | systems/win32/miktex/tm/packages/babel-romanian.tar.lzma
 2021/04/07 |      11913 | info/install-latex-guide-zh-cn/chapter/wsl.tex
-2021/04/07 |    1183705 | systems/win32/miktex/tm/packages/miktex-zzdb3-2.9.tar.lzma
-2021/04/07 |    1183249 | systems/win32/miktex/tm/packages/next/miktex-zzdb3-2.9.tar.lzma
-2021/04/07 |    1171731 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-2.9.tar.lzma
-2021/04/07 |     116931 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-2.9.tar.lzma
-2021/04/07 |     115468 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-x64-2.9.tar.lzma
-2021/04/07 |       1153 | systems/win32/miktex/tm/packages/next/pr.ini
+2021/04/07 |    1170892 | systems/win32/w32tex/pstoedit-w32.tar.xz
 2021/04/07 |     113056 | systems/texlive/tlnet/archive/babel-romanian.doc.r58776.tar.xz
 2021/04/07 |     112757 | systems/win32/miktex/tm/packages/physunits.tar.lzma
-2021/04/07 |     112251 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-x64-2.9.tar.lzma
-2021/04/07 |      11188 | systems/texlive/tlnet/archive/easybook.r58775.tar.xz
+2021/04/07 |   11080560 | systems/win32/w32tex/win64/xetex-w64.tar.xz
 2021/04/07 |    1098542 | systems/win32/miktex/tm/packages/texshade.tar.lzma
 2021/04/07 |    1097005 | systems/win32/miktex/tm/packages/mathtools.tar.lzma
-2021/04/07 |     109276 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-x64-2.9.tar.lzma
-2021/04/07 |    1078878 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-x64-2.9.tar.lzma
-2021/04/07 |     107044 | systems/texlive/tlnet/archive/texlive-scripts.r58769.tar.xz
+2021/04/07 |    1079108 | systems/win32/w32tex/win64/makeindex-w64.tar.xz
+2021/04/07 |   10701360 | systems/win32/w32tex/ptex-w32.tar.xz
 2021/04/07 |   10486168 | systems/win32/miktex/tm/packages/reledmac.tar.lzma
-2021/04/07 |     104625 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-x64-2.9.tar.lzma
 2021/04/07 |    1044772 | systems/win32/miktex/tm/packages/latexindent.tar.lzma
 2021/04/07 |    1035679 | systems/win32/miktex/tm/packages/powerdot.tar.lzma
-2021/04/07 |     103323 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-x64-2.9.tar.lzma
-2021/04/07 |     101760 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-x64-2.9.tar.lzma
+2021/04/07 |    1007424 | systems/win32/w32tex/lcdf-typetools-w32.tar.xz
 2021/04/06 |     972108 | systems/texlive/tlnet/archive/newtx.doc.r58748.tar.xz
 2021/04/06 |      96752 | systems/texlive/tlnet/archive/lua-ul.doc.r58745.tar.xz
 2021/04/06 |       9616 | systems/texlive/tlnet/archive/lua-ul.source.r58745.tar.xz
@@ -320,9 +521,7 @@
 2021/04/06 |     898429 | support/latexindent/documentation/latexindent.pdf
 2021/04/06 |     851528 | systems/texlive/tlnet/archive/dynkin-diagrams.doc.r58758.tar.xz
 2021/04/06 |        834 | support/latexindent/LatexIndent/Version.pm
-2021/04/06 |     830645 | macros/latex/contrib/apa7.zip
 2021/04/06 |      81212 | graphics/pstricks/contrib/pst-func/tex/pst-func.tex
-2021/04/06 |     811715 | systems/win32/w32tex/ChangeLog
 2021/04/06 |       7970 | support/latexindent/documentation/sec-introduction.tex
 2021/04/06 |       7945 | support/latexindent/LatexIndent/LogFile.pm
 2021/04/06 |      76744 | systems/texlive/tlnet/archive/gckanbun.doc.r58754.tar.xz
@@ -334,9 +533,6 @@
 2021/04/06 |       7223 | support/latexindent/documentation/subsubsec-no-add-remaining-code-blocks.tex
 2021/04/06 |       7161 | support/latexindent/documentation/figure-schematic.png
 2021/04/06 |       6793 | support/latexindent/LatexIndent/MandatoryArgument.pm
-2021/04/06 |       6535 | macros/latex/contrib/apa7/apa7.ins
-2021/04/06 |      65352 | macros/latex/contrib/apa7/samples/shortsample.pdf
-2021/04/06 |      65175 | systems/texlive/tlnet/tlpkg/installer/install-tl-gui.tcl
 2021/04/06 |       6438 | support/latexindent/LatexIndent/FileExtension.pm
 2021/04/06 |       6408 | support/latexindent/LatexIndent/Item.pm
 2021/04/06 |    6371371 | support/latexindent/latexindent.exe
@@ -357,7 +553,6 @@
 2021/04/06 |      54940 | systems/texlive/tlnet/archive/reledmac.r58763.tar.xz
 2021/04/06 |       5435 | support/latexindent/LatexIndent/BlankLines.pm
 2021/04/06 |       5330 | support/latexindent/LatexIndent/KeyEqualsValuesBraces.pm
-2021/04/06 |     530991 | macros/latex/contrib/apa7/apa7.pdf
 2021/04/06 |       5284 | support/latexindent/documentation/subsubsec-headings.tex
 2021/04/06 |       5244 | systems/texlive/tlnet/archive/marathi.r58760.tar.xz
 2021/04/06 |      52219 | support/latexindent/LatexIndent/AlignmentAtAmpersand.pm
@@ -371,7 +566,6 @@
 2021/04/06 |      46016 | systems/texlive/tlnet/archive/thuthesis.source.r58750.tar.xz
 2021/04/06 |      45856 | systems/texlive/tlnet/archive/figchild.r58759.tar.xz
 2021/04/06 |      44096 | support/latexindent/documentation/logo.png
-2021/04/06 |     440276 | systems/win32/w32tex/win64/cweb-w64.tar.xz
 2021/04/06 |       4355 | support/latexindent/LatexIndent/RoundBrackets.pm
 2021/04/06 |       4284 | support/latexindent/LatexIndent/NamedGroupingBracesBrackets.pm
 2021/04/06 |  417578814 | systems/mac/mactex/MacTeXtras-20210406.zip
@@ -418,7 +612,6 @@
 2021/04/06 |       1996 | systems/texlive/tlnet/archive/gckanbun.r58754.tar.xz
 2021/04/06 |       1990 | support/latexindent/LatexIndent/Switches.pm
 2021/04/06 |      19864 | support/latexindent/LatexIndent/Sentence.pm
-2021/04/06 |     196588 | macros/latex/contrib/apa7/samples/longsample.pdf
 2021/04/06 |       1896 | support/latexindent/documentation/figure-schematic.tex
 2021/04/06 |     189576 | systems/texlive/tlnet/archive/marathi.doc.r58760.tar.xz
 2021/04/06 |       1891 | support/latexindent/documentation/subsec-noAdditionalIndent-indentRules.tex
@@ -439,7 +632,6 @@
 2021/04/06 |       1558 | support/latexindent/latexindent-module-installer.pl
 2021/04/06 |       1483 | support/latexindent/LatexIndent/DoubleBackSlash.pm
 2021/04/06 |       1478 | support/latexindent/documentation/title.tex
-2021/04/06 |     144283 | macros/latex/contrib/apa7/apa7.dtx
 2021/04/06 |     144196 | systems/texlive/tlnet/archive/circuitikz.r58757.tar.xz
 2021/04/06 |       1432 | systems/texlive/tlnet/archive/collection-pictures.r58759.tar.xz
 2021/04/06 |       1420 | systems/texlive/tlnet/archive/scrlayer-fancyhdr.r58746.tar.xz
@@ -448,7 +640,6 @@
 2021/04/06 |      13154 | support/latexindent/LatexIndent/Special.pm
 2021/04/06 |  130665440 | systems/win32/w32tex/web2c-lib.tar.xz
 2021/04/06 |     129732 | systems/texlive/tlnet/archive/fontools.doc.r58747.tar.xz
-2021/04/06 |       1278 | macros/latex/contrib/apa7/README.txt
 2021/04/06 |      12661 | support/latexindent/LatexIndent/Braces.pm
 2021/04/06 |    1259016 | systems/texlive/tlnet/archive/circuitikz.doc.r58757.tar.xz
 2021/04/06 |      11862 | support/latexindent/LatexIndent/FileContents.pm
@@ -481,7 +672,6 @@
 2021/04/05 |      93585 | macros/latex/contrib/changes/examples/changes.example.setauthormarkupposition.pdf
 2021/04/05 |      92919 | macros/latex/contrib/changes/examples/changes.example.simple.pdf
 2021/04/05 |         91 | macros/latex/contrib/changes/userdoc/comment_ex.tex
-2021/04/05 |     911480 | systems/win32/w32tex/cweb-w32.tar.xz
 2021/04/05 |      89121 | macros/latex/contrib/changes/examples/changes.example.listofchanges.show.pdf
 2021/04/05 |      88820 | macros/latex/contrib/changes/examples/changes.example.listofchanges.all.pdf
 2021/04/05 |      88609 | fonts/missaali/doc/pics/pic-2.png
@@ -566,7 +756,6 @@
 2021/04/05 |      68141 | macros/latex/contrib/changes/examples/changes.example.final.pdf
 2021/04/05 |      67108 | systems/texlive/tlnet/archive/powerdot.source.r58730.tar.xz
 2021/04/05 |         66 | macros/latex/contrib/changes/userdoc/usepackage_authormarkupposition_changes_in.tex
-2021/04/05 |       6598 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
 2021/04/05 |       6552 | systems/texlive/tlnet/archive/physunits.source.r58728.tar.xz
 2021/04/05 |         63 | macros/latex/contrib/changes/userdoc/setauthormarkupposition_ex.tex
 2021/04/05 |     637016 | systems/texlive/tlnet/archive/siunitx.doc.r58714.tar.xz
@@ -596,7 +785,6 @@
 2021/04/05 |       5030 | macros/latex/contrib/changes/example-screenshot.dtx
 2021/04/05 |         49 | macros/latex/contrib/changes/userdoc/setauthormarkupposition_in.tex
 2021/04/05 |         49 | macros/latex/contrib/changes/userdoc/deleted_in.tex
-2021/04/05 |   49392484 | systems/win32/w32tex/xetex-w32.tar.xz
 2021/04/05 |       4934 | macros/latex/contrib/babel-contrib/romanian/romanian.ins
 2021/04/05 |         48 | macros/latex/contrib/changes/userdoc/usepackage_todonotes_changes_ex.tex
 2021/04/05 |         48 | macros/latex/contrib/changes/userdoc/usepackage_addedmarkup_changes_in.tex
@@ -605,7 +793,6 @@
 2021/04/05 |         47 | macros/latex/contrib/changes/userdoc/highlight_in.tex
 2021/04/05 |         47 | macros/latex/contrib/changes/userdoc/added_in.tex
 2021/04/05 |     458723 | fonts/missaali/doc/pics/missale-tinyfont.png
-2021/04/05 |   45563372 | systems/win32/w32tex/web2c-w32.tar.xz
 2021/04/05 |      45296 | systems/texlive/tlnet/archive/yquant.r58712.tar.xz
 2021/04/05 |     451971 | macros/latex/contrib/changes/changes.english.withcode.pdf
 2021/04/05 |       4486 | fonts/missaali/OFL.txt
@@ -621,13 +808,9 @@
 2021/04/05 |         39 | macros/latex/contrib/changes/userdoc/usepackage_xcolor_changes_in.tex
 2021/04/05 |         38 | macros/latex/contrib/changes/userdoc/usepackage_markup_changes_in.tex
 2021/04/05 |         38 | macros/latex/contrib/changes/userdoc/path_doc_examples_in.tex
-2021/04/05 |    3852056 | systems/win32/w32tex/luajittex-dev-w32.tar.xz
-2021/04/05 |    3848172 | systems/win32/w32tex/luajittex-w32.tar.xz
 2021/04/05 |      38245 | macros/latex/contrib/changes/userdoc/changes.en.tex
-2021/04/05 |    3820356 | systems/win32/w32tex/luajittex-exp-w32.tar.xz
 2021/04/05 |         37 | macros/latex/contrib/changes/userdoc/usepackage_ulem_changes_in.tex
 2021/04/05 |     376287 | macros/latex/contrib/changes/changes.ngerman.pdf
-2021/04/05 |    3756440 | systems/win32/w32tex/win64/web2c-w64.tar.xz
 2021/04/05 |    3746440 | systems/texlive/tlnet/archive/tudscr.doc.r58713.tar.xz
 2021/04/05 |       3700 | fonts/missaali/doc/missaali.bib
 2021/04/05 |     369568 | systems/texlive/tlnet/archive/cochineal.doc.r58717.tar.xz
@@ -636,9 +819,6 @@
 2021/04/05 |         34 | macros/latex/contrib/changes/userdoc/sethighlightmarkup_in.tex
 2021/04/05 |      34748 | systems/texlive/tlnet/archive/siunitx.r58714.tar.xz
 2021/04/05 |     346220 | systems/texlive/tlnet/archive/xint.source.r58738.tar.xz
-2021/04/05 |    3459624 | systems/win32/w32tex/win64/luajittex-w64.tar.xz
-2021/04/05 |    3457384 | systems/win32/w32tex/win64/luajittex-dev-w64.tar.xz
-2021/04/05 |    3453592 | systems/win32/w32tex/win64/luajittex-exp-w64.tar.xz
 2021/04/05 |        336 | macros/latex/contrib/babel-contrib/romanian/README.md
 2021/04/05 |     334084 | systems/texlive/tlnet/archive/scholax.doc.r58733.tar.xz
 2021/04/05 |     333228 | fonts/missaali/doc/pics/missale-largefont.png
@@ -649,9 +829,6 @@
 2021/04/05 |         32 | macros/latex/contrib/changes/userdoc/setcommentmarkup_in.tex
 2021/04/05 |         31 | macros/latex/contrib/changes/userdoc/setauthormarkup_in.tex
 2021/04/05 |     316860 | systems/texlive/tlnet/archive/tudscr.source.r58713.tar.xz
-2021/04/05 |    3120720 | systems/win32/w32tex/win64/luatex-dev-w64.tar.xz
-2021/04/05 |    3118996 | systems/win32/w32tex/win64/luatex-exp-w64.tar.xz
-2021/04/05 |    3118720 | systems/win32/w32tex/win64/luatex-w64.tar.xz
 2021/04/05 |         30 | macros/latex/contrib/changes/userdoc/setsocextension_in.tex
 2021/04/05 |         30 | macros/latex/contrib/changes/userdoc/setlocextension_in.tex
 2021/04/05 |         30 | macros/latex/contrib/changes/userdoc/setaddedmarkup_in.tex
@@ -699,9 +876,6 @@
 2021/04/05 |     196252 | systems/texlive/tlnet/archive/suppose.doc.r58736.tar.xz
 2021/04/05 |      19132 | systems/texlive/tlnet/archive/ekdosis.r58721.tar.xz
 2021/04/05 |      19110 | fonts/missaali/lppl.txt
-2021/04/05 |   18908220 | systems/win32/w32tex/luatex-exp-w32.tar.xz
-2021/04/05 |   18900792 | systems/win32/w32tex/luatex-dev-w32.tar.xz
-2021/04/05 |   18898248 | systems/win32/w32tex/luatex-w32.tar.xz
 2021/04/05 |    1884268 | systems/texlive/tlnet/archive/scholax.r58733.tar.xz
 2021/04/05 |      18756 | systems/texlive/tlnet/archive/physconst.source.r58727.tar.xz
 2021/04/05 |        182 | macros/latex/contrib/changes/userdoc/added_ex.tex
@@ -738,7 +912,6 @@
 2021/04/05 |       1126 | macros/generic/expkv-opt/README.md
 2021/04/05 |     112472 | macros/latex/contrib/babel-contrib/romanian/romanian.pdf
 2021/04/05 |    1123322 | fonts/missaali/Missaali.glyphs
-2021/04/05 |   11081804 | systems/win32/w32tex/win64/xetex-w64.tar.xz
 2021/04/05 |     110514 | macros/latex/contrib/changes/examples/changes.example.commentmarkup.footnote.pdf
 2021/04/05 |      11043 | macros/latex/contrib/changes/pyMergeChanges.py
 2021/04/05 |        109 | macros/latex/contrib/changes/userdoc/usepackage_authormarkuptext_changes_ex.tex
@@ -783,7 +956,6 @@
 2021/04/04 |     690730 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.9.3.sty
 2021/04/04 |     683433 | graphics/pgf/contrib/circuitikz/tex/t-circuitikz-0.9.3.tex
 2021/04/04 |        682 | support/arara/scripts/rules/arara-rule-sketch.yaml
-2021/04/04 |    6761856 | systems/win32/w32tex/ptex-ng-w32.tar.xz
 2021/04/04 |        651 | support/arara/scripts/rules/arara-rule-spix.yaml
 2021/04/04 |        647 | support/arara/scripts/rules/arara-rule-makeglossarieslite.yaml
 2021/04/04 |        647 | support/arara/scripts/rules/arara-rule-convert.yaml
@@ -924,7 +1096,6 @@
 2021/04/04 |       1722 | support/arara/scripts/rules/arara-rule-pythontex.yaml
 2021/04/04 |       1718 | macros/latex/contrib/reledmac/makefile
 2021/04/04 |       1709 | support/arara/scripts/rules/arara-rule-texcount.yaml
-2021/04/04 |    1690572 | systems/win32/w32tex/win64/ptex-ng-w64.tar.xz
 2021/04/04 |     168145 | macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_default.pdf
 2021/04/04 |       1672 | support/arara/scripts/rules/arara-rule-fig2dev.yaml
 2021/04/04 |      16580 | graphics/pgf/contrib/circuitikz/tex/pgfcircpath.tex
@@ -997,8 +1168,6 @@
 2021/04/03 |       9434 | indexing/upmendex/source/convert.c
 2021/04/03 |     875280 | systems/texlive/tlnet/archive/beebe.r58697.tar.xz
 2021/04/03 |        872 | indexing/upmendex/doc/samples/option/japanese.idx
-2021/04/03 |    8602952 | systems/win32/w32tex/uptex-w32.tar.xz
-2021/04/03 |     808672 | systems/win32/w32tex/win64/dvipdfm-w64.tar.xz
 2021/04/03 |        802 | macros/latex/contrib/thuthesis/thuthesis-numeric.bbx
 2021/04/03 |      79118 | language/japanese/gckanbun.zip
 2021/04/03 |        778 | macros/latex/contrib/thuthesis/thuthesis-bachelor.bbx
@@ -1037,7 +1206,6 @@
 2021/04/03 |        479 | macros/latex/contrib/thuthesis/thuthesis-author-year.bbx
 2021/04/03 |      47154 | macros/latex/contrib/thuthesis/thuthesis-author-year.bst
 2021/04/03 |      46876 | indexing/upmendex/source/Makefile.in
-2021/04/03 |    4662964 | systems/win32/w32tex/dvipdfm-w32.tar.xz
 2021/04/03 |       4656 | macros/latex/contrib/thuthesis/data/chap01.tex
 2021/04/03 |        463 | indexing/upmendex/doc/samples/german.idx
 2021/04/03 |        462 | macros/latex/contrib/thuthesis/data/resolution.tex
@@ -1121,7 +1289,6 @@
 2021/04/03 |      19106 | macros/latex/contrib/thuthesis/LICENSE
 2021/04/03 |       1891 | indexing/upmendex/doc/samples/alphabet/alpha_zhp.idx
 2021/04/03 |    1880344 | systems/texlive/tlnet/archive/luatex.doc.r58702.tar.xz
-2021/04/03 |    1873492 | systems/win32/w32tex/win64/ptex-w64.tar.xz
 2021/04/03 |      18669 | indexing/xindy/contrib/xindy-persian/persian/variant2-utf8.xdy
 2021/04/03 |      18626 | indexing/xindy/contrib/xindy-persian/persian/variant3-utf8.xdy
 2021/04/03 |      18618 | indexing/xindy/contrib/xindy-persian/persian/variant1-utf8.xdy
@@ -1131,7 +1298,6 @@
 2021/04/03 |       1807 | indexing/upmendex/doc/samples/alphabet/mdxsty_zh14.ist
 2021/04/03 |       1807 | indexing/upmendex/doc/samples/alphabet/mdxsty_zh13.ist
 2021/04/03 |       1807 | indexing/upmendex/doc/samples/alphabet/mdxsty_zh12.ist
-2021/04/03 |    1806444 | systems/win32/w32tex/win64/uptex-w64.tar.xz
 2021/04/03 |        179 | indexing/upmendex/source/tests/pprec2.ist
 2021/04/03 |        179 | indexing/upmendex/source/tests/pprec1.ist
 2021/04/03 |       1787 | macros/latex/contrib/thuthesis/data/appendix-translation.tex
@@ -1176,7 +1342,6 @@
 2021/04/03 |    1144457 | macros/latex/contrib/thuthesis/thuthesis.pdf
 2021/04/03 |       1095 | indexing/upmendex/doc/samples/option/attri1.idx
 2021/04/03 |      10827 | language/marathi/namuna-report.tex
-2021/04/03 |   10682588 | systems/win32/w32tex/ptex-w32.tar.xz
 2021/04/03 |       1052 | indexing/upmendex/source/pageread.c
 2021/04/03 |      10083 | indexing/upmendex/source/styfile.c
 2021/04/02 |     907631 | fonts/stix2-otf/STIXTwoMath-Regular.pdf
@@ -1187,7 +1352,6 @@
 2021/04/02 |     830931 | macros/luatex/latex/ekdosis/ekdosis.pdf
 2021/04/02 |     824127 | macros/luatex/latex/ekdosis.zip
 2021/04/02 |       7824 | macros/latex/contrib/suppose/suppose.sty
-2021/04/02 |    6933696 | systems/win32/w32tex/win64/pdftex-w64.tar.xz
 2021/04/02 |       6851 | macros/luatex/latex/ekdosis/samples/Caesar_BG-6-13-1-tei.xml
 2021/04/02 |      58513 | fonts/stix2-otf/OFL-FAQ.txt
 2021/04/02 |       5332 | macros/latex/contrib/conferences/sugconf/sugconf.cls
@@ -1219,64 +1383,9 @@
 2021/04/02 |     292268 | fonts/stix2-otf/STIXTwoText-Regular.otf
 2021/04/02 |       2710 | fonts/stix2-otf/intro.tex
 2021/04/02 |     235083 | fonts/stix2-otf/STIXTwoText-Regular.tex
-2021/04/02 |   22231236 | systems/win32/w32tex/pdftex-w32.tar.xz
 2021/04/02 |     198315 | macros/latex/contrib/suppose.zip
 2021/04/02 |       1874 | macros/luatex/latex/ekdosis/ekdosis.ins
 2021/04/02 |      17995 | macros/luatex/latex/ekdosis/samples/Caesar_BG-6-13-1.pdf
 2021/04/02 |    1763342 | systems/doc/luatex/luatex.pdf
-2021/04/02 |     141504 | systems/texlive/tlnet/archive/texlive-msg-translations.r58693.tar.xz
 2021/04/02 |      13528 | fonts/stix2-otf/README.md
 2021/04/02 |      11847 | fonts/stix2-otf/Math-features.tex
-2021/04/02 |    1182048 | systems/win32/w32tex/extractpdfmark-w32.tar.xz
-2021/04/02 |    1085612 | systems/win32/w32tex/win64/extractpdfmark-w64.tar.xz
-2021/04/01 |       9480 | fonts/utilities/fontools/bin/splitttc
-2021/04/01 |        837 | macros/latex/contrib/conferences/sugconf/sugconf-skeleton.tex
-2021/04/01 |       8032 | fonts/utilities/fontools/share/fontools_lgr.enc
-2021/04/01 |     785208 | fonts/xcharter/doc/xcharter-doc.pdf
-2021/04/01 |      69654 | fonts/utilities/fontools/doc/autoinst.pdf
-2021/04/01 |        662 | macros/latex/contrib/dynbrackets/README.md
-2021/04/01 |       5354 | macros/latex/contrib/dynbrackets/dynbrackets.dtx
-2021/04/01 |     522822 | macros/latex/contrib/profcollege/latex/ProfCollege.sty
-2021/04/01 |         50 | systems/mac/mactex/Ghostscript.pkg.md5
-2021/04/01 |         47 | systems/mac/mactex/BasicTeX.pkg.md5
-2021/04/01 |         45 | systems/mac/mactex/MacTeX.pkg.md5
-2021/04/01 |       3729 | fonts/utilities/fontools/share/fontools_t2b.enc
-2021/04/01 |       3651 | fonts/utilities/fontools/share/fontools_t2c.enc
-2021/04/01 |       3640 | macros/latex/contrib/suppose/suppose-doc.tex
-2021/04/01 |       3080 | fonts/utilities/fontools/share/fontools_ts1.enc
-2021/04/01 |       3003 | fonts/utilities/fontools/README
-2021/04/01 |       2907 | fonts/utilities/fontools/share/fontools_t2a.enc
-2021/04/01 |       2855 | fonts/utilities/fontools/share/fontools_ly1.enc
-2021/04/01 |       2815 | fonts/utilities/fontools/share/fontools_t1.enc
-2021/04/01 |      27582 | fonts/utilities/fontools/bin/ot2kpx
-2021/04/01 |       2751 | fonts/utilities/fontools/share/fontools_ts3.enc
-2021/04/01 |      27441 | fonts/utilities/fontools/doc/ot2kpx.pdf
-2021/04/01 |      27065 | fonts/utilities/fontools/doc/afm2afm.pdf
-2021/04/01 |       2656 | fonts/utilities/fontools/share/fontools_t3.enc
-2021/04/01 |    2599573 | macros/latex/contrib/profcollege/doc/ProfCollege-doc.pdf
-2021/04/01 |       2587 | fonts/utilities/fontools/share/fontools_ot1.enc
-2021/04/01 |       2504 | macros/latex/contrib/conferences/sugconf/sugconf-template.tex
-2021/04/01 |       2497 | macros/latex/contrib/easybook/README.md
-2021/04/01 |       2475 | macros/latex/contrib/texshade/texshade.ins
-2021/04/01 |     231121 | macros/latex/contrib/abraces/abraces-doc.pdf
-2021/04/01 |       2248 | fonts/utilities/fontools/share/fontools_oml.enc
-2021/04/01 |    2216432 | systems/win32/w32tex/win64/context-w64.tar.xz
-2021/04/01 |       2191 | macros/latex/contrib/dynbrackets/dynbrackets.ins
-2021/04/01 |       2161 | macros/latex/contrib/dimnum/dimnum.ins
-2021/04/01 |      20583 | fonts/utilities/fontools/doc/splitttc.pdf
-2021/04/01 |     205546 | macros/latex/contrib/suppose/suppose-doc.pdf
-2021/04/01 |     204110 | fonts/utilities/fontools.zip
-2021/04/01 |    1911308 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/biblatex-gb7714-2015.pdf
-2021/04/01 |        179 | systems/mac/mactex/README
-2021/04/01 |      17997 | fonts/utilities/fontools/GPLv2.txt
-2021/04/01 |    1675518 | macros/latex/contrib/profcollege/doc/ProfCollege-doc.zip
-2021/04/01 |      16192 | macros/latex/contrib/abraces/abraces-doc.tex
-2021/04/01 |     159316 | fonts/utilities/fontools/bin/autoinst
-2021/04/01 |  144907064 | systems/win32/w32tex/context.tar.xz
-2021/04/01 |     141825 | macros/latex/contrib/dynbrackets/dynbrackets.pdf
-2021/04/01 |     137049 | macros/latex/contrib/dynbrackets.zip
-2021/04/01 |      13334 | fonts/utilities/fontools/bin/afm2afm
-2021/04/01 |       1229 | systems/texlive/tlnet/README.md
-2021/04/01 |       1173 | systems/texlive/Images/README.md
-2021/04/01 |      11737 | macros/latex/contrib/abraces/abraces.sty
-2021/04/01 |          0 | systems/texlive/tlnet/TEXLIVE_2021
diff --git a/macros/latex/contrib/apa7/apa7.dtx b/macros/latex/contrib/apa7/apa7.dtx
index 20bc61a2c7..10da0cabda 100644
--- a/macros/latex/contrib/apa7/apa7.dtx
+++ b/macros/latex/contrib/apa7/apa7.dtx
@@ -4,11 +4,11 @@
 %                                                                           %
 %    CHANGE THESE VALUES WITH EACH NEW RELEASE:                             %
 %                                                                           %
-%<class>\ProvidesClass{apa7}[2021/04/05 v2.11 APA formatting (7th edition)]
+%<class>\ProvidesClass{apa7}[2021/04/08 v2.12 APA formatting (7th edition)]
 %                                                                           %
 %<*internal>                                                                %
-\def\apaSevenVersionDate{2021/04/05}
-\def\apaSevenVersionNumber{2.11}
+\def\apaSevenVersionDate{2021/04/08}
+\def\apaSevenVersionNumber{2.12}
 %                                                                           %
 %                                                                           %
 % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -271,6 +271,8 @@ and the derived files           apa7.ins,
 %
 % \changes{v2.11}{2021/04/05}{Updated linebreaks in caption separators to prevent warning. }
 %
+% \changes{v2.12}{2021/04/08}{Reset equation counter for every appendix (like for figures and tables). Thanks mmrabe. }
+%
 % \begin{abstract}
 %   The \textit{Publication Manual} of the American Psychological
 %   Association is widely used in the social sciences.  The most
@@ -2248,6 +2250,8 @@ and the derived files           apa7.ins,
 \def\apaSevenapptab{%
  \renewcommand\thetable{\theappendix\@arabic\c@table}%
  \ifapamodeman{\renewcommand\theposttbl{\theappendix\arabic{posttbl}}}{}}
+\def\apaSevenappeq{%
+ \renewcommand\theequation{\theappendix\@arabic\c@equation}}
 \newif\ifoneappendix
 \oneappendixtrue % one appendix by default
 \newif\ifappendix
@@ -2260,6 +2264,7 @@ and the derived files           apa7.ins,
   \appendixtrue
   \apaSevenappfig
   \apaSevenapptab
+  \apaSevenappeq
 %  \ifapamodejou{}{\clearpage} %% commented out -- thp 2005/07/23
   \let\old@apaSeven@section=\section % This will not work right with five levels in appendix.
                                  % Should go into \section, not \leveltwo but would also require
@@ -2290,6 +2295,7 @@ and the derived files           apa7.ins,
                    }%
                     \setcounter{figure}{0}%
                     \setcounter{table}{0}%
+                    \setcounter{equation}{0}%
                     \vskip2.5ex%
 %                  \addtocounter{appendix}{1}%
                    \refstepcounter{appendix}% 2002/07/20 this takes care of references too
@@ -3874,4 +3880,4 @@ The detailed results are shown in Table~\ref{tab:DeckedTable}. \lipsum[22]
 %\end{macro}
 %
 %
-%\Finale
\ No newline at end of file
+%\Finale
diff --git a/macros/latex/contrib/apa7/apa7.pdf b/macros/latex/contrib/apa7/apa7.pdf
index aa32a866a6..710740e416 100644
--- a/macros/latex/contrib/apa7/apa7.pdf
+++ b/macros/latex/contrib/apa7/apa7.pdf
diff --git a/macros/latex/contrib/apa7/samples/longsample.pdf b/macros/latex/contrib/apa7/samples/longsample.pdf
index 0a0b7b6545..1fe1ad8736 100644
--- a/macros/latex/contrib/apa7/samples/longsample.pdf
+++ b/macros/latex/contrib/apa7/samples/longsample.pdf
diff --git a/macros/latex/contrib/apa7/samples/shortsample.pdf b/macros/latex/contrib/apa7/samples/shortsample.pdf
index 83984dbc31..10623740d3 100644
--- a/macros/latex/contrib/apa7/samples/shortsample.pdf
+++ b/macros/latex/contrib/apa7/samples/shortsample.pdf
diff --git a/macros/latex/contrib/easybook/doc/easybook-demo.pdf b/macros/latex/contrib/easybook/doc/easybook-demo.pdf
index 16ed695502..b2b27f68bb 100644
--- a/macros/latex/contrib/easybook/doc/easybook-demo.pdf
+++ b/macros/latex/contrib/easybook/doc/easybook-demo.pdf
diff --git a/macros/latex/contrib/easybook/doc/easybook-demo.tex b/macros/latex/contrib/easybook/doc/easybook-demo.tex
index e23317741f..0308056ec0 100644
--- a/macros/latex/contrib/easybook/doc/easybook-demo.tex
+++ b/macros/latex/contrib/easybook/doc/easybook-demo.tex
@@ -91,7 +91,7 @@
     % tocdepth = 2
   }
 
-\usepackage{zhlipsum,bicaption,tcolorbox}
+\usepackage{zhlipsum,bicaption,tasks,tcolorbox,imakeidx}
 
 \begin{document}
 \title{\sffamily easybook书籍文档类}
@@ -101,7 +101,7 @@
     \url{https://latexstudio.net} \\
     \url{https://gitee.com/texl3/easybook}\thanks{Gitee为项目的主要发布地址。}
   }
-\date{2021/04/07\hskip\ccwd\relax v1.24g}
+\date{2021/04/08\hskip\ccwd\relax v1.24h}
 
 \frontmatter[roman]
 \maketitle
diff --git a/macros/latex/contrib/easybook/doc/easybook.pdf b/macros/latex/contrib/easybook/doc/easybook.pdf
index ab902542d5..0d13de0e90 100644
--- a/macros/latex/contrib/easybook/doc/easybook.pdf
+++ b/macros/latex/contrib/easybook/doc/easybook.pdf
diff --git a/macros/latex/contrib/easybook/easybook.dtx b/macros/latex/contrib/easybook/easybook.dtx
index 9fba915442..5ca915335b 100644
--- a/macros/latex/contrib/easybook/easybook.dtx
+++ b/macros/latex/contrib/easybook/easybook.dtx
@@ -55,7 +55,7 @@ The latest version of this license is in
 %
 % \title{\sffamily easybook书籍文档类}
 % \author{瞿毅}
-% \date{2021/04/07\hskip\ccwd\relax v1.24g\thanks{\url{https://gitee.com/texl3/easybook}}}
+% \date{2021/04/08\hskip\ccwd\relax v1.24h\thanks{\url{https://gitee.com/texl3/easybook}}}
 % \maketitle
 % \begin{abstract}
 %   \cls{easybook} 是基于 \cls{ctexbook} 书籍文档类创建以极简为风格的模板，可以看作对 \cls{ctexbook} 的进一步包装。虽然\CTeX 文档类提供了较好的中文支持，但想实现个性化功能一般需要在其基础上载入更多宏包来定制。\cls{easybook} 考虑了一些细节并载入一些常用宏包实现一般的排版需求，它适用于排版中英文书籍或笔记，甚至可稍加调整成为学位论文模板。
@@ -64,7 +64,7 @@ The latest version of this license is in
 %
 % \begin{documentation}
 % \section{编译方式}
-% 文档类含有一个使用示例文件 \opt{easybook-demo.tex}，编译前建议满足以下的条件
+% 编译文档类的一个使用示例文件 \opt{easybook-demo.tex} 前建议满足以下的条件
 % \begin{itemize}
 %   \item 使用 \hologo{XeLaTeX}（推荐）或 \hologo{LuaLaTeX} 两种编译方式。
 %   \item 由于用到了一些宏包较新的功能，建议安装最新的\TeX 发行版，例如 \TeX Live 2021或 \hologo{MiKTeX} 21.2之后的版本。
@@ -114,14 +114,14 @@ The latest version of this license is in
 % \begin{function}[rEXP,added = 2021-01-05]{entitle}
 % 部分标题编号由中文数字变为大写罗马数字，章标题编号由中文数字变为阿拉伯数字。比如\textbf{第一部分}变为\textbf{第I部分}，\textbf{第一章}变为\textbf{第1章}。
 % \end{function}
-% \begin{function}[rEXP,added = 2021-01-05,updated = 2021-04-07]{scheme}
+% \begin{function}[rEXP,added = 2021-01-05,updated = 2021-04-08]{scheme}
 % \begin{syntax}
 %   scheme = <(chinese)|plain>
 % \end{syntax}
 % \opt{scheme} 代表文档的主题，扩展了此选项在\CTeX 文档类中原有的作用范围，\opt{plain} 选项可使各类标题变为英文形式。包括章节标题、图表标题和定理标题等。如\textbf{第一章}变为\textbf{Chapter 1}，\textbf{图1.1} 变为 \textbf{Table 1.1}。
 % \end{function}
 % \begin{function}[rEXP,added = 2021-01-05]{enstyle}
-% 同时开启 \opt{newline}、\opt{entitle} 和 \opt{english} 三个选项以符合英文原生风格。
+% 同时开启 \opt{newline}、\opt{entitle} 和 \opt{scheme = plain} 三个选项以符合英文原生风格。
 % \end{function}
 %
 % \begin{function}[rEXP,added = 2021-01-05,updated = 2021-02-02]{font}
@@ -171,7 +171,7 @@ The latest version of this license is in
 % \end{syntax}
 % \opt{multoc} 与 \opt{style/multoc} 选项具有相同的效果，但是具有优先性且可单独设置不同目录是否双栏排版。已经预置了中英文的目录标题，可以使用 \opt{title} 选项更改目录标题的名称。\opt{book} 选项使目录标题按照 \opt{chapter} 级别输出，\opt{article} 选项使目录标题按照 \opt{article} 级别输出，默认为 \opt{chapter} 级别。
 % \changes{v1.23}{2021/03/15}{为几个目录增加键值列表的选项，可设置标题输出级别以及是否加入主目录。}
-% \changes{v1.24g}{2021/04/04}{目录命令的可选参数增加标题键值。}
+% \changes{v1.24h}{2021/04/04}{目录命令的可选参数增加标题键值。}
 % \end{function}
 %
 % \section{接口选项}
@@ -187,7 +187,7 @@ The latest version of this license is in
 %     \hyperref[subsec:style]{风格} & \hyperref[subsec:hyperlinks]{超链接} & \hyperref[subsec:other font]{其它字体} & \hyperref[subsec:spacing]{行距} & \hyperref[subsec:reference]{参考文献} \\
 %     style & link & elsefont & spread & bibset \\
 %     \midrule
-%     \hyperref[subsec:theorem of style]{定理样式} & \hyperref[subsec:page margins]{页面边距} & \hyperref[subsec:header and footer]{页眉页脚} & \hyperref[subsec:catalog style]{目录样式} & \\
+%     \hyperref[subsec:theorem of style]{定理样式} & \hyperref[subsec:page margins]{页面尺寸} & \hyperref[subsec:header and footer]{页眉页脚} & \hyperref[subsec:catalog style]{目录样式} & \\
 %     thmset & geoset & hdrset & tocset & \\
 %     \bottomrule
 %   \end{tabular}
@@ -259,7 +259,7 @@ The latest version of this license is in
 % \ding{229} 以上选项路径为 \opt{link/...} \\
 % \opt{link} 将超链接选项（包括以上选项）交给 \pkg{hyperref} 处理，除了一些关于 pdf 书签的选项可能会失效，其它由键值选项命令 \tn{hypersetup} 支持的多数选项可用。
 % \changes{v1.10}{2021/01/08}{修复了 \opt{linktopage} 选项关闭时目录中标题编号无超链接的问题。}
-% \changes{v1.24g}{2021/04/05}{增加 \pkg{hyperref} 超链接选项完整的支持。}
+% \changes{v1.24h}{2021/04/05}{增加 \pkg{hyperref} 超链接选项完整的支持。}
 % \end{function}
 %
 % \begin{optdesc}
@@ -286,13 +286,13 @@ The latest version of this license is in
 %   footnote = <(1)>
 % \end{syntax}
 % \ding{229} 以上选项路径为 \opt{spread/...} \\
-% 行距因子用于设置各种行距倍数，只能是浮点数，不能带有长度单位。\tn{ctexset} 原有的行距选项 \opt{linespread} 失效。各行距既可在导言区全局设置也可正文中设置对后面生效，行距的意义为
+% 行距因子用于设置各种行距倍数，只能是浮点数，不能带有长度单位。各行距既可在导言区全局设置也可正文中设置对后面生效，行距的意义为
 % \changes{v1.21}{2021/01/12}{增加脚注线间的距离选项。}
 % \changes{v1.23}{2021/02/09}{取消使用 \pkg{zhlineskip} 宏包设置数学间距。}
 % \end{function}
 %
 % \begin{optdesc}
-%   \item[line] 正文行距。
+%   \item[line] 正文行距，\tn{ctexset} 原有的行距选项 \opt{linespread} 失效。
 %   \item[table] 表格行距。
 %   \item[math] 数学环境行距，包括 \pkg{amsmath} 和 \pkg{mathtools} 宏包附带的环境，但并未加载 \pkg{mathtools} 宏包。
 %   \item[caption] 图表代码标题行距。
@@ -424,7 +424,7 @@ The latest version of this license is in
 %   \declaretheoremstyle[bodyfont = \rmfamily,spacepost = 0.5\ccwd]{定理样式名}
 % \end{ctexexam}
 %
-% \subsection{页面边距}
+% \subsection{页面尺寸}
 % \label{subsec:page margins}
 % \begin{function}[EXP,added = 2021-01-13,updated = 2021-03-21]{footnotemargin,footparskip,footparindent,list-labelsep,left,top,hmargin,textwidth,includehead}
 % \begin{syntax}
@@ -439,7 +439,7 @@ The latest version of this license is in
 %   includehead = <true|(false)>
 % \end{syntax}
 % \ding{229} 以上选项路径为 \opt{geoset/...} \\
-% 预置的页面边距与 \cls{Word} 的默认值接近，\opt{geoset} 会将前4个选项以外的其它选项交给 \pkg{geometry} 宏包接口命令 \tn{geometry} 处理，并且选项的键值列表与之相同，上面的选项仅是一小部分，支持的参数可查阅宏包帮助文档。当在此设置页面大小时，会覆盖 \opt{paper} 选项的设置。
+% 预置的页面尺寸与 \cls{Word} 的默认值接近，\opt{geoset} 会将前4个选项以外的其它选项交给 \pkg{geometry} 宏包接口命令 \tn{geometry} 处理，并且选项的键值列表与之相同，上面的选项仅是一小部分，支持的参数可查阅宏包帮助文档。当在此设置页面大小时，会覆盖 \opt{paper} 选项的设置。
 % \begin{ctexexam}
 %   \geoset
 %     {
@@ -450,7 +450,7 @@ The latest version of this license is in
 %       list-labelsep = \hspace{0.5\ccwd}
 %     }
 % \end{ctexexam}
-% \changes{v1.21}{2021/01/13}{增加配置页面边距的选项。}
+% \changes{v1.21}{2021/01/13}{增加配置页面尺寸的选项。}
 % \end{function}
 %
 % \subsection{页眉页脚}
@@ -529,8 +529,8 @@ The latest version of this license is in
 % \end{ctexexam}
 %
 % \opt{belowoffset} 选项为主目录标题 \tn{contentsname} 后的间距补偿，一般为负值，用于抵消 \opt{format} 中设置的垂直间距。\opt{lists} 中的 \opt{belowoffset} 与之意义类似，但是一般为正值，可以在 \opt{article} 模式中使用。建议 \opt{lists/lolskip(0.8pc) + lists/format/addvspace(0.2pc) + lists/belowoffset(0pc) = belowoffset(-1pc)}。\opt{line-align} 选项可以使目录引导线右边对齐并与页码保持一定间隙，否则会与页码连接。
-% \changes{v1.24g}{2021/04/05}{可以设置图、表和代码目录的标签。}
-% \changes{v1.24g}{2021/04/06}{增加目录引导线右边对齐方式。}
+% \changes{v1.24h}{2021/04/05}{可以设置图、表和代码目录的标签。}
+% \changes{v1.24h}{2021/04/06}{增加目录引导线右边对齐方式。}
 % \end{function}
 %
 % \begin{function}[added = 2021-01-13,updated = 2021-04-06]{\tocrule}
@@ -564,19 +564,19 @@ The latest version of this license is in
 % \end{function}
 %
 % \subsection{列表}
-% \begin{function}[added = 2021-01-05,updated = 2021-04-07]{enumerate,itemize,description}
+% \begin{function}[added = 2021-01-05,updated = 2021-04-08]{enumerate,itemize,description}
 % \begin{syntax}
 %   \tn{begin}\marg{环境名}\oarg{键值列表}
 %   \  \tn{item} <列表内容>
 %   \tn{end}\marg{环境名}
 % \end{syntax}
-% \pkg{enumitem} 宏包为系统预置的列表环境 \env{enumerate}、\env{itemize}和 \env{description} 提供了更灵活的标签以及间距的控制，可使用 \tn{setlist} 命令设置原有的三种列表格式。已为三种列表预置了三个级别的格式，可相互嵌套，若自定义标签可例如
+% \pkg{enumitem} 宏包为系统预置的列表环境 \env{enumerate}、\env{itemize}和 \env{description} 提供了更灵活的标签以及间距的控制，可使用 \tn{setlist} 命令设置原有的三种列表格式。已为三种列表预置了三个级别的格式可相互嵌套，默认标签与 \cls{book} 文档类相同，若自定义标签可例如
 % \begin{ctexexam}
 %   \begin{enumerate}[label = \arabic*(a),leftmargin = 1cm,resume]
 %   \begin{itemize}[label = \textbullet]
 %   \begin{description}[font = \sffamily\bfseries,style = nextline]
 % \end{ctexexam}
-% \changes{v1.24g}{2021/04/07}{重新优化列表环境的配置。}
+% \changes{v1.24h}{2021/04/08}{重新优化列表环境的配置。}
 % \end{function}
 %
 % \subsubsection{排序列表}
@@ -630,7 +630,7 @@ The latest version of this license is in
 %   \  \tn{item} <习题内容>
 %   \tn{end}\marg{exercise}
 % \end{syntax}
-% 习题环境 \env{exercise} 的标题紧接上一节编号并加入目录与页眉，当使用星号环境时不进行编号。三个可选参数中颜色为自定义或 \pkg{xcolor} 包含的颜色名称，正文编号格式与小节 \ref{subsec:sort list} 排序列表相同，标题名默认为摘要。注意，环境具有相同定界符的可选参数只能\textbf{从右往左}省略，省略的参数使用默认值。
+% 习题环境 \env{exercise} 的标题紧接上一节编号并加入目录与页眉，当使用星号环境时不进行编号。三个可选参数中颜色为自定义或 \pkg{xcolor} 包含的颜色名称，已载入了 \opt{svgnames} 颜色库。正文编号格式与小节 \ref{subsec:sort list} 排序列表相同，标题名默认为摘要。注意，环境具有相同定界符的可选参数只能\textbf{从右往左}省略，省略的参数使用默认值。
 % \begin{ctexexam}
 %   \begin{exercise}[LightYellow][1.](习题)
 %     \item 习题内容
@@ -768,7 +768,7 @@ The latest version of this license is in
 % \begin{syntax}
 %   \tn{bicaption}\oarg{目录标题1}\marg{标题2}\oarg{目录标题1}\marg{标题2}
 %   \tn{bicaptionbox}\oarg{目录标题1}\marg{标题2}\oarg{目录标题1}\marg{标题2}
-%     \oarg{宽度}\oarg{内部位置}\marg{内容}
+%   \             \oarg{宽度}\oarg{内部位置}\marg{内容}
 % \end{syntax}
 % 可以实现中英文双语标题，使用此功能需要在导言区载入 \pkg{bicaption} 宏包，具体用法见说明文档。
 % \end{function}
@@ -800,15 +800,47 @@ The latest version of this license is in
 % \end{syntax}
 % \pkg{ulem} 宏包提供了多种下划线命令，下划线的粗细由命令 \tn{ULthickness} 控制，重新定义它需要使用 \tn{renewcommand} 命令。下划线的深度由 \tn{ULdepth} 控制，默认值 \tn{maxdimen} 是一个允许深度根据当前字体变化的特殊标志，当然也可以使用 \tn{setlength} 设定特定深度。
 % \end{function}
+%
+% \section{载入的宏包}
+% 以下为 \cls{easybook} 直接调用的关键宏包，带有 \ding{75} 符号的宏包并未载入它们，仅做了预配置和兼容性处理，可根据需要在导言区手动载入以实现相关的功能。
+% \begin{description}
+%   \item[ctexbook] 提供中文排版的通用框架。
+%   \item[xcolor] 提供多种颜色、阴影、色调和任意颜色的混合。
+%   \item[footmisc] 更改脚注排版的方法的集合。
+%   \item[amsmath] 提供\LaTeX 中的数学功能。
+%   \item[thmtools] 用于通常需要的排版定理支持。
+%   \item[marginnote] 增强了边注输出的功能。
+%   \item[setspace] 提供对文档中行间距的支持。
+%   \item[chemformula] 提供了对化学式进行排版的命令。
+%   \item[siunitx] 全面的国际标准单位支持。
+%   \item[ulem] 提供可断行多样式的下划线命令。
+%   \item[geometry] 灵活完整的页面尺寸设置。
+%   \item[pdfpages] 在\LaTeX 中插入 pdf 文档。
+%   \item[graphicx] 增强了对图形插入的支持。
+%   \item[fancyhdr] 广泛控制页面的页眉和页脚。
+%   \item[titletoc] 设置目录中的标题格式。
+%   \item[caption-light] 在浮动环境中自定义题注。
+%   \item[tabularx] 带有可调整宽度的列的表格。
+%   \item[multirow] 创建跨越多行的表格单元格。
+%   \item[booktabs] 为表格提供三线表式的命令。
+%   \item[enumitem] 提供列表环境的布局控制。
+%   \item[listings] 可以在\LaTeX 中排版程序/编程代码。
+%   \item[\ding{75} tcolorbox] 为带有标题线的彩色和带框文本框提供了一个环境。
+%   \item[\ding{75} tasks] 将练习题组织成水平而不是垂直计数的列。
+%   \item[\ding{75} imakeidx] 可以让文档同时生成和排版一个或多个索引。
+%   \item[\ding{75} bicaption] 提供图表的双语题注。
+%   \item[\ding{75} mathtools] 增强 \pkg{amsmath} 的数学功能。
+%   \item[\ding{75} unicode-math] 处理使用 unicode 编码的数学字体。
+% \end{description}
 % \end{documentation}
 %
 % \StopEventually{}
 %<*class>
 \NeedsTeXFormat{LaTeX2e}[2020/10/01]
 \RequirePackage{l3keys2e}
-\ProvidesExplClass{easybook}{2021/04/07}{1.24g}{beta}
+\ProvidesExplClass{easybook}{2021/04/08}{1.24h}{beta}
 
-\cs_generate_variant:Nn \keys_define:nn {nx}
+\cs_generate_variant:Nn \__ctex_define:nn {nx}
 \cs_generate_variant:Nn \int_to_arabic:n {v}
 \cs_generate_variant:Nn \dim_add:Nn {NV}
 \cs_generate_variant:Nn \__eb_put_hyperref:n {x}
@@ -961,8 +993,8 @@ The latest version of this license is in
     fancyhdr,titletoc,
     caption-light,subcaption,
     tabularx,multirow,booktabs,
-    tasks,enumitem,
-    listings,imakeidx
+    enumitem,
+    listings
   }
 \ctex_at_end_preamble:n
   {
@@ -1369,7 +1401,7 @@ The latest version of this license is in
       {\text_uppercase:n {#1}}
       {\text_titlecase_first:n {#1}}
   }
-\cs_new_protected:Npn \__eb_markboth:n #1
+\cs_new_protected:Npn \eb@markboth#1
   {
     \bool_if:NTF \l__eb_page_twoside_bool
       {
@@ -1400,14 +1432,14 @@ The latest version of this license is in
         \section*{\phantomsection#1}
         \CTEX@addtocline{section}{#1}
       }
-    \__eb_markboth:n {#1}
+    \eb@markboth{#1}
   }
-\cs_new_protected:Npn \__eb_title_mark:n #1
+\cs_new_protected:Npn \__eb_title_mark_notoc:n #1
   {
     \tl_if_eq:NnTF \l__eb_toc_type_tl{book}
       {\chapter*{\phantomsection#1}}
       {\section*{\phantomsection#1}}
-    \__eb_markboth:n {#1}
+    \eb@markboth{#1}
   }
 \cs_new_protected:Npn \__eb_ifmultoc_pre_set:
   {
@@ -1436,7 +1468,7 @@ The latest version of this license is in
 \cs_new_protected:Npn \__eb_title_ifintoc_set:n #1
   {
     \IfBooleanTF{#1}
-      {\__eb_title_mark:n {\eb@toc@title}}
+      {\__eb_title_mark_notoc:n {\eb@toc@title}}
       {\__eb_title_mark_intoc:n {\eb@toc@title}}
   }
 \RenewDocumentCommand{\tableofcontents}{o}
@@ -1445,7 +1477,7 @@ The latest version of this license is in
     \tl_set_eq:NN \eb@toc@title\contentsname
     \IfValueT{#1}{\keys_set:nn {listoc}{#1}}
     \__eb_ifmultoc_pre_set:
-    \__eb_title_mark:n {\eb@toc@title}
+    \__eb_title_mark_notoc:n {\eb@toc@title}
     \vspace*{\dim_use:N \l__eb_toc_offset_dim}
     \@starttoc{toc}
     \__eb_ifmultoc_post_set:
@@ -1491,22 +1523,25 @@ The latest version of this license is in
     \group_end:
   }
 
-\makeindex[
-  intoc,
-  options = -M~texindy~-C~utf8,
-  program = truexindy,
-  columns = 2,
-  columnsep = 2\ccwd
-  ]
-\indexsetup
-  {
-    level = \bool_if:NTF \l__eb_class_book_bool{\chapter*}{\section*},
-    toclevel = \bool_if:NTF \l__eb_class_book_bool{chapter}{section},
-    firstpagestyle = \bool_if:NTF \l__eb_class_book_bool{plain}{fancy}
-  }
-\__eb_patch_cmd:Nnn \imki@indexheaders
-  {\@mkboth{\MakeUppercase\indexname}{\MakeUppercase\indexname}}
-  {\__eb_markboth:n {\indexname}}
+\ctex_at_end_package:nn {imakeidx}
+  {
+    \makeindex[
+      intoc,
+      options = -M~texindy~-C~utf8,
+      program = truexindy,
+      columns = 2,
+      columnsep = 2\ccwd
+      ]
+    \indexsetup
+      {
+        level = \bool_if:NTF \l__eb_class_book_bool{\chapter*}{\section*},
+        toclevel = \bool_if:NTF \l__eb_class_book_bool{chapter}{section},
+        firstpagestyle = \bool_if:NTF \l__eb_class_book_bool{plain}{fancy}
+      }
+    \ctex_patch_cmd:Nnn \imki@indexheaders
+      {\@mkboth{\MakeUppercase\indexname}{\MakeUppercase\indexname}}
+      {\eb@markboth{\indexname}}
+  }
 
 \tl_new:N \l__eb_font_table_tl
 \tl_new:N \l__eb_font_figure_tl
@@ -1688,7 +1723,7 @@ The latest version of this license is in
 
 \cs_new_protected:Npn \__eb_thmname_set:nn #1#2
   {\tl_const:cn {c__eb_name_#1_tl}{#2}}
-\tl_if_eq:VnTF \l__ctex_scheme_tl{chinese}
+\tl_if_eq:NnTF \l__ctex_scheme_tl{chinese}
   {
     \clist_map_inline:nn
       {
@@ -1794,13 +1829,16 @@ The latest version of this license is in
       ]{proof}
   }
 
-\settasks
+\ctex_at_end_package:nn {tasks}
   {
-    label = (\Alph*),
-    after-item-skip = 0ex plus .1ex,
-    column-sep = .5\ccwd,
-    item-indent = 2\ccwd,
-    label-width = 1.5\ccwd
+    \settasks
+      {
+        label = (\Alph*),
+        after-item-skip = 0ex plus .1ex,
+        column-sep = .5\ccwd,
+        item-indent = 2\ccwd,
+        label-width = 1.5\ccwd
+      }
   }
 \setchemformula
   {
@@ -2025,12 +2063,12 @@ The latest version of this license is in
   {
     \tl_if_empty:NTF \l__eb_bib_otherstyle_tl
       {
-        \tl_if_eq:VnT \l__eb_bib_style_tl{numerical}
+        \tl_if_eq:NnT \l__eb_bib_style_tl{numerical}
           {
             \bibliographystyle{gbt7714-numerical}
             \setcitestyle{comma,square,super}
           }
-        \tl_if_eq:VnT \l__eb_bib_style_tl{authoryear}
+        \tl_if_eq:NnT \l__eb_bib_style_tl{authoryear}
           {\bibliographystyle{gbt7714-author-year}}
         \cs_set_eq:NN \cite\citep
       }{\exp_args:NV \bibliographystyle\l__eb_bib_otherstyle_tl}
@@ -2055,9 +2093,9 @@ The latest version of this license is in
   {
     \tl_if_empty:NTF \l__eb_bib_otherstyle_tl
       {
-        \tl_if_eq:VnT \l__eb_bib_style_tl{numerical}
+        \tl_if_eq:NnT \l__eb_bib_style_tl{numerical}
           {\__eb_put_biblatex:n {style = gb7714-2015}}
-        \tl_if_eq:VnT \l__eb_bib_style_tl{authoryear}
+        \tl_if_eq:NnT \l__eb_bib_style_tl{authoryear}
           {\__eb_put_biblatex:n {style = gb7714-2015ay}}
       }{\__eb_put_biblatex:n {style = \l__eb_bib_otherstyle_tl}}
     \tl_if_empty:NF \l__eb_bib_citestyle_tl
@@ -2088,7 +2126,8 @@ The latest version of this license is in
   {
     \group_begin:
     \footnotesize
-    \exp_args:Nx \linespread{\fp_use:N \l__eb_spread_footnote_fp}\selectfont
+    \exp_args:Nx
+    \linespread{\fp_use:N \l__eb_spread_footnote_fp}\selectfont
     \skip_gset:Nn \footnotesep{\ht\strutbox}
     \group_end:
     \bool_if:NT \l__eb_chap_withpart_bool
@@ -2106,14 +2145,20 @@ The latest version of this license is in
   }
 \__eb_patch_cmd:Nnn \@footnotetext
   {\reset@font}
-  {\def\baselinestretch{\fp_use:N \l__eb_spread_footnote_fp}\l__eb_font_footnote_tl}
+  {
+    \def\baselinestretch{\fp_use:N \l__eb_spread_footnote_fp}
+    \l__eb_font_footnote_tl
+  }
 \__eb_patch_cmd:Nnn \@mpfootnotetext
   {\reset@font}
-  {\def\baselinestretch{\fp_use:N \l__eb_spread_footnote_fp}\l__eb_font_footnote_tl}
+  {
+    \def\baselinestretch{\fp_use:N \l__eb_spread_footnote_fp}
+    \l__eb_font_footnote_tl
+  }
 \__eb_patch_cmd:Nnn \@makefnmark
   {\normalfont}{\l__eb_font_footnote_tl}
 
-\lstdefinestyle{mystyle}
+\lstdefinestyle{easy-lst-sty}
   {
     language = [LaTeX]TeX,
     texcsstyle =
@@ -2158,7 +2203,7 @@ The latest version of this license is in
   }
 \lstset
   {
-    style = mystyle,
+    style = easy-lst-sty,
     breaklines = true,
     resetmargins = true,
     % numbers = left,
@@ -2215,9 +2260,13 @@ The latest version of this license is in
       \UrlBreaks{\UrlOrds\__eb_add_urlbreak_points:}
   }
 \tl_const:Nn \c__eb_urlbreak_points_tl
-  {ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789}
+  {
+    ABCDEFGHIJKLMNOPQRSTUVWXYZ
+    abcdefghijklmnopqrstuvwxyz
+    0123456789
+  }
 
-\keys_define:nx {ctex/link}
+\__ctex_define:nx {link}
   {
     hyperlink         .choice:,
     hyperlink/edge    .code:n = {},
@@ -2252,7 +2301,7 @@ The latest version of this license is in
           }
       }
   }
-\keys_define:nx {ctex/style}
+\__ctex_define:nx {style}
   {
     color             .choice:,
     color             .value_required:n = true,
@@ -2274,7 +2323,7 @@ The latest version of this license is in
     \__eb_allow_urlbreak:
     \ctex_hypersetup:n {pdfstartview = FitH}
     \exp_args:NV \hypersetup\l__eb_hyperref_clist
-    \tl_if_eq:VnTF \l__ctex_scheme_tl{chinese}
+    \tl_if_eq:NnTF \l__ctex_scheme_tl{chinese}
       {
         \keys_set_known:nn {ctex}
           {
diff --git a/macros/latex/contrib/lwarp/README.txt b/macros/latex/contrib/lwarp/README.txt
index f77e4ae669..bf13a2f01a 100644
--- a/macros/latex/contrib/lwarp/README.txt
+++ b/macros/latex/contrib/lwarp/README.txt
@@ -1,5 +1,5 @@
 
-LaTeX lwarp package v0.895   README.txt
+LaTeX lwarp package v0.896   README.txt
 
 Files included are:
 
diff --git a/macros/latex/contrib/lwarp/lwarp.dtx b/macros/latex/contrib/lwarp/lwarp.dtx
index 51892df0c1..bcd587f552 100644
--- a/macros/latex/contrib/lwarp/lwarp.dtx
+++ b/macros/latex/contrib/lwarp/lwarp.dtx
@@ -16,7 +16,7 @@
 % \iffalse
 %<package>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
 %<package>\ProvidesPackage{lwarp}
-%<package>    [2021/02/18 v0.895  Allows LaTeX to directly produce HTML5 output.]
+%<package>    [2021/04/08 v0.896  Allows LaTeX to directly produce HTML5 output.]
 %
 %<*driver>
 \documentclass{ltxdoc}
@@ -309,11 +309,11 @@ Keywords={LaTeX, HTML, conversion}%
 \newcommand{\spkg}[1]{\textcolor[Hsb]{120,1,.4}{\pkg{#1}}}% package supported as-is
 \newcommand{\mpkg}[1]{\textcolor[Hsb]{240,1,.4}{\pkg{#1}}}% package modified for HTML
 \newcommand{\epkg}[1]{\textcolor[Hsb]{300,1,.5}{\pkg{#1}}}% package emulated for HTML
-\newcommand{\ipkg}[1]{\textcolor[Hsb]{0,0,.5}{\pkg{#1}}}% package ignored
+\newcommand{\ipkg}[1]{\textcolor[Hsb]{0,0,.4}{\pkg{#1}}}% package ignored
 \newcommand{\wpkg}[1]{\textcolor[Hsb]{0,1,.5}{\pkg{#1}}}% package warning special case
 \newcommand{\sjax}{\textsuperscript{\textcolor[Hsb]{120,1,.4}{MJ}}}
 \newcommand{\ejax}{\textsuperscript{\textcolor[Hsb]{300,1,.5}{MJ}}}
-\newcommand{\ijax}{\textsuperscript{\textcolor[Hsb]{0,0,.5}{MJ}}}
+\newcommand{\ijax}{\textsuperscript{\textcolor[Hsb]{0,0,.4}{MJ}}}
 
 % green/cyan/blue/magenta
 % \newcommand{\spkg}[1]{\textcolor[Hsb]{120,1,.4}{\pkg{#1}}}% package supported as-is
@@ -322,7 +322,7 @@ Keywords={LaTeX, HTML, conversion}%
 % \newcommand{\ipkg}[1]{\textcolor[Hsb]{300,1,.5}{\pkg{#1}}}% package ignored
 % \newcommand{\wpkg}[1]{\textcolor[Hsb]{0,1,.5}{\pkg{#1}}}% package warning special case
 
-
+\newcommand{\ARIA}{\acro{ARIA}}
 
 \newcommand{\pdflatexonly}{
 \textred{Only pre-loaded if \prog{pdflatex} is being used.}
@@ -871,6 +871,7 @@ the link will be empty.
 Index entries also use \cs{nameref} and have the same limitation.
 \trouble{index>empty link}
 \trouble{reference>empty link}
+\trouble{link>empty}
 }
 
 \newcommand{\limitspfnote}{
@@ -908,16 +909,19 @@ due to the limited number of symbols which are available.
 
 \limitsperpage
 
-If using \brand{MathJax}, after each math expression with a \cs{footnotemark},
-\watchout[MathJax, \cs{footnotemark}]
-adjust the \ctr{footnote} counter by the number of \cs{footnotemark}s:
-\begin{sourcedisplay}
-\cs{[} (math expression with \textgreen{two} instances of \cs{footnotemark}) \cs{]} \\
-\textred{\cs{warpHTMLonly}\{}\cs{addtocounter}\{footnote\}\{\textgreen{2}\}\textred{\}}
-\end{sourcedisplay}
-Similarly for \pkg{endnotes}, but \emph{not} \pkg{sidenotes}.
+% No longer true:
+% If using \brand{MathJax}, \cs{footnote} and \cs{endnote} work,
+% \watchout[MathJax, \cs{footnotemark}]
+% but for \cs{footnotemark}, after each math expression with a \cs{footnotemark}
+% adjust the \ctr{footnote} counter by the number of \cs{footnotemark}s:
+% \begin{sourcedisplay}
+% \cs{[} (math expression with \textgreen{two} instances of \cs{footnotemark}) \cs{]} \\
+% \textred{\cs{warpHTMLonly}\{}\cs{addtocounter}\{footnote\}\{\textgreen{2}\}\textred{\}}
+% \end{sourcedisplay}
+% Similarly for \pkg{endnotes}, but \emph{not} \pkg{sidenotes}.
 
 Also for \brand{MathJax}, \cs{footnotename} is used for a \cs{footnotemark}
+\margintag{\brand{MathJax}}
 if the actual footnote number is not known.
 To redefine it, provide it before loading \pkg{lwarp}:
 \begin{sourcedisplay}
@@ -1643,34 +1647,38 @@ While using \brand{Mathjax}, \cs{displaymathother} may also be used
 for other forms of display and inline math which contain \pkg{chemformula} expressions.
 }
 
-\newcommand{\limitsntheorem}{%
-This conversion is not total.
-\trouble[Font control]{ntheorem=\pkg{ntheorem}>font}
-Font control is via \CSS, and the custom \LaTeX\ font settings
-are ignored.
-
+\newcommand{\limitstheorems}{%
 If the print version does not use \pkg{cleveref},
-\trouble[cref reference format undefined]{ntheorem=\pkg{ntheorem}>cref reference format}
-\trouble{cref reference format}
-\trouble{cleveref=\pkg{cleveref}>cref reference format}
+\trouble[cref reference format undefined]{ntheorem=\pkg{ntheorem}>cref reference format undefined}
+\trouble{cref reference format undefined}
+\trouble{cleveref=\pkg{cleveref}>cref reference format undefined}
+\trouble{theorem>cref reference format undefined}
 place all \cs{theoremstyle} and \cs{newtheorem}
-declarations in the preamble inside \cs{AtBeginDocument}.\footnote{%
+declarations in the preamble inside \cs{AtEndPreamble}.\footnote{%
     \pkg{lwarp} uses \pkg{cleveref} for the \HTML\ conversion,
-    and loads \pkg{cleveref} \cs{AtEndPreamble}, just before \cs{AtBeginDocument}.%
+    and loads \pkg{cleveref} \cs{AtEndPreamble}, just before \cs{AtBeginDocument}.
+    This is also before the \filenm{.aux} file is read.
 }
-For some theorems, it may also be required to add inside \cs{AtBeginDocument}
+For some theorems, it may also be required to add inside \cs{AtEndPreamble}
 something such as:
 \begin{sourcedisplay}
-\cs{AtBeginDocument}\{ \% if not using cleveref package \\
+\cs{usepackage}\{etoolbox\} \% for \cs{ifdef}, \cs{AtEndPreamble} \\
+\cs{AtEndPreamble}\{ \% if not using cleveref package \\
     \fquad \cs{theoremstyle}\{definition\} \\
     \fquad \cs{newtheorem}\{dtheorem\}\{Definition\} \\
     \fquad \dots \\
-    \fquad \cs{usepackage}\{etoolbox\} \% for \cs{ifdef} \\
     \fquad \cs{ifdef}\{\cs{cref}\}\{ \\
         \fqquad    \cs{crefname}\{Proof\}\{Proof\}\{Proofs\} \\
     \fquad \}\{\} \\
 \}
 \end{sourcedisplay}
+}
+
+\newcommand{\limitsntheorem}{%
+This conversion is not total.
+\trouble[Font control]{ntheorem=\pkg{ntheorem}>font}
+Font control is via \CSS, and the custom \LaTeX\ font settings
+are ignored.
 
 \limitsntheoremnumbering
 }
@@ -2911,8 +2919,8 @@ changes do not affect the \HTML\ output.
 }
 
 \newcommand{\limitspolyglossia}{%
-\trouble{Undefined control sequence \dots begindocument>polyglossia=\pkg{polyglossia}}
-\trouble{polyglossia=\pkg{polyglossia}>Undefined control sequence \dots begindocument}
+\trouble{Undefined control seq \dots\ begindocument>polyglossia=\pkg{polyglossia}}
+\trouble{polyglossia=\pkg{polyglossia}>Undefined control seq \dots\ begindocument}
 \pkg{lwarp} uses \pkg{cleveref}, which has some limitations when using
 \pkg{polyglossia}, possibly resulting in the error
 \begin{sourcedisplay}
@@ -3053,7 +3061,7 @@ This boolean may be tested by the user for later use.
 %<*package>
 % \fi
 %
-% \CheckSum{53146}
+% \CheckSum{54091}
 %
 % \CharacterTable
 % {Upper-case     \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
@@ -3190,6 +3198,7 @@ This boolean may be tested by the user for later use.
 % \changes{v0.893}{2020/11/26}{\ 2020/11/26}
 % \changes{v0.894}{2020/12/24}{\ 2020/12/24}
 % \changes{v0.895}{2021/02/18}{\ 2021/02/18}
+% \changes{v0.896}{2021/04/08}{\ 2021/04/08}
 
 
 
@@ -3413,6 +3422,41 @@ This boolean may be tested by the user for later use.
 %
 % \begin{description}
 % \needspace{2\baselineskip}
+% \item[v0.896:] Back references, accessibility.
+%   \begin{itemize}
+%       \item \textred{Due to changes in cross referencing, \watchout
+%           execute \cmds{lwarpmk clean} before recompiling.}
+%       \item Increased sectioning nesting stack depth.  Error if overflow stack.
+%       \item Fixed footnotes at the end of the document,
+%               or inside a \env{description} label.
+%       \item Added an error if using braces inside \cs{usepackage} options.
+%       \item Fixed footnotes in bracket display math with \brand{MathJax}.
+%           \margintag{\brand{MathJax}}
+%       \item \LaTeX\ theorems, \pkg{amsthm}, \pkg{ntheorem}, \pkg{theorem}:
+%           \margintag{theorems}
+%           Print theorem footnotes following theorems.
+%       \item Added \HTML\ \element{main} element to each page.
+%           \margintag{accessibility}
+%       \item Added \ARIA\ |math| role to \SVG\ math images, and |note| role to
+%           margin notes, footnotes, etc.
+%       \item Improved citation backreferences for various packages.
+%           \margintag{packages}
+%       \item \pkg{chemfig}: Updated to v1.6a.
+%       \item \pkg{bigdelim}: Updated to v2.8.
+%       \item \pkg{xetexko}: Updated to v3.1.
+%       \item \pkg{hyperxmp}: Fix: Accept and discard additional keys.
+%       \item \pkg{hyperef}: Fix: Added \cs{*autorefname} macros.
+%       \item \pkg{biblatex}: Fix: Back references.
+%       \item \pkg{tocloft}: Fix: \cs{cftpagenumbersoff}, \cs{cftpagenumberson}.
+%       \item \pkg{threeparttablex}: Fix: \cs{TPTL@tnotex}.
+%       \item \pkg{amsthm}: Fix: Footnotes inside environment optional argument.
+%       \item \pkg{listings}: Fixed labels.  Accepts but ignores escapes w/o error.
+%       \item \pkg{pdflscape}: Fix: Added \env{landscape} environment.
+%       \item Added \pkg{ccicons}, \pkg{classicthesis}, \pkg{orcidlink}.
+%       \item Added \pkg{enotez}.
+%       \item Verified support for \pkg{doi}, \pkg{doipubmed}.
+%   \end{itemize}
+% \needspace{2\baselineskip}
 % \item[v0.895:] Vector packages, greatly improved \brand{MathJax} for \pkg{siunitx}.
 %   \begin{itemize}
 %       \item Fixed quotes in \HTML\ tags while using old font packages with
@@ -4544,33 +4588,33 @@ This boolean may be tested by the user for later use.
 %       \item \pkg{endfloat}: Updated for v2.6.
 %       \item \pkg{url}: Fixes for active characters.
 %   \end{itemize}
-% \needspace{2\baselineskip}
-% \item[v0.51:] Improved \SVG\ math, added numerous chemistry packages.
-%   \begin{itemize}
-%       \item Docs: Added \nameref{sec:thingstoavoid}.
-%           \margintag{documentation}
-%       \item Docs: Added to \nameref{sec:convertexisting}.
-%       \item Docs: Multiple authors and affiliations with custom classes.
-%           See \cref{sec:authorsaffils}.
-%       \item Docs: \pkg{tikz} with matrices.  See \cref{sec:limitstikz}.
-%       \item Improved \SVG\ math baseline.\margintag{SVG math}
-%       \item Improved \SVG\ math font and color.
-%       \item Faster \SVG\ math rendering.
-%       \item Improved support for display math containing complicated math objects,
-%               such as \pkg{tikz-cd}.  See \cref{sec:displaymathother}.
-%       \item Fix: \cs{addcontentsline} inside \SVG\ math.
-%       \item Fix: \SVG\ math containing an embedded \env{lateximage}.
-%       \item \brand{MathJax} now handles \cs{ensuremath} in expressions.\margintag{MathJax}
-%       \item Fix: Added \env{alignat} environment. \margintag{misc. fixes}
-%       \item Fix: \pkg{afterpackage} no longer required, which conflicted with \pkg{scrlfile}.
-%       \item Fix: \pkg{titling} \cs{thanks} mark.
-%       \item Fix: \pkg{fancybox} improvements.
-%       \item Fix: \pkg{tikz} \cs{tikz} macro.  (Previously only the \env{tikzpicture} environment worked.)
-%       \item Fix: \pkg{tikz} with optional argument.
-%       \item Added \pkg{mhchem},  \margintag{packages}
-%           \pkg{chemfig}, \pkg{chemformula}, \pkg{chemmacros}, \pkg{chemnum}, \pkg{chemgreek},
-%           \pkg{epstopdf-base}, \pkg{grid}, \pkg{ltxgrid}.
-%   \end{itemize}
+% ^^A % \needspace{2\baselineskip}
+% ^^A % \item[v0.51:] Improved \SVG\ math, added numerous chemistry packages.
+% ^^A %   \begin{itemize}
+% ^^A %       \item Docs: Added \nameref{sec:thingstoavoid}.
+% ^^A %           \margintag{documentation}
+% ^^A %       \item Docs: Added to \nameref{sec:convertexisting}.
+% ^^A %       \item Docs: Multiple authors and affiliations with custom classes.
+% ^^A %           See \cref{sec:authorsaffils}.
+% ^^A %       \item Docs: \pkg{tikz} with matrices.  See \cref{sec:limitstikz}.
+% ^^A %       \item Improved \SVG\ math baseline.\margintag{SVG math}
+% ^^A %       \item Improved \SVG\ math font and color.
+% ^^A %       \item Faster \SVG\ math rendering.
+% ^^A %       \item Improved support for display math containing complicated math objects,
+% ^^A %               such as \pkg{tikz-cd}.  See \cref{sec:displaymathother}.
+% ^^A %       \item Fix: \cs{addcontentsline} inside \SVG\ math.
+% ^^A %       \item Fix: \SVG\ math containing an embedded \env{lateximage}.
+% ^^A %       \item \brand{MathJax} now handles \cs{ensuremath} in expressions.\margintag{MathJax}
+% ^^A %       \item Fix: Added \env{alignat} environment. \margintag{misc. fixes}
+% ^^A %       \item Fix: \pkg{afterpackage} no longer required, which conflicted with \pkg{scrlfile}.
+% ^^A %       \item Fix: \pkg{titling} \cs{thanks} mark.
+% ^^A %       \item Fix: \pkg{fancybox} improvements.
+% ^^A %       \item Fix: \pkg{tikz} \cs{tikz} macro.  (Previously only the \env{tikzpicture} environment worked.)
+% ^^A %       \item Fix: \pkg{tikz} with optional argument.
+% ^^A %       \item Added \pkg{mhchem},  \margintag{packages}
+% ^^A %           \pkg{chemfig}, \pkg{chemformula}, \pkg{chemmacros}, \pkg{chemnum}, \pkg{chemgreek},
+% ^^A %           \pkg{epstopdf-base}, \pkg{grid}, \pkg{ltxgrid}.
+% ^^A %   \end{itemize}
 % ^^A  \needspace{2\baselineskip}
 % ^^A  \item[v0.50:] Improved \SVG\ math.
 % ^^A    \begin{itemize}
@@ -5545,10 +5589,11 @@ This boolean may be tested by the user for later use.
 %       \ipkg{fullminipage}, \ipkg{fullpage},
 %       \ipkg{fwlw}, \ipkg{geometry}, \ipkg{gmeometric},
 %       \ipkg{grid}, \mpkg{grid-system}, \ipkg{gridset},
-%       \ipkg{layaureo}, \ipkg{layout}, \ipkg{layouts}, \ipkg{leading},
+%       \ipkg{layaureo}, \ipkg{layout}, \ipkg{layouts}, \ipkg{leading}, \ipkg{lscape},
 %       \ipkg{ltxgrid}, \ipkg{nccfancyhdr}, \ipkg{notespages}, \ipkg{nowidow},
 %       \ipkg{pagegrid}, \ipkg{pagesel}, \epkg{parallel}, \epkg{parcolumns},
-%       \ipkg{pdfcolparallel}, \ipkg{pdfcolparcolumns}, \ipkg{pdfcrypt}, \ipkg{pdfprivacy},
+%       \ipkg{pdfcolparallel}, \ipkg{pdfcolparcolumns}, \ipkg{pdfcrypt},
+%       \ipkg{pdflscape}, \ipkg{pdfprivacy},
 %       \ipkg{preview}, \epkg{ragged2e}, \ipkg{returntogrid}, \ipkg{rmpage},
 %       \epkg{scrlayer-scrpage}, \epkg{scrpage2}, \epkg{setspace}, \ipkg{selectp},
 %       \ipkg{textarea}, \ipkg{threadcol},
@@ -5616,7 +5661,7 @@ This boolean may be tested by the user for later use.
 % Footnotes: & Adds \progcode{FootnoteDepth} to print footnotes at section breaks.
 %   \brand{MathJax} emulation for \cs{footnote}, and also as marked in the following:
 %   \epkg{bigfoot}, \ipkg{dblfnote},
-%   \ipkg{endheads}, \mpkg{endnotes}\ejax, \spkg{fixfoot},
+%   \ipkg{endheads}, \mpkg{endnotes}\ejax, \mpkg{enotez}\ejax, \spkg{fixfoot},
 %   \ipkg{fnbreak}, \ipkg{fnpara}, \ipkg{fnpos},
 %   \epkg{footmisc}, \mpkg{footnote}, \ipkg{footnotebackref},
 %   \mpkg{footnoterange}, \ipkg{footnpag}, \epkg{manyfoot},
@@ -5733,8 +5778,8 @@ This boolean may be tested by the user for later use.
 % \midrule
 %
 % \mpkg{xcolor}: & \textcolor{DarkGreen}{Full package color names}, any color models,
-%   and \textcolor{Goldenrod}{mixing}.
-%   \textcolor{Maroon}{\cs{textcolor}},
+%   and \textcolor{red!70!black}{mixing}.
+%   \textcolor{blue}{\cs{textcolor}},
 %   \colorbox{LightSteelBlue}{\cs{colorbox}},
 %   \fcolorbox{red}{NavajoWhite}{\cs{fcolorbox}}.
 %   Enhanced for \HTML\ compatibility. \\
@@ -5821,7 +5866,7 @@ This boolean may be tested by the user for later use.
 %   Also see the math section for math and \brand{MathJax} support for math font packages. \\
 %
 % Symbols: & Native \LaTeX\ diacriticals, \mpkg{academicons}, \spkg{amssymb}\sjax,
-%   \mpkg{bbding},
+%   \mpkg{bbding}, \mpkg{ccicons},
 %   \mpkg{chemgreek}, \mpkg{dingbat}, \spkg{euro}, \mpkg{eurosym},
 %   \mpkg{fontawesome}, \mpkg{fontawesome5}, \spkg{gensymb}\ejax, \spkg{latexsym}\sjax,
 %   \mpkg{marvosym},
@@ -5872,7 +5917,8 @@ This boolean may be tested by the user for later use.
 %
 % \midrule
 %
-% Calendars: & \mpkg{termcal} \\
+% Academic: & \mpkg{academicons}, \epkg{classicthesis}, \spkg{doi},
+%   \spkg{doipubmed}, \mpkg{orcidlink}\ijax, \mpkg{termcal} \\
 %
 % \midrule
 %
@@ -6620,7 +6666,7 @@ This boolean may be tested by the user for later use.
 %	own auxiliary files.  In this way, both \PDF\ and \HTML\
 %	documents may co-exist side-by-side.
 %
-% \item [Auxiliary files:] The usual \LaTeX\ files |.aux|, |.log|, |.out|, |.toc|, |.lof|, |.idx|.
+% \item [Auxiliary files:] The usual \LaTeX\ files |.aux|, |.log|, |.out|, \filenm{.toc}, \filenm{.lof}, |.idx|.
 %	When an \HTML\ version of the document is created, |_html| versions
 %	of the auxiliary files will also be generated.
 %
@@ -7012,7 +7058,7 @@ This boolean may be tested by the user for later use.
 %
 % \subsection{Cleaning auxiliary files}
 %
-% To remove the auxiliary files |.aux|, |.toc|, |.lof|, |.lot|, |.idx|, |.ind|, |.log|,
+% To remove the auxiliary files |.aux|, \filenm{.toc}, \filenm{.lof}, \filenm{.lot}, |.idx|, |.ind|, |.log|,
 %	and |.gl*|, and a few others:
 %	\userentry{lwarpmk clean}
 %
@@ -7277,14 +7323,20 @@ This boolean may be tested by the user for later use.
 % \gindex{link>title=\attribute{title} text}
 % \gindex{hyperref=\pkg{hyperref}>title=\attribute{title} text}
 % \gindex{settings>accessibility}
+% \gindex{ARIA=\acro{ARIA}}
+% \gindex{roles>ARIA=\acro{ARIO}}
 %
 % \pkg{lwarp} provides several methods for improving access to
 % the document using tools such as text-only browsers, copy \Slash paste,
 % text-to-speech readers, or Braille readers.
-% \HTML\ provides the \attribute{alt} text attribute for images,
-% which is used by \pkg{lwarp} as describe below.
-% \HTML\ also provides the \attribute{title} attribute, which usually
+% \pkg{lwarp} can use the \HTML\ \attribute{alt} text attribute for images,
+% as describe below.
+% \pkg{lwarp} can also use the \HTML\ \attribute{title} attribute, which usually
 % generates a pop-up text.  \pkg{lwarp} can add this to a reference or hyperlink.
+% \pkg{lwarp} also uses standard \HTML5 elements which are pre-assigned
+% \ARIA\ roles for increased accessibility, and \pkg{lwarp} assigns the |math|
+% role for \SVG\ math images, and the |note| role for footnotes, end notes,
+% margin paragraphs and notes, etc.
 % \brand{MathJax} also has provisions for improved accessibility
 % as well.  See \cref{tab:accessibility}.
 %
@@ -9613,7 +9665,7 @@ This boolean may be tested by the user for later use.
 %     \cs{usepackage}[ \\
 %       \fqquad \textred{makeindex,} \\
 %       \fqquad \textred{makeindexStyle=gindex.ist,} \\
-%       \fqquad \dots or \dots \\
+%       \fqquad \dots\ or \dots \\
 %       \fqquad \textred{makeindexStyle=gindexh.ist,} \\
 %       \fqquad \textgreen{latexmk} \hfill \textrm{<optional>}\\
 %     ]\{\textblue{lwarp}\}
@@ -10141,7 +10193,7 @@ This boolean may be tested by the user for later use.
 % \DescribeOption{makeindexStyle}
 %   \begin{sourcedisplay}
 % \cs{usepackage}[ \\
-%     \fquad \dots other options \dots \\
+%     \fquad \dots\ other options \dots \\
 %     \fquad \textred{makeindex}, \\
 %     \fquad \textred{makeindexStyle=projectname.ist}, \\
 % ]\{lwarp\}
@@ -10200,7 +10252,7 @@ This boolean may be tested by the user for later use.
 % \DescribeOption{xindyStyle}
 %   \begin{sourcedisplay}
 % \cs{usepackage}[ \\
-%   \fquad \dots other options \dots \\
+%   \fquad \dots\ other options \dots \\
 %   \fquad \textred{xindy}, \\
 %   \fquad \textred{xindyStyle=projectname.xdy}, \\
 % ]\{lwarp\}
@@ -10237,7 +10289,7 @@ This boolean may be tested by the user for later use.
 % \DescribeOption{xindexConfig}
 %   \begin{sourcedisplay}
 % \cs{usepackage}[ \\
-%     \fquad \dots other options \dots \\
+%     \fquad \dots\ other options \dots \\
 %     \fquad \textred{xindex}, \\
 %     \fquad \textred{xindexConfig=projectname}, \quad \% \textgreen{(without xindex- or .lua)} \\
 % ]\{lwarp\}
@@ -10341,6 +10393,10 @@ This boolean may be tested by the user for later use.
 % \limitsmathdisplay
 %
 %
+% \subsubsection{Theorems}
+% \limitstheorems
+% \changes{v0.896}{2021/03/25}{Docs: Theorem references.}
+%
 % \subsubsection{\pkg{ntheorem} package}
 %
 % \DescribePackage{ntheorem}
@@ -10890,8 +10946,8 @@ This boolean may be tested by the user for later use.
 % No attempt has yet been made to make \pkg{pythontex} robust with \HTML\ output.
 % Some math objects must be surrounded by
 % \trouble[``impure'' math]{pythontex=\pkg{pythontex}}
-% \cs{displaymathother} \dots \cs{displaymathnormal},
-% or \cs{inlinemathother} \dots \cs{inlinemathnormal}.
+% \cs{displaymathother} \dots\ \cs{displaymathnormal},
+% or \cs{inlinemathother} \dots\ \cs{inlinemathnormal}.
 % Displays of code may have to be
 % enclosed inside a \env{lateximage} environment
 % \watchout[HTML look-alike]
@@ -11949,7 +12005,7 @@ This boolean may be tested by the user for later use.
 %       \item [``Temporary page! LaTeX was unable to guess the total
 %                           number of pages \dots'':] \
 %           Harmless.  Recompile the document one more time.
-%           \trouble{Temporary page \dots unable to guess \dots}
+%           \trouble{Temporary page \dots\ unable to guess \dots}
 %           \trouble{LaTeX was unable to guess the total\dots}
 %
 %         \item [``Leaders not followed by proper glue'':] ~ \\
@@ -12051,8 +12107,8 @@ This boolean may be tested by the user for later use.
 %           \trouble{alt tags}
 %           can also cause problems with \attribute{alt} tags, resulting in
 %           very slow compilation, large \attribute{alt} tags, and possible
-%           crashes.  Use \cs{inlinemathother} \dots \cs{inlinemathnormal} or
-%           \cs{displaymathother} \dots \cs{displaymathnormal} around the
+%           crashes.  Use \cs{inlinemathother} \dots\ \cs{inlinemathnormal} or
+%           \cs{displaymathother} \dots\ \cs{displaymathnormal} around the
 %           math expression.
 %   \end{description}
 %
@@ -12896,6 +12952,7 @@ This boolean may be tested by the user for later use.
 \LWR@loadafter{bussproofs}
 \LWR@loadafter{bxpapersize}
 \LWR@loadafter{bytefield}
+\LWR@loadafter{ccicons}
 \LWR@loadafter{cancel}
 \LWR@loadafter{canoniclayout}
 \LWR@loadafter{caption}
@@ -12920,6 +12977,7 @@ This boolean may be tested by the user for later use.
 \LWR@notmemoirloadafter{chngpage}
 \LWR@loadafter{cite}
 \LWR@loadafter{citeref}
+\LWR@loadafter{classicthesis}
 \LWR@loadafter{cleveref}
 % cmbright may be preloaded
 \LWR@loadafter{cmdtrack}
@@ -12957,6 +13015,7 @@ This boolean may be tested by the user for later use.
 \LWR@loadafter{endheads}
 \LWR@loadafter{endnotes}
 \LWR@loadafter{engtlc}
+\LWR@loadafter{enotez}
 \LWR@notmemoirloadafter{enumerate}
 \LWR@loadafter{enumitem}
 \LWR@notmemoirloadafter{epigraph}
@@ -13171,6 +13230,7 @@ This boolean may be tested by the user for later use.
 \LWR@loadafter{nowidow}
 \LWR@loadafter{ntheorem}
 \LWR@loadafter{octave}
+\LWR@loadafter{orcidlink}
 \LWR@loadafter{overpic}
 \LWR@loadafter{pagegrid}
 \LWR@notmemoirloadafter{pagenote}
@@ -13381,7 +13441,7 @@ This boolean may be tested by the user for later use.
 \LWR@loadafter{xcolor}
 \LWR@loadafter{xechangebar}
 \LWR@loadafter{xellipsis}
-% xetexko-vertical must be loaded before lwarp
+% xetexko must be loaded before lwarp
 \LWR@loadafter{xevlna}
 \LWR@loadafter{xfakebold}
 \LWR@loadafter{xfrac}
@@ -13739,25 +13799,29 @@ This boolean may be tested by the user for later use.
 %
 % \subsection{Argument selection}
 %
-% \begin{macro}{\LWR@firstoffour} \marg{first} \marg{second} \marg{third} \marg{fourth}
+% \begin{macro}{\LWR@firstoffive} \marg{first} \marg{second} \marg{third} \marg{fourth} \marg{fifth}
 % \changes{v0.63}{2019/01/25}{Added.}
-% \begin{macro}{\LWR@secondoffour} \marg{first} \marg{second} \marg{third} \marg{fourth}
-% \begin{macro}{\LWR@thirdoffour} \marg{first} \marg{second} \marg{third} \marg{fourth}
-% \begin{macro}{\LWR@fourthoffour} \marg{first} \marg{second} \marg{third} \marg{fourth}
+% \changes{v0.896}{2021/04/05}{Changed to firstoffive instead of four.}
+% \begin{macro}{\LWR@secondoffive} \marg{first} \marg{second} \marg{third} \marg{fourth} \marg{fifth}
+% \begin{macro}{\LWR@thirdoffive} \marg{first} \marg{second} \marg{third} \marg{fourth} \marg{fifth}
+% \begin{macro}{\LWR@fourthoffive} \marg{first} \marg{second} \marg{third} \marg{fourth} \marg{fifth}
+% \begin{macro}{\LWR@fifthoffive} \marg{first} \marg{second} \marg{third} \marg{fourth} \marg{fifth}
 %
-% Expands to the nth  of the four arguments.
+% Expands to the nth  of the five arguments.
 % Used for extra cross referencing.
 %
 %    \begin{macrocode}
-\long\def\LWR@firstoffour#1#2#3#4{#1}
-\long\def\LWR@secondoffour#1#2#3#4{#2}
-\long\def\LWR@thirdoffour#1#2#3#4{#3}
-\long\def\LWR@fourthoffour#1#2#3#4{#4}
+\long\def\LWR@firstoffive#1#2#3#4#5{#1}
+\long\def\LWR@secondoffive#1#2#3#4#5{#2}
+\long\def\LWR@thirdoffive#1#2#3#4#5{#3}
+\long\def\LWR@fourthoffive#1#2#3#4#5{#4}
+\long\def\LWR@fifthoffive#1#2#3#4#5{#5}
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
 % \end{macro}
 % \end{macro}
+% \end{macro}
 %
 %
 % \subsection{Inside boxes}
@@ -15676,6 +15740,7 @@ This boolean may be tested by the user for later use.
 %    \begin{macrocode}
 \RenewDocumentCommand{\RequirePackage}{o m o}{%
 %    \end{macrocode}
+%
 % Redirect up to twenty names:\footnote{This was originally nine names, but
 % then I came across a package which used twelve...}
 % \changes{v0.61}{2018/10/02}{Support up to 20 packages.}
@@ -15703,6 +15768,31 @@ This boolean may be tested by the user for later use.
 \LWR@lookforpackagename{19}%
 \LWR@lookforpackagename{20}%
 %    \end{macrocode}
+%
+% Error if braces are used in optional argument.
+% This can cause an error, so tell how to avoid.
+% \changes{v0.896}{2021/03/14}{Warn if package option has braces.}
+%    \begin{macrocode}
+\IfSubStr{\detokenize\expandafter{#1}}{\LWRleftbrace}%
+    {%
+        \PackageError{lwarp}{%
+            You used:\MessageBreak
+            \protect\requirepackage[#1]{#2}\MessageBreak
+            Braces in the package options will fail with Lwarp.\MessageBreak
+            Instead, use:\MessageBreak
+            \protect\PassOptionsToPackage{#1}{#2}\MessageBreak
+            \protect\requirepackage{#2}\MessageBreak
+            near the line number given below.\MessageBreak
+            Enter 'h' for more info%
+        }%
+        {%
+            See the Lwarp manual troubleshooting index entry for\MessageBreak
+            ``package, options with braces''%
+        }%
+    }%
+    {}% no brace
+%    \end{macrocode}
+%
 % \cs{RequirePackage} depending on the options and version:
 %    \begin{macrocode}
 \IfValueTF{#1}%
@@ -15967,7 +16057,7 @@ This boolean may be tested by the user for later use.
 
 % \begin{macro}{\LWR@copyfile} \marg{source filename} \marg{destination filename}
 %
-% Used to copy the |.toc| file to |.sidetoc| to re-print the \TOC\ in
+% Used to copy the \filenm{.toc} file to |.sidetoc| to re-print the \TOC\ in
 % the side\TOC\ navigation pane.
 %    \begin{macrocode}
 \newwrite\LWR@copyoutfile   % open the file to write to
@@ -17389,6 +17479,7 @@ This boolean may be tested by the user for later use.
 % \changes{v0.88}{2020/07/14}{\filenm{lwarp.css}: Added \optn{indexheading} for \pkg{gindex}.}
 % \changes{v0.893}{2020/10/18}{\filenm{lwarp.css}: Added \pkg{keystroke}.}
 % \changes{v0.894}{2020/12/15}{\filenm{lwarp.css}: \TeX\ logos no longer below baseline.}
+% \changes{v0.896}{2021/03/04}{\filenm{lwarp.css}: Added \element{main}, adjusted \element{sidetoccontainer} margin.}
 %
 % ^^A *lwarp.css
 %
@@ -17888,12 +17979,12 @@ div.marginblock br ,
 div.marginparblock br
     { margin-bottom: 2ex ; }
 
-div.bodycontainer {
+main.bodycontainer {
     float: left ;
     width: 80% ;
 }
 
-div.bodywithoutsidetoc div.bodycontainer {
+div.bodywithoutsidetoc main.bodycontainer {
     float: none ;
     width: 100% ;
 }
@@ -18735,15 +18826,12 @@ img.lateximage{
 }
 
 
-/* The -1px right margin compensates for the 1px right border. */
-/* Without this -1px margin, the body container appears below instead */
-/* of floating to the side. */
 div.sidetoccontainer {
     font-family: "DejaVu Serif", "Bitstream Vera Serif",
         "Lucida Bright", Georgia, serif;
     float: left ;
-    width: 20%;
-    margin: 0pt -1px 3ex 0pt ;
+    width: 19%; /* room for border-right next to 80% main */
+    margin: 0pt 0em 3ex 0pt ;
     border-right: 1px solid silver;
     border-bottom: 1px solid silver;
     background: #FAF7F4 ;
@@ -19097,7 +19185,7 @@ span.sidetocthetitle { display: none }
     span.sidetocthetitle { display: inline }
     nav.topnavigation { display:block }
     nav.botnavigation { display:block }
-    div.bodycontainer { width: 100% }
+    main.bodycontainer { width: 100% }
     .marginpar {
         max-width: 100%;
         float: none;
@@ -19116,21 +19204,21 @@ span.sidetocthetitle { display: none }
     div.sidetoccontainer { display:none; }
     nav.topnavigation { display: none; }
     nav.botnavigation { display: none; }
-    div.bodycontainer { width: 100% }
+    main.bodycontainer { width: 100% }
 }
 
 @media handheld {
     div.sidetoccontainer { display:none; }
     nav.topnavigation { display:block }
     nav.botnavigation { display:block }
-    div.bodycontainer { width: 100% }
+    main.bodycontainer { width: 100% }
 }
 
 @media projection {
     div.sidetoccontainer { display:none; }
     nav.topnavigation { display:block }
     nav.botnavigation { display:block }
-    div.bodycontainer { width: 100% }
+    main.bodycontainer { width: 100% }
 }
 \end{filecontents*}
 % \end{Verbatim}% for syntax highlighting
@@ -20192,7 +20280,7 @@ MathJax = {
 -- Copyright 2016-2021 Brian Dunn
 
 
-printversion = "v0.895"
+printversion = "v0.896"
 requiredconfversion = "2" -- also at *lwarpmk.conf
 
 function printhelp ()
@@ -21169,9 +21257,7 @@ end -- not --version
 %    \begin{macrocode}
 \begin{warpHTML}
 %    \end{macrocode}
-
-
-
+%
 % Stacks are used to remember how to close sections and list items.
 % Before a new section is started, previously nested sections and items must
 % be closed out (un-nested) in proper order.
@@ -21224,6 +21310,7 @@ end -- not --version
 % A stack to record the action to take to close each nesting level:
 % Add more levels of stack if necessary for a very deeply nested document,
 % adding to \cs{pushclose} and \cs{popclose} as well.
+% \changes{v0.896}{2021/03/15}{Stack 19 deep.}
 %    \begin{macrocode}
 \newcommand*{\LWR@closeone}{}% top of the stack
 \newcommand*{\LWR@closetwo}{}
@@ -21237,6 +21324,13 @@ end -- not --version
 \newcommand*{\LWR@closeten}{}
 \newcommand*{\LWR@closeeleven}{}
 \newcommand*{\LWR@closetwelve}{}
+\newcommand*{\LWR@closethirteen}{}
+\newcommand*{\LWR@closefourteen}{}
+\newcommand*{\LWR@closefifteen}{}
+\newcommand*{\LWR@closesixteen}{}
+\newcommand*{\LWR@closeseventeen}{}
+\newcommand*{\LWR@closeeighteen}{}
+\newcommand*{\LWR@closenineteen}{}
 %    \end{macrocode}
 
 % \subsection{Closing depths}
@@ -21258,7 +21352,8 @@ end -- not --version
 % \end{Verbatim}
 % \vspace{-\baselineskip}
 % \end{docsidebar}
-
+%
+% \changes{v0.896}{2021/03/15}{Stack 19 deep.}
 %    \begin{macrocode}
 \newcommand*{\LWR@closedepthone}{\LWR@depthnone}% top of the stack
 \newcommand*{\LWR@closedepthtwo}{\LWR@depthnone}
@@ -21272,6 +21367,13 @@ end -- not --version
 \newcommand*{\LWR@closedepthten}{\LWR@depthnone}
 \newcommand*{\LWR@closedeptheleven}{\LWR@depthnone}
 \newcommand*{\LWR@closedepthtwelve}{\LWR@depthnone}
+\newcommand*{\LWR@closedepththirteen}{\LWR@depthnone}
+\newcommand*{\LWR@closedepthfourteen}{\LWR@depthnone}
+\newcommand*{\LWR@closedepthfifteen}{\LWR@depthnone}
+\newcommand*{\LWR@closedepthsixteen}{\LWR@depthnone}
+\newcommand*{\LWR@closedepthseventeen}{\LWR@depthnone}
+\newcommand*{\LWR@closedeptheighteen}{\LWR@depthnone}
+\newcommand*{\LWR@closedepthnineteen}{\LWR@depthnone}
 %    \end{macrocode}
 
 % \subsection{Pushing and popping the stack}
@@ -21280,9 +21382,17 @@ end -- not --version
 
 % Pushes one return action and its \LaTeX\ depth onto the stacks.
 % \changes{v0.46}{2018/01/18}{Fix: Stack unnesting.}
+% \changes{v0.896}{2021/03/15}{Stack 19 deep.}
 %    \begin{macrocode}
 \NewDocumentCommand{\LWR@pushclose}{m}
 {%
+\global\let\LWR@closenineteen\LWR@closeeighteen%
+\global\let\LWR@closeeighteen\LWR@closeseventeen%
+\global\let\LWR@closeseventeen\LWR@closesixteen%
+\global\let\LWR@closesixteen\LWR@closefifteen%
+\global\let\LWR@closefifteen\LWR@closefourteen%
+\global\let\LWR@closefourteen\LWR@closethirteen%
+\global\let\LWR@closethirteen\LWR@closetwelve%
 \global\let\LWR@closetwelve\LWR@closeeleven%
 \global\let\LWR@closeeleven\LWR@closeten%
 \global\let\LWR@closeten\LWR@closenine%
@@ -21295,6 +21405,13 @@ end -- not --version
 \global\let\LWR@closethree\LWR@closetwo%
 \global\let\LWR@closetwo\LWR@closeone%
 \global\csletcs{LWR@closeone}{LWR@printclose#1}%
+\global\let\LWR@closedepthnineteen\LWR@closedeptheighteen%
+\global\let\LWR@closedeptheighteen\LWR@closedepthseventeen%
+\global\let\LWR@closedepthseventeen\LWR@closedepthsixteen%
+\global\let\LWR@closedepthsixteen\LWR@closedepthfifteen%
+\global\let\LWR@closedepthfifteen\LWR@closedepthfourteen%
+\global\let\LWR@closedepthfourteen\LWR@closedepththirteen%
+\global\let\LWR@closedepththirteen\LWR@closedepthtwelve%
 \global\let\LWR@closedepthtwelve\LWR@closedeptheleven%
 \global\let\LWR@closedeptheleven\LWR@closedepthten%
 \global\let\LWR@closedepthten\LWR@closedepthnine%
@@ -21307,6 +21424,20 @@ end -- not --version
 \global\let\LWR@closedepththree\LWR@closedepthtwo%
 \global\let\LWR@closedepthtwo\LWR@closedepthone%
 \global\csletcs{LWR@closedepthone}{LWR@depth#1}%
+%    \end{macrocode}
+%
+% Error if the deepest depth is no longer \cs{LWR@depthnone},
+% which means that it somehow has been nested too deeply,
+% or things are not being unnested correctly.
+% \changes{v0.896}{2021/03/15}{Error if stack overflow.}
+%    \begin{macrocode}
+\ifdefstring{\LWR@closedepthnineteen}{\LWR@depthnone}%
+    {}%
+    {%
+        \PackageError{lwarp}%
+            {The document is nested too deeply for Lwarp}%
+            {PLEASE inform the Lwarp maintainer!}%
+    }%
 }
 %    \end{macrocode}
 % \end{macro}
@@ -21316,6 +21447,7 @@ end -- not --version
 
 % Pops one action and its depth off the stacks.
 % \changes{v0.46}{2018/01/18}{Fix: Stack unnesting.}
+% \changes{v0.896}{2021/03/15}{Stack 19 deep.}
 %    \begin{macrocode}
 \newcommand*{\LWR@popclose}
 {%
@@ -21330,6 +21462,13 @@ end -- not --version
 \global\let\LWR@closenine\LWR@closeten%
 \global\let\LWR@closeten\LWR@closeeleven%
 \global\let\LWR@closeeleven\LWR@closetwelve%
+\global\let\LWR@closetwelve\LWR@closethirteen%
+\global\let\LWR@closethirteen\LWR@closefourteen%
+\global\let\LWR@closefourteen\LWR@closefifteen%
+\global\let\LWR@closefifteen\LWR@closesixteen%
+\global\let\LWR@closesixteen\LWR@closeseventeen%
+\global\let\LWR@closeseventeen\LWR@closeeighteen%
+\global\let\LWR@closeeighteen\LWR@closenineteen%
 \global\let\LWR@closedepthone\LWR@closedepthtwo%
 \global\let\LWR@closedepthtwo\LWR@closedepththree%
 \global\let\LWR@closedepththree\LWR@closedepthfour%
@@ -21341,6 +21480,13 @@ end -- not --version
 \global\let\LWR@closedepthnine\LWR@closedepthten%
 \global\let\LWR@closedepthten\LWR@closedeptheleven%
 \global\let\LWR@closedeptheleven\LWR@closedepthtwelve%
+\global\let\LWR@closedepthtwelve\LWR@closedepththirteen%
+\global\let\LWR@closedepththirteen\LWR@closedepthfourteen%
+\global\let\LWR@closedepthfourteen\LWR@closedepthfifteen%
+\global\let\LWR@closedepthfifteen\LWR@closedepthsixteen%
+\global\let\LWR@closedepthsixteen\LWR@closedepthseventeen%
+\global\let\LWR@closedepthseventeen\LWR@closedeptheighteen%
+\global\let\LWR@closedeptheighteen\LWR@closedepthnineteen%
 }
 %    \end{macrocode}
 % \end{macro}
@@ -21524,7 +21670,7 @@ end -- not --version
 \boolfalse{LWR@dynamicmath}
 %    \end{macrocode}
 %
-% \begin{macro}{\inlinemathother} Place before using |$| \dots\ |$| or \cs{(} \dots \cs{)}
+% \begin{macro}{\inlinemathother} Place before using |$| \dots\ |$| or \cs{(} \dots\ \cs{)}
 % if the contents of the math are not static, depending on counters or dynamic macros.
 % \changes{v0.57}{2018/05/23}{Added.}
 % \changes{v0.61}{2018/09/20}{Changed name from \cs{StartDynamicMath} to \cs{inlinemathother}.}
@@ -21536,7 +21682,7 @@ end -- not --version
 %    \end{macrocode}
 % \end{macro}
 %
-% \begin{macro}{\inlinemathnormal} Place after using |$| \dots\ |$| or \cs{(} \dots \cs{)}
+% \begin{macro}{\inlinemathnormal} Place after using |$| \dots\ |$| or \cs{(} \dots\ \cs{)}
 % with dynamic contents.
 % \changes{v0.61}{2018/09/20}{Changed name from \cs{StopDynamicMath} to \cs{inlinemathnormal}.}
 %    \begin{macrocode}
@@ -22069,12 +22215,16 @@ end -- not --version
 
 % \begin{macro}{\LWRPrintStack} Prints the closedepth stack.
 % \changes{v0.46}{2018/01/15}{Name changed from \cs{PrintStack}.}
+% \changes{v0.896}{2021/03/15}{Stack 19 deep.}
 %    \begin{macrocode}
 \newcommand*{\LWR@subprintstack}{
 \LWR@closedepthone\ \LWR@closedepthtwo\ \LWR@closedepththree\ 
 \LWR@closedepthfour\ \LWR@closedepthfive\ \LWR@closedepthsix\ 
 \LWR@closedepthseven\ \LWR@closedeptheight\ \LWR@closedepthnine\ 
 \LWR@closedepthten\ \LWR@closedeptheleven\ \LWR@closedepthtwelve\ 
+\LWR@closedepththirteen\ \LWR@closedepthfourteen\ \LWR@closedepthfifteen\
+\LWR@closedepthsixteen\ \LWR@closedepthseventeen\ \LWR@closedeptheighteen\ 
+\LWR@closedepthnineteen\
 }
 
 \newcommand*{\LWRPrintStack}{
@@ -22490,6 +22640,7 @@ end -- not --version
 % \changes{v0.73}{2019/06/23}{Fix: \env{quote}, \env{quotation} inside a span.}
 % \changes{v0.84}{2020/04/22}{Nullified \env{minipage}, \cs{parbox} inside a span.}
 % \changes{v0.84}{2020/04/22}{Issue warnings inside a span.}
+% \changes{v0.896}{2021/03/05}{Issue \env{BlockClassWP} warning inside a span.}
 %
 %    \begin{macrocode}
 \newcommand*{\LWR@nestspanitem}{%
@@ -22518,6 +22669,9 @@ end -- not --version
     \RenewDocumentEnvironment{BlockClass}{o m}%
         {\LWR@spanwarnformat{multi-paragraph object}}%
         {}%
+    \RenewDocumentEnvironment{LWR@BlockClassWP}{m m D(){} m}%
+        {\LWR@spanwarnformat{multi-paragraph object}}%
+        {}%
     \renewcommand{\BlockClassSingle}[2]{%
         {\LWR@spanwarnformat{multi-paragraph object}}%
         ##2%
@@ -22566,20 +22720,23 @@ end -- not --version
 % \end{macro}
 
 
-% \begin{macro}{\LWR@htmlspanclass} \oarg{style} \marg{class} \marg{text}
+% \begin{macro}{\LWR@htmlspanclass}
+%                   \oarg{style} \parg{\ARIA\ role} \marg{class} \marg{text}
 %
 % \changes{v0.34}{2017/08/02}{Moved optional argument in front of mandatory.}
-%
+% \changes{v0.896}{2021/03/05}{Added \ARIA\ role.}
 %    \begin{macrocode}
-\NewDocumentCommand{\LWR@htmlspanclass}{o m +m}{%
-\LWR@traceinfo{LWR@htmlspanclass |#1|#2|}%
-\LWR@ensuredoingapar%
-\LWR@subhtmlelementclass{span}[#1]{#2}%
-\begin{LWR@nestspan}%
-#3%
-\LWR@htmltagc{/span}%
-\LWR@traceinfo{LWR@htmlspanclass done}%
-\end{LWR@nestspan}%
+\NewDocumentCommand{\LWR@htmlspanclass}{o D(){} m +m}{%
+    \LWR@traceinfo{LWR@htmlspanclass |#1|#2|#3|}%
+    \LWR@ensuredoingapar%
+    \ifblank{#2}%
+        {\LWR@subhtmlelementclass{span}[#1]{#3}}%
+        {\LWR@subhtmlelementclass{span}[#1](#2){#3}}%
+    \begin{LWR@nestspan}%
+    #4%
+    \LWR@htmltagc{/span}%
+    \LWR@traceinfo{LWR@htmlspanclass done}%
+    \end{LWR@nestspan}%
 }
 %    \end{macrocode}
 % \end{macro}
@@ -22676,7 +22833,8 @@ end -- not --version
 % \subsection{Div class and element class}
 
 
-% \begin{macro}{\LWR@subhtmlelementclass} \marg{element} \oarg{style} \marg{class}
+% \begin{macro}{\LWR@subhtmlelementclass}
+%                       \marg{element} \oarg{style} \parg{\ARIA\ role} \marg{class}
 %
 % Factored and reused in several places.
 %
@@ -22690,21 +22848,24 @@ end -- not --version
 % \changes{v0.63}{2018/11/24}{Fix for \pkg{xeCJK}.}
 % \changes{v0.66}{2019/02/02}{Improved \HTML\ formatting.}
 % \changes{v0.892}{2020/10/03}{Ignore empty class.}
+% \changes{v0.896}{2021/03/05}{Added \ARIA\ role.}
 %
 %    \begin{macrocode}
-\NewDocumentCommand{\LWR@subhtmlelementclass}{m O{} m}{%
-\LWR@traceinfo{LWR@subhtmlelementclass !#1!#2!#3!}%
+\NewDocumentCommand{\LWR@subhtmlelementclass}{m O{} D(){} m}{%
+\LWR@traceinfo{LWR@subhtmlelementclass !#1!#2!#3!#4!}%
 \ifblank{#2}%
 {% empty style
     \LWR@htmltag{%
         #1%
-        \ifblank{#3}{}{ class=\textquotedbl#3\textquotedbl\ }% spaces
+        \ifblank{#3}{}{ role=\textquotedbl#3\textquotedbl}% spaces
+        \ifblank{#4}{}{ class=\textquotedbl#4\textquotedbl}% spaces
     }%
 }%
 {% non-empty style
     \LWR@htmltag{%
         #1\LWR@indentHTML%
-        \ifblank{#3}{}{class=\textquotedbl#3\textquotedbl\LWR@indentHTML}%
+        \ifblank{#3}{}{role=\textquotedbl#3\textquotedbl\LWR@indentHTML}%
+        \ifblank{#4}{}{class=\textquotedbl#4\textquotedbl\LWR@indentHTML}%
         style=\textquotedbl#2\textquotedbl\LWR@orignewline%
     }%
 }%
@@ -22714,17 +22875,20 @@ end -- not --version
 % \end{macro}
 
 
-% \begin{macro}{\LWR@htmlelementclass} \marg{element} \marg{class} \oarg{style}
+% \begin{macro}{\LWR@htmlelementclass} \marg{element} \oarg{style} \marg{class}
 %
 % \changes{v0.20}{2017/01/17}{Added optional style.}
 % \changes{v0.34}{2017/08/02}{Moved optional argument in front of mandatory.}
 % \changes{v0.73}{2019/06/26}{Vertical space.}
+% \changes{v0.896}{2021/03/05}{Added \ARIA\ role.}
 %    \begin{macrocode}
-\NewDocumentCommand{\LWR@htmlelementclass}{m o m}{%
-\LWR@stoppars%
-\LWR@forceemptyline%
-\LWR@subhtmlelementclass{#1}[#2]{#3}%
-\LWR@startpars%
+\NewDocumentCommand{\LWR@htmlelementclass}{m o D(){} m}{%
+    \LWR@stoppars%
+    \LWR@forceemptyline%
+    \ifblank{#3}%
+        {\LWR@subhtmlelementclass{#1}[#2]{#4}}%
+        {\LWR@subhtmlelementclass{#1}[#2](#3){#4}}%
+    \LWR@startpars%
 }
 %    \end{macrocode}
 % \end{macro}
@@ -22733,24 +22897,27 @@ end -- not --version
 % \begin{macro}{\LWR@htmlelementclassend} \marg{element} \marg{class}
 %    \begin{macrocode}
 \newcommand*{\LWR@htmlelementclassend}[2]{%
-\LWR@stoppars%
-\LWR@htmltag{/#1}%
-\ifbool{HTMLDebugComments}{%
-    \LWR@htmlcomment{End of #1 ``#2''}%
-}{}%
-\LWR@startpars%
+    \LWR@stoppars%
+    \LWR@htmltag{/#1}%
+    \ifbool{HTMLDebugComments}{%
+        \LWR@htmlcomment{End of #1 ``#2''}%
+    }{}%
+    \LWR@startpars%
 }
 %    \end{macrocode}
 % \end{macro}
 
-% \begin{macro}{\LWR@htmldivclass} \oarg{style} \marg{class}
+% \begin{macro}{\LWR@htmldivclass} \oarg{style} \parg{\ARIA\ role} \marg{class}
 %
 % \changes{v0.20}{2017/01/17}{Added optional style.}
 % \changes{v0.34}{2017/08/02}{Moved optional argument in front of mandatory.}
+% \changes{v0.896}{2021/03/05}{Added \ARIA\ role.}
 %
 %    \begin{macrocode}
-\NewDocumentCommand{\LWR@htmldivclass}{o m}{%
-\LWR@htmlelementclass{div}[#1]{#2}%
+\NewDocumentCommand{\LWR@htmldivclass}{o D(){} m}{%
+    \ifblank{#2}
+        {\LWR@htmlelementclass{div}[#1]{#3}}%
+        {\LWR@htmlelementclass{div}[#1](#2){#3}}%
 }
 %    \end{macrocode}
 % \end{macro}
@@ -22758,7 +22925,7 @@ end -- not --version
 % \begin{macro}{\LWR@htmldivclassend} \marg{class}
 %    \begin{macrocode}
 \newcommand*{\LWR@htmldivclassend}[1]{%
-\LWR@htmlelementclassend{div}{#1}%
+    \LWR@htmlelementclassend{div}{#1}%
 }
 %    \end{macrocode}
 % \end{macro}
@@ -22825,7 +22992,7 @@ end -- not --version
 % For other direct-formatting commands, see \cref{sec:directformatting}.
 %
 %
-% \begin{environment}{BlockClass} \oarg{style} \marg{class} \quad
+% \begin{environment}{BlockClass} \oarg{style} \parg{\ARIA\ role} \marg{class} \quad
 % High-level interface for \element{div} classes.
 %
 % \qquad Ex: |\begin{BlockClass}{class}| text |\end{BlockClass}|
@@ -22834,11 +23001,12 @@ end -- not --version
 % \changes{v0.20}{2017/01/17}{Added optional style.}
 % \changes{v0.34}{2017/08/02}{Moved optional argument in front of mandatory.}
 % \changes{v0.57}{2018/05/28}{Improved print/\HTML\ output selection.}
+% \changes{v0.896}{2021/03/05}{Added \ARIA\ role.}
 %
 % \codeprint
 %    \begin{macrocode}
 \begin{warpprint}
-\NewDocumentEnvironment{BlockClass}{o m}{}{}%
+\NewDocumentEnvironment{BlockClass}{o D(){} m}{}{}
 \end{warpprint}
 %    \end{macrocode}
 % \end{environment}
@@ -22847,11 +23015,11 @@ end -- not --version
 %    \begin{macrocode}
 \begin{warpHTML}
 
-\NewDocumentEnvironment{LWR@print@BlockClass}{o m}{}{}%
+\NewDocumentEnvironment{LWR@print@BlockClass}{o D(){} m}{}{}%
 
-\NewDocumentEnvironment{LWR@HTML@BlockClass}{o m}%
-    {\LWR@htmldivclass[#1]{#2}}
-    {\LWR@htmldivclassend{#2}}
+\NewDocumentEnvironment{LWR@HTML@BlockClass}{o D(){} m}%
+    {\LWR@htmldivclass[#1](#2){#3}}%
+    {\LWR@htmldivclassend{#3}}
 
 \LWR@formattedenv{BlockClass}
 \end{warpHTML}
@@ -22914,11 +23082,15 @@ end -- not --version
 \NewDocumentCommand{\LWR@print@InlineClass}{D{(}{)}{} o m +m}{#4}%
 
 \NewDocumentCommand{\LWR@HTML@InlineClass}{D{(}{)}{} o m +m}{%
+\LWR@traceinfo{LWR@HTML@InlineClass #3}%
 \ifbool{FormatWP}{%
+    \LWR@traceinfo{LWR@HTML@InlineClass: FormatWP}%
     \LWR@htmlspanclass[#1]{#3}{#4}%
 }{%
+    \LWR@traceinfo{LWR@HTML@InlineClass: not FormatWP}%
     \LWR@htmlspanclass[#2]{#3}{#4}%
 }%
+\LWR@traceinfo{LWR@HTML@InlineClass: done}%
 }
 
 \LWR@formatted{InlineClass}
@@ -22926,7 +23098,8 @@ end -- not --version
 %    \end{macrocode}
 
 
-% \begin{environment}{LWR@BlockClassWP} \marg{WPstyle} \marg{HTMLstyle} \marg{class} \quad
+% \begin{environment}{LWR@BlockClassWP}
+%       \marg{WPstyle} \marg{HTMLstyle} \parg{\ARIA\ role} \marg{class} \quad
 % Low-level interface for \element{div} classes with an automatic float ID.
 % These are often used when |\ifbool{FormatWP}|.
 %
@@ -22937,11 +23110,12 @@ end -- not --version
 % \changes{v0.47}{2018/01/26}{Fix: Line wrap at \HTML\ hyphen.}
 % \changes{v0.57}{2018/05/28}{Improved print/\HTML\ output selection.}
 % \changes{v0.63}{2018/11/24}{Fix for \pkg{xeCJK}.}
+% \changes{v0.896}{2021/03/05}{Added \ARIA\ role.}
 %
 % \codeprint
 %    \begin{macrocode}
 \begin{warpprint}
-\NewDocumentEnvironment{LWR@BlockClassWP}{m m m}{}{}%
+\NewDocumentEnvironment{LWR@BlockClassWP}{m m D(){} m}{}{}
 \end{warpprint}
 %    \end{macrocode}
 % \end{environment}
@@ -22949,8 +23123,9 @@ end -- not --version
 % \codehtml
 %    \begin{macrocode}
 \begin{warpHTML}
-\NewDocumentEnvironment{LWR@print@LWR@BlockClassWP}{m m m}{}{}%
-\NewDocumentEnvironment{LWR@HTML@LWR@BlockClassWP}{m m m}%
+\NewDocumentEnvironment{LWR@print@LWR@BlockClassWP}{m m D(){} m}{}{}%
+
+\NewDocumentEnvironment{LWR@HTML@LWR@BlockClassWP}{m m D(){} m}%
 {%
 \LWR@stoppars%
 \ifbool{FormatWP}%
@@ -22960,22 +23135,24 @@ end -- not --version
 % \changes{v0.65}{2018/12/21}{Fix space between class and id.}
 %    \begin{macrocode}
     \LWR@htmltag{%
-        div class=\textquotedbl#3\textquotedbl\ % space
+        div class=\textquotedbl#4\textquotedbl\ % space
         id=\textquotedbl%
             \LWR@print@mbox{autoidWP-\arabic{LWR@thisautoidWP}}%
         \textquotedbl%
+        \ifblank{#3}{}{ role=\textquotedbl#3\textquotedbl}%
         \ifblank{#1}{}{ style=\textquotedbl#1\textquotedbl}%
     }%
 }% FormatWP
 {% not FormatWP
     \LWR@htmltag{%
-        div class=\textquotedbl#3\textquotedbl%
+        div class=\textquotedbl#4\textquotedbl%
+        \ifblank{#3}{}{ role=\textquotedbl#3\textquotedbl}%
         \ifblank{#2}{}{ style=\textquotedbl#2\textquotedbl}%
     }%
 }% not FormatWP
 \LWR@startpars%
 }
-{\LWR@htmldivclassend{#3}}
+{\LWR@htmldivclassend{#4}}
 
 \LWR@formattedenv{LWR@BlockClassWP}
 \end{warpHTML}
@@ -23866,14 +24043,30 @@ end -- not --version
 % \changes{v0.36}{2017/08/15}{Extra \protect\HTML\ source space after paragraphs.}
 % \changes{v0.36}{2017/08/16}{Force \protect\HTML\ superscripts.}
 % \changes{v0.68}{2019/03/04}{Factored for multiple foot boxes.}
+% \changes{v0.896}{2021/04/04}{Fix: \ctr{autopage} references in footnotes.}
 %
 %    \begin{macrocode}
 \long\def\LWR@@footnotetext#1#2{%
 \LWR@traceinfo{LWR@footnotetext}%
-\global\setbox\csname #2\endcsname=\vbox{%
 %    \end{macrocode}
-% Add to any current footnotes:
+%
+% Perhaps generate an autopage in the text to link a citation backreference
+% closer to its usage.
+%    \begin{macrocode}
+\LWR@newautopagelabel{page}%
+%    \end{macrocode}
+%
+% Locally disable auto page labels inside the footnote text.
+% Footnotes are accumulated in the current page before finally being placed
+% in a potentially later page, so the aotopages would be incorrect.
+%    \begin{macrocode}
+\begingroup%
+\let\LWR@newautopagelabel\LWR@null@newautopagelabel%
+%    \end{macrocode}
+%
+% Take the existing footnote box and add the new content:
 %    \begin{macrocode}
+\global\setbox\csname #2\endcsname=\vbox{%
     \unvbox\csname #2\endcsname%
 %    \end{macrocode}
 % Remember the footnote number for \cs{ref}:
@@ -23929,6 +24122,7 @@ end -- not --version
 %    \begin{macrocode}
     \color@endgroup%
 }% vbox
+\endgroup%
 %    \end{macrocode}
 % Paragraph handling:
 % \changes{v0.52}{2018/03/28}{Fix: Paragraph handling.}
@@ -23940,7 +24134,7 @@ end -- not --version
 
 % \begin{macro}{\LWR@footnotetext} \marg{text}
 %    \begin{macrocode}
-\long\def\LWR@footnotetext#1{\LWR@@footnotetext{#1}{LWR@footnotebox}}
+\long\def\LWR@footnotetext#1{\LWR@@footnotetext{#1}{LWR@footnotebox}}%
 %    \end{macrocode}
 % \end{macro}
 %
@@ -24034,11 +24228,20 @@ end -- not --version
 %
 %
 % \begin{macro}{\LWR@@printpendingfootnotes} \marg{footnote counter name}
+% \changes{v0.896}{2021/03/05}{Added \ARIA\ role.}
+% \changes{v0.896}{2021/03/26}{Fix: Backref to footnote.}
 %    \begin{macrocode}
 \newcommand*{\LWR@@printpendingfootnotes}[1]{%
 \expandafter\ifvoid\csname LWR@#1box\endcsname\else
     \LWR@forcenewpage
-    \begin{BlockClass}{footnotes}
+    \begin{BlockClass}(note){footnotes}%
+%    \end{macrocode}
+%
+% Create a new autopage in case citation back references occur inside the footnotes:
+%    \begin{macrocode}
+    \LWR@newautopagelabel{page}%
+%    \end{macrocode}
+%    \begin{macrocode}
     \null
     \unvbox\csuse{LWR@#1box}
     \setbox\csuse{LWR@#1box}=\vbox{}
@@ -24085,11 +24288,12 @@ end -- not --version
 % \begin{macro}{\LWR@printpendingmpfootnotes}
 % Enclose the minipage footnotes in a class, print, then clear.
 % \changes{v0.45}{2018/01/10}{Added.}
+% \changes{v0.896}{2021/03/05}{Added \ARIA\ role.}
 %    \begin{macrocode}
 \newcommand*{\LWR@printpendingmpfootnotes}{%
 \ifvoid\LWR@mpfootnotes\else
     \LWR@forcenewpage
-    \begin{BlockClass}{footnotes}
+    \begin{BlockClass}(note){footnotes}%
     \null
     \unvbox\LWR@mpfootnotes
     \setbox\LWR@mpfootnotes=\vbox{}
@@ -24122,17 +24326,17 @@ end -- not --version
 %
 % \changes{v0.21}{2017/02/11}{Fixed source listing.}
 % \changes{v0.42}{2017/10/26}{If \progcode{FormatWP} emulate a wrapfig.}
-%
+% \changes{v0.896}{2021/03/05}{Added \ARIA\ role.}
 %    \begin{macrocode}
 \renewcommand{\marginpar}[2][]{%
 \ifbool{FormatWP}%
 {%
-\begin{LWR@BlockClassWP}{width:2in; float:right; margin:10pt}{}{marginblock}
+\begin{LWR@BlockClassWP}{width:2in; float:right; margin:10pt}{}(note){marginblock}%
 #2
-\end{LWR@BlockClassWP}
+\end{LWR@BlockClassWP}%
 }%
 {%
-    \LWR@htmlspanclass{marginpar}{#2}%
+    \LWR@htmlspanclass(note){marginpar}{#2}%
 }%
 }
 %    \end{macrocode}
@@ -24149,17 +24353,17 @@ end -- not --version
 % \changes{v0.42}{2017/10/26}{If \progcode{FormatWP} emulate a wrapfig.}
 % \changes{v0.44}{2017/11/10}{Added.}
 % \changes{v0.73}{2019/06/25}{Fix: Paragraph tags.}
-%
+% \changes{v0.896}{2021/03/05}{Added \ARIA\ role.}
 %    \begin{macrocode}
 \newcommand{\marginparBlock}[2][]{%
 \LWR@stoppars%
 \ifbool{FormatWP}%
 {%
-    \begin{LWR@BlockClassWP}{width:2in; float:right; margin:10pt}{}{marginblock}
+    \begin{LWR@BlockClassWP}{width:2in; float:right; margin:10pt}{}(note){marginblock}%
     #2
     \end{LWR@BlockClassWP}
 }{%
-    \begin{BlockClass}[width:2in; float:right; margin:10pt]{marginparblock}
+    \begin{BlockClass}[width:2in; float:right; margin:10pt](note){marginparblock}%
     #2
     \end{BlockClass}
 }%
@@ -24213,6 +24417,122 @@ end -- not --version
 
 
 
+% \section{Tracking internal cross references}
+%
+% Cross references are generated using the \PDF\ file's page number during
+% \LaTeX\ compilation.
+% Internal labels are generated which include these page numbers in the label.
+%
+%
+% \DescribeFile{*_html.aux}
+% A new entry in the \filenm{*_html.aux} file is used to help
+% cross-references:
+% \begin{sourceverb}
+% \newlabel{autopage-<nnn>}{{<x>}{<y>}}
+% \end{sourceverb}
+%
+%
+% \DescribeCounter{LWR@currentautosecpage} Records the page number when the section
+%   was created.  (If a math expression is included in the section name,
+%   and \SVG\ math is used, the corresponding \env{lateximage} will cause the
+%   page number to change by the time the following autosec label is created,
+%   thus the initial page number is recorded here.)
+%   \ctr{LWR@currentautosecfloatpage} is updated
+%   more often than \ctr{LWR@currentautosecpage}.
+% \changes{v0.43}{2017/11/01}{\ctr{LWR@currentautosecpage}: Added.}
+% \changes{v0.66}{2019/01/28}{\ctr{LWR@currentautosecpage}: Fix for \LOF, \LOT float in home page.}
+%    \begin{macrocode}
+\newcounter{LWR@currentautosecpage}
+\setcounter{LWR@currentautosecpage}{1}
+%    \end{macrocode}
+%
+%
+% \DescribeCounter{LWR@currentautosecfloatpage}
+% The \HTML\ output's \PDF\ page number at the start of a new \HTML\ file, section,
+% or float.
+% Updated more often than \ctr{LWR@currentautosecpage}, such as when a new float occurs.
+% Used only for table of contents, list of figures, list of tables,
+% but not for general cross references such as \cs{label}, citation backlinks, etc.
+%
+% \cs{LWRsetnextfloat} is written with this and the |autoid|
+% by the modified \cs{addcontentsline} just before each float's entry.
+%    \begin{macrocode}
+\newcounter{LWR@currentautosecfloatpage}
+\setcounter{LWR@currentautosecfloatpage}{1}
+%    \end{macrocode}
+%
+%
+% \DescribeCounter{LWR@previousautopagelabel} Remembers which autopage label
+% was most recently generated.  Used to avoid duplicates.
+%    \begin{macrocode}
+\newcounter{LWR@previousautopagelabel}
+\setcounter{LWR@previousautopagelabel}{-1}
+%    \end{macrocode}
+%
+%
+% \begin{macro}{\LWR@newautopagelabel} \marg{pagenumber counter}
+% \changes{v0.48}{2018/02/11}{Fix: \TOC, \LOF, \LOT\ links.}
+% \changes{v0.72}{2019/06/05}{Fix: References for \pkg{xr}, \pkg{xr-hyper}.}
+% \changes{v0.896}{2021/03/26}{Fix: Refs if page changed.}
+%
+% \cs{BaseJobname} is added to the label in case \pkg{xr} or \pkg{xr-hyper} are used.
+%    \begin{macrocode}
+\newcommand*{\LWR@newautopagelabel}[1]{%
+%    \end{macrocode}
+%
+% No action if this autopage label has already been defined:
+%    \begin{macrocode}
+\ifnumequal{\value{LWR@previousautopagelabel}}{\value{page}}%
+    {}%
+%    \end{macrocode}
+%
+% If the \PDF\ page has changed, create a label using the desired counter.
+%
+% If the counter is \ctr{LWR@currentautosecpage}, that was the page number
+% when the section generation began,
+% but the current \PDF\ page may be different by now
+% if the section name had an \SVG\ image, such as \SVG\ math.
+% To allow the cross-reference to point just after the section heading, the
+% label must be made after the section heading is complete, which may have
+% generated a new \PDF\ page.
+% Thus, the label is made with the given counter, which may be the \PDF\ page
+% number where the section heading began,
+% then if the \PDF\ page number has changed,
+% another label is made for the current page number.
+%    \begin{macrocode}
+    {%
+        \label{\BaseJobname-autopage-\csuse{the#1}}%
+%    \end{macrocode}
+%
+% If there are intervening pages, such as an \SVG\ image,
+% define another label for the new page:
+%    \begin{macrocode}
+        \ifnumequal{\value{#1}}{\value{page}}%
+            {}%
+            {\label{\BaseJobname-autopage-\csuse{thepage}}}%
+%    \end{macrocode}
+%
+% Remember the latest autopage label:
+%    \begin{macrocode}
+        \setcounter{LWR@previousautopagelabel}{\value{page}}%
+    }%
+}
+%    \end{macrocode}
+% \end{macro}
+
+% \begin{macro}{\LWR@null@newautopagelabel} \marg{pagenumber counter}
+% \changes{v0.896}{2021/04/04}{Fix: Refs in footnotes.}
+%
+% Inside a footnote, the page numbers will be incorrect,
+% so this is nullified.
+%    \begin{macrocode}
+\newcommand*{\LWR@null@newautopagelabel}[1]{}
+%    \end{macrocode}
+% \end{macro}
+
+
+
+
 % \section{Splitting \HTML\ files}
 %
 % \begin{itemize}
@@ -24559,40 +24879,6 @@ end -- not --version
 % \end{macro}
 
 
-% \DescribeCounter{LWR@previousautopagelabel} Remembers which autopage label
-% was most recently generated.  Used to avoid duplicates.
-%    \begin{macrocode}
-\newcounter{LWR@previousautopagelabel}
-\setcounter{LWR@previousautopagelabel}{-1}
-%    \end{macrocode}
-
-
-% \DescribeFile{*_html.aux}
-% A new entry in the \filenm{*_html.aux} file is used to help
-% cross-references:
-% \begin{sourceverb}
-% \newlabel{autopage-<nnn>}{{<x>}{<y>}}
-% \end{sourceverb}
-% 
-% \begin{macro}{\LWR@newautopagelabel} \marg{pagenumber counter}
-% \changes{v0.48}{2018/02/11}{Fix: \TOC, \LOF, \LOT\ links.}
-% \changes{v0.72}{2019/06/05}{Fix: References for \pkg{xr}, \pkg{xr-hyper}.}
-%
-% \cs{BaseJobname} is added to the label in case \pkg{xr} or \pkg{xr-hyper} are used.
-%    \begin{macrocode}
-\newcommand*{\LWR@newautopagelabel}[1]{%
-\ifnumequal{\value{LWR@previousautopagelabel}}{\value{page}}%
-{}% no action if this autopage label has already been defined
-{%
-    \label{\BaseJobname-autopage-\arabic{#1}}%
-    \setcounter{LWR@previousautopagelabel}{\value{page}}
-}%
-}
-%    \end{macrocode}
-% \end{macro}
-
-
-
 % \subsection{Sanitizing expressions for \HTML}
 
 % Math expressions are converted to |lateximage|s,
@@ -25119,9 +25405,10 @@ end -- not --version
 % At the bottom of the ending file:
 %
 % \changes{v0.65}{2018/12/18}{Improved \CSS\ for page layout.}
+% \changes{v0.896}{2021/03/04}{Added \element{main}.}
 %    \begin{macrocode}
 \LWR@htmlelementclassend{section}{textbody}
-\LWR@htmlelementclassend{div}{bodycontainer}
+\LWR@htmlelementclassend{main}{bodycontainer}
 \LWR@htmlelementclassend{div}{bodyandsidetoc}
 
 \LWR@printpendingfootnotes
@@ -25250,11 +25537,12 @@ end -- not --version
 
 %    \end{macrocode}
 %
-% Track the \PDF\ page numbers of the \HTML\ output:
+% Track the \PDF\ page numbers of the \HTML\ output.
+% This is updated more frequently than \ctr{LWR@currentautosecpage}.
 % \changes{v0.48}{2018/02/11}{Fix: \TOC, \LOF, \LOT\ links.}
 %    \begin{macrocode}
-\setcounter{LWR@latestautopage}{\value{page}}%
-\LWR@newautopagelabel{LWR@latestautopage}%
+\setcounter{LWR@currentautosecfloatpage}{\value{page}}%
+\LWR@newautopagelabel{LWR@currentautosecfloatpage}%
 %    \end{macrocode}
 %
 %
@@ -25305,8 +25593,9 @@ end -- not --version
 % Start of the \element{textbody}:
 % \changes{v0.65}{2018/12/18}{Improved \CSS\ for page layout.}
 % \changes{v0.84}{2020/04/24}{Added prev/next links.}
+% \changes{v0.896}{2021/03/04}{Added \element{main}.}
 %    \begin{macrocode}
-\LWR@htmlelementclass{div}{bodycontainer}
+\LWR@htmlelementclass{main}{bodycontainer}
 \LWR@htmlelementclass{section}{textbody}
 %    \end{macrocode}
 %
@@ -25664,20 +25953,6 @@ end -- not --version
 % \end{macro}
 %
 %
-% \DescribeCounter{LWR@currentautosec} Records the page number when the section
-%   was created.  (If a math expression is included in the section name,
-%   and \SVG\ math is used, the corresponding \env{lateximage} will cause the
-%   page number to change by the time the following autosec label is created,
-%   thus the initial page number is recorded here.)
-% \changes{v0.43}{2017/11/01}{\ctr{LWR@currentautosec}: Added.}
-% \changes{v0.66}{2019/01/28}{\ctr{LWR@currentautosec}: Fix for \LOF, \LOT float in home page.}
-%    \begin{macrocode}
-\newcounter{LWR@currentautosec}
-\setcounter{LWR@currentautosec}{1}
-%    \end{macrocode}
-%
-%
-%
 % \begin{macro}{\LWR@section} * \oarg{TOC name} \marg{name} \marg{sectiontype}
 %
 % \changes{v0.20}{2017/01/09}{Combined higher-level sections together into files.}
@@ -25819,7 +26094,7 @@ end -- not --version
 %    \end{macrocode}
 % \changes{v0.43}{2017/11/01}{Fix: Math in section name.}
 %    \begin{macrocode}
-\setcounter{LWR@currentautosec}{\value{page}}%
+\setcounter{LWR@currentautosecpage}{\value{page}}%
 %    \end{macrocode}
 %
 % Check if starred:
@@ -25960,6 +26235,12 @@ end -- not --version
 % Generate a \LaTeX{} label.
 %
 % Track the \PDF\ page numbers of the \HTML\ output.
+% A new autopage label may be generated for \ctr{LWR@currentautosecpage}
+% for the start of the section,
+% and also for the current page if it is different due to an \SVG\ image
+% in the section name.
+% Also, the final page after the section has been created is updated
+% in \ctr{LWR@currentautosecfloatpage}.
 %
 % \changes{v0.43}{2017/11/01}{Fix: Math in section name.}
 % \changes{v0.48}{2018/02/11}{Fix: \TOC, \LOF, \LOT\ links.}
@@ -25967,8 +26248,8 @@ end -- not --version
 % \changes{v0.66}{2019/02/02}{Improved \HTML\ formatting.}
 %    \begin{macrocode}
 \LWR@traceinfo{LWR@section: about to create the LaTeX label}%
-\setcounter{LWR@latestautopage}{\value{page}}%
-\LWR@newautopagelabel{LWR@currentautosec}\LWR@orignewline%
+\setcounter{LWR@currentautosecfloatpage}{\value{page}}%
+\LWR@newautopagelabel{LWR@currentautosecpage}\LWR@orignewline%
 %    \end{macrocode}
 %
 % If this is the first section found in this file,
@@ -26665,9 +26946,10 @@ end -- not --version
 }%
 %    \end{macrocode}
 % \changes{v0.65}{2018/12/18}{Improved \CSS\ for page layout.}
+% \changes{v0.896}{2021/03/04}{Added \element{main}.}
 %    \begin{macrocode}
 \LWR@htmlelementclass{div}{bodywithoutsidetoc}
-\LWR@htmlelementclass{div}{bodycontainer}
+\LWR@htmlelementclass{main}{bodycontainer}
 \LWR@traceinfo{LWR@lwarpStart: Generating textbody.}
 \LWR@htmlelementclass{section}{textbody}
 %    \end{macrocode}
@@ -26732,11 +27014,17 @@ end -- not --version
 % ^^A %    \end{macrocode}
 %
 %
-% First autopage label in case a figure occurs early.
+% First autopage label in case a figure occurs early before the first section:
+% A new autopage label may be generated for \ctr{LWR@currentautosecpage}
+% for the start of the section,
+% and also for the current page if it is different due to an \SVG\ image
+% in the section name.
+% Also, the final page after the section has been created is updated
+% in \ctr{LWR@currentautosecfloatpage}.
 % \changes{v0.66}{2019/01/28}{Fix: \TOC, \LOF, \LOT\ links.}
 %    \begin{macrocode}
-\setcounter{LWR@latestautopage}{\value{page}}%
-\LWR@newautopagelabel{LWR@currentautosec}%
+\setcounter{LWR@currentautosecfloatpage}{\value{page}}%
+\LWR@newautopagelabel{LWR@currentautosecpage}%
 %    \end{macrocode}
 %
 %    \begin{macrocode}
@@ -26790,20 +27078,23 @@ end -- not --version
 \LWR@closeprevious{finished}
 %    \end{macrocode}
 % At the bottom of the ending file:
-
+%
+% Print any pending footnotes:
+% \changes{v0.896}{2021/03/14}{Fix: Footnotes at end of document.}
+%    \begin{macrocode}
+\LWR@printpendingfootnotes
+%    \end{macrocode}
+%
 % Close the textbody:
 % \changes{v0.65}{2018/12/18}{Improved \CSS\ for page layout.}
 % \changes{v0.84}{2020/04/24}{Added prev/next links.}
+% \changes{v0.896}{2021/03/04}{Added \element{main}.}
 %    \begin{macrocode}
 \label{\BaseJobname-autofile-last}
 \LWR@htmlelementclassend{section}{textbody}
-\LWR@htmlelementclassend{div}{bodycontainer}
+\LWR@htmlelementclassend{main}{bodycontainer}
 \LWR@htmlelementclassend{div}{bodyandsidetoc}
 %    \end{macrocode}
-% Print any pending footnotes:
-%    \begin{macrocode}
-\LWR@printpendingfootnotes
-%    \end{macrocode}
 %
 % Create the footer if not \EPUB\:
 % \changes{v0.84}{2020/04/24}{Fix: No footer for \EPUB}
@@ -27360,7 +27651,9 @@ end -- not --version
 %
 %    \begin{macrocode}
 \LWR@setfootnoteseries%
-\def\@makefnmark{\textsuperscript{\thefootnote}}
+\def\@makefnmark{%
+    \textsuperscript{\thefootnote}%
+}
 %    \end{macrocode}
 %
 % \begin{center}
@@ -28107,6 +28400,12 @@ end -- not --version
 %    \begin{macrocode}
 \renewcommand{\@begintheorem}[2]{%
 \LWR@forcenewpage
+%    \end{macrocode}
+% \changes{v0.896}{2021/03/14}{Intersperse footnotes.}
+%    \begin{macrocode}
+    \LWR@printpendingfootnotes%                   lwarp
+%    \end{macrocode}
+%    \begin{macrocode}
 \BlockClass{theoremcontents}
 \trivlist
 \item[\InlineClass{theoremlabel}{#1\ #2\ }]\itshape
@@ -28137,6 +28436,12 @@ end -- not --version
 %    \begin{macrocode}
 \renewcommand*{\@endtheorem}{%
 \endtrivlist
+%    \end{macrocode}
+% \changes{v0.896}{2021/03/14}{Intersperse footnotes.}
+%    \begin{macrocode}
+    \LWR@printpendingfootnotes%                   lwarp
+%    \end{macrocode}
+%    \begin{macrocode}
 \endBlockClass% theoremcontents
 }
 %    \end{macrocode}
@@ -28260,7 +28565,7 @@ end -- not --version
 % \changes{v0.48}{2018/02/02}{Honors \cs{makelabel}.}
 %    \begin{macrocode}
 \def\LWR@HTML@item[#1]{%
-\LWR@traceinfo{@item}
+\LWR@traceinfo{@item}%
   \if@noparitem
     \@donoparitem
   \else
@@ -28517,12 +28822,55 @@ end -- not --version
 % \end{macro}
 
 % \begin{environment}{description} \oarg{options}
+%
+% Footnotes are modified to correctly parse optional arguments.
+% \changes{v0.896}{2021/03/14}{Fix: Footnotes inside \env{description} label.}
 %    \begin{macrocode}
 \newcommand*{\LWR@descriptionstart}{%
-\renewcommand*{\LWR@printcloselist}{\LWR@printclosedescription}
-\renewcommand*{\LWR@printopenlist}{dl}
-\let\item\LWR@descitem%
-\LWR@nulllistfills%
+    \renewcommand*{\LWR@printcloselist}{\LWR@printclosedescription}
+    \renewcommand*{\LWR@printopenlist}{dl}
+    \let\item\LWR@descitem%
+    \LWR@nulllistfills%
+%    \end{macrocode}
+%
+% Footnotes are redefined to process optional arguments inside the \env{description}
+% label.
+% A \cs{footnote} is dropped, as it is in print mode.
+% Using the optional arguments does not work in print mode,
+% but for some reason they must be accepted as done here to work correctly
+% even without the optional arguments.
+%    \begin{macrocode}
+    \renewcommand{\footnote}[2][]{%
+        \ifblank{##1}%
+        {%
+            \stepcounter\@mpfn
+            \protected@xdef\@thefnmark{\thempfn}%
+            \@footnotemark%\@footnotetext
+        }%
+        {%
+            \begingroup
+            \csname c@\@mpfn\endcsname ##1\relax
+            \unrestored@protected@xdef\@thefnmark{\thempfn}%
+            \endgroup
+            \@footnotemark%\@footnotetext
+        }%
+    }%
+    %
+    \renewcommand{\footnotemark}[1][]{%
+        \ifblank{##1}%
+        {%
+            \stepcounter{footnote}%
+            \protected@xdef\@thefnmark{\thefootnote}%
+            \@footnotemark%
+        }%
+        {%
+            \begingroup%
+            \c@footnote ##1\relax%
+            \unrestored@protected@xdef\@thefnmark{\thefootnote}%
+            \endgroup%
+            \@footnotemark%
+        }%
+    }%
 }
 %    \end{macrocode}
 % \end{environment}
@@ -29416,7 +29764,8 @@ end -- not --version
         \LWR@setexparray{LWR@colatspec}%
             {\arabic{LWR@tabletotalLaTeXcols}}%
             {\expandafter\@firstofone\LWR@colparameter}%
-        \LWR@traceinfo{at \arabic{LWR@tabletotalLaTeXcols}: %
+        \LWR@traceinfo{at \arabic{LWR@tabletotalLaTeXcols}%
+        : % space
         \LWR@getexparray{LWR@colatspec}{\arabic{LWR@tabletotalLaTeXcols}}}%
     }%
     \let\LWR@colparameter\relax%
@@ -32690,7 +33039,8 @@ end -- not --version
 %   \item [\cs{newlabel}:] Unchanged.  When the |.aux| file is read, sets \cs{r@<label>@lwarp}.
 %   \item [\cs{r@<label>@lwarp}:] Set to |{{section_name}{file_name}{depth}{number}}|:
 %		\begin{description}
-%		\item [\cs{LWR@nameref}:] The section name for this label.
+%		\item [\cs{LWR@nameref}:] The section or object name for this label.
+%       \item [\cs{LWR@currentautosecpageref}:] The \ctr{LWR@currentautosecpage} for this label.
 %		\item [\cs{LWR@htmlfileref}:] The filenumber or name for this label.
 %		\item [\cs{LWR@lateximagedepthref}:] The |lateximagedepth| for this label.
 %		\item [\cs{LWR@lateximagenumberref}:] The |lateximagenumber| for this label.
@@ -32830,7 +33180,18 @@ end -- not --version
 % \changes{v0.66}{2019/01/27}{No longer use \pkg{zref}.}
 %    \begin{macrocode}
 \newcommand*{\LWR@nameref}[1]{%
-    \expandafter\LWR@setref\csname r@#1@lwarp\endcsname\LWR@firstoffour{#1}%
+    \expandafter\LWR@setref\csname r@#1@lwarp\endcsname\LWR@firstoffive{#1}%
+}
+%    \end{macrocode}
+% \end{macro}
+%
+%
+% \begin{macro}{\LWR@currentautosecpageref} \marg{label}
+% Returns the \ctr{LWR@currentautosecpage} for this label:
+% \changes{v0.896}{2021/04/05}{Added.}
+%    \begin{macrocode}
+\newcommand*{\LWR@currentautosecpageref}[1]{%
+    \expandafter\LWR@setref\csname r@#1@lwarp\endcsname\LWR@secondoffive{#1}%
 }
 %    \end{macrocode}
 % \end{macro}
@@ -32842,7 +33203,7 @@ end -- not --version
 % \changes{v0.66}{2019/01/27}{No longer use \pkg{zref}.}
 %    \begin{macrocode}
 \newcommand*{\LWR@htmlfileref}[1]{%
-    \expandafter\LWR@setref\csname r@#1@lwarp\endcsname\LWR@secondoffour{#1}%
+    \expandafter\LWR@setref\csname r@#1@lwarp\endcsname\LWR@thirdoffive{#1}%
 }
 %    \end{macrocode}
 % \end{macro}
@@ -32853,7 +33214,7 @@ end -- not --version
 % \changes{v0.66}{2019/01/27}{No longer use \pkg{zref}.}
 %    \begin{macrocode}
 \newcommand*{\LWR@lateximagedepthref}[1]{%
-    \expandafter\LWR@setref\csname r@#1@lwarp\endcsname\LWR@thirdoffour{#1}%
+    \expandafter\LWR@setref\csname r@#1@lwarp\endcsname\LWR@fourthoffive{#1}%
 }
 %    \end{macrocode}
 % \end{macro}
@@ -32865,7 +33226,7 @@ end -- not --version
 % \changes{v0.66}{2019/01/27}{No longer use \pkg{zref}.}
 %    \begin{macrocode}
 \newcommand*{\LWR@lateximagenumberref}[1]{%
-    \expandafter\LWR@setref\csname r@#1@lwarp\endcsname\LWR@fourthoffour{#1}%
+    \expandafter\LWR@setref\csname r@#1@lwarp\endcsname\LWR@fifthoffive{#1}%
 }
 %    \end{macrocode}
 % \end{macro}
@@ -32874,6 +33235,7 @@ end -- not --version
 % \begin{macro}{\LWR@write@lwarplabel} \marg{label}
 % Sanitize the name and then creates the label:
 % \changes{v0.66}{2019/01/27}{No longer use \pkg{zref}.}
+% \changes{v0.896}{2021/04/05}{Added \cs{LWR@currentautosecpage}.}
 %    \begin{macrocode}
 \newcommand*{\LWR@write@lwarplabel}[1]{%
     \LWR@traceinfo{LWR@write@lwarplabel !#1!}%
@@ -32883,6 +33245,7 @@ end -- not --version
             {%
                 \string\newlabel{#1@lwarp}{%
                     {\@currentlabelname}%
+                    {\theLWR@currentautosecpage}%
                     {%
                         \ifbool{FileSectionNames}%
                             {\LWR@thisfilename}%
@@ -33017,8 +33380,9 @@ end -- not --version
 % and also patches \pkg{memoir}.
 %
 % \changes{v0.84}{2020/04/05}{Removed optional args.}
+% \changes{v0.896}{2021/04/08}{Revert to a simple \cs{newcommand*}.}
 %    \begin{macrocode}
-\NewDocumentCommand{\LWR@new@label}{m}{%
+\newcommand*{\LWR@new@label}[1]{%
     \LWR@traceinfo{LWR@new@label: starting}%
     \LWR@traceinfo{LWR@new@label: !#1!}%
 % \@bsphack%
@@ -33027,7 +33391,7 @@ end -- not --version
 %    \begin{macrocode}
     \LWR@orig@label{#1}%
 %    \end{macrocode}
-% Create a special label which holds the section number,
+% Create a special label which holds the section number, section name,
 % |LWR@htmlfilenumber|, |LWR@lateximagedepth|, and |LWR@lateximagenumber|:
 %    \begin{macrocode}
     \LWR@traceinfo{%
@@ -33190,6 +33554,24 @@ end -- not --version
 \LWR@formatted{ref}
 %    \end{macrocode}
 %
+%
+% \begin{macro}{\LWR@refwithsection}
+% \changes{v0.896}{2021/04/21}{Added.}
+%    \begin{macrocode}
+\NewDocumentCommand{\LWR@refwithsection}{s m}{%
+    \LWR@traceinfo{LWR@refwithsection !#2!}%
+    \IfBooleanTF{#1}%
+        {\LWR@print@ref{\BaseJobname-autopage-\LWR@currentautosecpageref{#2}}}%
+        {%
+            \LWR@startref{#2}%
+            \LWR@print@ref{\BaseJobname-autopage-\LWR@currentautosecpageref{#2}}%
+            \LWR@htmltag{/a}%
+        }%
+}
+%    \end{macrocode}
+% \end{macro}
+%
+%
 % For \brand{MathJax}:
 % \changes{v0.88}{2020/07/05}{Added \brand{MathJax}.}
 %    \begin{macrocode}
@@ -33280,9 +33662,10 @@ end -- not --version
 % \begin{macro}{\@currentHref} Added to support \pkg{backref}.
 % \changes{v0.45}{2018/01/14}{Added.}
 % \changes{v0.84}{2020/04/07}{\pkg{backref}: Fixed from \pkg{lwarp} v0.72 changes.}
+% \changes{v0.896}{2021/04/05}{\pkg{backref}: Improved back refs.}
 %    \begin{macrocode}
 \AtBeginDocument{
-    \def\@currentHref{\BaseJobname-autopage-\theLWR@currentautosec}
+    \def\@currentHref{\BaseJobname-autopage-\theLWR@previousautopagelabel}%
 }
 %    \end{macrocode}
 % \end{macro}
@@ -33471,8 +33854,8 @@ end -- not --version
 % \end{macro}
 
 
-% \begin{macro}{\LWR@subinlineimage} \marg{\element{alt} tag} \marg{class}
-%	\marg{filename} \marg{extension} \marg{CSS style}
+% \begin{macro}{\LWR@subinlineimage} \marg{1: \element{alt} tag} \marg{2: class}
+%	\marg{3: filename} \marg{4: extension} \marg{5: \CSS\ style} \marg{6: \ARIA\ role}
 %
 % Factored from \env{lateximage}.
 %
@@ -33480,13 +33863,18 @@ end -- not --version
 % \changes{v0.66}{2019/02/02}{Improved \HTML\ formatting.}
 % \changes{v0.74}{2019/08/20}{Add \cs{ThisAltText}.}
 % \changes{v0.895}{2021/01/14}{Improved \HTML\ quotes.}
+% \changes{v0.896}{2021/03/05}{Added \ARIA\ role.}
 %    \begin{macrocode}
-\newcommand*{\LWR@subinlineimage}[5]{%
+\newcommand*{\LWR@subinlineimage}[6]{%
+    \ifblank{#6}%
+        {\renewcommand*{\LWR@tempone}{}}
+        {\renewcommand*{\LWR@tempone}{role="#6"\LWR@indentHTML}}
     \ifblank{#1}%
     {%
         \LWR@htmltag{img \LWR@indentHTML
             src=\textquotedbl#3.#4\textquotedbl \LWR@indentHTML
             alt=\textquotedbl#3\textquotedbl \LWR@indentHTML
+            \LWR@tempone
             style=\textquotedbl#5\textquotedbl \LWR@indentHTML
             class=\textquotedbl#2\textquotedbl \LWR@orignewline
         }%
@@ -33495,6 +33883,7 @@ end -- not --version
         \LWR@htmltag{img \LWR@indentHTML
             src=\textquotedbl#3.#4\textquotedbl \LWR@indentHTML
             alt=\textquotedbl#1\textquotedbl \LWR@indentHTML
+            \LWR@tempone
             style=\textquotedbl#5\textquotedbl \LWR@indentHTML
             class=\textquotedbl#2\textquotedbl \LWR@orignewline
         }%
@@ -33899,20 +34288,20 @@ end -- not --version
 
 % When a new \HTML\ file is marked in the \LaTeX\ \PDF\ file,
 % or at the start of a new section,
-% the \LaTeX\ page number at that point is stored in |LWR@latestautopage|,
+% the \LaTeX\ \PDF\ page number at that point is stored in \ctr{LWR@currentautosecfloatpage},
 % (and the associated filename is remembered by the special \LaTeX\ labels).
 % This page number is used to generate an |autopage| \HTML\ \element{id}
 % in the \HTML\ output at the start of the new \HTML\ file or section.
 % Meanwhile, there is a float counter used to generate an \HTML\ |autoid|
 % \element{id} at the start of the float itself in the \HTML\ file.
 % The |autopage| and |autoid| values to use for each float are written to the
-% |.lof|, etc. files just before each float's entry.  These values are used
+% \filenm{.lof}, etc. files just before each float's entry.  These values are used
 % by \cs{l@figure}, etc. to create the \HTML\ links in the List of Figures, etc.
 %
 % \DescribeCounter{LWR@nextautoid} Tracks |autoid| for floats.
 % \DescribeCounter{LWR@nextautopage} Tracks |autopage| for floats.
 %
-% These are updated per float as the |.lof|, |.lot| file is read.
+% These are updated per float as the \filenm{.lof}, \filenm{.lot} file is read.
 %    \begin{macrocode}
 \newcounter{LWR@nextautoid}
 \newcounter{LWR@nextautopage}
@@ -33938,16 +34327,6 @@ end -- not --version
 % \end{macro}
 
 
-% \DescribeCounter{LWR@latestautopage}
-% The \HTML\ output's \PDF\ page number at the start of a new \HTML\ file or section.
-%
-% \cs{LWRsetnextfloat} is written with this and the |autoid|
-% by the modified \cs{addcontentsline} just before each float's entry.
-%    \begin{macrocode}
-\newcounter{LWR@latestautopage}
-\setcounter{LWR@latestautopage}{1}
-%    \end{macrocode}
-
 
 % \begin{environment}{LWR@figcaption}
 %
@@ -33963,7 +34342,6 @@ end -- not --version
     {%
         \ifbool{FormatWP}{%
             \BlockClass[font-style:italic]{figurecaption}%
-%             \LWR@print@vspace*{\baselineskip}
         }{%
             \BlockClass{figurecaption}%
         }%
@@ -34087,7 +34465,7 @@ end -- not --version
 
 % \begin{macro}{\addcontentsline}
 % Patched to write the |autopage| and |autoid| before each float's entry.
-% No changes if writing |.toc|
+% No changes if writing \filenm{.toc}
 % For a theorem, automatically defines \cs{ext@<type>} as needed, to
 % mimic and reuse the float mechanism.
 %
@@ -34113,7 +34491,7 @@ end -- not --version
 %    \begin{macrocode}
         \addtocontents{\@nameuse{ext@#2}}{%
             \protect\LWRsetnextfloat%
-            {\arabic{LWR@latestautopage}}%
+            {\arabic{LWR@currentautosecfloatpage}}%
             {\arabic{LWR@thisautoid}}%
         }%
     }% not TOC
@@ -34156,7 +34534,7 @@ end -- not --version
 %
 % This section controls the generation of the \TOC, \LOF, and \LOT.
 %
-% The |.toc|, |.lof|, and |.lot| files are named by the source code \cs{jobname}.
+% The \filenm{.toc}, \filenm{.lof}, and \filenm{.lot} files are named by the source code \cs{jobname}.
 %
 % In \HTML, the printed tables are placed inside a \element{div}
 %   of class \attribute{toc}, \attribute{lof}, or \attribute{lot}.
@@ -34308,8 +34686,8 @@ end -- not --version
     }
     {
 %    \end{macrocode}
-% Copy the |.toc| file to |.sidetoc| for printing the side\TOC.
-% The original |.toc| file is renewed when \cs{tableofcontents} is finished.
+% Copy the \filenm{.toc} file to |.sidetoc| for printing the side\TOC.
+% The original \filenm{.toc} file is renewed when \cs{tableofcontents} is finished.
 %    \begin{macrocode}
         \ifbool{LWR@copiedsidetoc}{}{%
             \LWR@copyfile{\jobname.toc}{\jobname.sidetoc}%
@@ -34498,7 +34876,7 @@ end -- not --version
 
 % \begin{macro}{\numberline} \marg{number}
 %
-% (Called from each line in the |.aux|, |.lof| files.)
+% (Called from each line in the |.aux|, \filenm{.lof} files.)
 %
 % Record this section number for further use:
 %
@@ -34906,7 +35284,7 @@ end -- not --version
 
 
 % \begin{macro}{\@wrglossary} \marg{term} \qquad
-% Redefined to write the |LWR@latestautopage| counter instead of |page|.
+% Redefined to write the |LWR@autoglossary| counter instead of |page|.
 %    \begin{macrocode}
 \def\@wrglossary#1{%
     \addtocounter{LWR@autoglossary}{1}%
@@ -35704,9 +36082,11 @@ end -- not --version
 %    \begin{macrocode}
     \RenewDocumentCommand{\hspace}{s m}{}%
 %    \end{macrocode}
+% \changes{v0.896}{2021/03/05}{Added \ARIA\ role.}
+% \changes{v0.896}{2021/03/15}{Added groups.}
 %    \begin{macrocode}
-    \RenewDocumentCommand{\LWR@htmlspanclass}{o m +m}{##3}%
-    \DeclareExpandableDocumentCommand{\InlineClass}{D{(}{)}{} o m +m}{##4}%
+    \RenewDocumentCommand{\LWR@htmlspanclass}{o D(){} m +m}{{##4}}%
+    \DeclareExpandableDocumentCommand{\InlineClass}{D{(}{)}{} o m +m}{{##4}}%
 %    \end{macrocode}
 % Nullify math macros.
 % \changes{v0.55}{2018/04/24}{Removed extraneous space which appeared in file links.}
@@ -36113,7 +36493,7 @@ end -- not --version
 % Temporarily disable formatting while measuring the image parameters:
 %    \begin{macrocode}
     \LWR@restoreorigformatting%
-    \RenewDocumentEnvironment{lateximage}{s o s o o}{}{}% inside group
+    \RenewDocumentEnvironment{lateximage}{s o s o o d()}{}{}% inside group
     \LWR@print@normalsize%
 %    \end{macrocode}
 % Temporarily set font for the \HTML\ \PDF\ output:
@@ -36297,6 +36677,7 @@ end -- not --version
 % \changes{v0.50}{2018/02/22}{MD5 hash avoids duplicate \SVG\ math.}
 % \changes{v0.57}{2018/05/23}{Fix: Dynamic inline math expressions.}
 % \changes{v0.74}{2019/08/20}{Adds star argument for \env{lateximage}.}
+% \changes{v0.896}{2021/03/05}{Added \ARIA\ role.}
 %    \begin{macrocode}
     \ifbool{LWR@dynamicmath}{%
         \LWR@traceinfo{subsingledollar: dynamic}%
@@ -36304,6 +36685,7 @@ end -- not --version
             [\MathImageAltText]% alt tag
             []% no add'l hashing
             [\LWR@singledollarstyle \LWR@singledollardepthstyle]% CSS
+            (math)% ARIA
     }{% not dynamic math
         \LWR@traceinfo{subsingledollar: static}%
         \IfValueTF{#1}{% #1 True
@@ -36330,11 +36712,13 @@ end -- not --version
                     FB\LWR@tempone% xfakebold
                 ]%
                 [\LWR@singledollarstyle \LWR@singledollardepthstyle]% CSS
+                (math)% ARIA
         }{% #1 False
             \begin{lateximage}% no hashing
                 [#2]% alt
                 []% no add'l hashing
                 [\LWR@singledollarstyle \LWR@singledollardepthstyle]% CSS
+                (math)% ARIA
         }%
     }% not dynamic math
 %    \end{macrocode}
@@ -36498,7 +36882,7 @@ end -- not --version
 \LetLtxMacro\LWR@origopenbracket\[
 \LetLtxMacro\LWR@origclosebracket\]
 %    \end{macrocode}
-
+%
 % \DescribeObject{\$}
 % \DescribeObject{\$\$}
 % Redefine the dollar sign to place math inside a \env{lateximage},
@@ -36532,12 +36916,31 @@ end -- not --version
 % For \brand{MathJax}, print the math between |\[| and |\]|:
 % \changes{v0.42}{2017/10/16}{Improved line spacing with mathjax.}
 % \changes{v0.89}{2020/08/01}{TT font for \brand{MathJax}.}
+% \changes{v0.896}{2021/04/07}{Fix: Displaymath notes with \brand{MathJax}.}
 %    \begin{macrocode}
 {
 
-    \textbackslash[%
-    {\LWR@print@ttfamily\LWR@HTMLsanitize{#1}}%
-    \textbackslash]
+    \IfSubStr{\detokenize\expandafter{#1}}{\detokenize{note}}{%
+%    \end{macrocode}
+%
+% The equation is printed to the \PDF\ output inside \HTML\ comment tags.
+% This allows labels and footnotes to be accepted and processed.
+% The \env{math} environment is selected here, and \cs{LWR@hidelatexequation}
+% will use the original print-mode meaning of \env{math}.
+%    \begin{macrocode}
+        \LWR@hidelatexequation{math}{#1}%
+%    \end{macrocode}
+%    \begin{macrocode}
+        \InlineClass{hidden}{\LWR@syncnotenumbers}%
+        \textbackslash[%
+        {\LWR@print@ttfamily\LWR@HTMLsanitize{#1}}%
+        \textbackslash]
+        \InlineClass{hidden}{\LWR@syncnotenames}%
+    }{%
+        \textbackslash[%
+        {\LWR@print@ttfamily\LWR@HTMLsanitize{#1}}%
+        \textbackslash]
+    }%
 
 }% mathjax
 %    \end{macrocode}
@@ -36546,6 +36949,7 @@ end -- not --version
 % \changes{v0.50}{2018/02/24}{Improved \SVG\ math \attribute{alt} tags.}
 % \changes{v0.50}{2018/03/02}{Improved \SVG\ math display.}
 % \changes{v0.51}{2018/03/11}{Fix: \cs{addcontentsline} inside \SVG\ math.  Provides an autoid anchor.}
+% \changes{v0.896}{2021/03/05}{Added \ARIA\ role.}
 %    \begin{macrocode}
 {% not mathjax
     \begin{BlockClass}{displaymath}%
@@ -36558,6 +36962,7 @@ end -- not --version
         \textbackslash{]}%
     ]%
     *% do not add open/closing braces
+    (math)% ARIA
 %    \end{macrocode}
 % Support for \pkg{xfakebold}:
 % \changes{v0.67}{2019/02/17}{\pkg{xfakebold}: Added support.}
@@ -36697,11 +37102,13 @@ end -- not --version
 %    \begin{macrocode}
 \let\LWR@orig@math\math
 \let\LWR@orig@endmath\endmath
+
 \let\LWR@orig@displaymath\displaymath
 \let\LWR@orig@enddisplaymath\enddisplaymath
 
 \let\math\relax
 \let\endmath\relax
+
 \let\displaymath\relax
 \let\enddisplaymath\relax
 %    \end{macrocode}
@@ -36740,14 +37147,14 @@ end -- not --version
 % but does not supply \brand{MathJax} or \HTML\ \attribute{alt} tags.
 % \changes{v0.51}{2018/03/21}{Processing for complicated display math.}
 % \changes{v0.74}{2019/08/07}{Uses \cs{MathImageAltText}.}
+% \changes{v0.896}{2021/03/05}{Added \ARIA\ role.}
 %    \begin{macrocode}
 \newenvironment{LWR@displaymathother}
 {%
     \begin{BlockClass}{displaymath}%
     \LWR@newautoidanchor%
     \booltrue{LWR@indisplaymathimage}%
-    \begin{lateximage}%
-    [\MathImageAltText]%
+    \begin{lateximage}[\MathImageAltText](math)% [alt](ARIA)
     \LWR@origdollar\LWR@origdollar%
 }
 {%
@@ -36764,17 +37171,18 @@ end -- not --version
 % but does not supply \brand{MathJax} or \HTML\ \attribute{alt} tags.
 % \changes{v0.51}{2018/03/21}{Processing for complicated display math.}
 % \changes{v0.74}{2019/08/07}{Uses \cs{MathImageAltText}.}
+% \changes{v0.896}{2021/03/05}{Added \ARIA\ role.}
 %    \begin{macrocode}
 \newenvironment{LWR@equationother}
 {%
     \begin{BlockClass}{displaymathnumbered}%
     \LWR@newautoidanchor%
     \booltrue{LWR@indisplaymathimage}%
-    \begin{lateximage}[\MathImageAltText]%
-    \LWR@origequation%
+    \begin{lateximage}[\MathImageAltText](math)% [alt](ARIA)
+    \LWR@orig@equation%
 }
 {%
-    \LWR@origendequation%
+    \LWR@orig@endequation%
     \end{lateximage}%
     \end{BlockClass}%
 }
@@ -36895,7 +37303,7 @@ end -- not --version
 % Start the \LaTeX\ math environment inside the \HTML\ comment:
 %    \begin{macrocode}
     \begingroup
-    \@nameuse{LWR@orig#1}
+    \@nameuse{LWR@orig@#1}
 %    \end{macrocode}
 % While in the math environment,
 % restore various commands to their \LaTeX\ meanings.
@@ -36914,7 +37322,7 @@ end -- not --version
 %    \end{macrocode}
 % End the \LaTeX{} math environment inside the \HTML\ comment:
 %    \begin{macrocode}
-    \@nameuse{LWR@origend#1}
+    \@nameuse{LWR@orig@end#1}
     \endgroup
 
 %    \end{macrocode}
@@ -36965,10 +37373,10 @@ end -- not --version
 % after redefined by \pkg{amsmath}, if loaded.
 %    \begin{macrocode}
 \AtBeginDocument{
-    \let\LWR@origequation\equation
-    \let\LWR@origendequation\endequation
-    \csletcs{LWR@origequation*}{equation*}
-    \csletcs{LWR@origendequation*}{endequation*}
+    \let\LWR@orig@equation\equation
+    \let\LWR@orig@endequation\endequation
+    \csletcs{LWR@orig@equation*}{equation*}
+    \csletcs{LWR@orig@endequation*}{endequation*}
 }
 %    \end{macrocode}
 %
@@ -37023,6 +37431,7 @@ end -- not --version
 % \changes{v0.50}{2018/03/02}{Improved \SVG\ math display.}
 % \changes{v0.51}{2018/03/11}{Fix: \cs{addcontentsline} inside \SVG\ math.  Provides an autoid anchor.}
 % \changes{v0.52}{2018/03/31}{Fix: \env{equation*} now based on \env{equation} instead of \env{displaymath}.}
+% \changes{v0.896}{2021/03/05}{Added \ARIA\ role.}
 %    \begin{macrocode}
         \ifstrequal{#2}{equation*}{%
             \begin{BlockClass}{displaymath}%
@@ -37044,7 +37453,7 @@ end -- not --version
             \textbackslash{begin\{#2\}} % extra space
             \LWR@HTMLsanitizeexpand{\detokenize\expandafter{#1}} % extra space
             \textbackslash{end\{#2\}}%
-        ]*% alt tag
+        ]*(math)% alt tag, ARIA
 %    \end{macrocode}
 % Support for \pkg{xfakebold}:
 % \changes{v0.67}{2019/02/17}{\pkg{xfakebold}: Added support.}
@@ -37054,9 +37463,9 @@ end -- not --version
 % Create the actual \LaTeX-formatted equation inside
 % the |lateximage| using the contents of the environment.
 %    \begin{macrocode}
-        \@nameuse{LWR@orig#2}%
+        \@nameuse{LWR@orig@#2}%
         #1% contents collected by \collect@body
-        \@nameuse{LWR@origend#2}%
+        \@nameuse{LWR@orig@end#2}%
         \end{lateximage}%
         \end{BlockClass}%
     }% not mathjax
@@ -37124,10 +37533,11 @@ end -- not --version
 
 
 % \begin{macro}{\LWR@synconenotename} \marg{\brand{MathJax} variable} \marg{text}
+% \changes{v0.896}{2021/04/07}{Fix: \brand{MathJax}: Footnote names.}
 %    \begin{macrocode}
 \newcommand*{\LWR@synconenotename}[2]{%
     \textbackslash(
-    \textbackslash{}def\textbackslash{}#1\{#2\}
+    \textbackslash{}def\textbackslash{}#1name\{#2\}
     \textbackslash)
 }
 %    \end{macrocode}
@@ -37417,7 +37827,7 @@ end -- not --version
             \LWR@newautoidanchor%
             \booltrue{LWR@indisplaymathimage}%
             \begin{lateximage}[(\LWR@startingequationtag\textendash\LWR@equationtag)%
-                \LWR@addmathjax{eqnarray}{\BODY}]*%
+                \LWR@addmathjax{eqnarray}{\BODY}]*(math)%
 %    \end{macrocode}
 % Support for \pkg{xfakebold}:
 % \changes{v0.67}{2019/02/17}{\pkg{xfakebold}: Added support.}
@@ -37441,7 +37851,7 @@ end -- not --version
             \begin{BlockClass}{displaymath}%
             \LWR@newautoidanchor%
             \booltrue{LWR@indisplaymathimage}%
-            \begin{lateximage}[\LWR@addmathjax{eqnarray*}{\BODY}]*%
+            \begin{lateximage}[\LWR@addmathjax{eqnarray*}{\BODY}]*(math)%
 %    \end{macrocode}
 % Support for \pkg{xfakebold}:
 % \changes{v0.67}{2019/02/17}{\pkg{xfakebold}: Added support.}
@@ -37755,19 +38165,21 @@ end -- not --version
 
 
 % \begin{macro}{\LWR@lateximage@oneimageb} \marg{1: alt text} \marg{2: filename}
-%                                               \marg{3: CSS style}
+%                                               \marg{3: \CSS\ style}
+%                                               \marg{4: \ARIA\ role}
 % Creates the image for the \env{lateximage}.
 %
 % \changes{v0.74}{2019/08/26}{Factored from \env{lateximage}.}
+% \changes{v0.896}{2021/03/05}{Added \ARIA\ role.}
 %    \begin{macrocode}
-\newcommand{\LWR@lateximage@oneimageb}[3]{%
+\newcommand{\LWR@lateximage@oneimageb}[4]{%
     \LWR@subinlineimage{#1}{lateximage}%
     {%
         \LWR@print@mbox{%
             \LWR@ImagesDirectory\OSPathSymbol%
             #2%
         }%
-    }{svg}{#3}%
+    }{svg}{#3}{#4}%
 }
 %    \end{macrocode}
 % \end{macro}
@@ -37775,25 +38187,27 @@ end -- not --version
 
 % \begin{macro}{\LWR@lateximage@oneimage} \marg{1: alt text} \marg{2: filename}
 %                                               \marg{3: \CSS\ style} \marg{4: delimit?}
+%                                               \marg{5: \ARIA\ role}
 %
 % Creates an image for the \env{lateximage},
 % whose \attribute{alt} text depends on the circumstances.
 %
 % \changes{v0.74}{2019/08/26}{Factored from \env{lateximage}.}
+% \changes{v0.896}{2021/03/05}{Added \ARIA\ role.}
 %    \begin{macrocode}
-\newcommand{\LWR@lateximage@oneimage}[4]{%
+\newcommand{\LWR@lateximage@oneimage}[5]{%
     \ifdefvoid{\LWR@ThisAltText}{%
         \IfBooleanTF{#4}{%
-            \LWR@lateximage@oneimageb{#1}{#2}{#3}%
+            \LWR@lateximage@oneimageb{#1}{#2}{#3}{#5}%
         }{%
             \LWR@lateximage@oneimageb%
                 {\AltTextOpen#1\AltTextClose}%
-                {#2}{#3}%
+                {#2}{#3}{#5}%
         }%
     }{%
         \LWR@lateximage@oneimageb%
             {\AltTextOpen\LWR@ThisAltText\AltTextClose}%
-            {#2}{#3}%
+            {#2}{#3}{#5}%
     }%
 }
 %    \end{macrocode}
@@ -37802,6 +38216,7 @@ end -- not --version
 
 % \begin{environment}{lateximage} * \oarg{2: \element{alt} tag} *
 %                                       \oarg{4: add'l hashing} \oarg{5: \CSS\ style}
+%                                       \parg{6: \ARIA\ role}
 %
 % Typesets the contents and then renders the result as an \SVG\ file.
 % Star \#1 causes the image to be hashed for reuse.
@@ -37843,11 +38258,12 @@ end -- not --version
 % \changes{v0.51}{2018/03/07}{Added additional hashing option.}
 % \changes{v0.66}{2019/01/27}{Added \cs{BaseJobname} for multiple projects.}
 % \changes{v0.74}{2019/08/20}{Added second starred argument.}
+% \changes{v0.896}{2021/03/05}{Added \ARIA\ role.}
 %
 %    \begin{macrocode}
 \catcode`\$=\active%
 
-\NewDocumentEnvironment{lateximage}{s O{\ImageAltText} s O{} O{}}
+\NewDocumentEnvironment{lateximage}{s O{\ImageAltText} s O{} O{} D(){}}%
 {%
 \LWR@traceinfo{lateximage: starting on \jobname.pdf page \arabic{page}}%
 \LWR@traceinfo{lateximage: entering depth is \arabic{LWR@lateximagedepth}}%
@@ -38040,10 +38456,10 @@ end -- not --version
     \ifbool{LWR@indisplaymathimage}{}{% not in display math
         \LetLtxMacro\[\LWR@origopenbracket%
         \LetLtxMacro\]\LWR@origclosebracket%
-        \let\equation\LWR@origequation%
-        \let\endequation\LWR@origendequation%
-        \csletcs{equation*}{LWR@origequation*}%
-        \csletcs{endequation*}{LWR@origendequation*}%
+        \let\equation\LWR@orig@equation%
+        \let\endequation\LWR@orig@endequation%
+        \csletcs{equation*}{LWR@orig@equation*}%
+        \csletcs{endequation*}{LWR@orig@endequation*}%
     }% not in display math
 %    \end{macrocode}
 %
@@ -38106,13 +38522,14 @@ end -- not --version
 % \changes{v0.47}{2018/01/26}{Fix: Line wrap at \HTML\ hyphen.}
 % \changes{v0.50}{2018/02/22}{MD5 hash avoids duplicate \SVG\ math.}
 % \changes{v0.74}{2019/08/20}{New syntax for \cs{LWR@subinlineimage}.}
+% \changes{v0.896}{2021/03/05}{Added \ARIA\ role.}
 %    \begin{macrocode}
     \IfBooleanTF{#1}% starred
     {% hash
-        \LWR@lateximage@oneimage{#2}{\LWR@hashedname}{#5}{#3}%
+        \LWR@lateximage@oneimage{#2}{\LWR@hashedname}{#5}{#3}{#6}%
     }% hash
     {% no hash
-        \LWR@lateximage@oneimage{#2}{\LWR@ImagesName\theLWR@externalfilecnt}{#5}{#3}%
+        \LWR@lateximage@oneimage{#2}{\LWR@ImagesName\theLWR@externalfilecnt}{#5}{#3}{#6}%
     }% no hash
 %    \end{macrocode}
 %
@@ -38161,7 +38578,7 @@ end -- not --version
 % \changes{v0.48}{2018/02/02}{Print mode boxed to natural width.}
 % \changes{v0.74}{2019/08/20}{Added second starred argument.}
 %    \begin{macrocode}
-\NewDocumentEnvironment{lateximage}{s o s o o}
+\NewDocumentEnvironment{lateximage}{s o s o o d()}
     {\begin{varwidth}[b]{\linewidth}}
     {\end{varwidth}}
 %    \end{macrocode}
@@ -38182,17 +38599,20 @@ end -- not --version
 %    \end{macrocode}
 
 % \begin{environment}{center}
-% Replace \env{center} functionality with \CSS\ tags:
+% Replace \env{center} functionality with \CSS\ tags.
+% In a \element{span}, these macros are nullified, but extra \% are used
+% to remove spurrious spaces here as well.
 % \changes{v0.42}{2017/10/26}{If \progcode{FormatWP} use explicit \attribute{text-align}.}
 % \changes{v0.47}{2018/01/26}{Fix: Line wrap at \HTML\ hyphen.}
 % \changes{v0.84}{2020/04/14}{Added print mode.}
+% \changes{v0.896}{2021/04/07}{Spurrious space in a \element{span}.}
 %    \begin{macrocode}
 \newenvironment*{LWR@HTML@center}
-{
-    \LWR@forcenewpage
-    \ifbool{FormatWP}
-        {\BlockClass[\LWR@print@mbox{text-align:center}]{center}}
-        {\BlockClass{center}}
+{%
+    \LWR@forcenewpage%
+    \ifbool{FormatWP}%
+        {\BlockClass[\LWR@print@mbox{text-align:center}]{center}}%
+        {\BlockClass{center}}%
 }
 {\endBlockClass}
 
@@ -38204,13 +38624,14 @@ end -- not --version
 % \begin{environment}{flushright}
 % \changes{v0.47}{2018/01/26}{Fix: Line wrap at \HTML\ hyphen.}
 % \changes{v0.84}{2020/04/14}{Added print mode.}
+% \changes{v0.896}{2021/04/07}{Spurrious space in a \element{span}.}
 %    \begin{macrocode}
 \newenvironment*{LWR@HTML@flushright}
-{
-    \LWR@forcenewpage
-    \ifbool{FormatWP}
-        {\BlockClass[\LWR@print@mbox{text-align:right}]{flushright}}
-        {\BlockClass{flushright}}
+{%
+    \LWR@forcenewpage%
+    \ifbool{FormatWP}%
+        {\BlockClass[\LWR@print@mbox{text-align:right}]{flushright}}%
+        {\BlockClass{flushright}}%
 }
 {\endBlockClass}
 
@@ -38221,13 +38642,14 @@ end -- not --version
 % \begin{environment}{flushleft}
 % \changes{v0.47}{2018/01/26}{Fix: Line wrap at \HTML\ hyphen.}
 % \changes{v0.84}{2020/04/14}{Added print mode.}
+% \changes{v0.896}{2021/04/07}{Spurrious space in a \element{span}.}
 %    \begin{macrocode}
 \newenvironment*{LWR@HTML@flushleft}
-{
-    \LWR@forcenewpage
-    \ifbool{FormatWP}
-        {\BlockClass[\LWR@print@mbox{text-align:left}]{flushleft}}
-        {\BlockClass{flushleft}}
+{%
+    \LWR@forcenewpage%
+    \ifbool{FormatWP}%
+        {\BlockClass[\LWR@print@mbox{text-align:left}]{flushleft}}%
+        {\BlockClass{flushleft}}%
 }
 {\endBlockClass}
 
@@ -38400,9 +38822,8 @@ end -- not --version
 \LWR@PreloadedPackage{ulem}
 %    \end{macrocode}
 
-% \pkg{xetexko-vertical} may be preloaded by \pkg{xetexko}.
 %    \begin{macrocode}
-\LWR@PreloadedPackage{xetexko-vertical}
+\LWR@PreloadedPackage{xetexko}
 %    \end{macrocode}
 
 % \pkg{geometry} is preloaded by \pkg{lwarp}, and perhaps by various classes.
@@ -39157,6 +39578,11 @@ end -- not --version
 \LWR@print@raggedright%
 %    \end{macrocode}
 %
+% \changes{v0.896}{2021/04/06}{Improved back refs.}
+%    \begin{macrocode}
+    \LWR@newautopagelabel{page}%
+%    \end{macrocode}
+%
 % Set minipage footnotes:
 %    \begin{macrocode}
 \def\@mpfn{mpfootnote}%
@@ -39252,8 +39678,9 @@ end -- not --version
 %   \qquad Nullified for \HTML.
 % \changes{v0.48}{2018/02/04}{Nullified for \HTML.}
 % \changes{v0.57}{2018/05/28}{Improved print/\HTML\ output selection.}
+% \changes{v0.896}{2021/03/15}{Added a group.}
 %    \begin{macrocode}
-\newcommand*{\LWR@HTML@mbox}[1]{#1}
+\newcommand*{\LWR@HTML@mbox}[1]{{#1}}
 
 \LWR@formatted{mbox}
 %    \end{macrocode}
@@ -39401,6 +39828,7 @@ end -- not --version
 %    \begin{macrocode}
 \newcommand*{\LWR@fboxstyle}{%
 \LWR@findcurrenttextcolor%
+\LWR@traceinfo{LWR@fboxstyle B}%
 border:\LWR@printlength{\LWR@atleastonept} solid \LWR@origpound\LWR@tempcolor ; %
 padding:\LWR@printlength{\fboxsep} ; %
 color:\LWR@origpound\LWR@tempcolor%
@@ -39422,10 +39850,12 @@ color:\LWR@origpound\LWR@tempcolor%
 \newcommand{\LWR@HTML@fbox}[1]{%
 \LWR@traceinfo{HTML fbox}%
 \LWR@forceminwidth{\fboxrule}%
+\LWR@traceinfo{HTML fbox B}%
 \InlineClass[%
     \LWR@print@mbox{display:inline-block} ; %
     \LWR@fboxstyle%
 ]{fbox}{#1}%
+\LWR@traceinfo{HTML fbox: done}%
 }
 %    \end{macrocode}
 % \pkg{xcolor} \cs{let}s things to \cs{fbox} when it is loaded,
@@ -40318,7 +40748,7 @@ color:\LWR@origpound\LWR@tempcolor%
 % \changes{v0.66}{2019/02/04}{Fix: Color if \pkg{xcolor} not loaded.}
 %    \begin{macrocode}
 \newcommand*{\LWR@findcurrenttextcolor}{%
-\renewcommand{\LWR@tempcolor}{000000}%
+    \renewcommand{\LWR@tempcolor}{000000}%
 }
 %    \end{macrocode}
 % \end{macro}
@@ -43612,7 +44042,7 @@ color:\LWR@origpound\LWR@tempcolor%
         \edef\LWR@thisthmstyle{\@nameuse{LWR@thmstyle#2}}%
     }%          lwarp
   }%
-  \@tempa
+  \@tempa%
 }
 %    \end{macrocode}
 
@@ -43649,20 +44079,24 @@ color:\LWR@origpound\LWR@tempcolor%
 %    \begin{macrocode}
     \GetTitleString{#3}%                                lwarp
     \let\@currentlabelname\GetTitleStringResult%        lwarp
+    \item[%
+%    \end{macrocode}
+% \changes{v0.896}{2021/04/05}{\pkg{amsthm}: Improved back refs.}
+%    \begin{macrocode}
+    \LWR@newautopagelabel{page}%
 %    \end{macrocode}
 %    \begin{macrocode}
-    \item[
 %   \deferred@thm@head{
 %     \the\thm@headfont \thm@indent
     \@ifempty{#1}{\let\thmname\@gobble}{\LWR@haveamsthmname}%       lwarp
     \@ifempty{#2}{\let\thmnumber\@gobble}{\LWR@haveamsthmnumber}%   lwarp
     \@ifempty{#3}{\let\thmnote\@gobble}{\LWR@haveamsthmnote}%       lwarp
     \thm@swap\swappedhead\thmhead{#1}{#2}{#3}%
-    \the\thm@headpunct~
+    \the\thm@headpunct % space
     \thmheadnl % possibly a newline.
     \hskip\thm@headsep
 %   }%
-    ]
+    ]%
   \ignorespaces}
 %    \end{macrocode}
 %
@@ -43673,7 +44107,51 @@ color:\LWR@origpound\LWR@tempcolor%
   \ifhmode\unskip\unskip\par\fi
   \normalfont
   \LWR@forcenewpage%                            lwarp
+%    \end{macrocode}
+% \changes{v0.896}{2021/03/14}{\pkg{amsthm}: Intersperse footnotes.}
+%    \begin{macrocode}
+  \LWR@printpendingfootnotes%                   lwarp
+%    \end{macrocode}
+%    \begin{macrocode}
   \BlockClass{amsthmbody\LWR@thisthmstyle}%     lwarp
+%    \end{macrocode}
+%
+% Footnotes are redefined to work correctly inside the option brackets
+% for a theorem environment.
+% \changes{v0.896}{2021/03/14}{\pkg{amsthm}: Fix: Footnotes in opt arg..}
+%    \begin{macrocode}
+    \renewcommand{\footnote}[1][]{%
+        \ifblank{##1}%
+        {%
+            \stepcounter\@mpfn
+            \protected@xdef\@thefnmark{\thempfn}%
+            \@footnotemark\@footnotetext
+        }%
+        {%
+            \begingroup
+            \csname c@\@mpfn\endcsname ##1\relax
+            \unrestored@protected@xdef\@thefnmark{\thempfn}%
+            \endgroup
+            \@footnotemark\@footnotetext
+        }%
+    }%
+%
+    \renewcommand{\footnotemark}[1][]{%
+        \ifblank{##1}%
+        {%
+            \stepcounter{footnote}%
+            \protected@xdef\@thefnmark{\thefootnote}%
+            \@footnotemark%
+        }%
+        {%
+            \begingroup%
+            \c@footnote ##1\relax%
+            \unrestored@protected@xdef\@thefnmark{\thefootnote}%
+            \endgroup%
+            \@footnotemark%
+        }%
+    }%
+%
   \trivlist
   \let\thmheadnl\relax
   \let\thm@swap\@gobble
@@ -43690,9 +44168,10 @@ color:\LWR@origpound\LWR@tempcolor%
     \refstepcounter{#2}%
     \def\@tempa{\@oparg{\@begintheorem{#3}{\csname the#2\endcsname}}[]}%
   \fi
-  \@tempa
+  \@tempa%
 }
 %    \end{macrocode}
+%
 % \pkg{cleveref} patches \cs{@thm} to do \cs{cref@thmoptarg} if an optional
 % argument is given.  \pkg{lwarp} then patches \cs{cref@thmoptarg}
 % \cs{AtBeginDocument}.
@@ -43702,6 +44181,12 @@ color:\LWR@origpound\LWR@tempcolor%
     \ifhmode\unskip\unskip\par\fi%
     \normalfont%
     \LWR@forcenewpage%                          lwarp
+%    \end{macrocode}
+% \changes{v0.896}{2021/03/14}{\pkg{amsthm}: Intersperse footnotes.}
+%    \begin{macrocode}
+    \LWR@printpendingfootnotes%                   lwarp
+%    \end{macrocode}
+%    \begin{macrocode}
     \BlockClass{amsthmbody\LWR@thisthmstyle}%   lwarp
     \trivlist%
     \let\thmheadnl\relax%
@@ -43723,7 +44208,17 @@ color:\LWR@origpound\LWR@tempcolor%
 }%
 }% AtBeginDocument
 
-\def\@endtheorem{\endtrivlist\endBlockClass\@endpefalse }
+\def\@endtheorem{%
+    \endtrivlist%
+%    \end{macrocode}
+% \changes{v0.896}{2021/03/14}{\pkg{amsthm}: Intersperse footnotes.}
+%    \begin{macrocode}
+  \LWR@printpendingfootnotes%                   lwarp
+%    \end{macrocode}
+%    \begin{macrocode}
+    \endBlockClass%
+    \@endpefalse%
+}
 %    \end{macrocode}
 %
 %
@@ -43752,10 +44247,18 @@ color:\LWR@origpound\LWR@tempcolor%
 %    \end{macrocode}
 %
 % Patched for \CSS:
+% \changes{v0.896}{2021/04/05}{\pkg{amsthm}: Improved back refs.}
 %    \begin{macrocode}
 \renewenvironment{proof}[1][\proofname]{\par
-\LWR@forcenewpage% lwarp
+  \LWR@forcenewpage% lwarp
+%    \end{macrocode}
+% \changes{v0.896}{2021/03/14}{\pkg{amsthm}: Intersperse footnotes.}
+%    \begin{macrocode}
+  \LWR@printpendingfootnotes%                   lwarp
+%    \end{macrocode}
+%    \begin{macrocode}
     \BlockClass{amsthmproof}% lwarp
+    \LWR@newautopagelabel{page}%
   \pushQED{\qed}%
   \normalfont \topsep6\p@\@plus6\p@\relax
   \trivlist
@@ -43763,6 +44266,12 @@ color:\LWR@origpound\LWR@tempcolor%
         \InlineClass{amsthmproofname}{#1\@addpunct{.}}]\ignorespaces% changes
 }{%
   \InlineClass{theoremendmark}{\popQED}\endtrivlist%
+%    \end{macrocode}
+% \changes{v0.896}{2021/03/14}{\pkg{amsthm}: Intersperse footnotes.}
+%    \begin{macrocode}
+  \LWR@printpendingfootnotes%                   lwarp
+%    \end{macrocode}
+%    \begin{macrocode}
   \endBlockClass% lwarp
   \@endpefalse
 }
@@ -45068,6 +45577,7 @@ color:\LWR@origpound\LWR@tempcolor%
 %
 % \changes{v0.45}{2018/01/14}{\pkg{backref}: Added.}
 % \changes{v0.84}{2020/04/07}{\pkg{backref}: Fixed from \pkg{lwarp} v0.72 changes.}
+% \changes{v0.896}{2021/04/05}{\pkg{backref}: Improved backrefs.}
 %
 % \codehtml
 %
@@ -45080,7 +45590,7 @@ color:\LWR@origpound\LWR@tempcolor%
 \def\backref{}
 
 \long\def\hyper@section@backref#1#2#3{%
-    \ref{#3}%
+    \LWR@refwithsection{#3}%
 }
 
 \let\backrefxxx\hyper@section@backref
@@ -45512,10 +46022,39 @@ color:\LWR@origpound\LWR@tempcolor%
 \let\blx@imc@ifhyperref\@firstoftwo
 %    \end{macrocode}
 %
+% Ensure that an autopage reference is current where each \cs{cite} is used,
+% although this is nullified inside footnotes since they now use a \LaTeX\ box.
+% \changes{v0.896}{2021/03/25}{\pkg{biblatex}: Fix: Citation references.}
+%    \begin{macrocode}
+\xpretocmd{\blx@citecmdinit}
+    {\LWR@newautopagelabel{page}}%
+    {}
+    {\LWR@patcherror{biblatex}{blx@citecmdinit}}
+%    \end{macrocode}
+%
+% Ensure that an autopage reference is current for each backref.
+% If the citation is in a footnote, the backref will point to whatever
+% preceeded the footnotes.
+% \changes{v0.896}{2021/03/25}{\pkg{biblatex}: Fix: Back references.}
+%    \begin{macrocode}
+\xpatchcmd{\blx@addbackref@i}
+    {\thepage}
+    {\theLWR@previousautopagelabel}% ref to the most recent object
+    {}
+    {\LWR@patcherror{biblatex}{blx@addbackref@i A}}
+
+\xpatchcmd{\blx@addbackref@i}
+    {\c@page}
+    {\c@LWR@previousautopagelabel}% refto the most recent object
+    {}
+    {\LWR@patcherror{biblatex}{blx@addbackref@i B}}
+%    \end{macrocode}
+%
 %
 % The following patches are for back page references.
 %
 % \changes{v0.891}{2020/09/05}{\pkg{biblatex}: Fixed: Back page references.}
+% \changes{v0.896}{2021/04/05}{\pkg{biblatex}: Improved refs: \cs{ref} to \cs{LWR@refwithsection}.}
 %    \begin{macrocode}
 \DeclareListFormat{pageref}{%
   \ifnumless{\abx@pagerefstyle}{0}
@@ -45523,7 +46062,7 @@ color:\LWR@origpound\LWR@tempcolor%
      \ifhyperref
        {%
 %             \hyperlink{page.#1}{#1}%
-            \ref{\BaseJobname-autopage-#1}%  lwarp
+            \LWR@refwithsection{\BaseJobname-autopage-#1}%  lwarp
        }
        {#1}}
     {\ifnumequal{\value{listcount}}{1}
@@ -45561,7 +46100,7 @@ color:\LWR@origpound\LWR@tempcolor%
           {}%
         \ifhyperref
 %           {\hyperlink{page.#1}{#1}}
-          {\ref{\BaseJobname-autopage-#1}}%  lwarp
+          {\LWR@refwithsection{\BaseJobname-autopage-#1}}%  lwarp
           {#1}}%
      \edef\abx@range@prev{\abx@range@num}}
     {\usebibmacro{pageref:dump}%
@@ -45570,7 +46109,7 @@ color:\LWR@origpound\LWR@tempcolor%
        {}%
      \ifhyperref
 %        {\hyperlink{page.#1}{#1}}
-       {\ref{\BaseJobname-autopage-#1}}%  lwarp
+       {\LWR@refwithsection{\BaseJobname-autopage-#1}}%  lwarp
        {#1}%
      \def\abx@range@prev{-1}}%
   \edef\abx@range@last{\abx@range@this}}
@@ -45581,7 +46120,7 @@ color:\LWR@origpound\LWR@tempcolor%
        \bibrangedash
        \ifhyperref
 %          {\hyperlink{page.\abx@range@hold}{\abx@range@hold}}
-         {\ref{\BaseJobname-autopage-\abx@range@hold}}%  lwarp
+         {\LWR@refwithsection{\BaseJobname-autopage-\abx@range@hold}}%  lwarp
          {\abx@range@hold}%
      \or % three
        \ifnumless{\abx@range@diff}{2}
@@ -45589,49 +46128,49 @@ color:\LWR@origpound\LWR@tempcolor%
          {\bibrangedash}%
        \ifhyperref
 %          {\hyperlink{page.\abx@range@hold}{\abx@range@hold}}
-         {\ref{\BaseJobname-autopage-\abx@range@hold}}%  lwarp
+         {\LWR@refwithsection{\BaseJobname-autopage-\abx@range@hold}}%  lwarp
          {\abx@range@hold}%
      \or % two+
        \ifnumless{\abx@range@diff}{2}
          {\sqspace
           \ifhyperref
 %             {\hyperlink{page.\abx@range@hold}{\bibstring{sequens}}}
-            {\ref{\BaseJobname-autopage-\abx@range@hold}}%  lwarp
+            {\LWR@refwithsection{\BaseJobname-autopage-\abx@range@hold}}%  lwarp
             {\bibstring{sequens}}}
          {\bibrangedash
           \ifhyperref
 %             {\hyperlink{page.\abx@range@hold}{\abx@range@hold}}
-            {\ref{\BaseJobname-autopage-\abx@range@hold}}%  lwarp
+            {\LWR@refwithsection{\BaseJobname-autopage-\abx@range@hold}}%  lwarp
             {\abx@range@hold}}%
      \or % three+
        \ifnumless{\abx@range@diff}{2}
          {\sqspace
           \ifhyperref
 %             {\hyperlink{page.\abx@range@hold}{\bibstring{sequens}}}
-            {\ref{\BaseJobname-autopage-\abx@range@hold}}%  lwarp
+            {\LWR@refwithsection{\BaseJobname-autopage-\abx@range@hold}}%  lwarp
             {\bibstring{sequens}}}
          {\ifnumless{\abx@range@diff}{3}
             {\sqspace
              \ifhyperref
 %                {\hyperlink{page.\abx@range@hold}{\bibstring{sequentes}}}
-               {\ref{\BaseJobname-autopage-\abx@range@hold}}%  lwarp
+               {\LWR@refwithsection{\BaseJobname-autopage-\abx@range@hold}}%  lwarp
                {\bibstring{sequentes}}}
             {\bibrangedash
              \ifhyperref
 %                {\hyperlink{page.\abx@range@hold}{\abx@range@hold}}
-               {\ref{\BaseJobname-autopage-\abx@range@hold}}%  lwarp
+               {\LWR@refwithsection{\BaseJobname-autopage-\abx@range@hold}}%  lwarp
                {\abx@range@hold}}}%
      \else % all+
        \ifnumless{\abx@range@diff}{2}
          {\sqspace
           \ifhyperref
 %             {\hyperlink{page.\abx@range@hold}{\bibstring{sequens}}}
-            {\ref{\BaseJobname-autopage-\abx@range@hold}}%  lwarp
+            {\LWR@refwithsection{\BaseJobname-autopage-\abx@range@hold}}%  lwarp
             {\bibstring{sequens}}}
          {\sqspace
           \ifhyperref
 %             {\hyperlink{page.\abx@range@hold}{\bibstring{sequentes}}}
-            {\ref{\BaseJobname-autopage-\abx@range@hold}}%  lwarp
+            {\LWR@refwithsection{\BaseJobname-autopage-\abx@range@hold}}%  lwarp
             {\bibstring{sequentes}}}%
      \fi
      \def\abx@range@diff{0}}
@@ -45705,6 +46244,7 @@ color:\LWR@origpound\LWR@tempcolor%
 % \changes{v0.39}{2017/08/31}{\pkg{bigdelim}: Added.}
 % \changes{v0.40}{2017/09/09}{\pkg{bigdelim}: Improved documentation.}
 % \changes{v0.57}{2018/06/01}{\pkg{bigdelim}: Improved print/\HTML\ output selection.}
+% \changes{v0.896}{2021/03/16}{\pkg{bigdelim}: Updated to v2.8.}
 %
 % \codehtml
 %
@@ -45717,23 +46257,23 @@ color:\LWR@origpound\LWR@tempcolor%
 %
 % Next, load the package's new definitions:
 %    \begin{macrocode}
-\LWR@ProvidesPackagePass{bigdelim}[2018/08/03]
+\LWR@ProvidesPackagePass{bigdelim}[2021/03/15]
 %    \end{macrocode}
 %
 %
-% \marg{1:delimiter} \marg{2:\#rows} \marg{3:width} \oarg{4:text}
+% \marg{1:delimiter} \marg{2:\#rows} \oarg{3: vmove} \marg{4:width} \oarg{5:text}
 % \marginpar{\hfill\cs{ldelim}}\marginpar{\hfill\cs{rdelim}}
 %    \begin{macrocode}
-\NewDocumentCommand{\LWR@HTML@ldelim}{m m m O{}}{%
+\NewDocumentCommand{\LWR@HTML@ldelim}{m m o m O{}}{%
 \renewcommand{\LWR@multirowborder}{right}%
-\multirow{#2}{#3}{#4 \InlineClass{ldelim}{#1}}%
+\multirow{#2}{#4}{#5 \InlineClass{ldelim}{#1}}%
 }
 
 \LWR@formatted{ldelim}
 
-\NewDocumentCommand{\LWR@HTML@rdelim}{m m m O{}}{%
+\NewDocumentCommand{\LWR@HTML@rdelim}{m m o m O{}}{%
 \renewcommand{\LWR@multirowborder}{left}%
-\multirow{#2}{#3}{\InlineClass{rdelim}{#1} #4}%
+\multirow{#2}{#4}{\InlineClass{rdelim}{#1} #5}%
 }
 
 \LWR@formatted{rdelim}
@@ -45744,12 +46284,14 @@ color:\LWR@origpound\LWR@tempcolor%
 % \changes{v0.79}{2020/01/20}{\pkg{bigdelim}: Added \brand{MathJax} emulation.}
 %    \begin{macrocode}
 \begin{warpMathJax}
-% \ldelim ( [n]{width}[text]
-\CustomizeMathJax{\newcommand{\LWRldelim}[1][]{\text{#1}~\LWRbigdelim}}
-\CustomizeMathJax{\def\ldelim#1#2#3{\def\LWRbigdelim{#1}\LWRldelim}}
-% \rdelim ) [n]{width}[text]
-\CustomizeMathJax{\newcommand{\LWRrdelim}[1][]{\LWRbigdelim~\text{#1}}}
-\CustomizeMathJax{\def\rdelim#1#2#3{\def\LWRbigdelim{#1}\LWRrdelim}}
+% \ldelim ( {n}{width}[text]
+\CustomizeMathJax{\newcommand{\LWRldelimtwo}[1][]{\text{#1}~\LWRbigdelim}}
+\CustomizeMathJax{\newcommand{\LWRldelimone}[2][]{\LWRldelimtwo}}
+\CustomizeMathJax{\def\ldelim#1#2{\def\LWRbigdelim{#1}\LWRldelimone}}
+% \rdelim ) {n}{width}[text]
+\CustomizeMathJax{\newcommand{\LWRrdelimtwo}[1][]{\LWRbigdelim~\text{#1}}}
+\CustomizeMathJax{\newcommand{\LWRrdelimone}[2][]{\LWRrdelimtwo}}
+\CustomizeMathJax{\def\rdelim#1#2{\def\LWRbigdelim{#1}\LWRrdelimone}}
 \end{warpMathJax}
 %    \end{macrocode}
 %
@@ -47199,6 +47741,55 @@ s%
 %
 %
 %
+%
+% \iffalse
+%<*ccicons>
+% \fi
+%
+% \part{lwarp-ccicons.sty}
+%
+% \section{ccicons}
+%
+% \credits{Michael Ummels}
+%
+% \DescribePackage{ccicons} \pkg{ccicons} is used as \SVG\ images for \HTML.
+%
+% \changes{v0.896}{2021/03/15}{\pkg{ccicons}: Added.}
+%
+% \codehtml
+%
+% Discard all options for \pkg{lwarp-ccicons}:
+%    \begin{macrocode}
+\LWR@ProvidesPackagePass{ccicons}[2017/10/30]
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+\newcommand{\LWR@ccicons}[2]{%
+    {\begin{lateximage}*[#1]\ccicons@font\char#2\end{lateximage}}
+}
+\renewcommand{\ccicons@logo}{\LWR@ccicons{ccLogo}{0}}
+\renewcommand{\ccicons@by}{\LWR@ccicons{ccAttribution}{1}}
+\renewcommand{\ccicons@sa}{\LWR@ccicons{ccShareAlike}{2}}
+\renewcommand{\ccicons@nd}{\LWR@ccicons{ccNoDerivatives}{3}}
+\renewcommand{\ccicons@nc}{\LWR@ccicons{ccNonCommercial}{4}}
+\renewcommand{\ccicons@nceu}{\LWR@ccicons{ccNonCommercialEU}{5}}
+\renewcommand{\ccicons@ncjp}{\LWR@ccicons{ccNonCommercialJP}{6}}
+\renewcommand{\ccicons@pd}{\LWR@ccicons{ccPublicDomain}{7}}
+\renewcommand{\ccicons@zero}{\LWR@ccicons{ccZero}{8}}
+\renewcommand{\ccicons@sampling}{\LWR@ccicons{ccSampling}{9}}
+\renewcommand{\ccicons@share}{\LWR@ccicons{ccShare}{10}}
+\renewcommand{\ccicons@remix}{\LWR@ccicons{ccRemix}{11}}
+\renewcommand{\ccicons@copy}{\LWR@ccicons{ccCopy}{12}}
+\renewcommand{\ccicons@pdalt}{\LWR@ccicons{ccPublicDomainAlt}{13}}
+%    \end{macrocode}
+%
+% \iffalse
+%</ccicons>
+% \fi
+%
+%
+%
+%
 % \iffalse
 %<*centernot>
 % \fi
@@ -47772,15 +48363,15 @@ test {\ifnumgreater{\csuse{Changes@In########1}}{0}}%
 % \changes{v0.51}{2018/03/04}{\pkg{chemfig}: Added.}
 % \changes{v0.71}{2019/04/25}{\pkg{chemfig}: Updated to v1.4.}
 % \changes{v0.82}{2020/03/12}{\pkg{chemfig}: Updated to v1.5.}
+% \changes{v0.896}{2021/03/04}{\pkg{chemfig}: Updated to v1.6a.}
 %
 % \codehtml
 %
 %    \begin{macrocode}
-\LWR@ProvidesPackagePass{chemfig}[2020/03/05]
+\LWR@ProvidesPackagePass{chemfig}[2021/02/28]
 %    \end{macrocode}
 
 %    \begin{macrocode}
-
 \catcode`\_=11
 
 \@ifpackagelater{chemfig}{2020/03/05}
@@ -47795,15 +48386,17 @@ test {\ifnumgreater{\csuse{Changes@In########1}}{0}}%
 
 \@ifpackagelater{chemfig}{2019/04/18}%
 {% 2019/04/18 or newer
+%    \end{macrocode}
+% \changes{v0.896}{2021/03/04}{\pkg{chemfig}: Updated to v1.6a.}
+%    \begin{macrocode}
+    \xpretocmd{\CF_chemfiga}
+        {\begin{lateximage}[-chemfig-~\PackageDiagramAltText]}
+        {}{\LWR@patcherror{chemfig}{CF_chemfiga}}
 
-
-    \LetLtxMacro\LWR@chemfig@origchemfig\chemfig
-
-    \renewcommand*{\chemfig}[2][]{%
-        \begin{lateximage}[-chemfig-~\PackageDiagramAltText]%
-        \LWR@chemfig@origchemfig[#1]{#2}%
-        \end{lateximage}%
-    }
+    \xpatchcmd{\CF_chemfigb}
+        {\let\CF_flipstate\CF_zero}
+        {\end{lateximage}\let\CF_flipstate\CF_zero}
+        {}{\LWR@patcherror{chemfig}{CF_chemfigb}}
 
     \GlobalLetLtxMacro\LWR@chemfig@origCF_lewisc\CF_lewisc
     \gdef\CF_lewisc#1,#2\_nil{%
@@ -49520,6 +50113,7 @@ name = \chemmacros_translate:n {scheme-name}
 % \pkg{citeref} is patched for use by \pkg{lwarp}.
 %
 % \changes{v0.87}{2020/05/16}{\pkg{citeref}: Added.}
+% \changes{v0.896}{2021/04/05}{\pkg{citeref}: Improved refs: \cs{ref} to \cs{LWR@refwithsection}.}
 %
 % \codehtml
 %
@@ -49528,7 +50122,9 @@ name = \chemmacros_translate:n {scheme-name}
 %    \end{macrocode}
 %
 %    \begin{macrocode}
-\def\@cprwrite#1={\write\@auxout{\string\citepageref{#1}{\theLWR@currentautosec}}}
+\def\@cprwrite#1={%
+    \write\@auxout{\string\citepageref{#1}{\theLWR@previousautopagelabel}}%
+}
 
 \def\citepageref#1#2{%
     \xdef\cpr@testa{\@nameuse{cpr@last@#1}}%letzte Zitatstelle
@@ -49538,8 +50134,11 @@ name = \chemmacros_translate:n {scheme-name}
     \else%
         \@namexdef{cpr@last@#1}{#2}%
         \@ifundefined{cpr@#1}%
-            {\@namexdef{cpr@#1}{\ref{\BaseJobname-autopage-#2}}}%   lwarp
-            {\@namexdef{cpr@#1}{\@nameuse{cpr@#1}, \ref{\BaseJobname-autopage-#2}}}%    lwarp
+            {\@namexdef{cpr@#1}{\LWR@refwithsection{\BaseJobname-autopage-#2}}}%   lwarp
+            {%      lwarp
+                \@namexdef{cpr@#1}{\@nameuse{cpr@#1}, % space
+                \LWR@refwithsection{\BaseJobname-autopage-#2}}%
+            }%
     \fi
     }
 %    \end{macrocode}
@@ -49607,6 +50206,54 @@ name = \chemmacros_translate:n {scheme-name}
 %
 %
 %
+% \iffalse
+%<*classicthesis>
+% \fi
+%
+% \part{lwarp-classicthesis.sty}
+%
+% \section{classicthesis}
+%
+% \credits{André Miede and Ivo Pletikosić}
+%
+% \DescribePackage{classicthesis} \pkg{classicthesis} is emulated.
+%
+% \changes{v0.896}{2021/03/15}{\pkg{classicthesis}: Added.}
+%
+% \codehtml
+%
+% Discard all options for \pkg{lwarp-classicthesis}:
+%    \begin{macrocode}
+\LWR@ProvidesPackageDrop{classicthesis}[2018/06/03]
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+\RequirePackage{scrlayer-scrpage} % provides headers and footers (KOMA Script)
+\RequirePackage{scrtime} % time access
+\PassOptionsToPackage{titles}{tocloft}
+\RequirePackage{textcase} % for \MakeTextUppercase
+\RequirePackage[newparttoc]{titlesec} % newparttoc to write \part to .toc with \numberline
+\RequirePackage{tocloft}
+\PassOptionsToPackage{headinclude,footinclude}{typearea} % for classes other than KOMA
+\RequirePackage{typearea}
+\PassOptionsToPackage{marginal}{footmisc}% marginal flushmargin
+\RequirePackage{footmisc}%
+\RequirePackage{prelim2e}
+\RequirePackage{remreset}%
+
+\DeclareRobustCommand{\spacedallcaps}[1]{\textsc{\MakeTextUppercase{#1}}}
+\DeclareRobustCommand{\spacedlowsmallcaps}[1]{\textsc{\MakeTextLowercase{#1}}}
+\newcommand{\ctparttext}[1]{}
+\newcommand{\tocEntry}[1]{}
+\DeclareRobustCommand*{\deactivateaddvspace}{}%
+\newlength{\beforebibskip}
+%    \end{macrocode}
+%
+% \iffalse
+%</classicthesis>
+% \fi
+%
+%
 %
 % \iffalse
 %<*cleveref>
@@ -49814,6 +50461,30 @@ name = \chemmacros_translate:n {scheme-name}
 %    \end{macrocode}
 %
 %
+% \changes{v0.896}{2021/04/07}{\pkg{cleveref}: Undo \pkg{memoir} changes.}
+%    \begin{macrocode}
+\@ifclassloaded{memoir}{
+\AtBeginDocument{
+\def\sf@memsub@label(#1)#2{%
+  \protected@edef\mem@currentlabelname{#1}%
+  \sf@@memsub@label{#2}}
+}
+}{}
+%    \end{macrocode}
+%
+% \changes{v0.896}{2021/04/07}{\pkg{cleveref}: Undo \pkg{subfig} changes.}
+%    \begin{macrocode}
+\@ifpackageloaded{subfig}{
+\def\sf@sub@label(#1)#2{%
+  \ifhyperrefloaded
+    \protected@edef\@currentlabelname{%
+      \expandafter\strip@period #1\relax.\relax\@@@}%
+  \fi
+  \sf@@sub@label{#2}}
+}{}
+%    \end{macrocode}
+%
+%
 % ^^A % For \brand{MathJax} and \pkg{cleveref},
 % ^^A % but not \pkg{varioref} since \pkg{varioref} macros would only
 % ^^A % be useful in math inside a \cs{text} macro, where they do not
@@ -52069,6 +52740,156 @@ name = \chemmacros_translate:n {scheme-name}
 %
 %
 %
+% \iffalse
+%<*enotez>
+% \fi
+%
+% \part{lwarp-enotez.sty}
+%
+% \section{enotez}
+%
+% \credits{Clemens Niederberger}
+%
+% \DescribePackage{enotez}
+% \pkg{enotez} is patched for use by \pkg{lwarp}.
+%
+% \changes{v0.896}{2021/04/07}{\pkg{enotez}: Added.}
+%
+% \codehtml
+%
+%    \begin{macrocode}
+\LWR@ProvidesPackagePass{enotez}[2020/12/13]
+%    \end{macrocode}
+%
+% Hyperref is emulated by \pkg{lwarp}, so it is forced on for \pkg{enotez}:
+%    \begin{macrocode}
+\ExplSyntaxOn
+\AtBeginDocument{
+    \bool_set_true:N \l__enotez_hyperref_bool
+    \bool_set_true:N \l__enotez_hyperfootnotes_bool
+}
+%    \end{macrocode}
+%
+% Do not move or \cs{hbox} the \cs{hypertarget}:
+%    \begin{macrocode}
+% typeset the actual mark:
+% #1: id
+% #2: mark
+\cs_gset_protected:Npn \enotez_write_mark:nn #1#2
+  {
+    \bool_if:NTF \l__enotez_hyperfootnotes_bool
+      {
+        \enotezwritemark { \hyperlink {enz.#1} { \enmarkstyle #2 } }
+        \bool_if:NT \l__enotez_hyperbackref_bool
+          {
+%             \box_move_up:nn {1em} { 
+%                 \hbox:n {
+                    \hypertarget {enz.#1.backref} { }
+%                 }
+%             }
+          }
+      }
+      { \enotezwritemark { \enmarkstyle #2 } }
+  }
+\cs_generate_variant:Nn \enotez_write_mark:nn {x}
+%    \end{macrocode}
+%
+% Do not move or \cs{hbox} the \cs{hypertarget}:
+%    \begin{macrocode}
+\cs_gset_protected:Npn \enotez_write_list_number:n #1
+  {
+    \bool_if:NT \l__enotez_hyperfootnotes_bool
+      {
+%         \box_move_up:nn {1em} { \hbox:n {
+            \hypertarget {enz.#1} { }
+%         } }
+      }
+    \tl_use:N \l__enotez_list_number_format_tl
+    \tl_if_eq:nxTF {a} { \prop_item:Nn \g__enotez_endnote_man_prop {#1} }
+      {
+        \bool_if:nTF
+          { \l__enotez_hyperfootnotes_bool && \l__enotez_hyperbackref_bool }
+          {
+            \exp_args:Nnx
+            \hyperlink {enz.#1.backref}
+              { \exp_not:V \l__enotez_endnote_mark_tl }
+          }
+          { \prop_item:Nn \g__enotez_endnote_mark_prop {#1} }
+      }
+      {
+        \bool_if:nTF
+          { \l__enotez_hyperfootnotes_bool && \l__enotez_hyperbackref_bool }
+          {
+            \exp_args:Nnx
+            \hyperlink {enz.#1.backref}
+              { \exp_not:V \l__enotez_endnote_mark_tl }
+          }
+          { \tl_use:N \l__enotez_endnote_mark_tl }
+      }
+  }
+%    \end{macrocode}
+%
+% Do not move the label to the left:
+%    \begin{macrocode}
+\DeclareTemplateCode {enotez-list} {paragraph} {1}
+  {
+    heading       = \enotez_list_heading:n           ,
+    format        = \l__enotez_list_format_tl        ,
+    number        = \enotez_list_number:n            ,
+    number-format = \l__enotez_list_number_format_tl ,
+    notes-sep     = \l__enotez_list_notes_sep_dim
+  }
+  {
+    \AssignTemplateKeys
+    \enotez_set_totoc:
+    \enotez_list_heading:n { \l__enotez_list_name_tl }
+    \enotez_list_preamble:
+    \enotez_build_print_list:nnnn {#1}
+      {}
+      {
+        \par\noindent
+        \group_begin:
+          \tl_use:N \l__enotez_list_format_tl
+%           \hbox_overlap_left:n
+%             {
+              \enotez_list_number:n
+                { \enotez_write_list_number:n {##1} }
+              \tl_use:N \c_space_tl
+%             }
+          % \cs_set:cpn {@currentlabel}
+          %   { \p@endnote \l__enotez_endnote_mark_tl }
+          \tl_use:N \g__enotez_endnote_text_tl
+          \par
+          \dim_compare:nT { \l__enotez_list_notes_sep_dim != 0pt }
+            { \addvspace { \l__enotez_list_notes_sep_dim } }
+        \group_end:
+      }
+      {}
+    \enotez_list_postamble:
+  }
+
+\ExplSyntaxOff
+%    \end{macrocode}
+%
+% For \brand{MathJax}:
+%    \begin{macrocode}
+\begin{warpMathJax}
+\def\endnotename{endnote}
+\appto\LWR@syncnotenumbers{\LWR@synconenotenumber{LWRendnote}{\theendnote}}
+\appto\LWR@syncnotenames{\LWR@synconenotename{LWRendnote}{\endnotename}}
+\CustomizeMathJax{\def\LWRendnote{1}}
+\CustomizeMathJax{\newcommand{\endnote}[2][\LWRendnote]{{}^{\mathrm{#1}}}}
+\CustomizeMathJax{\newcommand{\endnotemark}[1][\LWRendnote]{{}^{\mathrm{#1}}}}
+\end{warpMathJax}
+%    \end{macrocode}
+
+%
+% \iffalse
+%</enotez>
+% \fi
+%
+%
+%
 %
 % \iffalse
 %<*enumerate>
@@ -52204,17 +53025,18 @@ name = \chemmacros_translate:n {scheme-name}
 %    \end{macrocode}
 
 % \changes{v0.47}{2018/01/26}{\pkg{epigraph}: Fix: Line wrap at \HTML\ hyphen.}
+% \changes{v0.896}{2021/03/05}\pkg{epigraph}: {Added \ARIA\ role.}
 %    \begin{macrocode}
 \DeclareDocumentCommand{\LWR@HTML@epigraph}{m m}
 {%
-    \begin{LWR@BlockClassWP}{\LWR@print@mbox{text-align:right}}{}{epigraph}%
+    \begin{LWR@BlockClassWP}{\LWR@print@mbox{text-align:right}}{}(note){epigraph}%
     \qitem{#1}{#2}%
     \end{LWR@BlockClassWP}%
 }
 \LWR@formatted{epigraph}
 
 \DeclareDocumentEnvironment{LWR@HTML@epigraphs}{}
-    {\LWR@BlockClassWP{\LWR@print@mbox{text-align:right}}{}{epigraph}}
+    {\LWR@BlockClassWP{\LWR@print@mbox{text-align:right}}{}(note){epigraph}}%
     {\endLWR@BlockClassWP}
 \LWR@formattedenv{epigraphs}
 %    \end{macrocode}
@@ -53131,9 +53953,20 @@ name = \chemmacros_translate:n {scheme-name}
 % \begin{noindmacro}{\V@@footnotetext}
 % Patches in a subset of \pkg{lwarp}'s \cs{LWR@footnotetext} to the
 % \pkg{fancyvrb} version of \cs{V@@footnotetext}.
+% \changes{v0.896}{2021/04/04}{Fix: \ctr{autopage} references in footnotes.}
 %    \begin{macrocode}
 \def\V@@footnotetext{%
 \LWR@traceinfo{V@footnotetext}%
+%    \end{macrocode}
+%
+% Place an autopage marker so that back references to citations inside
+% a footnote will link closer to the footnote text, if possible.
+%    \begin{macrocode}
+\LWR@newautopagelabel{page}%
+%    \end{macrocode}
+%
+% Take the current footnote box, then append:
+%    \begin{macrocode}
 \global\setbox\LWR@footnotebox=\vbox\bgroup%
 %    \end{macrocode}
 % Add to any current footnotes:
@@ -53168,6 +54001,14 @@ name = \chemmacros_translate:n {scheme-name}
 %    \begin{macrocode}
   \bgroup%
   \aftergroup{\V@@@footnotetext}%
+%    \end{macrocode}
+%
+% Do not generate autopages inside the footnotes, since they are
+% accumulated at the moment before finally being used perhaps on a later page.
+%    \begin{macrocode}
+    \let\LWR@newautopagelabel\LWR@null@newautopagelabel%
+%    \end{macrocode}
+%    \begin{macrocode}
   \ignorespaces%
 }%
 %    \end{macrocode}
@@ -53581,9 +54422,20 @@ name = \chemmacros_translate:n {scheme-name}
 % \begin{noindmacro}{\V@@footnotetext}
 % Patches in a subset of \pkg{lwarp}'s \cs{LWR@footnotetext} to the
 % \pkg{fancyvrb} version of \cs{V@@footnotetext}.
+% \changes{v0.896}{2021/04/04}{Fix: \ctr{autopage} references in footnotes.}
 %    \begin{macrocode}
 \def\V@@footnotetext{%
 \LWR@traceinfo{V@footnotetext}%
+%    \end{macrocode}
+%
+% Place an autopage marker so that back references to citations inside
+% a footnote will link closer to the footnote text, if possible.
+%    \begin{macrocode}
+\LWR@newautopagelabel{page}%
+%    \end{macrocode}
+%
+% Take the current footnote box, then append:
+%    \begin{macrocode}
 \global\setbox\LWR@footnotebox=\vbox\bgroup%
 %    \end{macrocode}
 % Add to any current footnotes:
@@ -53618,6 +54470,14 @@ name = \chemmacros_translate:n {scheme-name}
 %    \begin{macrocode}
   \bgroup%
   \aftergroup{\V@@@footnotetext}%
+%    \end{macrocode}
+%
+% Do not generate autopages inside the footnotes, since they are
+% accumulated at the moment before finally being used perhaps on a later page.
+%    \begin{macrocode}
+    \let\LWR@newautopagelabel\LWR@null@newautopagelabel%
+%    \end{macrocode}
+%    \begin{macrocode}
   \ignorespaces%
 }%
 %    \end{macrocode}
@@ -54366,7 +55226,7 @@ solid {\FancyVerbRuleColor{\LWR@origpound\LWR@tempcolor}} ; % space
 
 \renewcommand{\l@fixme}[2]{%
     \hypertocfloat{1}{fixme}{lox}%
-        {\LWR@nameref{\BaseJobname-autopage-\arabic{LWR@nextautopage}} --- #1}
+        {\LWR@nameref{\BaseJobname-autopage-\arabic{LWR@nextautopage}} --- #1}%
         {#2}
 }
 %    \end{macrocode}
@@ -54682,6 +55542,7 @@ solid {\FancyVerbRuleColor{\LWR@origpound\LWR@tempcolor}} ; % space
 % Borrowed from the \pkg{lwarp} version of \pkg{keyfloat}:
 % \changes{v0.42}{2017/10/26}{\pkg{floatflt}: Added width.}
 % \changes{v0.79}{2020/01/08}{\pkg{floatflt}: Improved width control.}
+% \changes{v0.896}{2021/03/05}{\pkg{floatflt}: Added \ARIA\ role.}
 %    \begin{macrocode}
 \NewDocumentEnvironment{KFLTfloatflt@marginfloat}{O{-1.2ex} m m}
 {%
@@ -54692,6 +55553,7 @@ solid {\FancyVerbRuleColor{\LWR@origpound\LWR@tempcolor}} ; % space
             width: 1.5in; % reasonable dummy width for word processor
             margin:10pt%
         }{}%
+        (note)%
         {marginblock}%
     }{%
         \setlength{\LWR@templengthone}{#3}%
@@ -54702,6 +55564,7 @@ solid {\FancyVerbRuleColor{\LWR@origpound\LWR@tempcolor}} ; % space
         }{%
             width:\LWR@printlength{\LWR@templengthone}%
         }%
+        (note)%
         {marginblock}%
     }%
     \renewcommand*{\@captype}{#2}%
@@ -59061,9 +59924,12 @@ do not attempt to patch lwarp's version of `hyperref'.)\MessageBreak}
 % \changes{v0.52}{2018/03/26}{\pkg{hyperref}: Fix: \progcode{\#}, \progcode{\%}, \progcode{\&}, \progcode{\~}, \progcode{\_} in \URL.}
 % \changes{v0.54}{2018/04/19}{\pkg{hyperref}: Fix: \cs{ref} in \cs{hyperref} and \cs{hyperlink} caused nested link.}
 % \changes{v0.54}{2018/04/19}{\pkg{hyperref}: Fix: \cs{hyperref} and \cs{hyperlink} with special chars in text.}
+% \changes{v0.896}{2021/04/07}{\pkg{hyperref}: Fix: No \cs{hyperlink} in \HTML\ comment.}
 %    \begin{macrocode}
 \DeclareDocumentCommand{\LWR@hyperlinkb}{m}{%
-    \LWR@hyperrefcb[LWR-ht-#1]%
+    \ifbool{LWR@insidemathcomment}%
+        {\endgroup}%
+        {\LWR@hyperrefcb[LWR-ht-#1]}%
 }
 
 \DeclareDocumentCommand{\hyperlink}{}{%
@@ -59099,6 +59965,27 @@ do not attempt to patch lwarp's version of `hyperref'.)\MessageBreak}
 %    \end{macrocode}
 % \end{noindmacro}
 
+% Default names:
+% \changes{v0.896}{2021/03/13}{\pkg{hyperref}: Fix: Added \cs{*autorefname} macros.}
+%    \begin{macrocode}
+\def\equationautorefname{Equation}%
+\def\footnoteautorefname{footnote}%
+\def\itemautorefname{item}%
+\def\figureautorefname{Figure}%
+\def\tableautorefname{Table}%
+\def\partautorefname{Part}%
+\def\appendixautorefname{Appendix}%
+\def\chapterautorefname{chapter}%
+\def\sectionautorefname{section}%
+\def\subsectionautorefname{subsection}%
+\def\subsubsectionautorefname{subsubsection}%
+\def\paragraphautorefname{paragraph}%
+\def\subparagraphautorefname{subparagraph}%
+\def\FancyVerbLineautorefname{line}%
+\def\theoremautorefname{Theorem}%
+\def\pageautorefname{page}%
+%    \end{macrocode}
+
 
 
 % \begin{noindmacro}{\pdfstringdef} \marg{macroname} \marg{\TeX{}string}
@@ -59321,12 +60208,59 @@ do not attempt to patch lwarp's version of `hyperref'.)\MessageBreak}
 % \DescribePackage{hyperxmp} \pkg{hyperxmp} is ignored.
 %
 % \changes{v0.34}{2017/08/03}{\pkg{hyperxmp}: Added.}
+% \changes{v0.896}{2021/03/13}{\pkg{hyperxmp}: Added keys.}
 %
 % \codehtml
 %
 % Discard all options for \pkg{lwarp-hyperxmp}:
 %    \begin{macrocode}
 \LWR@ProvidesPackageDrop{hyperxmp}[2018/11/27]
+
+\define@key{LWR@hyperref}{pdfdate}[]{}
+\define@key{LWR@hyperref}{pdfmetadate}[]{}
+\define@key{LWR@hyperref}{pdfcopyright}[]{}
+\define@key{LWR@hyperref}{pdftype}[]{}
+\define@key{LWR@hyperref}{pdflicenseurl}[]{}
+\define@key{LWR@hyperref}{pdfauthortitle}[]{}
+\define@key{LWR@hyperref}{pdfcaptionwriter}[]{}
+\define@key{LWR@hyperref}{pdfmetalang}[]{}
+\define@key{LWR@hyperref}{pdfapart}[]{}
+\define@key{LWR@hyperref}{pdfaconformance}[]{}
+\define@key{LWR@hyperref}{pdfuapart}[]{}
+\define@key{LWR@hyperref}{pdfxstandard}[]{}
+\define@key{LWR@hyperref}{pdfsource}[]{}
+\define@key{LWR@hyperref}{pdfdocumentid}[]{}
+\define@key{LWR@hyperref}{pdfinstanceid}[]{}
+\define@key{LWR@hyperref}{pdfversionid}[]{}
+\define@key{LWR@hyperref}{pdfrendition}[]{}
+\define@key{LWR@hyperref}{pdfpublication}[]{}
+\define@key{LWR@hyperref}{pdfpubtype}[]{}
+\define@key{LWR@hyperref}{pdfbytes}[]{}
+\define@key{LWR@hyperref}{pdfnumpages}[]{}
+\define@key{LWR@hyperref}{pdfissn}[]{}
+\define@key{LWR@hyperref}{pdfeissn}[]{}
+\define@key{LWR@hyperref}{pdfisbn}[]{}
+\define@key{LWR@hyperref}{pdfbookedition}[]{}
+\define@key{LWR@hyperref}{pdfpublisher}[]{}
+\define@key{LWR@hyperref}{pdfvolumenum}[]{}
+\define@key{LWR@hyperref}{pdfissuenum}[]{}
+\define@key{LWR@hyperref}{pdfpagerange}[]{}
+\define@key{LWR@hyperref}{pdfdoi}[]{}
+\define@key{LWR@hyperref}{pdfurl}[]{}
+\define@key{LWR@hyperref}{pdfidentifier}[]{}
+\define@key{LWR@hyperref}{pdfsubtitle}[]{}
+\define@key{LWR@hyperref}{pdfpubstatus}[]{}
+\define@key{LWR@hyperref}{pdfcontactaddress}[]{}
+\define@key{LWR@hyperref}{pdfcontactcity}[]{}
+\define@key{LWR@hyperref}{pdfcontactregion}[]{}
+\define@key{LWR@hyperref}{pdfcontactpostcode}[]{}
+\define@key{LWR@hyperref}{pdfcontactcountry}[]{}
+\define@key{LWR@hyperref}{pdfcontactphone}[]{}
+\define@key{LWR@hyperref}{pdfcontactemail}[]{}
+\define@key{LWR@hyperref}{pdfcontacturl}[]{}
+\define@key{LWR@hyperref}{keeppdfinfo}[]{}
+\define@key{LWR@hyperref}{pdfauthor}[]{}
+\define@key{LWR@hyperref}{pdfkeywords}[]{}
 %    \end{macrocode}
 %
 %
@@ -60674,6 +61608,7 @@ do not attempt to patch lwarp's version of `hyperref'.)\MessageBreak}
 
 % \begin{noindenvironment}{KFLT@marginfloat} \oarg{offset} \marg{type}
 % \changes{v0.42}{2017/10/26}{\pkg{keyfloat}: If \progcode{FormatWP} add explicit \HTML\ style.}
+% \changes{v0.896}{2021/03/05}{\pkg{keyfloat}: Added \ARIA\ role.}
 %    \begin{macrocode}
 \DeclareDocumentEnvironment{KFLT@marginfloat}{O{-1.2ex} m}
 {%
@@ -60681,6 +61616,7 @@ do not attempt to patch lwarp's version of `hyperref'.)\MessageBreak}
     \LWR@BlockClassWP%
         {float:right; width:2in; margin:10pt}%
         {}%
+        (note)%
         {marginblock}%
     \renewcommand*{\@captype}{#2}%
     \minipage{\LWR@usersmarginparwidth}%
@@ -60706,7 +61642,8 @@ do not attempt to patch lwarp's version of `hyperref'.)\MessageBreak}
 
 
 % \begin{noindenvironment}{keywrap} \marg{width} \marg{keyfloat}
-% \changes{v0.79}{2020/01/10}{Factored to \cs{LWR@setvirtualpage}.}
+% \changes{v0.79}{2020/01/10}{\pkg{keyfloat}: Factored to \cs{LWR@setvirtualpage}.}
+% \changes{v0.896}{2021/03/05}{\pkg{keyfloat}: Added \ARIA\ role.}
 % ^^A % Modified to vertically align minipage for \HTML\ output:
 %    \begin{macrocode}
 \DeclareDocumentEnvironment{keywrap}{m +m}
@@ -60719,6 +61656,7 @@ do not attempt to patch lwarp's version of `hyperref'.)\MessageBreak}
             margin:10pt%
         }%
         {}%
+        (note)%
         {marginblock}%
     \setlength{\linewidth}{.95\LWR@templengthone}%
     \booltrue{KFLT@keywrap}%
@@ -62016,7 +62954,7 @@ do not attempt to patch lwarp's version of `hyperref'.)\MessageBreak}
 %
 % \DescribePackage{listings}
 % \pkg{listings} is supported with some limitations.
-% Text formatting is not yet supported.
+% Text formatting and escape characters are not yet supported.
 %
 % \changes{v0.20}{2017/01/01}{\pkg{listings}: Added.}
 %
@@ -62084,7 +63022,6 @@ do not attempt to patch lwarp's version of `hyperref'.)\MessageBreak}
 %    \end{macrocode}
 % \end{noindmacro}
 %
-%
 % \begin{noindmacro}{\lst@Init} \marg{backslash-processing} \quad
 % Done at the start of a listing.
 %    \begin{macrocode}
@@ -62102,29 +63039,113 @@ do not attempt to patch lwarp's version of `hyperref'.)\MessageBreak}
 % with paragraph handling and conditionals.
 % \changes{v0.891}{2020/09/16}{\pkg{listings}: Fix for \brand{MathJax}: Moved \cs{LWR@forcenewpage} to start.}
 %    \begin{macrocode}
-\lst@ifdisplaystyle%
-    \LWR@forcenewpage%
-\fi%
-\renewcommand*{\@captype}{lstlisting}%
-\let\lst@aboveskip\z@\let\lst@belowskip\z@%
-\gdef\lst@boxpos{t}%
-\let\lst@frame\@empty
-    \let\lst@frametshape\@empty
-    \let\lst@framershape\@empty
-    \let\lst@framebshape\@empty
-    \let\lst@framelshape\@empty
-\lstframe@\lst@frameround ffff\relax%
-\lst@multicols\@empty%
-\LWR@origlst@Init{#1}\relax%
+\lst@ifdisplaystyle%        lwarp
+    \LWR@forcenewpage%      lwarp
+\fi%                        lwarp
+%    \end{macrocode}
+%
+% Escapes do not work yet, and are disabled:
+% \changes{v0.896}{2021/03/14}{\pkg{listings}: Escapes accepted but disabled.}
+%    \begin{macrocode}
+\let\lst@ifmathescape\iffalse%      lwarp
+\let\lst@DefEsc\relax%              lwarp
+\def\lst@escapebegin{}%             lwarp
+\def\lst@escapeend{}%               lwarp
+%    \end{macrocode}
+%    \begin{macrocode}
+\renewcommand*{\@captype}{lstlisting}%      lwarp
+    \let\lst@aboveskip\z@\let\lst@belowskip\z@%     lwarp
+    \gdef\lst@boxpos{t}%            lwarp
+    \let\lst@frame\@empty%          lwarp
+    \let\lst@frametshape\@empty%    lwarp
+    \let\lst@framershape\@empty%    lwarp
+    \let\lst@framebshape\@empty%    lwarp
+    \let\lst@framelshape\@empty%    lwarp
+    \lstframe@\lst@frameround ffff\relax%   lwarp
+    \lst@multicols\@empty%  lwarp
+    \begingroup%
+    \ifx\lst@float\relax\else%
+        \edef\@tempa{\noexpand\lst@beginfloat{lstlisting}[\lst@float]}%
+        \expandafter\@tempa%
+    \fi%
+    \ifx\lst@multicols\@empty\else%
+        \edef\lst@next{\noexpand\multicols{\lst@multicols}}%
+        \expandafter\lst@next%
+    \fi%
+    \ifhmode\ifinner \lst@boxtrue \fi\fi%
+    \lst@ifbox%
+        \lsthk@BoxUnsafe%
+        \hbox to\z@\bgroup%
+             $\if t\lst@boxpos \vtop%
+        \else \if b\lst@boxpos \vbox%
+        \else \vcenter \fi\fi%
+        \bgroup \par\noindent%
+    \else%
+        \lst@ifdisplaystyle%
+            \lst@EveryDisplay%
+            \par\penalty-50\relax%
+            \vspace\lst@aboveskip%
+        \fi%
+    \fi%
+    \normalbaselines%
+    \abovecaptionskip\lst@abovecaption\relax%
+    \belowcaptionskip\lst@belowcaption\relax%
+    \lst@MakeCaption t%
+%    \end{macrocode}
+%
+% Use the overall listing label instead of the line number label:
+% \changes{v0.896}{2021/03/14}{\pkg{listings}: Fix: Labels.}
+%    \begin{macrocode}
+\LWR@traceinfo{lst@Init: defining current label !\@currentlabel!}%
+    \let\LWR@listings@currentlabel\@currentlabel%            lwarp
+\LWR@traceinfo{lst@Init: defining current label !\cref@currentlabel!}%
+    \let\LWR@listings@cref@currentlabel\cref@currentlabel%   lwarp
+%    \end{macrocode}
+%    \begin{macrocode}
+\LWR@traceinfo{lst@Init: preinit and init}%
+    \lsthk@PreInit \lsthk@Init%
+%    \end{macrocode}
+%    \begin{macrocode}
+    \let\@currentlabel\LWR@listings@currentlabel%            lwarp
+    \let\cref@currentlabel\LWR@listings@cref@currentlabel%   lwarp
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+\LWR@traceinfo{lst@Init: M}%
+    \lst@ifdisplaystyle
+        \global\let\lst@ltxlabel\@empty
+        \if@inlabel
+            \lst@ifresetmargins
+                \leavevmode
+            \else
+                \xdef\lst@ltxlabel{\the\everypar}%
+                \lst@AddTo\lst@ltxlabel{%
+                    \global\let\lst@ltxlabel\@empty
+                    \everypar{\lsthk@EveryLine\lsthk@EveryPar}}%
+            \fi
+        \fi
+        \everypar\expandafter{\lst@ltxlabel
+                              \lsthk@EveryLine\lsthk@EveryPar}%
+    \else
+        \everypar{}
+        \let\lst@NewLine\@empty
+    \fi
+\LWR@traceinfo{lst@Init: P}%
+    \lsthk@InitVars \lsthk@InitVarsBOL
+    \lst@Let{13}\lst@MProcessListing
+    \let\lst@Backslash#1%
+    \lst@EnterMode{\lst@Pmode}{\lst@SelectCharTable}%
+    \lst@InitFinalize%
+\LWR@traceinfo{lst@Init: S}%
 %    \end{macrocode}
 % Avoids extra horizontal space:
 % \changes{v0.60}{2018/09/12}{\pkg{listings}: Fix if inside a list.}
 %    \begin{macrocode}
-\def\lst@framelr{}%
+\def\lst@framelr{}%     lwarp
 %    \end{macrocode}
 %    \begin{macrocode}
-\LWR@traceinfo{finished origlst@Init}%
-\lst@ifdisplaystyle%
+\LWR@traceinfo{lst@Init: finished origlst@Init}%
+\lst@ifdisplaystyle%    lwarp
 %    \end{macrocode}
 % Creating a display.
 %
@@ -62132,26 +63153,25 @@ do not attempt to patch lwarp's version of `hyperref'.)\MessageBreak}
 % produce the \element{pre}, then
 % reenable line numbers.
 %    \begin{macrocode}
-    \LWR@traceinfo{About to create verbatim.}%
-    \let\lsthk@EveryPar\relax%
+    \LWR@traceinfo{lst@Init: About to create verbatim.}%  lwarp
+    \let\lsthk@EveryPar\relax%                  lwarp
 %    \end{macrocode}
 % \changes{v0.891}{2020/09/16}{\pkg{listings}: Fix for \brand{MathJax}: Moved \cs{LWR@forcenewpage} to start.}
 %    \begin{macrocode}
-    \LWR@atbeginverbatim{programlisting}%
+    \LWR@atbeginverbatim{programlisting}%       lwarp
 
-    \let\lsthk@EveryPar\LWR@origlsthkEveryPar%
-\else%
+    \let\lsthk@EveryPar\LWR@origlsthkEveryPar%  lwarp
+\else%                                          lwarp
 %    \end{macrocode}
 % Inline, so open a \element{span}:
 % \changes{v0.895}{2021/01/14}{Improved \HTML\ quotes.}
 %    \begin{macrocode}
-    \ifbool{LWR@verbtags}{\LWR@htmltag{%
-        span class=\textquotedbl{}inlineprogramlisting\textquotedbl%
-    }}{}%
-\fi%
-\LWR@traceinfo{lst@Init done}%
+    \ifbool{LWR@verbtags}{\LWR@htmltag{%        lwarp
+        span class=\textquotedbl{}inlineprogramlisting\textquotedbl%    lwarp
+    }}{}%                                       lwarp
+\fi%                                            lwarp
+\LWR@traceinfo{lst@Init: done}%
 }
-
 %    \end{macrocode}
 % \end{noindmacro}
 %
@@ -62159,27 +63179,57 @@ do not attempt to patch lwarp's version of `hyperref'.)\MessageBreak}
 % \begin{noindmacro}{\lst@DeInit} \quad Done at the end of a listing.
 %    \begin{macrocode}
 \renewcommand*{\lst@DeInit}{%
+\LWR@traceinfo{lst@DeInit}%
 \lst@ifdisplaystyle%
 %    \end{macrocode}
+%
 % Creating a display.
 %
-% Disable line numbers,
-% produce the \element{/pre}, then
-% reenable line numbers:
+% Disable line numbers, produce the \element{/pre}, then reenable line numbers:
 %    \begin{macrocode}
     \let\lsthk@EveryPar\relax%
     \LWR@afterendverbatim%
     \let\lsthk@EveryPar\LWR@origlsthkEveryPar%
 \else%
 %    \end{macrocode}
+%
 % Inline, so create the closing \element{/span}:
 %    \begin{macrocode}
     \ifbool{LWR@verbtags}{\noindent\LWR@htmltag{/span}}{}%
 \fi%
 %    \end{macrocode}
+%
 % Final \pkg{listings} deinit:
 %    \begin{macrocode}
-\LWR@origlst@DeInit%
+    \lst@XPrintToken \lst@EOLUpdate
+    \global\advance\lst@newlines\m@ne
+    \lst@ifshowlines
+        \lst@DoNewLines
+    \else
+        \setbox\@tempboxa\vbox{\lst@DoNewLines}%
+    \fi
+    \lst@ifdisplaystyle \par\removelastskip \fi
+    \lsthk@ExitVars\everypar{}\lsthk@DeInit\normalbaselines\normalcolor
+    \lst@MakeCaption b%
+    \lst@ifbox
+        \egroup $\hss \egroup
+        \vrule\@width\lst@maxwidth\@height\z@\@depth\z@
+    \else
+        \lst@ifdisplaystyle
+            \par\penalty-50\vspace\lst@belowskip
+        \fi
+    \fi
+    \ifx\lst@multicols\@empty\else
+        \def\lst@next{\global\let\@checkend\@gobble
+                      \endmulticols
+                      \global\let\@checkend\lst@@checkend}
+        \expandafter\lst@next
+    \fi
+    \ifx\lst@float\relax\else
+        \expandafter\lst@endfloat
+    \fi
+    \endgroup
+\LWR@traceinfo{lst@DeInit done}%
 }
 %    \end{macrocode}
 % \end{noindmacro}
@@ -62192,19 +63242,18 @@ do not attempt to patch lwarp's version of `hyperref'.)\MessageBreak}
 %
 % Patched for \pkg{lwarp}.
 %    \begin{macrocode}
-
 \def\lst@MakeCaption#1{%
-\LWR@traceinfo{MAKING CAPTION at #1}%
+\LWR@traceinfo{lst@MakeCaption at #1}%
   \lst@ifdisplaystyle
-\LWR@traceinfo{making a listings display caption}%
+\LWR@traceinfo{lst@MakeCaption: making a listings display caption}%
     \ifx #1t%
          \ifx\lst@@caption\@empty\expandafter\lst@HRefStepCounter \else
                                  \expandafter\refstepcounter
          \fi {lstlisting}%
-\LWR@traceinfo{About to assign label: !\lst@label!}%
+% \LWR@traceinfo{About to assign label: !\lst@label!}%
 %         \ifx\lst@label\@empty\else
 % \label{\lst@label}\fi
-\LWR@traceinfo{Finished assigning the label.}%
+% \LWR@traceinfo{Finished assigning the label.}%
         \let\lst@arg\lst@intname \lst@ReplaceIn\lst@arg\lst@filenamerpl
         \global\let\lst@name\lst@arg \global\let\lstname\lst@name
         \lst@ifnolol\else
@@ -62218,7 +63267,7 @@ do not attempt to patch lwarp's version of `hyperref'.)\MessageBreak}
 % This code places a contents entry for a non-float.
 % This would have to be modified for \pkg{lwarp}:
 %    \begin{macrocode}
-\LWR@traceinfo{addcontents lst@name: -\lst@name-}%
+\LWR@traceinfo{lst@MakeCaption: addcontents lst@name: -\lst@name-}%
 %                            \addcontentsline{lol}{lstlisting}{\lst@name}
                         \fi
                     \fi
@@ -62227,7 +63276,7 @@ do not attempt to patch lwarp's version of `hyperref'.)\MessageBreak}
 %    \end{macrocode}
 % This would have to be modified for \pkg{lwarp}:
 %    \begin{macrocode}
-\LWR@traceinfo{addcontents lst@@caption: -\lst@@caption-}%
+\LWR@traceinfo{lst@MakeCaption: addcontents lst@@caption: -\lst@@caption-}%
                  \addcontentsline{lol}{lstlisting}%
 {\protect\numberline{\thelstlisting}%
 {\protect\ignorespaces \LWR@isolate{\lst@@caption} \protect\relax}}%
@@ -62235,10 +63284,10 @@ do not attempt to patch lwarp's version of `hyperref'.)\MessageBreak}
          \fi
      \fi
     \ifx\lst@caption\@empty\else
-\LWR@traceinfo{lst@caption not empty-}%
+\LWR@traceinfo{lst@MakeCaption: lst@caption not empty-}%
         \lst@IfSubstring #1\lst@captionpos
             {\begingroup
-\LWR@traceinfo{at the selected position}%
+\LWR@traceinfo{lst@MakeCaption: at the selected position}%
 %    \end{macrocode}
 % These space and box commands are not needed for \HTML\ output:
 %    \begin{macrocode}
@@ -62252,37 +63301,37 @@ do not attempt to patch lwarp's version of `hyperref'.)\MessageBreak}
 % New \pkg{lwarp} code to create a caption:
 % \changes{v0.73}{2019/06/25}{\pkg{listings}: Fix: Paragraph tags.}
 %    \begin{macrocode}
-                    \LWR@stoppars%
+                    \LWR@stoppars%      lwarp
                   \lst@makecaption\fnum@lstlisting{\ignorespaces \lst@caption}
              \else
 %    \end{macrocode}
 % New \pkg{lwarp} code to create a title:
 %    \begin{macrocode}
 %                  \lst@maketitle\lst@title % (AS)
-\LWR@traceinfo{Making title: \lst@title}%
+\LWR@traceinfo{lst@MakeCaption: Making title: \lst@title}%
 \begin{BlockClass}{lstlistingtitle}%    lwarp
 \lst@maketitle\lst@title%               lwarp
 \end{BlockClass}%                       lwarp
-             \fi
-\LWR@traceinfo{About to assign label: !\lst@label!}%
-        \ifx\lst@label\@empty\else
+             \fi%
+\LWR@traceinfo{lst@MakeCaption: About to assign label: !\lst@label!}%
+        \ifx\lst@label\@empty\else%
 \leavevmode% gets rid of bad space factor error
 \GetTitleStringExpand{\lst@caption}%
 \edef\LWR@lntemp{\GetTitleStringResult}%
 \edef\@currentlabelname{\detokenize\expandafter{\LWR@lntemp}}%
-\label{\lst@label}\fi
-\LWR@traceinfo{Finished assigning the label.}%
+\label{\lst@label}\fi%
+\LWR@traceinfo{lst@MakeCaption: Finished assigning the label.}%
 %    \end{macrocode}
 % Not needed for \pkg{lwarp}:
 %    \begin{macrocode}
 %              \ifx #1b\allowbreak \fi
              \endgroup}{}%
     \fi
-\LWR@traceinfo{end of making a listings display caption}%
+\LWR@traceinfo{lst@MakeCaption: end of making a listings display caption}%
   \else
-\LWR@traceinfo{INLINE}%
+\LWR@traceinfo{lst@MakeCaption: INLINE}%
   \fi
-\LWR@traceinfo{DONE WITH CAPTION at #1}%
+\LWR@traceinfo{lst@MakeCaption: done at #1}%
 }
 
 \renewcommand{\lst@maketitle}[1]{%
@@ -62293,6 +63342,7 @@ do not attempt to patch lwarp's version of `hyperref'.)\MessageBreak}
 % \end{noindmacro}
 %
 %
+%
 % Patched to keep left line numbers outside of the left margin, and
 % \margintag{line numbers}
 % place right line numbers in a field \cs{VerbatimHTMLWidth} wide.
@@ -62525,25 +63575,26 @@ do not attempt to patch lwarp's version of `hyperref'.)\MessageBreak}
 \newcommand*{\LWR@longtable@headerror}{%
     \PackageError{lwarp-longtable}
     {For longtable:\MessageBreak
-    1: Keep either one of an \protect\endhead\space or
-        \protect\endfirsthead\space\MessageBreak
-        \space phrase as-is, to be used by both print and HTML.\MessageBreak
+    1: Keep either one of an \protect\endhead\space or\MessageBreak
+        \space\protect\endfirsthead\space phrase as-is,\MessageBreak
+        \space to be used by both print and HTML.\MessageBreak
     2: Place any other \protect\end... phrases inside a\MessageBreak
         \space\protect\warpprintonly\space macro,
             to be ignored by HTML.\MessageBreak
-    3: Add a final footer for HTML at the end of the table\MessageBreak
+    3: At the end of the table,\MessageBreak
+        \space add a final footer for HTML\MessageBreak
         \space inside a \protect\warpHTMLonly\space macro.
             This can be\MessageBreak
         \space a copy of an \protect\endfoot\space or
-            \protect\endfirstfoot\space phrase,\MessageBreak
-        \space but without the actual \protect\endfoot\space
-            or \protect\endfirstfoot\MessageBreak
-        \space macros.  If using threeparttablex, add\MessageBreak
+            \protect\endfirstfoot\MessageBreak
+        \space phrase, but without the actual \protect\endfoot\MessageBreak
+        \space or \protect\endfirstfoot\space macros.\MessageBreak
+        \space If using threeparttablex, add\MessageBreak
         \space \protect\insertTableNotes\space here,
             optionally with\MessageBreak
         \space \protect\UseMinipageWidths\space in front.\MessageBreak
-    See the Lwarp documentation regarding longtables\MessageBreak
-    and threeparttablex}
+    See the Lwarp documentation regarding\MessageBreak
+    longtables and threeparttablex}
     {See the Lwarp documentation regading longtables and threeparttablex.}
 }
 %    \end{macrocode}
@@ -67855,7 +68906,16 @@ do not attempt to patch lwarp's version of `nameref'.)\MessageBreak
 \LWRNB@patchnatbibopenclose%
 }
 %    \end{macrocode}
-
+%
+% Syncronize the autopage labels:
+% \changes{v0.896}{2021/03/26}{\pkg{natbib}: Fix: Citation references..}
+%    \begin{macrocode}
+\xpretocmd{\NAT@reset@parser}
+    {\LWR@newautopagelabel{page}}%
+    {}
+    {\LWR@patcherror{natbib}{NAT@reset@parser}}
+%    \end{macrocode}
+%
 % \iffalse
 %</natbib>
 % \fi
@@ -69475,6 +70535,12 @@ do not attempt to patch lwarp's version of `nameref'.)\MessageBreak
    \refstepcounter[#1]{#2}%  <<< cleveref modification
    \theorem@prework
     \LWR@forcenewpage% lwarp
+%    \end{macrocode}
+% \changes{v0.896}{2021/03/14}{\pkg{ntheorem}: Intersperse footnotes.}
+%    \begin{macrocode}
+    \LWR@printpendingfootnotes%                   lwarp
+%    \end{macrocode}
+%    \begin{macrocode}
     \BlockClass{theorembody#1}%\LWR@thisthmstyle% lwarp
    \trivlist % latex's \trivlist, calling latex's \@trivlist unchanged
    \ifuse@newframeskips  % cf. latex.ltx for topsepadd: \@trivlist
@@ -69511,6 +70577,12 @@ do not attempt to patch lwarp's version of `nameref'.)\MessageBreak
    \refstepcounter{#2}%
    \theorem@prework
     \LWR@forcenewpage% lwarp
+%    \end{macrocode}
+% \changes{v0.896}{2021/03/14}{\pkg{ntheorem}: Intersperse footnotes.}
+%    \begin{macrocode}
+    \LWR@printpendingfootnotes%                   lwarp
+%    \end{macrocode}
+%    \begin{macrocode}
     \BlockClass{theorembody#1}%\LWR@thisthmstyle% lwarp
    \trivlist % latex's \trivlist, calling latex's \@trivlist unchanged
    \ifuse@newframeskips  % cf. latex.ltx for topsepadd: \@trivlist
@@ -69964,6 +71036,12 @@ do not attempt to patch lwarp's version of `nameref'.)\MessageBreak
 }{}%
 \LWR@origendtheorem% also does \@endtrivlist
 \ifbool{LWR@ntheoremmarks}{\global\setendmarktrue}{}%
+%    \end{macrocode}
+% \changes{v0.896}{2021/03/14}{\pkg{ntheorem}: Intersperse footnotes.}
+%    \begin{macrocode}
+    \LWR@printpendingfootnotes%                   lwarp
+%    \end{macrocode}
+%    \begin{macrocode}
 \endBlockClass%
 }
 %    \end{macrocode}
@@ -70139,6 +71217,60 @@ do not attempt to patch lwarp's version of `nameref'.)\MessageBreak
 % \fi
 %
 %
+% \iffalse
+%<*orcidlink>
+% \fi
+%
+% \part{lwarp-orcidlink.sty}
+%
+% \section{orcidlink}
+%
+% \credits{Leo C. Stein}
+%
+% \DescribePackage{orcidlink}
+% \pkg{orcidlink} is patched for use by \pkg{lwarp}.
+%
+% \changes{v0.896}{2021/03/19}{\pkg{orcidlink}: Added.}
+%
+% \codehtml
+%
+%    \begin{macrocode}
+\RequirePackage{lwarp-scalerel}
+
+\LWR@ProvidesPackagePass{orcidlink}[2020/11/21]
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+\renewcommand\orcidlink[1]{%
+    \texorpdfstring%
+        {%
+            \href%
+                {https://orcid.org/#1}%
+                {%
+                    \begin{lateximage}[orcid #1]%   lwarp
+                    \mbox{%
+                        \scalerel*{%
+                            \begin{tikzpicture}[yscale=-1,transform shape]
+                            \pic{orcidlogo};
+                            \end{tikzpicture}
+                        }{|}%
+                    }%
+                    \end{lateximage}%   lwarp
+                }%
+        }%
+        {}%
+}
+
+\begin{warpMathJax}
+\CustomizeMathJax{\newcommand{\orcidlink}[1]{}}
+\end{warpMathJax}
+%    \end{macrocode}
+%
+% \iffalse
+%</orcidlink>
+% \fi
+%
+%
 %
 %
 % \iffalse
@@ -70614,6 +71746,7 @@ do not attempt to patch lwarp's version of `nameref'.)\MessageBreak
 % \pkg{parnotes} is supported with some patches.
 %
 % \changes{v0.56}{2018/05/08}{\pkg{parnotes}: Added.}
+% \changes{v0.896}{2021/03/05}{\pkg{parnotes}: Added \ARIA\ role.}
 %
 % \codehtml
 %
@@ -70647,10 +71780,10 @@ do not attempt to patch lwarp's version of `nameref'.)\MessageBreak
     \unless\ifvmode\par\fi
     % Avoid page breaks between a paragraph and its parnotes
     \nopagebreak\addvspace{\parnotevskip}%
-    \LWR@forcenewpage%                  lwarp
-    \begin{BlockClass}{footnotes}%      lwarp
+    \LWR@forcenewpage%                      lwarp
+    \begin{BlockClass}(note){footnotes}%    lwarp
     {\parnotefmt{\PN@text}\par}%
-    \end{BlockClass}%                   lwarp
+    \end{BlockClass}%                       lwarp
     \global\def\PN@text{}%
     \addvspace{\parnotevskip}%
     %
@@ -71048,12 +72181,20 @@ do not attempt to patch lwarp's version of `nameref'.)\MessageBreak
 % \DescribePackage{pdflscape} \pkg{pdflscape} is ignored.
 %
 % \changes{v0.34}{2017/08/03}{\pkg{pdflscape}: Added.}
+% \changes{v0.896}{2021/03/14}{\pkg{pdflscape}: Fix: Added \env{landscape}.}
 %
 % \codehtml
 %
 % Discard all options for \pkg{lwarp-pdflscape}:
 %    \begin{macrocode}
-\LWR@ProvidesPackageDrop{pdflscape}[2016/05/14]
+\LWR@ProvidesPackageDrop{pdflscape}[2019/12/05]
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+\let\landscape\relax
+\let\endlandscape\relax
+
+\newenvironment*{landscape}{}{}
 %    \end{macrocode}
 %
 % \iffalse
@@ -71775,12 +72916,13 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
 %    \end{macrocode}
 %
 % The \env{window} is floated by a \env{BlockClass} style.
+% \changes{v0.896}{2021/03/05}{\pkg{picinpar}: Added \ARIA\ role.}
 %    \begin{macrocode}
 \long\def\LWR@HTML@window[#1,#2,#3,#4] {%
     \if #2r%
-        \begin{BlockClass}[float:right]{marginblock}%
+        \begin{BlockClass}[float:right](note){marginblock}%
     \else%
-        \begin{BlockClass}[float:left]{marginblock}%
+        \begin{BlockClass}[float:left](note){marginblock}%
     \fi%
     #3\par%
     #4%
@@ -74372,7 +75514,22 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
 \NewDocumentCommand{\ofoot}{s o m}{}
 \NewDocumentCommand{\cfoot}{s o m}{}
 \NewDocumentCommand{\ifoot}{s o m}{}
+%    \end{macrocode}
+% \changes{v0.896}{2021/03/13}{\pkg{scrlayer-scrpage}: Added \cs{automark}, \cs{manualmark}.}
+%    \begin{macrocode}
+\NewDocumentCommand{\automark}{som}{}
+\newcommand*{\manualmark}{}
+%    \end{macrocode}
+%    \begin{macrocode}
 \DeclareDocumentCommand{\MakeMarkcase}{m}{#1}
+%    \end{macrocode}
+% \changes{v0.896}{2021/03/13}{\pkg{scrlayer-scrpage}: Added \cs{headmeark}, \cs{pagemark}.}
+%    \begin{macrocode}
+\let\headmark\leftmark
+\providecommand{\pnumfont}{\normalfont}%
+\DeclareRobustCommand\pagemark{{\pnumfont{\thepage}}}%
+%    \end{macrocode}
+%    \begin{macrocode}
 \newcommand*{\defpairofpagestyles}[3][]{}
 \newcommand*{\newpairofpagestyles}[3][]{}
 \newcommand*{\renewpairofpagestyles}[3][]{}
@@ -75267,7 +76424,10 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
 %    \end{macrocode}
 %
 %
-% The following patch \pkg{sidenotes} for use with \pkg{lwarp}:
+% The following patch \pkg{sidenotes} for use with \pkg{lwarp}.
+%
+% An \ARIA\ |note| role is not assigned since the caption is an
+% important part of the figure.
 %
 % \begin{noindmacro}{\sidecaption} * \oarg{entry} \oarg{offset} \marg{text}
 % \changes{v0.47}{2018/01/30}{\pkg{sidenotes}: Fix for \SVG\ math in captions.}
@@ -75280,7 +76440,7 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
   \captionsetup{style=sidecaption}%
   \IfBooleanTF{#1}
   { % starred
-    \begin{BlockClass}[border:none ; box-shadow:none]{marginblock}
+    \begin{BlockClass}[border:none ; box-shadow:none]{marginblock}%
     \caption*{#4}%
     \end{BlockClass}
   }
@@ -75288,7 +76448,7 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
   \IfNoValueOrEmptyTF{#2}
     {\def\@sidenotes@sidecaption@tof{#4}}
     {\def\@sidenotes@sidecaption@tof{#2}}
-    \begin{BlockClass}[border:none ; box-shadow:none]{marginblock}
+    \begin{BlockClass}[border:none ; box-shadow:none]{marginblock}%
     \caption[\@sidenotes@sidecaption@tof]{#4}
     \end{BlockClass}
   }
@@ -77821,7 +78981,7 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
    }{}%
     \begingroup%    lwarp
     \LWR@restoreorigformatting%     lwarp
-    \RenewDocumentEnvironment{lateximage}{s o s o o}{}{}% lwarp: inside group
+    \RenewDocumentEnvironment{lateximage}{s o s o o d()}{}{}% lwarp: inside group
   \expandafter\LWR@gsavebox\csname\sv@name content\endcsname{#2}%
   \expandafter\gdef\expandafter#1\expandafter{%
         \expandafter\begin\expandafter{lateximage\expandafter}%     lwarp
@@ -79041,21 +80201,17 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
 % \end{noindmacro}
 
 
-
 % \begin{noindmacro}{\subfloat@label}
 % Patches for \cs{sf@sub@label}:
 %    \begin{macrocode}
-\def\subfloat@label{%
-\LWR@ensuredoingapar% lwarp
-  \@ifnextchar(%   %) match left parenthesis
-    {\sf@sub@label}
-    {\sf@sub@label(Sub\@captype\space
-                   \@ifundefined{thechapter}{}{\@nameuse{thechapter}\space}%
-                   \@nameuse{p@sub\@captype}%
-                   \@nameuse{thesub\@captype}.)}}
+\xpretocmd{\subfloat@label}
+    {\LWR@ensuredoingapar}
+    {}
+    {\LWR@patcherror{subfig}{subfloat@label}}
 %    \end{macrocode}
 % \end{noindmacro}
 
+
 % Patches for \cs{subref}.
 %
 % \begin{noindmacro}{\sf@subref} \marg{label}
@@ -81010,6 +82166,12 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
 %    \begin{macrocode}
 \gdef\@thm#1#2{\refstepcounter{#1}%
 \LWR@forcenewpage% lwarp
+%    \end{macrocode}
+% \changes{v0.896}{2021/03/14}{\pkg{theorem}: Intersperse footnotes.}
+%    \begin{macrocode}
+    \LWR@printpendingfootnotes%                   lwarp
+%    \end{macrocode}
+%    \begin{macrocode}
     \BlockClass{theorembody\LWR@thisthmstyle}% lwarp
    \trivlist
    \@topsep \theorempreskipamount               % used by first \item
@@ -81020,6 +82182,12 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
 
 \gdef\@endtheorem{%
 \endtrivlist
+%    \end{macrocode}
+% \changes{v0.896}{2021/03/14}{\pkg{theorem}: Intersperse footnotes.}
+%    \begin{macrocode}
+    \LWR@printpendingfootnotes%                   lwarp
+%    \end{macrocode}
+%    \begin{macrocode}
 \endBlockClass
 }
 %    \end{macrocode}
@@ -81435,8 +82603,12 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
       }%
   }%
 }
+%    \end{macrocode}
 
-\renewcommand\TPTL@tnotex[2]{\tnote{\nameref{#2}}}
+% \changes{v0.896}{2021/03/13}{\pkg{threeparttablex}: Fix: \cs{TPTL@tnotex} if not referrable.}
+%    \begin{macrocode}
+\providecommand{\TPTL@tnotex}{}
+\renewcommand{\TPTL@tnotex}[2]{\tnote{\nameref{#2}}}
 %    \end{macrocode}
 %
 % \iffalse
@@ -83147,9 +84319,11 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
 \DeclareDocumentCommand{\cftsetindents}{m m m}{}
 %    \end{macrocode}
 
+% \changes{v0.893}{2021/03/13}{\pkg{tocloft}: Fix: \cs{cftpagenumbersoff}, \cs{cftpagenumberson}.}
+% \changes{v0.896}{2021/04/05}{\pkg{tocloft}: Fix: \cs{cftpagenumbersoff}, \cs{cftpagenumberson} with \pkg{memoir}.}
 %    \begin{macrocode}
-\newcommand{\pagenumbersoff}[1]{}
-\newcommand{\pagenumberson}[1]{}
+\providecommand{\cftpagenumbersoff}[1]{}
+\providecommand{\cftpagenumberson}[1]{}
 %    \end{macrocode}
 
 
@@ -83699,13 +84873,13 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
 % \watchout
 % \pkg{algorithmicx} uses |.loa|.
 % \pkg{trivfloat} by default starts with |.loa| and goes up for additional floats,
-% skipping |.lof| and |.lot|.
+% skipping \filenm{.lof} and \filenm{.lot}.
 %
 % When using \cs{newfloat},
 % \watchout
 % be sure to manually assign higher letters to the \cs{newfloat}
 % files to avoid |.loa| used by \pkg{algorithmicx}, and any files used by \pkg{trivfloat}.
-% Also avoid using |.lof| and |.lot|.
+% Also avoid using \filenm{.lof} and \filenm{.lot}.
 %
 % When using \cs{trivfloat}, you may force it to avoid conflicting with
 % \watchout
@@ -85584,6 +86758,7 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
 % \changes{v0.42}{2017/10/26}{\pkg{wrapfig}: If \progcode{FormatWP}
 %           add explicit \HTML\ style.}
 % \changes{v0.75}{2019/09/22}{\pkg{wrapfig}: Fix for width.}
+% \changes{v0.896}{2021/03/05}{\pkg{wrapfig}: Added \ARIA\ role.}
 %    \begin{macrocode}
 \newcommand*{\LWR@wrapposition}{}
 
@@ -85603,6 +86778,7 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
 {%
     width:\LWR@printlength{\LWR@templengthone}; \LWR@wrapposition; %
 }%
+(note)%
 {marginblock}%
 %    \end{macrocode}
 % \changes{v0.75}{2019/09/17}{\pkg{wrapfig}: Fix for \cs{linewidth}.}
@@ -85881,8 +87057,11 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
 % Sets \cs{LWR@tempcolor} to the current color.
 %    \begin{macrocode}
 \renewcommand*{\LWR@findcurrenttextcolor}{%
+\LWR@traceinfo{LWR@findcurrenttextcolor}%
 \protect\colorlet{LWR@current@color}{.}%
+\LWR@traceinfo{LWR@findcurrenttextcolor B}%
 \protect\convertcolorspec{named}{LWR@current@color}{HTML}\LWR@tempcolor%
+\LWR@traceinfo{LWR@findcurrenttextcolor: done}%
 }
 %    \end{macrocode}
 % \end{noindmacro}
@@ -86487,26 +87666,26 @@ height:\LWR@printlength{\LWR@tempheight}%
 %
 %
 % \iffalse
-%<*xetexko-vertical>
+%<*xetexko>
 % \fi
 %
-% \part{lwarp-xetexko-vertical.sty}
+% \part{lwarp-xetexko.sty}
 %
-% \section{xetexko-vertical}
+% \section{xetexko}
 %
 % \credits{Dohyun Kim}
 %
-% \DescribePackage{xetexko-vertical}
-% \pkg{xetexko-vertical} is patched for use by \pkg{lwarp}.
+% \DescribePackage{xetexko}
+% \pkg{xetexko} is patched for use by \pkg{lwarp}.
 %
-% \changes{v0.20}{2017/01/11}{\pkg{xetexko-vertical}: Added.}
+% \changes{v0.20}{2017/01/11}{\pkg{xetexko}: Added.}
 %
 % \codehtml
 %
 %    \begin{macrocode}
-\LWR@loadbefore{xetexko-vertical}
+\LWR@loadbefore{xetexko}
 
-\LWR@ProvidesPackagePass{xetexko-vertical}[2018/04/06]
+\LWR@ProvidesPackagePass{xetexko}[2021/03/22]
 %    \end{macrocode}
 %
 %    \begin{macrocode}
@@ -86517,7 +87696,7 @@ height:\LWR@printlength{\LWR@tempheight}%
 %    \end{macrocode}
 %
 % \iffalse
-%</xetexko-vertical>
+%</xetexko>
 % \fi
 %
 %
@@ -87816,37 +88995,40 @@ height:\LWR@printlength{\LWR@tempheight}%
 %
 % \begin{itemize}
 % \item \cs{@mem@old@label} is the \LaTeX\ definition of \cs{label}.
-% \item \cs{LWR@orig@label} adds the \pkg{memoir} definition.
+% \item \cs{LWR@orig@label} becomes the \pkg{memoir} definition.
 % \item \pkg{lwarp}'s \cs{LWR@new@label} uses \cs{LWR@orig@label}.
 % \item Want \pkg{memoir}'s \cs{label} to use \pkg{lwarp}'s \cs{label},
 %               which then would use \LaTeX's \cs{label}.
 % \item So:
 %   \begin{itemize}
-%       \item \cs{@mem@old@label} becomes \cs{LWR@new@label}.
-%       \item \cs{LWR@orig@label} becomes \cs{@mem@old@label}.
+%       \item \cs{@mem@old@label} is set to \cs{LWR@new@label}.
+%       \item \cs{LWR@orig@label} is set to \cs{@mem@old@label}.
 %   \end{itemize}
-% \item \pkg{cleveref} then encapsulates all the above.
-% \item For a subcaption, \pkg{cleveref} modifies \pkg{memoir}'s \cs{sf@memsub@label}.
+% \item \pkg{cleveref} then encapsulates all the above with \cs{cref@old@label}.
+% \item For a subcaption, \pkg{cleveref} modifies \pkg{memoir}'s \cs{sf@memsub@label},
+%       but that change is undone by \pkg{lwarp}.
 % \end{itemize}
 % \changes{v0.84}{2020/04/05}{\pkg{lwarp-patch-memoir}: Fix: \cs{label}.}
 %    \begin{macrocode}
-\let\LWR@orig@label\@mem@old@label
-\let\@mem@old@label\LWR@new@label
+\LetLtxMacro\LWR@orig@label\@mem@old@label
+\LetLtxMacro\@mem@old@label\LWR@new@label
 %    \end{macrocode}
 %
-% Patches for subfloats to support additional \pkg{lwarp} labels:
+% Patches for subfloats to support additional \pkg{lwarp} labels.
+% This is the non-\pkg{hyperref} version from \pkg{memoir}.
 %    \begin{macrocode}
 \AtBeginDocument{
     \renewcommand*{\sf@@memsub@label}[1]{%
         \@bsphack
         \sf@@memsub@label@hook{#1}%
-        \@memoldlabel{#1}%
-        \LWR@label@createtag{sub@#1}%
+%         \@memoldlabel{#1}%
+        \cref@label{#1}%                    lwarp
+        \LWR@label@createtag{sub@#1}%           lwarp
         \protected@write\@auxout{}{%
             \string\newlabel{sub@#1}%
             {{\@nameuse{@@thesub\@captype}}%
             {\thepage}}}%
-        \LWR@write@lwarplabel{sub@#1}%
+        \LWR@write@lwarplabel{sub@#1}%          lwarp
         \@esphack
     }
 }
@@ -88709,10 +89891,11 @@ height:\LWR@printlength{\LWR@tempheight}%
 %    \end{macrocode}
 %
 % Borrowed from the \pkg{lwarp} version of \pkg{keyfloat}:
+% \changes{v0.896}{2021/03/05}{\pkg{lwarp-patch-memoir}: Added \ARIA\ role.}
 %    \begin{macrocode}
 \NewDocumentEnvironment{KFLTmemoir@marginfloat}{O{-1.2ex} m}
 {% start
-    \LWR@BlockClassWP{float:right; width:2in; margin:10pt}{}{marginblock}%
+    \LWR@BlockClassWP{float:right; width:2in; margin:10pt}{}(note){marginblock}%
     \renewcommand*{\@captype}{#2}%
 }
 {%
diff --git a/macros/latex/contrib/lwarp/lwarp.ins b/macros/latex/contrib/lwarp/lwarp.ins
index 97c0deaed8..0ce71e74ae 100644
--- a/macros/latex/contrib/lwarp/lwarp.ins
+++ b/macros/latex/contrib/lwarp/lwarp.ins
@@ -97,6 +97,7 @@ version 2005/12/01 or later.
 \file{lwarp-bussproofs.sty}{\from{lwarp.dtx}{bussproofs}}
 \file{lwarp-bxpapersize.sty}{\from{lwarp.dtx}{bxpapersize}}
 \file{lwarp-bytefield.sty}{\from{lwarp.dtx}{bytefield}}
+\file{lwarp-ccicons.sty}{\from{lwarp.dtx}{ccicons}}
 \file{lwarp-cancel.sty}{\from{lwarp.dtx}{cancel}}
 \file{lwarp-canoniclayout.sty}{\from{lwarp.dtx}{canoniclayout}}
 \file{lwarp-caption.sty}{\from{lwarp.dtx}{caption}}
@@ -120,6 +121,7 @@ version 2005/12/01 or later.
 \file{lwarp-citeref.sty}{\from{lwarp.dtx}{citeref}}
 \file{lwarp-CJK.sty}{\from{lwarp.dtx}{CJK}}
 \file{lwarp-CJKutf8.sty}{\from{lwarp.dtx}{CJKutf8}}
+\file{lwarp-classicthesis.sty}{\from{lwarp.dtx}{classicthesis}}
 \file{lwarp-cleveref.sty}{\from{lwarp.dtx}{cleveref}}
 \file{lwarp-clrdblpg.sty}{\from{lwarp.dtx}{clrdblpg}}
 \file{lwarp-cmbright.sty}{\from{lwarp.dtx}{cmbright}}
@@ -157,6 +159,7 @@ version 2005/12/01 or later.
 \file{lwarp-endheads.sty}{\from{lwarp.dtx}{endheads}}
 \file{lwarp-endnotes.sty}{\from{lwarp.dtx}{endnotes}}
 \file{lwarp-engtlc.sty}{\from{lwarp.dtx}{engtlc}}
+\file{lwarp-enotez.sty}{\from{lwarp.dtx}{enotez}}
 \file{lwarp-enumerate.sty}{\from{lwarp.dtx}{enumerate}}
 \file{lwarp-enumitem.sty}{\from{lwarp.dtx}{enumitem}}
 \file{lwarp-epigraph.sty}{\from{lwarp.dtx}{epigraph}}
@@ -368,6 +371,7 @@ version 2005/12/01 or later.
 \file{lwarp-nowidow.sty}{\from{lwarp.dtx}{nowidow}}
 \file{lwarp-ntheorem.sty}{\from{lwarp.dtx}{ntheorem}}
 \file{lwarp-octave.sty}{\from{lwarp.dtx}{octave}}
+\file{lwarp-orcidlink.sty}{\from{lwarp.dtx}{orcidlink}}
 \file{lwarp-overpic.sty}{\from{lwarp.dtx}{overpic}}
 \file{lwarp-pagegrid.sty}{\from{lwarp.dtx}{pagegrid}}
 \file{lwarp-pagenote.sty}{\from{lwarp.dtx}{pagenote}}
@@ -576,7 +580,7 @@ version 2005/12/01 or later.
 \file{lwarp-xcolor.sty}{\from{lwarp.dtx}{xcolor}}
 \file{lwarp-xechangebar.sty}{\from{lwarp.dtx}{xechangebar}}
 \file{lwarp-xellipsis.sty}{\from{lwarp.dtx}{xellipsis}}
-\file{lwarp-xetexko-vertical.sty}{\from{lwarp.dtx}{xetexko-vertical}}
+\file{lwarp-xetexko.sty}{\from{lwarp.dtx}{xetexko}}
 \file{lwarp-xevlna.sty}{\from{lwarp.dtx}{xevlna}}
 \file{lwarp-xfakebold.sty}{\from{lwarp.dtx}{xfakebold}}
 \file{lwarp-xfrac.sty}{\from{lwarp.dtx}{xfrac}}
diff --git a/macros/latex/contrib/lwarp/lwarp.pdf b/macros/latex/contrib/lwarp/lwarp.pdf
index e49cbc84fb..d280510a29 100644
--- a/macros/latex/contrib/lwarp/lwarp.pdf
+++ b/macros/latex/contrib/lwarp/lwarp.pdf
diff --git a/macros/latex/contrib/lwarp/lwarpmk.lua b/macros/latex/contrib/lwarp/lwarpmk.lua
index 95c5d37a13..7357f24b90 100755
--- a/macros/latex/contrib/lwarp/lwarpmk.lua
+++ b/macros/latex/contrib/lwarp/lwarpmk.lua
@@ -2,7 +2,7 @@
 
 -- Copyright 2016-2021 Brian Dunn
 
-printversion = "v0.895"
+printversion = "v0.896"
 requiredconfversion = "2" -- also at *lwarpmk.conf
 
 function printhelp ()
diff --git a/macros/latex/contrib/nicematrix/nicematrix-french.pdf b/macros/latex/contrib/nicematrix/nicematrix-french.pdf
index f9d2004bed..98af2c5843 100644
--- a/macros/latex/contrib/nicematrix/nicematrix-french.pdf
+++ b/macros/latex/contrib/nicematrix/nicematrix-french.pdf
diff --git a/macros/latex/contrib/nicematrix/nicematrix-french.tex b/macros/latex/contrib/nicematrix/nicematrix-french.tex
index 8656d61f09..d92e274140 100644
--- a/macros/latex/contrib/nicematrix/nicematrix-french.tex
+++ b/macros/latex/contrib/nicematrix/nicematrix-french.tex
@@ -58,7 +58,7 @@
 \NewDocumentCommand {\cls} {m} {\textsf{#1}}
 
 \setlength{\parindent}{0pt}
-
+\skip \footins = 2 \bigskipamount
 
 \begin{document}
 
@@ -143,7 +143,9 @@ L'idée de \pkg{nicematrix} est de créer des nœuds \textsc{pgf} derrière les
 tableaux créés par \pkg{array} et de les utiliser pour développer de nouvelles fonctionnalités. Comme toujours avec
 \textsc{pgf}, les coordonnées de ces nœuds sont écrites dans le fichier |.aux| pour être utilisées à la
 compilation suivante. C'est pourquoi l'utilisation de \pkg{nicematrix} nécessite \textbf{plusieurs compilations
-  successives}.  
+  successives}.\footnote{Si vous utilisez Overleaf, Overleaf effectue
+  automatiquement le nombre de
+  compilations nécessaire.}
 
 \bigskip
 La plupart des fonctionnalités de \pkg{nicematrix} sont accessibles sans avoir à utiliser explicitement
@@ -189,20 +191,25 @@ environnements correspondants de l'\pkg{amsmath} (qui est chargée par
 \pkg{nicematrix}) : |{matrix}|, |{pmatrix}|, etc.
 
 \medskip
+\textbf{On conseille d'utiliser prioritairement les environnements classiques et de
+n'utiliser les environnements de \pkg{nicematrix} que lorsqu'on utilise les
+fonctionnalités supplémentaires offertes par ces environnements (cela permet
+d'économiser la mémoire).}
+
+\medskip
 Tous les environnements de l'extension \pkg{nicematrix} acceptent, entre
 crochets, une liste optionnelle de paires de la forme \textsl{clé=valeur}.
 {\bfseries Il doit n'y avoir aucun espace devant le crochet ouvrant (|[|) de
   cette liste d'options.}
 
 \bigskip
-\textbf{Important}
+\textbf{Important}\par\nobreak
 
 Avant la version 5.0, il fallait, pour des raisons techniques, utiliser les
 lettres |L|, |C| et |R| au lieu de |l|, |c| et |r| dans les préambules des
-environnements de \pkg{nicematrix}.
-
-Pour pouvoir continuer à utiliser ces lettres |L|, |C| et |R|, \pkg{nicematrix}
-doit être chargé avec l'option |define-L-C-R|.
+environnements de \pkg{nicematrix}. Pour pouvoir continuer à utiliser ces
+lettres |L|, |C| et |R|, \pkg{nicematrix} doit être chargé avec l'option
+|define-L-C-R|.
 \begin{Verbatim}
 \usepackage[define-L-C-R]{nicematrix}
 \end{Verbatim}
@@ -516,14 +523,16 @@ tableau) ;
 trace également le cadre avec cette couleur.
 \item la clé |line-width| fixe la largeur des filets servant pour le cadre (n'a
 d'intérêt que si |draw| est utilisée) ;
-\item \colorbox{yellow!50}{\textbf{Nouveau 5.12}}\enskip la clé
-|rounded-corners| impose des coins arrondis (pour le cadre dessiné par |draw| et
-le fond dessiné par |fill|) avec un rayon égal à la valeur de cette clé (la
-valeur par défaut est 4~pt\footnote{Cette valeur par défaut est la valeur
-  initiale des \emph{rounded corners} de Tikz.}).
-\item \colorbox{yellow!50}{\textbf{Nouveau 5.13}}\enskip la clé |borders| permet
-de ne tracer que certaines des bordures du bloc : cette clé prend comme valeur
-une liste d'éléments parmi les suivants : |left|, |right|, |top| et |bottom|.
+\item la clé |rounded-corners| impose des coins arrondis (pour le cadre dessiné
+par |draw| et le fond dessiné par |fill|) avec un rayon égal à la valeur de
+cette clé (la valeur par défaut est 4~pt\footnote{Cette valeur par défaut est la
+  valeur initiale des \emph{rounded corners} de Tikz.}) ;
+\item la clé |borders| permet de ne tracer que certaines des bordures du bloc :
+cette clé prend comme valeur une liste d'éléments parmi les suivants : |left|,
+|right|, |top| et |bottom| ;
+\item \colorbox{yellow!50}{\bfseries Nouveau 5.14}\enskip les clés |t| et |b|
+réglent la ligne de base qui sera donnée au bloc quand celui-ci est constitué de
+plusieurs lignes (séparées par la commande |\\|).
 \end{itemize}
 
 
@@ -641,6 +650,8 @@ la consigne générale donnée dans le préambule pour cette colonne.
 |rounded-corners|.\footnote{Pour colorier simplement le fond d'une case, il n'y a pas besoin
   d'utiliser un bloc mono-case : on peut utiliser la commande |\cellcolor| si la
   clé |colortbl-like| est utilisée : voir p.~\pageref{colortbl-like}.}
+
+\item On peut tracer ou plusieurs bordures de la case avec la clé |borders|.
 \end{itemize}
 
 \medskip
@@ -752,7 +763,8 @@ Marie & Pauline \\ \hline
 
 \bigskip
 En revanche, les filets verticaux ne sont pas tracés à l'intérieur des blocs
-(créés par |\Block|: cf.~p.~\pageref{Block}).
+(créés par |\Block|: cf.~p.~\pageref{Block}) ni dans les coins (dont la création
+est demandée par la clé |corners|: cf.~p.~\pageref{corners}).
 
 
 \bigskip
@@ -903,30 +915,48 @@ p.~\pageref{OnlyMainNiceMatrix}.
 
 
 \bigskip
-\subsection{La commande \textbackslash Hline}
+\subsection{Les outils de nicematrix pour tracer des filets}
 
-On a dit que les traits verticaux spécifiés par un symbole «\verb+|+» dans le
-préambule (pour les environnements à préambule, bien entendu) n'étaient pas
-tracés dans les blocs.\footnote{Ces blocs sont ceux créés par les commandes
-  \verb|\Block| et \verb|\multicolumn| mais aussi ceux délimités implicitement
-  par des lignes en pointillés continues (créées par \verb|\Cdots|, etc.).}
+Les outils proposés par \pkg{nicematrix} pour tracer des filets sont les
+suivants :
+\begin{itemize}
+\item les clés |hlines|, |vlines| et |hvlines| ;
+\item le spécificateur «\verb+|+» dans le préambule (pour les environnements à
+préambule) ;
+\item la commande |\Hline|.
+\end{itemize}
 
-\smallskip
-\colorbox{yellow!50}{\textbf{Nouveau 5.13}}\enskip Pour proposer des filets horizontaux
-ayant le même comportement, l'extension \pkg{nicematrix} fournit la commande
-|\Hline|. 
+\bigskip
+\textbf{Ces outils ont en commun de ne pas tracer les filets dans les blocs ni
+  dans les coins vides (quand la clé |corners| est utilisée).}
+\begin{itemize}
+\item Les blocs en question sont :
+\begin{itemize}
+\item ceux créés par la commande |\Block|\footnote{Et aussi la commande \verb|\multicolumn| même s'il
+  est recommandé d'utiliser plutôt \verb|\Block| quand on utilise l'extension
+  \pkg{nicematrix}.} de \pkg{nicematrix} présentée
+p.~\pageref{Block};
+\item ceux délimités implicitement par des lignes en pointillés continues, créées
+par |\Cdots|, |\Vdots|, etc. : cf.~p.~\pageref{Cdots}.
+\end{itemize}
+\item Les coins sont créés par la clé |corners| détaillée un peu plus loin : cf.
+p.~\pageref{corners}. 
+\end{itemize}
 
+En particulier, cette remarque explique la différence entre la commande standard
+|\hline| et la commande |\Hline| proposée par \pkg{nicematrix}.
 
 \bigskip
-\subsection{Les clés hlines et vlines}
+\subsubsection{Les clés hlines et vlines}
 
-La clé |hlines| demande un tracé de tous les filets horizontaux et la clé
-|vlines| demande un tracé de tous les filets verticaux (sauf dans les blocs,
-créés par |\Block| et dans les blocs virtuels déterminés par des lignes en
-pointillés : |\Cdots|, |\Vdots|, etc.). En fait, dans les environnements avec
-délimiteurs (comme |{pNiceMatrix}| ou |{bNiceArray}|), les filets extérieurs ne
-sont pas tracés (ce qui est le comportement certainement attendu).
+\medskip
+Les clés |hlines| et |vlines| (qui, bien sûr, tracent des filets horizontaux et
+verticaux) prennent comme valeur une liste de numéros qui sont les numéros des
+filets à tracer. Si aucune valeur n'est donnée, tous les filets sont tracés.
 
+En fait, pour les environnements avec délimiteurs (comme |{pNiceMatrix}| ou
+|{bNiceArray}|), la clé |vlines| ne trace pas les filets extérieurs (ce qui est
+le comportement certainement attendu). 
 
 \medskip
 \begin{BVerbatim}[baseline=c,boxwidth=10.6cm]
@@ -942,25 +972,19 @@ $\begin{pNiceMatrix}[vlines,rules/width=0.2pt]
 1 & 2 & 3 & 4 & 5 & 6 
 \end{pNiceMatrix}$
 
-\medskip
-\colorbox{yellow!50}{\textbf{Nouveau 5.13}}\enskip Il est possible de donner à
-la clé |vlines| une liste de numéros qui seront les numéros des filets verticaux
-qui seront tracés. Il en est de même pour |hlines|.
 
 
-\subsection{La clé hvlines}
+\subsubsection{La clé hvlines}
 \label{hvlines}
 
-La clé |hvlines| demande le tracé de tous les filets horizontaux et verticaux
-(sauf dans les blocs et dans les blocs virtuels déterminés par des
-lignes en pointillés et sauf les filets correspondants à des clés |draw| de
-commandes |\Block|, filets qui sont tracés avec leurs caractéristiques).
+La clé |hvlines|, qui ne prend pas de valeur, est la conjonction des clés
+|hlines| et |vlines|.
 
-\medskip
+\smallskip
 \begin{Verbatim}
 \begin{NiceTabular}{cccc}[~emphase#hvlines@,rules/color=blue,rules/width=1pt]
 rose      & tulipe & marguerite & dahlia \\
-violette  & \Block[~emphase#draw=red@]{2-2}{\LARGE fleurs}  & & souci \\
+violette  & \Block[draw=red]{2-2}{\LARGE fleurs}  & & souci \\
 pervenche & & & lys \\
 arum      & iris & jacinthe & muguet 
 \end{NiceTabular}
@@ -975,78 +999,116 @@ arum      & iris & jacinthe & muguet
 \end{NiceTabular}
 \end{center}
 
+\bigskip
+\subsubsection{Les coins (vides)}
+\label{corners}
 
-\subsection{La clé hvlines-except-corners}
+Les quatre coins d'un tableau seront notés |NW|, |SW|, |NE| et |SE| (\emph{north west}, \emph{south west}, \emph{north
+  east} et \emph{south east} en anglais). 
 
-\label{except-corners}
+\smallskip
+Pour chacun de ces coins, on appellera \emph{coin vide} (ou tout simplement
+\emph{coin}) la réunion de toutes les cases vides situées dans au moins un
+rectangle entièrement constitué de cases vides partant de ce coin.\footnote{Pour
+  être complet, on doit préciser que toute case située dans un bloc (même si
+  elle vide) n'est pas prise en compte pour la détermination des coins. Ce
+  comportement est naturel.}
 
-La clé |hvlines-except-corners| demande le tracé de tous les filets horizontaux
-et verticaux sauf dans les blocs (y compris dans les blocs virtuels déterminés par des
-lignes en pointillés) et sauf dans les coins vides. 
+\smallskip
+On peut néanmoins imposer à une case sans contenu d'être considérée
+comme non vide par \pkg{nicematrix} avec la commande |\NotEmpty|.
 
-\medskip
-\begin{Verbatim}
-\begin{NiceTabular}{*{6}{c}}[~emphase#hvlines-except-corners@,cell-space-top-limit=3pt]
+\bigskip
+\begin{minipage}{9cm}
+Dans l'exemple ci-contre (où B est au centre d'un bloc de taille $2\times 2$),
+on a colorié en bleu clair les quatre coins (vides) du tableau.
+\end{minipage}\hspace{2cm}%
+\begin{NiceTabular}{*{6}{c}}[cell-space-top-limit=3pt]
+\CodeBefore
+  \rectanglecolor{blue!10}{1-1}{4-2}
+  \rectanglecolor{blue!10}{1-1}{1-4}
+  \rectanglecolor{blue!10}{1-6}{3-6}
+  \rectanglecolor{blue!10}{7-1}{9-1}
+  \rectanglecolor{blue!10}{7-5}{9-6}
+\Body
   &   &   &   & A \\
   &   & A & A & A \\
   &   &   & A \\
   &   & A & A & A & A \\
 A & A & A & A & A & A \\
 A & A & A & A & A & A \\
+  & A & A & A \\
   & \Block{2-2}{B} & & A \\
   &   &   & A \\
-  & A & A & A \\
 \end{NiceTabular}
-\end{Verbatim}
-%
-\begin{center}
-\begin{NiceTabular}{*{6}{c}}[hvlines-except-corners,cell-space-top-limit=3pt]
+
+
+\bigskip
+\colorbox{yellow!50}{\textbf{Nouveau 5.14}}\enskip Quand la clé |corners| est
+utilisée, \pkg{nicematrix} calcule les coins vides et ces coins sont alors pris
+en compte par les outils de tracés de filets (les filets ne seront pas tracés
+dans ces coins vides). \emph{Remarque} : Dans les versions précédentes de
+\pkg{nicematrix}, il n'y avait qu'une clé |hvlines-except-corners| (maintenant
+considérée comme obsolète).
+
+\bigskip
+\begin{BVerbatim}[boxwidth=11cm,baseline=c]
+\NiceMatrixOptions{cell-space-top-limit=3pt}
+\begin{NiceTabular}{*{6}{c}}[~emphase#corners@,hvlines]
   &   &   &   & A \\
   &   & A & A & A \\
   &   &   & A \\
   &   & A & A & A & A \\
 A & A & A & A & A & A \\
 A & A & A & A & A & A \\
+  & A & A & A \\
   & \Block{2-2}{B} & & A \\
   &   &   & A \\
+\end{NiceTabular}
+\end{BVerbatim}
+\begin{NiceTabular}{*{6}{c}}[corners,hvlines,cell-space-top-limit=3pt]
+  &   &   &   & A \\
+  &   & A & A & A \\
+  &   &   & A \\
+  &   & A & A & A & A \\
+A & A & A & A & A & A \\
+A & A & A & A & A & A \\
   & A & A & A \\
+  & \Block{2-2}{B} & & A \\
+  &   &   & A \\
 \end{NiceTabular}
-\end{center}
-
-Comme on le voit, un «coin vide» est constitué de la réunion de tous les
-rectangles vides partant de la case située exactement dans le coin.
 
-\bigskip
-On peut passer en argument de |\hvlines-except-corners| une liste de coins à
-prendre en considération, les coins étant désignés par |NW|, |SW|, |NE| et |SE|
-(\emph{north west}, \emph{south west}, \emph{north east} et \emph{south east}).
+\vspace{1cm}
+On peut aussi donner comme valeur à la clé |corners| une liste de coins à
+prendre en considération (les coins sont notés |NW|, |SW|, |NE| et |SE| et
+doivent être séparés par des virgules).
 
 \medskip
 \begin{BVerbatim}[boxwidth=11cm,baseline=c]
-\begin{NiceTabular}{*{6}{c}}%
-  [~emphase#hvlines-except-corners=NE@,cell-space-top-limit=3pt]
+\NiceMatrixOptions{cell-space-top-limit=3pt}
+\begin{NiceTabular}{*{6}{c}}[~emphase#corners=NE@,hvlines]
 1\\
 1&1\\
 1&2&1\\
 1&3&3&1\\
 1&4&6&4&1\\
-1&5&10&10&5&1
+ & & & & &1
 \end{NiceTabular}
 \end{BVerbatim}
 \begin{NiceTabular}{*{6}{c}}%
-  [c,hvlines-except-corners=NE,cell-space-top-limit=3pt]
+  [c,corners=NE,hvlines,cell-space-top-limit=3pt]
 1\\
 1&1\\
 1&2&1\\
 1&3&3&1\\
 1&4&6&4&1\\
-1&5&10&10&5&1
+ & & & & &1
 \end{NiceTabular}
 
-\medskip
+\bigskip
 $\triangleright$ Le concept de coins est aussi utilisé par la commande
 |\arraycolor| dans le |\CodeBefore| qui accepte en option une clé
-|except-corners| : cf.~p.~\pageref{arraycolor}.
+|except-corners|: cf.~p.~\pageref{arraycolor}.
 
 
 \subsection{La commande \textbackslash diagbox}
@@ -1202,9 +1264,9 @@ L'extension \pkg{nicematrix} fournit une clé |code-before| pour du code qui ser
 exécuté avant le tracé du tableau. 
 
 \smallskip
-\colorbox{yellow!50}{\textbf{Nouveau 5.12}}\enskip Une syntaxe alternative est
-proposée : on peut placer le contenu de ce |code-before| entre les mots-clés
-|\CodeBefore| et |\Body| juste au début de l'environnement.
+Une syntaxe alternative est proposée : on peut placer le contenu de ce
+|code-before| entre les mots-clés |\CodeBefore| et |\Body| juste au début de
+l'environnement.
 
 \begin{Verbatim}
 \begin{pNiceArray}{~textsl#preamble@}
@@ -1216,7 +1278,7 @@ proposée : on peut placer le contenu de ce |code-before| entre les mots-clés
 \end{Verbatim}
 
 \smallskip
-De nouvelles commandes sont disponibles dans ce |\CodeBefore| :
+De nouvelles commandes sont disponibles dans ce |\CodeBefore|:
 |\cellcolor|, |\rectanglecolor|, |\rowcolor|, |\columncolor|, |\rowcolors| 
 |\chessboardcolors| et |\arraycolor|.\footnote{On pourra remarquer que, dans le
   \verb|\CodeBefore|, des nœuds PGF/Tikz de la forme \verb+(i-|j)+ correspondant
@@ -1369,12 +1431,12 @@ correspond à l'espace colorimétrique). Les clés disponibles sont |cols|,
 \begin{itemize}
 \item La clé |cols| décrit un ensemble de colonnes sur lesquelles portera
 l'effet de |\rowcolors|. Cet ensemble de colonnes est une liste d'intervalles de
-la forme $i$|-|$j$.
+la forme $i$|-|$j$ (où $i$ et $j$ peuvent être remplacés par |*|).
 
 \item Avec la clé |restart|, chacun des intervalles de rangées spécifié par le
 premier argument de |\rowcolors| recommence avec la même
 couleur.\footnote{Autrement, la couleur d'une rangée ne dépend que de la parité
-  de son numéro.}
+  de son numéro absolu.}
 
 
 \item Avec la clé |respect-blocks|, qui est de type booléen, les «rangées»
@@ -1488,13 +1550,12 @@ $\begin{pNiceMatrix}[baseline=1, r, margin]
 On a utilisé la clé |r| qui impose que toutes les colonnes soient alignées à
 droite (cf. p.~\pageref{key-R}).
 
-\item \colorbox{yellow!50}{\textbf{Nouveau 5.13}}\enskip La commande
-|\arraycolor| prend en argument obligatoire une couleur et colorie tout le
-tableau (sauf les éventuelles rangées et colonnes extérieures: cf.~p.~\pageref{exterior}) avec cette
-couleur. Elle est surtout intéressante du fait de la clé |except-corners|
-qu'elle accepte entre crochets en troisième argument (optionnel). La définition
-des coins a été donnée p.~\pageref{except-corners} quand on a présenté la clé
-|hvlines-except-corners|.
+\item La commande |\arraycolor| prend en argument obligatoire une couleur et
+colorie tout le tableau (sauf les éventuelles rangées et colonnes extérieures:
+cf.~p.~\pageref{exterior}) avec cette couleur. Elle est surtout intéressante du
+fait de la clé |except-corners| qu'elle accepte entre crochets en troisième
+argument (optionnel). La définition des coins a été donnée p.~\pageref{corners}
+quand on a présenté la clé~|corners|.
 
 \label{arraycolor}
 
@@ -2406,10 +2467,10 @@ b      & a      & b      & \Ddots &        & \Vdots \\
 
 Les lignes pointillées délimitent des blocs virtuels qui ont le même
 comportement vis à vis des filets que les blocs créés par |\Block| (les filets
-spécifiés par le spécificateur \verb+|+ dans le préambule et par les clés
-|vlines|, |hlines|, |hvlines| et |hvlines-except-corners| ne sont pas tracés
-dans les blocs).
-
+spécifiés par le spécificateur \verb+|+ dans le préambule, la commande |\Hline|
+et par les clés |vlines|, |hlines| et |hvlines| ne sont pas tracés dans les
+blocs).\footnote{En revanche, la commande \verb|\line| dans le \verb|\CodeAfter|
+  (cf.~p.~\pageref{line-in-code-after}) ne crée pas de bloc.}
 
 \medskip
 \begin{BVerbatim}[baseline=c,boxwidth=10.6cm]
@@ -2433,7 +2494,7 @@ $\begin{bNiceMatrix}[margin,hvlines]
 \label{code-after}
 On a présenté p.~\pageref{code-before} la clé |code-before|. Il existe en fait
 une clé similaire |code-after| qui peut être utilisée pour indiquer du code qui
-sera exécuté après la construction du tableau.
+sera exécuté \emph{après} la construction du tableau.
 
 \medskip
 Pour améliorer la lisibilité du code, une syntaxe alternative est proposée : on
@@ -2454,12 +2515,17 @@ Par ailleurs, deux commandes spéciales sont disponibles dans le |\CodeAfter| :
 
 \subsection{La commande \textbackslash line dans le \textbackslash CodeAfter}
 
+\label{line-in-code-after}
 La commande |\line| permet de tracer directement des lignes en pointillés entre
 les cases. Elle prend deux arguments correspondant aux deux cases à relier,
 chacun de la forme $i$-$j$ où $i$ est le numéro de ligne et $j$ est le numéro de
-colonne. Elle peut par exemple être utilisée pour tracer une ligne entre deux
-cases adjacentes comme dans l'exemple suivant.
-\label{line-in-code-after}
+colonne. Les options disponibles pour personnaliser les lignes pointillées créées par
+|\Cdots|, |\Vdots|, etc. peuvent aussi être passées à cette commande (cf.
+p.~\pageref{customization}). 
+
+\medskip
+Cette commande peut par exemple être utilisée pour tracer une ligne entre deux
+cases adjacentes.
 
 \medskip
 \begin{BVerbatim}[baseline=c,boxwidth=11cm]
@@ -2483,10 +2549,29 @@ I       & 0      & \Cdots  &0     \\
 \end{pNiceMatrix}$
 \end{scope}
 
+\bigskip
+Elle peut aussi être utilisée pour tracer une ligne diagonale non parallèle aux
+autres lignes diagonales (par défaut, les lignes tracées par |\Ddots| sont
+«parallélisées» : cf~p.~\pageref{parallelization}).
+
 \medskip
-Les options disponibles pour personnaliser les lignes pointillées créées par
-|\Cdots|, |\Vdots|, etc. peuvent aussi être passées à cette commande (cf.
-p.~\pageref{customization}). 
+\begin{BVerbatim}
+\begin{bNiceMatrix}
+1      & \Cdots &   & 1      & 2      & \Cdots          & 2      \\
+0      & \Ddots &   & \Vdots & \Vdots & \hspace*{2.5cm} & \Vdots \\
+\Vdots & \Ddots &   &        &        &                 &        \\
+0      & \Cdots & 0 & 1      & 2      & \Cdots          & 2 
+~emphase#\CodeAfter \line[shorten=6pt]{1-5}{4-7}@
+\end{bNiceMatrix}
+\end{BVerbatim}
+\[\begin{bNiceMatrix}
+1      & \Cdots &   & 1      & 2      & \Cdots          & 2      \\
+0      & \Ddots &   & \Vdots & \Vdots & \hspace*{2.5cm} & \Vdots \\
+\Vdots & \Ddots &   &        &        &                 &        \\
+0      & \Cdots & 0 & 1      & 2      & \Cdots          & 2 
+\CodeAfter \line[shorten=6pt]{1-5}{4-7}
+\end{bNiceMatrix}\]
+
 
 \subsection{La commande \textbackslash SubMatrix dans le \textbackslash CodeAfter}
 
@@ -3314,7 +3399,8 @@ lignes en pointillés entre les cases du tableau.
 \smallskip
 Néanmoins, on peut forcer la création d'un nœud avec la commande |\NotEmpty|.\footnote{Il faut toutefois remarquer qu'avec cette commande, la
   case est considérée comme non vide, ce qui a des conséquences sur le tracé des
-lignes pointillées (cf.~p.~\pageref{Cdots}).}
+lignes pointillées (cf.~p.~\pageref{Cdots}) et la déterminations des «coins»
+(cf. p.~\pageref{corners}).}
 
 \bigskip
 Tous les nœuds du document doivent avoir des noms deux à deux distincts et le
@@ -3632,25 +3718,28 @@ noix & noisette & brugnon
 
 \label{noeuds-i}
 
-\colorbox{yellow!30}{Nouveau 5.11}\enskip L'extension \pkg{nicematrix}
-crée un nœud PGF-Tikz nommé simplement $i$ (précédé du préfixe habituel) à
-l'intersection du filet horizontal de numéro $i$ et du filet vertical de
-numéro~$j$ (ou plutôt la position potentielle de ces filets car ils ne sont
-peut-être pas tracés). Ces nœuds sont accessibles dans le |\CodeAfter| mais
-aussi dans le |code-before|.
+L'extension \pkg{nicematrix} crée un nœud PGF-Tikz nommé simplement $i$ (précédé
+du préfixe habituel) à l'intersection du filet horizontal de numéro $i$ et du
+filet vertical de numéro~$i$ (ou plutôt la position potentielle de ces filets
+car ils ne sont peut-être pas tracés). Le dernier nœud a aussi un alias nommé
+simplement |last|.
+
+\smallskip
+\colorbox{yellow!50}{\textbf{Nouveau 5.14}}\enskip Il existe aussi un nœud nommé
+$i$|.5| à mi-chemin entre le nœud $i$ et le nœud $i+1$.
 
+Ces nœuds sont accessibles dans le
+|\CodeAfter| mais aussi dans le |\CodeBefore|.
 
-\colorbox{yellow!50}{Nouveau 5.13}\enskip Le dernier nœud a aussi un alias nommé
-|last|. 
 \begin{center}
 \begin{NiceTabular}{ccc}[hvlines,rules={width=1pt,color=gray}]
-rose & tulipe & lys \\
-arum & iris & violette \\
-muguet & dahlia & souci 
+       & tulipe & lys \\
+arum   &        & violette mauve \\
+muguet & dahlia 
 \CodeAfter
 \tiny
 \begin{tikzpicture}
-\foreach \i in {1,2,3,4}
+\foreach \i in {1,1.5,2,2.5,3,3.5,4}
   { 
     \fill [red] (\i) circle (0.5mm) ; 
     \node [red,above right] at (\i) {\i} ; 
@@ -3663,7 +3752,7 @@ muguet & dahlia & souci
 \bigskip
 Si on utilise Tikz (on rappelle que \pkg{nicematrix} ne charge pas Tikz mais
 uniquement \textsc{pgf} qui est une sous-couche de Tikz), on peut donc accéder
-(dans le |\CodeAfter| mais aussi dans le |code-before|) à l'intersection du filet
+(dans le |\CodeAfter| mais aussi dans le |\CodeBefore|) à l'intersection du filet
 horizontal~$i$ et du filet vertical~$j$ avec la syntaxe |(|$i$\verb+-|+$j$|)|.
 
 
@@ -3700,8 +3789,30 @@ horizontal~$i$ et du filet vertical~$j$ avec la syntaxe |(|$i$\verb+-|+$j$|)|.
 1 & 8 & 28 & 56 & 70 & 56 & 28 & 8 & 1
 \end{NiceMatrix}\]
 
+\bigskip
+Les nœuds de la forme $i$|.5| peuvent être utilisés par exemple pour barrer une
+ligne (si on a chargé Tikz).
+
+\smallskip
+\begin{BVerbatim}[boxwidth=11cm,baseline=c]
+$\begin{pNiceArray}{ccc|c}
+2 & 1 & 3 & 0 \\
+3 & 3 & 1 & 0 \\
+3 & 3 & 1 & 0 
+\CodeAfter 
+  \tikz \draw [red] (~emphase#3.5@-|1) -- (~emphase#3.5@-|last) ;
+\end{pNiceArray}$
+\end{BVerbatim}
+$\begin{pNiceArray}{ccc|c}
+2 & 1 & 3 & 0 \\
+3 & 3 & 1 & 0 \\
+3 & 3 & 1 & 0 
+\CodeAfter 
+  \tikz \draw [red] (3.5-|1) -- (3.5-|last) ;
+\end{pNiceArray}$
 
-\subsection{Les nœuds correspondant aux commandes \textbackslash SubMatrix}
+
+\subsection{Les nœuds correspondants aux commandes \textbackslash SubMatrix}
 
 \label{node-sub-matrix}
 
@@ -3880,6 +3991,8 @@ est sans effet.
 
 \subsection{Lignes diagonales} 
 
+\label{parallelization}
+
 Par défaut, toutes les lignes diagonales\footnote{On parle des lignes créées par
   |\Ddots| et non des lignes créées par une commande |\line| dans le
   |\CodeAfter|.} d'un même tableau sont «parallélisées». Cela signifie que la
@@ -4382,9 +4495,8 @@ précédentes. C'est que les parenthèses, en LaTeX, n'ont pas toutes la même
 largeur suivant leur taille.
 
 \medskip
-\colorbox{yellow!50}{\textbf{Nouveau 5.12}}\enskip Pour résoudre ce problème, on
-peut demander que les délimiteurs soient composés avec leur largeur maximale
-grâce à la clé booléenne |delimiters/max-width|.
+Pour résoudre ce problème, on peut demander que les délimiteurs soient composés
+avec leur largeur maximale grâce à la clé booléenne |delimiters/max-width|.
 
 \begin{Verbatim}[formatcom=\small\color{gray}]
 ~emphase#\begin{NiceMatrixBlock}[auto-columns-width]@
diff --git a/macros/latex/contrib/nicematrix/nicematrix.dtx b/macros/latex/contrib/nicematrix/nicematrix.dtx
index 38269b145c..fb4ebed732 100644
--- a/macros/latex/contrib/nicematrix/nicematrix.dtx
+++ b/macros/latex/contrib/nicematrix/nicematrix.dtx
@@ -15,8 +15,8 @@
 %
 % \fi
 % \iffalse
-\def\myfileversion{5.13}
-\def\myfiledate{2021/03/23}
+\def\myfileversion{5.14}
+\def\myfiledate{2021/04/08}
 %
 %
 %<*batchfile>
@@ -70,6 +70,7 @@ version 2005/12/01 or later.
 \usepackage{varwidth}
 \def\LetterAt{@}
 \parindent 0pt
+\skip \footins = 2 \bigskipamount
 
 \EnableCrossrefs
 \makeatletter
@@ -190,7 +191,8 @@ version 2005/12/01 or later.
 % use these nodes to develop new features. As usual with \textsc{pgf}, the
 % coordinates of these nodes are written in the |.aux| to be used on the next
 % compilation and that's why \pkg{nicematrix} may need \textbf{several
-% compilations}. 
+% compilations}.\footnote{If you use Overleaf, Overleaf will do automatically
+% the right number of compilations.}
 % 
 % \bigskip
 % Most features of \pkg{nicematrix} may be used without explicit use of
@@ -239,13 +241,18 @@ version 2005/12/01 or later.
 % corresponding environments of \pkg{amsmath} (which is loaded by
 % \pkg{nicematrix}): |{matrix}|, |{pmatrix}|, etc. 
 %
+% \medskip
+% \textbf{It's recommended to use primarily the classical environments and to use the
+% environments of \pkg{nicematrix} only when some feature provided by these
+% environments is used (this will save memory).}
+%
 % \medskip 
 % All the environments of the package \pkg{nicematrix} accept, between square
 % brackets, an optional list of \textsl{key=value} pairs. \textbf{There must be
 % no space before the opening bracket (|[|) of this list of options.}
 %
 %\bigskip
-% \textbf{Important}
+% \textbf{Important}\par\nobreak
 %
 % Before the version 5.0, it was mandatory to use, for technical reasons, the 
 % letters |L|, |C| et |R| instead of |l|, |c| et |r| in the preambles of the
@@ -561,15 +568,16 @@ version 2005/12/01 or later.
 % content of the block but draws also the frame of the block with that color;
 % \item the key |line-width| is the width (thickness) of the frame (this key
 % should be used only when the key |draw| is in force);
-% \item \colorbox{yellow!50}{\textbf{New 5.12}}\enskip the key |rounded-corners|
-% requires rounded corners (for the frame drawn by |draw| and the shape drawn by
-% |fill|) with a radius equal to the value of that key (the default value is
-% 4~pt\footnote{This value is the initial value of the \emph{rounded corners} of
-% Tikz.}).
-% \item \colorbox{yellow!50}{\textbf{New 5.13}}\enskip the key |borders| provides
-% the ability to draw only some borders of the blocks; the value of that key is
-% a (comma-separated) list of elements covered by |left|, |right|, |top| and
-% |bottom|. 
+% \item the key |rounded-corners| requires rounded corners (for the frame drawn
+% by |draw| and the shape drawn by |fill|) with a radius equal to the value of
+% that key (the default value is 4~pt\footnote{This value is the initial value
+% of the \emph{rounded corners} of Tikz.});
+% \item the key |borders| provides the ability to draw only some borders of the
+% blocks; the value of that key is a (comma-separated) list of elements covered
+% by |left|, |right|, |top| and |bottom|;
+% \item \colorbox{yellow!50}{\bfseries New 5.14}\enskip the keys |t| and |b| fix
+% the base line that will be given to the block when it has a multi-line content
+% (the lines are separated by |\\|). 
 % \end{itemize}
 % 
 % \interitem
@@ -679,6 +687,8 @@ version 2005/12/01 or later.
 % background of a unique celle, there is no point using the command |\Block|:
 % it's possible to use the command |\cellcolor| (when the key |colortbl-like| is
 % used).}
+% 
+% \item It's possible to draw one or several borders of the cell with the key |borders|.
 % \end{itemize}
 % 
 % \bigskip
@@ -785,7 +795,8 @@ version 2005/12/01 or later.
 %
 % \bigskip
 % However, the vertical rules are not drawn in the blocks (created by |\Block|:
-% cf.~p.~\pageref{Block}). 
+% cf.~p.~\pageref{Block}) nor in the corners (created by the key |corner|:
+% cf.~p.~\pageref{corners}). 
 %
 % \bigskip
 % If you use \pkg{booktabs} (which provides |\toprule|, |\midrule|,
@@ -926,26 +937,45 @@ version 2005/12/01 or later.
 % page~\pageref{OnlyMainNiceMatrix}.
 %
 %
-% \subsection{The command \textbackslash Hline}
+% \subsection{The tools of nicematrix for the rules}
 %
-% We have said that the vertical rules specified by a symbol ``\verb+|+'' in the
-% preamble (for the environments with preamble, of course) are not drawn in the
-% blocks.\footnote{Those blocks are those created by the commands \verb|\Block|
-% and |\multicolumn| but also those implicitely determined by the continuous
-% dotted lines (created by \verb|\Cdots|, etc.).} 
+% Here are the tools provided by \pkg{nicematrix} for the rules.
+% \begin{itemize}
+% \item the keys |hlines|, |vlines| and |hvlines|;
+% \item the specifier ``\verb+|+'' in the preamble (for the environments with
+% preamble);
+% \item the command |\Hline|.
+% \end{itemize}
+% 
+% \medskip
+% \textbf{All these tools don't draw the rules in the blocks nor in the
+% empty corners (when the key |corners| is used).}
+% \begin{itemize} 
+% \item These blocks are:
+% \begin{itemize}
+% \item the blocks created by the command |\Block|\footnote{And also the command \verb|\multicolumn| also
+% it's recommended to use instead |\Block| in the environments of
+% \pkg{nicematrix}.} presented
+% p.~\pageref{Block};
+% \item the blocks implicitely delimited by the continuous dotted lines created
+% by |\Cdots|, |Vdots|, etc. (cf.~p.~\pageref{Cdots}).
+% \end{itemize}
+% \item The corners are created by the key |corners| explained below (see p.~\pageref{corners}).
+% \end{itemize}
 %
-% \smallskip
-% \colorbox{yellow!50}{\textbf{New 5.13}}\enskip In order to have horizontal
-% rules with the same behaviour, \pkg{nicematrix} provides the command |\Hline|.
+% In particular, this remark explains the difference between the standard
+% command |\hline| and the command |\Hline| provided by \pkg{nicematrix}.
 % 
 %
-% \subsection{The keys hlines and vlines}
+% \subsubsection{The keys hlines and vlines}
 % 
-% The key |hlines| draws all the horizontal rules and the key |vlines| draws all
-% the vertical rules excepted in the blocks, created by |\Block| and the virtual
-% blocks determined by dotted lines: |\Cdots|, |\Vdots|, etc.. In fact, in the
-% environments with delimiters (as |{pNiceMatrix}| or |{bNiceArray}|) the
-% exterior rules are not drawn (as expected).
+% The keys |hlines| and |vlines| (which draw, of course, horizontal and vertical
+% rules) take in as value a list of numbers which are the numbers of the rules
+% to draw.
+%
+% In fact, for the environments with delimiters (such as |{pNiceMatrix}| or
+% |{bNiceArray}|), the key |vlines| don't draw the exterior rules (this is
+% certainly the expected behaviour).
 % 
 % \medskip
 % \begin{BVerbatim}[baseline=c,boxwidth=10.6cm]
@@ -962,21 +992,13 @@ version 2005/12/01 or later.
 % \end{pNiceMatrix}$
 %
 %
-% \bigskip
-% \colorbox{yellow!50}{\textbf{New 5.13}}\enskip It's possible to provide to the
-% key |vlines| a (comma-separated) list of numbers, which are the numbers of the
-% vertical rules to draw. The key |hlines| has a similar behaviour.
 %
-%
-% \subsection{The key hvlines}
+% \subsubsection{The key hvlines}
 % \label{hvlines}
 %
-% The key |hvlines| draws all the vertical and horizontal rules (excepted
-% in the blocks and the virtual blocks determined by dotted lines and excepted
-% the rules corresponding of the frame of the blocks using the key |draw| which
-% are drawn with their own characteristics).
+% The key |hvlines| (no value) is the conjonction of the keys |hlines| and |vlines|.
 %
-% \medskip
+% \smallskip
 % \begin{Verbatim}
 % \setlength{\arrayrulewidth}{1pt}
 % \begin{NiceTabular}{cccc}[~emphase#hvlines@,rules/color=blue]
@@ -998,71 +1020,104 @@ version 2005/12/01 or later.
 % \end{center}
 %
 %
-% \subsection{The key hvlines-except-corners}
+% \subsubsection{The (empty) corners}
 %
-% \label{except-corners}
+% \label{corners}
 %
-% The key |hvlines-except-corners| draws all the horizontal and vertical rules,
-% excepted in the blocks (and the virtual blocks determined by dotted lines) and
-% excepted in the empty corners. 
+% The four |corners| of an array will be designed by |NW|, |SW|, |NE| and |SE|
+% (\emph{north west}, \emph{south west}, \emph{north east} and \emph{south east}).
 %
-% \medskip
-% \begin{Verbatim}
-% \begin{NiceTabular}{*{6}{c}}[~emphase#hvlines-except-corners@,cell-space-top-limit=3pt]
+% For each of these corners, we will call \emph{empty corner} (or simply
+% \emph{corner}) the reunion of all the empty rectangles starting from the cell
+% actually in the corner of the array.\footnote{For sake of completeness, we
+% should also say that a cell contained in a block (even an empty cell) is not
+% taken into account for the determination of the corners. That behaviour is natural.}
+% 
+% However, it's possible, for a cell without content, to require \pkg{nicemarix}
+% to consider that cell as not empty with the key |\NotEmpty|.
+% 
+%\bigskip
+% \begin{minipage}{9cm}
+% In the example on the right (where B is in the center of a block of size
+% $2\times2$), we have colored in blue the four (empty) corners of the array. 
+% \end{minipage}\hspace{2cm}%
+% \begin{NiceTabular}{*{6}{c}}[cell-space-top-limit=3pt]
+% \CodeBefore
+%   \rectanglecolor{blue!10}{1-1}{4-2}
+%   \rectanglecolor{blue!10}{1-1}{1-4}
+%   \rectanglecolor{blue!10}{1-6}{3-6}
+%   \rectanglecolor{blue!10}{7-1}{9-1}
+%   \rectanglecolor{blue!10}{7-5}{9-6}
+% \Body
 %   &   &   &   & A \\
 %   &   & A & A & A \\
 %   &   &   & A \\
 %   &   & A & A & A & A \\
 % A & A & A & A & A & A \\
 % A & A & A & A & A & A \\
+%   & A & A & A \\
 %   & \Block{2-2}{B} & & A \\
 %   &   &   & A \\
-%   & A & A & A \\
 % \end{NiceTabular}
-% \end{Verbatim}
-% %
-% \begin{center}
-% \begin{NiceTabular}{*{6}{c}}[hvlines-except-corners,cell-space-top-limit=3pt]
+%
+% \bigskip
+% \colorbox{yellow!50}{\textbf{New 5.14}}\enskip When the key |corners| is used,
+% \pkg{nicematrix} computes the (empty) corners and these corners will be taken
+% into account by the tools for drawing the rules (the rules won't be drawn in
+% the corners). \emph{Remark}: In the previous versions of \pkg{nicematrix},
+% there was only a key |hvlines-except-corners| (now considered as obsolete).
+%
+% \bigskip
+% \begin{BVerbatim}[boxwidth=11cm,baseline=c]
+% \NiceMatrixOptions{cell-space-top-limit=3pt}
+% \begin{NiceTabular}{*{6}{c}}[~emphase#corners@,hvlines]
 %   &   &   &   & A \\
 %   &   & A & A & A \\
 %   &   &   & A \\
 %   &   & A & A & A & A \\
 % A & A & A & A & A & A \\
 % A & A & A & A & A & A \\
+%   & A & A & A \\
 %   & \Block{2-2}{B} & & A \\
 %   &   &   & A \\
+% \end{NiceTabular}
+% \end{BVerbatim}
+% \begin{NiceTabular}{*{6}{c}}[corners,hvlines,cell-space-top-limit=3pt]
+%   &   &   &   & A \\
+%   &   & A & A & A \\
+%   &   &   & A \\
+%   &   & A & A & A & A \\
+% A & A & A & A & A & A \\
+% A & A & A & A & A & A \\
 %   & A & A & A \\
+%   & \Block{2-2}{B} & & A \\
+%   &   &   & A \\
 % \end{NiceTabular}
-% \end{center}
 %
-% As we can see, an ``empty corner'' is composed by the reunion of all the empty
-% rectangles starting from the cell actually in the corner of the array.
 %
 % \bigskip
-% It's possible to give as value to the key |\hvlines-except-corners| a list of
-% the corners to take into consideration. The corners are designed by |NW|,
-% |SW|, |NE| and |SE| (\emph{north west}, \emph{south west}, \emph{north east}
-% and \emph{south east}).
+% It's also possible to provide to the key |corners| a (comma-separated) list of
+% corners (designed by |NW|, |SW|, |NE| and |SE|).
 %
-% \bigskip
+% \medskip
 % \begin{BVerbatim}[boxwidth=11cm,baseline=c]
-% \begin{NiceTabular}{*{6}{c}}%
-%   [~emphase#hvlines-except-corners=NE@,cell-space-top-limit=3pt]
+% \NiceMatrixOptions{cell-space-top-limit=3pt}
+% \begin{NiceTabular}{*{6}{c}}[~emphase#corners=NE@,hvlines]
 % 1\\
 % 1&1\\
 % 1&2&1\\
 % 1&3&3&1\\
 % 1&4&6&4&1\\
-% 1&5&10&10&5&1
+%  & & & & &1
 % \end{NiceTabular}
 % \end{BVerbatim}
-% \begin{NiceTabular}{*{6}{c}}[c,hvlines-except-corners=NE,cell-space-top-limit=3pt]
+% \begin{NiceTabular}{*{6}{c}}[c,corners=NE,hvlines,cell-space-top-limit=3pt]
 % 1\\
 % 1&1\\
 % 1&2&1\\
 % 1&3&3&1\\
 % 1&4&6&4&1\\
-% 1&5&10&10&5&1
+%  & & & & &1
 % \end{NiceTabular}
 %
 % \bigskip
@@ -1213,10 +1268,10 @@ version 2005/12/01 or later.
 % The extension \pkg{nicematrix} provides a key |code-before| for some code that
 % will be executed before the drawing of the tabular. 
 %
-% \medskip
-% \colorbox{yellow!50}{\textbf{New 5.12}}\enskip An alternative syntax is
-% provided: it's possible to put the content of that |code-before| between the
-% keywords |\CodeBefore| and |\Body| at the beginning of the environment.
+% \medskip 
+% An alternative syntax is provided: it's possible to put the content of that
+% |code-before| between the keywords |\CodeBefore| and |\Body| at the beginning
+% of the environment.
 % 
 % \begin{Verbatim}
 % \begin{pNiceArray}{~textsl#preamble@}
@@ -1379,10 +1434,10 @@ version 2005/12/01 or later.
 % \begin{itemize}
 % \item The key |cols| describes a set of columns. The command |\rowcolors| will
 % color only the cells of these columns. The value is a comma-separated list of
-% intervals of the form $i$-$j$.
+% intervals of the form $i$-$j$ (where $i$ or $j$ may be replaced by |*|).
 % \item With the key |restart|, each interval of rows (specified by the first
 % mandatory argument) begins with the same color.\footnote{Otherwise, the color
-% of a given row relies only upon the parity of its number.}
+% of a given row relies only upon the parity of its absolute number.}
 % \item With the key |respect-blocks| the ``rows'' alternately colored may extend over
 % several rows if they have to incorporate blocks (created with the command
 % |\Block|: cf.~p.~\pageref{Block}).
@@ -1489,14 +1544,12 @@ version 2005/12/01 or later.
 % p.~\pageref{key-R}).
 %
 %
-% \item \colorbox{yellow!50}{\textbf{New 5.13}}\enskip 
-% The command |\arraycolor| takes in as mandatory argument a color and color
-% the whole tabular with that color (excepted the potential exterior rows and
-% columns: cf.~p.~\pageref{exterior}). This command is useful thanks to its key
-% |except-corners| (in the third argument, which is a optional argument between
-% square brackets). The definition of these ``corners'' has been given
-% p.~\pageref{except-corners} when we have presented the key
-% |hvlines-except-corners|.
+% \item The command |\arraycolor| takes in as mandatory argument a color and
+% color the whole tabular with that color (excepted the potential exterior rows
+% and columns: cf.~p.~\pageref{exterior}). This command is useful thanks to its
+% key |except-corners| (in the third argument, which is a optional argument
+% between square brackets). The definition of these ``corners'' has been given
+% p.~\pageref{corners} when we have presented the key |corners|.
 %
 % \label{arraycolor}
 % 
@@ -2387,8 +2440,10 @@ version 2005/12/01 or later.
 % 
 % The dotted lines determine virtual blocks which have the same behaviour
 % regarding the rules (the rules specified by the specifier \verb+|+ in the
-% preamble and by the keys |hlines|, |vlines|, |hvlines| and
-% |hvlines-except-corners| are not drawn within the blocks).
+% preamble, by the command |\Hline| and by the keys |hlines|, |vlines| and
+% |hvlines| are not drawn within the blocks).\footnote{On the other side, the
+% command \verb|\line| in the \verb|\CodeAfter|
+% (cf.~p.~\pageref{line-in-code-after}) does \emph{not} create block.}
 %
 % \medskip
 % \begin{BVerbatim}[baseline=c,boxwidth=10.6cm]
@@ -2412,19 +2467,19 @@ version 2005/12/01 or later.
 %
 % \label{code-after}
 % The option |code-after| may be used to give some code that will be executed
-% after the construction of the matrix.\footnote{There is also a key
+% \emph{after} the construction of the matrix.\footnote{There is also a key
 % |code-before| described p.~\pageref{code-before}.}
 %
 % \medskip
 % For the legibility of the code, an alternative syntax is provided: it's
-% possible to give the instructions of the |\code-after| at the end of the
+% possible to give the instructions of the |code-after| at the end of the
 % environment, after the keyword |\CodeAfter|. Although |\CodeAfter| is a
 % keyword, it takes in an optional argument (between square brackets). The keys
 % accepted form a subset of the keys of the command |\WithArrowsOptions|.
 %
 %
 % \medskip
-% The experienced users may use, for instance, the PGF/Tikz nodes created by
+% The experienced users may, for instance, use the PGF/Tikz nodes created by
 % \pkg{nicematrix} in the |\CodeAfter|. These nodes are described further
 % beginning on p.~\pageref{PGF-nodes}.
 % 
@@ -2434,11 +2489,16 @@ version 2005/12/01 or later.
 %
 % \subsection{The command \textbackslash line in the \textbackslash CodeAfter}
 % 
+% \label{line-in-code-after}
 % The command |\line| draws directly dotted lines between nodes. It takes in two
 % arguments for the two cells to link, both of the form $i$-$j$ where is the
-% number of the row and $j$ is the number of the column. It may be used, for
-% example, to draw a dotted line between two adjacent
-% cells. \label{line-in-code-after}
+% number of the row and $j$ is the number of the column. The options available
+% for the customisation of the dotted lines created by |\Cdots|, |\Vdots|, etc.
+% are also available for this command (cf. p.~\pageref{customisation}).
+%
+% \bigskip
+% This command may be used, for example, to draw a dotted line between two
+% adjacent cells.
 %
 % \medskip
 % \begin{BVerbatim}[baseline=c,boxwidth=11cm]
@@ -2462,10 +2522,29 @@ version 2005/12/01 or later.
 % \end{pNiceMatrix}$
 % \end{scope}
 %
+% \bigskip
+% It can also be used to draw a diagonal line not parallel to the other diagonal
+% lines (by default, the dotted lines drawn by |\Ddots| are ``parallelized'':
+% cf.~p.~\pageref{parallelization}).
+%
 % \medskip
-% The options available for the customisation of the dotted lines created by
-% |\Cdots|, |\Vdots|, etc. are also available for this command (cf.
-% p.~\pageref{customisation}). 
+% \begin{BVerbatim}
+% \begin{bNiceMatrix}
+% 1      & \Cdots &   & 1      & 2      & \Cdots          & 2      \\
+% 0      & \Ddots &   & \Vdots & \Vdots & \hspace*{2.5cm} & \Vdots \\
+% \Vdots & \Ddots &   &        &        &                 &        \\
+% 0      & \Cdots & 0 & 1      & 2      & \Cdots          & 2 
+% ~emphase#\CodeAfter \line[shorten=6pt]{1-5}{4-7}@
+% \end{bNiceMatrix}
+% \end{BVerbatim}
+% \[\begin{bNiceMatrix}
+% 1      & \Cdots &   & 1      & 2      & \Cdots          & 2     \\
+% 0      & \Ddots &   & \Vdots & \Vdots & \hspace*{2.5cm} & \Vdots \\
+% \Vdots & \Ddots &   &        &        &                 &        \\
+% 0      & \Cdots & 0 & 1      & 2      & \Cdots          & 2 
+% \CodeAfter \line[shorten=6pt]{1-5}{4-7}
+% \end{bNiceMatrix}\]
+% 
 %
 %
 % \subsection{The command \textbackslash SubMatrix in the \textbackslash CodeAfter}
@@ -3277,10 +3356,11 @@ version 2005/12/01 or later.
 % \textbf{Caution} : By default, no node is created in a empty cell.
 %
 % \smallskip
-% However, it's possible to impose the creation of a node with the command |\NotEmpty|.
-% \footnote{One should note that, with that command, the cell is considered as
-% non-empty, which has consequencies for the continuous dotted lines (cf.
-% p.~\pageref{Cdots}).} 
+% However, it's possible to impose the creation of a node with the command
+% |\NotEmpty|. \footnote{One should note that, with that command, the cell is
+% considered as non-empty, which has consequencies for the continuous dotted
+% lines (cf. p.~\pageref{Cdots}) and the computation of the ``corners''
+% (cf.~p.~\pageref{corners}).}
 %
 % \medskip
 % The nodes of a document must have distinct names. That's why the names of the
@@ -3589,24 +3669,26 @@ version 2005/12/01 or later.
 % \subsection{The nodes which indicate the position of the rules}
 %
 % \label{nodes-i}
-% \colorbox{yellow!30}{New 5.11}\enskip The package \pkg{nicematrix}
-% creates a PGF/Tikz node merely called $i$ (with the classical prefix) at the
-% intersection of the horizontal rule of number~$i$ and the vertical rule of
-% number~$j$ (more specifically the potential position of those rules because
-% maybe there are not actually drawn). These nodes are available in the
-% |code-before| and the |\CodeAfter|.
-%
-% \colorbox{yellow!50}{\textbf{New 5.13}}\enskip The last node has also an alias called
-% |last|. 
+% The package \pkg{nicematrix} creates a PGF/Tikz node merely called $i$ (with
+% the classical prefix) at the intersection of the horizontal rule of number~$i$
+% and the vertical rule of number~$i$ (more specifically the potential position
+% of those rules because maybe there are not actually drawn). The last node has
+% also an alias called |last|.
+% 
+% \colorbox{yellow!50}{\textbf{New 5.14}}\enskip There is also a node called
+% $i$|.5| midway between the node $i$ and the node $i+1$. 
+%
+% These nodes are available in the |\CodeBefore| and the |\CodeAfter|.
+% 
 % \begin{center}
 % \begin{NiceTabular}{ccc}[hvlines,rules/width=1pt,rules/color=gray]
-% rose & tulipe & lys \\
-% arum & iris & violette \\
-% muguet & dahlia & souci 
+%      & tulipe   & lys \\
+% arum &          & violette mauve \\
+% muguet & dahlia 
 % \CodeAfter
 %   \tiny
 %   \begin{tikzpicture}
-%   \foreach \i in {1,2,3,4}
+%   \foreach \i in {1,1.5,2,2.5,3,3.5,4}
 %     { 
 %       \fill [red] (\i) circle (0.5mm) ; 
 %       \node [red,above right] at (\i) {\i} ; 
@@ -3618,7 +3700,7 @@ version 2005/12/01 or later.
 % \bigskip
 % If we use Tikz (we remind that \pkg{nicematrix} does not load Tikz by default,
 % by only \textsc{pgf}, which is a sub-layer of Tikz), we can access, in the
-% |\CodeAfter| but also in the |code-before|, to the intersection of the
+% |\CodeAfter| but also in the |\CodeBefore|, to the intersection of the
 % (potential) horizontal rule~$i$ and the (potential) vertical rule~$j$ with the
 % syntax |(|$i$\verb+-|+$j$|)|. 
 %
@@ -3655,6 +3737,29 @@ version 2005/12/01 or later.
 % 1 & 8 & 28 & 56 & 70 & 56 & 28 & 8 & 1
 % \end{NiceMatrix}\]
 %
+%
+% \bigskip
+% The nodes of the form $i$|.5| may be used, for example to cross a row of a
+% matrix (if Tikz is loaded).
+%
+% \smallskip
+% \begin{BVerbatim}[boxwidth=11cm,baseline=c]
+% $\begin{pNiceArray}{ccc|c}
+% 2 & 1 & 3 & 0 \\
+% 3 & 3 & 1 & 0 \\
+% 3 & 3 & 1 & 0 
+% \CodeAfter 
+%   \tikz \draw [red] (~emphase#3.5@-|1) -- (~emphase#3.5@-|last) ;
+% \end{pNiceArray}$
+% \end{BVerbatim}
+% $\begin{pNiceArray}{ccc|c}
+% 2 & 1 & 3 & 0 \\
+% 3 & 3 & 1 & 0 \\
+% 3 & 3 & 1 & 0 
+% \CodeAfter 
+%   \tikz \draw [red] (3.5-|1) -- (3.5-|last) ;
+% \end{pNiceArray}$
+%
 % \subsection{The nodes corresponding to the command  \textbackslash SubMatrix}
 %
 % \label{node-sub-matrix}
@@ -3829,6 +3934,7 @@ version 2005/12/01 or later.
 % 
 % \subsection{Diagonal lines} 
 %
+% \label{parallelization}
 % By default, all the diagonal lines\footnote{We speak of the lines created by
 % |\Ddots| and not the lines created by a command |\line| in |code-after|.} of a
 % same array are ``parallelized''. That means that the first diagonal line is
@@ -4319,9 +4425,9 @@ version 2005/12/01 or later.
 % (smaller parenthesis are a bit slimer).
 %
 % \medskip
-% \colorbox{yellow!50}{\textbf{New 5.12}}\enskip In order the solve that
-% problem, it's possible to require the delimiters to be composed with the
-% maximal width, thanks to the boolean key |delimiters/max-width|.
+% In order the solve that problem, it's possible to require the delimiters to be
+% composed with the maximal width, thanks to the boolean key
+% |delimiters/max-width|.
 %
 % \begin{Verbatim}[formatcom=\small\color{gray}]
 % ~emphase#\begin{NiceMatrixBlock}[auto-columns-width]@
@@ -4689,7 +4795,7 @@ version 2005/12/01 or later.
 % \end{pNiceArray}\]
 %
 % 
-% \subsection{Utilisation of \textbackslash SubMatrix in the code-before}
+% \subsection{Utilisation of \textbackslash SubMatrix in the \textbackslash CodeBefore}
 %
 % In the following example, we illustrate the mathematical product of two
 % matrices. 
@@ -5658,7 +5764,7 @@ version 2005/12/01 or later.
 % 
 % \medskip
 % We are able to determine the number of columns specified in the preamble (for
-% the environments with explicit preamble, of course and without the potential
+% the environments with explicit preamble of course and without the potential
 % exterior columns).
 %    \begin{macrocode}
 \int_new:N \g_@@_static_num_of_col_int
@@ -5693,10 +5799,15 @@ version 2005/12/01 or later.
 %    \end{macrocode}
 % 
 % \medskip
-% The parameter of position of the label of a block (|c|, |r| or |l|).
+% The parameters of position of the label of a block. For the horizontal
+% position, the possible values are |c|, |r| and |l|. For the vertical position,
+% the possible values are |c|, |t| and |b|. Of course, it would be intesting to
+% program a key |T| and a key |B|.
 %    \begin{macrocode}
-\tl_new:N \l_@@_pos_of_block_tl
-\tl_set:Nn \l_@@_pos_of_block_tl { c }
+\tl_new:N \l_@@_hpos_of_block_tl
+\tl_set:Nn \l_@@_hpos_of_block_tl { c }
+\tl_new:N \l_@@_vpos_of_block_tl
+\tl_set:Nn \l_@@_vpos_of_block_tl { c }
 %    \end{macrocode}
 %
 % \medskip
@@ -6186,12 +6297,9 @@ version 2005/12/01 or later.
 %
 %
 % \bigskip
-% The flag |\l_@@_except_corners_bool| will be raised when the key
-% |except-corners| will be used. In that case, the corners will be computed
-% before we draw rules and the rules won't be drawn in the corners. As expected,
-% the key |hvlines-except-corners| raises the key |except-corners|.
+% The following parameter correspond to the key |corners|.
 %    \begin{macrocode}
-\clist_new:N \l_@@_except_corners_clist
+\clist_new:N \l_@@_corners_clist
 %    \end{macrocode}
 % 
 %    \begin{macrocode}
@@ -6435,15 +6543,18 @@ version 2005/12/01 or later.
 \keys_define:nn { NiceMatrix / Env } 
   { 
     delimiters/max-width .bool_set:N = \l_@@_delimiters_max_width_bool ,
-    except-corners .clist_set:N = \l_@@_except_corners_clist , 
-    except-corners .default:n = { NW , SW , NE , SE } ,
+%    \end{macrocode}
+% The key |hvlines-except-corners| is now deprecated.
+%    \begin{macrocode}
     hvlines-except-corners .code:n = 
       { 
-        \clist_set:Nn \l_@@_except_corners_clist { #1 }
+        \clist_set:Nn \l_@@_corners_clist { #1 }
         \clist_set:Nn \l_@@_vlines_clist { all }
         \clist_set:Nn \l_@@_hlines_clist { all }
       } ,
     hvlines-except-corners .default:n = { NW , SW , NE , SE } ,
+    corners .clist_set:N = \l_@@_corners_clist ,
+    corners .default:n = { NW , SW , NE , SE } ,
     code-before .code:n = 
      {
        \tl_if_empty:nF { #1 } 
@@ -6828,7 +6939,6 @@ version 2005/12/01 or later.
 %    \begin{macrocode}
     \int_compare:nNnT \c@jCol = 1
       { \int_compare:nNnT \l_@@_first_col_int = 1 \@@_begin_of_row: }
-    \int_gset:Nn \g_@@_col_total_int { \int_max:nn \g_@@_col_total_int \c@jCol }
 %    \end{macrocode}
 % The content of the cell is composed in the box |\l_@@_cell_box| because we want
 % to compute some dimensions of the box. The |\hbox_set_end:| corresponding to
@@ -7023,6 +7133,7 @@ version 2005/12/01 or later.
           \@@_node_for_the_cell:
           { \box_use_drop:N \l_@@_cell_box }
       }
+    \int_gset:Nn \g_@@_col_total_int { \int_max:nn \g_@@_col_total_int \c@jCol }
     \bool_gset_false:N \g_@@_empty_cell_bool
     \bool_gset_false:N \g_@@_not_empty_cell_bool
   } 
@@ -8136,7 +8247,7 @@ version 2005/12/01 or later.
 %    \end{macrocode}
 %
 % First, we have to store our preamble in the token register |\@temptokena|
-% (those ``token registers'' are not supported by \pkg{expl3}).
+% (those ``token registers'' are \emph{not} supported by \pkg{expl3}).
 %    \begin{macrocode}
         \exp_args:NV \@temptokena \g_@@_preamble_tl 
 %    \end{macrocode}
@@ -9862,6 +9973,22 @@ version 2005/12/01 or later.
   }
 %    \end{macrocode}
 %
+% \bigskip
+% We define a new \textsc{pgf} shape for the diag nodes because we want to
+% provide a anchor called |.5| for those nodes.
+%    \begin{macrocode}
+\pgfdeclareshape { @@_diag_node }
+  {
+    \savedanchor { \five }
+      {
+        \dim_gset_eq:NN \pgf@x \l_tmpa_dim 
+        \dim_gset_eq:NN \pgf@y \l_tmpb_dim 
+      }
+    \anchor { 5 } { \five }
+    \anchor { center } { \pgfpointorigin }
+  }
+%    \end{macrocode}
+% 
 % 
 % \bigskip
 % The following command creates the diagonal nodes (in fact, if the matrix is
@@ -9871,13 +9998,35 @@ version 2005/12/01 or later.
   {
     \pgfpicture
     \pgfrememberpicturepositiononpagetrue
-    \int_step_inline:nn { \int_max:nn \c@iRow \c@jCol + 1 }
+    \int_step_inline:nn { \int_max:nn \c@iRow \c@jCol }
       {
-        \@@_qpoint:n { row - \int_min:nn { ##1 } { \c@iRow + 1 } } 
-        \dim_set_eq:NN \l_tmpa_dim \pgf@y 
         \@@_qpoint:n { col - \int_min:nn { ##1 } { \c@jCol + 1 } } 
-        \pgfcoordinate { \@@_env: - ##1 } { \pgfpoint \pgf@x \l_tmpa_dim } 
+        \dim_set_eq:NN \l_tmpa_dim \pgf@x
+        \@@_qpoint:n { row - \int_min:nn { ##1 } { \c@iRow + 1 } } 
+        \dim_set_eq:NN \l_tmpb_dim \pgf@y
+        \@@_qpoint:n { col - \int_min:nn { ##1 + 1 } { \c@jCol + 1 } } 
+        \dim_set_eq:NN \l_tmpc_dim \pgf@x
+        \@@_qpoint:n { row - \int_min:nn { ##1 + 1 } { \c@iRow + 1 } } 
+        \dim_set_eq:NN \l_tmpd_dim \pgf@y
+        \pgftransformshift { \pgfpoint \l_tmpa_dim \l_tmpb_dim }
+%    \end{macrocode}
+% Now, |\l_tmpa_dim| and |\l_tmpb_dim| become the width and the height of the
+% node (of shape |@à_diag_node|) that we will construct.
+%    \begin{macrocode}
+        \dim_set:Nn \l_tmpa_dim { ( \l_tmpc_dim - \l_tmpa_dim ) / 2 } 
+        \dim_set:Nn \l_tmpb_dim { ( \l_tmpd_dim - \l_tmpb_dim ) / 2 } 
+        \pgfnode { @@_diag_node } { center } { } { \@@_env: - ##1 } { }
       }
+%    \end{macrocode}
+% Now, the last node. Of course, that is only a |coordinate| because there is
+% not |.5| anchor for that node.
+%    \begin{macrocode}
+    \int_set:Nn \l_tmpa_int { \int_max:nn \c@iRow \c@jCol + 1 }
+    \@@_qpoint:n { row - \int_min:nn { \l_tmpa_int } { \c@iRow + 1 } } 
+    \dim_set_eq:NN \l_tmpa_dim \pgf@y 
+    \@@_qpoint:n { col - \int_min:nn { \l_tmpa_int } { \c@jCol + 1 } } 
+    \pgfcoordinate 
+      { \@@_env: - \int_use:N \l_tmpa_int } { \pgfpoint \pgf@x \l_tmpa_dim }  
     \pgfnodealias 
       { \@@_env: - last }
       { \@@_env: - \int_eval:n { \int_max:nn \c@iRow \c@jCol + 1 } }
@@ -9885,35 +10034,6 @@ version 2005/12/01 or later.
   }
 %    \end{macrocode}
 %
-% \bigskip
-% As for now, the ½ nodes are not documented and they are created only in the
-% native \textsc{utf8} engines, that is to say XeLaTeX and LuaLaTeX.
-%    \begin{macrocode}
-\bool_if:nT
- { \sys_if_engine_xetex_p: || \sys_if_engine_luatex_p: }
- { \tl_put_right:Nn \@@_create_diag_nodes: \@@_create_half_nodes: }
-%    \end{macrocode}
-% 
-%    \begin{macrocode}
-\cs_new_protected:Npn \@@_create_half_nodes:
-  {
-    \int_step_inline:nn { \int_max:nn \c@iRow \c@jCol }
-      {
-        \pgfpicture
-        \pgfrememberpicturepositiononpagetrue
-        \pgfcoordinate { \@@_env: - ##1 ½ } 
-          {
-            \pgfpointscale { 0.5 } 
-              { 
-                \pgfpointadd 
-                  { \@@_qpoint:n { ##1 } } 
-                  { \@@_qpoint:n { \int_eval:n { ##1 + 1 } } } 
-              }
-          }
-        \endpgfpicture
-      }
-  }
-%    \end{macrocode}
 % 
 % \bigskip
 % \subsection*{We draw the dotted lines}
@@ -10754,21 +10874,13 @@ version 2005/12/01 or later.
   {
     \bool_if:NTF \l_@@_initial_open_bool
       {
-        % \@@_qpoint:n { row - \int_use:N \l_@@_initial_i_int }
-        % \dim_set_eq:NN \l_@@_y_initial_dim \pgf@y
         \@@_open_y_initial_dim:
-        % \@@_qpoint:n { col - \@@_succ:n \l_@@_initial_j_int }
-        % \dim_set_eq:NN \l_@@_x_initial_dim \pgf@x
         \@@_open_x_initial_dim:
       }
       { \@@_set_initial_coords_from_anchor:n { south~west } }
     \bool_if:NTF \l_@@_final_open_bool
       {
-        % \@@_qpoint:n { row - \@@_succ:n \l_@@_final_i_int }
-        % \dim_set_eq:NN \l_@@_y_final_dim \pgf@y
         \@@_open_y_final_dim:
-        % \@@_qpoint:n { col - \int_use:N \l_@@_final_j_int }
-        % \dim_set_eq:NN \l_@@_x_final_dim \pgf@x
         \@@_open_x_final_dim:
       }
       { \@@_set_final_coords_from_anchor:n { north~east } } 
@@ -11247,10 +11359,6 @@ version 2005/12/01 or later.
     \exp_args:NNe 
       \@@_old_multicolumn 
       { #1 } 
-%    \end{macrocode}
-% We will have to replace |\tl_lower_case:n| in the future since it seems to be
-% deprecated.
-%    \begin{macrocode}
       { 
         \exp_args:Ne \str_case:nn { \str_foldcase:n { #2 } }
           {
@@ -11925,7 +12033,7 @@ version 2005/12/01 or later.
 %    \end{macrocode}
 % First, we compute the corners. 
 %    \begin{macrocode}
-    \clist_set:Nn \l_@@_except_corners_clist { #3 }
+    \clist_set:Nn \l_@@_corners_clist { #3 }
     \@@_compute_corners:
 %    \end{macrocode}
 % Now, for each cell of the array (excepted the potential exterior rows and
@@ -12151,8 +12259,13 @@ version 2005/12/01 or later.
         \tl_if_in:NnTF \l_tmpa_tl { - } 
           { \@@_cut_on_hyphen:w ##1 \q_stop }  
           { \@@_cut_on_hyphen:w ##1 - ##1 \q_stop }  
-        \tl_if_empty:NT \l_tmpa_tl { \tl_set:Nn \l_tmpa_tl { 1 } }  
-        \tl_if_empty:NT \l_tmpb_tl
+        \bool_lazy_or:nnT
+          { \tl_if_blank_p:V \l_tmpa_tl }
+          { \str_if_eq_p:Vn \l_tmpa_tl { * } }
+          { \tl_set:Nn \l_tmpa_tl { 1 } }  
+        \bool_lazy_or:nnT
+          { \tl_if_blank_p:V \l_tmpb_tl }
+          { \str_if_eq_p:Vn \l_tmpb_tl { * } }
           { \tl_set:Nx \l_tmpb_tl { \int_use:N \c@jCol } }
         \int_compare:nNnT \l_tmpb_tl > \c@jCol
           { \tl_set:Nx \l_tmpb_tl { \int_use:N \c@jCol } }
@@ -12220,7 +12333,7 @@ version 2005/12/01 or later.
 %    \end{macrocode}
 % 
 % \bigskip
-% When the user uses the key |colortbll-like|, the following command will
+% When the user uses the key |colortbl-like|, the following command will
 % be linked to |\rowcolor| in the tabular.
 %    \begin{macrocode}
 \NewDocumentCommand \@@_rowcolor_tabular { O { } m }
@@ -12234,15 +12347,23 @@ version 2005/12/01 or later.
   }
 %    \end{macrocode}
 %
+%
 % \bigskip
 %    \begin{macrocode}
 \NewDocumentCommand \@@_columncolor_preamble { O { } m }
   { 
-    \int_compare:nNnT \c@iRow = 1
+%    \end{macrocode}
+% With the following line, we test whether the cell is the first one we
+% encounter in its column (don't forget that some rows may be incomplete).
+%    \begin{macrocode}
+    \int_compare:nNnT \c@jCol > \g_@@_col_total_int
       {
 %    \end{macrocode}
 % You use |gput_left| because we want the specification of colors for the
 % columns drawn before the specifications of color for the rows (and the cells).
+% Be careful: maybe this is not effective since we have an analyze of the
+% instructions in the |\CodeBefore| in order to fill color by color (to avoid
+% the thin white lines).
 %    \begin{macrocode}
         \tl_gput_left:Nx \g_nicematrix_code_before_tl
           { 
@@ -12360,7 +12481,7 @@ version 2005/12/01 or later.
            { \@@_test_vline_in_block:nnnn ##1 }
          \seq_map_inline:Nn \g_@@_pos_of_stroken_blocks_seq
            { \@@_test_vline_in_stroken_block:nnnn ##1 }
-         \clist_if_empty:NF \l_@@_except_corners_clist
+         \clist_if_empty:NF \l_@@_corners_clist
            \@@_test_in_corner_v:
          \bool_if:NTF \g_tmpa_bool
            { 
@@ -12474,7 +12595,7 @@ version 2005/12/01 or later.
 % The following command draws a complete vertical rule in the column |#1| (|#2|
 % is the number of consecutive rules specified by the number of \verb+|+ in the
 % preamble). This command will be used if there is no block in the array (and
-% the key |except-corners| is not used).
+% the key |corners| is not used).
 %    \begin{macrocode}
 \cs_new_protected:Npn \@@_vline_i_complete:nn #1 #2
   { \@@_vline_ii:nnnn { #1 } { #2 } 1 { \int_use:N \c@iRow } }
@@ -12483,7 +12604,7 @@ version 2005/12/01 or later.
 % \bigskip
 % The command |\@@_draw_hlines:| draws all the vertical rules excepted in the
 % blocks, in the virtual blocks (determined by a command such as |\Cdots|) and in
-% the corners (if the key |except-corners| is used).
+% the corners (if the key |corners| is used).
 %    \begin{macrocode}
 \cs_new_protected:Npn \@@_draw_vlines:
   {
@@ -12541,7 +12662,7 @@ version 2005/12/01 or later.
            { \@@_test_hline_in_block:nnnn ##1 }
          \seq_map_inline:Nn \g_@@_pos_of_stroken_blocks_seq
            { \@@_test_hline_in_stroken_block:nnnn ##1 }
-         \clist_if_empty:NF \l_@@_except_corners_clist \@@_test_in_corner_h: 
+         \clist_if_empty:NF \l_@@_corners_clist \@@_test_in_corner_h: 
          \bool_if:NTF \g_tmpa_bool
            { 
              \tl_if_empty:NT \l_tmpc_tl
@@ -12657,7 +12778,7 @@ version 2005/12/01 or later.
 % \bigskip
 % The command |\@@_draw_hlines:| draws all the horizontal rules excepted in the
 % blocks (even the virtual drawn determined by commands such as |\Cdots| and in
-% the corners (if the key |except-corners| is used).
+% the corners (if the key |corners| is used).
 %    \begin{macrocode}
 \cs_new_protected:Npn \@@_draw_hlines:
   {
@@ -12775,9 +12896,9 @@ version 2005/12/01 or later.
 %    \end{macrocode}
 % 
 % \bigskip
-% \subsubsection*{The key except-corners}
+% \subsubsection*{The key corners}
 %
-% When the key |except-corners| is raised, the rules are not drawn in the
+% When the key |corners| is raised, the rules are not drawn in the
 % corners. Of course, we have to compute the corners before we begin to draw the
 % rules. 
 % 
@@ -12789,7 +12910,7 @@ version 2005/12/01 or later.
 % empty cells (and not in a block) considered in the corners of the array.
 %    \begin{macrocode}
     \seq_clear_new:N \l_@@_empty_corner_cells_seq
-    \clist_map_inline:Nn \l_@@_except_corners_clist 
+    \clist_map_inline:Nn \l_@@_corners_clist 
       {
         \str_case:nnF { ##1 }
           {
@@ -13611,12 +13732,16 @@ version 2005/12/01 or later.
 %    \begin{macrocode}
 \keys_define:nn { NiceMatrix / Block / FirstPass }
   {
-    l .code:n = \tl_set:Nn \l_@@_pos_of_block_tl l ,
+    l .code:n = \tl_set:Nn \l_@@_hpos_of_block_tl l ,
     l .value_forbidden:n = true ,
-    r .code:n = \tl_set:Nn \l_@@_pos_of_block_tl r ,
+    r .code:n = \tl_set:Nn \l_@@_hpos_of_block_tl r ,
     r .value_forbidden:n = true ,
-    c .code:n = \tl_set:Nn \l_@@_pos_of_block_tl c ,
+    c .code:n = \tl_set:Nn \l_@@_hpos_of_block_tl c ,
     c .value_forbidden:n = true ,
+    t .code:n = \tl_set:Nn \l_@@_vpos_of_block_tl t ,
+    t .value_forbidden:n = true ,
+    b .code:n = \tl_set:Nn \l_@@_vpos_of_block_tl b ,
+    b .value_forbidden:n = true ,
     color .tl_set:N = \l_@@_color_tl ,
     color .value_required:n = true ,
   }
@@ -13680,15 +13805,19 @@ version 2005/12/01 or later.
       { \int_set:Nn \l_tmpb_int { #2 } }
 %    \end{macrocode}
 %
+% \medskip
+% If the block is mono-column.
 %    \begin{macrocode}
     \int_compare:nNnTF \l_tmpb_int = 1
       {
         \tl_if_empty:NTF \l_@@_cell_type_tl
-          { \tl_set:Nn \l_@@_pos_of_block_tl c }
-          { \tl_set_eq:NN \l_@@_pos_of_block_tl \l_@@_cell_type_tl }
+          { \tl_set:Nn \l_@@_hpos_of_block_tl c }
+          { \tl_set_eq:NN \l_@@_hpos_of_block_tl \l_@@_cell_type_tl }
       }
-      { \tl_set:Nn \l_@@_pos_of_block_tl c }
+      { \tl_set:Nn \l_@@_hpos_of_block_tl c }
 %    \end{macrocode}
+% The value of |\l_@@_hpos_of_block_tl| may be modified by the keys of the
+% command |\Block| that we will analyze now.
 %
 % \medskip
 %    \begin{macrocode}
@@ -13775,18 +13904,24 @@ version 2005/12/01 or later.
 % the tabular is the same as the external alignment of the tabular (that is to
 % say the position of the block in its zone of merged cells).
 %    \begin{macrocode}
-        \bool_if:NT \g_@@_rotate_bool { \tl_set:Nn \l_@@_pos_of_block_tl c }  
+        \bool_if:NT \g_@@_rotate_bool { \tl_set:Nn \l_@@_hpos_of_block_tl c }  
         \bool_if:NTF \l_@@_NiceTabular_bool
           { 
-            \exp_args:Nnx \begin { tabular } 
-              { @ { } \l_@@_pos_of_block_tl @ { } } 
+            \use:x 
+              { 
+                \exp_not:N \begin { tabular } [ \l_@@_vpos_of_block_tl ]
+                  { @ { } \l_@@_hpos_of_block_tl @ { } }
+              }  
               #5 
             \end { tabular } 
           } 
           { 
             \c_math_toggle_token
-            \exp_args:Nnx \begin { array } 
-              { @ { } \l_@@_pos_of_block_tl @ { } } 
+            \use:x 
+              { 
+                \exp_not:N \begin { array } [ \l_@@_vpos_of_block_tl ]
+                { @ { } \l_@@_hpos_of_block_tl @ { } } 
+              }
               #5 
             \end { array } 
             \c_math_toggle_token 
@@ -13847,11 +13982,11 @@ version 2005/12/01 or later.
 %    \end{macrocode}
 % In the list of options |#3|, maybe there is a key for the horizontal alignment
 % (|l|, |r| or |c|). In that case, that key has been read and stored in
-% |\l_@@_pos_of_block_tl|. However, maybe there were no key of the horizontal
+% |\l_@@_hpos_of_block_tl|. However, maybe there were no key of the horizontal
 % alignement and that's why we put a key corresponding to the value of
-% |\l_@@_pos_of_block_tl|, which is fixed by the type of current column.
+% |\l_@@_hpos_of_block_tl|, which is fixed by the type of current column.
 %    \begin{macrocode}
-        { \exp_not:n { #3 } , \l_@@_pos_of_block_tl }
+        { \exp_not:n { #3 } , \l_@@_hpos_of_block_tl }
         { 
           \box_use_drop:c 
             { g_@@_ block _ box _ \int_use:N \g_@@_block_box_int _ box } 
@@ -13890,9 +14025,12 @@ version 2005/12/01 or later.
 % say the position of the block in its zone of merged cells).
 %    \begin{macrocode}
                   \bool_if:NT \g_@@_rotate_bool
-                    { \tl_set:Nn \l_@@_pos_of_block_tl c }
-                  \exp_args:Nnx \begin { tabular } 
-                    { @ { } \l_@@_pos_of_block_tl @ { } } 
+                    { \tl_set:Nn \l_@@_hpos_of_block_tl c }
+                  \use:x 
+                    { 
+                      \exp_not:N \begin { tabular } [ \l_@@_vpos_of_block_tl ] 
+                      { @ { } \l_@@_hpos_of_block_tl @ { } } 
+                    }
                     #5 
                   \end { tabular } 
                   \group_end:
@@ -13903,10 +14041,15 @@ version 2005/12/01 or later.
                   \dim_set_eq:NN \extrarowheight \c_zero_dim 
                   #4 
                   \bool_if:NT \g_@@_rotate_bool
-                    { \tl_set:Nn \l_@@_pos_of_block_tl c }
+                    { \tl_set:Nn \l_@@_hpos_of_block_tl c }
                   \c_math_toggle_token 
-                  \exp_args:Nnx \begin { array } 
-                    { @ { } \l_@@_pos_of_block_tl @ { } } #5 \end { array } 
+                  \use:x 
+                    { 
+                      \exp_not:N \begin { array } [ \l_@@_vpos_of_block_tl ]
+                      { @ { } \l_@@_hpos_of_block_tl @ { } }
+                    } 
+                    #5 
+                  \end { array } 
                   \c_math_toggle_token
                   \group_end:
                 }
@@ -13937,12 +14080,16 @@ version 2005/12/01 or later.
     borders .value_required:n = true ,
     line-width .dim_set:N = \l_@@_line_width_dim ,
     line-width .value_required:n = true ,
-    l .code:n = \tl_set:Nn \l_@@_pos_of_block_tl l ,
+    l .code:n = \tl_set:Nn \l_@@_hpos_of_block_tl l ,
     l .value_forbidden:n = true ,
-    r .code:n = \tl_set:Nn \l_@@_pos_of_block_tl r ,
+    r .code:n = \tl_set:Nn \l_@@_hpos_of_block_tl r ,
     r .value_forbidden:n = true ,
-    c .code:n = \tl_set:Nn \l_@@_pos_of_block_tl c ,
+    c .code:n = \tl_set:Nn \l_@@_hpos_of_block_tl c ,
     c .value_forbidden:n = true ,
+    t .code:n = \tl_set:Nn \l_@@_vpos_of_block_tl t ,
+    t .value_forbidden:n = true ,
+    b .code:n = \tl_set:Nn \l_@@_vpos_of_block_tl b ,
+    b .value_forbidden:n = true ,
     unknown .code:n = \@@_error:n { Unknown~key~for~Block }
   }
 %    \end{macrocode}
@@ -14266,7 +14413,7 @@ version 2005/12/01 or later.
         \pgfpointanchor 
           { \@@_env: - #1 - #2 - block - short } 
           {
-            \str_case:Vn \l_@@_pos_of_block_tl
+            \str_case:Vn \l_@@_hpos_of_block_tl
               {
                 c { center } 
                 l { west } 
@@ -14281,7 +14428,7 @@ version 2005/12/01 or later.
         \pgfnode 
           { rectangle } 
           {
-             \str_case:Vn \l_@@_pos_of_block_tl
+             \str_case:Vn \l_@@_hpos_of_block_tl
               {
                 c { base } 
                 l { base~west } 
@@ -14302,18 +14449,18 @@ version 2005/12/01 or later.
 % If we are in the first column, we must put the block as if it was with the key~|r|.
 %    \begin{macrocode}
         \int_compare:nNnT { #2 } = 0 
-          { \tl_set:Nn \l_@@_pos_of_block_tl r }
+          { \tl_set:Nn \l_@@_hpos_of_block_tl r }
         \bool_if:nT \g_@@_last_col_found_bool 
           {
             \int_compare:nNnT { #2 } = \g_@@_col_total_int
-              { \tl_set:Nn \l_@@_pos_of_block_tl l }
+              { \tl_set:Nn \l_@@_hpos_of_block_tl l }
           }
         \pgftransformshift
           {
             \pgfpointanchor 
               { \@@_env: - #1 - #2 - block - short } 
               {
-                \str_case:Vn \l_@@_pos_of_block_tl
+                \str_case:Vn \l_@@_hpos_of_block_tl
                   {
                     c { center } 
                     l { west } 
@@ -14325,7 +14472,7 @@ version 2005/12/01 or later.
         \pgfnode 
           { rectangle } 
           {
-             \str_case:Vn \l_@@_pos_of_block_tl
+             \str_case:Vn \l_@@_hpos_of_block_tl
               {
                 c { center } 
                 l { west } 
@@ -14659,7 +14806,7 @@ version 2005/12/01 or later.
 %    \end{macrocode}
 % We put the cell with |\diagbox| in the sequence |\g_@@_pos_of_blocks_seq|
 % because a cell with |\diagbox| must be considered as non empty by the key 
-% |except-corners|.
+% |corners|.
 %    \begin{macrocode}
     \seq_gput_right:Nx \g_@@_pos_of_blocks_seq
       {
@@ -15857,7 +16004,7 @@ version 2005/12/01 or later.
 \@@_msg_new:nn { bad~corner }
   {
     #1~is~an~incorrect~specification~for~a~corner~(in~the~keys~
-    'except-corners'~and~'hvlines-except-corners').~The~available~
+    'corners'~and~'except-corners').~The~available~
     values~are:~NW,~SW,~NE~and~SE.\\
     If~you~go~on,~this~specification~of~corner~will~be~ignored.
   }
@@ -16093,6 +16240,7 @@ version 2005/12/01 or later.
     code-for-first-row,~
     code-for-last-col,~
     code-for-last-row,~
+    corners,~
     create-extra-nodes,~
     create-medium-nodes,~
     create-large-nodes,~
@@ -16102,7 +16250,6 @@ version 2005/12/01 or later.
     first-row,~
     hlines,~
     hvlines,~
-    hvlines-except-corners,~
     last-col,~
     last-row,~
     left-margin,~
@@ -16144,6 +16291,7 @@ version 2005/12/01 or later.
     code-for-last-row,~
     colortbl-like,~
     columns-width,~
+    corners,~
     create-extra-nodes,~
     create-medium-nodes,~
     create-large-nodes,~
@@ -16154,7 +16302,6 @@ version 2005/12/01 or later.
     first-row,~
     hlines,~
     hvlines,~
-    hvlines-except-corners,~
     last-col,~
     last-row,~
     left-margin,~
@@ -16168,6 +16315,7 @@ version 2005/12/01 or later.
     rules~(with~the~subkeys~'color'~and~'width'),~
     small,~
     t,~
+    tabularnote,~
     vlines,~
     xdots/color,~
     xdots/shorten~and~
@@ -16202,6 +16350,7 @@ version 2005/12/01 or later.
     code-for-last-row,~
     colortbl-like,~
     columns-width,~
+    corners,~
     create-extra-nodes,~
     create-medium-nodes,~
     create-large-nodes,~
@@ -16212,7 +16361,6 @@ version 2005/12/01 or later.
     first-row,~
     hlines,~
     hvlines,~
-    hvlines-except-corners,~
     l,~
     last-col,~
     last-row,~
@@ -16256,6 +16404,7 @@ version 2005/12/01 or later.
     code-for-last-row,~
     colortbl-like,~
     columns-width,~
+    corners,~
     create-extra-nodes,~
     create-medium-nodes,~
     create-large-nodes,~
@@ -16265,7 +16414,6 @@ version 2005/12/01 or later.
     first-row,~
     hlines,~
     hvlines,~
-    hvlines-except-corners,~
     last-col,~
     last-row,~
     left-margin,~
@@ -16278,6 +16426,7 @@ version 2005/12/01 or later.
     right-margin,~
     rules~(with~the~subkeys~'color'~and~'width'),~
     t,~
+    tabularnote,~
     vlines,~
     xdots/color,~
     xdots/shorten~and~
@@ -16766,6 +16915,15 @@ version 2005/12/01 or later.
 % The keys |vlines| and |hlines| takes in as value a (comma-separated) list of
 % numbers (for the rules to draw).
 % 
+%
+% \subsection*{Changes between versions 5.13 and 5.14}
+%
+% Nodes of the forme |(1.5)|, |(2.5)|, |(3.5)|, etc. 
+% 
+% Keys |t| and |b| for the command |\Block|.
+%
+% Key |corners|. 
+%
 % \PrintIndex
 % 
 % \tableofcontents
diff --git a/macros/latex/contrib/nicematrix/nicematrix.pdf b/macros/latex/contrib/nicematrix/nicematrix.pdf
index 00cce2d6b7..c228e67e67 100644
--- a/macros/latex/contrib/nicematrix/nicematrix.pdf
+++ b/macros/latex/contrib/nicematrix/nicematrix.pdf
diff --git a/macros/xetex/generic/xetexko/ChangeLog b/macros/xetex/generic/xetexko/ChangeLog
index f8e4013e58..cdad25a566 100644
--- a/macros/xetex/generic/xetexko/ChangeLog
+++ b/macros/xetex/generic/xetexko/ChangeLog
@@ -1,3 +1,13 @@
+2021-04-08      Dohyun Kim <nomos at ktug org>
+
+	Version 3.2
+
+	* fix ulem package support
+	* \hangingpunctuation does not work with quotes by default.
+	* new commands \sethangingratio, \unsethangingratio added.
+	* \disablehangulspacing will remove \penalty between Hangul
+	  characters.
+
 2021-03-22      Dohyun Kim <nomos at ktug org>
 
 	Version 3.1
diff --git a/macros/xetex/generic/xetexko/README b/macros/xetex/generic/xetexko/README
index 50575ee4a2..c311723be5 100644
--- a/macros/xetex/generic/xetexko/README
+++ b/macros/xetex/generic/xetexko/README
@@ -1,4 +1,4 @@
-XeTeX-ko Package version 3.1 (2021/03/22)
+XeTeX-ko Package version 3.2 (2021/04/08)
 =========================================
 
 XeTeX-ko is a macro package for Xe(La)TeX which supports typesetting
diff --git a/macros/xetex/generic/xetexko/xetexko-doc.pdf b/macros/xetex/generic/xetexko/xetexko-doc.pdf
index 7d5f60a656..c03bfa8a4d 100644
--- a/macros/xetex/generic/xetexko/xetexko-doc.pdf
+++ b/macros/xetex/generic/xetexko/xetexko-doc.pdf
diff --git a/macros/xetex/generic/xetexko/xetexko-doc.tex b/macros/xetex/generic/xetexko/xetexko-doc.tex
index 481a2a0a57..616c9fcc5b 100644
--- a/macros/xetex/generic/xetexko/xetexko-doc.tex
+++ b/macros/xetex/generic/xetexko/xetexko-doc.tex
@@ -41,7 +41,6 @@
   {\setbox0=\vbox\bgroup\hsize=\dimexpr\textwidth-12pt\relax
     \hrule width0pt\kern5pt\par\small
   \parindent0pt }
-%  \noindent}
   {\par \vskip-\lastskip\kern5pt\hrule width0pt\egroup \par\medskip\par
     \dimen0=\dimexpr\pagegoal-\pagetotal\relax
     \ifdim\dimen0<2\baselineskip\relax \dimen0\maxdimen \fi
@@ -56,8 +55,8 @@
 \newenvironment{example}
   {\hbox\bgroup\grayvrule
     \vbox\bgroup\hsize\dimexpr\textwidth-4pt\relax
-    \grayhrule\kern1em\leftskip1em\rightskip1em
-  }{\par\kern1em\grayhrule\egroup\grayvrule\egroup}
+    \grayhrule\kern5pt\leftskip10pt\rightskip10pt
+  }{\par\kern5pt\grayhrule\egroup\grayvrule\egroup}
 \def\cs#1{\texttt{\textbackslash #1}}
 \def\hemph#1{\textsf{\bfseries #1}}
 \def\hparen#1{{\small\hangulparens(#1)}}
@@ -71,7 +70,7 @@
 \title{\xetexko\ 간단 매뉴얼}
 \author{Dohyun Kim \normalsize <\texttt{nomos at ktug org}> \and
   \normalsize <\url{http://github.com/dohyunkim/xetexko}>}
-\date{Version 3.1\quad 2021/03/22}
+\date{Version 3.2\quad 2021/04/08}
 \maketitle
 
 \begin{quote}\small
@@ -217,7 +216,7 @@ fontspec과 마찬가지로 각 명령의 끝에 `s'를 붙여도 된다.
 현재 폰트가 직전 문자의 폰트가 아닐 수 있음에 주의할 것.
 
 옵션 키의 종류와 의미는 다음과 같으며 각 키 값은 인자의 경우와 같다.
-\begin{description}\itemsep0pt\hangulparens
+\begin{description}\itemsep0pt
 \item[alphs] 라틴 알파벳, 숫자, 아래에 해당않는 모든 non-CJK 문자
 \item[parens] 라틴 괄호, 중괄호, 대괄호, 꺽쇠, 인용부호 및 그 리거쳐
 \item[colons] 라틴 콜론, 세미콜론
@@ -229,15 +228,17 @@ fontspec과 마찬가지로 각 명령의 끝에 `s'를 붙여도 된다.
 종전에\vernote{3.0}
 라틴숫자에 적용되던 \verb|nums| 옵션과
 라틴 인용부호에 적용되던 \verb|quotes| 옵션이
-3.0버전부터는
+3.0 버전부터는
 각각 \verb|alphs| 옵션과 \verb|parens| 옵션에 통합되었음에 유의하라.
 또한\vernote{3.0} en dash, em dash가 종래 \verb|colons|에 속하던 것이 이제
-\verb|hyphens|에 속하게 되었음도 주의하라.
+\verb|hyphens|에 속하게 되었다.
 
 기본값은 다음 명령을 준 것과 동일하다.
+v3.0부터\vernote{3.0} 괄호류의 기본글꼴이 한글이 되었음도 유의하라.
 \begin{verbatim}
   \xetexkofontregime {latin}%
-    [ puncts=prevfont, colons=prevfont, cjksymbols=hangul ]
+    [ puncts=prevfont, colons=prevfont,
+      parens=hangul, cjksymbols=hangul ]
 \end{verbatim}
 \begin{plaintex}
 플레인텍에서는 다음 명령을 사용한다. \LaTeX에서도 쓸 수 있다.
@@ -255,7 +256,7 @@ fontspec과 마찬가지로 각 명령의 끝에 `s'를 붙여도 된다.
 \end{verbatim}
 \end{plaintex}
 
-\section{간격 조정 옵션}\label{sec:fontopts}
+\section{글꼴 옵션}\label{sec:fontopts}
 \dotemph{고정폭 글꼴을 제외한} 한글·한자 글꼴 명령에 미세 간격 옵션을
 쓸 수 있다. 예컨대
 \begin{verbatim}
@@ -282,25 +283,19 @@ fontspec과 마찬가지로 각 명령의 끝에 `s'를 붙여도 된다.
 \item[CharRaise, charraise]\quad
   글자의 {\addhangulfontfeature{charraise=.5ex}수직 위치}를 조절한다.
   기본값은 \verb|0pt|.
+  고정폭 글꼴에서도 이 옵션은 작동한다.
 \end{description}
-3.0버전부터는\vernote{3.0} 다음 옵션들이 아무 효과도 가져오지 않게
+3.0 버전부터는\vernote{3.0} 다음 옵션들이 아무 효과도 가져오지 않게
 변경되었음을 주의하라.
 \begin{verbatim}
-    lowerperiod, PunctRaise
-    lowerquestion
-    lowerexclamation
-    lowercomma
-    preperiodkern
-    postperiodkern
-    prequestionkern
-    postquestionkern
-    preexclamationkern
-    postexclamationkern
-    precommakern
-    postcommakern
-    quoteraise
-    quotewidth
-    postmathskip
+    lowerperiod         lowerquestion
+    lowerexclamation    lowercomma
+    preperiodkern       postperiodkern
+    prequestionkern     postquestionkern
+    preexclamationkern  postexclamationkern
+    precommakern        postcommakern
+    quoteraise          quotewidth
+    postmathskip        PunctRaise
 \end{verbatim}
 
 \begin{plaintex}
@@ -356,10 +351,12 @@ fontspec과 마찬가지로 각 명령의 끝에 `s'를 붙여도 된다.
     줄바꿈까지도 먹지 않게 한다.
     일부 고급 오픈타입 기능을 사용하기 위해서 이 명령이 필요할 때가 있다.
     이를테면, 폰트가 지원하는 한글 리거쳐가 동작하지 않을 때 이 명령을
-    선언하면 문제가 해결된다.
-
-    \cs{enablehangulspacingandlinebreak}는 이 명령의 효력을 원래대로
-    되돌리는 기능을 한다.
+    선언하면 문제가 해결된다.%
+    \footnote{%
+      이 명령은 그룹 안에서 실행해야 할 것이다. 그렇더라도
+      \cs{enablehangulspacingandlinebreak} 명령을 그룹을 닫고나서 선언해야
+      원래 기능이 완전히 복구된다.
+      }
 
 \end{description}
 3.0 버전부터는\vernote{3.0} 종전의
@@ -376,8 +373,6 @@ fontspec과 마찬가지로 각 명령의 끝에 `s'를 붙여도 된다.
 Source Han Serif (본명조), Noto Sans CJK, Noto Serif CJK,
 나눔명조옛한글, 나눔바른고딕옛한글, KoPubWorld 바탕, KoPubWorld 돋움 등이 있다.
 또한
-%%% BUG: \char를 이용하여 옛한글을 찍으면 자모가 분리된다.
-%%%      코드 수정 요망.
 \textsf{^^^^1112^^^^119e^^^^11ab글}에 번들된 함초롬 글꼴에도
 최근 옛한글 지원이 추가되었다.}
 
@@ -427,12 +422,13 @@ vertical 환경의 인자는 세로쓰기 박스의 세로 길이이다.
 \begin{figure}
 \begin{example}
 \hfil\begin{vertical}{18em}
-  \spaceskip=.5em plus .08em minus .04em
-  \sffamily\addhangulfontfeatures{Vertical=Alternates,CharRaise=.5ex,
-  RawFeature=vertical}
-  \hanjabyhangulfont \parindent-1em\leftskip1em
+  \linespread{1.5}\sffamily
+  \addhangulfontfeatures{Vertical=Alternates,CharRaise=.5ex,RawFeature=vertical}
+  \hanjabyhangulfont
   \typesetclassic \latinparens
-  \noindent 님의 침묵 (The Silent Beloved)
+  \parindent0pt \everypar{\hangindent1em \hangafter1 }
+  \spaceskip=.5em plus .25em minus .125em
+  \quad 님의 침묵 (The Silent Beloved)
 \smallbreak
 \hfil\hfil 한 용 운\hfil
 \bigbreak
@@ -449,7 +445,7 @@ vertical 환경의 인자는 세로쓰기 박스의 세로 길이이다.
     세로쓰기 보기.\quad
     \sffamily\small
   Noto Sans CJK KR 글꼴을 이용했다. 이 글꼴의 세로쓰기 어간이 1em으로
-  매우 커서 \cs{spaceskip=0.5em plus.08em minus.04em}을 강제했다.
+  매우 커서 \cs{spaceskip=0.5em plus.25em minus.125em}을 강제했다.
   \texttt{CharRaise=.5ex}도 글꼴 옵션에 추가했다.
   또한 \cs{latinparens}를 선언했는데
   제목 다음의 괄호가 CJK 괄호가 아니라 아스키 괄호이기 때문이다.
@@ -540,11 +536,10 @@ horizontal 환경에는 가로쓰기 박스의 너비를 인자로 주어야 한
 
 \begin{figure}
   \begin{example}\linespread{1.3}
-    \hfil\begin{vertical}{18em}
-      \sffamily\typesetclassic
-      \addhangulfontfeatures{Vertical=Alternates,CharRaise=.5ex,
-      RawFeature=vertical}
-      \hanjabyhangulfont \parindent-1em\leftskip1em
+    \hfil\begin{vertical}{19em}
+      \linespread{1.5}\sffamily\typesetclassic
+      \addhangulfontfeatures{Vertical=Alternates,CharRaise=.5ex,RawFeature=vertical}
+      \hanjabyhangulfont \parindent0pt \everypar{\hangindent1em \hangafter1 }
       \analect
     \end{vertical}\hfil
   \end{example}
@@ -557,15 +552,36 @@ horizontal 환경에는 가로쓰기 박스의 너비를 인자로 주어야 한
 \end{figure}
 
 \section{매달린 구두점}
-마침표, 쉼표, 인용부호를 판면 바깥에 식자하여 행 끝에 매달리게 만든다.
+\hemph{하이픈을 제외한} 문장부호들를 판면 바깥에 식자하여 행 끝에 매달리게 만들 수 있다.
 
 3.0 버전부터는\vernote{3.0} \keyword{hangingpunctuations}%
 \cs{hangingpunctuations} 명령으로 활성화한다.
 \cs{hangingpunctuation}은 이 명령과 동의어이다.
-당분간 xetexko-hanging.sty 을 로드하는 것으로도 활성화되도록 해 두었다.
+당분간 xetexko-hanging.sty을 로드하는 것으로도 활성화되도록 해 두었다.
+이렇게 활성화되면 기본값으로 온점, 반점, 고리점, 모점에 대해서 전부 내밀기가 작동한다.
+
+3.2 버전부터는\vernote{3.2} 사용자가 원하는 문장부호를 원하는 만큼 판면 밖으로 내밀 수 있다.
+\begin{verbatim}
+    \sethangingratio"28=0.5 %
+    \sethangingratio"3002=1 %
+\end{verbatim}
+등호 앞의 숫자는 유니코드 코드포인트이고 뒤의 숫자는 글자폭에 대한 비율을 뜻한다.
+따라서 위 예는 여는괄호(U+0028)를 절반만 내밀고 고리점(U+3002)은 완전히 밀어내라는 지시다.
+어느 방향으로 내밀지는 \xetexko 가 알아서 판단한다.
+이러한 지시를 취소하려면,
+\begin{verbatim}
+    \unsethangingratio"28
+    \unsethangingratio"3002
+\end{verbatim}
 
-글자 내밀기 기본값에 차이가 좀 있긴 하지만,
-microtype 패키지를 로드하는 것으로도 유사한 결과를 얻을 수 있다.
+microtype 패키지의 protrusion 기능이 잘 작동하지 않는 경우가 있어,%
+\footnote{%
+  원시명령 \cs{lpcode} \cs{rpcode} 등 엔진이 제공하는 기능을 말한다.
+  이들 원시명령에는 글리프 인덱스를 지시해야 하는데 어떤 글자의 글리프 인덱스를
+  알아내는 일은 간단치가 않다.
+  \XeTeX\ reference guide를 참고하라.
+  }
+어쩔 수 없이 제공하게 되었으므로 예외적으로만 사용할 것을 권한다.
 
 %\begin{figure}
 %\Large
@@ -574,15 +590,11 @@ microtype 패키지를 로드하는 것으로도 유사한 결과를 얻을 수
 %\vbox{\hfil\hbox{\vrule\vbox{\hsize\wd0
 %  줄 끝에 매달린 구두점.
 %  줄 끝에 매달린 구두점,
-%  ``줄 끝에 매달린 구두점''
-%  `줄 끝에 매달린 구두점'
-%  “줄 끝에 매달린 구두점”
-%  ‘줄 끝에 매달린 구두점’
 %  줄 끝에 매달린 구두점、
 %  줄 끝에 매달린 구두점。
 %  줄 끝에 매달린 구두점
 %  }\vrule}\hfil}
-%\caption{매달린 구두점 보기}\label{fig:hanging}
+%\caption{기본값이 적용된 매달린 구두점}\label{fig:hanging}
 %\end{figure}
 
 \section{수식 한글}
@@ -661,7 +673,7 @@ microtype 패키지를 로드하는 것으로도 유사한 결과를 얻을 수
 따위를 사용한다.
 
 \section{밑줄긋기}
-\LaTeX에서는 \uwave{ulem 패키지}를 로드하는 것만으로 자동 지원된다.
+\uwave{ulem 패키지}를 로드하는 것만으로 자동 지원된다.
 
 3.0 버전부터는\vernote{3.0} \cs{xetexkoulemsupport} 선언이
 불필요하게 되었다. 이 명령은 호환성을 위해 남겨두었으나 아무 일도
@@ -675,6 +687,11 @@ microtype 패키지를 로드하는 것으로도 유사한 결과를 얻을 수
 
 \begin{small}\linespread{1.2}\selectfont
 \begin{description}\itemsep=0pt
+    \item[v3.2] 2021-04-08
+      \begin{itemize}
+        \item 매달린 구두점이 기본값으로 따옴표에는 작동하지 않고 마침표^^b7쉼표에만 작동한다.
+        \item \cs{sethangingratio}, \cs{unsethangingratio} 명령 추가
+      \end{itemize}
     \item[v3.1] 2021-03-22
       \begin{itemize}
         \item 플레인텍 명령 \cs{sethangulfont}, \cs{sethanjafont} 추가
diff --git a/macros/xetex/generic/xetexko/xetexko.sty b/macros/xetex/generic/xetexko/xetexko.sty
index 9b155d3c73..63108b667c 100644
--- a/macros/xetex/generic/xetexko/xetexko.sty
+++ b/macros/xetex/generic/xetexko/xetexko.sty
@@ -16,7 +16,7 @@
 
 \ifdefined\ProvidesPackage
   \NeedsTeXFormat{LaTeX2e}[2020/10/01]
-  \ProvidesPackage{xetexko}[2021/03/22 v3.1 typesetting Korean with XeTeX]
+  \ProvidesPackage{xetexko}[2021/04/08 v3.2 typesetting Korean with XeTeX]
 \else
   \ifdefined\@tempcnta\else \newcount\@tempcnta \fi
   \ifdefined\@gobble\else \def\@gobble#1{} \fi
@@ -524,20 +524,21 @@
 
 \expandafter\let\csname XeKo@1@class\endcsname =\XeTeXcharclassHG
 \expandafter\let\csname XeKo@2@class\endcsname =\XeTeXcharclassID
-\expandafter\let\csname XeKo@3@class\endcsname =\XeTeXcharclassSY
-\expandafter\let\csname XeKo@4@class\endcsname =\XeTeXcharclassAA
-\expandafter\let\csname XeKo@5@class\endcsname =\XeTeXcharclassAO
-\expandafter\let\csname XeKo@6@class\endcsname =\XeTeXcharclassAC
-\expandafter\let\csname XeKo@7@class\endcsname =\XeTeXcharclassAP
-\expandafter\let\csname XeKo@8@class\endcsname =\XeTeXcharclassAM
-\expandafter\let\csname XeKo@9@class\endcsname =\XeTeXcharclassAH
-\expandafter\let\csname XeKo@10@class\endcsname=\XeTeXcharclassOP
-\expandafter\let\csname XeKo@11@class\endcsname=\XeTeXcharclassCL
-\expandafter\let\csname XeKo@12@class\endcsname=\XeTeXcharclassMD
-\expandafter\let\csname XeKo@13@class\endcsname=\XeTeXcharclassFS
-\expandafter\let\csname XeKo@14@class\endcsname=\XeTeXcharclassEX
-\expandafter\let\csname XeKo@15@class\endcsname=\XeTeXcharclassLD
-\expandafter\let\csname XeKo@16@class\endcsname=\XeTeXcharclassVC
+% skip 3 which ulem uses
+\expandafter\let\csname XeKo@4@class\endcsname =\XeTeXcharclassSY
+\expandafter\let\csname XeKo@5@class\endcsname =\XeTeXcharclassAA
+\expandafter\let\csname XeKo@6@class\endcsname =\XeTeXcharclassAO
+\expandafter\let\csname XeKo@7@class\endcsname =\XeTeXcharclassAC
+\expandafter\let\csname XeKo@8@class\endcsname =\XeTeXcharclassAP
+\expandafter\let\csname XeKo@9@class\endcsname =\XeTeXcharclassAM
+\expandafter\let\csname XeKo@10@class\endcsname=\XeTeXcharclassAH
+\expandafter\let\csname XeKo@11@class\endcsname=\XeTeXcharclassOP
+\expandafter\let\csname XeKo@12@class\endcsname=\XeTeXcharclassCL
+\expandafter\let\csname XeKo@13@class\endcsname=\XeTeXcharclassMD
+\expandafter\let\csname XeKo@14@class\endcsname=\XeTeXcharclassFS
+\expandafter\let\csname XeKo@15@class\endcsname=\XeTeXcharclassEX
+\expandafter\let\csname XeKo@16@class\endcsname=\XeTeXcharclassLD
+\expandafter\let\csname XeKo@17@class\endcsname=\XeTeXcharclassVC
 
 \newtoks\XeKo@toks@
 \newtoks\XeKo@toks@ii
@@ -551,7 +552,8 @@
   \ifnum\XeKo@charslot="FFFF
     % 다음 한 줄이 없으면 한글과 한글 사이에 폰트가 변경되는 경우 글자 누락.
     % 폰트 변경은 kern 에 아무 영향을 주지 않기 때문.
-    \def\XeKo@maybe@gobble{\def\XeKo@maybe@gobble{\expandafter\expandafter\expandafter\@gobble}}%
+    \def\XeKo@maybe@gobble{\def\XeKo@maybe@gobble{%
+      \ifdefined\XeKo@curr@font\expandafter\XeKo@maybe@gobble@\fi }}%
     \expandafter\XeKo@flush@toks
   \else
     \ifnum\XeKo@currclass>\tw@
@@ -579,11 +581,11 @@
   \fi
   }
 \def\XeKo@addto@toks#1{%
-  \ifnum\XeKo@currclass=4 % AA
+  \ifnum\XeKo@currclass=5 % AA
     \global\let\XeKo@josatoken=#1\relax
   \else\ifnum\XeTeXcharclass\XeKo@charslot=\XeTeXcharclassJJ
     \global\let\XeKo@josatoken=#1\relax
-  \else\ifnum\XeKo@currclass=\thr@@ % SY
+  \else\ifnum\XeKo@currclass=4 % SY
     \global\let\XeKo@josatoken=#1\relax
   \fi\fi\fi
   \XeKo@toks@\expandafter{\the\XeKo@toks@ #1}%
@@ -682,8 +684,8 @@
   }
 % remove space
 \def\XeKo@maybe@ignorespaces{%
-  \ifnum 0\ifnum\XeKo@currclass<4 1\else  % HG ID SY
-          \ifnum\XeKo@currclass>9 1\fi\fi % CJK punctuations
+  \ifnum 0\ifnum\XeKo@currclass<5  1\else  % HG ID SY
+          \ifnum\XeKo@currclass>10 1\fi\fi % CJK punctuations
           >\z@
     \expandafter\XeKo@ignorespaces@iv
   \fi
@@ -708,6 +710,61 @@
 \protected\def\hangingpunctuation{\chardef\XeKo@hangingpuncts\@ne }
 \let\hangingpunctuations\hangingpunctuation
 
+\protected\def\sethangingratio#1=#2 {%
+  \expandafter\def\csname XeKo@hanging@ratio@\number#1\endcsname{#2}%
+  }
+\protected\def\unsethangingratio{\afterassignment\unsethangingratio@\count@= }
+\def\unsethangingratio@{%
+  \expandafter\let\csname XeKo@hanging@ratio@\number\count@\endcsname\XeKo@undefined
+  }
+\def\XeKo@def@pre@hang#1{%
+  \ifnum\XeKo@hangingpuncts=\@ne
+    \ifcsname XeKo@hanging@ratio@\number`#1\endcsname
+      \ifnum 0\ifnum\XeKo@compresspuncts=\@ne
+              \ifnum\XeKo@currclass=11 % OP
+              1\fi\fi >\z@
+        \XeKo@dimen@=.5em
+      \else
+        \setbox\XeKo@box@\hbox{\XeTeXinterchartokenstate\z@ #1}%
+        \XeKo@dimen@=\wd\XeKo@box@
+      \fi
+      \XeKo@dimen@=\csname XeKo@hanging@ratio@\number`#1\endcsname\XeKo@dimen@
+      \edef\XeKo@pre@hang{%
+        \kern\the\XeKo@dimen@
+        \vrule width-\the\XeKo@dimen@ height\z@ depth\z@
+        }%
+    \fi
+  \fi
+  }
+\def\XeKo@def@post@hang#1{%
+  \ifnum\XeKo@hangingpuncts=\@ne
+    \ifcsname XeKo@hanging@ratio@\number`#1\endcsname
+      \ifnum 0\ifnum\XeKo@compresspuncts=\@ne
+              \ifnum\XeKo@currclass>11 %
+              \ifnum\XeKo@currclass<15 % CL MD FS
+              1\fi\fi\fi >\z@
+        \XeKo@dimen@=.5em
+      \else
+        \setbox\XeKo@box@\hbox{\XeTeXinterchartokenstate\z@ #1}%
+        \XeKo@dimen@=\wd\XeKo@box@
+      \fi
+      \XeKo@dimen@=\csname XeKo@hanging@ratio@\number`#1\endcsname\XeKo@dimen@
+      \edef\XeKo@post@hang{%
+        \noexpand\XeKo@count@\noexpand\spacefactor
+        \vrule width-\the\XeKo@dimen@ height\z@ depth\z@
+        \kern\the\XeKo@dimen@
+        \noexpand\spacefactor\noexpand\XeKo@count@
+        }%
+    \fi
+  \fi
+  }
+\sethangingratio"2C=1 % , 반점
+\sethangingratio"2E=1 % . 온점
+\sethangingratio"3001=1 % 、 모점
+\sethangingratio"3002=1 % 。 고리점
+\sethangingratio"FF0C=1 % ， 전각반점
+\sethangingratio"FF0E=1 % ． 전각온점
+
 % compress CJK punctuations to .5em
 \protected\def\compresspunctuations{\chardef\XeKo@compresspuncts\@ne }
 \protected\def\nocompresspunctuations{\chardef\XeKo@compresspuncts\z@ }
@@ -747,200 +804,140 @@
 \def\XeKo@startSY#1{%
   \global\let\XeKo@josatoken=#1\relax
   \let\XeKo@pre@hang\XeKo@undefined \let\XeKo@post@hang\XeKo@undefined
-  \def\XeKo@currclass{3}%
+  \def\XeKo@currclass{4}%
   \XeKo@toks@{#1}%
   \XeKo@check@next@tok
   }
 \def\XeKo@startAA#1{%
   \global\let\XeKo@josatoken=#1\relax
   \let\XeKo@pre@hang\XeKo@undefined \let\XeKo@post@hang\XeKo@undefined
-  \def\XeKo@currclass{4}%
+  \def\XeKo@currclass{5}%
   \XeKo@toks@{#1}%
   \XeKo@check@next@tok
   }
 \def\XeKo@startAO#1{%
   \let\XeKo@pre@hang\XeKo@undefined \let\XeKo@post@hang\XeKo@undefined
-  \def\XeKo@currclass{5}%
+  \def\XeKo@currclass{6}%
   \XeKo@toks@{#1}%
-  \ifnum\XeKo@hangingpuncts=\@ne
-    \ifnum`#1="60 % `
-      \XeKo@dimen@=\fontcharwd\font"60 %
-      \edef\XeKo@pre@hang{%
-        \kern\the\XeKo@dimen@
-        \vrule width-\the\XeKo@dimen@ height\z@ depth\z@
-        }%
-    \fi
-  \fi
+  \XeKo@def@pre@hang{#1}%
   \XeKo@check@next@tok
   }
 \def\XeKo@startAC#1{%
   \let\XeKo@pre@hang\XeKo@undefined \let\XeKo@post@hang\XeKo@undefined
-  \def\XeKo@currclass{6}%
+  \def\XeKo@currclass{7}%
   \XeKo@toks@{#1}%
-  \ifnum\XeKo@hangingpuncts=\@ne
-    \ifnum`#1="27 % '
-      \XeKo@dimen@=\fontcharwd\font"27 %
-      \edef\XeKo@post@hang{%
-        \vrule width-\the\XeKo@dimen@ height\z@ depth\z@
-        \kern\the\XeKo@dimen@
-        }%
-    \fi
-  \fi
+  \XeKo@def@post@hang{#1}%
   \XeKo@check@next@tok
   }
 \def\XeKo@startAP#1{%
   \let\XeKo@pre@hang\XeKo@undefined \let\XeKo@post@hang\XeKo@undefined
-  \def\XeKo@currclass{7}%
+  \def\XeKo@currclass{8}%
   \XeKo@toks@{#1}%
-  \ifnum\XeKo@hangingpuncts=\@ne
-    \ifnum 0\ifnum`#1="2E 1\else % . ,
-            \ifnum`#1="2C 1\fi\fi >\z@
-      \XeKo@dimen@=\fontcharwd\font`#1 %
-      \edef\XeKo@post@hang{%
-        \noexpand\XeKo@count@\noexpand\spacefactor
-        \vrule width-\the\XeKo@dimen@ height\z@ depth\z@
-        \kern\the\XeKo@dimen@
-        \noexpand\spacefactor\noexpand\XeKo@count@
-        }%
-    \fi
-  \fi
+  \XeKo@def@post@hang{#1}%
   \XeKo@check@next@tok
   }
 \def\XeKo@startAM#1{%
   \let\XeKo@pre@hang\XeKo@undefined \let\XeKo@post@hang\XeKo@undefined
-  \def\XeKo@currclass{8}%
+  \def\XeKo@currclass{9}%
   \XeKo@toks@{#1}%
+  \XeKo@def@post@hang{#1}%
   \XeKo@check@next@tok
   }
 \def\XeKo@startAH#1{%
   \let\XeKo@pre@hang\XeKo@undefined \let\XeKo@post@hang\XeKo@undefined
-  \def\XeKo@currclass{9}%
+  \def\XeKo@currclass{10}%
   \XeKo@toks@{#1}%
+  \ifnum`#1=\hyphenchar\font \else % exclude hyphen char
+    \XeKo@def@post@hang{#1}%
+  \fi
   \XeKo@check@next@tok
   }
 \def\XeKo@startOP#1{%
   \let\XeKo@pre@hang\XeKo@undefined \let\XeKo@post@hang\XeKo@undefined
-  \def\XeKo@currclass{10}%
+  \def\XeKo@currclass{11}%
   \ifnum\XeKo@compresspuncts=\@ne
     \XeKo@toks@{\hbox to.5em\bgroup\hss #1\egroup}%
   \else
     \XeKo@toks@{#1}%
   \fi
-  \ifnum\XeKo@hangingpuncts=\@ne
-    \ifnum0\ifnum`#1="2018 1\else % ‘ “
-           \ifnum`#1="201C 1\fi\fi >\z@
-      \ifnum\XeKo@compresspuncts=\@ne
-        \XeKo@dimen@=.5em
-      \else
-        \XeKo@dimen@=\fontcharwd\font`#1 %
-      \fi
-      \ifnum`#1="201C %
-        \XeKo@dimen@=.5\XeKo@dimen@
-      \fi
-      \edef\XeKo@pre@hang{%
-        \kern\the\XeKo@dimen@
-        \vrule width-\the\XeKo@dimen@ height\z@ depth\z@
-        }%
-    \fi
-  \fi
+  \XeKo@def@pre@hang{#1}%
   \XeKo@do@flush@toks
   }
 \def\XeKo@startCL#1{%
   \let\XeKo@pre@hang\XeKo@undefined \let\XeKo@post@hang\XeKo@undefined
-  \def\XeKo@currclass{11}%
+  \def\XeKo@currclass{12}%
   \ifnum\XeKo@compresspuncts=\@ne
     \XeKo@toks@{\hbox to.5em\bgroup #1\hss\egroup}%
   \else
     \XeKo@toks@{#1}%
   \fi
-  \ifnum\XeKo@hangingpuncts=\@ne
-    \ifnum 0\ifnum`#1="2019 1\else % ’ ” 、 ，
-            \ifnum`#1="201D 1\else
-            \ifnum`#1="3001 1\else
-            \ifnum`#1="FF0C 1\fi\fi\fi\fi >\z@
-      \ifnum\XeKo@compresspuncts=\@ne
-        \XeKo@dimen@=.5em
-      \else
-        \XeKo@dimen@=\fontcharwd\font`#1 %
-      \fi
-      \ifnum`#1="201D %
-        \XeKo@dimen@=.5\XeKo@dimen@
-      \fi
-      \edef\XeKo@post@hang{%
-        \vrule width-\the\XeKo@dimen@ height\z@ depth\z@
-        \kern\the\XeKo@dimen@
-        }%
-    \fi
-  \fi
+  \XeKo@def@post@hang{#1}%
   \XeKo@do@flush@toks
   }
 \def\XeKo@startMD#1{%
   \let\XeKo@pre@hang\XeKo@undefined \let\XeKo@post@hang\XeKo@undefined
-  \def\XeKo@currclass{12}%
+  \def\XeKo@currclass{13}%
   \ifnum\XeKo@compresspuncts=\@ne
     \XeKo@toks@{\hbox to.5em\bgroup\hss #1\hss\egroup}%
   \else
     \XeKo@toks@{#1}%
   \fi
+  \XeKo@def@post@hang{#1}%
   \XeKo@do@flush@toks
   }
 \def\XeKo@startFS#1{%
   \let\XeKo@pre@hang\XeKo@undefined \let\XeKo@post@hang\XeKo@undefined
-  \def\XeKo@currclass{13}%
+  \def\XeKo@currclass{14}%
   \ifnum\XeKo@compresspuncts=\@ne
     \XeKo@toks@{\hbox to.5em\bgroup #1\hss\egroup}%
   \else
     \XeKo@toks@{#1}%
   \fi
-  \ifnum\XeKo@hangingpuncts=\@ne
-    \ifnum 0\ifnum`#1="3002 1\else % 。 ．
-            \ifnum`#1="FF0E 1\fi\fi >\z@
-      \ifnum\XeKo@compresspuncts=\@ne
-        \XeKo@dimen@=.5em
-      \else
-        \XeKo@dimen@=\fontcharwd\font`#1 %
-      \fi
-      \edef\XeKo@post@hang{%
-        \vrule width-\the\XeKo@dimen@ height\z@ depth\z@
-        \kern\the\XeKo@dimen@
-      }%
-    \fi
-  \fi
+  \XeKo@def@post@hang{#1}%
   \XeKo@do@flush@toks
   }
 \def\XeKo@startEX#1{%
   \let\XeKo@pre@hang\XeKo@undefined \let\XeKo@post@hang\XeKo@undefined
-  \def\XeKo@currclass{14}%
+  \def\XeKo@currclass{15}%
   \XeKo@toks@{#1}%
+  \XeKo@def@post@hang{#1}%
   \XeKo@do@flush@toks
   }
 \def\XeKo@startLD#1{%
   \let\XeKo@pre@hang\XeKo@undefined \let\XeKo@post@hang\XeKo@undefined
-  \def\XeKo@currclass{15}%
+  \def\XeKo@currclass{16}%
   \XeKo@toks@{#1}%
+  \XeKo@def@post@hang{#1}%
   \XeKo@do@flush@toks
   }
 \def\XeKo@startVC#1{%
   \let\XeKo@pre@hang\XeKo@undefined \let\XeKo@post@hang\XeKo@undefined
-  \def\XeKo@currclass{16}%
+  \def\XeKo@currclass{17}%
   \XeKo@toks@{#1}%
+  \XeKo@def@post@hang{#1}%
   \XeKo@do@flush@toks
   }
 
-\def\XeKo@maybe@gobble{\expandafter\expandafter\expandafter\@gobble}
+\def\XeKo@maybe@gobble{%
+  \ifdefined\XeKo@curr@font\expandafter\XeKo@maybe@gobble@\fi
+  }
+\def\XeKo@maybe@gobble@{%
+  \expandafter\expandafter\expandafter\@gobble
+  }
 
 \XeTeXinterchartoks\XeTeXcharclassBoundary\XeTeXcharclassHG{%
   \ifnum\lastnodetype=12 %
     \ifcase\lastkern
       \or \unkern\unkern \XKinterhangulbreak \XeKo@maybe@gobble % HG HG
       \or \unkern\unkern \XKinterhanjabreak   % ID HG
+      \or
       \or \unkern\unkern                      % SY HG
       \or \unkern\unkern \XeKo@latincjk       % AA HG
       \or \unkern\unkern \XeKo@nobreak        % AO HG
       \or \unkern\unkern \XeKo@latincjk       % AC HG
       \or \unkern\unkern \XeKo@latincjk       % AP HG
       \or \unkern\unkern \XeKo@latincjk       % AM HG
-      \or \unkern\unkern                      % AH HG
+      \or \unkern\unkern \XKinterhanjabreak   % AH HG
       \or \unkern\unkern                      % OP HG
       \or \unkern\unkern \XeKo@halfhalf       % CL HG
       \or \unkern\unkern \XeKo@quarterquarter % MD HG
@@ -959,13 +956,14 @@
     \ifcase\lastkern
       \or \unkern\unkern \XKinterhanjabreak   % HG ID
       \or \unkern\unkern \XKinterhanjabreak \XeKo@maybe@gobble % ID ID
+      \or
       \or \unkern\unkern                      % SY ID
       \or \unkern\unkern \XeKo@latincjk       % AA ID
       \or \unkern\unkern \XeKo@nobreak        % AO ID
       \or \unkern\unkern \XeKo@latincjk       % AC ID
       \or \unkern\unkern \XeKo@latincjk       % AP ID
       \or \unkern\unkern \XeKo@latincjk       % AM ID
-      \or \unkern\unkern                      % AH ID
+      \or \unkern\unkern \XKinterhanjabreak   % AH ID
       \or \unkern\unkern                      % OP ID
       \or \unkern\unkern \XeKo@halfhalf       % CL ID
       \or \unkern\unkern \XeKo@quarterquarter % MD ID
@@ -983,14 +981,15 @@
   \ifnum\lastnodetype=12 %
     \ifcase\lastkern
       \or \unkern\unkern \XKinterhanjabreak   % HG CJ
-      \or \unkern\unkern \penalty5000\XKinterhanjabreak \XeKo@maybe@gobble % ID CJ
+      \or \unkern\unkern \XKinterhanjabreak\XeKo@suppress@char@orphan \XeKo@maybe@gobble % ID CJ
+      \or
       \or \unkern\unkern                      % SY CJ
       \or \unkern\unkern \XeKo@latincjk       % AA CJ
       \or \unkern\unkern \XeKo@nobreak        % AO CJ
       \or \unkern\unkern \XeKo@latincjk       % AC CJ
       \or \unkern\unkern \XeKo@latincjk       % AP CJ
       \or \unkern\unkern \XeKo@latincjk       % AM CJ
-      \or \unkern\unkern                      % AH CJ
+      \or \unkern\unkern \XKinterhanjabreak   % AH CJ
       \or \unkern\unkern                      % OP CJ
       \or \unkern\unkern \XeKo@halfhalf       % CL CJ
       \or \unkern\unkern \XeKo@quarterquarter % MD CJ
@@ -1009,6 +1008,7 @@
     \ifcase\lastkern
       \or \unkern\unkern                      % HG SY
       \or \unkern\unkern                      % ID SY
+      \or
       \or \unkern\unkern \XeKo@maybe@gobble % SY SY
       \or \unkern\unkern                      % AA SY
       \or \unkern\unkern \XeKo@nobreak        % AO SY
@@ -1034,6 +1034,7 @@
     \ifcase\lastkern
       \or \unkern\unkern \XeKo@latincjk       % HG AA
       \or \unkern\unkern \XeKo@latincjk       % ID AA
+      \or
       \or \unkern\unkern                      % SY AA
       \or \unkern\unkern \XeKo@maybe@gobble % AA AA
       \or \unkern\unkern                      % AO AA
@@ -1057,6 +1058,7 @@
     \ifcase\lastkern
       \or \unkern\unkern \XeKo@latincjk       % HG AO
       \or \unkern\unkern \XeKo@latincjk       % ID AO
+      \or
       \or \unkern\unkern \XeKo@latincjk       % SY AO
       \or \unkern\unkern                      % AA AO
       \or \unkern\unkern \XeKo@maybe@gobble % AO AO
@@ -1080,6 +1082,7 @@
     \ifcase\lastkern
       \or \unkern\unkern                                   % HG AC
       \or \unkern\unkern                                   % ID AC
+      \or
       \or \unkern\unkern                                   % SY AC
       \or \unkern\unkern                                   % AA AC
       \or \unkern\unkern                                   % AO AC
@@ -1103,6 +1106,7 @@
     \ifcase\lastkern
       \or \unkern\unkern                                   % HG AP
       \or \unkern\unkern                                   % ID AP
+      \or
       \or \unkern\unkern                                   % SY AP
       \or \unkern\unkern                                   % AA AP
       \or \unkern\unkern                                   % AO AP
@@ -1126,6 +1130,7 @@
     \ifcase\lastkern
       \or \unkern\unkern \XeKo@nobreak\XeKo@latincjk       % HG AM
       \or \unkern\unkern \XeKo@nobreak\XeKo@latincjk       % ID AM
+      \or
       \or \unkern\unkern \XeKo@nobreak\XeKo@latincjk       % SY AM
       \or \unkern\unkern                                   % AA AM
       \or \unkern\unkern                                   % AO AM
@@ -1147,22 +1152,23 @@
 \XeTeXinterchartoks\XeTeXcharclassBoundary\XeTeXcharclassAH{%
   \ifnum\lastnodetype=12 %
     \ifcase\lastkern
-      \or \unkern\unkern \XeKo@nobreak % HG AH
-      \or \unkern\unkern \XeKo@nobreak % ID AH
-      \or \unkern\unkern \XeKo@nobreak % SY AH
-      \or \unkern\unkern               % AA AH
-      \or \unkern\unkern               % AO AH
-      \or \unkern\unkern               % AC AH
-      \or \unkern\unkern               % AP AH
-      \or \unkern\unkern               % AM AH
+      \or \unkern\unkern \XeKo@nobreak                     % HG AH
+      \or \unkern\unkern \XeKo@nobreak                     % ID AH
+      \or
+      \or \unkern\unkern \XeKo@nobreak                     % SY AH
+      \or \unkern\unkern                                   % AA AH
+      \or \unkern\unkern                                   % AO AH
+      \or \unkern\unkern                                   % AC AH
+      \or \unkern\unkern                                   % AP AH
+      \or \unkern\unkern                                   % AM AH
       \or \unkern\unkern \XeKo@maybe@gobble % AH AH
-      \or \unkern\unkern               % OP AH
-      \or \unkern\unkern \XeKo@nobreak % CL AH
-      \or \unkern\unkern \XeKo@nobreak % MD AH
-      \or \unkern\unkern \XeKo@nobreak % FS AH
-      \or \unkern\unkern \XeKo@nobreak % EX AH
-      \or \unkern\unkern \XeKo@nobreak % LD AH
-      \or \unkern\unkern \XeKo@nobreak % VC AH
+      \or \unkern\unkern                                   % OP AH
+      \or \unkern\unkern \XeKo@nobreak\XeKo@halfhalf       % CL AH
+      \or \unkern\unkern \XeKo@nobreak\XeKo@quarterquarter % MD AH
+      \or \unkern\unkern \XeKo@nobreak\XeKo@halfzero       % FS AH
+      \or \unkern\unkern \XeKo@nobreak\XeKo@halfhalf       % EX AH
+      \or \unkern\unkern \XeKo@nobreak                     % LD AH
+      \or \unkern\unkern \XeKo@nobreak                     % VC AH
     \fi
   \fi
   \XeKo@fontAH\XeKo@startAH
@@ -1172,13 +1178,14 @@
     \ifcase\lastkern
       \or \unkern\unkern \XeKo@halfhalf              % HG OP
       \or \unkern\unkern \XeKo@halfhalf              % ID OP
+      \or
       \or \unkern\unkern \XeKo@halfhalf              % SY OP
       \or \unkern\unkern \XeKo@halfhalf              % AA OP
       \or \unkern\unkern \XeKo@nobreak\XeKo@halfhalf % AO OP
       \or \unkern\unkern \XeKo@halfhalf              % AC OP
       \or \unkern\unkern \XeKo@halfhalf              % AP OP
       \or \unkern\unkern \XeKo@halfhalf              % AM OP
-      \or \unkern\unkern                             % AH OP
+      \or \unkern\unkern \XeKo@halfhalf              % AH OP
       \or \unkern\unkern \XeKo@maybe@gobble % OP OP
       \or \unkern\unkern \XeKo@halfhalf              % CL OP
       \or \unkern\unkern \XeKo@quarterquarter        % MD OP
@@ -1197,6 +1204,7 @@
     \ifcase\lastkern
       \or \unkern\unkern                                   % HG CL
       \or \unkern\unkern                                   % ID CL
+      \or
       \or \unkern\unkern                                   % SY CL
       \or \unkern\unkern                                   % AA CL
       \or \unkern\unkern                                   % AO CL
@@ -1220,13 +1228,14 @@
     \ifcase\lastkern
       \or \unkern\unkern \XeKo@nobreak\XeKo@quarterquarter    % HG MD
       \or \unkern\unkern \XeKo@nobreak\XeKo@quarterquarter    % ID MD
+      \or
       \or \unkern\unkern \XeKo@nobreak\XeKo@quarterquarter    % SY MD
       \or \unkern\unkern \XeKo@nobreak\XeKo@quarterquarter    % AA MD
       \or \unkern\unkern \XeKo@nobreak\XeKo@quarterquarter    % AO MD
       \or \unkern\unkern \XeKo@nobreak\XeKo@quarterquarter    % AC MD
       \or \unkern\unkern \XeKo@nobreak\XeKo@quarterquarter    % AP MD
       \or \unkern\unkern \XeKo@nobreak\XeKo@quarterquarter    % AM MD
-      \or \unkern\unkern                                      % AH MD
+      \or \unkern\unkern \XeKo@nobreak\XeKo@quarterquarter    % AH MD
       \or \unkern\unkern \XeKo@nobreak\XeKo@quarterquarter    % OP MD
       \or \unkern\unkern \XeKo@nobreak\XeKo@quarterquarter    % CL MD
       \or \unkern\unkern \XeKo@nobreak\XeKo@halfquarter \XeKo@maybe@gobble % MD MD
@@ -1245,6 +1254,7 @@
     \ifcase\lastkern
       \or \unkern\unkern                                   % HG FS
       \or \unkern\unkern                                   % ID FS
+      \or
       \or \unkern\unkern                                   % SY FS
       \or \unkern\unkern                                   % AA FS
       \or \unkern\unkern                                   % AO FS
@@ -1268,6 +1278,7 @@
     \ifcase\lastkern
       \or \unkern\unkern                                   % HG EX
       \or \unkern\unkern                                   % ID EX
+      \or
       \or \unkern\unkern                                   % SY EX
       \or \unkern\unkern                                   % AA EX
       \or \unkern\unkern                                   % AO EX
@@ -1291,6 +1302,7 @@
     \ifcase\lastkern
       \or \unkern\unkern                                   % HG LD
       \or \unkern\unkern                                   % ID LD
+      \or
       \or \unkern\unkern                                   % SY LD
       \or \unkern\unkern                                   % AA LD
       \or \unkern\unkern                                   % AO LD
@@ -1312,21 +1324,22 @@
 \XeTeXinterchartoks\XeTeXcharclassBoundary\XeTeXcharclassVC{%
   \ifnum\lastnodetype=12 %
     \ifcase\lastkern
-      \or \unkern\unkern                                % HG VC
-      \or \unkern\unkern                                % ID VC
-      \or \unkern\unkern                                % SY VC
-      \or \unkern\unkern                                % AA VC
-      \or \unkern\unkern                                % AO VC
-      \or \unkern\unkern                                % AC VC
-      \or \unkern\unkern                                % AP VC
-      \or \unkern\unkern                                % AM VC
-      \or \unkern\unkern                                % AH VC
-      \or \unkern\unkern                                % OP VC
-      \or \unkern\unkern                                % CL VC
-      \or \unkern\unkern \XeKo@nobreak\XeKo@halfquarter % MD VC
-      \or \unkern\unkern                                % FS VC
-      \or \unkern\unkern                                % EX VC
-      \or \unkern\unkern                                % LD VC
+      \or \unkern\unkern                                   % HG VC
+      \or \unkern\unkern                                   % ID VC
+      \or
+      \or \unkern\unkern                                   % SY VC
+      \or \unkern\unkern                                   % AA VC
+      \or \unkern\unkern                                   % AO VC
+      \or \unkern\unkern                                   % AC VC
+      \or \unkern\unkern                                   % AP VC
+      \or \unkern\unkern                                   % AM VC
+      \or \unkern\unkern                                   % AH VC
+      \or \unkern\unkern                                   % OP VC
+      \or \unkern\unkern                                   % CL VC
+      \or \unkern\unkern \XeKo@nobreak\XeKo@quarterquarter % MD VC
+      \or \unkern\unkern                                   % FS VC
+      \or \unkern\unkern                                   % EX VC
+      \or \unkern\unkern                                   % LD VC
       \or \unkern\unkern \XeKo@maybe@gobble % VC VC
     \fi
   \fi
@@ -1615,30 +1628,19 @@
   \let\XeKo@iiiquarterquarter \inhibitglue
   \let\XeKo@latincjk          \inhibitglue
   \let\XeKo@postmath          \inhibitglue
-  \let\XKinterhangulbreak     \XKinterhanjabreak
+  \let\XKinterhangulbreak     \inhibitglue
+  \let\XKinterhanjabreak      \inhibitglue
   \let\XeKo@latincjk@classic  \inhibitglue
   \let\XeKo@latincjk@modern   \inhibitglue
   \let\XeKo@postmath@modern   \inhibitglue
   \let\XeKo@suppress@char@orphan  \relax
-  \chardef\XeKo@hangingpuncts     \z@
   \chardef\XeKo@cjk@ignorespaces  \z@
+  \chardef\XeKo@compresspuncts    \z@
   }
 \protected\def\disablehangulspacingandlinebreak{%
-  \let\XeKo@halfzero          \relax
-  \let\XeKo@halfhalf          \relax
-  \let\XeKo@halfquarter       \relax
-  \let\XeKo@quarterquarter    \relax
-  \let\XeKo@iiiquarterquarter \relax
-  \let\XeKo@latincjk          \relax
-  \let\XeKo@postmath          \relax
-  \let\XKinterhangulbreak     \relax
-  \let\XKinterhanjabreak      \relax
-  \let\XeKo@latincjk@classic  \relax
-  \let\XeKo@latincjk@modern   \relax
-  \let\XeKo@postmath@modern   \relax
-  \let\XeKo@suppress@char@orphan  \relax
-  \chardef\XeKo@hangingpuncts     \z@
-  \chardef\XeKo@cjk@ignorespaces  \z@
+  \let\inhibitglue            \relax
+  \chardef\XeKo@hangingpuncts \z@
+  \disablehangulspacing
   \XeTeXlinebreaklocale""
   }
 \protected\def\enablehangulspacingandlinebreak{%
@@ -1938,7 +1940,7 @@
 \DeclareDocumentCommand \setmonohangulfont { O{} m O{} }
 {
   \__xtxko_assign_font_opts:n { #1, #3 }
-  \fontspec_set_family:Nnn \XeKo@monohangulfamily { Ligatures=TeX, \l_xtxko_rest_opts_tl } { #2 }
+  \fontspec_set_family:Nnn \XeKo@monohangulfamily { \l_xtxko_rest_opts_tl } { #2 }
   \cs_set_protected_nopar:Npn \xetexkomonohangulfont
   {
     \fontencoding \g_fontspec_encoding_tl \fontfamily \XeKo@monohangulfamily \selectfont
@@ -2065,7 +2067,7 @@
 \DeclareDocumentCommand \setmonohanjafont { O{} m O{} }
 {
   \__xtxko_assign_font_opts:n { #1, #3 }
-  \fontspec_set_family:Nnn \XeKo@monohanjafamily { Ligatures=TeX, \l_xtxko_rest_opts_tl } { #2 }
+  \fontspec_set_family:Nnn \XeKo@monohanjafamily { \l_xtxko_rest_opts_tl } { #2 }
   \cs_set_protected_nopar:Npn \xetexkomonohanjafont
   {
     \fontencoding \g_fontspec_encoding_tl \fontfamily \XeKo@monohanjafamily \selectfont
@@ -2082,7 +2084,6 @@
   }
   \ignorespaces
 }
-    \XeKo@latin@selectfont
 \DeclareDocumentCommand \newhanjafontfamily { m O{} m O{} }
 {
   \__xtxko_assign_font_opts:n { #2, #4 }
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb b/systems/texlive/tlnet/tlpkg/texlive.tlpdb
index aae82b7e7b..feccc7fa34 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb
@@ -26,7 +26,7 @@ depend container_split_src_files/1
 depend frozen/0
 depend minrelease/2016
 depend release/2021
-depend revision/58792
+depend revision/58798
 
 name 00texlive.image
 category TLCore
@@ -27681,7 +27681,7 @@ catalogue-version 1.0
 
 name babel
 category Package
-revision 58684
+revision 58797
 shortdesc Multilingual support for Plain TeX or LaTeX
 relocated 1
 longdesc This package manages culturally-determined typographical (and
@@ -27694,22 +27694,22 @@ longdesc has to be done for each language. Included is also a set of ini
 longdesc files for about 250 languages. Many language styles work with
 longdesc pdfLaTeX, as well as with XeLaTeX and LuaLaTeX, out of the box.
 longdesc A few even work with plain formats.
-containersize 175072
-containerchecksum d7a08a9733b008436529ca481535497d0e6bf53362711224dcc4cd2449b3041ea71f1cf94bf86a45a9fcfac54ed523f06afea91f0df42775a0315af3a2f6390a
-doccontainersize 812024
-doccontainerchecksum 66e09bf630ea04e94158813baddc8aece0afe65d5f2a713ed6d9d59c3c494d11245c2467ee17a180075ac7e5468d0f3006e5e4defdeb0f5d86d29058aa3803c7
+containersize 176868
+containerchecksum a548741250ad9448761ebeecef36889fe58e77c7240a584ff68b9a0e7b8d09e9fae522320a53406142f459d7e891fbd62d75e6c660c7fa49870798f30663a7cc
+doccontainersize 813832
+doccontainerchecksum e7df412ab9b1ef2467ec3c61feadef6559baf523fc5f26ca48f85075c1cc9023121a5de5125affb3fc0b34ece75157be18e4c667f3fc9fe4eba188b82bf5eeae
 docfiles size=203
  RELOC/doc/latex/babel/README.md details="Readme"
  RELOC/doc/latex/babel/babel.pdf details="Package documentation"
-srccontainersize 674948
-srccontainerchecksum 18ee85e8865f065fcbb36e1232c5f3bc5e97a40e97504f6baa7c7f59099260998e257f21a8f97608c819d6279eb4823c2791668c2fb46bd564e007f729ecf99f
+srccontainersize 678128
+srccontainerchecksum 1c23db39bf91fdd5ff796fada1da87f2eea9a35d392a8660bf38f4ad1c13af67422289c1d7d455f1f62ebf784c794457a1ba6c4f6b25bb74adeeaf912bfef863
 srcfiles size=370
  RELOC/source/latex/babel/babel.dtx
  RELOC/source/latex/babel/babel.ins
  RELOC/source/latex/babel/bbcompat.dtx
  RELOC/source/latex/babel/bbidxglo.dtx
  RELOC/source/latex/babel/locale.zip
-runfiles size=934
+runfiles size=936
  RELOC/makeindex/babel/bbglo.ist
  RELOC/makeindex/babel/bbind.ist
  RELOC/tex/generic/babel/UKenglish.sty
@@ -27991,6 +27991,7 @@ runfiles size=934
  RELOC/tex/generic/babel/locale/hsb/babel-usorbian.tex
  RELOC/tex/generic/babel/locale/hu/babel-hu.ini
  RELOC/tex/generic/babel/locale/hu/babel-hungarian.tex
+ RELOC/tex/generic/babel/locale/hu/babel-magyar.tex
  RELOC/tex/generic/babel/locale/hy/babel-armenian.tex
  RELOC/tex/generic/babel/locale/hy/babel-hy.ini
  RELOC/tex/generic/babel/locale/ia/babel-ia.ini
@@ -28411,7 +28412,7 @@ catalogue-contact-repository https://github.com/latex3/babel
 catalogue-ctan /macros/latex/required/babel/base
 catalogue-license lppl1.3
 catalogue-topics multilingual
-catalogue-version 3.56
+catalogue-version 3.57
 
 name babel-albanian
 category Package
@@ -98411,15 +98412,15 @@ catalogue-topics notes editorial
 
 name easybook
 category Package
-revision 58788
+revision 58798
 shortdesc Typeset Chinese books or notes
 relocated 1
 longdesc Easybook is a minimalist style template based on the ctexbook
 longdesc book document class.
-containersize 11224
-containerchecksum 77ab4f7539d6389298de6905cfc271090a41c4e2b7c75166de700b26fc31770a0b2c7aba0e06ecc496ce0de28018d2b80e47c9391d2f96e59a0134fbf1a2d157
-doccontainersize 687304
-doccontainerchecksum 3cab62035e6a92b6ab7401d07aaecfff709af6969795c8662c76a90d15641e3a45faaa3edc9f9df33b17d128c499708ee879626824e455bfe54c9d775e0c827d
+containersize 11452
+containerchecksum 3726c1d794527cf0847d97791f599b8d4244ad06ac8f708533cb4882bf52afa0b2ebd98a229451d8d695d5eb0d6463bd2fcd96d830f5e15ff60e2fdc3835938f
+doccontainersize 688256
+doccontainerchecksum a1d5f18328039b2c979771992df38c813ea1769827d2e613df9f330d6f8997f99e0da4e638d32394275f920e7edd9f36874b10c255640cb8aee575dc603c2c8e
 docfiles size=177
  RELOC/doc/latex/easybook/README.md details="Readme"
  RELOC/doc/latex/easybook/appendix.tex
@@ -98430,18 +98431,18 @@ docfiles size=177
  RELOC/doc/latex/easybook/easybook-demo.tex
  RELOC/doc/latex/easybook/easybook.pdf details="Package documentation" language="zh"
  RELOC/doc/latex/easybook/refs.bib
-srccontainersize 22784
-srccontainerchecksum a0db9cb99deb5f0db2259b7611a9a708662a0db01a6d54996edbab36c1d5b95407fc3b22634c44c9dde5bb4e04a4572cd472659da9475eff4c1ee9fb9f9bf72e
+srccontainersize 23088
+srccontainerchecksum c4516210e98da75966241d12e600e2f3090a4c5483fb7e04f101598697da1645404bfea13d77e0eedc384eadaaad192452deb13ee1a1aa5b9d4c17582de653a8
 srcfiles size=23
  RELOC/source/latex/easybook/easybook.dtx
-runfiles size=12
+runfiles size=13
  RELOC/tex/latex/easybook/easybook.cls
 catalogue-also ctex
 catalogue-contact-repository https://gitee.com/texl3/easybook
 catalogue-ctan /macros/latex/contrib/easybook
 catalogue-license cc-by-4
 catalogue-topics book-pub class chinese expl3
-catalogue-version 1.24g
+catalogue-version 1.24h
 
 name easyfig
 category Package
@@ -142694,7 +142695,7 @@ catalogue-version 2.2
 
 name install-latex-guide-zh-cn
 category Package
-revision 57590
+revision 58796
 shortdesc A short introduction to LaTeX installation written in Chinese
 relocated 1
 longdesc This package will introduce the operations related to
@@ -142703,10 +142704,10 @@ longdesc macro packages, and compiling simple documents on Windows 10,
 longdesc Ubuntu 20.04, and macOS systems, and mainly introducing command
 longdesc line operations.
 containersize 568
-containerchecksum c5f11472922d7bb05b8c1bfaeac6862af0e3367a7cf7a0201e09ac030b44c15965647e885d3c90a518e8cdf6816756873184d7835caae28423b505f15170ebb2
-doccontainersize 739032
-doccontainerchecksum e0a934c670f06a175e1c2805efc06df559c3436656df7d0191a204c3be0d0556050757378f9a4b0f403862dd747f783941281af539d534caa5b1dcfc27b0b885
-docfiles size=211
+containerchecksum df82e74e3bd7fb351ee29594f5ef2438b2217008ed03a9a3dd11e99dd7e64253b8bfe8c40d41cc20763143b8c65fa600ba9c81a72872dc4e51b974aeb6da640e
+doccontainersize 762088
+doccontainerchecksum dced6a6a334cdef2d648a5619a246fbb2704c0119b179516491e3fcd832d8fe568ad9fb47c6732793717c040d5556ffcc54e0714e9da5ca6f81fca1bf336b485
+docfiles size=217
  RELOC/doc/latex/install-latex-guide-zh-cn/LICENSE
  RELOC/doc/latex/install-latex-guide-zh-cn/README.md details="Readme"
  RELOC/doc/latex/install-latex-guide-zh-cn/appendix/mirror.tex
@@ -142728,7 +142729,7 @@ catalogue-contact-repository https://github.com/OsbertWang/install-latex-guide-z
 catalogue-ctan /info/install-latex-guide-zh-cn
 catalogue-license lppl1.3c
 catalogue-topics chinese-doc tutorial
-catalogue-version 2021.2.1
+catalogue-version 2021.4.7
 
 name installfont
 category Package
@@ -298330,15 +298331,15 @@ docfiles size=619
 
 name texlive-docindex
 category TLCore
-revision 58780
+revision 58794
 shortdesc top-level TeX Live doc.html, etc.
 longdesc These files are regenerated as needed, which is often, so we
 longdesc make them a separate package. See the tl-update-auto script for
 longdesc the process.
 containersize 392
-containerchecksum 817744e5fafb65fab41232df0a2648c0b8962d8e7d5ec997fe349b806479eb93cef89d9c8f713da58ad028fe493b04a446c3438a819f849c73c01dcb42fac6b0
-doccontainersize 174312
-doccontainerchecksum 27c5144b49bae0a71ce33ae1aad7221a3ce8e0c1a338df5d47100d7a7b0f67ff1c173b98ceae89a0352ad84058f4771cef32aaa9c1713f989b3aff4c2fc168de
+containerchecksum a83072a4276ded51a62af94bd81c07fcef0a879c2d0b37c901d50c0bc5d45dcdc9a2b9ed1572254ddd6c9c4eb5bd0dd91a805fb477347284506603f8e02770fd
+doccontainersize 174388
+doccontainerchecksum 69a884450e5790fe5d2d1e540aa40bbf69dcdf7e060d36352de44826195c37467e246385b8689b3237c588163cdd674bb767057902f4f63e76c9f51a41d1f714
 docfiles size=347
  doc.html
 
@@ -298497,14 +298498,14 @@ docfiles size=539
 
 name texlive-msg-translations
 category TLCore
-revision 58781
+revision 58795
 shortdesc translations of the TeX Live installer and TeX Live Manager
 longdesc This package contains the translated messages of the TeX Live
 longdesc installer and TeX Live Manager. For information on creating or
 longdesc updating translations, see
 longdesc http://tug.org/texlive/doc.html#install-tl-xlate.
-containersize 141480
-containerchecksum 6a6b677189e276e62e37b904563924821b9f85eb2faeafae9b3399f68387a999ef3998238d90b025afe0d7f4f31f45bb1e50435aab7740f737cce01cd8553aa1
+containersize 141444
+containerchecksum 8051781a91f3a5aaaeec32e0bd002b5c9f0ec53e840665382500437907df980a92618f2074f935290e8ad6a343f636d77b78af40c4f39a0363a048c77b36c6aa
 runfiles size=350
  tlpkg/translations/README
  tlpkg/translations/cs.po
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
index 5bb53ed70a..8205f65b9d 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
@@ -1 +1 @@
-1a12f714299bc56840bbab3e15517c47  texlive.tlpdb
+665168c096dca74d47209eac48218f30  texlive.tlpdb
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
index c1e9903090..40a306e97f 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
@@ -1 +1 @@
-0234a9d0bf6b0cf3e10c0d95f7e82d04452a6507283b1f53c9740295fc1721f035f45d1c03ede54b20881bd78f0f340b0d235dc3bd2a73e00fa3f4fd759eeb52  texlive.tlpdb
+ac358fd01da0b7ce3eff305c3e309682a061d8f654fee40cc275d19b2ff532d533c883217f91217d89d2dc341339abec8b764078c4e40b3677f945d5c0f1d2c9  texlive.tlpdb
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
index 4ae1d08cef..9aebfde444 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-----
 
-iQEcBAEBCgAGBQJgbkXbAAoJEEzhh34ZQ4xwAdAIAJLEGokb7gl4dJD+4GrE6ryz
-Z/+i+4xfI7Wxydkg9t7r1wrxl7L3bYL8b/7yIsMLoXb5PU5/6OQe9cuhc6oxl/xc
-haFqRLEYBlTWR2PLLkwzlFIuE9MmkEXQghhpREJ8xgVdbCTMaRrHLcthxuazjn4X
-C2rfwgyxxGaswFOs6QwavQG0d3k7UlxVx3gP57ic1xPnRxTd9Lqh9AqUg2XM2fjU
-PwaJiSDANBbnCRYUbtGjS91Zht+rJK3Ta/7gykCzMaf3T33dsFl/gKGD9plcjwvD
-3qYtf0L8tYfkAXYDS4OeqTs8+nPoeQgLxTqMkrnmVhlNznS+NrV6ZMrS0VSqHuk=
-=DsDk
+iQEcBAEBCgAGBQJgb5dLAAoJEEzhh34ZQ4xwrp4H/1T5ChmXF8jc+P33DzdMFF1I
+fmXsRm4bVXu2kSGbVaIP/OjchzYZtN+YtBbqFKatJYxpJslYyMYwhu4pe3M5/5Uo
+Ku1oadhCCedIgG4dx7LY80aQoMkk9FZRyqmF3wanNCXJhRBPJt/vMv0tgIEQtEBJ
+Xs4qetvmEgucVy+zri07XwPkX0YbsI6ltEe++Fp571iMC5mFRSmROyrtVP3+ezjI
++umJZ+kFuBbqnzZsBeyKFIU8cU1k1+ec0yw+eX80QSyFBxupFsr2XWeKM80J7zZw
+Hc9MIhAh4PzKURcUNzQ8+t4vuDyns1I1CJ2z/Uia7Gv48hHbQHJqjqU3fNRkq5I=
+=o4xv
 -----END PGP SIGNATURE-----
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
index cc775b0d03..5ac849d9bd 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
diff --git a/systems/texlive/tlnet/tlpkg/translations/cs.po b/systems/texlive/tlnet/tlpkg/translations/cs.po
index 3b68cdd0ba..f3d2ba1ebb 100644
--- a/systems/texlive/tlnet/tlpkg/translations/cs.po
+++ b/systems/texlive/tlnet/tlpkg/translations/cs.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: TeX Live translation\n"
 "Report-Msgid-Bugs-To: tex-live@tug.org\n"
-"POT-Creation-Date: 2021-04-07 01:48+0200\n"
+"POT-Creation-Date: 2021-04-08 01:48+0200\n"
 "PO-Revision-Date: 2021-03-11 09:18+0300\n"
 "Last-Translator: Petr Sojka <sojka@fi.muni.cz>\n"
 "Language-Team: Czech <>\n"
@@ -22,20 +22,20 @@ msgstr ""
 #: tlpkg/installer/install-menu-text.pl:41
 #: tlpkg/installer/install-tl-gui.tcl:820
 #: tlpkg/installer/install-tl-gui.tcl:1045
-#: tlpkg/installer/install-tl-gui.tcl:1675
+#: tlpkg/installer/install-tl-gui.tcl:1674
 msgid "None"
 msgstr "Žádné"
 
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:138
 #: tlpkg/installer/install-menu-text.pl:38
-#: tlpkg/installer/install-tl-gui.tcl:1675
+#: tlpkg/installer/install-tl-gui.tcl:1674
 msgid "Only new"
 msgstr "Jen nové"
 
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:139
 #: tlpkg/installer/install-menu-text.pl:39
 #: tlpkg/installer/install-tl-gui.tcl:1042
-#: tlpkg/installer/install-tl-gui.tcl:1675
+#: tlpkg/installer/install-tl-gui.tcl:1674
 #: texmf-dist/scripts/tlshell/tlshell.tcl:1642
 #: texmf-dist/scripts/tlshell/tlshell.tcl:2547
 #: texmf-dist/scripts/tlshell/tlshell.tcl:2565
@@ -643,7 +643,7 @@ msgid "Create shortcuts on the desktop"
 msgstr "Vytvořit zkratky na ploše"
 
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1230
-#: tlpkg/installer/install-tl-gui.tcl:1688
+#: tlpkg/installer/install-tl-gui.tcl:1687
 msgid "Install for all users"
 msgstr "Nainstaluj pro všechny uživatele"
 
@@ -966,7 +966,7 @@ msgid "TeX Live Installer"
 msgstr "Instalátor TeX Live"
 
 #: tlpkg/installer/install-tl-gui.tcl:373
-#: tlpkg/installer/install-tl-gui.tcl:2021
+#: tlpkg/installer/install-tl-gui.tcl:2020
 #, tcl-format
 msgid ""
 "Trying to load %s.\n"
@@ -1185,56 +1185,56 @@ msgstr "Instalovat dokumentaci fontů/maker"
 msgid "Install font/macro source tree"
 msgstr "Instalovat zdrojové soubory fontů/maker"
 
-#: tlpkg/installer/install-tl-gui.tcl:1656
+#: tlpkg/installer/install-tl-gui.tcl:1655
 msgid "Adjust searchpath"
 msgstr "Přizpůsob vyhledávací cestu"
 
-#: tlpkg/installer/install-tl-gui.tcl:1663
+#: tlpkg/installer/install-tl-gui.tcl:1662
 msgid "No shortcuts"
 msgstr "Žádné zkratky"
 
-#: tlpkg/installer/install-tl-gui.tcl:1663
+#: tlpkg/installer/install-tl-gui.tcl:1662
 msgid "TeX Live menu"
 msgstr "TeX Live menu"
 
-#: tlpkg/installer/install-tl-gui.tcl:1663
+#: tlpkg/installer/install-tl-gui.tcl:1662
 msgid "Launcher entry"
 msgstr "Položka k spuštění"
 
-#: tlpkg/installer/install-tl-gui.tcl:1665
+#: tlpkg/installer/install-tl-gui.tcl:1664
 msgid "Desktop integration"
 msgstr "Integrace desktopu"
 
-#: tlpkg/installer/install-tl-gui.tcl:1677
+#: tlpkg/installer/install-tl-gui.tcl:1676
 msgid "File associations"
 msgstr "Asociace typů souborů"
 
-#: tlpkg/installer/install-tl-gui.tcl:1699
+#: tlpkg/installer/install-tl-gui.tcl:1698
 msgid "Install TeXworks front end"
 msgstr "Nainstaluj pomocníka TeXworks"
 
-#: tlpkg/installer/install-tl-gui.tcl:1711
+#: tlpkg/installer/install-tl-gui.tcl:1710
 msgid "Create symlinks in standard directories"
 msgstr "Vytvářet symbolické linky ve standardní adresářích"
 
-#: tlpkg/installer/install-tl-gui.tcl:1717
+#: tlpkg/installer/install-tl-gui.tcl:1716
 msgid "Specify directories"
 msgstr "Specifikovat adresáře"
 
-#: tlpkg/installer/install-tl-gui.tcl:1731
+#: tlpkg/installer/install-tl-gui.tcl:1730
 msgid "After install, set CTAN as source for package updates"
 msgstr "Po instalaci nastavte CTAN jako zdroj aktualizace balíků"
 
-#: tlpkg/installer/install-tl-gui.tcl:1782
+#: tlpkg/installer/install-tl-gui.tcl:1781
 msgid "Custom scheme"
 msgstr "Přizpůsobení schématu"
 
-#: tlpkg/installer/install-tl-gui.tcl:1959
+#: tlpkg/installer/install-tl-gui.tcl:1958
 #, tcl-format
 msgid "%s not a local or remote repository"
 msgstr "%s není lokální nebo vzdálený repozitář"
 
-#: tlpkg/installer/install-tl-gui.tcl:1963
+#: tlpkg/installer/install-tl-gui.tcl:1962
 #, tcl-format
 msgid "%s requires an argument"
 msgstr "%s vyžaduje argument"
diff --git a/systems/texlive/tlnet/tlpkg/translations/de.po b/systems/texlive/tlnet/tlpkg/translations/de.po
index 0da51bbf62..3810abec9b 100644
--- a/systems/texlive/tlnet/tlpkg/translations/de.po
+++ b/systems/texlive/tlnet/tlpkg/translations/de.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: TeX Live translation\n"
 "Report-Msgid-Bugs-To: tex-live@tug.org\n"
-"POT-Creation-Date: 2021-04-07 01:48+0200\n"
+"POT-Creation-Date: 2021-04-08 01:48+0200\n"
 "PO-Revision-Date: 2021-03-11 13:46+0100\n"
 "Last-Translator: Uwe Ziegenhagen <ziegenhagen@gmail.com>\n"
 "Language-Team: TL German Translation Team <tex-live@tug.org>\n"
@@ -18,20 +18,20 @@ msgstr ""
 #: tlpkg/installer/install-menu-text.pl:41
 #: tlpkg/installer/install-tl-gui.tcl:820
 #: tlpkg/installer/install-tl-gui.tcl:1045
-#: tlpkg/installer/install-tl-gui.tcl:1675
+#: tlpkg/installer/install-tl-gui.tcl:1674
 msgid "None"
 msgstr "Keine(n)"
 
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:138
 #: tlpkg/installer/install-menu-text.pl:38
-#: tlpkg/installer/install-tl-gui.tcl:1675
+#: tlpkg/installer/install-tl-gui.tcl:1674
 msgid "Only new"
 msgstr "Nur neue"
 
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:139
 #: tlpkg/installer/install-menu-text.pl:39
 #: tlpkg/installer/install-tl-gui.tcl:1042
-#: tlpkg/installer/install-tl-gui.tcl:1675
+#: tlpkg/installer/install-tl-gui.tcl:1674
 #: texmf-dist/scripts/tlshell/tlshell.tcl:1642
 #: texmf-dist/scripts/tlshell/tlshell.tcl:2547
 #: texmf-dist/scripts/tlshell/tlshell.tcl:2565
@@ -637,7 +637,7 @@ msgid "Create shortcuts on the desktop"
 msgstr "Erstelle Verknüpfungen auf dem Desktop"
 
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1230
-#: tlpkg/installer/install-tl-gui.tcl:1688
+#: tlpkg/installer/install-tl-gui.tcl:1687
 msgid "Install for all users"
 msgstr "Installiere für alle Nutzer"
 
@@ -960,7 +960,7 @@ msgid "TeX Live Installer"
 msgstr "TeX Live Installationsprogramm"
 
 #: tlpkg/installer/install-tl-gui.tcl:373
-#: tlpkg/installer/install-tl-gui.tcl:2021
+#: tlpkg/installer/install-tl-gui.tcl:2020
 #, tcl-format
 msgid ""
 "Trying to load %s.\n"
@@ -1178,56 +1178,56 @@ msgstr "Installation der Font/Macro-Dokumentation"
 msgid "Install font/macro source tree"
 msgstr "Installation der Font/Macro-Quellen"
 
-#: tlpkg/installer/install-tl-gui.tcl:1656
+#: tlpkg/installer/install-tl-gui.tcl:1655
 msgid "Adjust searchpath"
 msgstr "Passe Suchpfad an"
 
-#: tlpkg/installer/install-tl-gui.tcl:1663
+#: tlpkg/installer/install-tl-gui.tcl:1662
 msgid "No shortcuts"
 msgstr "Keine Menülinks"
 
-#: tlpkg/installer/install-tl-gui.tcl:1663
+#: tlpkg/installer/install-tl-gui.tcl:1662
 msgid "TeX Live menu"
 msgstr "TeX Live Menü"
 
-#: tlpkg/installer/install-tl-gui.tcl:1663
+#: tlpkg/installer/install-tl-gui.tcl:1662
 msgid "Launcher entry"
 msgstr "Eintrag im Startmenü"
 
-#: tlpkg/installer/install-tl-gui.tcl:1665
+#: tlpkg/installer/install-tl-gui.tcl:1664
 msgid "Desktop integration"
 msgstr "Desktop Integration"
 
-#: tlpkg/installer/install-tl-gui.tcl:1677
+#: tlpkg/installer/install-tl-gui.tcl:1676
 msgid "File associations"
 msgstr "Dateiverknüpfungen"
 
-#: tlpkg/installer/install-tl-gui.tcl:1699
+#: tlpkg/installer/install-tl-gui.tcl:1698
 msgid "Install TeXworks front end"
 msgstr "Installiere TeXworks als Frontend"
 
-#: tlpkg/installer/install-tl-gui.tcl:1711
+#: tlpkg/installer/install-tl-gui.tcl:1710
 msgid "Create symlinks in standard directories"
 msgstr "Erstelle Symlinks in Standardverzeichnissen"
 
-#: tlpkg/installer/install-tl-gui.tcl:1717
+#: tlpkg/installer/install-tl-gui.tcl:1716
 msgid "Specify directories"
 msgstr "Wähle Verzeichnisse"
 
-#: tlpkg/installer/install-tl-gui.tcl:1731
+#: tlpkg/installer/install-tl-gui.tcl:1730
 msgid "After install, set CTAN as source for package updates"
 msgstr "Setze nach der Installation CTAN als Paketquelle"
 
-#: tlpkg/installer/install-tl-gui.tcl:1782
+#: tlpkg/installer/install-tl-gui.tcl:1781
 msgid "Custom scheme"
 msgstr "Angepasstes Schema"
 
-#: tlpkg/installer/install-tl-gui.tcl:1959
+#: tlpkg/installer/install-tl-gui.tcl:1958
 #, tcl-format
 msgid "%s not a local or remote repository"
 msgstr "%s ist kein lokales oder remote Repository"
 
-#: tlpkg/installer/install-tl-gui.tcl:1963
+#: tlpkg/installer/install-tl-gui.tcl:1962
 #, tcl-format
 msgid "%s requires an argument"
 msgstr "%s erfordert ein Argument"
diff --git a/systems/texlive/tlnet/tlpkg/translations/fr.po b/systems/texlive/tlnet/tlpkg/translations/fr.po
index a1363a3a20..77fd8c4c48 100644
--- a/systems/texlive/tlnet/tlpkg/translations/fr.po
+++ b/systems/texlive/tlnet/tlpkg/translations/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: TeX Live translation\n"
 "Report-Msgid-Bugs-To: tex-live@tug.org\n"
-"POT-Creation-Date: 2021-04-07 01:48+0200\n"
+"POT-Creation-Date: 2021-04-08 01:48+0200\n"
 "PO-Revision-Date: 2021-03-24 08:08+0100\n"
 "Last-Translator: Denis Bitouzé <denis.bitouze@univ-littoral.fr>\n"
 "Language-Team: French <kde-i18n-doc@kde.org>\n"
@@ -24,20 +24,20 @@ msgstr ""
 #: tlpkg/installer/install-menu-text.pl:41
 #: tlpkg/installer/install-tl-gui.tcl:820
 #: tlpkg/installer/install-tl-gui.tcl:1045
-#: tlpkg/installer/install-tl-gui.tcl:1675
+#: tlpkg/installer/install-tl-gui.tcl:1674
 msgid "None"
 msgstr "Aucun"
 
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:138
 #: tlpkg/installer/install-menu-text.pl:38
-#: tlpkg/installer/install-tl-gui.tcl:1675
+#: tlpkg/installer/install-tl-gui.tcl:1674
 msgid "Only new"
 msgstr "Seulement les nouveaux"
 
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:139
 #: tlpkg/installer/install-menu-text.pl:39
 #: tlpkg/installer/install-tl-gui.tcl:1042
-#: tlpkg/installer/install-tl-gui.tcl:1675
+#: tlpkg/installer/install-tl-gui.tcl:1674
 #: texmf-dist/scripts/tlshell/tlshell.tcl:1642
 #: texmf-dist/scripts/tlshell/tlshell.tcl:2547
 #: texmf-dist/scripts/tlshell/tlshell.tcl:2565
@@ -643,7 +643,7 @@ msgid "Create shortcuts on the desktop"
 msgstr "Ajouter des raccourcis sur le bureau"
 
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1230
-#: tlpkg/installer/install-tl-gui.tcl:1688
+#: tlpkg/installer/install-tl-gui.tcl:1687
 msgid "Install for all users"
 msgstr "Installer pour tous les utilisateurs"
 
@@ -971,7 +971,7 @@ msgid "TeX Live Installer"
 msgstr "Installateur de la TeX Live"
 
 #: tlpkg/installer/install-tl-gui.tcl:373
-#: tlpkg/installer/install-tl-gui.tcl:2021
+#: tlpkg/installer/install-tl-gui.tcl:2020
 #, tcl-format
 msgid ""
 "Trying to load %s.\n"
@@ -1191,57 +1191,57 @@ msgstr "Installer la documentation des macros et polices"
 msgid "Install font/macro source tree"
 msgstr "Installer les sources des macros et polices"
 
-#: tlpkg/installer/install-tl-gui.tcl:1656
+#: tlpkg/installer/install-tl-gui.tcl:1655
 msgid "Adjust searchpath"
 msgstr "Ajuster le chemin de recherche"
 
-#: tlpkg/installer/install-tl-gui.tcl:1663
+#: tlpkg/installer/install-tl-gui.tcl:1662
 msgid "No shortcuts"
 msgstr "Pas de raccourcis"
 
-#: tlpkg/installer/install-tl-gui.tcl:1663
+#: tlpkg/installer/install-tl-gui.tcl:1662
 msgid "TeX Live menu"
 msgstr "Menu TeX Live"
 
-#: tlpkg/installer/install-tl-gui.tcl:1663
+#: tlpkg/installer/install-tl-gui.tcl:1662
 msgid "Launcher entry"
 msgstr "Entrée de lanceur"
 
-#: tlpkg/installer/install-tl-gui.tcl:1665
+#: tlpkg/installer/install-tl-gui.tcl:1664
 msgid "Desktop integration"
 msgstr "Intégration au poste de travail"
 
-#: tlpkg/installer/install-tl-gui.tcl:1677
+#: tlpkg/installer/install-tl-gui.tcl:1676
 msgid "File associations"
 msgstr "Associations de fichiers"
 
-#: tlpkg/installer/install-tl-gui.tcl:1699
+#: tlpkg/installer/install-tl-gui.tcl:1698
 msgid "Install TeXworks front end"
 msgstr "Installer l'éditeur intégré TeXworks"
 
-#: tlpkg/installer/install-tl-gui.tcl:1711
+#: tlpkg/installer/install-tl-gui.tcl:1710
 msgid "Create symlinks in standard directories"
 msgstr "Créer les liens symboliques dans les répertoires standards"
 
-#: tlpkg/installer/install-tl-gui.tcl:1717
+#: tlpkg/installer/install-tl-gui.tcl:1716
 msgid "Specify directories"
 msgstr "Spécifier les répertoires"
 
-#: tlpkg/installer/install-tl-gui.tcl:1731
+#: tlpkg/installer/install-tl-gui.tcl:1730
 msgid "After install, set CTAN as source for package updates"
 msgstr ""
 "Après l'installation, la source des mises à jour des packages sera CTAN"
 
-#: tlpkg/installer/install-tl-gui.tcl:1782
+#: tlpkg/installer/install-tl-gui.tcl:1781
 msgid "Custom scheme"
 msgstr "Schéma personnalisé"
 
-#: tlpkg/installer/install-tl-gui.tcl:1959
+#: tlpkg/installer/install-tl-gui.tcl:1958
 #, tcl-format
 msgid "%s not a local or remote repository"
 msgstr "%s n'est pas un dépôt local ou distant"
 
-#: tlpkg/installer/install-tl-gui.tcl:1963
+#: tlpkg/installer/install-tl-gui.tcl:1962
 #, tcl-format
 msgid "%s requires an argument"
 msgstr "%s requiert un argument"
diff --git a/systems/texlive/tlnet/tlpkg/translations/ja.po b/systems/texlive/tlnet/tlpkg/translations/ja.po
index 077f62d8fc..a43f504288 100644
--- a/systems/texlive/tlnet/tlpkg/translations/ja.po
+++ b/systems/texlive/tlnet/tlpkg/translations/ja.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: TeX Live translation\n"
 "Report-Msgid-Bugs-To: tex-live@tug.org\n"
-"POT-Creation-Date: 2021-04-07 01:48+0200\n"
+"POT-Creation-Date: 2021-04-08 01:48+0200\n"
 "PO-Revision-Date: 2021-03-18 11:41+0900\n"
 "Last-Translator: Takuto Asakura <tkt.asakura@gmail.com>\n"
 "Language-Team: TL Translation Team <tex-live@tug.org>\n"
@@ -22,20 +22,20 @@ msgstr ""
 #: tlpkg/installer/install-menu-text.pl:41
 #: tlpkg/installer/install-tl-gui.tcl:820
 #: tlpkg/installer/install-tl-gui.tcl:1045
-#: tlpkg/installer/install-tl-gui.tcl:1675
+#: tlpkg/installer/install-tl-gui.tcl:1674
 msgid "None"
 msgstr "なし"
 
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:138
 #: tlpkg/installer/install-menu-text.pl:38
-#: tlpkg/installer/install-tl-gui.tcl:1675
+#: tlpkg/installer/install-tl-gui.tcl:1674
 msgid "Only new"
 msgstr "新規のみ"
 
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:139
 #: tlpkg/installer/install-menu-text.pl:39
 #: tlpkg/installer/install-tl-gui.tcl:1042
-#: tlpkg/installer/install-tl-gui.tcl:1675
+#: tlpkg/installer/install-tl-gui.tcl:1674
 #: texmf-dist/scripts/tlshell/tlshell.tcl:1642
 #: texmf-dist/scripts/tlshell/tlshell.tcl:2547
 #: texmf-dist/scripts/tlshell/tlshell.tcl:2565
@@ -641,7 +641,7 @@ msgid "Create shortcuts on the desktop"
 msgstr "ショートカットをデスクトップに作成"
 
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1230
-#: tlpkg/installer/install-tl-gui.tcl:1688
+#: tlpkg/installer/install-tl-gui.tcl:1687
 msgid "Install for all users"
 msgstr "すべてのユーザ向けにインストールする"
 
@@ -963,7 +963,7 @@ msgid "TeX Live Installer"
 msgstr "TeX Live インストーラ"
 
 #: tlpkg/installer/install-tl-gui.tcl:373
-#: tlpkg/installer/install-tl-gui.tcl:2021
+#: tlpkg/installer/install-tl-gui.tcl:2020
 #, tcl-format
 msgid ""
 "Trying to load %s.\n"
@@ -1182,56 +1182,56 @@ msgstr "font/macro のドキュメントツリーをインストール"
 msgid "Install font/macro source tree"
 msgstr "font/macro のソースツリーをインストール"
 
-#: tlpkg/installer/install-tl-gui.tcl:1656
+#: tlpkg/installer/install-tl-gui.tcl:1655
 msgid "Adjust searchpath"
 msgstr "検索パスを調整"
 
-#: tlpkg/installer/install-tl-gui.tcl:1663
+#: tlpkg/installer/install-tl-gui.tcl:1662
 msgid "No shortcuts"
 msgstr "ショートカットなし"
 
-#: tlpkg/installer/install-tl-gui.tcl:1663
+#: tlpkg/installer/install-tl-gui.tcl:1662
 msgid "TeX Live menu"
 msgstr "TeX Live メニュー"
 
-#: tlpkg/installer/install-tl-gui.tcl:1663
+#: tlpkg/installer/install-tl-gui.tcl:1662
 msgid "Launcher entry"
 msgstr "ランチャ項目"
 
-#: tlpkg/installer/install-tl-gui.tcl:1665
+#: tlpkg/installer/install-tl-gui.tcl:1664
 msgid "Desktop integration"
 msgstr "スタートメニューにショートカットを作成"
 
-#: tlpkg/installer/install-tl-gui.tcl:1677
+#: tlpkg/installer/install-tl-gui.tcl:1676
 msgid "File associations"
 msgstr "ファイルの関連付けを変更"
 
-#: tlpkg/installer/install-tl-gui.tcl:1699
+#: tlpkg/installer/install-tl-gui.tcl:1698
 msgid "Install TeXworks front end"
 msgstr "TeXworks をインストール"
 
-#: tlpkg/installer/install-tl-gui.tcl:1711
+#: tlpkg/installer/install-tl-gui.tcl:1710
 msgid "Create symlinks in standard directories"
 msgstr "シンボリックリンクを標準ディレクトリに作成"
 
-#: tlpkg/installer/install-tl-gui.tcl:1717
+#: tlpkg/installer/install-tl-gui.tcl:1716
 msgid "Specify directories"
 msgstr "ディレクトリを指定"
 
-#: tlpkg/installer/install-tl-gui.tcl:1731
+#: tlpkg/installer/install-tl-gui.tcl:1730
 msgid "After install, set CTAN as source for package updates"
 msgstr "インストール後に CTAN をパッケージのアップデート元に設定"
 
-#: tlpkg/installer/install-tl-gui.tcl:1782
+#: tlpkg/installer/install-tl-gui.tcl:1781
 msgid "Custom scheme"
 msgstr "カスタムスキーム"
 
-#: tlpkg/installer/install-tl-gui.tcl:1959
+#: tlpkg/installer/install-tl-gui.tcl:1958
 #, tcl-format
 msgid "%s not a local or remote repository"
 msgstr "%s はローカルリポジトリでもリモートリポジトリでもありません"
 
-#: tlpkg/installer/install-tl-gui.tcl:1963
+#: tlpkg/installer/install-tl-gui.tcl:1962
 #, tcl-format
 msgid "%s requires an argument"
 msgstr "%s には引数が必要です"
diff --git a/systems/texlive/tlnet/tlpkg/translations/messages.pot b/systems/texlive/tlnet/tlpkg/translations/messages.pot
index 9af4b2bd4e..da5b9d7afb 100644
--- a/systems/texlive/tlnet/tlpkg/translations/messages.pot
+++ b/systems/texlive/tlnet/tlpkg/translations/messages.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: TeX Live 2021\n"
 "Report-Msgid-Bugs-To: tex-live@tug.org\n"
-"POT-Creation-Date: 2021-04-07 01:48+0200\n"
+"POT-Creation-Date: 2021-04-08 01:48+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -22,20 +22,20 @@ msgstr ""
 #: tlpkg/installer/install-menu-text.pl:41
 #: tlpkg/installer/install-tl-gui.tcl:820
 #: tlpkg/installer/install-tl-gui.tcl:1045
-#: tlpkg/installer/install-tl-gui.tcl:1675
+#: tlpkg/installer/install-tl-gui.tcl:1674
 msgid "None"
 msgstr ""
 
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:138
 #: tlpkg/installer/install-menu-text.pl:38
-#: tlpkg/installer/install-tl-gui.tcl:1675
+#: tlpkg/installer/install-tl-gui.tcl:1674
 msgid "Only new"
 msgstr ""
 
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:139
 #: tlpkg/installer/install-menu-text.pl:39
 #: tlpkg/installer/install-tl-gui.tcl:1042
-#: tlpkg/installer/install-tl-gui.tcl:1675
+#: tlpkg/installer/install-tl-gui.tcl:1674
 #: texmf-dist/scripts/tlshell/tlshell.tcl:1642
 #: texmf-dist/scripts/tlshell/tlshell.tcl:2547
 #: texmf-dist/scripts/tlshell/tlshell.tcl:2565
@@ -633,7 +633,7 @@ msgid "Create shortcuts on the desktop"
 msgstr ""
 
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1230
-#: tlpkg/installer/install-tl-gui.tcl:1688
+#: tlpkg/installer/install-tl-gui.tcl:1687
 msgid "Install for all users"
 msgstr ""
 
@@ -935,7 +935,7 @@ msgid "TeX Live Installer"
 msgstr ""
 
 #: tlpkg/installer/install-tl-gui.tcl:373
-#: tlpkg/installer/install-tl-gui.tcl:2021
+#: tlpkg/installer/install-tl-gui.tcl:2020
 #, tcl-format
 msgid ""
 "Trying to load %s.\n"
@@ -1145,56 +1145,56 @@ msgstr ""
 msgid "Install font/macro source tree"
 msgstr ""
 
-#: tlpkg/installer/install-tl-gui.tcl:1656
+#: tlpkg/installer/install-tl-gui.tcl:1655
 msgid "Adjust searchpath"
 msgstr ""
 
-#: tlpkg/installer/install-tl-gui.tcl:1663
+#: tlpkg/installer/install-tl-gui.tcl:1662
 msgid "No shortcuts"
 msgstr ""
 
-#: tlpkg/installer/install-tl-gui.tcl:1663
+#: tlpkg/installer/install-tl-gui.tcl:1662
 msgid "TeX Live menu"
 msgstr ""
 
-#: tlpkg/installer/install-tl-gui.tcl:1663
+#: tlpkg/installer/install-tl-gui.tcl:1662
 msgid "Launcher entry"
 msgstr ""
 
-#: tlpkg/installer/install-tl-gui.tcl:1665
+#: tlpkg/installer/install-tl-gui.tcl:1664
 msgid "Desktop integration"
 msgstr ""
 
-#: tlpkg/installer/install-tl-gui.tcl:1677
+#: tlpkg/installer/install-tl-gui.tcl:1676
 msgid "File associations"
 msgstr ""
 
-#: tlpkg/installer/install-tl-gui.tcl:1699
+#: tlpkg/installer/install-tl-gui.tcl:1698
 msgid "Install TeXworks front end"
 msgstr ""
 
-#: tlpkg/installer/install-tl-gui.tcl:1711
+#: tlpkg/installer/install-tl-gui.tcl:1710
 msgid "Create symlinks in standard directories"
 msgstr ""
 
-#: tlpkg/installer/install-tl-gui.tcl:1717
+#: tlpkg/installer/install-tl-gui.tcl:1716
 msgid "Specify directories"
 msgstr ""
 
-#: tlpkg/installer/install-tl-gui.tcl:1731
+#: tlpkg/installer/install-tl-gui.tcl:1730
 msgid "After install, set CTAN as source for package updates"
 msgstr ""
 
-#: tlpkg/installer/install-tl-gui.tcl:1782
+#: tlpkg/installer/install-tl-gui.tcl:1781
 msgid "Custom scheme"
 msgstr ""
 
-#: tlpkg/installer/install-tl-gui.tcl:1959
+#: tlpkg/installer/install-tl-gui.tcl:1958
 #, tcl-format
 msgid "%s not a local or remote repository"
 msgstr ""
 
-#: tlpkg/installer/install-tl-gui.tcl:1963
+#: tlpkg/installer/install-tl-gui.tcl:1962
 #, tcl-format
 msgid "%s requires an argument"
 msgstr ""
diff --git a/systems/texlive/tlnet/tlpkg/translations/nl.po b/systems/texlive/tlnet/tlpkg/translations/nl.po
index 705ddf30e5..cda086c000 100644
--- a/systems/texlive/tlnet/tlpkg/translations/nl.po
+++ b/systems/texlive/tlnet/tlpkg/translations/nl.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: TeX Live translation\n"
 "Report-Msgid-Bugs-To: tex-live@tug.org\n"
-"POT-Creation-Date: 2021-04-07 01:48+0200\n"
+"POT-Creation-Date: 2021-04-08 01:48+0200\n"
 "PO-Revision-Date: 2021-03-08 12:17+0100\n"
 "Last-Translator: Siep Kroonenberg <siepo@bitmuis.nl>\n"
 "Language-Team: TL Translation Team <tex-live@tug.org>\n"
@@ -18,20 +18,20 @@ msgstr ""
 #: tlpkg/installer/install-menu-text.pl:41
 #: tlpkg/installer/install-tl-gui.tcl:820
 #: tlpkg/installer/install-tl-gui.tcl:1045
-#: tlpkg/installer/install-tl-gui.tcl:1675
+#: tlpkg/installer/install-tl-gui.tcl:1674
 msgid "None"
 msgstr "Geen"
 
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:138
 #: tlpkg/installer/install-menu-text.pl:38
-#: tlpkg/installer/install-tl-gui.tcl:1675
+#: tlpkg/installer/install-tl-gui.tcl:1674
 msgid "Only new"
 msgstr "Alleen nieuw"
 
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:139
 #: tlpkg/installer/install-menu-text.pl:39
 #: tlpkg/installer/install-tl-gui.tcl:1042
-#: tlpkg/installer/install-tl-gui.tcl:1675
+#: tlpkg/installer/install-tl-gui.tcl:1674
 #: texmf-dist/scripts/tlshell/tlshell.tcl:1642
 #: texmf-dist/scripts/tlshell/tlshell.tcl:2547
 #: texmf-dist/scripts/tlshell/tlshell.tcl:2565
@@ -639,7 +639,7 @@ msgid "Create shortcuts on the desktop"
 msgstr "Maak snelkoppelingen op het bureaublad"
 
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1230
-#: tlpkg/installer/install-tl-gui.tcl:1688
+#: tlpkg/installer/install-tl-gui.tcl:1687
 msgid "Install for all users"
 msgstr "Installeer voor alle gebruikers"
 
@@ -961,7 +961,7 @@ msgid "TeX Live Installer"
 msgstr "TeX Live Installatie"
 
 #: tlpkg/installer/install-tl-gui.tcl:373
-#: tlpkg/installer/install-tl-gui.tcl:2021
+#: tlpkg/installer/install-tl-gui.tcl:2020
 #, tcl-format
 msgid ""
 "Trying to load %s.\n"
@@ -1180,56 +1180,56 @@ msgstr "Installeer font/macro doc folder"
 msgid "Install font/macro source tree"
 msgstr "Installeer font/macro bron folder"
 
-#: tlpkg/installer/install-tl-gui.tcl:1656
+#: tlpkg/installer/install-tl-gui.tcl:1655
 msgid "Adjust searchpath"
 msgstr "Zoekpad aanpassen"
 
-#: tlpkg/installer/install-tl-gui.tcl:1663
+#: tlpkg/installer/install-tl-gui.tcl:1662
 msgid "No shortcuts"
 msgstr "Geen TeX Live menu"
 
-#: tlpkg/installer/install-tl-gui.tcl:1663
+#: tlpkg/installer/install-tl-gui.tcl:1662
 msgid "TeX Live menu"
 msgstr "TeX Live menu"
 
-#: tlpkg/installer/install-tl-gui.tcl:1663
+#: tlpkg/installer/install-tl-gui.tcl:1662
 msgid "Launcher entry"
 msgstr "Launcher item"
 
-#: tlpkg/installer/install-tl-gui.tcl:1665
+#: tlpkg/installer/install-tl-gui.tcl:1664
 msgid "Desktop integration"
 msgstr "Bureaublad-integratie"
 
-#: tlpkg/installer/install-tl-gui.tcl:1677
+#: tlpkg/installer/install-tl-gui.tcl:1676
 msgid "File associations"
 msgstr "Koppeling bestandsformaten"
 
-#: tlpkg/installer/install-tl-gui.tcl:1699
+#: tlpkg/installer/install-tl-gui.tcl:1698
 msgid "Install TeXworks front end"
 msgstr "Installeer TeXworks front-end"
 
-#: tlpkg/installer/install-tl-gui.tcl:1711
+#: tlpkg/installer/install-tl-gui.tcl:1710
 msgid "Create symlinks in standard directories"
 msgstr "Maak symlinks in standaard folders"
 
-#: tlpkg/installer/install-tl-gui.tcl:1717
+#: tlpkg/installer/install-tl-gui.tcl:1716
 msgid "Specify directories"
 msgstr "Specificeer folders"
 
-#: tlpkg/installer/install-tl-gui.tcl:1731
+#: tlpkg/installer/install-tl-gui.tcl:1730
 msgid "After install, set CTAN as source for package updates"
 msgstr "Kies na installatie CTAN als bron voor nieuwe versies van pakketten"
 
-#: tlpkg/installer/install-tl-gui.tcl:1782
+#: tlpkg/installer/install-tl-gui.tcl:1781
 msgid "Custom scheme"
 msgstr "Eigen schema"
 
-#: tlpkg/installer/install-tl-gui.tcl:1959
+#: tlpkg/installer/install-tl-gui.tcl:1958
 #, tcl-format
 msgid "%s not a local or remote repository"
 msgstr "%s is niet een lokale of online installatie-bron"
 
-#: tlpkg/installer/install-tl-gui.tcl:1963
+#: tlpkg/installer/install-tl-gui.tcl:1962
 #, tcl-format
 msgid "%s requires an argument"
 msgstr "%s vereist een argument"
diff --git a/systems/texlive/tlnet/tlpkg/translations/pl.po b/systems/texlive/tlnet/tlpkg/translations/pl.po
index 6377d5a94e..05b3574582 100644
--- a/systems/texlive/tlnet/tlpkg/translations/pl.po
+++ b/systems/texlive/tlnet/tlpkg/translations/pl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: TeX Live 2020\n"
 "Report-Msgid-Bugs-To: tex-live@tug.org\n"
-"POT-Creation-Date: 2021-04-07 01:48+0200\n"
+"POT-Creation-Date: 2021-04-08 01:48+0200\n"
 "PO-Revision-Date: 2021-03-22 01:37+0100\n"
 "Last-Translator: Jerzy Ludwichowski <Jerzy.Ludwichowski@umk.pl>\n"
 "Language-Team: \n"
@@ -24,20 +24,20 @@ msgstr ""
 #: tlpkg/installer/install-menu-text.pl:41
 #: tlpkg/installer/install-tl-gui.tcl:820
 #: tlpkg/installer/install-tl-gui.tcl:1045
-#: tlpkg/installer/install-tl-gui.tcl:1675
+#: tlpkg/installer/install-tl-gui.tcl:1674
 msgid "None"
 msgstr "Żaden"
 
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:138
 #: tlpkg/installer/install-menu-text.pl:38
-#: tlpkg/installer/install-tl-gui.tcl:1675
+#: tlpkg/installer/install-tl-gui.tcl:1674
 msgid "Only new"
 msgstr "Tylko nowe"
 
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:139
 #: tlpkg/installer/install-menu-text.pl:39
 #: tlpkg/installer/install-tl-gui.tcl:1042
-#: tlpkg/installer/install-tl-gui.tcl:1675
+#: tlpkg/installer/install-tl-gui.tcl:1674
 #: texmf-dist/scripts/tlshell/tlshell.tcl:1642
 #: texmf-dist/scripts/tlshell/tlshell.tcl:2547
 #: texmf-dist/scripts/tlshell/tlshell.tcl:2565
@@ -644,7 +644,7 @@ msgid "Create shortcuts on the desktop"
 msgstr "Utwórz skróty na pulpicie"
 
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1230
-#: tlpkg/installer/install-tl-gui.tcl:1688
+#: tlpkg/installer/install-tl-gui.tcl:1687
 msgid "Install for all users"
 msgstr "Instaluj dla wszystkich użytkowników"
 
@@ -967,7 +967,7 @@ msgid "TeX Live Installer"
 msgstr "Instalator TeX Live"
 
 #: tlpkg/installer/install-tl-gui.tcl:373
-#: tlpkg/installer/install-tl-gui.tcl:2021
+#: tlpkg/installer/install-tl-gui.tcl:2020
 #, tcl-format
 msgid ""
 "Trying to load %s.\n"
@@ -1187,56 +1187,56 @@ msgstr "Instalowanie dokumentacji fontów i makr"
 msgid "Install font/macro source tree"
 msgstr "Instalowanie plików źródłowych fontów i makr"
 
-#: tlpkg/installer/install-tl-gui.tcl:1656
+#: tlpkg/installer/install-tl-gui.tcl:1655
 msgid "Adjust searchpath"
 msgstr "Dostosuj ścieżkę wyszukiwania"
 
-#: tlpkg/installer/install-tl-gui.tcl:1663
+#: tlpkg/installer/install-tl-gui.tcl:1662
 msgid "No shortcuts"
 msgstr "Brak skrótów"
 
-#: tlpkg/installer/install-tl-gui.tcl:1663
+#: tlpkg/installer/install-tl-gui.tcl:1662
 msgid "TeX Live menu"
 msgstr "Menu TeX Live"
 
-#: tlpkg/installer/install-tl-gui.tcl:1663
+#: tlpkg/installer/install-tl-gui.tcl:1662
 msgid "Launcher entry"
 msgstr "Pozycja programu uruchomieniowego"
 
-#: tlpkg/installer/install-tl-gui.tcl:1665
+#: tlpkg/installer/install-tl-gui.tcl:1664
 msgid "Desktop integration"
 msgstr "Integracja pulpitu"
 
-#: tlpkg/installer/install-tl-gui.tcl:1677
+#: tlpkg/installer/install-tl-gui.tcl:1676
 msgid "File associations"
 msgstr "Skojarzenia plików"
 
-#: tlpkg/installer/install-tl-gui.tcl:1699
+#: tlpkg/installer/install-tl-gui.tcl:1698
 msgid "Install TeXworks front end"
 msgstr "Zainstaluj edytor TeXworks"
 
-#: tlpkg/installer/install-tl-gui.tcl:1711
+#: tlpkg/installer/install-tl-gui.tcl:1710
 msgid "Create symlinks in standard directories"
 msgstr "Utwórz dowiązania symboliczne do standardowych katalogów"
 
-#: tlpkg/installer/install-tl-gui.tcl:1717
+#: tlpkg/installer/install-tl-gui.tcl:1716
 msgid "Specify directories"
 msgstr "Określ katalogi"
 
-#: tlpkg/installer/install-tl-gui.tcl:1731
+#: tlpkg/installer/install-tl-gui.tcl:1730
 msgid "After install, set CTAN as source for package updates"
 msgstr "Po instalacji pobierz aktualizacje pakietów z CTAN"
 
-#: tlpkg/installer/install-tl-gui.tcl:1782
+#: tlpkg/installer/install-tl-gui.tcl:1781
 msgid "Custom scheme"
 msgstr "Schemat indywidualny"
 
-#: tlpkg/installer/install-tl-gui.tcl:1959
+#: tlpkg/installer/install-tl-gui.tcl:1958
 #, tcl-format
 msgid "%s not a local or remote repository"
 msgstr "%s nie lokalne lub zdalne repozytorium"
 
-#: tlpkg/installer/install-tl-gui.tcl:1963
+#: tlpkg/installer/install-tl-gui.tcl:1962
 #, tcl-format
 msgid "%s requires an argument"
 msgstr "%s wymaga argumentu"
diff --git a/systems/texlive/tlnet/tlpkg/translations/sk.po b/systems/texlive/tlnet/tlpkg/translations/sk.po
index 096bcb3ebc..a5731cfac5 100644
--- a/systems/texlive/tlnet/tlpkg/translations/sk.po
+++ b/systems/texlive/tlnet/tlpkg/translations/sk.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: TeX Live translation\n"
 "Report-Msgid-Bugs-To: tex-live@tug.org\n"
-"POT-Creation-Date: 2021-04-07 01:48+0200\n"
+"POT-Creation-Date: 2021-04-08 01:48+0200\n"
 "PO-Revision-Date: 2021-03-11 09:24+0300\n"
 "Last-Translator: Ján Buša <jan.busa@tuke.sk>\n"
 "Language-Team: tex-live@tug.org\n"
@@ -18,20 +18,20 @@ msgstr ""
 #: tlpkg/installer/install-menu-text.pl:41
 #: tlpkg/installer/install-tl-gui.tcl:820
 #: tlpkg/installer/install-tl-gui.tcl:1045
-#: tlpkg/installer/install-tl-gui.tcl:1675
+#: tlpkg/installer/install-tl-gui.tcl:1674
 msgid "None"
 msgstr "Žiaden"
 
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:138
 #: tlpkg/installer/install-menu-text.pl:38
-#: tlpkg/installer/install-tl-gui.tcl:1675
+#: tlpkg/installer/install-tl-gui.tcl:1674
 msgid "Only new"
 msgstr "Len nové"
 
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:139
 #: tlpkg/installer/install-menu-text.pl:39
 #: tlpkg/installer/install-tl-gui.tcl:1042
-#: tlpkg/installer/install-tl-gui.tcl:1675
+#: tlpkg/installer/install-tl-gui.tcl:1674
 #: texmf-dist/scripts/tlshell/tlshell.tcl:1642
 #: texmf-dist/scripts/tlshell/tlshell.tcl:2547
 #: texmf-dist/scripts/tlshell/tlshell.tcl:2565
@@ -638,7 +638,7 @@ msgid "Create shortcuts on the desktop"
 msgstr "Vytvoriť odkazy na pracovnej ploche"
 
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1230
-#: tlpkg/installer/install-tl-gui.tcl:1688
+#: tlpkg/installer/install-tl-gui.tcl:1687
 msgid "Install for all users"
 msgstr "Nainštalovať pre všetkých používateľov"
 
@@ -964,7 +964,7 @@ msgid "TeX Live Installer"
 msgstr "Inštalátor TeX Live"
 
 #: tlpkg/installer/install-tl-gui.tcl:373
-#: tlpkg/installer/install-tl-gui.tcl:2021
+#: tlpkg/installer/install-tl-gui.tcl:2020
 #, tcl-format
 msgid ""
 "Trying to load %s.\n"
@@ -1185,56 +1185,56 @@ msgstr "Nainštalovať strom dokumentácie fontov/makier"
 msgid "Install font/macro source tree"
 msgstr "Nainštalovať strom zdrojových súborov fontov/makier"
 
-#: tlpkg/installer/install-tl-gui.tcl:1656
+#: tlpkg/installer/install-tl-gui.tcl:1655
 msgid "Adjust searchpath"
 msgstr "Upraviť cestu vyhľadávania"
 
-#: tlpkg/installer/install-tl-gui.tcl:1663
+#: tlpkg/installer/install-tl-gui.tcl:1662
 msgid "No shortcuts"
 msgstr "Žiadne skratky"
 
-#: tlpkg/installer/install-tl-gui.tcl:1663
+#: tlpkg/installer/install-tl-gui.tcl:1662
 msgid "TeX Live menu"
 msgstr "Menu TeX Live"
 
-#: tlpkg/installer/install-tl-gui.tcl:1663
+#: tlpkg/installer/install-tl-gui.tcl:1662
 msgid "Launcher entry"
 msgstr "Položka zavádzača"
 
-#: tlpkg/installer/install-tl-gui.tcl:1665
+#: tlpkg/installer/install-tl-gui.tcl:1664
 msgid "Desktop integration"
 msgstr "Integrácia pracovnej plochy"
 
-#: tlpkg/installer/install-tl-gui.tcl:1677
+#: tlpkg/installer/install-tl-gui.tcl:1676
 msgid "File associations"
 msgstr "Súborové asociácie"
 
-#: tlpkg/installer/install-tl-gui.tcl:1699
+#: tlpkg/installer/install-tl-gui.tcl:1698
 msgid "Install TeXworks front end"
 msgstr "Nainštalovať pomocný program TeXworks"
 
-#: tlpkg/installer/install-tl-gui.tcl:1711
+#: tlpkg/installer/install-tl-gui.tcl:1710
 msgid "Create symlinks in standard directories"
 msgstr "Vytvoriť symbolické odkazy v štandardných adresároch"
 
-#: tlpkg/installer/install-tl-gui.tcl:1717
+#: tlpkg/installer/install-tl-gui.tcl:1716
 msgid "Specify directories"
 msgstr "Špecifikujte adresáre"
 
-#: tlpkg/installer/install-tl-gui.tcl:1731
+#: tlpkg/installer/install-tl-gui.tcl:1730
 msgid "After install, set CTAN as source for package updates"
 msgstr "Po inštalácii nastavte CTAN ako zdroj aktualizácií balíkov"
 
-#: tlpkg/installer/install-tl-gui.tcl:1782
+#: tlpkg/installer/install-tl-gui.tcl:1781
 msgid "Custom scheme"
 msgstr "Prispôsobenie schémy"
 
-#: tlpkg/installer/install-tl-gui.tcl:1959
+#: tlpkg/installer/install-tl-gui.tcl:1958
 #, tcl-format
 msgid "%s not a local or remote repository"
 msgstr "%s nie je lokálne alebo vzdialené úložisko"
 
-#: tlpkg/installer/install-tl-gui.tcl:1963
+#: tlpkg/installer/install-tl-gui.tcl:1962
 #, tcl-format
 msgid "%s requires an argument"
 msgstr "%s požaduje argument"
diff --git a/systems/texlive/tlnet/tlpkg/translations/vi.po b/systems/texlive/tlnet/tlpkg/translations/vi.po
index ad107e8c18..c8468e850b 100644
--- a/systems/texlive/tlnet/tlpkg/translations/vi.po
+++ b/systems/texlive/tlnet/tlpkg/translations/vi.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: TeX Live translation\n"
 "Report-Msgid-Bugs-To: tex-live@tug.org\n"
-"POT-Creation-Date: 2021-04-07 01:48+0200\n"
+"POT-Creation-Date: 2021-04-08 01:48+0200\n"
 "PO-Revision-Date: 2021-03-13 11:02+0100\n"
 "Last-Translator: Anh K. Huỳnh <kyanh@viettug.org>\n"
 "Language-Team: TL Translation Team <tex-live@tug.org>\n"
@@ -21,20 +21,20 @@ msgstr ""
 #: tlpkg/installer/install-menu-text.pl:41
 #: tlpkg/installer/install-tl-gui.tcl:820
 #: tlpkg/installer/install-tl-gui.tcl:1045
-#: tlpkg/installer/install-tl-gui.tcl:1675
+#: tlpkg/installer/install-tl-gui.tcl:1674
 msgid "None"
 msgstr "Không"
 
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:138
 #: tlpkg/installer/install-menu-text.pl:38
-#: tlpkg/installer/install-tl-gui.tcl:1675
+#: tlpkg/installer/install-tl-gui.tcl:1674
 msgid "Only new"
 msgstr "Chỉ cái mới"
 
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:139
 #: tlpkg/installer/install-menu-text.pl:39
 #: tlpkg/installer/install-tl-gui.tcl:1042
-#: tlpkg/installer/install-tl-gui.tcl:1675
+#: tlpkg/installer/install-tl-gui.tcl:1674
 #: texmf-dist/scripts/tlshell/tlshell.tcl:1642
 #: texmf-dist/scripts/tlshell/tlshell.tcl:2547
 #: texmf-dist/scripts/tlshell/tlshell.tcl:2565
@@ -640,7 +640,7 @@ msgid "Create shortcuts on the desktop"
 msgstr "Tạo liên kết nhanh trên Desktop"
 
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1230
-#: tlpkg/installer/install-tl-gui.tcl:1688
+#: tlpkg/installer/install-tl-gui.tcl:1687
 msgid "Install for all users"
 msgstr "Cài đặt cho mọi người trên máy"
 
@@ -963,7 +963,7 @@ msgid "TeX Live Installer"
 msgstr "Chương trình cài đặt TeX Live"
 
 #: tlpkg/installer/install-tl-gui.tcl:373
-#: tlpkg/installer/install-tl-gui.tcl:2021
+#: tlpkg/installer/install-tl-gui.tcl:2020
 #, tcl-format
 msgid ""
 "Trying to load %s.\n"
@@ -1183,56 +1183,56 @@ msgstr "Cài đặt tài liệu cho font/macro"
 msgid "Install font/macro source tree"
 msgstr "Cài đặt mã nguồn của font/macro"
 
-#: tlpkg/installer/install-tl-gui.tcl:1656
+#: tlpkg/installer/install-tl-gui.tcl:1655
 msgid "Adjust searchpath"
 msgstr "Chỉnh đường dẫn tìm kiếm tập tin thi hành"
 
-#: tlpkg/installer/install-tl-gui.tcl:1663
+#: tlpkg/installer/install-tl-gui.tcl:1662
 msgid "No shortcuts"
 msgstr "Không tạo liên kết nhanh"
 
-#: tlpkg/installer/install-tl-gui.tcl:1663
+#: tlpkg/installer/install-tl-gui.tcl:1662
 msgid "TeX Live menu"
 msgstr "Menu TeXLive"
 
-#: tlpkg/installer/install-tl-gui.tcl:1663
+#: tlpkg/installer/install-tl-gui.tcl:1662
 msgid "Launcher entry"
 msgstr "Nơi khởi động chương trình"
 
-#: tlpkg/installer/install-tl-gui.tcl:1665
+#: tlpkg/installer/install-tl-gui.tcl:1664
 msgid "Desktop integration"
 msgstr "Tích hợp với Desktop"
 
-#: tlpkg/installer/install-tl-gui.tcl:1677
+#: tlpkg/installer/install-tl-gui.tcl:1676
 msgid "File associations"
 msgstr "Thay đổi cách mở tập tin"
 
-#: tlpkg/installer/install-tl-gui.tcl:1699
+#: tlpkg/installer/install-tl-gui.tcl:1698
 msgid "Install TeXworks front end"
 msgstr "Cài đặt trình soạn thảo TeXworks"
 
-#: tlpkg/installer/install-tl-gui.tcl:1711
+#: tlpkg/installer/install-tl-gui.tcl:1710
 msgid "Create symlinks in standard directories"
 msgstr "Tạo liên kết mềm trong các thư mục tiêu chuẩn"
 
-#: tlpkg/installer/install-tl-gui.tcl:1717
+#: tlpkg/installer/install-tl-gui.tcl:1716
 msgid "Specify directories"
 msgstr "Chọn thư mục"
 
-#: tlpkg/installer/install-tl-gui.tcl:1731
+#: tlpkg/installer/install-tl-gui.tcl:1730
 msgid "After install, set CTAN as source for package updates"
 msgstr "Sau khi cài xong, đặt CTAN làm nguồn để cập nhật các gói"
 
-#: tlpkg/installer/install-tl-gui.tcl:1782
+#: tlpkg/installer/install-tl-gui.tcl:1781
 msgid "Custom scheme"
 msgstr "Chọn mẫu"
 
-#: tlpkg/installer/install-tl-gui.tcl:1959
+#: tlpkg/installer/install-tl-gui.tcl:1958
 #, tcl-format
 msgid "%s not a local or remote repository"
 msgstr "%s không phải kho ở dưới máy hay trên mạng"
 
-#: tlpkg/installer/install-tl-gui.tcl:1963
+#: tlpkg/installer/install-tl-gui.tcl:1962
 #, tcl-format
 msgid "%s requires an argument"
 msgstr "%s thiếu một tham số"
diff --git a/systems/texlive/tlnet/tlpkg/translations/zh_CN.po b/systems/texlive/tlnet/tlpkg/translations/zh_CN.po
index 28c436f0e6..6b9842ba9c 100644
--- a/systems/texlive/tlnet/tlpkg/translations/zh_CN.po
+++ b/systems/texlive/tlnet/tlpkg/translations/zh_CN.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: TeX Live translation\n"
 "Report-Msgid-Bugs-To: tex-live@tug.org\n"
-"POT-Creation-Date: 2021-04-07 01:48+0200\n"
+"POT-Creation-Date: 2021-04-08 01:48+0200\n"
 "PO-Revision-Date: 2009-09-22 12:54+0800\n"
 "Last-Translator: Jiang Jiang <gzjjgod@gmail.com>\n"
 "Language-Team: TL Translation Team <tex-live@tug.org>\n"
@@ -17,20 +17,20 @@ msgstr ""
 #: tlpkg/installer/install-menu-text.pl:41
 #: tlpkg/installer/install-tl-gui.tcl:820
 #: tlpkg/installer/install-tl-gui.tcl:1045
-#: tlpkg/installer/install-tl-gui.tcl:1675
+#: tlpkg/installer/install-tl-gui.tcl:1674
 msgid "None"
 msgstr "无"
 
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:138
 #: tlpkg/installer/install-menu-text.pl:38
-#: tlpkg/installer/install-tl-gui.tcl:1675
+#: tlpkg/installer/install-tl-gui.tcl:1674
 msgid "Only new"
 msgstr "只有新的"
 
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:139
 #: tlpkg/installer/install-menu-text.pl:39
 #: tlpkg/installer/install-tl-gui.tcl:1042
-#: tlpkg/installer/install-tl-gui.tcl:1675
+#: tlpkg/installer/install-tl-gui.tcl:1674
 #: texmf-dist/scripts/tlshell/tlshell.tcl:1642
 #: texmf-dist/scripts/tlshell/tlshell.tcl:2547
 #: texmf-dist/scripts/tlshell/tlshell.tcl:2565
@@ -634,7 +634,7 @@ msgid "Create shortcuts on the desktop"
 msgstr ""
 
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1230
-#: tlpkg/installer/install-tl-gui.tcl:1688
+#: tlpkg/installer/install-tl-gui.tcl:1687
 msgid "Install for all users"
 msgstr "给所有用户安装"
 
@@ -938,7 +938,7 @@ msgid "TeX Live Installer"
 msgstr ""
 
 #: tlpkg/installer/install-tl-gui.tcl:373
-#: tlpkg/installer/install-tl-gui.tcl:2021
+#: tlpkg/installer/install-tl-gui.tcl:2020
 #, tcl-format
 msgid ""
 "Trying to load %s.\n"
@@ -1149,56 +1149,56 @@ msgstr "安装字体/宏包文档目录树"
 msgid "Install font/macro source tree"
 msgstr "安装字体/宏包源码目录树"
 
-#: tlpkg/installer/install-tl-gui.tcl:1656
+#: tlpkg/installer/install-tl-gui.tcl:1655
 msgid "Adjust searchpath"
 msgstr ""
 
-#: tlpkg/installer/install-tl-gui.tcl:1663
+#: tlpkg/installer/install-tl-gui.tcl:1662
 msgid "No shortcuts"
 msgstr ""
 
-#: tlpkg/installer/install-tl-gui.tcl:1663
+#: tlpkg/installer/install-tl-gui.tcl:1662
 msgid "TeX Live menu"
 msgstr ""
 
-#: tlpkg/installer/install-tl-gui.tcl:1663
+#: tlpkg/installer/install-tl-gui.tcl:1662
 msgid "Launcher entry"
 msgstr ""
 
-#: tlpkg/installer/install-tl-gui.tcl:1665
+#: tlpkg/installer/install-tl-gui.tcl:1664
 msgid "Desktop integration"
 msgstr ""
 
-#: tlpkg/installer/install-tl-gui.tcl:1677
+#: tlpkg/installer/install-tl-gui.tcl:1676
 msgid "File associations"
 msgstr ""
 
-#: tlpkg/installer/install-tl-gui.tcl:1699
+#: tlpkg/installer/install-tl-gui.tcl:1698
 msgid "Install TeXworks front end"
 msgstr "安装 TeXworks 前端"
 
-#: tlpkg/installer/install-tl-gui.tcl:1711
+#: tlpkg/installer/install-tl-gui.tcl:1710
 msgid "Create symlinks in standard directories"
 msgstr ""
 
-#: tlpkg/installer/install-tl-gui.tcl:1717
+#: tlpkg/installer/install-tl-gui.tcl:1716
 msgid "Specify directories"
 msgstr ""
 
-#: tlpkg/installer/install-tl-gui.tcl:1731
+#: tlpkg/installer/install-tl-gui.tcl:1730
 msgid "After install, set CTAN as source for package updates"
 msgstr ""
 
-#: tlpkg/installer/install-tl-gui.tcl:1782
+#: tlpkg/installer/install-tl-gui.tcl:1781
 msgid "Custom scheme"
 msgstr ""
 
-#: tlpkg/installer/install-tl-gui.tcl:1959
+#: tlpkg/installer/install-tl-gui.tcl:1958
 #, tcl-format
 msgid "%s not a local or remote repository"
 msgstr ""
 
-#: tlpkg/installer/install-tl-gui.tcl:1963
+#: tlpkg/installer/install-tl-gui.tcl:1962
 #, tcl-format
 msgid "%s requires an argument"
 msgstr ""
diff --git a/systems/texlive/tlnet/tlpkg/translations/zh_TW.po b/systems/texlive/tlnet/tlpkg/translations/zh_TW.po
index 6113a2f8c7..1690d7a516 100644
--- a/systems/texlive/tlnet/tlpkg/translations/zh_TW.po
+++ b/systems/texlive/tlnet/tlpkg/translations/zh_TW.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: TeX Live translation\n"
 "Report-Msgid-Bugs-To: tex-live@tug.org\n"
-"POT-Creation-Date: 2021-04-07 01:48+0200\n"
+"POT-Creation-Date: 2021-04-08 01:48+0200\n"
 "PO-Revision-Date: 2009-09-03 12:34+0200\n"
 "Last-Translator: Norbert Preining <preining@logic.at>\n"
 "Language-Team: TL Translation Team <tex-live@tug.org>\n"
@@ -17,21 +17,21 @@ msgstr ""
 #: tlpkg/installer/install-menu-text.pl:41
 #: tlpkg/installer/install-tl-gui.tcl:820
 #: tlpkg/installer/install-tl-gui.tcl:1045
-#: tlpkg/installer/install-tl-gui.tcl:1675
+#: tlpkg/installer/install-tl-gui.tcl:1674
 #, fuzzy
 msgid "None"
 msgstr "否"
 
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:138
 #: tlpkg/installer/install-menu-text.pl:38
-#: tlpkg/installer/install-tl-gui.tcl:1675
+#: tlpkg/installer/install-tl-gui.tcl:1674
 msgid "Only new"
 msgstr ""
 
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:139
 #: tlpkg/installer/install-menu-text.pl:39
 #: tlpkg/installer/install-tl-gui.tcl:1042
-#: tlpkg/installer/install-tl-gui.tcl:1675
+#: tlpkg/installer/install-tl-gui.tcl:1674
 #: texmf-dist/scripts/tlshell/tlshell.tcl:1642
 #: texmf-dist/scripts/tlshell/tlshell.tcl:2547
 #: texmf-dist/scripts/tlshell/tlshell.tcl:2565
@@ -656,7 +656,7 @@ msgid "Create shortcuts on the desktop"
 msgstr ""
 
 #: texmf-dist/scripts/texlive/tlmgrgui.pl:1230
-#: tlpkg/installer/install-tl-gui.tcl:1688
+#: tlpkg/installer/install-tl-gui.tcl:1687
 msgid "Install for all users"
 msgstr ""
 
@@ -962,7 +962,7 @@ msgid "TeX Live Installer"
 msgstr ""
 
 #: tlpkg/installer/install-tl-gui.tcl:373
-#: tlpkg/installer/install-tl-gui.tcl:2021
+#: tlpkg/installer/install-tl-gui.tcl:2020
 #, tcl-format
 msgid ""
 "Trying to load %s.\n"
@@ -1172,57 +1172,57 @@ msgstr "安裝字體/巨集包文檔目錄樹"
 msgid "Install font/macro source tree"
 msgstr "安裝字體/巨集包源碼目錄樹"
 
-#: tlpkg/installer/install-tl-gui.tcl:1656
+#: tlpkg/installer/install-tl-gui.tcl:1655
 msgid "Adjust searchpath"
 msgstr ""
 
-#: tlpkg/installer/install-tl-gui.tcl:1663
+#: tlpkg/installer/install-tl-gui.tcl:1662
 msgid "No shortcuts"
 msgstr ""
 
-#: tlpkg/installer/install-tl-gui.tcl:1663
+#: tlpkg/installer/install-tl-gui.tcl:1662
 msgid "TeX Live menu"
 msgstr ""
 
-#: tlpkg/installer/install-tl-gui.tcl:1663
+#: tlpkg/installer/install-tl-gui.tcl:1662
 msgid "Launcher entry"
 msgstr ""
 
-#: tlpkg/installer/install-tl-gui.tcl:1665
+#: tlpkg/installer/install-tl-gui.tcl:1664
 msgid "Desktop integration"
 msgstr ""
 
-#: tlpkg/installer/install-tl-gui.tcl:1677
+#: tlpkg/installer/install-tl-gui.tcl:1676
 msgid "File associations"
 msgstr ""
 
-#: tlpkg/installer/install-tl-gui.tcl:1699
+#: tlpkg/installer/install-tl-gui.tcl:1698
 #, fuzzy
 msgid "Install TeXworks front end"
 msgstr "安裝字體/巨集包文檔目錄樹"
 
-#: tlpkg/installer/install-tl-gui.tcl:1711
+#: tlpkg/installer/install-tl-gui.tcl:1710
 msgid "Create symlinks in standard directories"
 msgstr ""
 
-#: tlpkg/installer/install-tl-gui.tcl:1717
+#: tlpkg/installer/install-tl-gui.tcl:1716
 msgid "Specify directories"
 msgstr ""
 
-#: tlpkg/installer/install-tl-gui.tcl:1731
+#: tlpkg/installer/install-tl-gui.tcl:1730
 msgid "After install, set CTAN as source for package updates"
 msgstr ""
 
-#: tlpkg/installer/install-tl-gui.tcl:1782
+#: tlpkg/installer/install-tl-gui.tcl:1781
 msgid "Custom scheme"
 msgstr ""
 
-#: tlpkg/installer/install-tl-gui.tcl:1959
+#: tlpkg/installer/install-tl-gui.tcl:1958
 #, tcl-format
 msgid "%s not a local or remote repository"
 msgstr ""
 
-#: tlpkg/installer/install-tl-gui.tcl:1963
+#: tlpkg/installer/install-tl-gui.tcl:1962
 #, tcl-format
 msgid "%s requires an argument"
 msgstr ""
diff --git a/systems/unix/tex-fpc/MFT/manfonts b/systems/unix/tex-fpc/MFT/manfonts
index cd84126c14..bc3262c8b3 100755
--- a/systems/unix/tex-fpc/MFT/manfonts
+++ b/systems/unix/tex-fpc/MFT/manfonts
@@ -7,3 +7,8 @@ mkfont cmman  # font used for miscellaneous Computer Modern variations
 	      # from ctan:/systems/knuth/local/mf/cmman.mf
 mkfont random # from ctan:/systems/knuth/local/lib/random.mf
 mkfont cmss9
+mkfont cmbx12
+mkfont cmti12
+mkfont cmsl12
+mkfont cmmi12
+mkfont cmr12
diff --git a/systems/unix/tex-fpc/README b/systems/unix/tex-fpc/README
index 1d9cd8dcfa..96e9af8865 100644
--- a/systems/unix/tex-fpc/README
+++ b/systems/unix/tex-fpc/README
@@ -1,4 +1,4 @@
-TeX-FPC 3rd ed.                                                    2021-02-14
+TeX-FPC 4th ed.                                                    2021-04-08
 
 This directory contains change files for Donald E. Knuth's suite
 of TeX related programs. The change files (.ch) and Don Knuth's WEB
@@ -26,6 +26,8 @@ Likewise the directory mp for John Hobby's METAPOST.
 The directory tech demonstrates how to build a TeX system that
 supports the german language.
 
+The directory twebmac explains and fixes bugs of WEB macros.
+
 And the ch.ch directory contains change files for change files.
 
 Requirements:
@@ -38,7 +40,7 @@ I have to admit, now and then I used vi instead of ed, the Unix Standard
 Editor.
 If TeX-FPC doesn't work on your system, it is not Unix, not even remotely so.
 
-Ane version of FPC from 3.0.0 (Nov. 2015) to 3.2.0 (June 2020)
+Any version of FPC from 3.0.0 (Nov. 2015) to 3.2.0 (June 2020)
 works fine.
 
 To build the DVI-driver xdvi and dvips a C-compiler is necessary.
@@ -267,14 +269,14 @@ Create links to the master directories in tex-fpc:
 
 Get Knuth's source files:
 ------------------------
-Get some directories Knuth's distribution from
+Get some directories of Knuth's distribution from
 	tug.org/tex-archive/systems/knuth/dist.zip
 Unpack dist.zip in the parent directory of tex-fpc and move the files from
 Knuth's distribution to tex-fpc.
   $ mv dist/* tex-fpc
 
 This directory, i.e. tex-fpc will be our stage directory, that is
-all compiling etc. will be done in  tex-fpc and it's subdirectories.
+all compiling etc. will be done in tex-fpc and it's subdirectories.
 
 Install the files from cm to MFinputs:
 	mv cm/* MFinputs
@@ -329,7 +331,7 @@ binary directory.
     tex.web, tex.ch --> initex,initex.p tex.pool
     --------------------------------------------
 
-Build the ini-programs itgl and save them as initex, resp. inimf in your
+Build the ini-programs using itgl and save them as initex, resp. inimf in your
 bin directory.  Save tex.pool in  TeXformats and mf.pool in MFbases.
 
 2. Make plain.base                   lib/plain.mf --> MFbases/plain.base
diff --git a/systems/unix/tex-fpc/fpcbugs b/systems/unix/tex-fpc/fpcbugs
index 58162f5678..f4b07972c9 100644
--- a/systems/unix/tex-fpc/fpcbugs
+++ b/systems/unix/tex-fpc/fpcbugs
@@ -51,6 +51,6 @@ interpreter of the Pascal-p5 system, which claims to be ISO-Pascal,
 since pcom, pint use only text files whose names appear in the
 program header.
 
-TeX-FPC does not depend on one of the last to features, i. e.
+TeX-FPC does not depend on one of the last two features, i. e.
 TeX-FPC's programs flush (or close) text-files always and assign
 external file names always, since it is simply easier to code.
diff --git a/systems/unix/tex-fpc/history b/systems/unix/tex-fpc/history
index 29b8229088..ba8e364491 100644
--- a/systems/unix/tex-fpc/history
+++ b/systems/unix/tex-fpc/history
@@ -96,6 +96,7 @@ future: Bugs that remain to be fixed:
             Whatever you enter during error recovery, you cannot convince
 	    TeX to forgive your faux pas and continue processing the rest
 	    of the file.
+
 2021-02:    3rd edition. Will Senn and Dave Jarvis pointed out some ambiguities
             in the README file. I'll took their comments and questions to
             improve the wordings in the README file and some of TeX's error
@@ -103,3 +104,6 @@ future: Bugs that remain to be fixed:
 
             The minimal installation does not care for the .pk fonts. They will
             be created on demand by the dvi drivers. (dvips and xdvi)
+
+2021-04:    4th edition. Joachim found some typos in README and helped to
+	    fix the WEB macros.
diff --git a/systems/unix/tex-fpc/mf.ch b/systems/unix/tex-fpc/mf.ch
index 1a5a2eab18..eb993dde7c 100644
--- a/systems/unix/tex-fpc/mf.ch
+++ b/systems/unix/tex-fpc/mf.ch
@@ -1,5 +1,16 @@
-% This is a change file of Metafont for FPC, Wolfgang Helbig, Nov. 2007
-[0] to print changed sections only
+% This is a change file of Metafont, Wolfgang Helbig, Nov. 2007 - Apr.2021
+@x nwebmac
+\outer\def\N#1. \[#2]#3.{\MN#1.\vfil\eject % begin starred section
+  \def\rhead{PART #2:\uppercase{#3}} % define running headline
+@y
+\outer\def\N#1. \[#2]#3.{ % begin starred section
+  {\xdef\modstar{#1}\let\*=\empty\xdef\modno{#1}}% remove \* from section name
+  \ifx\modno\modstar \onmaybe \else\ontrue \fi
+  \def\rhead{PART #2:\uppercase{#3}} % define running headline
+  \ifon\mark{{{\tensy x}\modno}{\rhead}}
+    \vfil\eject
+  \fi
+@z
 @x
 \def\gglob{20, 26} % this should be the next two sections of "<Global...>"
 @y
@@ -7,7 +18,7 @@
 \input webmac-fpc
 \emergencystretch 0.5in % avoid overfull boxes
 
-\let\maybe=\iftrue % print changed modules only.
+\let\maybe=\iffalse % print changed modules only.
 
 \def\name{\MF}
 
@@ -38,7 +49,7 @@ Comments and questions are welcome!
 @x
 @d banner=='This is METAFONT, Version 2.71828182' {printed when \MF\ starts}
 @y
-@d banner=='This is METAFONT-FPC, 3rd ed.' {printed when \MF\ starts}
+@d banner=='This is METAFONT-FPC, 4th ed.' {printed when \MF\ starts}
 @z
 
 [4] terminal output and input
diff --git a/systems/unix/tex-fpc/tex-fpc.pdf b/systems/unix/tex-fpc/tex-fpc.pdf
index fab992d408..926dd8017b 100644
--- a/systems/unix/tex-fpc/tex-fpc.pdf
+++ b/systems/unix/tex-fpc/tex-fpc.pdf
diff --git a/systems/unix/tex-fpc/tex.ch b/systems/unix/tex-fpc/tex.ch
index c6f0087062..b191a7fe4a 100644
--- a/systems/unix/tex-fpc/tex.ch
+++ b/systems/unix/tex-fpc/tex.ch
@@ -1,6 +1,18 @@
 % This is a change file of TeX, Wolfgang Helbig, Nov. 2007-Feb. 2021
 
 [0] About TeX-FPC
+@x nwebmac
+\outer\def\N#1. \[#2]#3.{\MN#1.\vfil\eject % begin starred section
+  \def\rhead{PART #2:\uppercase{#3}} % define running headline
+@y
+\outer\def\N#1. \[#2]#3.{ % begin starred section
+  {\xdef\modstar{#1}\let\*=\empty\xdef\modno{#1}}% remove \* from section name
+  \ifx\modno\modstar \onmaybe \else\ontrue \fi
+  \def\rhead{PART #2:\uppercase{#3}} % define running headline
+  \ifon\mark{{{\tensy x}\modno}{\rhead}}
+    \vfil\eject
+  \fi
+@z
 Strangely, the first page is page 3
 @x
 \pageno=3
@@ -136,7 +148,7 @@ November 1984].
 Even though \namefpc\ does not differ from \TeX\ I proudly change
 the banner! And take responsibility for any error.
 
-@d banner=='This is TeX-FPC, 3rd ed.'
+@d banner=='This is TeX-FPC, 4th ed.'
 @z
 
 [4] program header
@@ -674,11 +686,11 @@ loop@+begin write(term_out,'**');
 @z
 
 [37] chatty
-	@x chatty
-	    write(term_out,'! End of file on the terminal... why?');
-	@.End of file on the terminal@>
-	@y
-	@z
+@x chatty
+    write(term_out,'! End of file on the terminal... why?');
+@.End of file on the terminal@>
+@y
+@z
 
 [37] hint Control-D
 @x
@@ -834,30 +846,30 @@ end;
 @z
 
 [360] Don't print empty lines
-	@x chatty
-	@ All of the easy branches of |get_next| have now been taken care of.
-	There is one more branch.
-	@y
-	@ All of the easy branches of |get_next| have now been taken care of.
-	There is one more branch.
-	
-	\marke h \TeX82 ends the current line by calling |print_ln| even
-	if the line is empty.  This causes a spurious ugly empty line.
-	Calling |print_nl("")| is smarter.  It ends the current
-	line only if it is not empty.
-	@z
+@x chatty
+@ All of the easy branches of |get_next| have now been taken care of.
+There is one more branch.
+@y
+@ All of the easy branches of |get_next| have now been taken care of.
+There is one more branch.
 
-	@x chatty
-	    if limit=start then {previous line was empty}
-	      print_nl("(Please type a command or say `\end')");
-	@.Please type...@>
-	    print_ln; first:=start;
-	@y
-	    if limit=-1 then {previous line was empty}
-	      print_nl("(Please type a command or say `\end')");
-	@.Please type...@>
-	    print_nl(""); first:=start;
-	@z
+\marke h \TeX82 ends the current line by calling |print_ln| even
+if the line is empty.  This causes a spurious ugly empty line.
+Calling |print_nl("")| is smarter.  It ends the current
+line only if it is not empty.
+@z
+
+@x chatty
+    if limit=start then {previous line was empty}
+      print_nl("(Please type a command or say `\end')");
+@.Please type...@>
+    print_ln; first:=start;
+@y
+    if limit=-1 then {previous line was empty}
+      print_nl("(Please type a command or say `\end')");
+@.Please type...@>
+    print_nl(""); first:=start;
+@z
 
 @x [514]
 |TEX_font_area|.  These system area names will, of course, vary from place
@@ -1114,11 +1126,11 @@ Stop pruning at this node.
 @z
 
 	[1265] empty line after change of interaction mode
-	@x chatty
-	begin print_ln;
-	@y
-	begin print_nl(""); { print new line only if current line not empty \marke h}
-	@z
+@x chatty
+begin print_ln;
+@y
+begin print_nl(""); { print new line only if current line not empty \marke h}
+@z
 
 [1327] eof is broken
 @x
diff --git a/systems/unix/tex-fpc/twebmac/README b/systems/unix/tex-fpc/twebmac/README
new file mode 100644
index 0000000000..280abdbb63
--- /dev/null
+++ b/systems/unix/tex-fpc/twebmac/README
@@ -0,0 +1,20 @@
+Here is how to three bugs of the WEB macros:
+1. Excessive memory usage: TeX cannot compile tex.tex with its
+   default memory size.
+2. Module number in the header don't agree with the the first module on
+   the page.
+3. Modules starts on new pages when they shouldn't.
+
+The report describes the bugs, explains them and their fixes.
+The script patch.sh creates the file nwebmac.tex file from the original
+file TeXinputs/webmac.tex. Install nwebmac.tex in TeXinputs as webmac.tex,
+thus overwriting the original.
+
+To test the new macros cd to the tex directory, set \let\maybe=\iffalse in
+tex.ch. Then weave:
+	wve tex.web tex.ch
+It should print more than 90 pages and less than 100. Than and only then
+bug 1 and bug 3 are fixed.
+
+Happy TeXing and WEAVEing.
+Wolfgang
diff --git a/systems/unix/tex-fpc/twebmac/patch.sh b/systems/unix/tex-fpc/twebmac/patch.sh
new file mode 100644
index 0000000000..426475e155
--- /dev/null
+++ b/systems/unix/tex-fpc/twebmac/patch.sh
@@ -0,0 +1,92 @@
+ed TeXinputs/webmac.tex <<'END'
+207a
+  \let\toppart\rhead
+.
+192a
+  \let\toppart\rhead
+.
+159a
+\newif\ifdp \dptrue % writing to dummy page
+\newif\ifwp \wpfalse % writing not pending
+\edef\nextcl{}
+.
+157c
+  \ifcomp
+    \global\output{\normaloutput\page\clheader\crheader}
+  \else
+    \global\output{\normaloutput\page\lheader\rheader}
+  \fi
+}
+.
+155a
+  \global\dpfalse % not writing to dummy page
+.
+137c
+\def\rhead{WEB OUTPUT} % this running head is reset by starred sections
+\def\rrhead{WEB OUTPUT} % \rrhead and \rhead match for unchanged tex.tex
+.
+124a
+\def\toppart{\expandafter\taketwo\topmark}
+.
+123a
+% not compatible
+\def\lheader{\mainfont\the\pageno\eightrm\qquad\toppart
+  \hfill\title\qquad\mainfont\topsecno} % top line on left-hand pages
+\def\rheader{\mainfont\topsecno\eightrm\qquad\title\hfill
+  \toppart\qquad\mainfont\the\pageno} % top line on right-hand pages
+.
+122c
+\def\crheader{\mainfont\topsecno\eightrm\qquad\title\hfill
+.
+120c
+\newif\ifcomp \compfalse
+% compatible
+\def\clheader{\mainfont\the\pageno\eightrm\qquad\rhead
+.
+89,90c
+  \ifon \mark{{{\tensy x}\modno}{\rhead}}\fi}
+
+.
+87a
+  \comptrue
+.
+86c
+\def\MN#1.{\par % common code for \M, \N only called by private \N module
+.
+84d
+82a
+  \ifon\mark{{{\tensy x}\modno}{\rhead}}
+    \vfil\eject
+  \fi
+  \ifdp
+    \edef\nextcl{\nextcl\write\cont{\Z{#2}{\modno}{\the\pageno}}}
+    \wptrue
+  \else
+    \ifwp
+      \nextcl
+      \wpfalse
+    \fi
+    \edef\nextcl{\write\cont{\Z{#2}{\modno}{\the\pageno}}}\nextcl
+      % to contents file
+  \fi
+.
+79,81c
+\outer\def\M#1.{ % beginning of section
+  {\xdef\modstar{#1}\let\*=\empty\xdef\modno{#1}}
+  \ifx\modno\modstar \onmaybe \else\ontrue \fi
+  \ifon
+    \mark{{{\tensy x}\modno}{\rhead}}
+    \vfil\penalty-100\vfilneg
+    \vskip12ptminus3pt\startsection\ignorespaces
+}
+\outer\def\N#1.#2.{ % beginning of starred section
+  {\xdef\modstar{#1}\let\*=\empty\xdef\modno{#1}}% remove \* from section name
+  \ifx\modno\modstar \onmaybe \else\ontrue \fi
+.
+2c
+\xdef\fmtversion{\fmtversion+WEBMAC4.2+TeX-FPC, 4th ed.}
+  % identifies current set of macros
+\message{\fmtversion}
+.
+w nwebmac.tex
+END
diff --git a/systems/unix/tex-fpc/twebmac/report b/systems/unix/tex-fpc/twebmac/report
new file mode 100644
index 0000000000..9789534b9f
--- /dev/null
+++ b/systems/unix/tex-fpc/twebmac/report
@@ -0,0 +1,91 @@
+All bugs occur when weave prints changed modules only.
+
+bug 1: Excessive memory usage.
+reason: All modules \mark their module numbers on the current page.
+In tex.tex modules 880 to 1332 put their marks all on page 25, since
+most of these modules are unchanged. The fix is obvious: mark
+your module number only when you are going to be printed.
+
+bug 2:  The module number in the header sometime differs from the first
+module on the page.
+reason: To keep it simple, we denote the four kinds of Modules with letters:
+m: unchanged unstarred Module
+n: unchanged starred Module
+M: changed unstarred Module
+N: changed starred Module
+
+The module sequence "n M", leads to the course of actions:
+1. n marks its number on page p.
+2. n \ejects p.
+3. M marks its number on page p+1
+4. M tentativly tries a page break. This break is prohibitive expensive.
+   M is still at the start of p+1. 
+5. Eventually page p+1 is shipped out.
+6. The \output routine writes the last mark from the previous page as module
+   number in the header. This is the number of n.
+The fix is obvious: Don't \eject a page when you are not going to
+be printed. This way there is always some text of the previous
+module (or of the initial "\vbox to \vsize".) when it marks its
+number.  If the break after the mark is performed, M will have put
+its mark on the previous page and the heading will show its number.
+If the break is not performed, there will be some text some text
+of the previous module, that is, M will not print at the start of
+the page and the heading shows correctly the number of the previous
+module.
+
+bug 3:  A (nonstarred) module starts on a new page, even though there
+was enough room left for the whole module on the old page.
+The fix of bug 2 also fixes bug 3.
+
+bug 4:  Some starred modules are not listed in the contents file.
+This bug is introduced by the fix of bug 2.
+This bug is triggered, when the first module of the program is starred but not
+changed.
+Writing the contents line is delayed until the current page is
+shipped out. Because only then the page number is determined. But
+the very first page, the dummy page, will never be shipped out.
+Because the dummy page is not ejected before n writes its content line, the
+write will get lost.
+The fix is obious: Maintain a flag "dp" with the meaning: "Writing
+to dummy page" and collect the lines in a macro like this:
+\ifdp
+  \edef\cline{\cline "line for this module"}
+\else
+  \edef\cline{"line for this module"}\cline
+\fi
+
+bug 5: Sometimes the heading shows the wrong part name 
+The fix of bug2 introduces bug5.
+A starred module defines its part name in the macro \rhead.
+The \output-routine then displays \rhead in the heading.
+The sequence n1.p1. n2.p2 M3 N4.p3. triggers the bug: M2 is member of part p2,
+but the heading for M2 displays p3 instead of p2. That's because N4 puts p3
+in \rhead and then \ejects. The \ejected page starts with M3 but the
+\output routine includes the \rhead as defined at the time of \output.
+
+The fix is obvious: Store both the part name and the module number in
+the mark. And use both components of the mark to fill the header.
+
+bug 6: \input webmac and the say \bye. The \output will \cycle and fill your
+disk.
+The fix of bug5 triggers this bug.
+What happened? The mark (to the dummy page) is defined to contain \rhead
+and \def\rhead{\.{WEB} OUTPUT} breaks the execution of the tokenlist in
+the mark.
+
+The kludge is obvious: \def\rhead{WEB OUTPUT} saves the day. The
+\.-Macro kills the \output routine.
+
+Why and how the \. macro does its devastating deeds, you ask? Don't
+know, I answer.
+
+bug 7: weaving tex.web w/o tex.ch will give you wrong part names in the
+header, namely the one of the preceding part.
+case: N1.p1 M2 N3.p2 will display the part name WEB OUTPUT for N1.p1
+and part name p1 for N3.p2. It should show p1 and p2.
+The reason is simple: tex.tex defines a private macro \N which assumes
+the old \output routine which puts the part name via \rhead into the header.
+(See bug5)
+The fix is obvious: \NM is invoked only by the private unchanged \N of
+pure TeX or mf. This sets a flag, that controls the \output routine to
+get the part name from the topmark (not compatible) or from the \rhead.
diff --git a/systems/unix/tex-fpc/weave.ch b/systems/unix/tex-fpc/weave.ch
index a59132fbed..1e35341bc9 100644
--- a/systems/unix/tex-fpc/weave.ch
+++ b/systems/unix/tex-fpc/weave.ch
@@ -33,8 +33,8 @@ to compile its input.
 These commands will do:
 
 {\obeylines
-\indent\.{sed s/MEMMAX=30000/MEMMAX=32000/ ../tex.p >tex.p}
-\indent\.{fpc -Fasysutils,baseunix tex.p}
+\indent\.{sed s/MEMMAX=30000/MEMMAX=32000/ ../tex/tex.p >tex.p}
+\indent\.{fpc -Fasysutils,baseunix,unix tex.p}
 }
 
 \medskip
diff --git a/systems/win32/miktex/tm/packages/next/pr.ini b/systems/win32/miktex/tm/packages/next/pr.ini
index d97e8e95aa..e5d6bc7d16 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=1617826733

+date=1617912947

 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=020dd90d83d5d98d0d545c0ea5fccb3d

+lstdigest=e412dcc12fc6584d6aca986a7e6098ff

 numpkg=4086

 relstate=next

-version=7767

+version=7768

 

 ;;;;This configuration file is signed by a MiKTeX maintainer. The signature follows.

 ;;;;-----BEGIN MIKTEX SIGNATURE-----

-;;;; signature/miktex: dWMsbvRszI+d47dMvUb8N4fdd4G1SR/+5AJ0Ge5qw/uJGjl64Pz55oh6nGsl1FWHPWyo/XQZa4gppOmheDKS6bBIppp6ZTjCb40CANWmwKPQ8R3vG/HbYsZCetSpF3cBg7eGWPM7CSQ01BVXNrW1aV2uapnLJpQUAMUL2XbXhpSpByjoBXlTergtUNwoFLA3n0uleqnvcRmoVkZ+765Rnv9YaMlIyTPr/v1GxwuxxUQ3Dq6PEhAHZPZHw2XHqvnmTCj48Sp/2edUBnzj+a98togvu4SK55XmDYdcoLZ7BEVYZgx6qXB1Roy1e/zA8N0yChdAAzKTAXnGZXyLG5ypvA==

+;;;; signature/miktex: YoaibEHrD/Ub9RKf1JqqKhx5wRw6z/JaQdZg7xgky//k5DkJ6udy0dJj0BqNdSLgsG0+3VbQZ72LkuzDEmvBYRugK0MAh2AVZsEwDIVNTyPRyfbNAty+aFQXqcKZKn07WF8HIeEaE1zAGFwQiSilq9P9tmVuE1EI1rSr+qy2fxmUDrlngHmq2BUSXktN+m66Dx9bZDOeECbG1Z0EJQk45xI/i/HG8z08BXkivRav9L//J5n0E+TOxJr5CopS1NcDKD7BZXGVMMNI9we4vaeMr67osL6fxpd+inWWRUANBxKb9FskyjScjknTJ79r4IRnt7cvPvH+2yoXcmOTUidqZg==

 ;;;;-----END MIKTEX SIGNATURE-----

diff --git a/systems/win32/miktex/tm/packages/pr.ini b/systems/win32/miktex/tm/packages/pr.ini
index fec6011bff..496fd05ddc 100644
--- a/systems/win32/miktex/tm/packages/pr.ini
+++ b/systems/win32/miktex/tm/packages/pr.ini
@@ -1,13 +1,13 @@
 

 [repository]

-date=1617826300

+date=1617912690

 lastupd=abraces apa7 arara babel-romanian beamertheme-trigon beamerthemelalic biblatex-chicago biblatex-gb7714-2015 biblatex-ieee buctthesis changes circuitikz cochineal dimnum dtk dynbrackets dynkin-diagrams easybook ekdosis expkv-opt

-lstdigest=ca46e9b025b670787e4f48f0f9da9b39

+lstdigest=7a48e3a07b964c1146f7ccc40b62fb4b

 numpkg=4086

 relstate=stable

-version=7767

+version=7768

 

 ;;;;This configuration file is signed by a MiKTeX maintainer. The signature follows.

 ;;;;-----BEGIN MIKTEX SIGNATURE-----

-;;;; signature/miktex: HnM0umZZDiwMhiF1UJjopSYvGMwP5XlAuku5ZJgVIrNE9PrWt9ISF0NsfaDM9Ttahk6ceQE50YoloAB1qwznu4Uf0G87lRkgqmT0aHBpQ0vwmRlR75TOFacmsLXAjguZ/7DEW23EcW3COiHHnoIg68ZaZ/ryxP1i9r6M9Jh05L4do2S5CYjUTjCB8dXWb3IWti76m/8kRy1nKRgmVxjRlf0zvDY6XteQFS6flV/6GgkvpvmRtjzPsY6VryPw7U3Brz26ea312iDK6t8FqDXrnPQPJZuwtEVaqIwLcRMIvu3H3OdBH184G0o2ljaReqedBZI0tLL+lR+Yrm996ZssCw==

+;;;; signature/miktex: Ue5J5JkeDANMtlPrLUfNYK8IC9cCP5W6lTb+DoiDl3YLOovtIx4ETrBZh8f8KxT90b0r72K1lQaJU9mf6NvTeRfmtrlMG+K9n1a/e7PeZlkSDAp0KktIdYTjYeZP7S65qbcnzFIOopI5aC/Cdl6XeBzr/wGPO8IFcS4TJJnXQBNLOYxVxGy4UKmG/yZiAh9btZLZDr6GKby3A0uoB2h8gjhZCa08ur8Cwd9wBPe3SAiyrysEXN01okB2NWWVPX51VZ1BNo1ngZ/3eTqOXI3hYjBYe8fAHzhYW2Nn+2SywUy0Nfp90wCHMkySfJ5em2SOH/3st5qmd7D2qfOfqCsDeA==

 ;;;;-----END MIKTEX SIGNATURE-----

diff --git a/systems/win32/protext/README1ST.txt b/systems/win32/protext/README1ST.txt
new file mode 100644
index 0000000000..d0efacedcf
--- /dev/null
+++ b/systems/win32/protext/README1ST.txt
@@ -0,0 +1,22 @@
+Willkommen zur Installation von ProTeXt
+=========================================
+
+ProTeXt ist ein Projekt der TuG, Dante und der FernUni.
+
+Hinweise zur Installation:
+
+0. Entpacken Sie die Datei protext-*.zip in ein leeres Verzeichnis
+auf Ihrem Rechner.
+
+1. Starten Sie ueber den Windows-Explorer die Datei Setup.exe .
+
+2. Fragen und Probleme?
+
+Schreiben Sie an:
+
+    FernUniversitaet in Hagen
+    Zentrum fuer Medien und IT
+    z.H. Th. Feuerstack
+    58084 Hagen
+
+    E-Mail: helpdesk@fernuni-hagen.de
diff --git a/systems/win32/w32tex/ChangeLog b/systems/win32/w32tex/ChangeLog
index 28442a69b0..f094f44b06 100644
--- a/systems/win32/w32tex/ChangeLog
+++ b/systems/win32/w32tex/ChangeLog
@@ -1,5 +1,35 @@
                    W32TeX (x86 & x64) ChangeLog
 
+[2021/04/08]
+(01) aleph-w32.tar.xz
+     Update format files.
+(02) jtex-w32.tar.xz
+     Update format files.
+(03) latex-dev.tar.xz
+     Update format files.
+(04) luatex-dev-w32.tar.xz
+     Update format files.
+(05) luatex-exp-w32.tar.xz
+     Update format files.
+(06) luatex-w32.tar.xz
+     Update format files.
+(07) pdftex-w32.tar.xz
+     Update format files.
+(08) pstricks.tar.xz
+     Update pst-func.
+(09) ptex-ng-w32.tar.xz
+     Update format files.
+(10) ptex-w32.tar.xz
+     Update format files.
+(11) uptex-w32.tar.x
+     Update format files.
+(12) web2c-lib.tar.xz
+     Update babel (3.57).
+(13) web2c-w32.tar.xz
+     Update latexindent.
+(14) xetex-w32.tar.xz
+     Update format files.
+
 [2021/04/07]
 (01) aleph-w32.tar.xz
 (02) context.tar.xz
diff --git a/timestamp b/timestamp
index bd6bad13fb..b54add8fa3 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-04-08-02-02
+2021-04-09-02-02