53 files changed, 5945 insertions, 1374 deletions

diff --git a/FILES.byname b/FILES.byname
index 74afe24762..b440a1e4ff 100644
--- a/FILES.byname
+++ b/FILES.byname
@@ -5107,7 +5107,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/12/25 |     191496 | FILES.last07days
+2021/12/26 |     218575 | FILES.last07days
 2021/07/24 |    1139410 | fonts/aboensis/Aboensis.glyphs
 2021/07/24 |   18907382 | fonts/aboensis/aboensis.pdf
 2021/07/24 |     137860 | fonts/aboensis/Aboensis-Regular.otf
@@ -182938,7 +182938,7 @@
 2021/01/01 |      26118 | info/undergradmath/undergradmath.tex
 2021/01/01 |    2162772 | info/undergradmath.zip
 2005/02/11 |      11710 | info/virtualfontshowto/virtualfontshowto.txt
-2021/02/26 |       3019 | info/visualfaq-fr/README
+2021/12/26 |       3024 | info/visualfaq-fr/README
 2021/02/24 |       2632 | info/visualfaq-fr/source/anotherarticle.tex
 2021/02/24 |        479 | info/visualfaq-fr/source/fuzzytext.tex
 2021/02/27 |       5078 | info/visualfaq-fr/source/labelgraph.gp
@@ -182952,16 +182952,16 @@
 2021/02/24 |      31311 | info/visualfaq-fr/source/latex-books/tex-unbound.jpg
 2021/02/24 |    5274456 | info/visualfaq-fr/source/lorem-ipsum.blend
 2021/02/24 |      10381 | info/visualfaq-fr/source/musixtex.png
-2021/02/26 |       3315 | info/visualfaq-fr/source/README
+2021/12/26 |       3313 | info/visualfaq-fr/source/README
 2021/02/24 |      65167 | info/visualfaq-fr/source/visfaq-html.png
-2021/03/21 |     139076 | info/visualfaq-fr/source/visualFAQ-fr.tex
+2021/12/26 |     140180 | info/visualfaq-fr/source/visualFAQ-fr.tex
 2021/02/24 |       1463 | info/visualfaq-fr/source/visualFAQ.ind
 2021/02/24 |       1258 | info/visualfaq-fr/source/visualFAQ.ind2
 2021/02/24 |      10093 | info/visualfaq-fr/source/watermark.odg
 2021/02/26 |      68565 | info/visualfaq-fr/troubleshoot-vlf-fr.pdf
-2021/03/21 |         11 | info/visualfaq-fr/VERSION
-2021/03/21 |    3327721 | info/visualfaq-fr/visualFAQ-fr.pdf
-2021/08/19 |    5836420 | info/visualfaq-fr.zip
+2021/12/26 |         11 | info/visualfaq-fr/VERSION
+2021/12/26 |    3436552 | info/visualfaq-fr/visualFAQ-fr.pdf
+2021/12/26 |    5953884 | info/visualfaq-fr.zip
 2021/08/08 |       1701 | info/visualfaq/README
 2021/08/08 |      23582 | info/visualfaq/source/anotherarticle.pdf
 2021/08/08 |    1710017 | info/visualfaq/source/book-montage.png
@@ -196700,7 +196700,7 @@
 2013/04/01 |      14776 | macros/context/contrib/context-visualcounter/tex/context/third/visualcounter/t-visualcounter.mkvi
 2018/03/05 |         11 | macros/context/contrib/context-visualcounter/VERSION
 2018/03/22 |     276789 | macros/context/contrib/context-visualcounter.zip
-2021/12/24 |  117981663 | macros/context/latest/cont-tmf.zip
+2021/12/24 |  118002438 | macros/context/latest/cont-tmf.zip
 2016/04/21 |      32846 | macros/cstex/base/cmexb.tar.gz
 2016/06/26 |    1728262 | macros/cstex/base/csfonts-t1.tar.gz
 2007/03/01 |     187106 | macros/cstex/base/csfonts.tar.gz
@@ -201051,34 +201051,34 @@
 2020/10/22 |      39241 | macros/latex/contrib/askmaps/askmaps.tex
 2020/10/22 |        814 | macros/latex/contrib/askmaps/README
 2020/10/22 |     385765 | macros/latex/contrib/askmaps.zip
-2021/01/04 |      37675 | macros/latex/contrib/asmeconf/asmeconf.bst
-2021/02/20 |      72150 | macros/latex/contrib/asmeconf/asmeconf.cls
-2021/01/30 |      13996 | macros/latex/contrib/asmeconf/asmeconf-sample.bib
-2021/02/20 |     638109 | macros/latex/contrib/asmeconf/asmeconf-template.pdf
-2021/02/20 |      42772 | macros/latex/contrib/asmeconf/asmeconf-template.tex
-2021/01/18 |     610103 | macros/latex/contrib/asmeconf/examples/asmeconf-authorgrid-example.pdf
-2021/01/18 |      41310 | macros/latex/contrib/asmeconf/examples/asmeconf-authorgrid-example.tex
-2021/01/18 |     381051 | macros/latex/contrib/asmeconf/examples/asmeconf-fontspec.pdf
-2021/01/18 |      27451 | macros/latex/contrib/asmeconf/examples/asmeconf-fontspec.tex
-2021/01/18 |     275604 | macros/latex/contrib/asmeconf/examples/asmeconf-lualatex-ode-example.pdf
-2021/01/16 |       9886 | macros/latex/contrib/asmeconf/examples/asmeconf-lualatex-ode-example.tex
+2021/12/02 |      37819 | macros/latex/contrib/asmeconf/asmeconf.bst
+2021/12/26 |      88313 | macros/latex/contrib/asmeconf/asmeconf.cls
+2021/12/24 |      13992 | macros/latex/contrib/asmeconf/asmeconf-sample.bib
+2021/12/26 |     643458 | macros/latex/contrib/asmeconf/asmeconf-template.pdf
+2021/12/26 |      42180 | macros/latex/contrib/asmeconf/asmeconf-template.tex
+2021/12/26 |     639103 | macros/latex/contrib/asmeconf/examples/asmeconf-authorgrid-example.pdf
+2021/12/26 |      42105 | macros/latex/contrib/asmeconf/examples/asmeconf-authorgrid-example.tex
+2021/12/26 |     370592 | macros/latex/contrib/asmeconf/examples/asmeconf-fontspec.pdf
+2021/12/26 |      27502 | macros/latex/contrib/asmeconf/examples/asmeconf-fontspec.tex
+2021/12/26 |     280349 | macros/latex/contrib/asmeconf/examples/asmeconf-lualatex-ode-example.pdf
+2021/12/26 |       9955 | macros/latex/contrib/asmeconf/examples/asmeconf-lualatex-ode-example.tex
 2020/11/07 |     483046 | macros/latex/contrib/asmeconf/examples/CONTRACTOR-copyright-asmeconf-template.pdf
 2020/11/07 |     482459 | macros/latex/contrib/asmeconf/examples/GOVT-copyright-asmeconf-template.pdf
-2021/02/20 |       8189 | macros/latex/contrib/asmeconf/README.md
+2021/12/26 |       9157 | macros/latex/contrib/asmeconf/README.md
 2019/03/24 |      17689 | macros/latex/contrib/asmeconf/sample-figure-1.pdf
 2019/07/08 |      95556 | macros/latex/contrib/asmeconf/sample-figure-2a.pdf
 2019/07/08 |      91105 | macros/latex/contrib/asmeconf/sample-figure-2b.pdf
-2021/02/20 |    2835955 | macros/latex/contrib/asmeconf.zip
+2021/12/26 |    2880413 | macros/latex/contrib/asmeconf.zip
 2021/12/23 |      42691 | macros/latex/contrib/asmejour/asmejour.bst
-2021/12/23 |      42423 | macros/latex/contrib/asmejour/asmejour.cls
+2021/12/26 |      44075 | macros/latex/contrib/asmejour/asmejour.cls
 2021/12/23 |      19681 | macros/latex/contrib/asmejour/asmejour-sample.bib
-2021/12/23 |     670705 | macros/latex/contrib/asmejour/asmejour-template.pdf
-2021/12/23 |      42768 | macros/latex/contrib/asmejour/asmejour-template.tex
-2021/12/23 |       7759 | macros/latex/contrib/asmejour/README.md
+2021/12/26 |     670642 | macros/latex/contrib/asmejour/asmejour-template.pdf
+2021/12/26 |      42772 | macros/latex/contrib/asmejour/asmejour-template.tex
+2021/12/26 |       7900 | macros/latex/contrib/asmejour/README.md
 2019/03/24 |      17689 | macros/latex/contrib/asmejour/sample-figure-1.pdf
 2019/07/08 |      95556 | macros/latex/contrib/asmejour/sample-figure-2a.pdf
 2019/07/08 |      91105 | macros/latex/contrib/asmejour/sample-figure-2b.pdf
-2021/12/23 |     875148 | macros/latex/contrib/asmejour.zip
+2021/12/26 |     875831 | macros/latex/contrib/asmejour.zip
 2008/02/08 |       3136 | macros/latex/contrib/aspectratio/amarbi.pfb
 2008/02/08 |        144 | macros/latex/contrib/aspectratio/amarbi.tfm
 2008/01/27 |       3138 | macros/latex/contrib/aspectratio/amarri.pfb
@@ -205845,6 +205845,17 @@
 2015/06/01 |      12155 | macros/latex/contrib/cntperchap/cntperchap.sty
 2015/06/01 |       1440 | macros/latex/contrib/cntperchap/README
 2015/06/01 |     274186 | macros/latex/contrib/cntperchap.zip
+2021/12/26 |        289 | macros/latex/contrib/codebox/build.sh
+2021/12/26 |      69553 | macros/latex/contrib/codebox/codebox-doc-en.pdf
+2021/12/26 |      11317 | macros/latex/contrib/codebox/codebox-doc-en.tex
+2021/12/26 |      35256 | macros/latex/contrib/codebox/codebox.dtx
+2021/12/26 |     280271 | macros/latex/contrib/codebox/codebox.pdf
+2021/12/24 |      29262 | macros/latex/contrib/codebox/ctxdoc-en.cls
+2021/12/26 |        122 | macros/latex/contrib/codebox/hellojava.java
+2021/12/26 |        888 | macros/latex/contrib/codebox/hellopy.py
+2021/12/26 |       3274 | macros/latex/contrib/codebox/README.md
+2021/12/26 |        104 | macros/latex/contrib/codebox/test.c
+2021/12/26 |     365836 | macros/latex/contrib/codebox.zip
 2010/03/30 |      46009 | macros/latex/contrib/codedoc/codedoc.cls
 2010/03/30 |     598708 | macros/latex/contrib/codedoc/CodeDoc-manual.pdf
 2010/03/30 |     156353 | macros/latex/contrib/codedoc/CodeDoc-manual.tex
@@ -208023,12 +208034,12 @@
 2008/02/10 |      19110 | macros/latex/contrib/ean13isbn/License.txt
 2021/01/24 |        422 | macros/latex/contrib/ean13isbn/README
 2021/01/24 |     322624 | macros/latex/contrib/ean13isbn.zip
-2021/12/23 |      83473 | macros/latex/contrib/easybook/easybook.dtx
+2021/12/26 |      83394 | macros/latex/contrib/easybook/easybook.dtx
 2021/11/17 |       2075 | macros/latex/contrib/easybook/easybook.ins
-2021/12/23 |     594225 | macros/latex/contrib/easybook/easybook.pdf
-2021/12/23 |      84741 | macros/latex/contrib/easybook/easybook.tex
+2021/12/26 |     594563 | macros/latex/contrib/easybook/easybook.pdf
+2021/12/26 |      84780 | macros/latex/contrib/easybook/easybook.tex
 2021/11/17 |        795 | macros/latex/contrib/easybook/README.md
-2021/12/23 |     637213 | macros/latex/contrib/easybook.zip
+2021/12/26 |     637591 | 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
@@ -224984,12 +224995,14 @@
 2010/06/12 |      13963 | macros/latex/contrib/termlist/termlist.dtx
 2010/06/12 |     169943 | macros/latex/contrib/termlist/termlist.pdf
 2010/06/12 |     165080 | macros/latex/contrib/termlist.zip
-2021/12/24 |        289 | macros/latex/contrib/termsim/build.sh
-2021/12/24 |       3759 | macros/latex/contrib/termsim/README.md
-2021/12/24 |      46991 | macros/latex/contrib/termsim/termsim.dtx
-2021/12/24 |      71132 | macros/latex/contrib/termsim/termsim-en.pdf
-2021/12/24 |     317576 | macros/latex/contrib/termsim/termsim-zh-cn.pdf
-2021/12/24 |     391739 | macros/latex/contrib/termsim.zip
+2021/12/26 |        289 | macros/latex/contrib/termsim/build.sh
+2021/12/26 |      29262 | macros/latex/contrib/termsim/ctxdoc-en.cls
+2021/12/26 |       3759 | macros/latex/contrib/termsim/README.md
+2021/12/26 |      77433 | macros/latex/contrib/termsim/termsim-doc-en.pdf
+2021/12/26 |      18927 | macros/latex/contrib/termsim/termsim-doc-en.tex
+2021/12/26 |      45728 | macros/latex/contrib/termsim/termsim.dtx
+2021/12/26 |     313173 | macros/latex/contrib/termsim/termsim.pdf
+2021/12/26 |     404704 | macros/latex/contrib/termsim.zip
 2015/11/23 |       1281 | macros/latex/contrib/testhyphens/manifest.txt
 2015/11/23 |       1486 | macros/latex/contrib/testhyphens/README
 2015/11/23 |      21446 | macros/latex/contrib/testhyphens/testhyphens.dtx
@@ -278674,8 +278687,8 @@
 2019/02/28 |       1608 | systems/texlive/tlnet/archive/biblatex-anonymous.r48548.tar.xz
 2020/08/30 |     226684 | systems/texlive/tlnet/archive/biblatex-apa6.doc.r56209.tar.xz
 2020/08/30 |      21184 | systems/texlive/tlnet/archive/biblatex-apa6.r56209.tar.xz
-2020/08/30 |     322056 | systems/texlive/tlnet/archive/biblatex-apa.doc.r56208.tar.xz
-2020/08/30 |      24868 | systems/texlive/tlnet/archive/biblatex-apa.r56208.tar.xz
+2021/12/26 |     320848 | systems/texlive/tlnet/archive/biblatex-apa.doc.r61406.tar.xz
+2021/12/26 |      27172 | systems/texlive/tlnet/archive/biblatex-apa.r61406.tar.xz
 2020/01/02 |    4828952 | systems/texlive/tlnet/archive/biblatex-archaeology.doc.r53281.tar.xz
 2020/01/02 |      39412 | systems/texlive/tlnet/archive/biblatex-archaeology.r53281.tar.xz
 2020/01/02 |     193792 | systems/texlive/tlnet/archive/biblatex-archaeology.source.r53281.tar.xz
@@ -285168,9 +285181,9 @@
 2019/02/28 |      41924 | systems/texlive/tlnet/archive/minitoc.r48196.tar.xz
 2019/02/28 |     166396 | systems/texlive/tlnet/archive/minorrevision.doc.r32165.tar.xz
 2019/02/28 |       1584 | systems/texlive/tlnet/archive/minorrevision.r32165.tar.xz
-2019/02/28 |     803632 | systems/texlive/tlnet/archive/minted.doc.r44855.tar.xz
-2019/02/28 |       9496 | systems/texlive/tlnet/archive/minted.r44855.tar.xz
-2019/02/28 |      44376 | systems/texlive/tlnet/archive/minted.source.r44855.tar.xz
+2021/12/26 |     824148 | systems/texlive/tlnet/archive/minted.doc.r61405.tar.xz
+2021/12/26 |       9592 | systems/texlive/tlnet/archive/minted.r61405.tar.xz
+2021/12/26 |      45492 | systems/texlive/tlnet/archive/minted.source.r61405.tar.xz
 2019/02/28 |     308404 | systems/texlive/tlnet/archive/mintspirit.doc.r32069.tar.xz
 2019/02/28 |    1105488 | systems/texlive/tlnet/archive/mintspirit.r32069.tar.xz
 2019/02/28 |     393404 | systems/texlive/tlnet/archive/minutes.doc.r42186.tar.xz
@@ -285642,15 +285655,15 @@
 2021/03/08 |      61332 | systems/texlive/tlnet/archive/newpax.doc.r58212.tar.xz
 2021/03/08 |       8444 | systems/texlive/tlnet/archive/newpax.r58212.tar.xz
 2021/03/08 |       8676 | systems/texlive/tlnet/archive/newpax.source.r58212.tar.xz
-2021/12/09 |     255964 | systems/texlive/tlnet/archive/newpx.doc.r61250.tar.xz
-2021/12/09 |    3889932 | systems/texlive/tlnet/archive/newpx.r61250.tar.xz
+2021/12/26 |     256024 | systems/texlive/tlnet/archive/newpx.doc.r61404.tar.xz
+2021/12/26 |    2859480 | systems/texlive/tlnet/archive/newpx.r61404.tar.xz
 2019/02/28 |     137580 | systems/texlive/tlnet/archive/newsletr.doc.r15878.tar.xz
 2019/02/28 |      16788 | systems/texlive/tlnet/archive/newsletr.r15878.tar.xz
 2019/02/28 |     196212 | systems/texlive/tlnet/archive/newspaper.doc.r15878.tar.xz
 2019/02/28 |       1924 | systems/texlive/tlnet/archive/newspaper.r15878.tar.xz
 2019/02/28 |       6804 | systems/texlive/tlnet/archive/newspaper.source.r15878.tar.xz
-2021/10/24 |     983000 | systems/texlive/tlnet/archive/newtx.doc.r60850.tar.xz
-2021/10/24 |    5635196 | systems/texlive/tlnet/archive/newtx.r60850.tar.xz
+2021/12/26 |     633692 | systems/texlive/tlnet/archive/newtx.doc.r61408.tar.xz
+2021/12/26 |    6537272 | systems/texlive/tlnet/archive/newtx.r61408.tar.xz
 2021/05/17 |     332420 | systems/texlive/tlnet/archive/newtxsf.doc.r59227.tar.xz
 2021/05/17 |     105908 | systems/texlive/tlnet/archive/newtxsf.r59227.tar.xz
 2020/03/24 |     171356 | systems/texlive/tlnet/archive/newtxtt.doc.r54512.tar.xz
@@ -287126,8 +287139,8 @@
 2019/02/28 |       4764 | systems/texlive/tlnet/archive/pst-pulley.r45316.tar.xz
 2019/02/28 |      24596 | systems/texlive/tlnet/archive/pst-qtree.doc.r15878.tar.xz
 2019/02/28 |       1844 | systems/texlive/tlnet/archive/pst-qtree.r15878.tar.xz
-2021/09/27 |   10634380 | systems/texlive/tlnet/archive/pstricks-add.doc.r60622.tar.xz
-2021/09/27 |      21292 | systems/texlive/tlnet/archive/pstricks-add.r60622.tar.xz
+2021/12/26 |    9152100 | systems/texlive/tlnet/archive/pstricks-add.doc.r61407.tar.xz
+2021/12/26 |      21888 | systems/texlive/tlnet/archive/pstricks-add.r61407.tar.xz
 2019/02/28 |    1133128 | systems/texlive/tlnet/archive/pstricks_calcnotes.doc.r34363.tar.xz
 2019/02/28 |        512 | systems/texlive/tlnet/archive/pstricks_calcnotes.r34363.tar.xz
 2021/11/18 |    7526604 | systems/texlive/tlnet/archive/pstricks.doc.r61084.tar.xz
@@ -288900,7 +288913,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/12/25 |     402028 | systems/texlive/tlnet/archive/texlive-scripts.doc.r61394.tar.xz
+2021/12/26 |     402264 | systems/texlive/tlnet/archive/texlive-scripts.doc.r61403.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
@@ -288924,7 +288937,7 @@
 2020/05/17 |        588 | systems/texlive/tlnet/archive/texlive-scripts.i386-linux.r55172.tar.xz
 2020/05/17 |        592 | systems/texlive/tlnet/archive/texlive-scripts.i386-netbsd.r55172.tar.xz
 2020/05/17 |        588 | systems/texlive/tlnet/archive/texlive-scripts.i386-solaris.r55172.tar.xz
-2021/12/25 |     108300 | systems/texlive/tlnet/archive/texlive-scripts.r61394.tar.xz
+2021/12/26 |     108268 | systems/texlive/tlnet/archive/texlive-scripts.r61403.tar.xz
 2021/02/25 |        572 | systems/texlive/tlnet/archive/texlive-scripts.universal-darwin.r57908.tar.xz
 2021/04/12 |      36308 | systems/texlive/tlnet/archive/texlive-scripts.win32.r58829.tar.xz
 2020/05/17 |        588 | systems/texlive/tlnet/archive/texlive-scripts.x86_64-cygwin.r55172.tar.xz
@@ -290695,16 +290708,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/12/06 |     105168 | systems/texlive/tlnet/install-tl
-2021/12/25 |    6811319 | systems/texlive/tlnet/install-tl-unx.tar.gz
-2021/12/25 |        152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
-2021/12/25 |        455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
+2021/12/26 |    6811294 | systems/texlive/tlnet/install-tl-unx.tar.gz
+2021/12/26 |        152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
+2021/12/26 |        455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
 2021/04/11 |       4945 | systems/texlive/tlnet/install-tl-windows.bat
-2021/12/25 |   20871936 | systems/texlive/tlnet/install-tl-windows.exe
-2021/12/25 |        153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
-2021/12/25 |        455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
-2021/12/25 |   25631674 | systems/texlive/tlnet/install-tl.zip
-2021/12/25 |        145 | systems/texlive/tlnet/install-tl.zip.sha512
-2021/12/25 |        455 | systems/texlive/tlnet/install-tl.zip.sha512.asc
+2021/12/26 |   20873611 | systems/texlive/tlnet/install-tl-windows.exe
+2021/12/26 |        153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
+2021/12/26 |        455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
+2021/12/26 |   25631646 | systems/texlive/tlnet/install-tl.zip
+2021/12/26 |        145 | systems/texlive/tlnet/install-tl.zip.sha512
+2021/12/26 |        455 | systems/texlive/tlnet/install-tl.zip.sha512.asc
 2021/04/01 |       1229 | systems/texlive/tlnet/README.md
 2021/04/01 |          0 | systems/texlive/tlnet/TEXLIVE_2021
 2021/07/03 |       7181 | systems/texlive/tlnet/tlpkg/gpg/pubring.gpg
@@ -290714,7 +290727,7 @@
 2021/07/03 |       1280 | systems/texlive/tlnet/tlpkg/gpg/trustdb.gpg
 2021/12/15 |      49408 | systems/texlive/tlnet/tlpkg/installer/config.guess
 2010/11/11 |      11651 | systems/texlive/tlnet/tlpkg/installer/COPYING.MinGW-runtime.txt
-2021/12/22 |       6837 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
+2021/12/25 |       6738 | 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
@@ -290756,12 +290769,12 @@
 2021/05/16 |      20371 | systems/texlive/tlnet/tlpkg/TeXLive/TLCrypto.pm
 2021/12/21 |       5429 | systems/texlive/tlnet/tlpkg/TeXLive/TLDownload.pm
 2021/12/21 |      27582 | systems/texlive/tlnet/tlpkg/TeXLive/TLPaper.pm
-2021/12/25 |   17048819 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
-2021/12/25 |         48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
+2021/12/26 |   17059142 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
+2021/12/26 |         48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
 2021/12/21 |      86654 | systems/texlive/tlnet/tlpkg/TeXLive/TLPDB.pm
-2021/12/25 |        144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
-2021/12/25 |        455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
-2021/12/25 |    2336284 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
+2021/12/26 |        144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
+2021/12/26 |        455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
+2021/12/26 |    2335968 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
 2021/12/21 |      58848 | systems/texlive/tlnet/tlpkg/TeXLive/TLPOBJ.pm
 2021/12/21 |      42112 | systems/texlive/tlnet/tlpkg/TeXLive/TLPSRC.pm
 2021/12/21 |      16130 | systems/texlive/tlnet/tlpkg/TeXLive/TLTREE.pm
@@ -295787,7 +295800,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/12/25 |     630565 | systems/win32/miktex/tm/packages/files.csv.lzma
+2021/12/26 |     630565 | 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
@@ -297267,9 +297280,9 @@
 2018/01/12 |     157226 | systems/win32/miktex/tm/packages/miktex-zip-bin-x64.tar.lzma
 2021/12/09 |      39714 | systems/win32/miktex/tm/packages/miktex-zlib-bin-2.9.tar.lzma
 2021/12/09 |      43639 | systems/win32/miktex/tm/packages/miktex-zlib-bin-x64-2.9.tar.lzma
-2021/12/25 |     256789 | systems/win32/miktex/tm/packages/miktex-zzdb1-2.9.tar.lzma
-2021/12/25 |    1397650 | systems/win32/miktex/tm/packages/miktex-zzdb2-2.9.tar.lzma
-2021/12/25 |    1293287 | systems/win32/miktex/tm/packages/miktex-zzdb3-2.9.tar.lzma
+2021/12/26 |     256780 | systems/win32/miktex/tm/packages/miktex-zzdb1-2.9.tar.lzma
+2021/12/26 |    1396326 | systems/win32/miktex/tm/packages/miktex-zzdb2-2.9.tar.lzma
+2021/12/26 |    1293842 | systems/win32/miktex/tm/packages/miktex-zzdb3-2.9.tar.lzma
 2021/12/09 |      13527 | systems/win32/miktex/tm/packages/miktex-zzip-bin-2.9.tar.lzma
 2021/12/09 |      14417 | 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
@@ -297489,193 +297502,193 @@
 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/12/25 |     630358 | systems/win32/miktex/tm/packages/next/files.csv.lzma
-2021/12/25 |      51587 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-2.9.tar.lzma
-2021/12/25 |      57406 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-x64-2.9.tar.lzma
-2021/12/25 |     959950 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-2.9.tar.lzma
-2021/12/25 |    1087068 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-x64-2.9.tar.lzma
-2021/12/25 |      28895 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-2.9.tar.lzma
-2021/12/25 |      31539 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-x64-2.9.tar.lzma
-2021/12/25 |      30179 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-2.9.tar.lzma
-2021/12/25 |      35263 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-x64-2.9.tar.lzma
-2021/12/25 |      50733 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-2.9.tar.lzma
-2021/12/25 |      58369 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-x64-2.9.tar.lzma
-2021/12/25 |      86768 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-2.9.tar.lzma
-2021/12/25 |      95274 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-x64-2.9.tar.lzma
-2021/12/25 |      68801 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-2.9.tar.lzma
-2021/12/25 |      77072 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-x64-2.9.tar.lzma
-2021/12/25 |      27243 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-2.9.tar.lzma
-2021/12/25 |      31332 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-x64-2.9.tar.lzma
-2021/12/25 |     332374 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-2.9.tar.lzma
-2021/12/25 |     394272 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-x64-2.9.tar.lzma
-2021/12/25 |      32992 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-2.9.tar.lzma
-2021/12/25 |      37092 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-x64-2.9.tar.lzma
-2021/12/25 |      51431 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-2.9.tar.lzma
-2021/12/25 |      57277 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-x64-2.9.tar.lzma
-2021/12/25 |     256199 | systems/win32/miktex/tm/packages/next/miktex-console-bin-2.9.tar.lzma
-2021/12/25 |     281440 | systems/win32/miktex/tm/packages/next/miktex-console-bin-x64-2.9.tar.lzma
-2021/12/25 |     179708 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-2.9.tar.lzma
-2021/12/25 |     196123 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-x64-2.9.tar.lzma
-2021/12/25 |      54951 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-2.9.tar.lzma
-2021/12/25 |      62418 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-x64-2.9.tar.lzma
-2021/12/25 |      21372 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-2.9.tar.lzma
-2021/12/25 |      24152 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-x64-2.9.tar.lzma
-2021/12/25 |     461240 | systems/win32/miktex/tm/packages/next/miktex-doc.tar.lzma
-2021/12/25 |      46135 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-2.9.tar.lzma
-2021/12/25 |      52094 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-x64-2.9.tar.lzma
-2021/12/25 |     285454 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-2.9.tar.lzma
-2021/12/25 |     326388 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-x64-2.9.tar.lzma
-2021/12/25 |      41326 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-2.9.tar.lzma
-2021/12/25 |      45687 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-x64-2.9.tar.lzma
-2021/12/25 |     120297 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-2.9.tar.lzma
-2021/12/25 |     135073 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-x64-2.9.tar.lzma
-2021/12/25 |    1299134 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-2.9.tar.lzma
-2021/12/25 |    1447744 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-x64-2.9.tar.lzma
-2021/12/25 |      99760 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-2.9.tar.lzma
-2021/12/25 |     113045 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-x64-2.9.tar.lzma
-2021/12/25 |      43639 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-2.9.tar.lzma
-2021/12/25 |      48803 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-x64-2.9.tar.lzma
-2021/12/25 |      25134 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-2.9.tar.lzma
-2021/12/25 |      28544 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-x64-2.9.tar.lzma
-2021/12/25 |      56963 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-2.9.tar.lzma
-2021/12/25 |      63312 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-x64-2.9.tar.lzma
-2021/12/25 |     135931 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-2.9.tar.lzma
-2021/12/25 |     155283 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-x64-2.9.tar.lzma
-2021/12/25 |      73597 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-2.9.tar.lzma
-2021/12/25 |      79138 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-x64-2.9.tar.lzma
-2021/12/25 |      72252 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-2.9.tar.lzma
-2021/12/25 |      81707 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-x64-2.9.tar.lzma
-2021/12/25 |     259273 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-2.9.tar.lzma
-2021/12/25 |     295888 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-x64-2.9.tar.lzma
-2021/12/25 |      22179 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-2.9.tar.lzma
-2021/12/25 |      25061 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-x64-2.9.tar.lzma
-2021/12/25 |      97105 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-2.9.tar.lzma
-2021/12/25 |     112483 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-x64-2.9.tar.lzma
-2021/12/25 |      64568 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-2.9.tar.lzma
-2021/12/25 |      73180 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-x64-2.9.tar.lzma
-2021/12/25 |      96828 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-2.9.tar.lzma
-2021/12/25 |     115672 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-x64-2.9.tar.lzma
-2021/12/25 |      38461 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-2.9.tar.lzma
-2021/12/25 |      43809 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-x64-2.9.tar.lzma
-2021/12/25 |     484479 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-2.9.tar.lzma
-2021/12/25 |     566759 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-x64-2.9.tar.lzma
-2021/12/25 |     152105 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-2.9.tar.lzma
-2021/12/25 |     168851 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-x64-2.9.tar.lzma
-2021/12/25 |      95448 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-2.9.tar.lzma
-2021/12/25 |     109546 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-x64-2.9.tar.lzma
-2021/12/25 |      16521 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-2.9.tar.lzma
-2021/12/25 |      18370 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-x64-2.9.tar.lzma
-2021/12/25 |      28386 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-2.9.tar.lzma
-2021/12/25 |      30568 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-x64-2.9.tar.lzma
-2021/12/25 |     631000 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-2.9.tar.lzma
-2021/12/25 |     682340 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-x64-2.9.tar.lzma
-2021/12/25 |     532338 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-2.9.tar.lzma
-2021/12/25 |     599047 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-x64-2.9.tar.lzma
-2021/12/25 |     477729 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-2.9.tar.lzma
-2021/12/25 |     528531 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-x64-2.9.tar.lzma
-2021/12/25 |      93990 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-2.9.tar.lzma
-2021/12/25 |     103462 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-x64-2.9.tar.lzma
-2021/12/25 |    1732473 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-2.9.tar.lzma
-2021/12/25 |    2012706 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-x64-2.9.tar.lzma
-2021/12/25 |      67994 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-2.9.tar.lzma
-2021/12/25 |      74054 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-x64-2.9.tar.lzma
-2021/12/25 |      27263 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-2.9.tar.lzma
-2021/12/25 |      32155 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-x64-2.9.tar.lzma
-2021/12/25 |       7756 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-2.9.tar.lzma
-2021/12/25 |       8791 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-x64-2.9.tar.lzma
-2021/12/25 |     197374 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-2.9.tar.lzma
-2021/12/25 |     215852 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-x64-2.9.tar.lzma
-2021/12/25 |     251068 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-2.9.tar.lzma
-2021/12/25 |     286703 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-x64-2.9.tar.lzma
-2021/12/25 |      99373 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-2.9.tar.lzma
-2021/12/25 |     104745 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-x64-2.9.tar.lzma
-2021/12/25 |      64516 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-2.9.tar.lzma
-2021/12/25 |      74620 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-x64-2.9.tar.lzma
-2021/12/25 |     126740 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-2.9.tar.lzma
-2021/12/25 |     139309 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-x64-2.9.tar.lzma
-2021/12/25 |     181557 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-2.9.tar.lzma
-2021/12/25 |     202238 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-x64-2.9.tar.lzma
-2021/12/25 |     199837 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-2.9.tar.lzma
-2021/12/25 |     181465 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-x64-2.9.tar.lzma
-2021/12/25 |      68617 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-2.9.tar.lzma
-2021/12/25 |      76233 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-x64-2.9.tar.lzma
-2021/12/25 |      31413 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-2.9.tar.lzma
-2021/12/25 |      35165 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-x64-2.9.tar.lzma
-2021/12/25 |      38542 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-2.9.tar.lzma
-2021/12/25 |      43895 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-x64-2.9.tar.lzma
-2021/12/25 |      43275 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-2.9.tar.lzma
-2021/12/25 |      47893 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-x64-2.9.tar.lzma
-2021/12/25 |      45733 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-2.9.tar.lzma
-2021/12/25 |      52279 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-x64-2.9.tar.lzma
-2021/12/25 |     199114 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-2.9.tar.lzma
-2021/12/25 |     213459 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-x64-2.9.tar.lzma
-2021/12/25 |      36043 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin.tar.lzma
-2021/12/25 |      41219 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin-x64.tar.lzma
-2021/12/25 |     753827 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-2.9.tar.lzma
-2021/12/25 |     824229 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-x64-2.9.tar.lzma
-2021/12/25 |     200140 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-2.9.tar.lzma
-2021/12/25 |     203081 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-x64-2.9.tar.lzma
-2021/12/25 |     209940 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-2.9.tar.lzma
-2021/12/25 |     244963 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-x64-2.9.tar.lzma
-2021/12/25 |      78962 | systems/win32/miktex/tm/packages/next/miktex-png-bin-2.9.tar.lzma
-2021/12/25 |      88227 | systems/win32/miktex/tm/packages/next/miktex-png-bin-x64-2.9.tar.lzma
-2021/12/25 |    1181005 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-2.9.tar.lzma
-2021/12/25 |    1322402 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-x64-2.9.tar.lzma
-2021/12/25 |      20190 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-2.9.tar.lzma
-2021/12/25 |      23933 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-x64-2.9.tar.lzma
-2021/12/25 |      31579 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-2.9.tar.lzma
-2021/12/25 |      37375 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-x64-2.9.tar.lzma
-2021/12/25 |      64716 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-2.9.tar.lzma
-2021/12/25 |      72851 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-x64-2.9.tar.lzma
-2021/12/25 |      50853 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-2.9.tar.lzma
-2021/12/25 |      58546 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-x64-2.9.tar.lzma
-2021/12/25 |     694125 | systems/win32/miktex/tm/packages/next/miktex-ptex-bin-2.9.tar.lzma
-2021/12/25 |     693756 | systems/win32/miktex/tm/packages/next/miktex-ptex-bin.tar.lzma
-2021/12/25 |     763148 | systems/win32/miktex/tm/packages/next/miktex-ptex-bin-x64-2.9.tar.lzma
-2021/12/25 |     762929 | systems/win32/miktex/tm/packages/next/miktex-ptex-bin-x64.tar.lzma
-2021/12/25 |    1353498 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-2.9.tar.lzma
-2021/12/25 |    1497474 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-x64-2.9.tar.lzma
-2021/12/25 |      42767 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-2.9.tar.lzma
-2021/12/25 |      52572 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-x64-2.9.tar.lzma
-2021/12/25 |      57566 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin.tar.lzma
-2021/12/25 |      63700 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-x64.tar.lzma
-2021/12/25 |      25672 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-2.9.tar.lzma
-2021/12/25 |      27473 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-x64-2.9.tar.lzma
-2021/12/25 |      16566 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-2.9.tar.lzma
-2021/12/25 |      18487 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-x64-2.9.tar.lzma
-2021/12/25 |      64453 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-2.9.tar.lzma
-2021/12/25 |      70994 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-x64-2.9.tar.lzma
-2021/12/25 |     157440 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-2.9.tar.lzma
-2021/12/25 |     172344 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-x64-2.9.tar.lzma
-2021/12/25 |      58641 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-2.9.tar.lzma
-2021/12/25 |      67188 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-x64-2.9.tar.lzma
-2021/12/25 |     101508 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-2.9.tar.lzma
-2021/12/25 |     109263 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-x64-2.9.tar.lzma
-2021/12/25 |    2675895 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-2.9.tar.lzma
-2021/12/25 |    2798719 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-x64-2.9.tar.lzma
-2021/12/25 |      55294 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-2.9.tar.lzma
-2021/12/25 |      62710 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-x64-2.9.tar.lzma
-2021/12/25 |      37152 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin.tar.lzma
-2021/12/25 |      41203 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin-x64.tar.lzma
-2021/12/25 |      28679 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-2.9.tar.lzma
-2021/12/25 |      34090 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-x64-2.9.tar.lzma
-2021/12/25 |      67857 | systems/win32/miktex/tm/packages/next/miktex-web-bin-2.9.tar.lzma
-2021/12/25 |      71897 | systems/win32/miktex/tm/packages/next/miktex-web-bin-x64-2.9.tar.lzma
-2021/12/25 |     318732 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-2.9.tar.lzma
-2021/12/25 |     351560 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-x64-2.9.tar.lzma
-2021/12/25 |      55722 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin.tar.lzma
-2021/12/25 |      57417 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin-x64.tar.lzma
-2021/12/25 |     591064 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-2.9.tar.lzma
-2021/12/25 |     629125 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-x64-2.9.tar.lzma
-2021/12/25 |      39745 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-2.9.tar.lzma
-2021/12/25 |      43683 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-x64-2.9.tar.lzma
-2021/12/25 |     256931 | systems/win32/miktex/tm/packages/next/miktex-zzdb1-2.9.tar.lzma
-2021/12/25 |    1397755 | systems/win32/miktex/tm/packages/next/miktex-zzdb2-2.9.tar.lzma
-2021/12/25 |    1293558 | systems/win32/miktex/tm/packages/next/miktex-zzdb3-2.9.tar.lzma
-2021/12/25 |      13511 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-2.9.tar.lzma
-2021/12/25 |      14417 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-x64-2.9.tar.lzma
+2021/12/26 |     630358 | systems/win32/miktex/tm/packages/next/files.csv.lzma
+2021/12/26 |      51588 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-2.9.tar.lzma
+2021/12/26 |      57408 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-x64-2.9.tar.lzma
+2021/12/26 |     959950 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-2.9.tar.lzma
+2021/12/26 |    1087070 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-x64-2.9.tar.lzma
+2021/12/26 |      28896 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-2.9.tar.lzma
+2021/12/26 |      31539 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-x64-2.9.tar.lzma
+2021/12/26 |      30180 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-2.9.tar.lzma
+2021/12/26 |      35263 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-x64-2.9.tar.lzma
+2021/12/26 |      50732 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-2.9.tar.lzma
+2021/12/26 |      58370 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-x64-2.9.tar.lzma
+2021/12/26 |      86768 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-2.9.tar.lzma
+2021/12/26 |      95274 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-x64-2.9.tar.lzma
+2021/12/26 |      68799 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-2.9.tar.lzma
+2021/12/26 |      77072 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-x64-2.9.tar.lzma
+2021/12/26 |      27243 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-2.9.tar.lzma
+2021/12/26 |      31333 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-x64-2.9.tar.lzma
+2021/12/26 |     332374 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-2.9.tar.lzma
+2021/12/26 |     394270 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-x64-2.9.tar.lzma
+2021/12/26 |      32990 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-2.9.tar.lzma
+2021/12/26 |      37092 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-x64-2.9.tar.lzma
+2021/12/26 |      51430 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-2.9.tar.lzma
+2021/12/26 |      57278 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-x64-2.9.tar.lzma
+2021/12/26 |     256200 | systems/win32/miktex/tm/packages/next/miktex-console-bin-2.9.tar.lzma
+2021/12/26 |     281442 | systems/win32/miktex/tm/packages/next/miktex-console-bin-x64-2.9.tar.lzma
+2021/12/26 |     179708 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-2.9.tar.lzma
+2021/12/26 |     196120 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-x64-2.9.tar.lzma
+2021/12/26 |      54950 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-2.9.tar.lzma
+2021/12/26 |      62420 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-x64-2.9.tar.lzma
+2021/12/26 |      21371 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-2.9.tar.lzma
+2021/12/26 |      24152 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-x64-2.9.tar.lzma
+2021/12/26 |     461238 | systems/win32/miktex/tm/packages/next/miktex-doc.tar.lzma
+2021/12/26 |      46135 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-2.9.tar.lzma
+2021/12/26 |      52095 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-x64-2.9.tar.lzma
+2021/12/26 |     285455 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-2.9.tar.lzma
+2021/12/26 |     326387 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-x64-2.9.tar.lzma
+2021/12/26 |      41326 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-2.9.tar.lzma
+2021/12/26 |      45687 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-x64-2.9.tar.lzma
+2021/12/26 |     120296 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-2.9.tar.lzma
+2021/12/26 |     135071 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-x64-2.9.tar.lzma
+2021/12/26 |    1299135 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-2.9.tar.lzma
+2021/12/26 |    1447745 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-x64-2.9.tar.lzma
+2021/12/26 |      99759 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-2.9.tar.lzma
+2021/12/26 |     113044 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-x64-2.9.tar.lzma
+2021/12/26 |      43637 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-2.9.tar.lzma
+2021/12/26 |      48803 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-x64-2.9.tar.lzma
+2021/12/26 |      25133 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-2.9.tar.lzma
+2021/12/26 |      28545 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-x64-2.9.tar.lzma
+2021/12/26 |      56963 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-2.9.tar.lzma
+2021/12/26 |      63313 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-x64-2.9.tar.lzma
+2021/12/26 |     135932 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-2.9.tar.lzma
+2021/12/26 |     155285 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-x64-2.9.tar.lzma
+2021/12/26 |      73599 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-2.9.tar.lzma
+2021/12/26 |      79137 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-x64-2.9.tar.lzma
+2021/12/26 |      72256 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-2.9.tar.lzma
+2021/12/26 |      81707 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-x64-2.9.tar.lzma
+2021/12/26 |     259274 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-2.9.tar.lzma
+2021/12/26 |     295888 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-x64-2.9.tar.lzma
+2021/12/26 |      22178 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-2.9.tar.lzma
+2021/12/26 |      25061 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-x64-2.9.tar.lzma
+2021/12/26 |      97104 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-2.9.tar.lzma
+2021/12/26 |     112482 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-x64-2.9.tar.lzma
+2021/12/26 |      64567 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-2.9.tar.lzma
+2021/12/26 |      73180 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-x64-2.9.tar.lzma
+2021/12/26 |      96827 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-2.9.tar.lzma
+2021/12/26 |     115671 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-x64-2.9.tar.lzma
+2021/12/26 |      38460 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-2.9.tar.lzma
+2021/12/26 |      43809 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-x64-2.9.tar.lzma
+2021/12/26 |     484479 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-2.9.tar.lzma
+2021/12/26 |     566759 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-x64-2.9.tar.lzma
+2021/12/26 |     152104 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-2.9.tar.lzma
+2021/12/26 |     168851 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-x64-2.9.tar.lzma
+2021/12/26 |      95449 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-2.9.tar.lzma
+2021/12/26 |     109545 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-x64-2.9.tar.lzma
+2021/12/26 |      16521 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-2.9.tar.lzma
+2021/12/26 |      18371 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-x64-2.9.tar.lzma
+2021/12/26 |      28385 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-2.9.tar.lzma
+2021/12/26 |      30567 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-x64-2.9.tar.lzma
+2021/12/26 |     631001 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-2.9.tar.lzma
+2021/12/26 |     682341 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-x64-2.9.tar.lzma
+2021/12/26 |     532337 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-2.9.tar.lzma
+2021/12/26 |     599046 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-x64-2.9.tar.lzma
+2021/12/26 |     477727 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-2.9.tar.lzma
+2021/12/26 |     528531 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-x64-2.9.tar.lzma
+2021/12/26 |      93989 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-2.9.tar.lzma
+2021/12/26 |     103462 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-x64-2.9.tar.lzma
+2021/12/26 |    1732472 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-2.9.tar.lzma
+2021/12/26 |    2012704 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-x64-2.9.tar.lzma
+2021/12/26 |      67994 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-2.9.tar.lzma
+2021/12/26 |      74054 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-x64-2.9.tar.lzma
+2021/12/26 |      27262 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-2.9.tar.lzma
+2021/12/26 |      32155 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-x64-2.9.tar.lzma
+2021/12/26 |       7756 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-2.9.tar.lzma
+2021/12/26 |       8790 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-x64-2.9.tar.lzma
+2021/12/26 |     197376 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-2.9.tar.lzma
+2021/12/26 |     215852 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-x64-2.9.tar.lzma
+2021/12/26 |     251069 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-2.9.tar.lzma
+2021/12/26 |     286703 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-x64-2.9.tar.lzma
+2021/12/26 |      99372 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-2.9.tar.lzma
+2021/12/26 |     104747 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-x64-2.9.tar.lzma
+2021/12/26 |      64516 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-2.9.tar.lzma
+2021/12/26 |      74622 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-x64-2.9.tar.lzma
+2021/12/26 |     126741 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-2.9.tar.lzma
+2021/12/26 |     139309 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-x64-2.9.tar.lzma
+2021/12/26 |     181559 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-2.9.tar.lzma
+2021/12/26 |     202237 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-x64-2.9.tar.lzma
+2021/12/26 |     199836 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-2.9.tar.lzma
+2021/12/26 |     181466 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-x64-2.9.tar.lzma
+2021/12/26 |      68619 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-2.9.tar.lzma
+2021/12/26 |      76231 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-x64-2.9.tar.lzma
+2021/12/26 |      31411 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-2.9.tar.lzma
+2021/12/26 |      35167 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-x64-2.9.tar.lzma
+2021/12/26 |      38541 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-2.9.tar.lzma
+2021/12/26 |      43894 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-x64-2.9.tar.lzma
+2021/12/26 |      43275 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-2.9.tar.lzma
+2021/12/26 |      47893 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-x64-2.9.tar.lzma
+2021/12/26 |      45731 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-2.9.tar.lzma
+2021/12/26 |      52279 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-x64-2.9.tar.lzma
+2021/12/26 |     199114 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-2.9.tar.lzma
+2021/12/26 |     213460 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-x64-2.9.tar.lzma
+2021/12/26 |      36041 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin.tar.lzma
+2021/12/26 |      41220 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin-x64.tar.lzma
+2021/12/26 |     753825 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-2.9.tar.lzma
+2021/12/26 |     824229 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-x64-2.9.tar.lzma
+2021/12/26 |     200142 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-2.9.tar.lzma
+2021/12/26 |     203080 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-x64-2.9.tar.lzma
+2021/12/26 |     209937 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-2.9.tar.lzma
+2021/12/26 |     244963 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-x64-2.9.tar.lzma
+2021/12/26 |      78962 | systems/win32/miktex/tm/packages/next/miktex-png-bin-2.9.tar.lzma
+2021/12/26 |      88228 | systems/win32/miktex/tm/packages/next/miktex-png-bin-x64-2.9.tar.lzma
+2021/12/26 |    1181004 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-2.9.tar.lzma
+2021/12/26 |    1322402 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-x64-2.9.tar.lzma
+2021/12/26 |      20190 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-2.9.tar.lzma
+2021/12/26 |      23931 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-x64-2.9.tar.lzma
+2021/12/26 |      31579 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-2.9.tar.lzma
+2021/12/26 |      37373 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-x64-2.9.tar.lzma
+2021/12/26 |      64715 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-2.9.tar.lzma
+2021/12/26 |      72850 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-x64-2.9.tar.lzma
+2021/12/26 |      50852 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-2.9.tar.lzma
+2021/12/26 |      58547 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-x64-2.9.tar.lzma
+2021/12/26 |     694124 | systems/win32/miktex/tm/packages/next/miktex-ptex-bin-2.9.tar.lzma
+2021/12/26 |     693756 | systems/win32/miktex/tm/packages/next/miktex-ptex-bin.tar.lzma
+2021/12/26 |     763148 | systems/win32/miktex/tm/packages/next/miktex-ptex-bin-x64-2.9.tar.lzma
+2021/12/26 |     762930 | systems/win32/miktex/tm/packages/next/miktex-ptex-bin-x64.tar.lzma
+2021/12/26 |    1353497 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-2.9.tar.lzma
+2021/12/26 |    1497475 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-x64-2.9.tar.lzma
+2021/12/26 |      42766 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-2.9.tar.lzma
+2021/12/26 |      52573 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-x64-2.9.tar.lzma
+2021/12/26 |      57566 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin.tar.lzma
+2021/12/26 |      63699 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-x64.tar.lzma
+2021/12/26 |      25671 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-2.9.tar.lzma
+2021/12/26 |      27474 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-x64-2.9.tar.lzma
+2021/12/26 |      16566 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-2.9.tar.lzma
+2021/12/26 |      18487 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-x64-2.9.tar.lzma
+2021/12/26 |      64452 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-2.9.tar.lzma
+2021/12/26 |      70993 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-x64-2.9.tar.lzma
+2021/12/26 |     157439 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-2.9.tar.lzma
+2021/12/26 |     172343 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-x64-2.9.tar.lzma
+2021/12/26 |      58642 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-2.9.tar.lzma
+2021/12/26 |      67188 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-x64-2.9.tar.lzma
+2021/12/26 |     101510 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-2.9.tar.lzma
+2021/12/26 |     109263 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-x64-2.9.tar.lzma
+2021/12/26 |    2675897 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-2.9.tar.lzma
+2021/12/26 |    2798719 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-x64-2.9.tar.lzma
+2021/12/26 |      55294 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-2.9.tar.lzma
+2021/12/26 |      62710 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-x64-2.9.tar.lzma
+2021/12/26 |      37151 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin.tar.lzma
+2021/12/26 |      41202 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin-x64.tar.lzma
+2021/12/26 |      28678 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-2.9.tar.lzma
+2021/12/26 |      34090 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-x64-2.9.tar.lzma
+2021/12/26 |      67857 | systems/win32/miktex/tm/packages/next/miktex-web-bin-2.9.tar.lzma
+2021/12/26 |      71896 | systems/win32/miktex/tm/packages/next/miktex-web-bin-x64-2.9.tar.lzma
+2021/12/26 |     318734 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-2.9.tar.lzma
+2021/12/26 |     351558 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-x64-2.9.tar.lzma
+2021/12/26 |      55725 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin.tar.lzma
+2021/12/26 |      57416 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin-x64.tar.lzma
+2021/12/26 |     591064 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-2.9.tar.lzma
+2021/12/26 |     629126 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-x64-2.9.tar.lzma
+2021/12/26 |      39745 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-2.9.tar.lzma
+2021/12/26 |      43683 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-x64-2.9.tar.lzma
+2021/12/26 |     256876 | systems/win32/miktex/tm/packages/next/miktex-zzdb1-2.9.tar.lzma
+2021/12/26 |    1398132 | systems/win32/miktex/tm/packages/next/miktex-zzdb2-2.9.tar.lzma
+2021/12/26 |    1294683 | systems/win32/miktex/tm/packages/next/miktex-zzdb3-2.9.tar.lzma
+2021/12/26 |      13510 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-2.9.tar.lzma
+2021/12/26 |      14416 | 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/12/25 |       1153 | systems/win32/miktex/tm/packages/next/pr.ini
+2021/12/26 |       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
@@ -298115,7 +298128,7 @@
 2020/10/20 |     342254 | systems/win32/miktex/tm/packages/preview.tar.lzma
 2019/06/20 |     375963 | systems/win32/miktex/tm/packages/prftree.tar.lzma
 2021/04/23 |     274028 | systems/win32/miktex/tm/packages/principia.tar.lzma
-2021/12/25 |        965 | systems/win32/miktex/tm/packages/pr.ini
+2021/12/26 |        965 | 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
@@ -299824,7 +299837,7 @@
 2004/06/04 |        404 | tds/tds.sed
 2004/06/23 |      65418 | tds/tds.tex
 2019/05/29 |     304264 | tds.zip
-2021/12/26 |        186 | timestamp
+2021/12/27 |        186 | timestamp
 2002/08/26 |      61898 | usergrps/dante/antrag.pdf
 2002/08/26 |     118217 | usergrps/dante/antrag.ps
 2021/11/11 |        917 | usergrps/dante/dtk/doc/beispiel.bib
diff --git a/FILES.byname.gz b/FILES.byname.gz
index e1a3528ff6..b0c82e5ab2 100644
--- a/FILES.byname.gz
+++ b/FILES.byname.gz
diff --git a/FILES.last07days b/FILES.last07days
index d0f5af6812..f82ce40942 100644
--- a/FILES.last07days
+++ b/FILES.last07days
@@ -1,8 +1,268 @@
+2021/12/26 |      99759 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-2.9.tar.lzma
+2021/12/26 |       9955 | macros/latex/contrib/asmeconf/examples/asmeconf-lualatex-ode-example.tex
+2021/12/26 |      99372 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-2.9.tar.lzma
+2021/12/26 |      97104 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-2.9.tar.lzma
+2021/12/26 |      96827 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-2.9.tar.lzma
+2021/12/26 |        965 | systems/win32/miktex/tm/packages/pr.ini
+2021/12/26 |     959950 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-2.9.tar.lzma
+2021/12/26 |       9592 | systems/texlive/tlnet/archive/minted.r61405.tar.xz
+2021/12/26 |      95449 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-2.9.tar.lzma
+2021/12/26 |      95274 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-x64-2.9.tar.lzma
+2021/12/26 |      93989 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-2.9.tar.lzma
+2021/12/26 |       9157 | macros/latex/contrib/asmeconf/README.md
+2021/12/26 |    9152100 | systems/texlive/tlnet/archive/pstricks-add.doc.r61407.tar.xz
+2021/12/26 |        888 | macros/latex/contrib/codebox/hellopy.py
+2021/12/26 |      88313 | macros/latex/contrib/asmeconf/asmeconf.cls
+2021/12/26 |      88228 | systems/win32/miktex/tm/packages/next/miktex-png-bin-x64-2.9.tar.lzma
+2021/12/26 |       8790 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-x64-2.9.tar.lzma
+2021/12/26 |     875831 | macros/latex/contrib/asmejour.zip
+2021/12/26 |      86768 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-2.9.tar.lzma
+2021/12/26 |      84780 | macros/latex/contrib/easybook/easybook.tex
+2021/12/26 |      83394 | macros/latex/contrib/easybook/easybook.dtx
+2021/12/26 |     824229 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-x64-2.9.tar.lzma
+2021/12/26 |     824148 | systems/texlive/tlnet/archive/minted.doc.r61405.tar.xz
+2021/12/26 |      81707 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-x64-2.9.tar.lzma
+2021/12/26 |      79137 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-x64-2.9.tar.lzma
+2021/12/26 |       7900 | macros/latex/contrib/asmejour/README.md
+2021/12/26 |      78962 | systems/win32/miktex/tm/packages/next/miktex-png-bin-2.9.tar.lzma
+2021/12/26 |       7756 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-2.9.tar.lzma
+2021/12/26 |      77433 | macros/latex/contrib/termsim/termsim-doc-en.pdf
+2021/12/26 |      77072 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-x64-2.9.tar.lzma
+2021/12/26 |     763148 | systems/win32/miktex/tm/packages/next/miktex-ptex-bin-x64-2.9.tar.lzma
+2021/12/26 |     762930 | systems/win32/miktex/tm/packages/next/miktex-ptex-bin-x64.tar.lzma
+2021/12/26 |      76231 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-x64-2.9.tar.lzma
+2021/12/26 |     753825 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-2.9.tar.lzma
+2021/12/26 |      74622 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-x64-2.9.tar.lzma
+2021/12/26 |      74054 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-x64-2.9.tar.lzma
+2021/12/26 |      73599 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-2.9.tar.lzma
+2021/12/26 |      73180 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-x64-2.9.tar.lzma
+2021/12/26 |      72850 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-x64-2.9.tar.lzma
+2021/12/26 |      72256 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-2.9.tar.lzma
+2021/12/26 |      71896 | systems/win32/miktex/tm/packages/next/miktex-web-bin-x64-2.9.tar.lzma
+2021/12/26 |      70993 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-x64-2.9.tar.lzma
+2021/12/26 |      69553 | macros/latex/contrib/codebox/codebox-doc-en.pdf
+2021/12/26 |     694124 | systems/win32/miktex/tm/packages/next/miktex-ptex-bin-2.9.tar.lzma
+2021/12/26 |     693756 | systems/win32/miktex/tm/packages/next/miktex-ptex-bin.tar.lzma
+2021/12/26 |      68799 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-2.9.tar.lzma
+2021/12/26 |      68619 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-2.9.tar.lzma
+2021/12/26 |     682341 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-x64-2.9.tar.lzma
+2021/12/26 |    6811294 | systems/texlive/tlnet/install-tl-unx.tar.gz
+2021/12/26 |      67994 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-2.9.tar.lzma
+2021/12/26 |      67857 | systems/win32/miktex/tm/packages/next/miktex-web-bin-2.9.tar.lzma
+2021/12/26 |      67188 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-x64-2.9.tar.lzma
+2021/12/26 |     670642 | macros/latex/contrib/asmejour/asmejour-template.pdf
+2021/12/26 |    6537272 | systems/texlive/tlnet/archive/newtx.r61408.tar.xz
+2021/12/26 |      64715 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-2.9.tar.lzma
+2021/12/26 |      64567 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-2.9.tar.lzma
+2021/12/26 |      64516 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-2.9.tar.lzma
+2021/12/26 |      64452 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-2.9.tar.lzma
+2021/12/26 |     643458 | macros/latex/contrib/asmeconf/asmeconf-template.pdf
+2021/12/26 |     639103 | macros/latex/contrib/asmeconf/examples/asmeconf-authorgrid-example.pdf
+2021/12/26 |     637591 | macros/latex/contrib/easybook.zip
+2021/12/26 |      63699 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-x64.tar.lzma
+2021/12/26 |     633692 | systems/texlive/tlnet/archive/newtx.doc.r61408.tar.xz
+2021/12/26 |      63313 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-x64-2.9.tar.lzma
+2021/12/26 |     631001 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-2.9.tar.lzma
+2021/12/26 |     630565 | systems/win32/miktex/tm/packages/files.csv.lzma
+2021/12/26 |     630358 | systems/win32/miktex/tm/packages/next/files.csv.lzma
+2021/12/26 |     629126 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-x64-2.9.tar.lzma
+2021/12/26 |      62710 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-x64-2.9.tar.lzma
+2021/12/26 |      62420 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-x64-2.9.tar.lzma
+2021/12/26 |     599046 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-x64-2.9.tar.lzma
+2021/12/26 |    5953884 | info/visualfaq-fr.zip
+2021/12/26 |     594563 | macros/latex/contrib/easybook/easybook.pdf
+2021/12/26 |     591064 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-2.9.tar.lzma
+2021/12/26 |      58642 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-2.9.tar.lzma
+2021/12/26 |      58547 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-x64-2.9.tar.lzma
+2021/12/26 |      58370 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-x64-2.9.tar.lzma
+2021/12/26 |      57566 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin.tar.lzma
+2021/12/26 |      57416 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin-x64.tar.lzma
+2021/12/26 |      57408 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-x64-2.9.tar.lzma
+2021/12/26 |      57278 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-x64-2.9.tar.lzma
+2021/12/26 |      56963 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-2.9.tar.lzma
+2021/12/26 |     566759 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-x64-2.9.tar.lzma
+2021/12/26 |      55725 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin.tar.lzma
+2021/12/26 |      55294 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-2.9.tar.lzma
+2021/12/26 |      54950 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-2.9.tar.lzma
+2021/12/26 |     532337 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-2.9.tar.lzma
+2021/12/26 |     528531 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-x64-2.9.tar.lzma
+2021/12/26 |      52573 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-x64-2.9.tar.lzma
+2021/12/26 |      52279 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-x64-2.9.tar.lzma
+2021/12/26 |      52095 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-x64-2.9.tar.lzma
+2021/12/26 |      51588 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-2.9.tar.lzma
+2021/12/26 |      51430 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-2.9.tar.lzma
+2021/12/26 |      50852 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-2.9.tar.lzma
+2021/12/26 |      50732 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-2.9.tar.lzma
+2021/12/26 |         48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
+2021/12/26 |      48803 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-x64-2.9.tar.lzma
+2021/12/26 |     484479 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-2.9.tar.lzma
+2021/12/26 |      47893 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-x64-2.9.tar.lzma
+2021/12/26 |     477727 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-2.9.tar.lzma
+2021/12/26 |      46135 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-2.9.tar.lzma
+2021/12/26 |     461238 | systems/win32/miktex/tm/packages/next/miktex-doc.tar.lzma
+2021/12/26 |      45731 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-2.9.tar.lzma
+2021/12/26 |      45728 | macros/latex/contrib/termsim/termsim.dtx
+2021/12/26 |      45687 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-x64-2.9.tar.lzma
+2021/12/26 |        455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
+2021/12/26 |        455 | systems/texlive/tlnet/install-tl.zip.sha512.asc
+2021/12/26 |        455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
+2021/12/26 |        455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
+2021/12/26 |      45492 | systems/texlive/tlnet/archive/minted.source.r61405.tar.xz
+2021/12/26 |      44075 | macros/latex/contrib/asmejour/asmejour.cls
+2021/12/26 |      43894 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-x64-2.9.tar.lzma
+2021/12/26 |      43809 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-x64-2.9.tar.lzma
+2021/12/26 |      43683 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-x64-2.9.tar.lzma
+2021/12/26 |      43637 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-2.9.tar.lzma
+2021/12/26 |      43275 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-2.9.tar.lzma
+2021/12/26 |      42772 | macros/latex/contrib/asmejour/asmejour-template.tex
+2021/12/26 |      42766 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-2.9.tar.lzma
+2021/12/26 |      42180 | macros/latex/contrib/asmeconf/asmeconf-template.tex
+2021/12/26 |      42105 | macros/latex/contrib/asmeconf/examples/asmeconf-authorgrid-example.tex
+2021/12/26 |      41326 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-2.9.tar.lzma
+2021/12/26 |      41220 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin-x64.tar.lzma
+2021/12/26 |      41202 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin-x64.tar.lzma
+2021/12/26 |     404704 | macros/latex/contrib/termsim.zip
+2021/12/26 |     402264 | systems/texlive/tlnet/archive/texlive-scripts.doc.r61403.tar.xz
+2021/12/26 |      39745 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-2.9.tar.lzma
+2021/12/26 |     394270 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-x64-2.9.tar.lzma
+2021/12/26 |      38541 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-2.9.tar.lzma
+2021/12/26 |      38460 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-2.9.tar.lzma
+2021/12/26 |       3759 | macros/latex/contrib/termsim/README.md
+2021/12/26 |      37373 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-x64-2.9.tar.lzma
+2021/12/26 |      37151 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin.tar.lzma
+2021/12/26 |      37092 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-x64-2.9.tar.lzma
+2021/12/26 |     370592 | macros/latex/contrib/asmeconf/examples/asmeconf-fontspec.pdf
+2021/12/26 |     365836 | macros/latex/contrib/codebox.zip
+2021/12/26 |      36041 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin.tar.lzma
+2021/12/26 |      35263 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-x64-2.9.tar.lzma
+2021/12/26 |      35256 | macros/latex/contrib/codebox/codebox.dtx
+2021/12/26 |      35167 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-x64-2.9.tar.lzma
+2021/12/26 |     351558 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-x64-2.9.tar.lzma
+2021/12/26 |    3436552 | info/visualfaq-fr/visualFAQ-fr.pdf
+2021/12/26 |      34090 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-x64-2.9.tar.lzma
+2021/12/26 |     332374 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-2.9.tar.lzma
+2021/12/26 |       3313 | info/visualfaq-fr/source/README
+2021/12/26 |      32990 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-2.9.tar.lzma
+2021/12/26 |       3274 | macros/latex/contrib/codebox/README.md
+2021/12/26 |     326387 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-x64-2.9.tar.lzma
+2021/12/26 |      32155 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-x64-2.9.tar.lzma
+2021/12/26 |     320848 | systems/texlive/tlnet/archive/biblatex-apa.doc.r61406.tar.xz
+2021/12/26 |     318734 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-2.9.tar.lzma
+2021/12/26 |      31579 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-2.9.tar.lzma
+2021/12/26 |      31539 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-x64-2.9.tar.lzma
+2021/12/26 |      31411 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-2.9.tar.lzma
+2021/12/26 |      31333 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-x64-2.9.tar.lzma
+2021/12/26 |     313173 | macros/latex/contrib/termsim/termsim.pdf
+2021/12/26 |      30567 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-x64-2.9.tar.lzma
+2021/12/26 |       3024 | info/visualfaq-fr/README
+2021/12/26 |      30180 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-2.9.tar.lzma
+2021/12/26 |     295888 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-x64-2.9.tar.lzma
+2021/12/26 |      29262 | macros/latex/contrib/termsim/ctxdoc-en.cls
+2021/12/26 |        289 | macros/latex/contrib/termsim/build.sh
+2021/12/26 |        289 | macros/latex/contrib/codebox/build.sh
+2021/12/26 |      28896 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-2.9.tar.lzma
+2021/12/26 |    2880413 | macros/latex/contrib/asmeconf.zip
+2021/12/26 |      28678 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-2.9.tar.lzma
+2021/12/26 |     286703 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-x64-2.9.tar.lzma
+2021/12/26 |    2859480 | systems/texlive/tlnet/archive/newpx.r61404.tar.xz
+2021/12/26 |      28545 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-x64-2.9.tar.lzma
+2021/12/26 |     285455 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-2.9.tar.lzma
+2021/12/26 |      28385 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-2.9.tar.lzma
+2021/12/26 |     281442 | systems/win32/miktex/tm/packages/next/miktex-console-bin-x64-2.9.tar.lzma
+2021/12/26 |     280349 | macros/latex/contrib/asmeconf/examples/asmeconf-lualatex-ode-example.pdf
+2021/12/26 |     280271 | macros/latex/contrib/codebox/codebox.pdf
+2021/12/26 |    2798719 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-x64-2.9.tar.lzma
+2021/12/26 |      27502 | macros/latex/contrib/asmeconf/examples/asmeconf-fontspec.tex
+2021/12/26 |      27474 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-x64-2.9.tar.lzma
+2021/12/26 |      27262 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-2.9.tar.lzma
+2021/12/26 |      27243 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-2.9.tar.lzma
+2021/12/26 |      27172 | systems/texlive/tlnet/archive/biblatex-apa.r61406.tar.xz
+2021/12/26 |    2675897 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-2.9.tar.lzma
+2021/12/26 |     259274 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-2.9.tar.lzma
+2021/12/26 |     256876 | systems/win32/miktex/tm/packages/next/miktex-zzdb1-2.9.tar.lzma
+2021/12/26 |     256780 | systems/win32/miktex/tm/packages/miktex-zzdb1-2.9.tar.lzma
+2021/12/26 |      25671 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-2.9.tar.lzma
+2021/12/26 |   25631646 | systems/texlive/tlnet/install-tl.zip
+2021/12/26 |     256200 | systems/win32/miktex/tm/packages/next/miktex-console-bin-2.9.tar.lzma
+2021/12/26 |     256024 | systems/texlive/tlnet/archive/newpx.doc.r61404.tar.xz
+2021/12/26 |      25133 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-2.9.tar.lzma
+2021/12/26 |     251069 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-2.9.tar.lzma
+2021/12/26 |      25061 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-x64-2.9.tar.lzma
+2021/12/26 |     244963 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-x64-2.9.tar.lzma
+2021/12/26 |      24152 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-x64-2.9.tar.lzma
+2021/12/26 |      23931 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-x64-2.9.tar.lzma
+2021/12/26 |    2335968 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
+2021/12/26 |      22178 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-2.9.tar.lzma
+2021/12/26 |      21888 | systems/texlive/tlnet/archive/pstricks-add.r61407.tar.xz
+2021/12/26 |     215852 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-x64-2.9.tar.lzma
+2021/12/26 |      21371 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-2.9.tar.lzma
+2021/12/26 |     213460 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-x64-2.9.tar.lzma
+2021/12/26 |     209937 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-2.9.tar.lzma
+2021/12/26 |   20873611 | systems/texlive/tlnet/install-tl-windows.exe
+2021/12/26 |     203080 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-x64-2.9.tar.lzma
+2021/12/26 |     202237 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-x64-2.9.tar.lzma
+2021/12/26 |      20190 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-2.9.tar.lzma
+2021/12/26 |    2012704 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-x64-2.9.tar.lzma
+2021/12/26 |     200142 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-2.9.tar.lzma
+2021/12/26 |     199836 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-2.9.tar.lzma
+2021/12/26 |     199114 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-2.9.tar.lzma
+2021/12/26 |     197376 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-2.9.tar.lzma
+2021/12/26 |     196120 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-x64-2.9.tar.lzma
+2021/12/26 |      18927 | macros/latex/contrib/termsim/termsim-doc-en.tex
+2021/12/26 |      18487 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-x64-2.9.tar.lzma
+2021/12/26 |      18371 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-x64-2.9.tar.lzma
+2021/12/26 |     181559 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-2.9.tar.lzma
+2021/12/26 |     181466 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-x64-2.9.tar.lzma
+2021/12/26 |     179708 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-2.9.tar.lzma
+2021/12/26 |    1732472 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-2.9.tar.lzma
+2021/12/26 |     172343 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-x64-2.9.tar.lzma
+2021/12/26 |   17059142 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
+2021/12/26 |     168851 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-x64-2.9.tar.lzma
+2021/12/26 |      16566 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-2.9.tar.lzma
+2021/12/26 |      16521 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-2.9.tar.lzma
+2021/12/26 |     157439 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-2.9.tar.lzma
+2021/12/26 |     155285 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-x64-2.9.tar.lzma
+2021/12/26 |        153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
+2021/12/26 |        152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
+2021/12/26 |     152104 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-2.9.tar.lzma
+2021/12/26 |    1497475 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-x64-2.9.tar.lzma
+2021/12/26 |        145 | systems/texlive/tlnet/install-tl.zip.sha512
+2021/12/26 |        144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
+2021/12/26 |    1447745 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-x64-2.9.tar.lzma
+2021/12/26 |      14416 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-x64-2.9.tar.lzma
+2021/12/26 |     140180 | info/visualfaq-fr/source/visualFAQ-fr.tex
+2021/12/26 |    1398132 | systems/win32/miktex/tm/packages/next/miktex-zzdb2-2.9.tar.lzma
+2021/12/26 |    1396326 | systems/win32/miktex/tm/packages/miktex-zzdb2-2.9.tar.lzma
+2021/12/26 |     139309 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-x64-2.9.tar.lzma
+2021/12/26 |     135932 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-2.9.tar.lzma
+2021/12/26 |    1353497 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-2.9.tar.lzma
+2021/12/26 |      13510 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-2.9.tar.lzma
+2021/12/26 |     135071 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-x64-2.9.tar.lzma
+2021/12/26 |    1322402 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-x64-2.9.tar.lzma
+2021/12/26 |    1299135 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-2.9.tar.lzma
+2021/12/26 |    1294683 | systems/win32/miktex/tm/packages/next/miktex-zzdb3-2.9.tar.lzma
+2021/12/26 |    1293842 | systems/win32/miktex/tm/packages/miktex-zzdb3-2.9.tar.lzma
+2021/12/26 |     126741 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-2.9.tar.lzma
+2021/12/26 |        122 | macros/latex/contrib/codebox/hellojava.java
+2021/12/26 |     120296 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-2.9.tar.lzma
+2021/12/26 |         11 | info/visualfaq-fr/VERSION
+2021/12/26 |    1181004 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-2.9.tar.lzma
+2021/12/26 |     115671 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-x64-2.9.tar.lzma
+2021/12/26 |       1153 | systems/win32/miktex/tm/packages/next/pr.ini
+2021/12/26 |      11317 | macros/latex/contrib/codebox/codebox-doc-en.tex
+2021/12/26 |     113044 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-x64-2.9.tar.lzma
+2021/12/26 |     112482 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-x64-2.9.tar.lzma
+2021/12/26 |     109545 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-x64-2.9.tar.lzma
+2021/12/26 |     109263 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-x64-2.9.tar.lzma
+2021/12/26 |    1087070 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-x64-2.9.tar.lzma
+2021/12/26 |     108268 | systems/texlive/tlnet/archive/texlive-scripts.r61403.tar.xz
+2021/12/26 |        104 | macros/latex/contrib/codebox/test.c
+2021/12/26 |     104747 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-x64-2.9.tar.lzma
+2021/12/26 |     103462 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-x64-2.9.tar.lzma
+2021/12/26 |     101510 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-2.9.tar.lzma
 2021/12/25 |       9985 | graphics/pstricks/contrib/pstricks-add/doc/data/data.data
-2021/12/25 |      99760 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-2.9.tar.lzma
 2021/12/25 |       9972 | fonts/newpx/tfm/zpl-BoldItalic-lf-scl-t1.tfm
 2021/12/25 |       9956 | fonts/newpx/tfm/zpl-BoldItalic-osf-scl-t1.tfm
-2021/12/25 |      99373 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-2.9.tar.lzma
 2021/12/25 |       9916 | fonts/newpx/tfm/zpl-BoldItalic-tlf-scl-t1.tfm
 2021/12/25 |       9912 | fonts/newpx/tfm/zpl-BoldItalic-tosf-scl-t1.tfm
 2021/12/25 |       9900 | fonts/newpx/tfm/zpl-BoldItalic-lf-sc-t1.tfm
@@ -11,22 +271,12 @@
 2021/12/25 |       9840 | fonts/newpx/tfm/zpl-BoldItalic-tosf-sc-t1.tfm
 2021/12/25 |     982832 | systems/texlive/tlnet/archive/europecv.doc.r61398.tar.xz
 2021/12/25 |       9788 | systems/texlive/tlnet/archive/termsim.source.r61399.tar.xz
-2021/12/25 |      97105 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-2.9.tar.lzma
 2021/12/25 |       9684 | fonts/newpx/tfm/zpl-BoldItalic-lf-t1.tfm
-2021/12/25 |      96828 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-2.9.tar.lzma
 2021/12/25 |       9672 | fonts/newpx/tfm/zpl-BoldItalic-osf-t1.tfm
-2021/12/25 |        965 | systems/win32/miktex/tm/packages/pr.ini
 2021/12/25 |       9628 | fonts/newpx/tfm/zpl-BoldItalic-tlf-t1.tfm
 2021/12/25 |       9624 | fonts/newpx/tfm/zpl-BoldItalic-tosf-t1.tfm
-2021/12/25 |     959950 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-2.9.tar.lzma
-2021/12/25 |      95448 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-2.9.tar.lzma
-2021/12/25 |      95274 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-x64-2.9.tar.lzma
 2021/12/25 |    9514335 | fonts/newtx.zip
-2021/12/25 |      93990 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-2.9.tar.lzma
 2021/12/25 |      91089 | graphics/pstricks/contrib/pstricks-add/tex/pstricks-add.tex
-2021/12/25 |      88227 | systems/win32/miktex/tm/packages/next/miktex-png-bin-x64-2.9.tar.lzma
-2021/12/25 |       8791 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-x64-2.9.tar.lzma
-2021/12/25 |      86768 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-2.9.tar.lzma
 2021/12/25 |       8372 | fonts/newpx/tfm/ztm-BoldItalic-osf-sc-ly1.tfm
 2021/12/25 |       8372 | fonts/newpx/tfm/ztm-BoldItalic-lf-sc-ly1.tfm
 2021/12/25 |       8336 | fonts/newpx/tfm/ztm-BoldItalic-tlf-sc-ly1.tfm
@@ -35,7 +285,6 @@
 2021/12/25 |       8292 | fonts/newpx/tfm/zpl-Slanted-osf-sc-ly1.tfm
 2021/12/25 |       8252 | fonts/newpx/tfm/zpl-Slanted-tosf-sc-ly1.tfm
 2021/12/25 |       8252 | fonts/newpx/tfm/zpl-Slanted-tlf-sc-ly1.tfm
-2021/12/25 |     824229 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-x64-2.9.tar.lzma
 2021/12/25 |       8220 | fonts/newpx/tfm/zpl-BoldSlanted-lf-sc-ly1.tfm
 2021/12/25 |       8208 | fonts/newpx/tfm/zpl-BoldSlanted-osf-sc-ly1.tfm
 2021/12/25 |       8196 | fonts/newpx/tfm/zpl-Italic-lf-scl-ly1.tfm
@@ -44,7 +293,6 @@
 2021/12/25 |       8176 | fonts/newpx/tfm/zpl-BoldSlanted-tosf-sc-ly1.tfm
 2021/12/25 |       8176 | fonts/newpx/tfm/zpl-BoldSlanted-tlf-sc-ly1.tfm
 2021/12/25 |       8172 | fonts/newpx/tfm/zpl-Italic-osf-sc-ly1.tfm
-2021/12/25 |      81707 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-x64-2.9.tar.lzma
 2021/12/25 |       8144 | fonts/newpx/tfm/zpl-Italic-tosf-scl-ly1.tfm
 2021/12/25 |       8144 | fonts/newpx/tfm/zpl-Italic-tlf-scl-ly1.tfm
 2021/12/25 |       8132 | fonts/newpx/tfm/zpl-Italic-tlf-sc-ly1.tfm
@@ -72,44 +320,31 @@
 2021/12/25 |       7960 | fonts/newpx/tfm/zpl-Bold-tlf-sc-ly1.tfm
 2021/12/25 |       7940 | fonts/newpx/tfm/zpl-Slanted-lf-ly1.tfm
 2021/12/25 |       7936 | fonts/newpx/tfm/zpl-Slanted-osf-ly1.tfm
-2021/12/25 |      79138 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-x64-2.9.tar.lzma
 2021/12/25 |       7900 | fonts/newpx/tfm/zpl-Slanted-tosf-ly1.tfm
 2021/12/25 |       7900 | fonts/newpx/tfm/zpl-Slanted-tlf-ly1.tfm
-2021/12/25 |      78962 | systems/win32/miktex/tm/packages/next/miktex-png-bin-2.9.tar.lzma
 2021/12/25 |       7816 | fonts/newpx/tfm/ztm-Regular-lf-sc-ly1.tfm
 2021/12/25 |       7812 | fonts/newpx/tfm/ztm-Regular-osf-sc-ly1.tfm
 2021/12/25 |       7784 | fonts/newpx/tfm/ztm-Regular-tosf-sc-ly1.tfm
 2021/12/25 |       7784 | fonts/newpx/tfm/ztm-Regular-tlf-sc-ly1.tfm
-2021/12/25 |       7756 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-2.9.tar.lzma
 2021/12/25 |       7752 | fonts/newpx/tfm/ztm-Bold-lf-sc-ly1.tfm
 2021/12/25 |       7748 | fonts/newpx/tfm/ztm-Bold-osf-sc-ly1.tfm
 2021/12/25 |       7720 | fonts/newpx/tfm/ztm-Bold-tosf-sc-ly1.tfm
 2021/12/25 |       7720 | fonts/newpx/tfm/ztm-Bold-tlf-sc-ly1.tfm
 2021/12/25 |       7712 | fonts/newpx/tfm/zpl-Regular-lf-ly1.tfm
 2021/12/25 |       7708 | fonts/newpx/tfm/zpl-Regular-osf-ly1.tfm
-2021/12/25 |      77072 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-x64-2.9.tar.lzma
 2021/12/25 |       7672 | fonts/newpx/tfm/zpl-Regular-tosf-ly1.tfm
 2021/12/25 |       7672 | fonts/newpx/tfm/zpl-Regular-tlf-ly1.tfm
-2021/12/25 |     763148 | systems/win32/miktex/tm/packages/next/miktex-ptex-bin-x64-2.9.tar.lzma
-2021/12/25 |     762929 | systems/win32/miktex/tm/packages/next/miktex-ptex-bin-x64.tar.lzma
-2021/12/25 |      76233 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-x64-2.9.tar.lzma
-2021/12/25 |     753827 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-2.9.tar.lzma
 2021/12/25 |       7516 | fonts/newpx/tfm/zpl-Italic-lf-ly1.tfm
 2021/12/25 |       7504 | fonts/newpx/tfm/zpl-Italic-osf-ly1.tfm
-2021/12/25 |      74620 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-x64-2.9.tar.lzma
 2021/12/25 |       7456 | fonts/newpx/tfm/zpl-Italic-tlf-ly1.tfm
 2021/12/25 |       7452 | fonts/newpx/tfm/zpl-Italic-tosf-ly1.tfm
 2021/12/25 |       7436 | fonts/newpx/tfm/zplth-Italic-osf-ly1.tfm
-2021/12/25 |      74054 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-x64-2.9.tar.lzma
 2021/12/25 |       7404 | fonts/newpx/tfm/zpl-BoldSlanted-lf-ly1.tfm
 2021/12/25 |       7392 | fonts/newpx/tfm/zpl-BoldSlanted-osf-ly1.tfm
 2021/12/25 |       7388 | fonts/newpx/tfm/zplth-Italic-tlf-ly1.tfm
 2021/12/25 |       7360 | fonts/newpx/tfm/zpl-BoldSlanted-tosf-ly1.tfm
 2021/12/25 |       7360 | fonts/newpx/tfm/zpl-BoldSlanted-tlf-ly1.tfm
-2021/12/25 |      73597 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-2.9.tar.lzma
-2021/12/25 |      73180 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-x64-2.9.tar.lzma
 2021/12/25 |        728 | graphics/pstricks/contrib/pstricks-add/doc/data/matrix2.data
-2021/12/25 |      72851 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-x64-2.9.tar.lzma
 2021/12/25 |       7284 | fonts/newpx/tfm/ztm-Regular-lf-ly1.tfm
 2021/12/25 |       7280 | fonts/newpx/tfm/ztm-Regular-osf-ly1.tfm
 2021/12/25 |       7264 | fonts/newpx/tfm/ztm-Bold-lf-ly1.tfm
@@ -120,11 +355,9 @@
 2021/12/25 |       7252 | fonts/newpx/tfm/ztm-Regular-tlf-ly1.tfm
 2021/12/25 |       7232 | fonts/newpx/tfm/ztm-Bold-tosf-ly1.tfm
 2021/12/25 |       7232 | fonts/newpx/tfm/ztm-Bold-tlf-ly1.tfm
-2021/12/25 |      72252 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-2.9.tar.lzma
 2021/12/25 |       7216 | fonts/newpx/tfm/ztm-BoldItalic-tlf-ly1.tfm
 2021/12/25 |       7212 | fonts/newpx/tfm/ztm-BoldItalic-tosf-ly1.tfm
 2021/12/25 |       7192 | fonts/newpx/tfm/ztm-Italic-lf-ly1.tfm
-2021/12/25 |      71897 | systems/win32/miktex/tm/packages/next/miktex-web-bin-x64-2.9.tar.lzma
 2021/12/25 |       7184 | fonts/newpx/tfm/zpl-Bold-lf-ly1.tfm
 2021/12/25 |       7180 | fonts/newpx/tfm/ztm-Italic-osf-ly1.tfm
 2021/12/25 |       7172 | fonts/newpx/tfm/zpl-Bold-osf-ly1.tfm
@@ -132,119 +365,48 @@
 2021/12/25 |       7144 | fonts/newpx/tfm/ztm-Italic-tlf-ly1.tfm
 2021/12/25 |       7140 | fonts/newpx/tfm/zpl-Bold-tosf-ly1.tfm
 2021/12/25 |       7140 | fonts/newpx/tfm/zpl-Bold-tlf-ly1.tfm
-2021/12/25 |      70994 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-x64-2.9.tar.lzma
-2021/12/25 |     694125 | systems/win32/miktex/tm/packages/next/miktex-ptex-bin-2.9.tar.lzma
-2021/12/25 |     693756 | systems/win32/miktex/tm/packages/next/miktex-ptex-bin.tar.lzma
-2021/12/25 |      68801 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-2.9.tar.lzma
-2021/12/25 |      68617 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-2.9.tar.lzma
-2021/12/25 |     682340 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-x64-2.9.tar.lzma
-2021/12/25 |    6811319 | systems/texlive/tlnet/install-tl-unx.tar.gz
-2021/12/25 |      67994 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-2.9.tar.lzma
-2021/12/25 |      67857 | systems/win32/miktex/tm/packages/next/miktex-web-bin-2.9.tar.lzma
 2021/12/25 |       6780 | fonts/newpx/tfm/zpl-BoldItalic-lf-scl-ly1.tfm
 2021/12/25 |       6760 | fonts/newpx/tfm/zpl-BoldItalic-osf-scl-ly1.tfm
+2021/12/25 |       6738 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
 2021/12/25 |       6720 | fonts/newpx/tfm/zpl-BoldItalic-tlf-scl-ly1.tfm
-2021/12/25 |      67188 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-x64-2.9.tar.lzma
 2021/12/25 |       6716 | fonts/newpx/tfm/zpl-BoldItalic-tosf-scl-ly1.tfm
 2021/12/25 |       6712 | fonts/newpx/tfm/zpl-BoldItalic-lf-sc-ly1.tfm
 2021/12/25 |       6688 | fonts/newpx/tfm/zpl-BoldItalic-osf-sc-ly1.tfm
 2021/12/25 |       6652 | fonts/newpx/tfm/zpl-BoldItalic-tlf-sc-ly1.tfm
 2021/12/25 |       6648 | fonts/newpx/tfm/zpl-BoldItalic-tosf-sc-ly1.tfm
-2021/12/25 |      64716 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-2.9.tar.lzma
-2021/12/25 |      64568 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-2.9.tar.lzma
-2021/12/25 |      64516 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-2.9.tar.lzma
-2021/12/25 |      64453 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-2.9.tar.lzma
 2021/12/25 |        639 | graphics/pstricks/contrib/pstricks-add/latex/pstricks-add.sty
-2021/12/25 |      63700 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-x64.tar.lzma
-2021/12/25 |      63312 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-x64-2.9.tar.lzma
-2021/12/25 |     631000 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-2.9.tar.lzma
-2021/12/25 |     630565 | systems/win32/miktex/tm/packages/files.csv.lzma
 2021/12/25 |       6304 | fonts/newpx/tfm/zpl-BoldItalic-lf-ly1.tfm
-2021/12/25 |     630358 | systems/win32/miktex/tm/packages/next/files.csv.lzma
 2021/12/25 |       6292 | fonts/newpx/tfm/zpl-BoldItalic-osf-ly1.tfm
-2021/12/25 |     629125 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-x64-2.9.tar.lzma
-2021/12/25 |      62710 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-x64-2.9.tar.lzma
 2021/12/25 |       6248 | fonts/newpx/tfm/zpl-BoldItalic-tlf-ly1.tfm
 2021/12/25 |       6244 | fonts/newpx/tfm/zpl-BoldItalic-tosf-ly1.tfm
-2021/12/25 |      62418 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-x64-2.9.tar.lzma
 2021/12/25 |       6076 | fonts/newpx/tfm/zpl-Slanted-lf-scl-t1.tfm
 2021/12/25 |       6072 | fonts/newpx/tfm/zpl-Slanted-osf-scl-t1.tfm
 2021/12/25 |       6036 | fonts/newpx/tfm/zpl-Slanted-tosf-scl-t1.tfm
 2021/12/25 |       6036 | fonts/newpx/tfm/zpl-Slanted-tlf-scl-t1.tfm
 2021/12/25 |       6016 | fonts/newpx/tfm/zpl-BoldSlanted-lf-scl-t1.tfm
 2021/12/25 |       6008 | fonts/newpx/tfm/zpl-BoldSlanted-osf-scl-t1.tfm
-2021/12/25 |     599047 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-x64-2.9.tar.lzma
 2021/12/25 |       5980 | fonts/newpx/tfm/zpl-BoldSlanted-tosf-scl-t1.tfm
 2021/12/25 |       5980 | fonts/newpx/tfm/zpl-BoldSlanted-tlf-scl-t1.tfm
-2021/12/25 |     591064 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-2.9.tar.lzma
-2021/12/25 |      58641 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-2.9.tar.lzma
-2021/12/25 |      58546 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-x64-2.9.tar.lzma
-2021/12/25 |      58369 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-x64-2.9.tar.lzma
-2021/12/25 |      57566 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin.tar.lzma
-2021/12/25 |      57417 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin-x64.tar.lzma
-2021/12/25 |      57406 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-x64-2.9.tar.lzma
-2021/12/25 |      57277 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-x64-2.9.tar.lzma
-2021/12/25 |      56963 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-2.9.tar.lzma
-2021/12/25 |     566759 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-x64-2.9.tar.lzma
-2021/12/25 |      55722 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin.tar.lzma
-2021/12/25 |      55294 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-2.9.tar.lzma
-2021/12/25 |      54951 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-2.9.tar.lzma
-2021/12/25 |     532338 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-2.9.tar.lzma
-2021/12/25 |     528531 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-x64-2.9.tar.lzma
-2021/12/25 |      52572 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-x64-2.9.tar.lzma
-2021/12/25 |      52279 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-x64-2.9.tar.lzma
-2021/12/25 |      52094 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-x64-2.9.tar.lzma
 2021/12/25 |        516 | systems/texlive/tlnet/archive/dtk-bibliography.r61396.tar.xz
-2021/12/25 |      51587 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-2.9.tar.lzma
-2021/12/25 |      51431 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-2.9.tar.lzma
-2021/12/25 |      50853 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-2.9.tar.lzma
-2021/12/25 |      50733 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-2.9.tar.lzma
 2021/12/25 |       5069 | graphics/pstricks/contrib/pstricks-add/dvips/pstricks-add.pro
-2021/12/25 |         48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
-2021/12/25 |      48803 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-x64-2.9.tar.lzma
 2021/12/25 |    4859033 | fonts/newpx.zip
-2021/12/25 |     484479 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-2.9.tar.lzma
-2021/12/25 |      47893 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-x64-2.9.tar.lzma
-2021/12/25 |     477729 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-2.9.tar.lzma
-2021/12/25 |      46135 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-2.9.tar.lzma
-2021/12/25 |     461240 | systems/win32/miktex/tm/packages/next/miktex-doc.tar.lzma
-2021/12/25 |      45733 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-2.9.tar.lzma
-2021/12/25 |      45687 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-x64-2.9.tar.lzma
 2021/12/25 |       4561 | graphics/pstricks/contrib/pstricks-add/doc/pstricks-add-doc.bib
-2021/12/25 |        455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
-2021/12/25 |        455 | systems/texlive/tlnet/install-tl.zip.sha512.asc
-2021/12/25 |        455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
-2021/12/25 |        455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
-2021/12/25 |      43895 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-x64-2.9.tar.lzma
-2021/12/25 |      43809 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-x64-2.9.tar.lzma
-2021/12/25 |      43683 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-x64-2.9.tar.lzma
-2021/12/25 |      43639 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-2.9.tar.lzma
 2021/12/25 |       4336 | fonts/newpx/tfm/zpl-Slanted-lf-scl-ly1.tfm
 2021/12/25 |       4328 | fonts/newpx/tfm/zpl-Slanted-osf-scl-ly1.tfm
-2021/12/25 |      43275 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-2.9.tar.lzma
 2021/12/25 |       4304 | fonts/newpx/tfm/zpl-BoldSlanted-lf-scl-ly1.tfm
 2021/12/25 |        429 | graphics/pstricks/contrib/pstricks-add/doc/data/dataMul.data
 2021/12/25 |       4292 | fonts/newpx/tfm/zpl-Slanted-tosf-scl-ly1.tfm
 2021/12/25 |       4292 | fonts/newpx/tfm/zpl-Slanted-tlf-scl-ly1.tfm
 2021/12/25 |       4292 | fonts/newpx/tfm/zpl-BoldSlanted-osf-scl-ly1.tfm
-2021/12/25 |      42767 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-2.9.tar.lzma
 2021/12/25 |     426648 | systems/texlive/tlnet/archive/dtk-bibliography.doc.r61396.tar.xz
 2021/12/25 |       4260 | fonts/newpx/tfm/zpl-BoldSlanted-tosf-scl-ly1.tfm
 2021/12/25 |       4260 | fonts/newpx/tfm/zpl-BoldSlanted-tlf-scl-ly1.tfm
 2021/12/25 |        420 | graphics/pstricks/contrib/pstricks-add/doc/data/demo0.data
-2021/12/25 |      41326 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-2.9.tar.lzma
-2021/12/25 |      41219 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin-x64.tar.lzma
-2021/12/25 |      41203 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin-x64.tar.lzma
 2021/12/25 |      40546 | systems/win32/miktex/tm/packages/ptex-fontmaps.tar.lzma
 2021/12/25 |     405245 | macros/latex/contrib/biblatex-contrib/biblatex-apa.zip
 2021/12/25 |       4028 | systems/texlive/tlnet/archive/termsim.r61399.tar.xz
-2021/12/25 |     402028 | systems/texlive/tlnet/archive/texlive-scripts.doc.r61394.tar.xz
-2021/12/25 |      39745 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-2.9.tar.lzma
-2021/12/25 |     394272 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-x64-2.9.tar.lzma
 2021/12/25 |      39052 | systems/texlive/tlnet/archive/europecv.r61398.tar.xz
 2021/12/25 |      38765 | graphics/pstricks/contrib/pstricks-add/doc/data/olympic.eps
-2021/12/25 |      38542 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-2.9.tar.lzma
-2021/12/25 |      38461 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-2.9.tar.lzma
 2021/12/25 |       3840 | fonts/newpx/tfm/npxsups-Italic-ly1.tfm
 2021/12/25 |       3828 | fonts/newpx/tfm/npxsups-BoldItalic-ly1.tfm
 2021/12/25 |       3784 | fonts/newpx/tfm/npxsups-Italic-t1.tfm
@@ -252,13 +414,9 @@
 2021/12/25 |       3776 | fonts/newpx/tfm/npxsups-BoldItalic-t1.tfm
 2021/12/25 |     377608 | systems/texlive/tlnet/archive/erewhon.doc.r61395.tar.xz
 2021/12/25 |       3764 | fonts/newpx/tfm/npxsups-Regular-ly1.tfm
-2021/12/25 |      37375 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-x64-2.9.tar.lzma
-2021/12/25 |      37152 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin.tar.lzma
-2021/12/25 |      37092 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-x64-2.9.tar.lzma
 2021/12/25 |       3704 | fonts/newpx/tfm/npxsups-Regular-t1.tfm
 2021/12/25 |       3672 | fonts/newpx/tfm/npxsups-Bold-ly1.tfm
 2021/12/25 |       3616 | fonts/newpx/tfm/npxsups-Bold-t1.tfm
-2021/12/25 |      36043 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin.tar.lzma
 2021/12/25 |       3600 | fonts/newpx/tfm/zpl-Slanted-lf-sc-ot1.tfm
 2021/12/25 |       3592 | fonts/newpx/tfm/zpl-Slanted-osf-sc-ot1.tfm
 2021/12/25 |       3576 | fonts/newpx/tfm/zpl-BoldSlanted-lf-sc-ot1.tfm
@@ -272,12 +430,9 @@
 2021/12/25 |       3540 | fonts/newpx/tfm/zpl-Italic-osf-sc-ot1.tfm
 2021/12/25 |       3532 | fonts/newpx/tfm/zpl-Italic-osf-scl-ot1.tfm
 2021/12/25 |       3528 | fonts/newpx/tfm/zpl-BoldSlanted-tosf-sc-ot1.tfm
-2021/12/25 |      35263 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-x64-2.9.tar.lzma
 2021/12/25 |       3524 | fonts/newpx/tfm/zpl-BoldSlanted-tlf-sc-ot1.tfm
 2021/12/25 |       3516 | fonts/newpx/tfm/zpl-Slanted-tosf-ot1.tfm
 2021/12/25 |       3516 | fonts/newpx/tfm/zpl-Slanted-tlf-ot1.tfm
-2021/12/25 |      35165 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-x64-2.9.tar.lzma
-2021/12/25 |     351560 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-x64-2.9.tar.lzma
 2021/12/25 |       3504 | fonts/newpx/tfm/ztm-Italic-lf-sc-ot1.tfm
 2021/12/25 |       3496 | fonts/newpx/tfm/zpl-Italic-tlf-sc-ot1.tfm
 2021/12/25 |       3496 | fonts/newpx/tfm/zpl-Italic-tlf-scl-ot1.tfm
@@ -290,7 +445,6 @@
 2021/12/25 |       3444 | fonts/newpx/tfm/ztm-BoldItalic-tosf-sc-ot1.tfm
 2021/12/25 |       3432 | fonts/newpx/tfm/ztm-Italic-tlf-sc-ot1.tfm
 2021/12/25 |       3428 | fonts/newpx/tfm/ztm-Italic-tosf-sc-ot1.tfm
-2021/12/25 |      34090 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-x64-2.9.tar.lzma
 2021/12/25 |       3364 | fonts/newpx/tfm/zpl-Bold-lf-scl-ot1.tfm
 2021/12/25 |       3360 | fonts/newpx/tfm/zpl-Regular-lf-scl-ot1.tfm
 2021/12/25 |       3360 | fonts/newpx/tfm/zpl-Bold-osf-scl-ot1.tfm
@@ -301,7 +455,6 @@
 2021/12/25 |       3328 | fonts/newpx/tfm/zpl-Bold-tosf-scl-ot1.tfm
 2021/12/25 |       3328 | fonts/newpx/tfm/zpl-Bold-tlf-scl-ot1.tfm
 2021/12/25 |       3328 | fonts/newpx/tfm/zpl-Bold-osf-sc-ot1.tfm
-2021/12/25 |     332374 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-2.9.tar.lzma
 2021/12/25 |       3320 | fonts/newpx/tfm/zpl-Regular-tosf-scl-ot1.tfm
 2021/12/25 |       3320 | fonts/newpx/tfm/zpl-Regular-tlf-scl-ot1.tfm
 2021/12/25 |       3316 | fonts/newpx/tfm/zpl-Regular-lf-ot1r.tfm
@@ -310,12 +463,10 @@
 2021/12/25 |       3312 | fonts/newpx/tfm/npxsups-Italic-ot1.tfm
 2021/12/25 |       3308 | fonts/newpx/tfm/zpl-Regular-osf-ot1r.tfm
 2021/12/25 |       3308 | fonts/newpx/tfm/npxsups-BoldItalic-ot1.tfm
-2021/12/25 |      32992 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-2.9.tar.lzma
 2021/12/25 |       3296 | fonts/newpx/tfm/zpl-Bold-tosf-sc-ot1.tfm
 2021/12/25 |       3296 | fonts/newpx/tfm/zpl-Bold-tlf-sc-ot1.tfm
 2021/12/25 |       3276 | fonts/newpx/tfm/zpl-Regular-tosf-ot1r.tfm
 2021/12/25 |       3276 | fonts/newpx/tfm/zpl-Regular-tlf-ot1r.tfm
-2021/12/25 |     326388 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-x64-2.9.tar.lzma
 2021/12/25 |       3260 | fonts/newpx/tfm/zpl-Italic-lf-ot1.tfm
 2021/12/25 |       3260 | fonts/newpx/tfm/zpl-BoldSlanted-lf-ot1.tfm
 2021/12/25 |       3248 | fonts/newpx/tfm/zpl-BoldSlanted-osf-ot1.tfm
@@ -324,27 +475,21 @@
 2021/12/25 |       3216 | fonts/newpx/tfm/ztm-Regular-lf-sc-ot1.tfm
 2021/12/25 |       3216 | fonts/newpx/tfm/zpl-BoldSlanted-tosf-ot1.tfm
 2021/12/25 |       3216 | fonts/newpx/tfm/zpl-BoldSlanted-tlf-ot1.tfm
-2021/12/25 |      32155 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-x64-2.9.tar.lzma
 2021/12/25 |       3212 | fonts/newpx/tfm/ztm-Regular-osf-sc-ot1.tfm
 2021/12/25 |       3200 | fonts/newpx/tfm/zpl-Italic-tlf-ot1.tfm
 2021/12/25 |       3196 | fonts/newpx/tfm/zpl-Italic-tosf-ot1.tfm
 2021/12/25 |       3188 | fonts/newpx/tfm/zplth-Italic-osf-ot1.tfm
-2021/12/25 |     318732 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-2.9.tar.lzma
 2021/12/25 |       3180 | fonts/newpx/tfm/ztm-Regular-tosf-sc-ot1.tfm
 2021/12/25 |       3180 | fonts/newpx/tfm/ztm-Regular-tlf-sc-ot1.tfm
 2021/12/25 |       3180 | fonts/newpx/tfm/ztm-Bold-lf-sc-ot1.tfm
 2021/12/25 |       3176 | fonts/newpx/tfm/ztm-Bold-osf-sc-ot1.tfm
 2021/12/25 |       3168 | fonts/newpx/tfm/ztm-Italic-lf-ot1.tfm
-2021/12/25 |      31579 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-2.9.tar.lzma
 2021/12/25 |       3156 | fonts/newpx/tfm/npxsups-Bold-ot1.tfm
-2021/12/25 |      31539 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-x64-2.9.tar.lzma
 2021/12/25 |       3148 | fonts/newpx/tfm/zplth-Italic-tlf-ot1.tfm
 2021/12/25 |       3144 | fonts/newpx/tfm/ztm-Bold-tosf-sc-ot1.tfm
 2021/12/25 |       3144 | fonts/newpx/tfm/ztm-Bold-tlf-sc-ot1.tfm
 2021/12/25 |       3144 | fonts/newpx/tfm/ztm-BoldItalic-lf-ot1.tfm
-2021/12/25 |      31413 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-2.9.tar.lzma
 2021/12/25 |       3140 | fonts/newpx/tfm/ztm-BoldItalic-osf-ot1.tfm
-2021/12/25 |      31332 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-x64-2.9.tar.lzma
 2021/12/25 |       3132 | fonts/newpx/tfm/ztm-Italic-osf-ot1.tfm
 2021/12/25 |       3120 | fonts/newpx/tfm/zpl-BoldItalic-lf-scl-ot1.tfm
 2021/12/25 |     312053 | systems/win32/miktex/tm/packages/ptex-fontmaps__source.tar.lzma
@@ -358,14 +503,12 @@
 2021/12/25 |       3080 | fonts/newpx/tfm/zpl-BoldItalic-osf-sc-ot1.tfm
 2021/12/25 |       3064 | fonts/newpx/tfm/zpl-BoldItalic-tlf-scl-ot1.tfm
 2021/12/25 |       3060 | fonts/newpx/tfm/zpl-BoldItalic-tosf-scl-ot1.tfm
-2021/12/25 |      30568 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-x64-2.9.tar.lzma
 2021/12/25 |       3044 | fonts/newpx/tfm/zpl-BoldItalic-tlf-sc-ot1.tfm
 2021/12/25 |       3040 | fonts/newpx/tfm/ztm-Regular-lf-ot1r.tfm
 2021/12/25 |       3040 | fonts/newpx/tfm/zpl-BoldItalic-tosf-sc-ot1.tfm
 2021/12/25 |       3036 | fonts/newpx/tfm/ztm-Regular-osf-ot1r.tfm
 2021/12/25 |        302 | graphics/pstricks/contrib/pstricks-add/doc/data/demo1.data
 2021/12/25 |       3028 | fonts/newpx/tfm/zpl-Bold-lf-ot1.tfm
-2021/12/25 |      30179 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-2.9.tar.lzma
 2021/12/25 |       3016 | fonts/newpx/tfm/zpl-Bold-osf-ot1.tfm
 2021/12/25 |       3012 | fonts/newpx/tfm/ztm-Bold-lf-ot1.tfm
 2021/12/25 |       3008 | fonts/newpx/tfm/ztm-Bold-osf-ot1.tfm
@@ -375,110 +518,41 @@
 2021/12/25 |       2984 | fonts/newpx/tfm/zpl-Bold-tlf-ot1.tfm
 2021/12/25 |       2976 | fonts/newpx/tfm/ztm-Bold-tosf-ot1.tfm
 2021/12/25 |       2976 | fonts/newpx/tfm/ztm-Bold-tlf-ot1.tfm
-2021/12/25 |     295888 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-x64-2.9.tar.lzma
 2021/12/25 |     292234 | fonts/newpx/type1/zplb.pfb
 2021/12/25 |    2917275 | graphics/pstricks/contrib/pstricks-add/doc/data/pstricks-add-doc.data
-2021/12/25 |      28895 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-2.9.tar.lzma
 2021/12/25 |       2876 | graphics/pstricks/contrib/pstricks-add/doc/data/data3.data
-2021/12/25 |      28679 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-2.9.tar.lzma
-2021/12/25 |     286703 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-x64-2.9.tar.lzma
-2021/12/25 |     285454 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-2.9.tar.lzma
-2021/12/25 |      28544 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-x64-2.9.tar.lzma
 2021/12/25 |       2852 | fonts/newpx/tfm/zpl-BoldItalic-lf-ot1.tfm
 2021/12/25 |       2840 | fonts/newpx/tfm/zpl-BoldItalic-osf-ot1.tfm
 2021/12/25 |        283 | graphics/pstricks/contrib/pstricks-add/doc/data/olympic.tex
-2021/12/25 |      28386 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-2.9.tar.lzma
 2021/12/25 |        281 | graphics/pstricks/contrib/pstricks-add/doc/data/matrix1.data
-2021/12/25 |     281440 | systems/win32/miktex/tm/packages/next/miktex-console-bin-x64-2.9.tar.lzma
-2021/12/25 |    2798719 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-x64-2.9.tar.lzma
 2021/12/25 |       2796 | fonts/newpx/tfm/zpl-BoldItalic-tlf-ot1.tfm
 2021/12/25 |       2792 | fonts/newpx/tfm/zpl-BoldItalic-tosf-ot1.tfm
-2021/12/25 |      27473 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-x64-2.9.tar.lzma
-2021/12/25 |      27263 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-2.9.tar.lzma
-2021/12/25 |      27243 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-2.9.tar.lzma
 2021/12/25 |     270769 | fonts/newpx/type1/zplrsl.pfb
 2021/12/25 |     269572 | fonts/newpx/type1/zplbsl.pfb
 2021/12/25 |     267932 | fonts/newpx/type1/zplri.pfb
-2021/12/25 |    2675895 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-2.9.tar.lzma
 2021/12/25 |     266923 | fonts/newpx/type1/zplbi.pfb
-2021/12/25 |     259273 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-2.9.tar.lzma
-2021/12/25 |     256931 | systems/win32/miktex/tm/packages/next/miktex-zzdb1-2.9.tar.lzma
-2021/12/25 |     256789 | systems/win32/miktex/tm/packages/miktex-zzdb1-2.9.tar.lzma
-2021/12/25 |      25672 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-2.9.tar.lzma
-2021/12/25 |   25631674 | systems/texlive/tlnet/install-tl.zip
-2021/12/25 |     256199 | systems/win32/miktex/tm/packages/next/miktex-console-bin-2.9.tar.lzma
 2021/12/25 |    2558852 | systems/texlive/tlnet/archive/erewhon.r61395.tar.xz
 2021/12/25 |      25464 | systems/texlive/tlnet/archive/bfh-ci.r61397.tar.xz
-2021/12/25 |      25134 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-2.9.tar.lzma
-2021/12/25 |     251068 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-2.9.tar.lzma
-2021/12/25 |      25061 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-x64-2.9.tar.lzma
-2021/12/25 |     244963 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-x64-2.9.tar.lzma
-2021/12/25 |      24152 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-x64-2.9.tar.lzma
-2021/12/25 |      23933 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-x64-2.9.tar.lzma
 2021/12/25 |     235149 | fonts/newpx/type1/zplr.pfb
 2021/12/25 |     233924 | systems/texlive/tlnet/archive/bfh-ci.doc.r61397.tar.xz
-2021/12/25 |    2336284 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
 2021/12/25 |      22914 | systems/win32/miktex/tm/packages/miktex-misc.tar.lzma
 2021/12/25 |       2236 | fonts/newpx/tfm/zpl-Slanted-lf-scl-ot1.tfm
 2021/12/25 |       2228 | fonts/newpx/tfm/zpl-Slanted-osf-scl-ot1.tfm
-2021/12/25 |      22179 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-2.9.tar.lzma
 2021/12/25 |       2204 | fonts/newpx/tfm/zpl-BoldSlanted-lf-scl-ot1.tfm
 2021/12/25 |       2192 | fonts/newpx/tfm/zpl-Slanted-tosf-scl-ot1.tfm
 2021/12/25 |       2192 | fonts/newpx/tfm/zpl-Slanted-tlf-scl-ot1.tfm
 2021/12/25 |       2192 | fonts/newpx/tfm/zpl-BoldSlanted-osf-scl-ot1.tfm
 2021/12/25 |       2164 | fonts/newpx/tfm/zpl-BoldSlanted-tlf-scl-ot1.tfm
 2021/12/25 |       2160 | fonts/newpx/tfm/zpl-BoldSlanted-tosf-scl-ot1.tfm
-2021/12/25 |     215852 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-x64-2.9.tar.lzma
-2021/12/25 |      21372 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-2.9.tar.lzma
-2021/12/25 |     213459 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-x64-2.9.tar.lzma
-2021/12/25 |     209940 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-2.9.tar.lzma
 2021/12/25 |    2097416 | graphics/pstricks/contrib/pstricks-add/doc/data/contourN.data
-2021/12/25 |   20871936 | systems/texlive/tlnet/install-tl-windows.exe
 2021/12/25 |      20312 | fonts/newpx/README
-2021/12/25 |     203081 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-x64-2.9.tar.lzma
-2021/12/25 |     202238 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-x64-2.9.tar.lzma
-2021/12/25 |      20190 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-2.9.tar.lzma
-2021/12/25 |    2012706 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-x64-2.9.tar.lzma
-2021/12/25 |     200140 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-2.9.tar.lzma
-2021/12/25 |     199837 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-2.9.tar.lzma
-2021/12/25 |     199114 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-2.9.tar.lzma
-2021/12/25 |     197374 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-2.9.tar.lzma
-2021/12/25 |     196123 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-x64-2.9.tar.lzma
 2021/12/25 |     195065 | graphics/pstricks/contrib/pstricks-add/doc/pstricks-add-doc.tex
-2021/12/25 |      18487 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-x64-2.9.tar.lzma
-2021/12/25 |      18370 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-x64-2.9.tar.lzma
 2021/12/25 |      18163 | graphics/pstricks/contrib/pstricks-add/doc/data/olympic.pdf
-2021/12/25 |     181557 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-2.9.tar.lzma
-2021/12/25 |     181465 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-x64-2.9.tar.lzma
-2021/12/25 |     179708 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-2.9.tar.lzma
-2021/12/25 |    1732473 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-2.9.tar.lzma
-2021/12/25 |     172344 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-x64-2.9.tar.lzma
-2021/12/25 |   17048819 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
-2021/12/25 |     168851 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-x64-2.9.tar.lzma
-2021/12/25 |      16566 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-2.9.tar.lzma
-2021/12/25 |      16521 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-2.9.tar.lzma
 2021/12/25 |       1604 | systems/texlive/tlnet/archive/collection-publishers.r61397.tar.xz
-2021/12/25 |     157440 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-2.9.tar.lzma
-2021/12/25 |     155283 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-x64-2.9.tar.lzma
 2021/12/25 |        154 | graphics/pstricks/contrib/pstricks-add/doc/data/demo2.data
-2021/12/25 |        153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
-2021/12/25 |        152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
-2021/12/25 |     152105 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-2.9.tar.lzma
 2021/12/25 |        151 | graphics/pstricks/contrib/pstricks-add/doc/data/demo3.data
-2021/12/25 |    1497474 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-x64-2.9.tar.lzma
-2021/12/25 |        145 | systems/texlive/tlnet/install-tl.zip.sha512
-2021/12/25 |        144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
-2021/12/25 |    1447744 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-x64-2.9.tar.lzma
-2021/12/25 |      14417 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-x64-2.9.tar.lzma
 2021/12/25 |       1428 | graphics/pstricks/contrib/pstricks-add/README
 2021/12/25 |   14083650 | graphics/pstricks/contrib/pstricks-add/doc/pstricks-add-doc.pdf
-2021/12/25 |    1397755 | systems/win32/miktex/tm/packages/next/miktex-zzdb2-2.9.tar.lzma
-2021/12/25 |    1397650 | systems/win32/miktex/tm/packages/miktex-zzdb2-2.9.tar.lzma
-2021/12/25 |     139309 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-x64-2.9.tar.lzma
-2021/12/25 |     135931 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-2.9.tar.lzma
-2021/12/25 |    1353498 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-2.9.tar.lzma
-2021/12/25 |      13511 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-2.9.tar.lzma
-2021/12/25 |     135073 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-x64-2.9.tar.lzma
 2021/12/25 |      13348 | fonts/newpx/tfm/zpl-Slanted-lf-sc-t1.tfm
 2021/12/25 |      13344 | fonts/newpx/tfm/zpl-Slanted-osf-sc-t1.tfm
 2021/12/25 |      13340 | fonts/newpx/tfm/ztm-BoldItalic-lf-sc-t1.tfm
@@ -487,7 +561,6 @@
 2021/12/25 |      13304 | fonts/newpx/tfm/zpl-Slanted-tlf-sc-t1.tfm
 2021/12/25 |      13300 | fonts/newpx/tfm/ztm-BoldItalic-tlf-sc-t1.tfm
 2021/12/25 |      13292 | fonts/newpx/tfm/ztm-BoldItalic-tosf-sc-t1.tfm
-2021/12/25 |    1322402 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-x64-2.9.tar.lzma
 2021/12/25 |      13208 | fonts/newpx/tfm/zpl-Regular-lf-scl-t1.tfm
 2021/12/25 |      13204 | fonts/newpx/tfm/zpl-Regular-osf-scl-t1.tfm
 2021/12/25 |      13168 | fonts/newpx/tfm/zpl-Regular-tosf-scl-t1.tfm
@@ -508,18 +581,14 @@
 2021/12/25 |      13016 | fonts/newpx/tfm/zpl-Italic-lf-scl-t1.tfm
 2021/12/25 |      13012 | fonts/newpx/tfm/zpl-Italic-osf-sc-t1.tfm
 2021/12/25 |      13012 | fonts/newpx/tfm/zpl-Italic-osf-scl-t1.tfm
-2021/12/25 |    1299134 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-2.9.tar.lzma
 2021/12/25 |      12976 | fonts/newpx/tfm/zpl-Italic-tlf-sc-t1.tfm
 2021/12/25 |      12972 | fonts/newpx/tfm/zpl-Italic-tosf-sc-t1.tfm
 2021/12/25 |      12968 | fonts/newpx/tfm/zpl-Italic-tosf-scl-t1.tfm
 2021/12/25 |      12968 | fonts/newpx/tfm/zpl-Italic-tlf-scl-t1.tfm
 2021/12/25 |      12952 | fonts/newpx/tfm/zpl-Bold-lf-sc-t1.tfm
 2021/12/25 |      12940 | fonts/newpx/tfm/zpl-Bold-osf-sc-t1.tfm
-2021/12/25 |    1293558 | systems/win32/miktex/tm/packages/next/miktex-zzdb3-2.9.tar.lzma
-2021/12/25 |    1293287 | systems/win32/miktex/tm/packages/miktex-zzdb3-2.9.tar.lzma
 2021/12/25 |      12908 | fonts/newpx/tfm/zpl-Bold-tosf-sc-t1.tfm
 2021/12/25 |      12908 | fonts/newpx/tfm/zpl-Bold-tlf-sc-t1.tfm
-2021/12/25 |     126740 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-2.9.tar.lzma
 2021/12/25 |   12648900 | graphics/pstricks/contrib/pstricks-add.zip
 2021/12/25 |      12612 | fonts/newpx/tfm/ztm-Italic-lf-sc-t1.tfm
 2021/12/25 |      12600 | fonts/newpx/tfm/ztm-Italic-osf-sc-t1.tfm
@@ -541,20 +610,16 @@
 2021/12/25 |      12248 | fonts/newpx/tfm/zpl-Regular-osf-t1.tfm
 2021/12/25 |      12212 | fonts/newpx/tfm/zpl-Regular-tosf-t1.tfm
 2021/12/25 |      12212 | fonts/newpx/tfm/zpl-Regular-tlf-t1.tfm
-2021/12/25 |     120297 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-2.9.tar.lzma
 2021/12/25 |      11976 | fonts/newpx/tfm/zpl-Italic-lf-t1.tfm
 2021/12/25 |      11960 | fonts/newpx/tfm/zpl-Italic-osf-t1.tfm
 2021/12/25 |      11912 | fonts/newpx/tfm/zpl-Italic-tlf-t1.tfm
 2021/12/25 |      11908 | fonts/newpx/tfm/zpl-Italic-tosf-t1.tfm
 2021/12/25 |      11852 | fonts/newpx/tfm/zplth-Italic-osf-t1.tfm
 2021/12/25 |      11812 | fonts/newpx/tfm/zplth-Italic-tlf-t1.tfm
-2021/12/25 |    1181005 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-2.9.tar.lzma
 2021/12/25 |      11640 | fonts/newpx/tfm/zpl-BoldSlanted-lf-t1.tfm
 2021/12/25 |      11624 | fonts/newpx/tfm/zpl-BoldSlanted-osf-t1.tfm
 2021/12/25 |      11592 | fonts/newpx/tfm/zpl-BoldSlanted-tosf-t1.tfm
 2021/12/25 |      11592 | fonts/newpx/tfm/zpl-BoldSlanted-tlf-t1.tfm
-2021/12/25 |     115672 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-x64-2.9.tar.lzma
-2021/12/25 |       1153 | systems/win32/miktex/tm/packages/next/pr.ini
 2021/12/25 |      11436 | fonts/newpx/tfm/zpl-Bold-lf-t1.tfm
 2021/12/25 |      11420 | fonts/newpx/tfm/zpl-Bold-osf-t1.tfm
 2021/12/25 |      11404 | fonts/newpx/tfm/ztm-BoldItalic-lf-t1.tfm
@@ -572,19 +637,10 @@
 2021/12/25 |      11312 | fonts/newpx/tfm/ztm-Italic-lf-t1.tfm
 2021/12/25 |      11304 | fonts/newpx/tfm/ztm-Bold-tosf-t1.tfm
 2021/12/25 |      11304 | fonts/newpx/tfm/ztm-Bold-tlf-t1.tfm
-2021/12/25 |     113045 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-x64-2.9.tar.lzma
 2021/12/25 |      11300 | fonts/newpx/tfm/ztm-Italic-osf-t1.tfm
 2021/12/25 |      11264 | fonts/newpx/tfm/ztm-Italic-tlf-t1.tfm
 2021/12/25 |      11260 | fonts/newpx/tfm/ztm-Italic-tosf-t1.tfm
-2021/12/25 |     112483 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-x64-2.9.tar.lzma
 2021/12/25 |       1110 | graphics/pstricks/contrib/pstricks-add/Changes
-2021/12/25 |     109546 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-x64-2.9.tar.lzma
-2021/12/25 |     109263 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-x64-2.9.tar.lzma
-2021/12/25 |    1087068 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-x64-2.9.tar.lzma
-2021/12/25 |     108300 | systems/texlive/tlnet/archive/texlive-scripts.r61394.tar.xz
-2021/12/25 |     104745 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-x64-2.9.tar.lzma
-2021/12/25 |     103462 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-x64-2.9.tar.lzma
-2021/12/25 |     101508 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-2.9.tar.lzma
 2021/12/24 |       9965 | macros/latex/contrib/biblatex-contrib/biblatex-apa/russian-apa.lbx
 2021/12/24 |       9961 | macros/latex/contrib/biblatex-contrib/biblatex-apa/slovene-apa.lbx
 2021/12/24 |      98982 | fonts/newtx/doc/newtxdoc.tex
@@ -614,7 +670,6 @@
 2021/12/24 |       8059 | macros/latex/contrib/europecv/templates/cv_template_academic_en.tex
 2021/12/24 |        765 | macros/latex/contrib/europecv/examples/bulgarian-koi8-r.tex
 2021/12/24 |        712 | macros/latex/contrib/minted/README
-2021/12/24 |      71132 | macros/latex/contrib/termsim/termsim-en.pdf
 2021/12/24 |       6975 | macros/latex/contrib/europecv/examples/at.pdf
 2021/12/24 |        678 | info/dtk-bibliography/README.md
 2021/12/24 |       6698 | macros/latex/contrib/biblatex-contrib/biblatex-apa/norsk-apa.lbx
@@ -635,7 +690,6 @@
 2021/12/24 |       4834 | info/dtk-bibliography/dtk-logos.sty
 2021/12/24 |       4778 | macros/latex/contrib/europecv/templates/cv_template_en.tex
 2021/12/24 |      47274 | macros/latex/contrib/europecv/examples/Pythagoras.jpg
-2021/12/24 |      46991 | macros/latex/contrib/termsim/termsim.dtx
 2021/12/24 |       4646 | macros/latex/contrib/europecv/examples/EuropeFlagCMYK.eps
 2021/12/24 |       4646 | macros/latex/contrib/europecv/EuropeFlagCMYK.eps
 2021/12/24 |       4631 | macros/latex/contrib/europecv/EuropeFlagBW.eps
@@ -647,12 +701,10 @@
 2021/12/24 |       4207 | macros/latex/contrib/europecv/CONTRIBUTING.md
 2021/12/24 |      41261 | fonts/newtx/README
 2021/12/24 |       3987 | fonts/newtx/tex/newtx.sty
-2021/12/24 |     391739 | macros/latex/contrib/termsim.zip
 2021/12/24 |      38240 | macros/latex/contrib/europecv/templates/cv_template_academic_en.pdf
 2021/12/24 |     382394 | info/dtk-bibliography/dtk-bibliography.pdf
 2021/12/24 |      37766 | macros/latex/contrib/europecv/examples/europasslogo.eps
 2021/12/24 |      37766 | macros/latex/contrib/europecv/europasslogo.eps
-2021/12/24 |       3759 | macros/latex/contrib/termsim/README.md
 2021/12/24 |      37248 | macros/latex/contrib/europecv/examples/minimal.pdf
 2021/12/24 |     350683 | fonts/newtx/doc/newtxdoc.pdf
 2021/12/24 |       3438 | macros/latex/contrib/europecv/ecvgr.def
@@ -660,9 +712,8 @@
 2021/12/24 |       3392 | macros/latex/contrib/europecv/CHANGELOG.rst
 2021/12/24 |       3356 | macros/latex/contrib/europecv/examples/EuropeFlagCMYK-eps-converted-to.pdf
 2021/12/24 |      33105 | macros/latex/contrib/biblatex-contrib/biblatex-apa/biblatex-apa-test.tex
-2021/12/24 |     317576 | macros/latex/contrib/termsim/termsim-zh-cn.pdf
 2021/12/24 |      31505 | macros/latex/contrib/europecv/templates/cv_template_en.pdf
-2021/12/24 |        289 | macros/latex/contrib/termsim/build.sh
+2021/12/24 |      29262 | macros/latex/contrib/codebox/ctxdoc-en.cls
 2021/12/24 |       2690 | macros/latex/contrib/europecv/examples/europass-cv.tex
 2021/12/24 |       2676 | macros/latex/contrib/biblatex-contrib/biblatex-apa/apa.dbx
 2021/12/24 |      26706 | macros/latex/contrib/europecv/europecv.cls
@@ -716,6 +767,7 @@
 2021/12/24 |       1496 | systems/texlive/tlnet/archive/collection-pictures.r61392.tar.xz
 2021/12/24 |      14662 | macros/latex/contrib/biblatex-contrib/biblatex-apa/american-apa.lbx
 2021/12/24 |      14480 | macros/latex/contrib/europecv/examples/europasslogo-eps-converted-to.pdf
+2021/12/24 |      13992 | macros/latex/contrib/asmeconf/asmeconf-sample.bib
 2021/12/24 |      13747 | macros/latex/contrib/biblatex-contrib/biblatex-apa/catalan-apa.lbx
 2021/12/24 |      13330 | macros/latex/contrib/biblatex-contrib/biblatex-apa/spanish-apa.lbx
 2021/12/24 |      12785 | macros/latex/contrib/biblatex-contrib/biblatex-apa/biblatex-apa-test-citations.bib
@@ -726,7 +778,7 @@
 2021/12/24 |      12466 | macros/latex/contrib/biblatex-contrib/biblatex-apa/austrian-apa.lbx
 2021/12/24 |      12454 | macros/latex/contrib/biblatex-contrib/biblatex-apa/nswissgerman-apa.lbx
 2021/12/24 |      12439 | macros/latex/contrib/biblatex-contrib/biblatex-apa/german-apa.lbx
-2021/12/24 |  117981663 | macros/context/latest/cont-tmf.zip
+2021/12/24 |  118002438 | macros/context/latest/cont-tmf.zip
 2021/12/24 |    1179523 | macros/latex/contrib/europecv.zip
 2021/12/24 |      10913 | fonts/erewhon/README
 2021/12/24 |      10654 | macros/latex/contrib/biblatex-contrib/biblatex-apa/greek-apa.lbx
@@ -806,7 +858,6 @@
 2021/12/23 |       8769 | macros/latex/contrib/bfh-ci/tex/bfh-projectproposal.cfg
 2021/12/23 |       8764 | fonts/erewhon/tfm/Erewhon-Italic-tosf-t1.tfm
 2021/12/23 |       8760 | fonts/erewhon/tfm/Erewhon-Italic-tlf-t1.tfm
-2021/12/23 |     875148 | macros/latex/contrib/asmejour.zip
 2021/12/23 |       8672 | fonts/erewhon/tfm/Erewhon-BoldItalic-osf-t2b.tfm
 2021/12/23 |       8664 | fonts/erewhon/tfm/Erewhon-BoldItalic-lf-t2b.tfm
 2021/12/23 |       8660 | fonts/erewhon/tfm/Erewhon-Bold-osf-t1.tfm
@@ -827,7 +878,6 @@
 2021/12/23 |       8580 | fonts/erewhon/tfm/Erewhon-BoldSlanted-tosf-sc-t2a.tfm
 2021/12/23 |       8580 | fonts/erewhon/tfm/Erewhon-BoldSlanted-tlf-sc-t2a.tfm
 2021/12/23 |       8507 | systems/win32/miktex/tm/packages/colorist__source.tar.lzma
-2021/12/23 |      84741 | macros/latex/contrib/easybook/easybook.tex
 2021/12/23 |       8448 | fonts/erewhon/tfm/Erewhon-Bold-osf-t2c.tfm
 2021/12/23 |       8432 | fonts/erewhon/tfm/Erewhon-Bold-lf-t2c.tfm
 2021/12/23 |       8428 | fonts/erewhon/tfm/Erewhon-Bold-tosf-t2c.tfm
@@ -835,7 +885,6 @@
 2021/12/23 |      84117 | systems/win32/miktex/tm/packages/knowledge__source.tar.lzma
 2021/12/23 |       8348 | fonts/erewhon/tfm/Erewhon-Italic-osf-t2c.tfm
 2021/12/23 |       8348 | fonts/erewhon/tfm/Erewhon-Italic-lf-t2c.tfm
-2021/12/23 |      83473 | macros/latex/contrib/easybook/easybook.dtx
 2021/12/23 |       8340 | fonts/erewhon/tfm/Erewhon-BoldSlanted-osf-sc-t2b.tfm
 2021/12/23 |       8328 | fonts/erewhon/tfm/Erewhon-Italic-tosf-t2c.tfm
 2021/12/23 |       8328 | fonts/erewhon/tfm/Erewhon-Italic-tlf-t2c.tfm
@@ -846,7 +895,6 @@
 2021/12/23 |       8172 | fonts/erewhon/tfm/Erewhon-BoldItalic-lf-t2c.tfm
 2021/12/23 |       8152 | fonts/erewhon/tfm/Erewhon-BoldItalic-tosf-t2c.tfm
 2021/12/23 |       8152 | fonts/erewhon/tfm/Erewhon-BoldItalic-tlf-t2c.tfm
-2021/12/23 |       7759 | macros/latex/contrib/asmejour/README.md
 2021/12/23 |       7740 | fonts/erewhon/tfm/Erewhon-BoldSlanted-osf-sc-t2c.tfm
 2021/12/23 |       7728 | fonts/erewhon/tfm/Erewhon-BoldSlanted-lf-sc-t2c.tfm
 2021/12/23 |       7724 | fonts/erewhon/tfm/Erewhon-BoldSlanted-tosf-sc-t2c.tfm
@@ -866,7 +914,6 @@
 2021/12/23 |      68144 | systems/texlive/tlnet/archive/latexindent.r61385.tar.xz
 2021/12/23 |      67585 | systems/win32/miktex/tm/packages/latexindent.tar.lzma
 2021/12/23 |       6742 | fonts/erewhon/enc/erewhontlf-ot2.enc
-2021/12/23 |     670705 | macros/latex/contrib/asmejour/asmejour-template.pdf
 2021/12/23 |        644 | fonts/erewhon/vf/Erewhon-RegularSlanted-tosf-ts1.vf
 2021/12/23 |        644 | fonts/erewhon/vf/Erewhon-RegularSlanted-tlf-ts1.vf
 2021/12/23 |        644 | fonts/erewhon/vf/Erewhon-RegularSlanted-osf-ts1.vf
@@ -883,7 +930,6 @@
 2021/12/23 |        640 | fonts/erewhon/vf/Erewhon-BoldItalic-tlf-ts1.vf
 2021/12/23 |        640 | fonts/erewhon/vf/Erewhon-BoldItalic-osf-ts1.vf
 2021/12/23 |        640 | fonts/erewhon/vf/Erewhon-BoldItalic-lf-ts1.vf
-2021/12/23 |     637213 | macros/latex/contrib/easybook.zip
 2021/12/23 |       6366 | macros/latex/contrib/bfh-ci/tex/bfhthesis.cls
 2021/12/23 |       6364 | fonts/erewhon/tfm/Erewhon-RegularSlanted-osf-sc-t2a.tfm
 2021/12/23 |       6364 | fonts/erewhon/tfm/Erewhon-RegularSlanted-lf-sc-t2a.tfm
@@ -936,7 +982,6 @@
 2021/12/23 |       6000 | fonts/erewhon/tfm/Erewhon-Italic-tosf-ly1.tfm
 2021/12/23 |       5996 | fonts/erewhon/tfm/Erewhon-Italic-tlf-ly1.tfm
 2021/12/23 |     597382 | systems/win32/miktex/tm/packages/easybook__doc.tar.lzma
-2021/12/23 |     594225 | macros/latex/contrib/easybook/easybook.pdf
 2021/12/23 |       5928 | fonts/erewhon/tfm/Erewhon-Bold-osf-ly1.tfm
 2021/12/23 |       5912 | fonts/erewhon/tfm/Erewhon-Bold-lf-ly1.tfm
 2021/12/23 |       5908 | fonts/erewhon/tfm/Erewhon-Bold-tosf-ly1.tfm
@@ -1012,9 +1057,7 @@
 2021/12/23 |       4300 | fonts/erewhon/tfm/Erewhon-Italic-tlf-sc-t2c.tfm
 2021/12/23 |     428560 | fonts/erewhon/afm/Erewhon-Italic.afm
 2021/12/23 |     427846 | fonts/erewhon/afm/Erewhon-BoldItalic.afm
-2021/12/23 |      42768 | macros/latex/contrib/asmejour/asmejour-template.tex
 2021/12/23 |      42691 | macros/latex/contrib/asmejour/asmejour.bst
-2021/12/23 |      42423 | macros/latex/contrib/asmejour/asmejour.cls
 2021/12/23 |       4240 | fonts/erewhon/tfm/Erewhon-BoldItalic-osf-sc-t1.tfm
 2021/12/23 |       4236 | fonts/erewhon/tfm/Erewhon-BoldItalic-lf-sc-t1.tfm
 2021/12/23 |       4216 | fonts/erewhon/tfm/Erewhon-BoldItalic-tosf-sc-t1.tfm
@@ -1816,7 +1859,6 @@
 2021/12/22 |      71531 | macros/latex/contrib/srdp-mathematik/srdp-mathematik.sty
 2021/12/22 |      70955 | macros/latex/contrib/spbmark/spbmark.pdf
 2021/12/22 |       6984 | support/latexindent/LatexIndent/FileExtension.pm
-2021/12/22 |       6837 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
 2021/12/22 |       6742 | support/latexindent/LatexIndent/Environment.pm
 2021/12/22 |       6645 | support/latexindent/LatexIndent/BackUpFileProcedure.pm
 2021/12/22 |      66231 | support/latexindent/documentation/subsec-poly-switches.tex
@@ -2944,7 +2986,6 @@
 2021/12/20 |      20274 | macros/latex/contrib/tcolorbox/tcolorbox.doc.magazine.tex
 2021/12/20 |      20201 | macros/latex/contrib/tcolorbox/tcolorbox.doc.filling.tex
 2021/12/20 |      19956 | macros/latex/contrib/tcolorbox/tcolorbox.doc.fitting.tex
-2021/12/20 |      19108 | fonts/newtx/tex/newtxtext.sty
 2021/12/20 |     183634 | graphics/mcf2graph/mcf_mplib_exa.pdf
 2021/12/20 |     179904 | macros/latex/contrib/knowledge/knowledge.tex
 2021/12/20 |       1759 | macros/latex/contrib/knowledge/knowledge.ins
@@ -2956,7 +2997,6 @@
 2021/12/20 |        148 | macros/latex/contrib/tcolorbox/tcolorbox.doc.references.tex
 2021/12/20 |      14877 | macros/latex/contrib/tcolorbox/tcbfitting.code.tex
 2021/12/20 |       1414 | macros/latex/contrib/tcolorbox/tcblistingsutf8.code.tex
-2021/12/20 |     139753 | fonts/newtx/tex/newtxmath.sty
 2021/12/20 |      13913 | macros/latex/contrib/tcolorbox/tcblistingscore.code.tex
 2021/12/20 |      13613 | macros/latex/contrib/tcolorbox/tcolorbox.doc.sidebyside.tex
 2021/12/20 |       1284 | graphics/pgf/contrib/xistercian/README.md
@@ -2975,12 +3015,3 @@
 2021/12/20 |      10268 | macros/latex/contrib/tcolorbox/tcbxparse.code.tex
 2021/12/20 |      10040 | macros/latex/contrib/tcolorbox/tcbskinsjigsaw.code.tex
 2021/12/20 |       1002 | macros/latex/contrib/zref-check/README.md
-2021/12/19 |      98872 | graphics/mcf2graph/mcf_data_base.mcf
-2021/12/19 |     949430 | graphics/mcf2graph.zip
-2021/12/19 |       7860 | support/TeX4ht/source/mktex4ht-cnf.tex
-2021/12/19 |      62535 | graphics/mcf2graph/mcf_manual.tex
-2021/12/19 |       3642 | systems/win32/miktex/tm/packages/eurosym__source.tar.lzma
-2021/12/19 |     275608 | systems/win32/miktex/tm/packages/eurosym__doc.tar.lzma
-2021/12/19 |       2303 | graphics/mcf2graph/mcf_exa_soc.mf
-2021/12/19 |      16010 | graphics/mcf2graph/mcf_mplib_exa.tex
-2021/12/19 |     140217 | systems/win32/miktex/tm/packages/eurosym.tar.lzma
diff --git a/info/visualfaq-fr/README b/info/visualfaq-fr/README
index d1774286f5..4ccb8e78f4 100644
--- a/info/visualfaq-fr/README
+++ b/info/visualfaq-fr/README
@@ -61,8 +61,8 @@ to French.
 Copyright and license
 =====================
 
-Copyright (C) 2015-2021 by Scott Pakin <scott+vfaq@pakin.org>, for the original version, in English
-Copyright (C) 2021 by Jérémy Just <jeremy@jejust.fr>, for the French version
+Copyright (C) 2015-2022 by Scott Pakin <scott+vfaq@pakin.org>, for the original version, in English
+Copyright (C) 2021-2022 by Jérémy Just <jeremy@jejust.fr>, for the French version
 
 This file may be distributed and/or modified under the conditions of
 the LaTeX Project Public License, either version 1.3c of this license
diff --git a/info/visualfaq-fr/VERSION b/info/visualfaq-fr/VERSION
index e191215a97..fe40da70b1 100644
--- a/info/visualfaq-fr/VERSION
+++ b/info/visualfaq-fr/VERSION
@@ -1 +1 @@
-2021-03-21
+2021-12-26
diff --git a/info/visualfaq-fr/source/README b/info/visualfaq-fr/source/README
index 5ee8f435d4..e11ed933b2 100644
--- a/info/visualfaq-fr/source/README
+++ b/info/visualfaq-fr/source/README
@@ -74,5 +74,3 @@ If you want more information in English, please have a look at the
 original package:
                 https://ctan.org/pkg/visualFAQ
                 https://github.com/spakin/visualFAQ
-
-
diff --git a/info/visualfaq-fr/source/visualFAQ-fr.tex b/info/visualfaq-fr/source/visualFAQ-fr.tex
index fd062e80bd..0eff30a1da 100644
--- a/info/visualfaq-fr/source/visualFAQ-fr.tex
+++ b/info/visualfaq-fr/source/visualFAQ-fr.tex
@@ -21,9 +21,9 @@
 %% vous, de cliquer sur les liens hypertextes qui vous int�ressent et
 %% d'apprendre ce que la FAQ LaTeX francophone a � vous dire.
 %%
-\documentclass[twoside,letterpaper]{article}
+\documentclass[twoside,a4paper]{article}
 \usepackage{etex}
-\usepackage[marginparwidth=65pt, marginratio=1:1, tmargin=126pt, height=550pt, width=400pt]{geometry}
+\usepackage[marginparwidth=65pt, marginratio=1:1, tmargin=136pt, height=550pt, width=400pt]{geometry}
 \usepackage{fancyhdr}
 \usepackage{lastpage}
 \usepackage{lettrine}
@@ -72,18 +72,19 @@
   pdfauthor={Scott Pakin, Jeremy Just},
   pdfcontactemail={jeremy@jejust.fr},
   pdfcontacturl={https://www.gutenberg.eu.org/faq},
-  pdfsubject={Answers to frequently asked questions regarding LaTeX},
+  pdfsubject={R�ponses aux questions les plus courantes sur LaTeX},
   pdfkeywords={%
-    LaTeX, tables, figures, typesetting, spacing, spaces, hyphenation,
-    sections, titles, verbatim, fonts, symbols, characters, floats,
-    bibliography, BibTeX, page numbers, footnotes, columns,
-    mathematics, captions, references, citations, alignment
+    LaTeX, TeX, tableaux, figures, flottants, mise en page, espacement,
+    coupure des mots, c�sure, sections, titres, paragraphes, verbatim,
+    fontes, symboles, polices de caract�res, bibliography, BibTeX,
+    num�rotation des pages, notes de bas de page, colonnes, l�gendes,
+    formules math�matiques, �quations, references, citations, alignement
   },
   pdfcopyright={Copyright (C) \the\year, Jeremy Just et Scott Pakin pour la version francaise},
   pdflicenseurl={http://www.latex-project.org/lppl.txt},
   pdfcaptionwriter={Jeremy Just},
   pdfcontactcountry={France},
-  baseurl={http://mirror.ctan.org/info/visualFAQ-fr/visualFAQ-fr.pdf},
+  baseurl={http://mirror.ctan.org/info/visualfaq-fr/visualFAQ-fr.pdf},
   pdflang={fr-FR}
 }
 
@@ -182,27 +183,27 @@
 \makeatother
 
 % FAQuk:   "Alternative head- and footlines in LaTeX" (fancyhdr)
-%   FAQfr: "Comment d�finir les hauts et bas de page?" (3_composition/texte/pages/composer_des_en-tetes_et_pieds_de_page)
+%   FAQfr: "Comment d�finir les hauts et bas de page?" (3_composition/texte/pages/entetes/composer_des_en-tetes_et_pieds_de_page)
 % FAQuk:   "Page numbering '<n> of <m>'" (nofm)
 %   FAQfr: "Comment obtenir la num�rotation � page <K> sur <N> �?" (3_composition/texte/pages/numerotation_des_pages/numeroter_les_pages_avec_k_sur_n)
 % FAQuk:   "How many pages are there in my document?" (howmanypp)
-%   FAQfr: "Comment compter le nombre de pages d'un document?" (3_composition/texte/document/combien_de_pages_a_mon_document)
+%   FAQfr: "Comment compter le nombre de pages d'un document?" (3_composition/document/combien_de_pages_a_mon_document)
 \fancypagestyle{fancybasic}{%
   \fancyhf{}
   \fancyhead[LO,RE]{%
-    \faq{3_composition/texte/pages/composer_des_en-tetes_et_pieds_de_page}{"Comment d�finir les hauts et bas de page?"}{%
+    \faq{3_composition/texte/pages/entetes/composer_des_en-tetes_et_pieds_de_page}{"Comment d�finir les hauts et bas de page?"}{%
       \usefont{T1}{pzc}{m}{it}\leftmark}}
   \fancyhead[LE,RO]{%
-    \faq{3_composition/texte/pages/composer_des_en-tetes_et_pieds_de_page}{"Comment d�finir les hauts et bas de page?"}{%
+    \faq{3_composition/texte/pages/entetes/composer_des_en-tetes_et_pieds_de_page}{"Comment d�finir les hauts et bas de page?"}{%
       \usefont{T1}{pzc}{m}{it}\rightmark}}
   \fancyfoot[CE]{%
     \faq{3_composition/texte/pages/numerotation_des_pages/numeroter_les_pages_avec_k_sur_n}%
       {"Comment obtenir la num�rotation 'page <K> sur <N>'?"}%
-      {Page~\thepage\ de~\pageref*{LastPage}}\strut}
+      {Page~\thepage\ sur~\pageref*{LastPage}}\strut}
   \fancyfoot[CO]{%
-    \faq{3_composition/texte/document/combien_de_pages_a_mon_document}%
+    \faq{3_composition/document/combien_de_pages_a_mon_document}%
       {"Comment compter le nombre de pages d'un document?"}%
-      {Page~\thepage\ de~\pageref*{LastPage}}\strut}
+      {Page~\thepage\ sur~\pageref*{LastPage}}\strut}
 }
 \pagestyle{fancybasic}
 
@@ -450,11 +451,11 @@ lorem sem sagittis est, vit\ae{} laoreet odio arcu auctor
 consectetuer.
 
 % FAQuk:   "What's the name of this file" (filename)
-%   FAQfr: "Comment afficher le nom du fichier compil�?" (3_composition/texte/document/utiliser_le_nom_de_fichier_dans_le_document)
+%   FAQfr: "Comment afficher le nom du fichier compil�?" (3_composition/document/utiliser_le_nom_de_fichier_dans_le_document)
 % FAQuk:   "Printing the time" (time)
 %   FAQfr: "Comment ins�rer l'heure dans un document?" (3_composition/texte/mots/inserer_l_heure_dans_un_document)
 In vehicula sagittis nisl. M\ae{}cenas malesuada feugiat eros. Nulla
-facilisis accumsan quam. Nulla id nunc \faq{3_composition/texte/document/utiliser_le_nom_de_fichier_dans_le_document}{"Comment afficher le nom du fichier compil�?"}{\strut\texttt{\jobname.tex}}
+facilisis accumsan quam. Nulla id nunc \faq{3_composition/document/utiliser_le_nom_de_fichier_dans_le_document}{"Comment afficher le nom du fichier compil�?"}{\strut\texttt{\jobname.tex}}
 duis \faq{3_composition/texte/mots/inserer_l_heure_dans_un_document}{"Comment ins�rer l'heure dans un document?"}{\strut\today~10:51pm} facilisis tristique
 lectus. Vestibulum ante ipsum primis in faucibus orci luctus et
 ultrices posuere cubilia cur\ae{}; Vivamus dictum nibh vit\ae{} mi.
@@ -743,11 +744,11 @@ intellegam.}  {\usefont{T1}{pnc}{m}{n} Ex nihil aperiri per.}
 \end{figure}
 
 % FAQuk:   "Footnotes in LaTeX section headings" (ftnsect)
-%   FAQfr: "Comment mettre une note de bas de page dans un titre?" (3_composition/texte/footnotes/inserer_une_note_de_bas_de_page_dans_un_titre)
+%   FAQfr: "Comment mettre une note de bas de page dans un titre?" (3_composition/texte/pages/footnotes/inserer_une_note_de_bas_de_page_dans_un_titre)
 \addtocounter{footnote}{1}
 \subsection[Mauris sagittis]{%
   Mauris sagittis%
-  \faq{3_composition/texte/footnotes/inserer_une_note_de_bas_de_page_dans_un_titre}{"Comment mettre une note de bas de page dans un titre?"}%
+  \faq{3_composition/texte/pages/footnotes/inserer_une_note_de_bas_de_page_dans_un_titre}{"Comment mettre une note de bas de page dans un titre?"}%
                {\normalfont\textsuperscript{\footnotesize{\thefootnote}}}%
   \footnotetext{Nulla non augue sed sem accumsan lobortis.}}
 
@@ -819,7 +820,7 @@ suscipit justo \faq{4_domaines_specialises/mathematiques/changer_la_position_des
 lorem. Sed feugiat:
 
 % FAQuk:   "Set specifications and Dirac brackets" (braket)
-%   FAQfr: "Set specifications and Dirac brackets" (4_domaines_specialises/mathematiques/symboles_de_separateurs)
+%   FAQfr: "Comment �crire les bra-kets de Dirac ou une sp�cification d'ensemble?" (4_domaines_specialises/mathematiques/symboles_de_separateurs)
 \begin{equation}
   \faq{4_domaines_specialises/mathematiques/symboles_de_separateurs}{"Comment �crire les bra-kets de Dirac ou une sp�cification d'ensemble?"}{%
     \ensuremath{\displaystyle
@@ -1042,9 +1043,9 @@ qui ea, esse nonummy pro ad.
 \bigskip
 
 % FAQuk:   "Marking changed parts of your document" (changebars)
-%   FAQfr: "Comment afficher les modifications dans un document?" (3_composition/texte/document/signaler_des_changements_entre_versions)
+%   FAQfr: "Comment afficher les modifications dans un document?" (3_composition/document/signaler_des_changements_entre_versions)
 \newcommand*{\changebarfaq}[1]{%
-  \faq{3_composition/texte/document/signaler_des_changements_entre_versions}{"Comment afficher les modifications dans un document?"}{#1}%
+  \faq{3_composition/document/signaler_des_changements_entre_versions}{"Comment afficher les modifications dans un document?"}{#1}%
 }
 \newcommand*{\insertedtext}[1]{\textcolor{blue}{\uwave{#1}}}
 \newcommand*{\deletedtext}[1]{\textcolor{red}{\sout{#1}}}
@@ -1077,14 +1078,14 @@ molestie eu convallis hymen\ae{}os, amet a, integer morbi inceptos
 ipsum in vulputate.
 
 % FAQuk:   "Putting bibliography entries in text" (bibinline)
-%   FAQfr: "Putting bibliography entries in text" (3_composition/annexes/bibliographie/inserer_les_references_biblio_dans_le_texte)
+%   FAQfr: "Comment faire appara�tre les entr�es bibliographiques dans le texte?" (3_composition/annexes/bibliographie/inserer_les_references_biblio_dans_le_texte)
 \newlength{\fnwidth}
 \setlength{\fnwidth}{\linewidth}
 \addtolength{\fnwidth}{-15pt}
 Vivamus interdum tellus elit et, sapien orci orci porta urna magna
 consectetuer, posuere dolor vel, tempus volutpat, in nullam at quisque
 consectetuer. At eos postea ancill\ae{}, an ullum denique
-vis.\footnote{\faq{3_composition/annexes/bibliographie/inserer_les_references_biblio_dans_le_texte}{"Putting bibliography entries in text"}{\parbox[t]{\fnwidth}{Detraxit Pertinax and Nisl
+vis.\footnote{\faq{3_composition/annexes/bibliographie/inserer_les_references_biblio_dans_le_texte}{"Comment faire appara�tre les entr�es bibliographiques dans le texte?"}{\parbox[t]{\fnwidth}{Detraxit Pertinax and Nisl
 Regione. \emph{Elitr Invidunt Referrentur}. Placerat Singulis
 Scriptorem, Atqui, Vivendum, 2nd ed., March 1973.}}}  Quo odio virtute
 pertinacia ei, reque posse ad cum.  Ei cum alii postea legendos, ne
@@ -1163,7 +1164,7 @@ vel, aperiam periculis repudiare ad est.
 % FAQuk:   "Diagonal separation in corner cells of tables" (slashbox)
 %   FAQfr: "Comment diviser une cellule par une diagonale?" (3_composition/tableaux/cellules/diviser_une_cellule_en_diagonale)
 % FAQuk:   "Merging cells in a column of a table" (multirow)
-%   FAQfr: "Merging cells in a column of a table" (3_composition/tableaux/cellules/fusionner_des_cellule_dans_une_colonne)
+%   FAQfr: "Comment fusionner des cellules d'une m�me colonne dans un tableau?" (3_composition/tableaux/cellules/fusionner_des_cellule_dans_une_colonne)
 \begin{table}[htbp]
   \centering
   \begin{tabular}{|l||c|c|c|}
@@ -1176,7 +1177,7 @@ vel, aperiam periculis repudiare ad est.
     trinani & apeirian &
       \multirow{4}{6em}{%
         \faq{3_composition/tableaux/cellules/fusionner_des_cellule_dans_une_colonne}%
-          {"Merging cells in a column of a table"}%
+          {"Comment fusionner des cellules d'une m�me colonne dans un tableau?"}%
           {\parbox{6em}{te ad utinam ex uso per te democritum}}} &
       nobis \\ \cline{1-2}\cline{4-4}
     sed & quodsi & & aliquip \\ \cline{1-2}\cline{4-4}
@@ -1305,14 +1306,14 @@ laoreet.  Alia temporibus eos cu. Posse mucius pro ex. No vis agam
 platonem.
 
 % FAQuk:   "Merging cells in a column of a table" (multirow)
-%   FAQfr: "Merging cells in a column of a table" (3_composition/tableaux/cellules/fusionner_des_cellule_dans_une_colonne)
+%   FAQfr: "Comment fusionner des cellules d'une m�me colonne dans un tableau?" (3_composition/tableaux/cellules/fusionner_des_cellule_dans_une_colonne)
 % FAQuk:   "Footnotes in tables" (footintab)
 %   FAQfr: "Comment obtenir une note de bas de page dans un tableau?" (3_composition/tableaux/notes_de_bas_de_tableau)
 \begin{table}[htbp]
   \centering
   \newcommand{\rotbox}[1]{%
     \faq{3_composition/tableaux/cellules/fusionner_des_cellule_dans_une_colonne}%
-      {"Merging cells in a column of a table"}%
+      {"Comment fusionner des cellules d'une m�me colonne dans un tableau?"}%
       {\rotatebox[origin=bl]{70}{\makebox[10em][l]{#1}}}%
   }
   \begin{minipage}{25em}
@@ -1364,9 +1365,9 @@ fusce rutrum integer luctus penatibus scelerisque metus convallis
 accumsan ornare cursus.
 
 % FAQuk:   "Other 'document font' sizes?" (extsizes)
-%   FAQfr: "Other 'document font' sizes?" (3_composition/texte/symboles/polices/comment_avoir_d_autres_tailles_de_police)
+%   FAQfr: "Comment avoir d'autres tailles de police de base?" (3_composition/texte/symboles/polices/comment_avoir_d_autres_tailles_de_police)
 \mbox{}\vskip 3.5ex plus -1ex minus -.2ex
-\noindent\faq{3_composition/texte/symboles/polices/comment_avoir_d_autres_tailles_de_police}{"Other 'document font' sizes?"}{%
+\noindent\faq{3_composition/texte/symboles/polices/comment_avoir_d_autres_tailles_de_police}{"Comment avoir d'autres tailles de police de base?"}{%
 \begin{minipage}{\linewidth}
 \addtocounter{subsection}{1}%
 \setcounter{subsubsection}{0}%
@@ -1488,7 +1489,7 @@ elementum.
 % FAQuk:   "Page number is wrong at start of page" (wrongpn)
 %   FAQfr: "Pourquoi un num�ro de page courante peut �tre faux en haut de page?" (3_composition/texte/pages/numerotation_des_pages/le_numero_de_page_est_incorrect)
 % FAQuk:   "Choosing a bibliography style" (whatbst)
-%   FAQfr: "Choosing a bibliography style" (3_composition/annexes/bibliographie/choisir_un_style_de_bibliographie)
+%   FAQfr: "Comment choisir un style de bibliographie BibTeX?" (3_composition/annexes/bibliographie/choisir_un_style_de_bibliographie)
 Cras suscipit lectus a magna. Cras massa leo, viverra sit amet, auctor
 nec, ultricies quis, pede. Mauris blandit metus id enim. Proin
 malesuada. Mauris consectetuer. Proin sit amet est. \AE{}nean luctus
@@ -1501,8 +1502,8 @@ hendrerit. Curabitur nonummy. Cras volutpat \antifaq{3_composition/texte/pages/n
 ac arcu non nibh venenatis commodo. Morbi lorem. Sed ullamcorper
 luctus enim. Vestibulum et tortor. Quisque elit. Sed molestie
 tincidunt auctor pede. Proin felis velit, mattis semper, gravida vel,
-ullamcorper semper, mi~\faq{3_composition/annexes/bibliographie/choisir_un_style_de_bibliographie}{"Choosing a bibliography
-  style"}{(Dapibus, 1938)}.  M\ae{}cenas varius, felis semper pharetra
+ullamcorper semper, mi~\faq{3_composition/annexes/bibliographie/choisir_un_style_de_bibliographie}{"Comment choisir un style de bibliographie
+  BibTeX?"}{(Dapibus, 1938)}.  M\ae{}cenas varius, felis semper pharetra
 eleifend, felis leo hendrerit tortor, ac tempor wisi nunc eget
 sapien. Proin viverra pede nec justo. Donec suscipit. Phasellus
 egestas tortor sit amet sem. M\ae{}cenas dignissim malesuada
@@ -1525,7 +1526,7 @@ lectus. Vestibulum ullamcorper aliquam nulla.
   \setlength{\logoxoffset}{\paperwidth-\wd\logobox-2ex}
   \setlength{\logoyoffset}{2ex}
   \AtPageLowerLeft{\put(\LenToUnit{\logoxoffset},\LenToUnit{\logoyoffset}){%
-    \faq{abspos}{"Putting things at fixed positions on the page"}{\usebox{\logobox}}}
+    \faq{3_composition/texte/pages/positionner_un_objet_de_facon_absolue_sur_la_page}{"Comment mettre des �l�ments � une position donn�e sur une page?"}{\usebox{\logobox}}}
   }
 }
 
@@ -1642,9 +1643,9 @@ dolore, qui vero, nulla suscipit qui.
   \rule{\chngmarglen}{0pt}}
 
 % FAQuk:   "My section title is too wide for the page header" (runheadtoobig)
-%   FAQfr: "Comment r�duire les rappels de titres dans un haut ou bas de page?" (3_composition/texte/pages/raccourcir_les_rappels_de_titres_en_haut_de_page)
+%   FAQfr: "Comment r�duire les rappels de titres dans un haut ou bas de page?" (3_composition/texte/pages/entetes/raccourcir_les_rappels_de_titres_en_haut_de_page)
 \subsection[Te lorem blandit]{%
-  \faq{3_composition/texte/pages/raccourcir_les_rappels_de_titres_en_haut_de_page}%
+  \faq{3_composition/texte/pages/entetes/raccourcir_les_rappels_de_titres_en_haut_de_page}%
     {"Comment r�duire les rappels de titres dans un haut ou bas de page?"}%
     {\parbox[t]{\linewidth-1em-\widthof{6.2}}{%
       Te lorem blandit quis consequat ad augue fermentum, scelerisque
@@ -1653,7 +1654,7 @@ dolore, qui vero, nulla suscipit qui.
 }
 
 % FAQuk:   "How to create crop marks" (crop)
-%   FAQfr: "Comment tracer des hirondelles?" (3_composition/divers/hirondelles)
+%   FAQfr: "Comment tracer des hirondelles?" (3_composition/texte/pages/hirondelles)
 \newsavebox{\cropulc}
 \savebox{\cropulc}{%
 \begin{picture}(40,40)(-35,-5)
@@ -1708,7 +1709,7 @@ dolore, qui vero, nulla suscipit qui.
 }
 \newlength{\pageminusmargin}
 \setlength{\pageminusmargin}{\paperwidth-50pt}
-\newcommand*{\cropfaq}[1]{\faq{3_composition/divers/hirondelles}{"Comment tracer des hirondelles?"}{#1}}
+\newcommand*{\cropfaq}[1]{\faq{3_composition/texte/pages/hirondelles}{"Comment tracer des hirondelles?"}{#1}}
 \AddToShipoutPicture*{%
   \AtPageUpperLeft{%
     \put(10,-50){\cropfaq{\usebox{\cropulc}}}}
@@ -1738,9 +1739,9 @@ dolore, qui vero, nulla suscipit qui.
 \end{figure}
 
 % FAQuk:   "Labelling graphics" (labelfig)
-%   FAQfr: "Labelling graphics" (3_composition/illustrations/annoter_un_graphique)
+%   FAQfr: "Comment placer du texte LaTeX dans un graphique?" (3_composition/illustrations/annoter_un_graphique)
 % FAQuk:   "Footnotes in captions" (ftncapt)
-%   FAQfr: "Comment obtenir une note de bas de page dans une l�gende?" (3_composition/texte/footnotes/inserer_une_note_de_bas_de_page_dans_une_legende)
+%   FAQfr: "Comment obtenir une note de bas de page dans une l�gende?" (3_composition/texte/pages/footnotes/inserer_une_note_de_bas_de_page_dans_une_legende)
 \begin{figure}[tbp]
   \centering
   \begin{minipage}{5in}
@@ -1771,12 +1772,12 @@ dolore, qui vero, nulla suscipit qui.
       \put(3951,3944){\makebox(0,0){\strut{}}}%
       \put(286,110){\makebox(0,0)[l]{\strut{}}}%
       \put(5706,3882){\makebox(0,0)[r]{%
-        \faq{3_composition/illustrations/annoter_un_graphique}{"Labelling graphics"}{\strut$y = \frac{\sin{x}}{x^2+\pi}$}}}%
+        \faq{3_composition/illustrations/annoter_un_graphique}{"Comment placer du texte LaTeX dans un graphique?"}{\strut$y = \frac{\sin{x}}{x^2+\pi}$}}}%
       \put(0,0){\includegraphics{labelgraph}}%
     \end{picture}
     \caption[Duis iriure aliquam aliquam suscipit ex vel commodo]
             {Duis iriure aliquam aliquam suscipit ex vel commodo%
-             \faq{3_composition/texte/footnotes/inserer_une_note_de_bas_de_page_dans_une_legende}{"Comment obtenir une note de bas de page dans une l�gende?"}{\strut\nolinkfootnotemark}}%
+             \faq{3_composition/texte/pages/footnotes/inserer_une_note_de_bas_de_page_dans_une_legende}{"Comment obtenir une note de bas de page dans une l�gende?"}{\strut\nolinkfootnotemark}}%
     \label{fig:labelfig}
     \footnotetext[1]{Pellentesque sagittis vestibulum aliquam habitant varius.}%
   \end{minipage}
@@ -1829,7 +1830,7 @@ posuere nisl. Blandit vestibulum montes duis ridiculus suscipit
 volutpat ut egestas ultricies:
 
 % FAQuk:   "Including a file verbatim in LaTeX" (verbfile)
-%   FAQfr: "Including a file verbatim in LaTeX" (4_domaines_specialises/informatique/inclure_un_fichier_en_mode_verbatim)
+%   FAQfr: "Comment inclure un fichier verbatim?" (4_domaines_specialises/informatique/inclure_un_fichier_en_mode_verbatim)
 \newsavebox{\verbfilebox}
 \begin{lrbox}{\verbfilebox}
 \begin{minipage}{\widthof{\texttt{sit discere detraxit, eam nulla omnium id.~~Homero grXaecXXiX~}}}
@@ -1852,7 +1853,7 @@ nominati persequeris et mei.
 \end{lrbox}
 \begin{center}
 \faq{4_domaines_specialises/informatique/inclure_un_fichier_en_mode_verbatim}%
-  {"Including a file verbatim in LaTeX"}%
+  {"Comment inclure un fichier verbatim?"}%
   {\makebox[\wd\verbfilebox+2em]{%
     \rule{0pt}{\ht\verbfilebox+3ex}%
     \rule[-\dp\verbfilebox-3ex]{0pt}{3ex}%
@@ -2116,10 +2117,10 @@ eu, porta eget, risus. Quisque nisi pr\ae{}sent nibh urna, dapibus eu,
 pretium vit\ae{} sollicitudin et nunc,
 
 % FAQuk:   "Re-using an equation" (reuseq)
-%   FAQfr: "Comment num�roter les �quations?" (4_domaines_specialises/mathematiques/numeroter_les_equations)
+%   FAQfr: "Comment num�roter les �quations?" (4_domaines_specialises/mathematiques/equations/numeroter_les_equations)
 \begin{equation}
 \alpha \leq \int_m^{\log_2 m} K^{*}(z)\:\text{d}z < \beta \:,
-\tag{\faq{4_domaines_specialises/mathematiques/numeroter_les_equations}{"Comment num�roter les �quations?"}{\hypergetref{eq:repeatable}\strut}}
+\tag{\faq{4_domaines_specialises/mathematiques/equations/numeroter_les_equations}{"Comment num�roter les �quations?"}{\hypergetref{eq:repeatable}\strut}}
 \end{equation}
 
 \noindent
@@ -2283,24 +2284,22 @@ vit\ae{} volutpat aspernatur:
 \end{center}
 
 % FAQuk:   "My words aren't being hyphenated" (nohyph)
-%   FAQfr: "La c�sure ne fonctionne pas !" (3_composition/langues/cesure/la_cesure_ne_fonctionne_pas)
+%   FAQfr: "Pourquoi la c�sure ne fonctionne pas?" (3_composition/langues/cesure/la_cesure_ne_fonctionne_pas)
 % FAQuk:   "Hyphenation exceptions" (hyphexcept)
 %   FAQfr: "Hyphenation exceptions" (3_composition/langues/cesure/nouveaux_motifs_de_cesure)
 %   FAQxx: Add back "hyphexcept" somewhere.
 % FAQuk:   "Weird hyphenation of words" (weirdhyphen)
-%   FAQfr: "Weird hyphenation of words" (3_composition/langues/cesure/cesures_bizarres3)
+%   FAQfr: "Pourquoi les coupures de mots sont bizarres?" (3_composition/langues/cesure/cesures_bizarres3)
 % FAQuk:   "(Merely) peculiar hyphenation" (oddhyphen)
 %   FAQfr: "Comment g�rer des r�gles de c�sures sp�cifiques?" (3_composition/langues/cesure/cesures_bizarres)
 Ullamcorper penatibus morbi nulla arcu luctus, phasellus nullam
 consequat quam fusce curabitur, auctor integer felis neque
-\antifaq{3_composition/langues/cesure/la_cesure_ne_fonctionne_pas}{"La c�sure ne fonctionne pas !"}{e\=osvider\'erap\v{e}iriann\H{o}anviserr\"oriuvareti\d{u}stopl\r{a}cerat\ss{}imiliquem\b{e}iexpr\oe{}pi\c{c}uri\^eff\`{\i}ciendi\strut}
+\antifaq{3_composition/langues/cesure/la_cesure_ne_fonctionne_pas}{"Pourquoi la c�sure ne fonctionne pas?"}{e\=osvider\'erap\v{e}iriann\H{o}anviserr\"oriuvareti\d{u}stopl\r{a}cerat\ss{}imiliquem\b{e}iexpr\oe{}pi\c{c}uri\^eff\`{\i}ciendi\strut}
 turpis ad at, malesuada ante lacinia quis ante vehicula, arcu pulvinar
 aliquam in eros.  Reque gr\ae{}co volutpat at eum. Et etiam falli
 omittam nec, ludus nostro delicata cu sit. Ut autem oportere sit. Duo
 malis adipisci id, id per omnium takimata repudiand\ae{}. Ex cum
-\antifaq{3_composition/langues/cesure/cesures_bizarres3}{"Weird hyphenation of words" and
-"(Merely) peculiar
-hyphenation"}{n-\strut}\linebreak[4]\antifaq{3_composition/langues/cesure/cesures_bizarres}{"Comment g�rer des r�gles de c�sures sp�cifiques?"}{ibh\strut}
+\antifaq{3_composition/langues/cesure/cesures_bizarres3}{"Pourquoi les coupures de mots sont bizarres?"}{n-\strut}\linebreak[4]\antifaq{3_composition/langues/cesure/cesures_bizarres}{"Comment g�rer des r�gles de c�sures sp�cifiques?"}{ibh\strut}
 augue epicuri.  Percipit invenire mediocrem ad mel, eu agam atqui
 mei. Vis ei vocent urbanitas duis nominati honestatis vel.
 Pellentesque sollicitudin urna eget nulla. Nulla imperdiet
@@ -2367,12 +2366,12 @@ sollicitudin leo. Phasellus odio. Nam scelerisque dolor ut mi.
 \end{table}
 
 % FAQuk:   "Preventing hyphenation of a particular word" (wdnohyph)
-%   FAQfr: "Preventing hyphenation of a particular word" (3_composition/langues/cesure/empecher_la_cesure_de_certains_mots)
+%   FAQfr: "Comment supprimer certaines c�sures?" (3_composition/langues/cesure/empecher_des_coupures_de_mots)
 % FAQuk:   "Stopping all hyphenation" (hyphoff)
-%   FAQfr: "Stopping all hyphenation" (3_composition/langues/cesure/desactiver_completement_la_cesure)
+%   FAQfr: "Comment d�sactiver compl�tement la coupure des mots?" (3_composition/langues/cesure/desactiver_completement_la_cesure)
 %   FAQxx: Add back "hyphoff" somewhere.
 Vel eu modus simul iriure, mei cu unum nominavi, eos postea
-\faq{3_composition/langues/cesure/empecher_la_cesure_de_certains_mots}{"Preventing hyphenation of a particular word"}{delicatissimietveniameleifendintellegameamubiqueoportereargumentumetvix\strut}
+\faq{3_composition/langues/cesure/empecher_des_coupures_de_mots}{"Comment supprimer certaines c�sures?"}{delicatissimietveniameleifendintellegameamubiqueoportereargumentumetvix\strut}
 facer movet usu ne, facilis qualisque ne mei. Decore gr\ae{}cis
 verterem at qui. An ceteros voluptua consectetuer sed, te ius accumsan
 posidonium, pro ei quis principes.
@@ -2418,9 +2417,9 @@ tincidunt.  Sed vulputate nunc a nulla vulputate, ac rutrum
 enim sem, interdum vit\ae{} magna sed.  Curabitur euismod faucibus.
 
 % FAQuk:   "Version control using RCS, CVS or the like" (RCS)
-%   FAQfr: "Gestion de versions avec RCS, CVS ou �quivalent" (3_composition/texte/document/inclure_des_informations_venant_d_un_gestionnaire_de_versions)
+%   FAQfr: "Gestion de versions avec RCS, CVS ou �quivalent" (3_composition/document/inclure_des_informations_venant_d_un_gestionnaire_de_versions)
 \begin{center}
-\faq{3_composition/texte/document/inclure_des_informations_venant_d_un_gestionnaire_de_versions}%
+\faq{3_composition/document/inclure_des_informations_venant_d_un_gestionnaire_de_versions}%
   {"Gestion de versions avec RCS, CVS ou �quivalent"}%
   {\texttt{\$Id:~visualFAQ.tex,v 1.01 2015/10/14 17:06:31 pakin Exp \$}}
 \end{center}
@@ -2487,10 +2486,10 @@ Duis Indoctum and Primis Qu\ae{}stio.
 \newblock \emph{Vituperata Signiferumque}, 7(12), December 1981.
 
 % FAQuk:   "Transcribed initials in BibTeX" (bibtranscinit)
-%   FAQfr: "Multi-letter initials in BibTeX" (3_composition/annexes/bibliographie/initiales_multiples_avec_bibtex)
+%   FAQfr: "Comment d�finir des initiales de pr�nom regroupant au moins deux lettres?" (3_composition/annexes/bibliographie/utiliser_les_deux_premieres_lettres_du_prenom_d_un_auteur)
 \bibitem{initials}
-\faq{3_composition/annexes/bibliographie/initiales_multiples_avec_bibtex}{"Multi-letter initials in BibTeX"}{Yu.\strut} Iriure and
-\faq{3_composition/annexes/bibliographie/initiales_multiples_avec_bibtex}{"Multi-letter initials in BibTeX"}{Ya.\strut} Porrov.
+\faq{3_composition/annexes/bibliographie/utiliser_les_deux_premieres_lettres_du_prenom_d_un_auteur}{"Comment d�finir des initiales de pr�nom regroupant au moins deux lettres?"}{Yu.\strut} Iriure and
+\faq{3_composition/annexes/bibliographie/utiliser_les_deux_premieres_lettres_du_prenom_d_un_auteur}{"Comment d�finir des initiales de pr�nom regroupant au moins deux lettres?"}{Ya.\strut} Porrov.
 \newblock Mei recteque: Sententi\ae{} ad error essent.
 \newblock \emph{Meis Iriure Molesti\ae}, volume~25, Winter~2001.
 
@@ -2501,13 +2500,13 @@ Ridens Laboramus, Congue Nominati Adolescens, Quidam S. Constituto,
   and Ullum Honestatis.
 \newblock \emph{Inani Melius Nam Ad---Pri ei Facete Dissentiunt}.
 \newblock Ferri Prompta version~3.1, October 2005.
-\newblock \faq{3_composition/annexes/bibliographie/referencer_les_pages_d_appel_d_une_reference_bibliographique}{"Comment r�f�rencer les pages contenant des citations?"}{Pages~\hypergetpageref{backbackref1},
+\newblock \faq{3_composition/annexes/bibliographie/referencer_les_pages_d_appel_d_une_reference_bibliographique2}{"Comment r�f�rencer les pages contenant des citations?"}{Pages~\hypergetpageref{backbackref1},
   \hypergetpageref{backbackref2}, \hypergetpageref{backbackref3}}.
 
 % FAQuk:   "Non-english bibliographies" (i18nbib)
-%   FAQfr: "Non-english bibliographies" (3_composition/annexes/bibliographie/bibliographies_internationales)
+%   FAQfr: "Comment mettre en forme une bibliographie en langue non-anglaise?" (3_composition/annexes/bibliographie/bibliographies_internationales)
 \newcommand{\foreign}[1]{%
-  \faq{3_composition/annexes/bibliographie/bibliographies_internationales}{"Non-english bibliographies"}{\usefont{U}{psy}{m}{n}#1\strut}%
+  \faq{3_composition/annexes/bibliographie/bibliographies_internationales}{"Comment mettre en forme une bibliographie en langue non-anglaise?"}{\usefont{U}{psy}{m}{n}#1\strut}%
 }
 \bibitem{non-english}
 Congue Magna, Duo Cu, \foreign{and} Mucius Veritus.
@@ -2519,11 +2518,11 @@ Congue Magna, Duo Cu, \foreign{and} Mucius Veritus.
   Esse, 3rd~\foreign{edition}, \foreign{November}~1986.
 
 % FAQuk:   "Choosing a bibliography style" (whatbst)
-%   FAQfr: "Choosing a bibliography style" (3_composition/annexes/bibliographie/choisir_un_style_de_bibliographie)
+%   FAQfr: "Comment choisir un style de bibliographie BibTeX?" (3_composition/annexes/bibliographie/choisir_un_style_de_bibliographie)
 \makeatletter
 \let\orig@biblabel=\@biblabel
 \renewcommand*{\@biblabel}[1]{%
-  [\faq{3_composition/annexes/bibliographie/choisir_un_style_de_bibliographie}{"Choosing a bibliography style"}{Dapibus, 1938\strut}]%
+  [\faq{3_composition/annexes/bibliographie/choisir_un_style_de_bibliographie}{"Comment choisir un style de bibliographie BibTeX?"}{Dapibus, 1938\strut}]%
 }
 \bibitem{whatbst}
 Morbi Dapibus,
@@ -2538,9 +2537,9 @@ Choro Fabellas, Modus Consetetur, and Homero D. Invenire.
 \makeatother
 
 % FAQuk:   "Multiple citations" (mcite)
-%   FAQfr: "Multiple citations" (3_composition/annexes/bibliographie/references_biblio_multiples)
+%   FAQfr: "Comment fusionner des entr�es dans la bibliographie?" (3_composition/annexes/bibliographie/references_biblio_multiples)
 \bibitem{multicite}
-\faq{3_composition/annexes/bibliographie/references_biblio_multiples}{"Multiple citations"}{\parbox[t]{\linewidth}{%
+\faq{3_composition/annexes/bibliographie/references_biblio_multiples}{"Comment fusionner des entr�es dans la bibliographie?"}{\parbox[t]{\linewidth}{%
 Paulo Omittam, Vocent A. Fugit, Mentitum Ponderum, and Vero Lorem
 Mediocritatem,
 \newblock Qu\ae{}rendum et Sit~\textbf{13} (1954);
@@ -2562,10 +2561,10 @@ Mediocritatem,
   URL:~\nolinkurl{http://www.pakin.org/~scott}.}}
 
 % FAQuk:   "BibTeX sorting and name prefixes" (bibprefixsort)
-%   FAQfr: "BibTeX sorting and name prefixes" (3_composition/annexes/bibliographie/trier_des_noms_avec_prefixes)
+%   FAQfr: "Comment concilier le tri de BibTeX avec certaines formes de noms?" (3_composition/annexes/bibliographie/trier_des_noms_avec_prefixes)
 \bibitem{name-prefix}
 \faq{3_composition/annexes/bibliographie/trier_des_noms_avec_prefixes}%
-  {"BibTeX sorting and name prefixes"}%
+  {"Comment concilier le tri de BibTeX avec certaines formes de noms?"}%
   {Lord Recteque},
 P. Aperiam, and S. Sensibus.
 \newblock Per debet aperiri urbanitas ne.
@@ -2601,10 +2600,10 @@ Agam Prima,  Congue Everti, and Appetere Facilisis.
 \bigskip
 
 % FAQuk:   "Multiple bibliographies?" (multbib)
-%   FAQfr: "Multiple bibliographies?" (3_composition/annexes/bibliographie/plusieurs_bibliographies_dans_un_document)
+%   FAQfr: "Comment obtenir plusieurs bibliographies dans un document?" (3_composition/annexes/bibliographie/gerer_plusieurs_bibliographies)
 \let\thebibliography=\origthebibliography
 \noindent
-\faq{3_composition/annexes/bibliographie/plusieurs_bibliographies_dans_un_document}{"Multiple bibliographies?"}{%
+\faq{3_composition/annexes/bibliographie/gerer_plusieurs_bibliographies}{"Comment obtenir plusieurs bibliographies dans un document?"}{%
   \begin{minipage}{\linewidth}
   \renewcommand{\refname}{Voluptatibus~II}
   \begin{thebibliography}{Con01}
@@ -2890,14 +2889,14 @@ lectus id nostra porta suspendisse sem duis. Lectus, porttitor lectus.
 }
 
 % FAQuk:   "A 'report' from lots of 'article's" (multidoc)
-%   FAQfr: "Comment constituer un recueil d'articles � partir de plusieurs documents sources?" (3_composition/texte/document/compiler_des_articles_en_un_seul_documents)
+%   FAQfr: "Comment constituer un recueil d'articles � partir de plusieurs documents sources?" (3_composition/texte/document/compiler_des_articles_en_un_seul_document)
 \clearpage
 \null
 \thispagestyle{empty}
 \centergraphic*{anotherarticle}
 \AddToShipoutPicture*{%
   \put(0,0){%
-    \faq{3_composition/texte/document/compiler_des_articles_en_un_seul_documents}%
+    \faq{3_composition/texte/document/compiler_des_articles_en_un_seul_document}%
       {"Comment constituer un recueil d'articles � partir de plusieurs documents sources?"}%
       {\rule{0pt}{\paperheight}\rule{\paperwidth}{0pt}}}
 }
diff --git a/info/visualfaq-fr/visualFAQ-fr.pdf b/info/visualfaq-fr/visualFAQ-fr.pdf
index c5377f664a..34009680fd 100644
--- a/info/visualfaq-fr/visualFAQ-fr.pdf
+++ b/info/visualfaq-fr/visualFAQ-fr.pdf
diff --git a/macros/latex/contrib/asmeconf/README.md b/macros/latex/contrib/asmeconf/README.md
index 18b8aefa17..272f025bf2 100644
--- a/macros/latex/contrib/asmeconf/README.md
+++ b/macros/latex/contrib/asmeconf/README.md
@@ -1,7 +1,7 @@
  
   #asmeconf: A latex template for ASME conference papers#
  
-  Version 1.26 dated 2021/02/20.
+  Version 1.27 dated 2021/12/26.
 
   ####Overview####
   This class provides a LaTeX template for ASME Conference papers formatted according to
@@ -15,7 +15,7 @@
 
 - match ASME's font current specifications and layout
 
-- match ASME's current reference formats, and add support for DOI and URL fields
+- match ASME's current reference formats, and add support for DOI and URL fields (asmeconf.bst replaces asmems4.bst)
 
 - support hyperlinks to figures, tables, equations, references, and external URLs
 
@@ -47,7 +47,7 @@
 
           README.md              --  this file
           asmeconf.cls           --  the class file
-          asmeconf.bst           --  bibtex style for ASME conference format
+          asmeconf.bst           --  bibtex style for current ASME conference format
           asmeconf-template.tex  --  a latex template/example for this class
           asmeconf-template.pdf  --  documentation/sample paper
           asmeconf-sample.bib    --  a sample bibliography file
@@ -79,6 +79,17 @@
  
  ####Change log####
 
+ v1.27 (2021/12/26):
+ - fix bug in captions that appeared in Jan. 2021 (code not uppercasing caption text)
+ - revise code to switch to grid-style author block through a single package option, \[grid\]; previous macros for grid-style remain active. 
+ - various code modifications to enable older LaTeX distributions to run this class. With pdfLaTeX, TeX Live 2016 or later should be used; with luaLaTeX, TeX Live 2021 or later should be used.
+ - eliminate use of \\entry{} with a single argument to produce subheadings in nomenclature; use \\EntryHeading{} instead. (**not backward compatible**)
+ - incorporate recent changes to LaTeX pdf management in relation to pdf-a color profile loading and recently deprecated \\pdfcatalog command
+ - minor edits in relation to url links
+ - minor edits to asmeconf.bst
+ - allow omission of affiliation superscript for single author or single institution
+ - other minor code clean up
+ 
  v1.26 (2021/02/20):
  - edit title and metadata
  - put real author's name ahead of placeholder names
diff --git a/macros/latex/contrib/asmeconf/asmeconf-sample.bib b/macros/latex/contrib/asmeconf/asmeconf-sample.bib
index 669addfc34..01163ef34f 100644
--- a/macros/latex/contrib/asmeconf/asmeconf-sample.bib
+++ b/macros/latex/contrib/asmeconf/asmeconf-sample.bib
@@ -48,7 +48,7 @@
 
 @inproceedings{wions2005,
   author 	= {Thomas Wions and Christopher D. Mills}, 
-  title 	= {Struct\-ur\-al Dynamics in Parallel Manipulation},
+  title 	= {Structural Dynamics in Parallel Manipulation},
   booktitle = {Proceedings of the ASME IDETC/CIE},
   number 	= {DETC2005-99532},
   venue 	= {New Orleans, LA},
diff --git a/macros/latex/contrib/asmeconf/asmeconf-template.pdf b/macros/latex/contrib/asmeconf/asmeconf-template.pdf
index 85b5522a44..5cbfbf7019 100644
--- a/macros/latex/contrib/asmeconf/asmeconf-template.pdf
+++ b/macros/latex/contrib/asmeconf/asmeconf-template.pdf
diff --git a/macros/latex/contrib/asmeconf/asmeconf-template.tex b/macros/latex/contrib/asmeconf/asmeconf-template.tex
index c10d706915..93e2621929 100644
--- a/macros/latex/contrib/asmeconf/asmeconf-template.tex
+++ b/macros/latex/contrib/asmeconf/asmeconf-template.tex
@@ -4,7 +4,7 @@
 %%  This file is asmeconf-template.tex, a LaTeX template to format ASME Conference papers according to
 %%  the requirements on ASME's conference web pages, and including hypertext support for the pdf.
 %%
-%%  This file is version 1.26 dated 2021/02/20
+%%  This file is version 1.27 dated 2021/12/26
 %%  
 %%  As of version 1.11, this template follows ASME's newer conference guidelines first posted July 2019.
 %% 			The new guidelines have changed the requested author block formatting to be inline. 
@@ -19,19 +19,18 @@
 %%  Class options include:
 %%
 %%          * Math options from M. Sharpe's newtxmath package: upright integrals [upint]; 
-%%          *    [varvw] for a v and w that are better distinguished from greek nu; and also 
+%%          *    [varvw] for a v and w that are better distinguished from Greek nu; and also 
 %%          *    [subscriptcorrection, smallerops, varg, frenchmath, varbb, cmbraces, slantedGreek,...] 
-%%			* 	 See newtx documentation for descriptions (at CTAN: http://ctan.org, v1.6 or higher best).
-%%
-%%          * Many options for calligraphic, script, and fraktur fonts from the mathalfa package; the
-%%          *    example shown here is: [mathalfa=cal=euler] to use Euler font for \mathcal.
-%%          *    Some other options for cal are: dutchcal, zapfc, cm (default), boondox,...
-%%          *    frak (fraktur), bb (blackboard bold), scr (script) may also be chosen this way.
-%%			*	 For details, refer to mathalfa documentation (at CTAN: http://ctan.org).
+%%			* 	 See newtx documentation for descriptions (at CTAN: http://ctan.org, v1.6 or higher is best).
 %%
 %%          * Options to: 	omit the ASME copyright footer [nofoot]; 
-%%							use government employee copyright notice [govt];
-%%							use government contractor copyright notice [contractor]
+%%			*				use government employee copyright notice [govt];
+%%			*				use government contractor copyright notice [contractor]
+%%
+%%          * An option to use the traditional grid arrangement of author names [grid].  
+%%			*	 With this option, line breaks (\\) may be inserted into the address as needed. 
+%%			*	 Author names that include commas should be enclosed in braces, e.g., {Joseph L. Smith, Jr.}.  
+%%			*	 Authors may be grouped above a single affiliation using braces, e.g., {Henry Tudor, Catherine Parr}.
 %%
 %%          * An option to balance the heights of columns on the last page [balance]. 
 %%          *    This option is NOT compatible with the [lineno] option.
@@ -44,11 +43,17 @@
 %%          *    just leave a blank line above the displayed equation while you are editing and then remove the 
 %%          *    blank line and [lineno] option when you move to your final version.
 %%
-%%          * An option to use the traditional grid arrangement of author names [authorgrid]. See Appendix B for usage,
-%%          *    because the authors and affiliations must be entered differently in this case. (Same as former option [oldauthors])
-%%
 %%			* Options for PDF/A compliance. [pdf-a] will produce PDF/A-3u compliance with sRGB OutputIntent.
 %%			*	 [pdfapart= 1 or 2 or 3] and [pdfaconformance= b or u] can enable levels 1b, 2b, 2u, and 3b.
+%%			*    The most recent versions of LaTeX (2021 and later) are moving toward integrated support for pdf-a, 
+%%			*    through \DeclareDocumentMetadata{..}. The asmeconf class supports these new features, which can 
+%%			*	 replace the aforementioned class options. (An up-to-date LaTeX installation is required to use this.)
+%%
+%%          * Many options for calligraphic, script, and fraktur fonts from the mathalfa package; the
+%%          *    example shown here is: [mathalfa=cal=euler] to use Euler font for \mathcal.
+%%          *    Some other options for cal are: dutchcal, zapfc, cm (default), boondox,...
+%%          *    frak (fraktur), bb (blackboard bold), scr (script) may also be chosen this way.
+%%			*	 For details, refer to mathalfa documentation (at CTAN: http://ctan.org).
 %%
 %%          * Option to use superiors font from newtxtext for footnotes [nodefaultsups] and
 %%          *    for slightly larger small capitals, [largesc], also from newtxtext.
@@ -60,12 +65,15 @@
 %%
 %%          * Options (used by the babel package) to include passages in languages other than English (e.g., a translation 
 %%			*    of the abstract). Languages are called as options, e.g. [french], [spanish], [greek], [russian], etc. 
-%%			*    See Appendix C for details.
+%%			*    Language support is greatest when running LuaLaTeX with the [fontspec] option.
+%%			*    See Appendix B for details.
 %%
 %%  The use of commands defined or modified by the asmeconf class is illustrated throughout this file. In particular, 
 %%  ASME requires capitalized, sans-serif section headings, and as a result some care is needed when using macros 
 %%  in section headings, as also illustrated below.
 %%
+%%  Use an up-to-date and complete installation of LaTeX, such as TeX Live 2020 or later. Errors may occur with old set-ups.
+%%
  %=========================================================
 %% 
 %% LICENSE: 
@@ -74,30 +82,31 @@
 %%
 %% Offered under the MIT license: https://ctan.org/license/mit 
 %%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% 
 
-%% Class options are described above. If you are not using the languages options, remove them.
+%% Class options are described above. Change these options as desired. 
+%%		If you are not using the language options, remove them (together with Appendices B and C)
+%%	 	Remove the [colorlinks] option before *final* submission to ASME, to get black text for printing,
+%%		but keep that option for other uses.
+ 
+\documentclass[balance,upint,subscriptcorrection,varvw,mathalfa=cal=euler,spanish,french,greek,russian,vietnamese,pdf-a,colorlinks]{asmeconf}
 
-\documentclass[upint,subscriptcorrection,varvw,mathalfa=cal=euler,pdf-a,balance,spanish,french,greek,russian,vietnamese,fontspec,japanese,colorlinks]{asmeconf} % <=== remove colorlinks before your *final* submission to ASME! But keep it for other purposes.
 
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%  Fields to be completed   %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-%%%%%  pdf metadata          %%%%%%%%%%%%
-%%%%%  The user should edit  %%%%%%%%%%%%
+%%%%%  pdf metadata  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 \hypersetup{%
+	pdfauthor={John H. Lienhard},                       		      % <=== change to YOUR name[s]!
 	pdftitle={ASME Conference Paper LaTeX Template},                  % <=== change to YOUR pdf file title
 	pdfkeywords={ASME conference paper, LaTeX template, BibTeX style},% <=== change to YOUR pdf keywords
-	pdfauthor={John H. Lienhard},                          		      % <=== change to YOUR name[s]!
-	pdfurl={https://ctan.org/pkg/asmeconf},% may delete
+	pdfsubject = {Describes the asmeconf LaTeX template},			  % <=== change to YOUR subject
+%	pdfurl={https://ctan.org/pkg/asmeconf},% may delete
 	pdflicenseurl={https://ctan.org/pkg/asmeconf},% may delete
 }
 
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 \begin{document}
+
 % Change these fields to the right content for your conference.
 % You can comment these out if for some reason you don't want a header.
 % Use title case (first letters capitalized), not all capitals
@@ -108,8 +117,7 @@
 \ConfCity{Virtual Conference, Online}
 \PaperNo{IMECE2021-XXXX}
 
-
-% Units of measure and other specialty lowercase terms in the title should be 
+% Units of measure (e.g., cm) and other specialty lowercase terms in the title should be 
 %   enclosed in \NoCaseChange{...} to maintain lower case type
 %   LaTeX will automatically set the rest of the title in all capital letters.
 
@@ -120,12 +128,20 @@
 %   \affil{#} tags the author's affiliation to the address in \SetAffiliation{#}.
 %   No space between last name and \affil{#}, separate names with commas.
 %
+%	For a sole author or a single affiliation for all authors, {#} may be left empty, as \affil{} and \SetAffiliation{} (but not with [grid] option!)
+%
 %   \CorrespondingAuthor{email} follows that author's affiliation, no spaces.  
 %   If multiple corresponding authors, put both email addresses in the same command and place after both authors.
 %
 %   \JointFirstAuthor, if applicable, follows the affiliation of the relevant authors, no spaces.
 
-\SetAuthors{John H.\ Lienhard\affil{1}\CorrespondingAuthor{}, Luis Hern\'andez\affil{2}\JointFirstAuthor , Maria Silva\affil{3}\JointFirstAuthor, Henry Tudor\affil{4},  Catherine~Parr\affil{4}\CorrespondingAuthor{lienhard@mit.edu, kate@thepalace.gov}}
+\SetAuthors{%
+	John H.\ Lienhard\affil{1}\JointFirstAuthor\CorrespondingAuthor{}, 
+	Luis Hern\'andez\affil{2}\JointFirstAuthor, 
+	Maria Silva\affil{3}, 
+	Henry Tudor\affil{4},  
+	Catherine~Parr\affil{4}\CorrespondingAuthor{lienhard@mit.edu, kate@thepalace.gov}
+	}
 
 \SetAffiliation{1}{Massachusetts Institute of Technology, Cambridge, MA }
 \SetAffiliation{2}{Institution or Company Name, City, State}
@@ -133,17 +149,13 @@
 \SetAffiliation{4}{Hampton Court Palace, Richmond, England}
 %	Note: Luis and Maria are not real people.  Henry and Catherine have been dead for >450 years.
 
-
-%	To instead use the [authorgrid] option, follow the syntax in Appendix B.
-
+%	To switch from inline author names to gridded names, use the [grid] option.
 
 \maketitle
 
 %%% Use this footnote for tracking various versions of your draft. Change text to suit your own needs. 
-%%% REMOVE from final version of your paper.
 %%% \date{..} calls the same command. 
-
-\versionfootnote{\texttt{asmeconf.cls}: version \versionno, \today, \href{https://ctan.org/pkg/asmeconf}{ctan.org/pkg/asmeconf}}% <=== Delete before final submission.
+\versionfootnote{Documentation for \texttt{asmeconf.cls}: Version~\versionno, \today.}% <=== Delete before final submission.
 
 
 %%% Change these to your keywords.  Keywords are automatically printed at the end of the abstract.
@@ -152,14 +164,15 @@
 
 \keywords{ASME conference paper, \LaTeX\ Template, \hologo{BibTeX}}
 
-%%%%%%%%%%%%%%%%%%%%%  End of fields to be completed. Now write! %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%  End of fields to be completed. Now write your paper. %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 
-%%%%%%%%%  Abstract  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%  ABSTRACT  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%
-%% Abstract should be no more than 200 words
+%% Abstract should be 200 words or less
 \begin{abstract}
-This paper is an example of and a  {\upshape\LaTeX} template for typesetting ASME conference papers using the {\upshape\texttt{asmeconf}} class. This  {\upshape\LaTeX} template follows ASME guidelines for margins, fonts, headings, captions, and reference formats as of 2020. The class is intended to be used with the {\upshape\texttt{asmeconf.bst} \hologo{BibTeX}} style for reference formatting, which is part of this distribution. The template produces pdfs that contain hyperlinks, bookmarks, and metadata; and references can include the DOI and URL fields. Links may be colored, for online use, or black, for publication. The class enables inline author names, following ASME's current style, but can also produce the traditional grid style. Options include line numbering, final column balancing, various math options, government copyright, and archivability (PDF/A). In addition, section headers may contain mathematics, references, citations, and footnotes. The class is compatible with {\upshape\hologo{pdfLaTeX}} or {\upshape\hologo{LuaLaTeX}}.
+
+This paper is an example of and a  {\upshape\LaTeX} template for typesetting ASME conference papers using the {\upshape\texttt{asmeconf}} class. This  {\upshape\LaTeX} template follows ASME guidelines for margins, fonts, headings, captions, and reference formats as of 2021. The class is intended to be used with the {\upshape\texttt{asmeconf.bst} \hologo{BibTeX}} style for reference formatting, which is part of this distribution. The template produces pdfs that contain hyperlinks, bookmarks, and metadata; and references can include the DOI and URL fields. Links may be colored, for online use, or black, for publication. The class enables inline author names, following ASME's current style, but can also produce the traditional grid style. Options include line numbering, final column balancing, various math options, government copyright, and archivability (PDF/A). In addition, section headers may contain mathematics, references, citations, and footnotes. The class is compatible with {\upshape\hologo{pdfLaTeX}} or {\upshape\hologo{LuaLaTeX}}.
 \end{abstract}
 
 %%%%%%%%%  NOMENCLATURE (OPTIONAL) %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -167,9 +180,7 @@ This paper is an example of and a  {\upshape\LaTeX} template for typesetting ASM
 %% To change space between the symbols and  definitions, use \begin{nomenclature}[Xcm] where X is a number 
 %% The unit cm can be replaced by any LaTeX unit of dimension: pt, in, ex, em, pc, etc.
 %% Default is 2em.
-
-%% \EntryHeading{Greek letters} produces an italicized subheading, e.g., \EntryHeading{Greek letters}
-%% (Leaving off the second argument of \entry, e.g. \entry{Greek letters}, has the same effect)
+%% \EntryHeading{..} produces an italicized subheading in the nomenclature list, e.g., \EntryHeading{Greek letters}
 
 \begin{nomenclature}
 \EntryHeading{Roman letters}
@@ -193,11 +204,13 @@ This paper is an example of and a  {\upshape\LaTeX} template for typesetting ASM
 %%%%%%%%%  BODY OF PAPER %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 \section{Introduction}
-The \texttt{\href{https://ctan.org/pkg/asmeconf}{asmeconf}} class typesets papers with margins, fonts, headings, captions, and reference formats that follow the specifications for conference papers of the American Society of Mechanical Engineers (ASME). In contrast to older ASME \LaTeX\ templates, \texttt{asmeconf} will set internal and external hyperlinks, and the pdf file will contain bookmarks and metadata. Many other useful features have been incorporated. This class is not a publication of ASME, but the author has published in ASME conferences since 1983. 
 
-The \texttt{.tex} file may be written using standard \LaTeX\ commands, although some specific initial commands are needed to format the blocks containing the author[s], title, and abstract.  This class loads a number of other packages, all of which are contained in up-to-date versions of \href{https://www.tug.org/texlive/}{\TeX\ Live}, \href{http://www.tug.org/mactex/}{Mac\TeX}, and similar platforms. If you find that you are missing one of these packages, you may obtain it at no cost from CTAN (\href{http://ctan.org}{ctan.org}).
+The \texttt{\hrefurl{https://ctan.org/pkg/asmeconf}{asmeconf}} class typesets papers with margins, fonts, headings, captions, and reference formats that follow the specifications for conference papers of the American Society of Mechanical Engineers (ASME). In contrast to older ASME \LaTeX\ templates, \texttt{asmeconf} will set internal and external hyperlinks, and the pdf file will contain bookmarks and metadata. Many other useful features have been incorporated. This class is not a publication of ASME, but the author has published in ASME conferences since 1983. 
+
+The \texttt{.tex} file may be written using standard \LaTeX\ commands, although some specific initial commands are needed to format the blocks containing the author[s], title, and abstract.  This class loads a number of other packages, all of which are contained in up-to-date versions of \hrefurl{https://www.tug.org/texlive/}{\TeX\ Live}, \hrefurl{http://www.tug.org/mactex/}{Mac\TeX}, and similar platforms. If you find that you are missing one of these packages, you may obtain it at no cost from CTAN (\hrefurl{https://ctan.org}{ctan.org}). 
 
 \subsection{Essential Initial Commands}
+
 To begin, fill in the fields to be completed at top of the \texttt{asmeconf-template.tex} file. These fields include the headers for your conference and your paper number. Specified metadata will be placed into the pdf file itself. 
 The title should be placed into \verb|\title{..}|. 
 
@@ -215,9 +228,10 @@ The abstract text must be placed into \verb|\begin{abstract}| \ldots \verb|\end{
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 \section{Referring to Citations, Figures, and Equations}
-Citations are automatically numbered \cite{ning2002}. They should be inserted at the appropriate point using a \verb|\cite{ref}| command~\cite{gibson2008,stevens1999}. The citations will be automatically sorted and compressed if they are given in a set \cite{stevens1999,ning2002,gibson2008,wions2005,smith2002,watson1982}. 
+
+Citations are automatically numbered \cite{ning2002}. They should be inserted in the text using a \verb|\cite{ref}| command~\cite{gibson2008,stevens1999}. The citations will be automatically sorted and compressed if they are given in a set \cite{stevens1999,ning2002,gibson2008,wions2005,smith2002,watson1982}. 
 A specific reference may be named with an abbreviation, as in Ref.~\cite{watson1982}.
-See the \texttt{asmeconf-sample.bib} file and Sect.~\ref{sec:references} for examples of how to enter your references.
+See the \texttt{asmeconf-sample.bib} file and Sect.~\ref{sec:references} for examples of entering references.
 
 For ASME conference papers, the labels Equation and Figure should be abbreviated when they do not start a sentence, as in  Eq.~\eqref{eqn:dw} and Fig.~\ref{fig:1}. Figure~\ref{fig:1} is spelled out when it starts a sentence. Equation~\eqref{eqn:dw} is spelled out when it starts a sentence. 
 
@@ -235,7 +249,7 @@ ASME prefers SI units. (U.S.\ style units may follow in parentheses.) Be sure to
 
 \begin{figure}
 \centering\includegraphics[width=0.7\linewidth]{sample-figure-1.pdf}
-\caption{Figure caption with math, eqn.~\eqref{eqn:fourier}: $z = (r,\phi)$ \cite{Lienhard2019b}\label{fig:1}}
+\caption{Caption with math, eqn.~\eqref{eqn:fourier}: $z = (r,\phi)$ \cite{Lienhard2019b}\label{fig:1}}
 \end{figure}
  
 %%%%%%%%%%%%% end figure %%%%%%%%%%%%%%%%%%%
@@ -243,9 +257,10 @@ ASME prefers SI units. (U.S.\ style units may follow in parentheses.) Be sure to
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-%% Use title case for subsections and subsubsections
+%% Use title case for subsections and subsubsections (first letter of words capitalized)
 
 \section{Section Headings and Captions}
+
 ASME requires that section headings and captions be set in an uppercase, sans serif font.  The class will do this automatically.  You can place \verb|\cite{..}|, \verb|\ref{..}|, \verb|\label{..}|, and mathematics into headings and captions directly, as you would in the main text. Do not enclose them braces, e.g.\ \verb|{\cite{..}}|, which will cause errors. You can place \verb|\footnote{..}| into headings, but not into captions.\footnote{See \texttt{tex-stackexchange} for various approaches to footnotes in captions, if they seem necessary. For footnotes in tables, use the \texttt{tablefootnote} package.}\footnote{Sequential footnotes are automatically separated by a comma.}
 
 Text in section headings and captions will not be capitalized if enclosed in a \verb|\NoCaseChange{..}| command.
@@ -257,17 +272,20 @@ Simple mathematical expressions can be used in either captions or section headin
 To override the \texttt{sansbold} math version in captions, put \verb|\NoCaseChange{\mathversion{normal}}| in the caption.
 
 \subsection{Subsection and Sub-subsection Headings}
+
 Subsections and sub-subsection headings should be entered in title case, with the first letter of primary words capitalized. Sub-subsections (i.e., paragraphs) are never numbered.
 
 
 %%%%%%%%%%%%%%% begin simple table %%%%%%%%%%%%%%%%%%%%%%%%%% 
 
-%% captions go above tables
+%% Captions go above tables
+%%
+%% Note that placement of figures and tables can managed with the [!tbhp] options. See: https://latexref.xyz/dev/latex2e.html#Floats
 
 \begin{table}[t]
 \caption[Table]{A simple table\label{tab:1}}
 \centering{%
-\begin{tabular}{l l r}
+\begin{tabular}{llr}
 \toprule
 Experiment & $u$ [m/s] & $T$ [\textdegree C] \\
 \midrule
@@ -303,7 +321,7 @@ Our competitor's test                &  72.321   &  141.384 \\
 \section{Tables and Figures}
 
 Table \ref{tab:1} is an example of a simple table. Table captions should be placed above tables.
-The class loads the \texttt{booktabs} package (used for horizontal rules in both Table \ref{tab:1} and \ref{tab:2}), and the \texttt{array} and \texttt{dcolumn} packages which provide extended capabilities for columns in the \texttt{tabular} environment (used in Table \ref{tab:2}).  Table \ref{tab:3} is an example of a table that spans two columns. Two column tables (and figures) will always float to the top of a later page.
+The class loads the \texttt{booktabs} package (used for horizontal rules in Tables \ref{tab:1} and \ref{tab:2}), and the \texttt{array} and \texttt{dcolumn} packages which provide extended capabilities for columns in the \texttt{tabular} environment (see Table \ref{tab:2}).  Table \ref{tab:3} is an example of a table that spans two columns. Two column tables (and figures) will always float to the top of a later page.
 
 Figure captions go below figures. Figure~\ref{fig:2} is an example of a figure that spans two columns and includes subfigures. The text in figures (and tables) should be no smaller than 6~point type. Images in figures are handled by the standard \texttt{graphicx} package.
 
@@ -347,20 +365,20 @@ Landscape figures and tables may be produced at full-page size by putting \verb|
 
 \section{Reference Formatting with \NoCaseChange{\texttt{asmeconf.bst}}\footnote{If you have text in a section heading or caption that you do not want to be capitalized, such as an SI unit, enclose it in a \texttt{\textbackslash NoCaseChange} command.}}\label{sec:references}
 
-The {\upshape\texttt{asmeconf.bst}} \hologo{BibTeX}  style follows the reference styles shown on ASME's conference web site in  2020.\footnote{\texttt{asmeconf.bst} is intended as a replacement for the old \texttt{asmems4.bst}, which does not follow ASME's current reference formats or support DOI and URL.}
+The {\upshape\texttt{asmeconf.bst}} \hologo{BibTeX}  style follows the reference styles shown on ASME's conference web site in  2021.\footnote{\texttt{asmeconf.bst} is intended as a replacement for the old \texttt{asmems4.bst}, which does not follow ASME's current reference formats or support DOI and URL.}
 Examples for these and many other cases are given in the \texttt{asmeconf-sample.bib} file, which is part of this distribution. Citations and references are managed by the standard \texttt{natbib} package.  Nevertheless, a few comments are necessary. 
 
-%% sub-subsections should *not* be numbered
+%% sub-subsections should *not* be numbered according to ASME's style
 
 \subsubsection*{DOI, URL, and eprint} Include DOI numbers when they are available.  URL's may alternatively be given. ASME requests that URLs point to a document's abstract.
 
-Elementary support for \texttt{eprint} numbers is also included, generating a url at the end of the citation. The \texttt{archive} type may be specified using the macros \texttt{arxiv, googlebooks, hdl, jstore, oclc}, or \texttt{pubmed} (e.g., \texttt{archive=hdl},  \textit{without} braces). Both \texttt{eprint} and \texttt{archive} fields \textit{must} be given. Other root urls may be invoked using \verb|archive = {http://another.url.org/}|.
+Basic support for \texttt{eprint} numbers is also included, generating a url at the end of the citation. The \texttt{archive} type may be specified using the macros \texttt{arxiv, google\-books, hdl, jstore, oclc}, or \texttt{pubmed} (e.g., \texttt{archive=hdl},  \textit{without} braces). Both \texttt{eprint} and \texttt{archive} fields \textit{must} be given. Other root urls may be invoked using \verb|archive = {https://another.url.org/}|.
 
 \subsubsection*{Online Sources} A bibliography entry \verb|@online{..| is included for citation of online sources, such as web pages. A \texttt{url} or \texttt{eprint} with \texttt{archive} must be included. See the examples of use in the \texttt{asmeconf-sample.bib} file. 
 
 \subsubsection*{Date Accessed} The \verb|urldate={..}| field may be used to provide the date on which a given url was accessed. By default, the text printed will be \texttt{Accessed `date',}. The word ``Accessed'' may be changed using the \verb|urltype={..}| field.
 
-\subsubsection*{Conference Location and Date} For the entry types \verb|@inproceeedings{..| and \verb|@proceeedings{..|, you may include \verb|venue={..}| and \verb|eventdate={..}| to specify the city and the date of a conference.
+\subsubsection*{Conference Location and Date} For \verb|@inproceeedings{..| and \verb|@proceeedings{..|, you may include \verb|venue={..}| and \verb|eventdate={..}| to specify the city and date of a conference.
 
 \subsubsection*{Capitalization of Titles} ASME's bibliography style requires that document titles be in title case. The first letters of principal words are capitalized. Do this in the \texttt{.bib} file.
 
@@ -374,17 +392,18 @@ Elementary support for \texttt{eprint} numbers is also included, generating a ur
 \vspace*{1.7em}
 \centering{
   \includegraphics{sample-figure-2a.pdf}
-}
+}%
 \vspace*{1.7em}
-}
+}%
 \subcaption{Interior region\label{fig:interior-region}}
 \end{subfigure}%
 %%%%%%%%%%%%% no spaces or line breaks between these two subfigures
 \begin{subfigure}[t]{0.5\textwidth}
 \centering{%
 \includegraphics{sample-figure-2b.pdf}
+}%
 \subcaption{Exterior region\label{fig:exterior-region}}
-}\end{subfigure}
+\end{subfigure}
 \caption{A figure with two subfigures  \cite{Lienhard2019b}}\label{fig:2}
 \end{figure*}
 
@@ -393,7 +412,7 @@ Elementary support for \texttt{eprint} numbers is also included, generating a ur
 
 %%%%%%%%%%%%%%%  MORE ON MATH   %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-%% Dealing with complicated math in a section or subsection heading: 
+%% Here is an example of managing complicated math in a section or subsection heading: 
 %%    the optional argument to \section will provide the pdf bookmark
 %%    without losing characters or producing warnings/errors.
 %%
@@ -412,15 +431,15 @@ An example using \texttt{align} appears in Appendix~\ref{appendix:a}.
 
 An alternative solution may be to set large equations into two-column-wide tables or figures. While a package exists for setting equations that span two columns (\texttt{widetext.sty}), that code is erratic in relation to floats and page breaks.
 
-Math italics are used for roman and greek letters by default.  If you want an upright letter in math, you can use the relevant math alphabet, e.g., \verb|\mathrm, \mathbf, \mathsf|:
+Math italics are used for Roman and Greek letters by default.  If you want an upright letter in math, you can use the relevant math alphabet, e.g., \verb|\mathrm, \mathbf, \mathsf|:
 \begin{equation}\label{eqn:dw}
 \vec{F} = m \vec{a} \quad\textrm{or}\quad \vec{\mathrm{F}} = m \vec{\mathrm{a}} \quad\textrm{or}\quad \mathbf{F} = m \mathbf{a} \quad\textrm{or}\quad \vec{\mathsf{F}} = m \vec{\mathsf{a}}
 \end{equation}
-To get additional symbols in bold math, you can use \verb|\mathversion{bold}| or the \verb|\bm{..}| macro from the \texttt{bm} package, which is loaded by the class.
+To get additional symbols in bold math, use the \verb|\bm{..}| macro from the \texttt{bm} package (which is loaded by the class) or, for longer passages, use \verb|{\mathversion{bold}|\ldots\texttt{\}}.
 
-The class file also provides upright sans-serif greek letters with \verb|\sfalpha| and similar expressions (e.g., $\sfalpha, \sfbeta, \sfgamma, \sfdelta$ \ldots $\bm{\sfalpha, \sfbeta, \sfgamma, \sfdelta \ldots}$), in case they are needed (but note that the \verb|newtxmath| options \verb|frenchmath| and \verb|slantedGreek| also affect how greek letters are presented).
+The class file also provides upright sans-serif Greek letters with \verb|\sfalpha| and similar expressions (e.g., $\sfalpha, \sfbeta, \sfgamma, \sfdelta$ \ldots $\bm{\sfalpha, \sfbeta, \sfgamma, \sfdelta \ldots}$), in case they are needed (but note that the \verb|newtxmath| options \verb|frenchmath| and \verb|slantedGreek| also affect how Greek letters are presented).
 
-\subsection{The \texttt{newtxmath} and \texttt{mathalpha} Packages~\cite{sharpe1,sharpe2}} The \texttt{newtxmath} package~\cite{sharpe1}, loaded by default, includes a large number of options for mathematics, most of which can be called as options to \verb|\documentclass|. For example, the \texttt{upint} option of \texttt{newtxmath} selects upright integral signs (rather than slanted integral signs):
+\subsection{The \texttt{newtxmath} and \texttt{mathalpha} Packages~\cite{sharpe1,sharpe2}} The \texttt{newtxmath} package~\cite{sharpe1}, loaded by default, includes many options for mathematics, most of which can be called as options to \verb|\documentclass|. For example, the \texttt{upint} option selects upright integral signs (rather than slanted integral signs):
 \begin{quote}
 \verb|\documentclass[upint]{asmeconf}|. 
 \end{quote}  
@@ -430,7 +449,7 @@ In addition, many options for calligraphic, fraktur, and script fonts are availa
 \begin{center}
 \verb|\documentclass[mathalfa=cal=euler]{asmeconf}| 
 \end{center}
-which selects the Euler font for \verb|\mathcal| (this is our default). To find all the font options, refer to the \texttt{mathalfa} package documentation \cite{sharpe2}.
+which selects the Euler font for \verb|\mathcal|, as in $A \in \mathcal{P}(A)$. To find all the font options, refer to the \texttt{mathalfa} package documentation \cite{sharpe2}.
 
 The \texttt{asmeconf} class is designed to be used with \texttt{newtxmath} and does not support the \texttt{unicode-math} package.
 
@@ -451,23 +470,28 @@ This package will attempt to give equal height to the two columns on the last pa
 
 The \texttt{lineno} package is not compatible with the \texttt{flushend} package that makes final short columns the same height. Balancing is automatically disabled when this option is called. 
 
-\subsection{Grid-Style Author Block} The option \texttt{[authorgrid]} invokes ASME's grid-style arrangement of author names.  The authors and affiliations must be entered differently in this case. See Appendix \ref{appendix:b} for usage.
+\subsection{Grid-Style Author Block} The option \texttt{[grid]} invokes ASME's grid-style arrangement of author names. Author names are recognized by the commas that separate them. (To include a comma in a name, enclose it in braces.) Line breaks (\verb|\\|) may be inserted into the address of \verb|\SetAffiliation{n}{address}| as needed. 
+
+Note that ASME interprets the author order in the grid style by reading names from left-to-right in the top row, then left-to-right in each subsequent row.
 
 \subsection{Changing the Copyright Footer} The option \texttt{[nofoot]} will omit the ASME copyright from the page footer. The option \texttt{[govt]} will produce a copyright notice for authors who are employees of the U.\ S.\ Government.  The option \texttt{[contractor]} will produce a copyright
 notice for authors who are employed by a U.\ S.\ Government contractor.
 
-The footers are generated with the \texttt{fancyhdr} package~\cite{oostrum}, so you can change them in any way you like using the commands of that package. Only the default arrangement of footers matches ASME's style, however.
+The footers are generated with the \texttt{fancyhdr} package~\cite{oostrum} and can be changed using the commands of that package. Only the default arrangement matches ASME's style, however.
 
 \subsection{Archivability:~PDF/A} Compliance with PDF/A standards can be enabled using the option \texttt{[pdf-a]} 
 when running with \hologo{pdfLaTeX}. The default setting is for PDF/A-3u with sRGB OutputIntent (\texttt{sRGB.icc}). 
 If levels 1b, 2b, 2u, or 3b are preferred, use the options \texttt{[pdfapart=1 or 2 or 3]} and 
 \texttt{[pdfaconformance=b or u]}. Note that accessible conformance~(\texttt{a}) is not currently possible with \LaTeX.
 
-\subsection{Superiors Font} The \texttt{newtxtext} package includes a superiors font (both numbers and letters) for use in footnote markers and superscripts. To enable this font, use the option \texttt{[nodefaultsups]}. 
+As of late 2021, the \LaTeX 3 team is phasing in native support for PDF/A in the \LaTeX\ kernel, which will make these
+class options unnecessary when using up-to-date installations.
+
+\subsection{Superiors Font} The \texttt{newtxtext} package includes a superiors font (both numbers and letters) for use in footnote markers and text superscripts. To enable this font, use the option \texttt{[nodefaultsups]}. 
 
-\subsection{Typewriter Font Options} This font is the sans-serif \texttt{inconsolata}. By default, the word spacing is variable, but option \texttt{[mono]} ends this behavior. A slashed zero is default; option \texttt{[var0]} removes the slash. Option \texttt{[hyphenate]} enables hyphenation. (This option is not available if the \texttt{[fontspec]} option is used.)
+\subsection{Typewriter Font Options} This font is the sans-serif \texttt{inconsolata}. By default, the word spacing is variable, but option \texttt{[mono]} ends this behavior. A slashed zero is default; option \texttt{[var0]} removes the slash. Option \texttt{[hyphenate]} enables hyphenation. (The hyphenation option is not available if the \texttt{[fontspec]} option is used.)
 
-\subsection{Support for Other Languages}  The package can be adapted to incorporate (or entirely use) languages other than English. See Appendix \ref{appendix:c} for details.
+\subsection{Support for Other Languages}  This package can be adapted to incorporate (or entirely use) languages other than English. See Appendix \ref{appendix:b} for details.
 
 
 %%%%% Conclusions %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -482,18 +506,17 @@ Provide a brief conclusion (3-4 lines).
 Place any acknowledgments here.
 
 
-
 %%%  REFERENCES  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%
 %% Put your references into your .bib file in the usual way. Run latex once, bibtex once, then latex twice.
-%% The asmeconf.bst style allows: venue = {Location of Conference}, and eventdate = {Month, days}
-%%		for @inproceedings and @proceedings
-%%
+%% The asmeconf.bst style allows @inproceedings and @proceedings to include: 
+%%		venue = {Location of Conference}, 
+%%		eventdate = {Month, days},
 
-\nocite{*} %% <=== Delete this line unless you want to typeset the entire contents of your .bib file!
+\nocite{*}%% <=== Delete this line unless you want to typeset the entire contents of your .bib file!
 
-\bibliographystyle{asmeconf}   %% .bst file following ASME conference format. Do not change.
-\bibliography{asmeconf-sample} %% <=== change this to name of your bib file
+\bibliographystyle{asmeconf}  %% .bst file following ASME conference format. Do not change.
+\bibliography{asmeconf-sample}%% <=== change this to name of your bib file
 
 
 %%%  APPENDICES  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -514,35 +537,8 @@ consecutively, following those in the paper. Consider $\rho \neq \textrm{fn}(p)$
                    &{}= \iint_{\mathcal{S}}  \nabla p \times \nabla \left( \frac{1}{\rho}\right) \cdot d\mathbf{A}
 \end{align}
 
-\section{Option to Use an Author Grid}\label{appendix:b}
-
-ASME's most recent templates place author names inline, with affiliations for all authors in rows below. 
-This style is the default for this template.  
-
-The traditional style of putting authors with affiliation into a grid of blocks may be invoked with
-the option [\texttt{authorgrid}].  When using this form, the author names and addresses should be entered as below:
-
-\smallskip
-\noindent\verb|\SetAuthorBlock{Name\JointFirstAuthor}{%|
- \hbox{}\hfil\verb|Institution \\ City, State}| 
-\verb|\SetAuthorBlock{Name\JointFirstAuthor}{%|
- \hbox{}\hfil\verb|Institution \\ City, Country}|
-\verb|\SetAuthorBlock{Name, Name}{%|\hfil\hbox{}
- \hbox{}\hfil\verb|Institution \\ City, Country}|
-\verb|\SetAuthorBlock{John Lienhard\CorrespondingAuthor{%|
- \hbox{\qquad}\hfil\verb|lienhard@mit.edu}}{Institution \\ City, State}|
-\smallskip
-
-Directly usable code is contained at the very end of the \texttt{asmeconf-template.tex} file.
-
-Note that ASME interprets the author order in the grid style by reading names from left-to-right in the top row, then left-to-right in each
-subsequent row.
-
-%% directly usable code follows the \end{document} command below.
-
-%\end{document}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\section{Multilingual Support}\label{appendix:c}
+\section{Multilingual Support}\label{appendix:b}
 
 ASME publishes in English, but the \texttt{babel} package is loaded for 
 users who may wish to include other languages. For example, an author might wish to include an appendix that provides the 
@@ -554,34 +550,35 @@ If no language options are given, the package defaults to English.  As examples,
 shown in \selectlanguage{french}\appendixname~\ref{app:fourier}\selectlanguage{english}, followed by 
 \ifpdftex abstracts in Spanish, Greek, Russian, and Vietnamese.\else abstracts in other languages.\fi
 
-Font encoding is set to T1 with utf-8 input supported: 
+The input encoding can be utf-8, as for these glyphs:
 %% If you have trouble with the next line, your file may not be saved in utf-8 format. You can delete that line to resolve the issue.
-\typeout{If you have trouble with the next line, your file may not be saved in utf-8 format. You can delete that line to resolve the issue.}
+\typeout{If you have trouble with the next line, your file may not be saved in utf-8 format. You can delete that line to resolve the issue. Under LuaLaTeX, be sure to load the [fontspec] option}%
 àáâäæãåā  èéęëêēė  îïíīįì ôöòóœøōõ ûüùúū çćč ł ñń ßśš ÿ žźż.
 
-Fonts similar to Times/Helvetica are automatically used when the Greek, Vietnamese, or selected cyrillic-alphabet languages are called as options under {\upshape\hologo{pdfLaTeX}}. Using {\upshape\hologo{LuaLaTeX}} with the \texttt{[fontspec]} option, many additional scripts are available; see the supplemental notes for such usage~\cite{lienhard2021}. Possibilities include Arabic, Bengali, Chinese, Devanagari (e.g., for Hindi), Hangul (for Korean), Kana (for Japanese), and Tamil.
+Fonts similar to Times/Helvetica are automatically used when the Greek, Vietnamese, or selected cyrillic-alphabet languages are called as options under {\upshape\hologo{pdfLaTeX}}. Using {\upshape\hologo{LuaLaTeX}} with the \texttt{[fontspec]} option, many additional scripts are available; see the supplemental notes for such usage~\cite{lienhard2021}. Possibilities include Arabic, Bengali, Chinese, Devanagari (e.g., for Hindi), Hangul (for Korean), Kana (for Japanese), and Tamil. \textit{The {\upshape\texttt{[fontspec]}} option requires a \LaTeX\ installation dated October 2020 or later.}
 
-The bibliography style, \texttt{asmeconf.bst}, is designed in English and aimed at \hologo{BibTeX}.  Multilingual bibliographies 
-can be supported using \texttt{BibLaTeX}.
+The bibliography style, \texttt{asmeconf.bst}, is designed in English and aimed at \hologo{BibTeX}.  
+% Multilingual bibliographies can be supported using \texttt{BibLaTeX}.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-\begin{selectlanguage}{french}
+\begin{selectlanguage}{french}%
 \section{Discours Préliminaire de Fourier}\label{app:fourier}
 Les causes primordiales ne nous sont point con­nues; mais elles sont assujetties à des lois simples et constantes, que l'on peut découvrir par l'obser­vation, et dont l'étude est l'objet de la philosophie naturelle. 
 
 La chale ur pénètre, comme la gravité, toutes les substances de l'univers, ses rayons occupent toutes les parties de l'espace. Le but de notre ouvrage est d'exposer les lois mathématiques que suit cet élé­ment. Cette théorie formera désormais une des branches les plus importantes de la physique gé­nérale~\cite{fourier1822}. 
-\end{selectlanguage}
+\end{selectlanguage}%
  
-\begin{selectlanguage}{spanish}
+\begin{selectlanguage}{spanish}%
 \begin{abstract*}
 Este es el resumen del artículo. Escribimos en español. Se describen el problema, los métodos y los resultados. También se incluyen referencias.
 \end{abstract*}
 \end{selectlanguage}% edited by Aarón Montoya-Moraga
 
-%% If you have trouble with the following passages, your file may not be saved in utf-8 format. You can delete this stuff to resolve the issue.
-\typeout{If you have trouble with the following passages, your file may not be saved in utf-8 format. You can delete those lines to resolve the issue.}
-%% Examples of abstracts in other languages. The first two are intended for pdflatex, not lualatex.
+%% If you have trouble with the following passages, you may deleting this stuff and remove the associated language option from \documentclass[..].
+\typeout{If you have trouble with the following passages, your file may not be saved in utf-8 format, or your LaTeX format may be old, or you may not have the assumed font installed. You can delete those lines to resolve the issue.}
+
+%% Examples of abstracts in other languages. The first three are intended for pdflatex, not lualatex.
 \ifpdftex
     \begin{selectlanguage}{greek}%
     \begin{abstract*}
@@ -594,15 +591,15 @@ Este es el resumen del artículo. Escribimos en español. Se describen el proble
     Это резюме статьи. Пишем по русски. Описаны проблема, методы и результаты. Библиография также включена.%
     \end{abstract*}
     \end{selectlanguage}% edited by Steven Gerasimoff
-\fi
-
-\begin{selectlanguage}{vietnamese}
-\begin{abstract*}
-Đây là phần tóm tắt của bài báo khoa học. Chúng tôi viết bằng tiếng Việt. Vấn đề, các phương pháp và các kết quả được mô tả trong phần này. Tài liệu tham khảo cũng được bao gồm.
-\end{abstract*}
-\end{selectlanguage}% Checked and edited by Nguyen Le and Thao Nguyen
     
-\iffontspecloaded
+    \begin{selectlanguage}{vietnamese}
+    \begin{abstract*}
+    Đây là phần tóm tắt của bài báo khoa học. Chúng tôi viết bằng tiếng Việt. Vấn đề, các phương pháp và các kết quả được mô tả trong phần này. Tài liệu tham khảo cũng được bao gồm.
+    \end{abstract*}
+    \end{selectlanguage}% Checked and edited by Nguyen Le and Thao Nguyen
+\fi
+   
+\iffontspecloaded %%% requires lualatex
 %
     \begin{selectlanguage}{greek}%
     \begin{abstract*}
@@ -616,12 +613,18 @@ Este es el resumen del artículo. Escribimos en español. Se describen el proble
     \end{abstract*}
     \end{selectlanguage}% edited by Steven Gerasimoff
 %
-    \begin{selectlanguage}{japanese}% be sure to call class option [japanese]
+    \begin{selectlanguage}{vietnamese}
     \begin{abstract*}
-    %論文の要約です。日本語で記述します。問題、方法、および結果について説明します。また、参考文献も含めます。           
-    この論文の日本語での要約は以下のとおりです。問題、方法、および結果が説明されています。参考資料も添付してあります。
+    Đây là phần tóm tắt của bài báo khoa học. Chúng tôi viết bằng tiếng Việt. Vấn đề, các phương pháp và các kết quả được mô tả trong phần này. Tài liệu tham khảo cũng được bao gồm.
     \end{abstract*}
-    \end{selectlanguage}% Edited by Keiji Yano and Yoshiki Okamoto
+    \end{selectlanguage}% Checked and edited by Nguyen Le and Thao Nguyen
+%
+%    \begin{selectlanguage}{japanese}% Use class option [japanese] if you uncomment this passage.
+%    \begin{abstract*}
+%    % 論文の要約です。日本語で記述します。問題、方法、および結果について説明します。また、参考文献も含めます。           
+%    この論文の日本語での要約は以下のとおりです。問題、方法、および結果が説明されています。参考資料も添付してあります。
+%    \end{abstract*}
+%    \end{selectlanguage}% Edited by Keiji Yano and Yoshiki Okamoto
 %
     \begin{selectlanguage}{korean}
     \begin{abstract*}
@@ -641,28 +644,3 @@ Este es el resumen del artículo. Escribimos en español. Se describen el proble
 
 \end{document}
 
-
-%%% This is the set-up for the traditional author block style (a grid of blocks) using option [authorgrid]
-
-% Change to your name[s] and addresses, in the desired order of authors. Up to nine author blocks.
-% Note usage below for joint first authors and for corresponding author.
-% First name, middle initial, last name
-% Use title case (upper and lower case letters)
-%    (Most of the names below are not real people, just very common names.)
-
-\SetAuthorBlock{Luis Hern\'{a}ndez\JointFirstAuthor}{Institution or Company Name \\ City, State} 
-\SetAuthorBlock{Maria Silva\JointFirstAuthor}{Institution or Company Name \\ City, Province, Canada}
-
-\SetAuthorBlock{Henry Tudor, Catherine Parr\CorrespondingAuthor{}}{Hampton Court Palace \\ Richmond, England}
-\SetAuthorBlock{Jinsoo Kim}{Institution or Company Name \\ City, Country}
-\SetAuthorBlock{Yusuf Yilmaz}{Institution or Company Name \\ City, Country}
-
-% Give an empty argument for \CorrespondingAuthor{} if you are putting email into address block.
-% Can also put multiple emails into the argument and use command more than once for multiple 
-% corresponding authors. Only the *last* set of emails issued will be printed.
-
-\SetAuthorBlock{John H.\ Lienhard V\CorrespondingAuthor{lienhard@mit.edu, kate@thepalace.com}\JointFirstAuthor}{%
-Massachusetts Institute of Technology \\  Cambridge, MA}
-
-% be sure to issue [authorgrid] option when using this (otherwise your authorblock will not display!)
-
diff --git a/macros/latex/contrib/asmeconf/asmeconf.bst b/macros/latex/contrib/asmeconf/asmeconf.bst
index 1dcbf48a66..aec731ec0a 100644
--- a/macros/latex/contrib/asmeconf/asmeconf.bst
+++ b/macros/latex/contrib/asmeconf/asmeconf.bst
@@ -4,7 +4,7 @@
 %%%%% ***   https://www.asme.org/publications-submissions/proceedings/author-guidelines/elements-of-a-paper/references  ***
 %%%%% ***   The examples given by ASME do *not* cover all possibilities               									***
 %%%%%
-%%%%%  This file is version 1.12 dated 2021/01/04
+%%%%%  This file is version 1.13 dated 2021/12/02
 %%%%%
 %%%%%       Author: John H. Lienhard V
 %%%%%               Department of Mechanical Engineering
@@ -26,6 +26,10 @@
 %%%%% Added: urlprefix = {}, format.web.urldate, bbl.urldate; urltype field changes "accessed" to something else. 
 %%%%% Added: venue and eventdate to @inproceedings
 %%%%%
+%%%%% Edits in version 1.13, 2021/12/02
+%%%%%		Switched remaining http:// prefixes to https://
+%%%%%		Replace \href{}{} in \eprint by \url
+%%%%%
 %%%%% Edits in version 1.12, 2021/01/04: 
 %%%%% 		Added fields: version={}, format.version, to @book, @inbook, @online, @manual; 
 %%%%%					  versiontype = {}, with bbl.version, changes "Version" to other
@@ -445,16 +449,16 @@ FUNCTION {eng.ord}
 
 MACRO {arxiv} {"https://arxiv.org/abs/"}
 
-MACRO {googlebooks} {"http://books.google.com/books?id="}
+MACRO {googlebooks} {"https://books.google.com/books?id="}
 
-MACRO {hdl}  {"http://hdl.handle.net/"}
-MACRO {hndl} {"http://hdl.handle.net/"}
+MACRO {hdl}  {"https://hdl.handle.net/"}
+MACRO {hndl} {"https://hdl.handle.net/"}
 
-MACRO {jstor} {"http://www.jstor.org/stable/"}
+MACRO {jstor} {"https://www.jstor.org/stable/"}
 
-MACRO {oclc} {"http://www.worldcat.org/oclc/"}
+MACRO {oclc} {"https://www.worldcat.org/oclc/"}
 
-MACRO {pubmed} {"http://www.ncbi.nlm.nih.gov/pubmed/"}
+MACRO {pubmed} {"https://www.ncbi.nlm.nih.gov/pubmed/"}
 
 
 MACRO {amr} {"Appl. Mech. Rev."}
@@ -1758,7 +1762,7 @@ FUNCTION {begin.bib}
   write$ newline$
   "  \providecommand{\doi}{DOI \discretionary{}{}{}\begingroup \urlstyle{rm}\Url}\fi"
   write$ newline$
- "\providecommand{\eprint}[2][]{\urlprefix\href{#1#2}{#1#2}}"
+ "\providecommand{\eprint}[2][]{\urlprefix\url{#1#2}}"
   write$ newline$
 }
 EXECUTE {begin.bib}
diff --git a/macros/latex/contrib/asmeconf/asmeconf.cls b/macros/latex/contrib/asmeconf/asmeconf.cls
index de5fc86ca2..7ed5a6ca17 100644
--- a/macros/latex/contrib/asmeconf/asmeconf.cls
+++ b/macros/latex/contrib/asmeconf/asmeconf.cls
@@ -2,11 +2,11 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%
 %%  This file provides the asmeconf LaTeX class for formatting conference papers according to 
-%%  ASME conference requirements as represented on ASME's conference web pages in 2020.
+%%  ASME conference requirements as represented on ASME's conference web pages in 2021.
 %%
 %%  This file's version and date:
-	\def\versionno{1.26}
-	\def\versiondate{2021/02/20\space}
+	\def\versionno{1.27}
+	\def\versiondate{2021/12/26\space}
 %%
 %%  Author: John H. Lienhard, V
 %%          Department of Mechanical Engineering
@@ -16,7 +16,7 @@
 %%  This LaTeX template was designed to approach the following aims:
 %%
 %%          1. Match ASME's current layout and font specifications
-%%          2. With amseconf.bst, match ASME's reference formats and support DOI & URL fields
+%%          2. With amseconf.bst, match ASME's reference formats including DOI & URL (replaces asmems4.bst)
 %%          3. Provide hyperref compatibility for hyperlinks, pdf bookmarks, and metadata
 %%          4. Set author names in either the traditional grid or the more recent inline style
 %%          5. Support citations, footnotes, and bold face, sans serif math in section headings
@@ -31,6 +31,8 @@
 %%  access language-specific fonts), but the class does not support unicode-math. All packages required
 %%  by the class are in TeXLive and CTAN (https://ctan.org/). 
 %%
+%%	Use an up-to-date LaTeX distribution: for pdfLaTeX, TeX Live 2016 or later; for LuaLaTeX, TeX Live 2021 or later.
+%%
 %%  Commands for entering conference headers and author names are specific to this class.
 %%  See asmeconf-template.tex for details.
 %%
@@ -69,12 +71,52 @@
 \LoadClass[twoside,twocolumn,10pt]{article}
 % Even/odd page layout is not used in ASME's specs, although the papers are printed in two-sided format.
 
-%%%%%%%%%%%%%% Options for the class %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\ifdefined\NewDocumentCommand\else
+  \RequirePackage{xparse} % enable older installations to access features recently moved into LaTeX kernel
+\fi
 
-\RequirePackage{xparse} % access features not yet moved into the LaTeX kernel
 \RequirePackage{etoolbox}
 \RequirePackage{ifthen}
-\RequirePackage{iftex} 	% check whether pdftex or another engine is used
+
+%%%%%%%%%%%%%  Test compatibility of older distributions  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\providecommand\IfFormatAtLeastTF{\@ifl@t@r\fmtversion}% compare version to date (thanks Ulrike Fischer)
+
+\IfFormatAtLeastTF{2017/01/01}{%
+	\ClassInfo{asmeconf}{Your LaTeX format is dated \fmtversion. LaTeX distributions 2020 or later are strongly recommended for best results}
+	}{%
+	\ClassError{asmeconf}{Your LaTeX format is dated \fmtversion.  Formats dated 2020 or later are recommended for the asmeconf class. Older formats may generate errors}{Please UPDATE your LaTeX distribution to obtain best results. TeX Live is available for download at no charge: \string https://www.tug.org/texlive/.  You can try to click past the errors for now.}%
+}
+	
+\DeclareDocumentCommand\LogNote{m}{%   
+	\IfFormatAtLeastTF{2021/11/01}{% 
+		\ClassNoteNoLine{asmeconf}{#1}%
+		}{%
+	    \ClassWarningNoLine{asmeconf}{#1}%
+	}
+}
+
+%% provide iftex command \ifpdftex for those still running old distributions
+\IfFormatAtLeastTF{2019/11/07}{% 
+	\RequirePackage{iftex}% check whether pdftex or another engine is used
+	}{% 
+    \LogNote{The asmeconf class requires the missing package iftex---trying a work-around.}
+	% Code copied from iftex package written by the LaTeX3 Project (used under LPPL).
+    % \csname and \let construct useful for hiding \ifzzz tokens from outer level \if tests.
+    \def\IFTEX@let#1#2{%
+      \expandafter\let\csname if#1\expandafter\endcsname
+      \csname if#2\endcsname}
+    % pdftex (including in dvi mode)
+    \begingroup\expandafter\expandafter\expandafter\endgroup
+    \expandafter\ifx\csname pdftexversion\endcsname\relax
+      \IFTEX@let{pdftex}{false}
+    \else
+      \IFTEX@let{pdftex}{true}
+    \fi
+    \IFTEX@let{PDFTeX}{pdftex}
+}
+
+%%%%%%%%%%%%%% Options for the class %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 \RequirePackage{kvoptions}
 \SetupKeyvalOptions{
@@ -85,6 +127,11 @@
   setkeys=\kvsetkeys,
 }
 
+%%% set key [colorlinks] to have colored hyperlinks, rather than black links (use a key with new pdfmanagement, 2021/12/01)
+\define@key{asmeconf}{colorlinks}[colorlinks]{%
+  \PassOptionsToPackage{#1}{hyperref}%
+}
+
 %%% for mathalfa, we may now pass options in this format:  mathalfa=cal=euler, mathalfa=frak=boondox
 \define@key{asmeconf}{mathalfa}{%
   \PassOptionsToPackage{#1}{mathalfa}%
@@ -119,7 +166,7 @@
 	  \ac@mainsettrue
 	  \ifthenelse{\equal{#1}{english}}{%
 			\PassOptionsToPackage{pdflang=en}{hyperref}}{%
-		  	\ClassWarningNoLine{asmeconf}{Selecting #1 as the primary language}%
+			\LogNote{Selecting #1 as the primary language}%
 			\ifthenelse{\equal{#1}{greek}}{%
 				\ac@greektrue
 				\def\ac@LGR{LGR}%
@@ -147,7 +194,7 @@
 	  \ac@mainsettrue%
 	  \ifthenelse{\equal{#1}{english}}{%
 			\relax}{%
-		  	\ClassWarningNoLine{asmeconf}{Selecting #1 as the primary language}%
+			\LogNote{Selecting #1 as the primary language}%
 	  }%
 }
 \define@key{asmeconf}{lang-second}[english]{% deprecated option
@@ -157,13 +204,14 @@
       \PassOptionsToPackage{#1}{babel}%
 }
 
+\DeclareDefaultOption{}% suppress warning about unused mathalfa option, 2021/06/15
 \ProcessKeyvalOptions{asmeconf}
 
 %% if main language was not chosen explicitly, default to English
 \ifac@mainset\relax\else
 	\PassOptionsToPackage{main=english}{babel}%
 	\PassOptionsToPackage{pdflang=en}{hyperref}
-	%\ClassWarningNoLine{asmeconf}{Selecting English as the primary language, since main= not set}%
+	\ClassInfo{asmeconf}{Selecting English as the primary language, since main= not set}%
 \fi
 
 %% Turn off these keys now that we're done with them
@@ -176,30 +224,30 @@
 }
 \NewDocumentCommand\@DisableKeys{>{\SplitList{;}}m}{\ProcessList{#1}{\ac@DisableOption}}
 
-\@DisableKeys{main;lang;nodefaultsups;mathalfa;lang-second;lang-third}
+\@DisableKeys{main;lang;nodefaultsups;mathalfa;lang-second;lang-third;vietnamese}
+
 
 %%%%%%%%%%%%%   More Language options  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-%%% option to use fontspec [fontspec] (e.g, if you need complex language-specific fonts)
+%%% option to use fontspec [fontspec] (for complex language-specific fonts)
 \newif\ifac@fontspec\ac@fontspecfalse
 \newif\iffontspecloaded\fontspecloadedfalse% so user can test in .tex file
 \DeclareOption{fontspec}{%
 	\ifpdftex
 		\ClassWarningNoLine{asmeconf}{fontspec option requires LuaLaTeX, will be ignored under pdfLaTeX}%
 	\else
-		\ac@fontspectrue
-		\fontspecloadedtrue
-	    \def\ssztwo{}% for Inconsolatazi4; default uses slashed zero, +ss02 uses regular zero
-	    \def\MonoNotMono{WordSpace={1,1.33,1.67}}% for Inconsolatazi4; default allows word spacing (is not mono)	
+        \IfFormatAtLeastTF{2020/10/01}{%
+        	\ClassInfo{asmeconf}{Your LaTeX format is dated \fmtversion. LaTeX distributions after 2020 are needed with [fontspec] for language support}
+    		\ac@fontspectrue
+    		\fontspecloadedtrue
+    	    \def\ssztwo{}% for Inconsolatazi4; default uses slashed zero, +ss02 uses regular zero
+    	    \def\MonoNotMono{WordSpace={1,1.33,1.67}}% for Inconsolatazi4; default allows word spacing (is not mono)	
+        	}{%
+        	\ClassError{asmeconf}{Your LaTeX format is dated \fmtversion.  LaTeX installations dated 2020/10/01 or later are needed for the [fontspec] option. Option [fontspec] will be ignored. Language support will be minimal}{Please UPDATE your LaTeX distribution to obtain best results. TeX Live is available for download at no charge: \string https://www.tug.org/texlive/}%
+        }
 	\fi
 }
 
-\DeclareOption{greek}{%
-	\PassOptionsToPackage{greek}{babel}%
-	\ac@greektrue
-	\def\ac@LGR{LGR}%
-}
-
 \DeclareOption{japanese}{% mainly to control loading of fontspec options
 	\ifac@fontspec	
 		\PassOptionsToPackage{japanese}{babel}%
@@ -209,6 +257,12 @@
 	\fi
 }
 
+\DeclareOption{greek}{%
+	\PassOptionsToPackage{greek}{babel}%
+	\ac@greektrue
+	\def\ac@LGR{LGR}%
+}
+
 %% Cyrillic languages
 \NewDocumentCommand\@CyrOptions{>{\SplitList{;}}m}{\ProcessList{#1}{\@CyrOptSet}}
 \NewDocumentCommand\@CyrOptSet{m}{%
@@ -248,25 +302,28 @@
 
 \ifpdftex %% PDF/A compliance has only been configured for pdflatex
 %
-%%% set key [pdfa] to activate pdf/a compliance (default is pdf/A-3u)
+	%%% set key [pdfa] to activate pdf/a compliance (default is pdf/A-3u)
 	\define@key{pdfaopt}{pdf-a}[true]{%
       \ac@setpdfatrue
-      \PassOptionsToPackage{pdfa,pdfapart=3,pdfaconformance=u}{hyperref}%
+      \PassOptionsToPackage{pdfa,pdfapart=3,pdfaconformance=u}{hyperref}% note: hyperref takes these options if hyperxmp is loaded
 	}
-%%% to select part 1, 2 or 3 
+	%%% to select part 1, 2 or 3 
 	\define@key{pdfaopt}{pdfapart}[3]{%
       \PassOptionsToPackage{pdfapart=#1}{hyperref}%
 	  \ifthenelse{\equal{#1}{1}}{\ac@pdfaonetrue}{\relax}%
 	}
-%%% to select conformance b or u.  NB: a is not possible with pdfLaTeX, and u is not possible with 1.
+	%%% to select conformance b or u.  NB: a is not possible with pdfLaTeX, and u is not possible with 1.
 	\define@key{pdfaopt}{pdfaconformance}[u]{%
       \PassOptionsToPackage{pdfaconformance=#1}{hyperref}%
 	}
-	\ProcessKeyvalOptions{pdfaopt}%
 \else
-	\ifac@pdfaone\ClassWarningNoLine{asmeconf}{PDF/A compliance option requires pdfLaTeX engine}\fi
+	\define@key{pdfaopt}{pdf-a}[true]{%
+      \ac@setpdfatrue
+    }
 \fi
 
+\ProcessKeyvalOptions{pdfaopt}%
+
 %% Done with these keys, so we can now disable them
 \def\@KeyFamily{pdfaopt}
 \@DisableKeys{pdf-a;pdfapart;pdfaconformance}
@@ -277,8 +334,8 @@
 %%% option to balance column height on last page [balance] 
 \newif\ifac@balance\ac@balancefalse
 \DeclareOption{balance}{%
-      \ac@balancetrue
-	  \ClassWarningNoLine{asmeconf}{Loading flushend package to balance column height on last page}%
+	\ac@balancetrue
+	\LogNote{Loading flushend package to balance column height on last page}%
 }
 
 %%% option to obtain line numbers [lineno] 
@@ -298,15 +355,21 @@
 \newif\ifac@govt\ac@govtfalse
 \DeclareOption{govt}{\ac@govttrue}
 
-%% option to use grid of authors
+%% option to convert inline author data to a grid of authors
+\newboolean{grid}\setboolean{grid}{false}
+\DeclareOption{grid}{%
+	\setboolean{grid}{true}%
+	\LogNote{Selected option for a grid of author blocks}%
+}
+%% option to directly use grid of authors
 \newboolean{Oldauthors}\setboolean{Oldauthors}{false}
 \DeclareOption{authorgrid}{%
-      \setboolean{Oldauthors}{true}%
-	  \ClassWarningNoLine{asmeconf}{Selected option for a grid of author blocks}%
+	\setboolean{Oldauthors}{true}%
+	\LogNote{Selected option for a grid of author blocks}%
 }
 \DeclareOption{oldauthors}{%% deprecated, but retained for backward compatibility
-      \setboolean{Oldauthors}{true}%
-	  \ClassWarningNoLine{asmeconf}{Selected option for a grid of author blocks}%
+	\setboolean{Oldauthors}{true}%
+	\LogNote{Selected option for a grid of author blocks}%
 }
 
 %% option for slightly larger small capitals font, via newtxtext
@@ -329,7 +392,7 @@
 		\ClassWarningNoLine{asmeconf}{hyphenate option is not supported by fontspec, will be ignored}%
 	\else
 		\PassOptionsToPackage{hyphenate}{inconsolata}% hyphenate is a key via xkeyval in inconsolata
-		\ClassWarningNoLine{asmeconf}{Allowing hyphenation of typewriter font}%
+		\LogNote{Allowing hyphenation of typewriter font}%
 	\fi
 }
 %% option for monospacing in typewriter font [mono].
@@ -369,7 +432,7 @@
 \setlength\bibsep{1pt plus 1pt minus 1pt}
 
 \RequirePackage{graphicx} 
-\ifpdf\def\MyColorOption{fixpdftex}\else\ifluatex\def\MyColorOption{luatex}\else\def\MyColorOption{}\fi\fi
+\ifpdftex\def\MyColorOption{fixpdftex}\else\ifluatex\def\MyColorOption{luatex}\else\def\MyColorOption{}\fi\fi
 \RequirePackage[hyperref,\MyColorOption,dvipsnames,svgnames,x11names]{xcolor}
 
 %%%%%%%%%%%%  Table related %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -378,12 +441,12 @@
 \RequirePackage{array} 
 
 \RequirePackage{dcolumn}% alignment on decimal places 
-\newcolumntype{d}[1]{D{.}{.}{#1}}% NB: This conflicts with babel's spanish language option which makes "." an active character.
-								 % To use "," separator, put this in preamble: \newcolumntype{d}[1]{D{,}{,}{#1}}
+\newcolumntype{d}[1]{D{.}{.}{#1}}% NB: This conflicts with babel's Spanish language option which makes "." an active character.
+								 % To use "," separator, put this command in your preamble: \newcolumntype{d}[1]{D{,}{,}{#1}}
 
-%%%%%%%%%%%%  Font related  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%  PDF/A compliance related  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-\ifpdftex % moved fontenc 31 Jan 2021
+\ifpdftex % moved fontenc 2021/01/31
 	\ifac@pdfaone
 		\pdfminorversion=4 % for pdf/a-1 need version 4, not 7
 	\else
@@ -392,13 +455,48 @@
 	\RequirePackage[T1,\ac@TtwoA,\ac@LGR,\ac@Tfive]{fontenc}% T2A to support Cyrillic (w/o babel warning); LGR - Greek; T5 - Vietnamese
   	\RequirePackage[utf8]{inputenc} % for backward compatibility with pre-2018 LaTeX distributions
 \else
-  	\ifluatex
-		\relax
+	\ifluatex
+		\ifac@setpdfa\ClassWarningNoLine{asmejour}{pdf-a option requires pdfLaTeX engine. Under LuaLaTeX, use %
+			\protect\DeclareDocumentMetadata{pdfstandard=A-3b} before \protect\begin{document}}%
+		\fi
+    	\directlua{
+            if pdf.getminorversion() \string~= 7 then
+              if (status.pdf_gone and status.pdf_gone > 0)
+              or (status.pdf_ptr and status.pdf_ptr > 0) then
+                tex.error("PDF version cannot be changed anymore")
+              else
+                pdf.setminorversion(7)
+              end
+            end
+        }
 	\else 
   		\ClassError{asmeconf}{Please use either pdfLaTeX or LuaLaTeX}{This class has NOT been configured to support other engines, and the results will be unpredictable. Your best course of action is to exit and rerun using either pdfLaTeX or LuaLaTeX.}%
 	\fi
 \fi
 
+%%%%%%%%%  Caption related  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%% Needs to come before babel messes with captions, to keep uppercase text. 2021/12/25
+
+\RequirePackage{textcase} %% Allows uppercase titles and captions without errors from math and citations
+
+\RequirePackage[labelfont={sf,bf},hypcap=false]{caption}
+\RequirePackage[hypcap=false,list=true]{subcaption}
+
+\DeclareCaptionLabelFormat{uppercase}{\MakeTextUppercase{#1} #2}
+\DeclareCaptionTextFormat{boldmath}{\mathversion{sansbold}#1}
+\captionsetup[figure]{labelformat=uppercase, labelfont={sf,bf,small},textfont={sf,bf,small},textformat=boldmath,labelsep=colon}
+\captionsetup[table]{labelformat=uppercase, labelfont={sf,bf,small},textfont={sf,bf,small},textformat=boldmath,labelsep=colon,skip=0.5\baselineskip} %name=TABLE,
+
+%% This construction avoids a failure of hyperref in relation to uppercase caption
+%% Discussion: https://tex.stackexchange.com/questions/375695/maketextuppercase-inside-table-captions
+\AtBeginDocument{
+   \let\scaption\caption
+   \renewcommand*{\caption}[2][\shortcaption]{\def\shortcaption{#2}\scaption[#1]{\MakeTextUppercase{#2}}}
+}
+
+%%%%%%%%%%%%  Font related  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
 \RequirePackage{mathtools}% loads and extends amsmath
 \RequirePackage[]{babel}
 
@@ -408,22 +506,22 @@
     \RequirePackage[]{newtxmath}
 \else
     \ifac@fontspec
-        \RequirePackage[varqu,varl]{inconsolata}% typewriter font for math
-        \renewcommand*{\sfdefault}{qhv}         % sans font for math
-        \renewcommand{\rmdefault}{ntxtlf}       % roman font for math
-        \RequirePackage[]{newtxmath}			% newtxmath still handles mathematics
-        
+        \RequirePackage[varqu,varl]{inconsolata}  % typewriter font for math
+        \renewcommand\rmdefault{ntxtlf}           % roman font for math
+		\RequirePackage[T1]{fontenc} 			  % qhv is not TU encoded, 2021/12/24
+	        \DeclareFontFamily{T1}{\sfdefault}{}  % sf for math
+	        \DeclareFontShape{T1}{\sfdefault}{m}{n}{<-> s*[0.9] ec-qhvr}{} %% see t1qhv.fd
+        \RequirePackage[]{newtxmath}			  % newtxmath still handles mathematics        
         \RequirePackage[no-math]{fontspec}
-        \defaultfontfeatures{Ligatures= TeX,}
+        \defaultfontfeatures{Ligatures=TeX,}
 %        
         \setmainfont{TeXGyreTermesX}[% Presumes these are system fonts! Available at: http://www.gust.org.pl/projects/e-foundry/tex-gyre
- 			WordSpace = {1,1.4,1},%% This stretch matches newtxtext a little better.
+ 			WordSpace = {1,1.4,1},%% This stretch matches newtxtext a little better. 1.4
         	Extension = .otf,
         	UprightFont = *-Regular,
         	ItalicFont = *-Italic,
         	BoldFont = *-Bold,
         	BoldItalicFont = *-BoldItalic,
-        	Ligatures= TeX,
 			Numbers = Lining,
 			]
         \setsansfont{texgyreheros}[% Presumes these are system fonts! Available at: http://www.gust.org.pl/projects/e-foundry/tex-gyre
@@ -433,7 +531,6 @@
         	ItalicFont = *-italic,
         	BoldFont = *-bold,
         	BoldItalicFont = *-bolditalic,
-        	Ligatures = TeX,
 			Numbers = Lining,
         	Scale=0.9,
 			]        
@@ -445,21 +542,20 @@
             ItalicFont = *-Regular,% has no italic face
             BoldFont = *-Bold, 
         	BoldItalicFont = *-Bold,% has no italic face
-	        Ligatures = TeX,
             RawFeature = {+ss01,\ssztwo,+ss03},
             ]          
 %    
         % For many languages, using babel commands helps font loading. 
         % Noto fonts are available at https://github.com/googlefonts
     	\def\Noto@scale{0.92}
-	   	\def\NotoAra@scale{0.91}% The serif font only
+	   	\def\Ara@scale{0.91}% For the serif font only
     	\def\NotoBan@scale{0.92}% 1.} should probably stay consistent within the Noto family.
     	\def\NotoDev@scale{0.92}% 1.} should probably stay consistent within the Noto family.
     	\def\NotoTam@scale{0.92}
 		\def\Noto@color{black}	
 %
         \babelprovide[import, language=Default]{arabic}
-        \babelfont [arabic]{rm}[Scale=\NotoAra@scale,
+        \babelfont [arabic]{rm}[Scale=\Ara@scale,
 	 		 Renderer=HarfBuzz,
              Extension = .ttf,
 			 UprightFont = *-Regular,
@@ -521,9 +617,33 @@
 		\NewDocumentCommand\@LoadBabelCyr{>{\SplitList{;}}m}{\ProcessList{#1}{\@CyrillicBabel}}
 		\NewDocumentCommand\@CyrillicBabel{m}{%
         	\babelprovide[import,language=Default,script=Cyrillic]{#1}
-            \babelfont [#1]{rm}[Scale=\Noto@scale,Color=\Noto@color]{NotoSerif}
-            \babelfont [#1]{sf}[Scale=\Noto@scale,Color=\Noto@color]{NotoSans}
-            \babelfont [#1]{tt}[Scale=\Noto@scale,Color=\Noto@color]{NotoSansMono}
+            \babelfont [#1]{rm}[%
+            	Scale=\Noto@scale,
+    			Color=\Noto@color,
+    			Extension = .ttf,
+                UprightFont = *-Regular,
+                ItalicFont = *-Italic,
+                BoldFont = *-Bold, 
+            	BoldItalicFont = *-BoldItalic,%
+            ]{NotoSerif}
+            \babelfont [#1]{sf}[%
+            	Scale=\Noto@scale,
+				Color=\Noto@color,
+   				Extension = .ttf,
+                UprightFont = *-Regular,
+                ItalicFont = *-Italic,
+                BoldFont = *-Bold, 
+            	BoldItalicFont = *-BoldItalic,%
+			]{NotoSans}
+            \babelfont [#1]{tt}[%
+            	Scale=\Noto@scale,
+				Color=\Noto@color,
+				Extension = .ttf,
+				UprightFont = *-Regular,
+    			ItalicFont = *-Regular,% has no italic face
+    			BoldFont = *-Bold, 
+            	BoldItalicFont = *-Bold,% has no italic face
+			]{NotoSansMono}
 		}
 		\@LoadBabelCyr{russian;belarusian;bulgarian;macedonian;serbian-cyrillic;ukrainian}% serbianc has no .ini under fontspec
 		\setlocalecaption{serbian-cyrillic}{abstract}{Сажетак}% NB: utf-8
@@ -564,20 +684,70 @@
             	 BoldItalicFont = *-Bold,% has no italic face
 			 ]{NotoSansDevanagari}		
 		}
-		\@LoadBabelDev{hindi;marathi;kashmiri;nepali;sanskrit}% no .ldf files for these languages, but they do have .ini. Nepali: no abstractname
+		\@LoadBabelDev{hindi;marathi;kashmiri;nepali;sanskrit}
+		% No .ldf files for these languages, but they do have .ini files. Nepali: no abstractname
 %
 		% Greek
 		\babelprovide[import,language=Default]{greek}
-        \babelfont [greek]{rm}[Scale=\Noto@scale,WordSpace={1.1},Color=\Noto@color]{NotoSerif}% increase word spacing slightly
-        \babelfont [greek]{sf}[Scale=\Noto@scale,WordSpace={1.1},Color=\Noto@color]{NotoSans}
-        \babelfont [greek]{tt}[Scale=\Noto@scale,Color=\Noto@color]{NotoSansMono}
+        \babelfont [greek]{rm}[%
+        	Scale=\Noto@scale,
+			WordSpace={1.1},% increase word spacing slightly
+			Color=\Noto@color,
+			Extension = .ttf,
+            UprightFont = *-Regular,
+            ItalicFont = *-Italic,
+            BoldFont = *-Bold, 
+        	BoldItalicFont = *-BoldItalic,%
+		]{NotoSerif}
+        \babelfont [greek]{sf}[%
+        	Scale=\Noto@scale,
+			WordSpace={1.1},% increase word spacing slightly
+			Color=\Noto@color,
+			Extension = .ttf,
+            UprightFont = *-Regular,
+            ItalicFont = *-Italic,
+            BoldFont = *-Bold, 
+        	BoldItalicFont = *-BoldItalic,%
+		]{NotoSans}
+        \babelfont [greek]{tt}[%
+            Scale=\Noto@scale,
+			Color=\Noto@color,
+			Extension = .ttf,
+			UprightFont = *-Regular,
+    		ItalicFont = *-Regular,% has no italic face
+    		BoldFont = *-Bold, 
+            BoldItalicFont = *-Bold,% has no italic face
+		]{NotoSansMono}
 %      
         % Japanese
         \ifac@japanese
         	\RequirePackage[match]{luatexja-fontspec}% japanese typesets *much* better with this loaded
-            \setmainjfont{NotoSerifCJKjp}[Scale=\Noto@scale,Color=\Noto@color]
-            \setsansjfont{NotoSansCJKjp}[Scale=\Noto@scale,Color=\Noto@color]
-            \setmonojfont{NotoSansMonoCJKjp}[Scale=\Noto@scale,Color=\Noto@color]
+            \setmainjfont{NotoSerifCJKjp}[%
+            	Scale=\Noto@scale,
+				Color=\Noto@color,
+%    			Extension = .otf,
+    			UprightFont = *-Regular,
+    			ItalicFont = *-Regular,% has no italic face
+    			BoldFont = *-Bold, 
+            	BoldItalicFont = *-Bold,% has no italic face
+			]
+            \setsansjfont{NotoSansCJKjp}[%
+            	Scale=\Noto@scale,
+				Color=\Noto@color,
+%    			Extension = .ttc,
+    			UprightFont = *-Regular,
+    			ItalicFont = *-Regular,%  has no italic face
+    			BoldFont = *-Bold, 
+            	BoldItalicFont = *-Bold,% has no italic face
+			]
+            \setmonojfont{NotoSansMonoCJKjp}[%
+            	Scale=\Noto@scale,
+				Color=\Noto@color,	
+    			UprightFont = *-Regular,
+    			ItalicFont = *-Regular,%  has no italic face
+    			BoldFont = *-Bold, 
+            	BoldItalicFont = *-Bold,% has no italic face
+			]
             \ltjsetparameter{jacharrange={-1, -2, +3, -4, -5, +6, +7, +8}}% this prevents luatexja from breaking Russian and Greek.
             % see: https://tex.stackexchange.com/questions/222320/russian-in-document-with-japanese-as-main-language-lualatex-ltjsarticle
     		% Need at least one of the following to load the Japanese dictionary.
@@ -593,13 +763,21 @@
         	\babelfont [japanese]{sf}[%
             	Scale=\Noto@scale,
     			Color=\Noto@color,
-    			Extension = .ttc,
+ %   			Extension = .ttc,
     			UprightFont = *-Regular,
     			ItalicFont = *-Regular,%  has no italic face
     			BoldFont = *-Bold, 
             	BoldItalicFont = *-Bold,% has no italic face
-			]{NotoSansCJK}
-            \babelfont [japanese]{tt}[Scale=\Noto@scale,Color=\Noto@color]{NotoSansMonoCJKjp}% renders same as Sans!
+			]{NotoSansCJKjp}
+            \babelfont [japanese]{tt}[%
+            	Scale=\Noto@scale,
+				Color=\Noto@color,
+%				Extension = .ttc,
+				UprightFont = *-Regular,
+				ItalicFont = *-Regular,%  has no italic face
+				BoldFont = *-Bold, 
+        		BoldItalicFont = *-Bold,% has no italic face
+			]{NotoSansMonoCJKjp}% renders same as Sans!
 		\fi
 		% Note: \japaneseabstractname is not defined if japanese is not called as a package option.
 				
@@ -623,7 +801,15 @@
 			BoldFont = *-Bold, 
         	BoldItalicFont = *-Bold,% has no italic face
 		]{NotoSansCJK}
-        \babelfont [korean]{tt}[Scale=\Noto@scale,Color=\Noto@color]{NotoSansMonoCJKkr}
+        \babelfont [korean]{tt}[%
+        	Scale=\Noto@scale,
+			Color=\Noto@color,
+%			Extension = .ttc,
+			UprightFont = *-Regular,
+			ItalicFont = *-Regular,%  has no italic face
+			BoldFont = *-Bold, 
+        	BoldItalicFont = *-Bold,% has no italic face
+		]{NotoSansMonoCJKkr}
         \renewcommand\koreanabstractname{초록}% NB: utf-8
 
 		% Simplified Chinese
@@ -646,7 +832,15 @@
 			BoldFont = *-Bold, 
         	BoldItalicFont = *-Bold,% has no italic face
 		]{NotoSansCJK}
-        \babelfont [chinese-simplified]{tt}[Scale=\Noto@scale,Color=\Noto@color]{NotoSansMonoCJKsc}
+        \babelfont [chinese-simplified]{tt}[%
+        	Scale=\Noto@scale,
+			Color=\Noto@color,
+%			Extension = .ttc,
+			UprightFont = *-Regular,
+			ItalicFont = *-Regular,%  has no italic face
+			BoldFont = *-Bold, 
+        	BoldItalicFont = *-Bold,% has no italic face
+		]{NotoSansMonoCJKsc}
 %
 		% Traditional Chinese (includes characters for Cantonese also)
 		\babelprovide[import,language=Default]{chinese-traditional}
@@ -740,7 +934,7 @@
 %% font size selection  
 %% ASME's specs differ slightly from latex standard article-10 class 
 
-\renewcommand\LARGE{\@setfontsize\LARGE{16}{19.2}}              %{18}{21.6}}  updated 7/7/19 to match new ASME spec.  
+\renewcommand\LARGE{\@setfontsize\LARGE{16}{19.2}}              %{18}{21.6}}  updated 2019/7/7 to match new ASME spec.  
                                                                 % ...default is 17.28/22 ... used for paper#
 \renewcommand\large{\@setfontsize\large{11}{13.6}}              % default is 12/14 ... used for headings
 
@@ -756,11 +950,13 @@
 \DeclareMathVersion{sansbold}
 \SetSymbolFont{letters}{sansbold}{OML}{ntxsfmi}{b}{it}
 \SetSymbolFont{lettersA}{sansbold}{U}{ntxsfmia}{b}{it}
-\SetSymbolFont{symbols}{sansbold}{LMS}{ntxsy}{b}{n}
+\IfFormatAtLeastTF{2016/01/05}{%
+	\SetSymbolFont{symbols}{sansbold}{LMS}{ntxsy}{b}{n}
+	}{\relax}
 \SetSymbolFont{largesymbols}{sansbold}{LMX}{ntxexx}{b}{n}%  added 25 Jan 2021
 \SetSymbolFont{largesymbolsTXA}{sansbold}{U}{ntxexa}{b}{n}% added 25 Jan 2021
 \SetSymbolFont{operators}{sansbold}{\encodingdefault}{\sfdefault}{\bfdefault}{n}
-\SetMathAlphabet{\mathsf}{sansbold}{\encodingdefault}{\sfdefault}{b}{n}% changed from it 31 Jan 2021, \mathsf is upright.
+\SetMathAlphabet{\mathsf}{sansbold}{\encodingdefault}{\sfdefault}{b}{n}% changed from it, 2021/01/31: \mathsf is upright.
 
 
 % Nice solution from DPC to prevent aux file errors (due to active characters from babel) when switching from pdflatex to lualatex.
@@ -769,6 +965,7 @@
 	 \ifx\directlua\undefined\else\endinput\fi}}}
 \fi
 
+
 %%%%%%%%  Footers and Footnotes  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 \RequirePackage{fancyhdr}
@@ -814,29 +1011,11 @@
 \RenewDocumentCommand\@makefntext{m}{%
   \noindent\makebox[2ex][r]{\@makefnmark}#1}% <== To discourage hyphenation, do \hyphenpenalty=300\exhyphenpenalty=300 before #1
 
-%%%%%%%%%  Caption related  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-\RequirePackage[labelfont={sf,bf},hypcap=false]{caption}
-\RequirePackage[hypcap=false,list=true]{subcaption}
-
-\DeclareCaptionLabelFormat{uppercase}{\MakeTextUppercase{#1} #2}
-\DeclareCaptionTextFormat{boldmath}{\mathversion{sansbold}#1}
-\captionsetup[figure]{labelformat=uppercase, labelfont={sf,bf,small},textfont={sf,bf,small},textformat=boldmath, labelsep=colon}
-\captionsetup[table]{labelformat=uppercase, labelfont={sf,bf,small},textfont={sf,bf,small},textformat=boldmath, labelsep=colon,skip=0.5\baselineskip} %name=TABLE,
-
-%% This construction avoids a failure of hyperref in relation to uppercase caption
-%% Discussion: https://tex.stackexchange.com/questions/375695/maketextuppercase-inside-table-captions
-\AtBeginDocument{
-   \let\scaption\caption
-   \renewcommand*{\caption}[2][\shortcaption]{\def\shortcaption{#2}\scaption[#1]{\MakeTextUppercase{#2}}}%
-}
   
 %%%%%%%%%  Section headings %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 %% wish to accommodate hyperref
 
-\RequirePackage{textcase} %% Allows uppercase titles and captions without errors from math and citations
-
 \RequirePackage[raggedright,indentafter]{titlesec}
 
 %% ASME specifies 10 pt headings
@@ -845,9 +1024,9 @@
 \titleformat{\subsection}{\mathversion{sansbold}\bfseries\sffamily\raggedright}{\thesubsection}{0.5em}{}
 \titleformat{\subsubsection}[runin]{\mathversion{sansbold}\bfseries\sffamily}{\thesubsubsection}{0.5em}{}[.\hspace*{0.5em}]
 
-\titlespacing\section{0pt}{12pt plus 4pt minus 2pt}{1pt plus 1pt minus 1pt} % from 2 pt 2 pt 1 pt, 7/7/19
+\titlespacing\section{0pt}{12pt plus 4pt minus 2pt}{1pt plus 1pt minus 1pt} % from 2 pt 2 pt 1 pt, 2019/7/7
 \titlespacing\subsection{0pt}{12pt plus 4pt minus 2pt}{0pt plus 2pt minus 1pt}
-\titlespacing\subsubsection{\parindent}{6pt plus 3pt minus 2pt}{0pt plus 2pt minus 1pt} % from 12 4 3, 7/7/19
+\titlespacing\subsubsection{\parindent}{6pt plus 3pt minus 2pt}{0pt plus 2pt minus 1pt} % from 12 4 3, 2019/7/7
 
 %%  Special handling of the appendices            
 %%  Assumes that appendices are the last content in paper 
@@ -860,63 +1039,97 @@
 
 %%%%%%%%%%  Hyperref, bookmarks, and PDF/A  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-\ifac@setpdfa
-	%%% to assist with unicode glyph mapping, following M. Sharpe's recommendation in the newtx documentation.
-	\pdfgentounicode=1  							%% enable CMaps
-	\input glyphtounicode.tex 						%% lists of mappings
-	\InputIfFileExists{glyphtounicode-cmr.tex}{}{} 	%% additional mappings
-	\InputIfFileExists{glyphtounicode-ntx.tex}{}{} 	%% additional mappings
-%
-	%%% a fairly generic RGB color profile, aimed at on-screen rendering (not print production)
-	\immediate\pdfobj stream attr{/N 3} file{sRGB.icc}
-	\pdfcatalog{%
-	   /OutputIntents [
-	    <<
-	      /Type /OutputIntent
-	      /S /GTS_PDFA1
-	      /DestOutputProfile \the\pdflastobj\space 0 R
-	      /OutputConditionIdentifier (sRGB)
-	      /Info (sRGB)
-	    >>
-	   ]
-	 }%
+\newif\if@asme@pdfmanagement% Thanks to Ulrike Fischer
+
+\ExplSyntaxOn
+    \IfFormatAtLeastTF{2020/02/02}{%
+        \bool_if:nTF
+          {
+            \bool_lazy_and_p:nn
+              {\cs_if_exist_p:N \pdfmanagement_if_active_p:}
+              { \pdfmanagement_if_active_p: }
+          }
+          {
+            \@asme@pdfmanagementtrue
+          }
+          {
+            \@asme@pdfmanagementfalse
+          }
+     }{\@asme@pdfmanagementfalse}
+\ExplSyntaxOff
+
+\ifpdftex
+    %%% to assist with unicode glyph mapping, following M. Sharpe's recommendation in the newtx documentation.
+    \IfFormatAtLeastTF{2020/10/01}{\relax}{%
+    	\pdfgentounicode=1  							%% enable CMaps; has moved into the latex kernel Oct 2020
+    	\input glyphtounicode.tex 						%% lists of mappings; has moved into the latex kernel Oct 2020
+    }
+    \InputIfFileExists{glyphtounicode-cmr.tex}{}{} 	%% additional mappings
+    \InputIfFileExists{glyphtounicode-ntx.tex}{}{} 	%% additional mappings
+    
+    \ifac@setpdfa
+    %%%% the pdfmanagement options are experimental, from Ulrike Fischer 2021/06/12
+        \if@asme@pdfmanagement
+        	\ClassInfo{asmeconf}{pdfmanagement is defined. Class file will not load a color profile}
+        \else
+        	\ClassInfo{asmeconf}{NOTE: pdfmanagement not defined. Class file will load a color profile}%
+            %%% a fairly generic RGB color profile, aimed at on-screen rendering (not print production)
+            	\immediate\pdfobj stream attr{/N 3} file{sRGB.icc}
+            	\pdfcatalog{%
+            	   /OutputIntents [
+            	    <<
+            	      /Type /OutputIntent
+            	      /S /GTS_PDFA1
+            	      /DestOutputProfile \the\pdflastobj\space 0 R
+            	      /OutputConditionIdentifier (sRGB)
+            	      /Info (sRGB)
+            	    >>
+            	   ]
+            	 }%
+        \fi
+    \fi
 \fi
 
 \RequirePackage{hyperxmp}% improve transfer of metadata to pdf 
 
-\RequirePackage[%
+\RequirePackage[psdextra]{hyperref} % recent kernel transition suggests providing most hyperref options via \hypersetup, 
+									% but setting psdextra here (for additional math support in bookmarks) 2021/12/01
+
+\hypersetup{%
     unicode,        % Unicode encoded PDF strings
-    psdextra,       % additional support for math in pdf bookmarks
 	pdfborder={0 0 0},% 
-	bookmarks=true, %
 	bookmarksnumbered=true,%
-	bookmarksopen=true,%
+	bookmarksopen=true,
 	bookmarksopenlevel=1,%
-%	colorlinks=true,%%% <=== set true to get colored type, but do so via package options
 	linkcolor=blue, %
 	citecolor=blue, % 
-	urlcolor=blue,  % 
-	breaklinks=true,%
-	pdftitle={},    % <=== add in .tex file
-	pdfkeywords={}, % <=== add in .tex file
+	urlcolor=blue,  %
+	filecolor=red,  % added 2021/12/02, to make certain broken links more apparent
 	pdfnewwindow=true,%
-	pdfpagelayout=SinglePage, %TwoPageRight,% changed this 08/12/20
-	pdfauthor={},   % <=== add in .tex file
+	pdfpagelayout=SinglePage, %TwoPageRight,% changed this 2020/12/08
 	pdfdisplaydoctitle=true%
-	]{hyperref}
+%	colorlinks=true,% <=== set true to get colored type, but do so via package options in .tex file
+}
 	
 \urlstyle{same}     		  % don't switch to typewriter font for urls
 \RequirePackage{doi}          % supports the nasty characters in some doi's
 \renewcommand{\doitext}{DOI } % change to this from default value, {doi:}, per ASME specification
 \RequirePackage{bookmark}     % improves handling of pdf bookmarks
 
+\providecommand*{\toclevel@subfigure}{1}% <== to address unknown bookmark level of subfigure. 2021/12/24
+
+\providecommand\hrefurl[2]{\href{#1}{#2}}% to address certain issues around URL recognition with new pdf management code, 2021/12/02
+
+%%% ==> recent and evolving development of \pdfstring removes all robust commands from bookmarks, so
+%%%		the following interventions may become unnecessary over time (2021/12/01).
+
 %% Since \bm may be useful in headings, this fix will reduce frequency with which
 %%    alternate pdfstrings must be given in revised section command as \section[pdfstring]{texstring}
 \pdfstringdefDisableCommands{%
     \def\bm#1#{\relax}%
 }
 
-%% Let's disable \( and \) in pdf bookmarks, 28/2/20
+%% Let's disable \( and \) in pdf bookmarks, 2020/02/28
 \pdfstringdefDisableCommands{%
     \def\({\relax}%
     \def\){\relax}%
@@ -934,7 +1147,7 @@
 
 %% Let's make sure footnotes in section headings don't break pdf bookmarks.
 \robustify{\footnote}
-% \patchcmd{\section}{\sectionmark}{\let\footnote\@gobble\sectionmark}{}{}% <== not really needed in this context 28/2/20
+% \patchcmd{\section}{\sectionmark}{\let\footnote\@gobble\sectionmark}{}{}% <== not really needed in this context, 2020/02/28
 \pdfstringdefDisableCommands{%
   \def\footnote#1{}%
 }
@@ -943,7 +1156,7 @@
 %% if given in section headings. Ditto for \eqref
 %
 \patchcmd{\@uclcnotmath}{\@nonchangecase\ref}{\@nonchangecase\ref\@nonchangecase\footnote}{}{}
-\patchcmd{\@uclcnotmath}{\@nonchangecase\ref}{\@nonchangecase\ref\@nonchangecase\eqref}{}{} %% corrected 24 Jan 2020
+\patchcmd{\@uclcnotmath}{\@nonchangecase\ref}{\@nonchangecase\ref\@nonchangecase\eqref}{}{} %% corrected 2020/01/24
      
 
 %%% Create an optional argument for unnumbered sections and set pdf bookmark (thru \addcontentsline).
@@ -956,7 +1169,7 @@
 		{\svsection*{#3}\phantomsection%
 					{\IfNoValueTF {#2}
 					{\addcontentsline{toc}{section}{#3}}
-					{\addcontentsline{toc}{section}{#2}}% removed trailing space 28/2/20
+					{\addcontentsline{toc}{section}{#2}}% removed trailing space 2020/02/28
 					}%
 		}%
 		{\IfNoValueTF {#2}
@@ -1032,15 +1245,25 @@
 
 %%   Nomenclature environment  %%%%%%%%%%%%%%%%%%
 %%
-%%   Increase first optional argument to a dimension > 2em if wide entries cause undesired misalignment of columns. 
-%%   Second optional argument can be used to rename the environment, e.g., to List of Symbols.
 
 \newlength\nomenwidth
 \newlength\savitemsep
 
+%% ==> xparse "g" argument used in this version of \entry is deprecated; so have phased out this version, 2021/12/01
 %% If second argument of \entry is omitted, will produce an italicized heading (e.g. "Greek letters")
-\NewDocumentCommand\entry{m g}{%
- \IfNoValueTF{#2}{%
+%\NewDocumentCommand\entry{m g}{%
+% \IfNoValueTF{#2}{%
+% 			 \itemsep3\p@ plus 1\p@ minus 1\p@%
+%             \goodbreak\item[\itshape#1\hfill]\setlength\itemsep\savitemsep\@itempenalty=1000%
+%             }{%
+%             \item[#1\hfill]#2%
+%             \@itempenalty=-\@lowpenalty%
+%             }%
+%}
+
+\NewDocumentCommand\entry{m m}{%
+ \ifblank{#2}{%
+			 \ClassWarningNoLine{asmeconf}{The command \protect\entry requires two arguments. To obtain a subheading, use \protect\EntryHeading}
  			 \itemsep3\p@ plus 1\p@ minus 1\p@%
              \goodbreak\item[\itshape#1\hfill]\setlength\itemsep\savitemsep\@itempenalty=1000%
              }{%
@@ -1049,12 +1272,14 @@
              }%
 }
 
-%% A separate command command for nomenclature subheadings (xparse "g" argument used in \entry is deprecated)
+%% A separate command command for nomenclature subheadings 
 \NewDocumentCommand\EntryHeading{m}{%
 	\itemsep3\p@ plus 1\p@ minus 1\p@%
     \goodbreak\item[\itshape#1\hfill]\setlength\itemsep\savitemsep\@itempenalty=1000%
 }
 
+%%   Increase first optional argument to a dimension > 2em if wide entries cause undesired misalignment of columns. 
+%%   Second optional argument can be used to rename the environment, e.g., to List of Symbols.
 \NewDocumentEnvironment{nomenclature}{O{2em} O{\nomname}}{%
         \setlength\columnsep{2em} 
         \setlength{\nomenwidth}{#1}
@@ -1111,7 +1336,7 @@
 \NewDocumentCommand\papertitle{}{%
 \vspace*{3\baselineskip}
 \parbox{\linewidth}{\mathversion{sansbold}\centering{\bfseries\sffamily\large%
-\MakeTextUppercase{\@PaperTitle}\par}%%% <=== extra \par to make leading stick. See adjustment in \MakeTitle
+\MakeTextUppercase{\@PaperTitle}\par}%%% <=== extra \par to make font leading stick. See adjustment in \MakeTitle
      }%
 }
 
@@ -1133,7 +1358,7 @@
 %% Flag for corresponding author (expecting just one, but if two enter both email addresses and flag both authors)
 \newif\ifac@CA\ac@CAfalse
 
-\NewDocumentCommand\CorrespondingAuthor{m}{% Revised this command 29/12/20, to make the CA email mandatory but possibly empty
+\NewDocumentCommand\CorrespondingAuthor{m}{% Revised this command 2020/12/29, to make the CA email mandatory but possibly empty
    \ignorespaces$\bm{^\ast}$%
    \global\ac@CAtrue%
    \ifblank{#1}{%
@@ -1147,7 +1372,7 @@
 
 %%%% option to use the traditional grid layout of authors or the inline style
 
-\ifthenelse{\boolean{Oldauthors}}{% This command works better than \if... in this context.
+\ifthenelse{\boolean{grid}\or\boolean{Oldauthors}}{% This command works better than \if... in this context.
 
 	%%%%%%%%%%%%%%%%%%%%  Gridded author layout  %%%%%%%%%%%%%%%%%%%%%%%%%
 
@@ -1156,91 +1381,247 @@
     %% Allows for up to fifteen author groups... if you need more authors, the edits should be obvious
     %% You can put multiple authors above a single affiliation to reduce number of author blocks needed.
     \NewCoffin{\firstrowauthorblock}
-    \SetHorizontalCoffin\firstrowauthorblock{}
     \NewCoffin{\secondrowauthorblock}
-    \SetHorizontalCoffin\secondrowauthorblock{}
     \NewCoffin{\thirdrowauthorblock}
-    \SetHorizontalCoffin\thirdrowauthorblock{}
     \NewCoffin{\fourthrowauthorblock}
-    \SetHorizontalCoffin\fourthrowauthorblock{}
     \NewCoffin{\fifthrowauthorblock}
-    \SetHorizontalCoffin\fifthrowauthorblock{}
+    \AtBeginDocument{% corrected 2021/12/01
+        \SetHorizontalCoffin\firstrowauthorblock{}
+        \SetHorizontalCoffin\secondrowauthorblock{}
+        \SetHorizontalCoffin\thirdrowauthorblock{}
+        \SetHorizontalCoffin\fourthrowauthorblock{}
+        \SetHorizontalCoffin\fifthrowauthorblock{}
+    }
     
     \newcounter{authorno}
     \setcounter{authorno}{0}
     
     \newlength{\coffinsep}% horizontal space between coffins
     \setlength{\coffinsep}{0.03\textwidth}
-    
-    \NewDocumentCommand\SetAuthorBlock{mm}{%
-       \addtocounter{authorno}{1}%
-       \SetVerticalCoffin{\authorblock}{0.3\textwidth}{%
-       \centering\sffamily%
-       \textbf{\ignorespaces#1\ignorespaces}\\
-       #2%
-    	}
-        \ifnum\value{authorno}=1
-             \JoinCoffins\firstrowauthorblock[r,t]\authorblock[l,t]
-         \else
-            \ifnum\value{authorno}=2
-               \JoinCoffins\firstrowauthorblock[r,t]\authorblock[l,t](\coffinsep,0pt)
-            \else
-              \ifnum\value{authorno}=3
-                 \JoinCoffins\firstrowauthorblock[r,t]\authorblock[l,t](\coffinsep,0pt)
-              \fi
-            \fi 
-        \fi
-        \ifnum\value{authorno}=4
-           \JoinCoffins\secondrowauthorblock[r,t]\authorblock[l,t]
-        \else
-           \ifnum\value{authorno}=5
-                \JoinCoffins\secondrowauthorblock[r,t]\authorblock[l,t](\coffinsep,0pt)
-           \else
-                \ifnum\value{authorno}=6
-                   \JoinCoffins\secondrowauthorblock[r,t]\authorblock[l,t](\coffinsep,0pt)
+
+	\ifthenelse{\boolean{grid}}{%
+        \newcounter{authorcnt}
+        \setcounter{authorcnt}{0}
+         
+        \NewDocumentCommand\SetAffiliation{mm}{\expandafter\xdef\csname af@#1\endcsname{#2}}% defines \af@#1 as Affiliation #2
+        
+        \AtBeginDocument{% error control, when no author or empty \affil is given
+        	\SetAffiliation{-1}{Missing author name!\\Or extra comma!}
+        	\SetAffiliation{99}{Missing affiliation tag!!}
+        	\SetAffiliation{100}{Missing number in affiliation!!}
+        }
+               
+        \NewDocumentCommand\SetAuthors{>{\SplitList{,}}m}{\ProcessList{#1}{\@TagAutAff}}
+             
+        \NewDocumentCommand\@AuthNo{m}{%
+        		\ifblank{#1}{%
+        			\expandafter\xdef\csname aut@\theauthorcnt\endcsname{}%
+        			\expandafter\xdef\csname autaffil@\theauthorcnt\endcsname{-1}
+        			\ClassWarning{asmeconf}{Missing author name, check for extra comma}%
+        			}{\expandafter\xdef\csname aut@\theauthorcnt\endcsname{#1}%
+        		}%
+        }% defines \aut@authorcnt as Name #1
+        
+        \NewExpandableDocumentCommand\affil{m}{%
+        	\ifblank{#1}{%
+        		  \expandafter\xdef\csname autaffil@\theauthorcnt\endcsname{100}%
+        		}{\expandafter\xdef\csname autaffil@\theauthorcnt\endcsname{#1}%
+        	}%
+        }% defines \autaffil@authorcnt as #1 (unique association)
+        
+        \NewDocumentCommand\@TagAutAff{m}{%
+            \addtocounter{authorcnt}{1}%
+        	\@AuthNo{#1}%
+        }
+        \NewDocumentCommand\@SetAuthorBlock{}{%
+            \whiledo{\value{authorno}<\value{authorcnt}}{% starting with authorno = 0 ensures we reach authorcnt with +1
+                \addtocounter{authorno}{1}%
+            	\SetVerticalCoffin{\authorblock}{0.3\textwidth}{%
+            	\centering\sffamily%
+            	\textbf{\ignorespaces\csname aut@\theauthorno\endcsname\ignorespaces}\\
+				\ifcsname autaffil@\theauthorno\endcsname% in case the \affil command has been omitted
+            		\csname af@\csname autaffil@\theauthorno\endcsname\endcsname
+				\else
+					\csname af@99\endcsname
+				\fi
+            	\par}
+                \ifnum\value{authorno}=1
+                     \JoinCoffins\firstrowauthorblock[r,t]\authorblock[l,t]
+                 \else
+                    \ifnum\value{authorno}=2
+                       \JoinCoffins\firstrowauthorblock[r,t]\authorblock[l,t](\coffinsep,0pt)
+                    \else
+                      \ifnum\value{authorno}=3
+                         \JoinCoffins\firstrowauthorblock[r,t]\authorblock[l,t](\coffinsep,0pt)
+                      \fi
+                    \fi 
                 \fi
-           \fi 
-        \fi
-        \ifnum\value{authorno}=7
-           \JoinCoffins\thirdrowauthorblock[r,t]\authorblock[l,t]	
-        \else
-           \ifnum\value{authorno}=8
-                \JoinCoffins\thirdrowauthorblock[r,t]\authorblock[l,t](\coffinsep,0pt)
-           \else
-                \ifnum\value{authorno}=9
-                   \JoinCoffins\thirdrowauthorblock[r,t]\authorblock[l,t](\coffinsep,0pt)
+                \ifnum\value{authorno}=4
+                   \JoinCoffins\secondrowauthorblock[r,t]\authorblock[l,t]
+                \else
+                   \ifnum\value{authorno}=5
+                        \JoinCoffins\secondrowauthorblock[r,t]\authorblock[l,t](\coffinsep,0pt)
+                   \else
+                        \ifnum\value{authorno}=6
+                           \JoinCoffins\secondrowauthorblock[r,t]\authorblock[l,t](\coffinsep,0pt)
+                        \fi
+                   \fi 
                 \fi
-           \fi 
-        \fi
-        \ifnum\value{authorno}=10
-           \JoinCoffins\fourthrowauthorblock[r,t]\authorblock[l,t]	
-        \else
-           \ifnum\value{authorno}=11
-                \JoinCoffins\fourthrowauthorblock[r,t]\authorblock[l,t](\coffinsep,0pt)
-           \else
-                \ifnum\value{authorno}=12
-                   \JoinCoffins\fourthrowauthorblock[r,t]\authorblock[l,t](\coffinsep,0pt)
+                \ifnum\value{authorno}=7
+                   \JoinCoffins\thirdrowauthorblock[r,t]\authorblock[l,t]	
+                \else
+                   \ifnum\value{authorno}=8
+                        \JoinCoffins\thirdrowauthorblock[r,t]\authorblock[l,t](\coffinsep,0pt)
+                   \else
+                        \ifnum\value{authorno}=9
+                           \JoinCoffins\thirdrowauthorblock[r,t]\authorblock[l,t](\coffinsep,0pt)
+                        \fi
+                   \fi 
                 \fi
-           \fi 
-        \fi
-        \ifnum\value{authorno}=13
-           \JoinCoffins\fifthrowauthorblock[r,t]\authorblock[l,t]	
-        \else
-           \ifnum\value{authorno}=14
-                \JoinCoffins\fifthrowauthorblock[r,t]\authorblock[l,t](\coffinsep,0pt)
-           \else
-                \ifnum\value{authorno}=15
-                   \JoinCoffins\fifthrowauthorblock[r,t]\authorblock[l,t](\coffinsep,0pt)
+                \ifnum\value{authorno}=10
+                   \JoinCoffins\fourthrowauthorblock[r,t]\authorblock[l,t]	
+                \else
+                   \ifnum\value{authorno}=11
+                        \JoinCoffins\fourthrowauthorblock[r,t]\authorblock[l,t](\coffinsep,0pt)
+                   \else
+                        \ifnum\value{authorno}=12
+                           \JoinCoffins\fourthrowauthorblock[r,t]\authorblock[l,t](\coffinsep,0pt)
+                        \fi
+                   \fi 
                 \fi
-           \fi 
-        \fi
-        \ifnum\value{authorno}>15
-        	\ClassWarningNoLine{asmeconf}{The class is programmed for up to 15 author blocks. If some of your authors are at the same institution, %
-			you may put more than one name above a single address.  If you need more than 15 author blocks, try using the in-line author style %
-			instead of the [authorgrid] option}
-		\fi
-    }
+                \ifnum\value{authorno}=13
+                   \JoinCoffins\fifthrowauthorblock[r,t]\authorblock[l,t]	
+                \else
+                   \ifnum\value{authorno}=14
+                        \JoinCoffins\fifthrowauthorblock[r,t]\authorblock[l,t](\coffinsep,0pt)
+                   \else
+                        \ifnum\value{authorno}=15
+                           \JoinCoffins\fifthrowauthorblock[r,t]\authorblock[l,t](\coffinsep,0pt)
+                        \fi
+                   \fi 
+                \fi
+                \ifnum\value{authorno}>15
+                	\ClassWarningNoLine{asmeconf}{The class is programmed for up to 15 author blocks. If some of your authors are at the same institution, %
+        			you may put more than one name above a single address.  If you need more than 15 author blocks, try using the in-line author style %
+        			instead of the [grid] option}
+        		\fi
+        	}% end whiledo
+		}
+	}{% end ifthen for grid, now do else for Oldauthors
+        \NewDocumentCommand\SetAuthorBlock{mm}{%
+           \addtocounter{authorno}{1}%
+           \SetVerticalCoffin{\authorblock}{0.3\textwidth}{%
+           \centering\sffamily%
+           \textbf{\ignorespaces#1\ignorespaces}\\
+           #2%
+        	}
+            \ifnum\value{authorno}=1
+                 \JoinCoffins\firstrowauthorblock[r,t]\authorblock[l,t]
+             \else
+                \ifnum\value{authorno}=2
+                   \JoinCoffins\firstrowauthorblock[r,t]\authorblock[l,t](\coffinsep,0pt)
+                \else
+                  \ifnum\value{authorno}=3
+                     \JoinCoffins\firstrowauthorblock[r,t]\authorblock[l,t](\coffinsep,0pt)
+                  \fi
+                \fi 
+            \fi
+            \ifnum\value{authorno}=4
+               \JoinCoffins\secondrowauthorblock[r,t]\authorblock[l,t]
+            \else
+               \ifnum\value{authorno}=5
+                    \JoinCoffins\secondrowauthorblock[r,t]\authorblock[l,t](\coffinsep,0pt)
+               \else
+                    \ifnum\value{authorno}=6
+                       \JoinCoffins\secondrowauthorblock[r,t]\authorblock[l,t](\coffinsep,0pt)
+                    \fi
+               \fi 
+            \fi
+            \ifnum\value{authorno}=7
+               \JoinCoffins\thirdrowauthorblock[r,t]\authorblock[l,t]	
+            \else
+               \ifnum\value{authorno}=8
+                    \JoinCoffins\thirdrowauthorblock[r,t]\authorblock[l,t](\coffinsep,0pt)
+               \else
+                    \ifnum\value{authorno}=9
+                       \JoinCoffins\thirdrowauthorblock[r,t]\authorblock[l,t](\coffinsep,0pt)
+                    \fi
+               \fi 
+            \fi
+            \ifnum\value{authorno}=10
+               \JoinCoffins\fourthrowauthorblock[r,t]\authorblock[l,t]	
+            \else
+               \ifnum\value{authorno}=11
+                    \JoinCoffins\fourthrowauthorblock[r,t]\authorblock[l,t](\coffinsep,0pt)
+               \else
+                    \ifnum\value{authorno}=12
+                       \JoinCoffins\fourthrowauthorblock[r,t]\authorblock[l,t](\coffinsep,0pt)
+                    \fi
+               \fi 
+            \fi
+            \ifnum\value{authorno}=13
+               \JoinCoffins\fifthrowauthorblock[r,t]\authorblock[l,t]	
+            \else
+               \ifnum\value{authorno}=14
+                    \JoinCoffins\fifthrowauthorblock[r,t]\authorblock[l,t](\coffinsep,0pt)
+               \else
+                    \ifnum\value{authorno}=15
+                       \JoinCoffins\fifthrowauthorblock[r,t]\authorblock[l,t](\coffinsep,0pt)
+                    \fi
+               \fi 
+            \fi
+            \ifnum\value{authorno}>15
+            	\ClassWarningNoLine{asmeconf}{The class is programmed for up to 15 author blocks. If some of your authors are at the same institution, %
+    			you may put more than one name above a single address.  If you need more than 15 author blocks, try using the in-line author style %
+    			instead of the [authorgrid] option}
+    		\fi
+        }
+     
+        % Changed to follow syntax of the inline style, which is much easier to use! 2020/12/29  
+        %    % allow for NO email address to be given by omitting second argument
+        %    \NewDocumentCommand{\CorrespondingAuthor}{m g}{%
+        %       \global\ac@CAtrue%
+        %       \IfNoValueTF{#2}{%
+        %             \gdef\@CAsep{\relax}%
+        %             \gdef\@CAemail{\relax}%
+        %             }{%
+        %             \gdef\@CAsep{:\space}%
+        %             \gdef\@CAemail{#2}%
+        %             }%
+        %       \ignorespaces#1\ignorespaces$\bm{^\ast}$%\footnotemark[1]%
+        %   }
     
+    	%%% to deal with sequential notes as, e.g., "1,*", or "1,2,*" %%%%%%%%%%
+    	% 	bug fixed 2020/12/29
+        \newcommand\nextToken\relax
+        
+        \newcommand\isOthernote{%
+            \ifx\CorrespondingAuthor\nextToken\textsuperscript{\sffamily\bfseries,}%
+            \else%
+                \ifx\JointFirstAuthor\nextToken\textsuperscript{\sffamily\bfseries,}%
+                \fi%
+            \fi%
+            \ignorespaces% 
+        }
+        
+        \let\oldCorrespondingAuthor\CorrespondingAuthor
+        \renewcommand\CorrespondingAuthor[1]{%
+            \oldCorrespondingAuthor{#1}\futurelet\nextToken\isOthernote}
+            
+        \let\oldJointFirstAuthor\JointFirstAuthor
+        \renewcommand\JointFirstAuthor{%
+            \oldJointFirstAuthor\futurelet\nextToken\isOthernote}
+        
+        \let\oldfootnote\footnote
+        \renewcommand\footnote[1]{%
+            \oldfootnote{#1}\futurelet\nextToken\isOtherfnote}
+            
+        \newcommand\isOtherfnote{%
+            \ifx\footnote\nextToken\textsu{\mdseries,}%
+            \fi%
+        }
+    }%end ifthenelse
+           
     \NewDocumentCommand\ConstructAuthorBlock{}{%
         \ifnum\value{authorno}>3
            \JoinCoffins\firstrowauthorblock[hc,b]\secondrowauthorblock[hc,t](0pt, -1.5\baselineskip)     
@@ -1255,52 +1636,7 @@
            \JoinCoffins\firstrowauthorblock[hc,b]\fifthrowauthorblock[hc,t](0pt, -1.5\baselineskip)  
         \fi
         \centerline{\TypesetCoffin\firstrowauthorblock}%% in this instance, \centerline is better than \centering
-    }   
- 
-    % Changed to follow syntax of the inline style, which is much easier to use! 29/12/2020  
-    %    % allow for NO email address to be given by omitting second argument
-    %    \NewDocumentCommand{\CorrespondingAuthor}{m g}{%
-    %       \global\ac@CAtrue%
-    %       \IfNoValueTF{#2}{%
-    %             \gdef\@CAsep{\relax}%
-    %             \gdef\@CAemail{\relax}%
-    %             }{%
-    %             \gdef\@CAsep{:\space}%
-    %             \gdef\@CAemail{#2}%
-    %             }%
-    %       \ignorespaces#1\ignorespaces$\bm{^\ast}$%\footnotemark[1]%
-    %   }
-
-	%%% to deal with sequential notes as, e.g., "1,*", or "1,2,*" %%%%%%%%%%
-	% 	bug fixed 29/12/2020
-    \newcommand\nextToken\relax
-    
-    \newcommand\isOthernote{%
-        \ifx\CorrespondingAuthor\nextToken\textsuperscript{\sffamily\bfseries,}%
-        \else%
-            \ifx\JointFirstAuthor\nextToken\textsuperscript{\sffamily\bfseries,}%
-            \fi%
-        \fi%
-        \ignorespaces% 
     }
-    
-    \let\oldCorrespondingAuthor\CorrespondingAuthor
-    \renewcommand\CorrespondingAuthor[1]{%
-        \oldCorrespondingAuthor{#1}\futurelet\nextToken\isOthernote}
-        
-    \let\oldJointFirstAuthor\JointFirstAuthor
-    \renewcommand\JointFirstAuthor{%
-        \oldJointFirstAuthor\futurelet\nextToken\isOthernote}
-    
-    \let\oldfootnote\footnote
-    \renewcommand\footnote[1]{%
-        \oldfootnote{#1}\futurelet\nextToken\isOtherfnote}
-        
-    \newcommand\isOtherfnote{%
-        \ifx\footnote\nextToken\textsu{\mdseries,}%
-        \fi%
-    }    
-     
 %%% otherwise use the new compact layout of authors
 }{%  i.e., this begins "else"
 
@@ -1308,9 +1644,9 @@
     \NewCoffin{\AuthorBlock}
     \NewCoffin{\AffiliationBlock}
     \NewCoffin{\AffiliationsBlock}
-    
+    \AtBeginDocument{\SetHorizontalCoffin\AffiliationsBlock{}}% corrected 2021/12/01
+        
 	%% NB: \parbox width to \textwidth (full page) not \linewidth (single column)
-    \SetHorizontalCoffin\AffiliationsBlock{}
     \NewDocumentCommand\SetAuthors{m}{%
          \SetHorizontalCoffin\AuthorBlock{%
          \parbox{\textwidth}{\centering\sffamily\bfseries\ignorespaces#1\ignorespaces}%
@@ -1321,14 +1657,19 @@
     
     \NewDocumentCommand\SetAffiliation{mm}{%
        \SetVerticalCoffin\AffiliationBlock{\textwidth}{%
-          \centering\sffamily\footnotemark[#1]#2\ignorespaces%
+       \ifblank{#1}{%
+       		\centering\sffamily#2\ignorespaces}{% empty argument for one author or one affiliation, where affiliation need not be tagged
+          	\centering\sffamily\footnotemark[#1]#2\ignorespaces}%
        }
        \JoinCoffins\AffiliationsBlock[hc,b]\AffiliationBlock[hc,t](0pt,-1pt) 
     }
             
 	%%% Affiliation mark
     \NewDocumentCommand{\affil}{m}{%
-       {\bfseries\footnotemark[#1]}%
+    	\ifblank{#1}{%
+			\ClassWarning{asmeconf}{Empty affiliation tag}%
+			\@gobble% 9 Dec 2021, addresses modification for commas
+        }{\bfseries\footnotemark[#1]}%
     }
           
 	%%% to deal with sequential notes as, e.g., "1,*", or "1,2,*" %%%%%%%%%%
@@ -1386,7 +1727,9 @@
           \vspace*{2\baselineskip}
           \ifthenelse{\boolean{Oldauthors}}{%
              \ConstructAuthorBlock}{%
-             \SetAuthorBlock}
+             \ifthenelse{\boolean{grid}}{%
+             \@SetAuthorBlock\ConstructAuthorBlock}{%
+             \SetAuthorBlock}}
           \vspace*{3\baselineskip} 
        \end{@twocolumnfalse} 
     ]
@@ -1415,24 +1758,29 @@
 
 %% Produces an unmarked footnote about the version date, to replace "date"
 %% This tool is for editing and should not be used in the final draft
-\NewDocumentCommand\versionfootnote{m}{\begin{NoHyper}\gdef\@thefnmark{}\@footnotetext{#1}\end{NoHyper}} 
 
-\RenewDocumentCommand{\date}{m}{\versionfootnote{#1}}% if one wants to use \date this same way; fixed bug 14/01/2021
+%% This version provides working hyperlink, but throws warning; also, \gdef -->\def. 2021/12/09
+%\NewDocumentCommand\versionfootnote{m}{\def\@thefnmark{}\@footnotetext{#1}}
+
+%% A hyperlink in this footnote will not function, since NoHyper is used to suppress 'missing anchor' warning
+\NewDocumentCommand\versionfootnote{m}{\def\@thefnmark{}\begin{NoHyper}\@footnotetext{#1}\end{NoHyper}}
+
+\RenewDocumentCommand{\date}{m}{\versionfootnote{#1}}% if one wants to use \date this same way; fixed bug 2021/01/14
 
 
 %%%%%%%%%%%%%%  Sans serif upright greek and sans mathversion  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 %% Provide sans-serif *upright* Greek letters, following a suggestion by Michael Sharpe (March 2019).
 %% Following Sharpe's newtxsf implementation of the STIX fonts, under the LaTeX Project Public License.
-%% (Note that \mathversion{sansbold} provides sans-serif *italic* Greek letters.) Various edits 25 Jan 2021
+%% (Note that \mathversion{sansbold} provides sans-serif *italic* Greek letters.) Various edits 2021/01/25
 
 \DeclareSymbolFont{lettersAB}{U}{ntxsfmia}{m}{it}
 \SetSymbolFont{lettersAB}{normal}{U}{ntxsfmia}{m}{it}
 \SetSymbolFont{lettersAB}{bold}{U}{ntxsfmia}{b}{it}
-\SetSymbolFont{lettersAB}{sansbold}{U}{ntxsfmia}{b}{it}% added 25/01/2021, to get this bold in captions, etc.
+\SetSymbolFont{lettersAB}{sansbold}{U}{ntxsfmia}{b}{it}% added 2021/01/25, to get this bold in captions, etc.
 \DeclareFontSubstitution{U}{ntxsfmia}{m}{it}
 
-\DeclareMathSymbol{\sfGamma}{\mathalpha}{lettersAB}{0}% adjust to avoid overwriting newtxmath commands 25/01/2021
+\DeclareMathSymbol{\sfGamma}{\mathalpha}{lettersAB}{0}% adjust to avoid overwriting newtxmath commands, 2021/01/25
 \DeclareMathSymbol{\sfDelta}{\mathalpha}{lettersAB}{1}
 \DeclareMathSymbol{\sfTheta}{\mathalpha}{lettersAB}{2}
 \DeclareMathSymbol{\sfLambda}{\mathalpha}{lettersAB}{3}
@@ -1466,7 +1814,7 @@
 \DeclareMathSymbol{\sfrho}{\mathalpha}{lettersAB}{26}
 \DeclareMathSymbol{\sfsigma}{\mathalpha}{lettersAB}{27}
 \DeclareMathSymbol{\sftau}{\mathalpha}{lettersAB}{28}
-\DeclareMathSymbol{\sfUpsilon}{\mathalpha}{lettersAB}{29}
+\DeclareMathSymbol{\sfupsilon}{\mathalpha}{lettersAB}{29}
 \DeclareMathSymbol{\sfphi}{\mathalpha}{lettersAB}{30}
 
 \DeclareMathSymbol{\sfchi}{\mathalpha}{lettersAB}{31}
@@ -1475,7 +1823,7 @@
 \DeclareMathSymbol{\sfvarepsilon}{\mathalpha}{lettersAB}{34}
 \DeclareMathSymbol{\sfvartheta}{\mathalpha}{lettersAB}{35}
 
-\DeclareMathSymbol{\sfvarpi}{\mathord}{lettersAB}{36}% added these 25/01/2021
+\DeclareMathSymbol{\sfvarpi}{\mathord}{lettersAB}{36}% added these 2021/01/25
 \DeclareMathSymbol{\sfvarrho}{\mathord}{lettersAB}{37}
 \DeclareMathSymbol{\sfvarsigma}{\mathord}{lettersAB}{38}
 \DeclareMathSymbol{\sfvarphi}{\mathord}{lettersAB}{39}
@@ -1486,7 +1834,7 @@
 \DeclareMathSymbol{\sfhslash}{\mathalpha}{lettersAB}{52}% this is not upright
 \DeclareMathSymbol{\sfhbar}{\mathalpha}{lettersAB}{53}%   this is not upright
 
-\DeclareMathAccent{\grave}{\mathord}{lettersAB}{254}% added these after bug report 24/01/2021
+\DeclareMathAccent{\grave}{\mathord}{lettersAB}{254}% added these after bug report 2021/01/24
 \DeclareMathAccent{\acute}{\mathord}{lettersAB}{255}
 \DeclareMathAccent{\check}{\mathord}{lettersAB}{186}
 \DeclareMathAccent{\breve}{\mathord}{lettersAB}{187}
@@ -1496,30 +1844,51 @@
 \DeclareMathAccent{\dot}{\mathord}{lettersAB}{224}
 \DeclareMathAccent{\tilde}{\mathord}{lettersAB}{219}
 
-%%% sans math version, potential value with PGFPlots, e.g., not for use in main text. 25/01/2021 %%%
+%%% sans math version, potential value with PGFPlots, e.g., not for use in main text. 2021/01/25 %%%
 \DeclareMathVersion{sans}
 \SetSymbolFont{letters}{sans}{OML}{ntxsfmi}{m}{it}
 \SetSymbolFont{lettersA}{sans}{U}{ntxsfmia}{m}{it}
 \SetSymbolFont{lettersAB}{sans}{U}{ntxsfmia}{m}{it}
-\SetSymbolFont{symbols}{sans}{LMS}{ntxsy}{m}{n}
+\IfFormatAtLeastTF{2016/01/05}{%
+	\SetSymbolFont{symbols}{sans}{LMS}{ntxsy}{m}{n}
+	}{\relax}
 \SetSymbolFont{largesymbols}{sans}{LMX}{ntxexx}{m}{n}
 \SetSymbolFont{largesymbolsTXA}{sans}{U}{ntxexa}{m}{n}
 \SetSymbolFont{operators}{sans}{\encodingdefault}{\sfdefault}{m}{n}
-\SetMathAlphabet{\mathsf}{sans}{\encodingdefault}{\sfdefault}{m}{n}% make upright 31 Jan 2021.
+\SetMathAlphabet{\mathsf}{sans}{\encodingdefault}{\sfdefault}{m}{n}% make upright 2021/01/31.
 
 %%%%%%%%%%%%%%%%%%  Times-like fonts for specific languages  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 \ifpdftex % Under lualatex, babel has problems with the following approach. Use [fontspec] option instead.
-    \ifac@vietnamese
-    	\RequirePackage{substitutefont}%
-    	\substitutefont{T5}{\rmdefault}{qtm}% Vietnamese is in T5 encoding, can use Tex Gyre Termes font (qtm); 
-    	%\substitutefont{T5}{\sfdefault}{qhv}% qhv = Heros (helvetica). We get the right font w/o loading this.
-    	
+	\ifac@vietnamese
+		% 2021/12/24 removed substitute font package
+		% Vietnamese is in T5 encoding, can use Tex Gyre Termes font (qtm); 
+    	% qhv = Heros (helvetica). We get the right font w/o loading this.        	
     	% qcr = Cursor (monospaced) is poor match to inconsolata; qhv (the sf font) matches better, but isn't monospaced.
-    	% From TeX Gyre Cursor .fd file by B. Jackowski and J. M. Nowacki, released under the GUST license
+
+    	% From TeX Gyre Termes and Cursor .fd files by B. Jackowski and J. M. Nowacki, released under the GUST license
         \begingroup
         \nfss@catcodes
         
+        \def\qtm@scale{s*[0.97]}
+        \DeclareFontFamily{T5}{\rmdefault}{}% not adjusting wordspacing
+        \DeclareFontShape{T5}{\rmdefault}{b}{sc}{<-> \qtm@scale t5-qtmb-sc}{}
+        \DeclareFontShape{T5}{\rmdefault}{b}{n}{<-> \qtm@scale t5-qtmb}{}
+        \DeclareFontShape{T5}{\rmdefault}{b}{scit}{<-> \qtm@scale t5-qtmbi-sc}{}
+        \DeclareFontShape{T5}{\rmdefault}{b}{it}{<-> \qtm@scale t5-qtmbi}{}
+        \DeclareFontShape{T5}{\rmdefault}{m}{sc}{<-> \qtm@scale t5-qtmr-sc}{}
+        \DeclareFontShape{T5}{\rmdefault}{m}{n}{<-> \qtm@scale t5-qtmr}{}
+        \DeclareFontShape{T5}{\rmdefault}{m}{scit}{<-> \qtm@scale t5-qtmri-sc}{}
+        \DeclareFontShape{T5}{\rmdefault}{m}{it}{<-> \qtm@scale t5-qtmri}{}
+        \DeclareFontShape{T5}{\rmdefault}{bx}{sc}{<->ssub * qtm/b/sc}{}
+        \DeclareFontShape{T5}{\rmdefault}{bx}{n}{<->ssub * qtm/b/n}{}
+        \DeclareFontShape{T5}{\rmdefault}{bx}{scit}{<->ssub * qtm/b/scit}{}
+        \DeclareFontShape{T5}{\rmdefault}{bx}{it}{<->ssub * qtm/b/it}{}
+        \DeclareFontShape{T5}{\rmdefault}{b}{sl}{<->sub * qtm/b/it}{}
+        \DeclareFontShape{T5}{\rmdefault}{m}{sl}{<->sub * qtm/m/it}{}
+        \DeclareFontShape{T5}{\rmdefault}{b}{scsl}{<->sub * qtm/b/scit}{}
+        \DeclareFontShape{T5}{\rmdefault}{m}{scsl}{<->sub * qtm/m/scit}{}
+        
         \def\qcr@scale{s*[0.95]}
         \DeclareFontFamily{T5}{\ttdefault}{}% not adjusting wordspacing
         \DeclareFontShape{T5}{\ttdefault}{b}{sc}{<-> \qcr@scale t5-qcrb-sc}{}
@@ -1540,7 +1909,7 @@
         \DeclareFontShape{T5}{\ttdefault}{m}{scsl}{<->sub * qcr/m/scit}{}
     	\endgroup
     \fi
-    
+
     \ifac@greek
         %% Based on Artemisia fd files by A. Tsolomitis and ideas from substitutefont package by G. Milde, both LaTeX Public License.
         \begingroup
@@ -1601,10 +1970,10 @@
         \DeclareFontShape{LGR}{\ttdefault}{bx}{sl}{<->\DejaVuSansMono@@scale DejaVuSansMono-TLF/b/it}{}
         \DeclareFontShape{LGR}{\ttdefault}{bx}{it}{<->\DejaVuSansMono@@scale DejaVuSansMono-TLF/b/it}{}
         \DeclareFontShape{LGR}{\ttdefault}{bx}{n}{ <->\DejaVuSansMono@@scale DejaVuSansMono-TLF/b/n}{}
-    
+
     	\endgroup
     \fi
-    
+
     \ifac@cyrillic
         %% Paratype fonts for cyrillic, maintained by Pavel Farar, under Latex Project Public License
     	\begingroup
@@ -1652,7 +2021,7 @@
         \DeclareFontShape{T2A}{\ttdefault}{bx}{n}{<->ssub * PTMono-TLF/b/n}{}
         \DeclareFontShape{T2A}{\ttdefault}{bx}{sl}{<->ssub * PTMono-TLF/b/sl}{}
     
-        \endgroup    
+        \endgroup 
     \fi
 \fi
 
diff --git a/macros/latex/contrib/asmeconf/examples/asmeconf-authorgrid-example.pdf b/macros/latex/contrib/asmeconf/examples/asmeconf-authorgrid-example.pdf
index fb724951f0..600ff30201 100644
--- a/macros/latex/contrib/asmeconf/examples/asmeconf-authorgrid-example.pdf
+++ b/macros/latex/contrib/asmeconf/examples/asmeconf-authorgrid-example.pdf
diff --git a/macros/latex/contrib/asmeconf/examples/asmeconf-authorgrid-example.tex b/macros/latex/contrib/asmeconf/examples/asmeconf-authorgrid-example.tex
index 5dc8d1b90d..bef7b45381 100644
--- a/macros/latex/contrib/asmeconf/examples/asmeconf-authorgrid-example.tex
+++ b/macros/latex/contrib/asmeconf/examples/asmeconf-authorgrid-example.tex
@@ -1,14 +1,14 @@
 % !TEX encoding = UTF-8 Unicode
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% 
 %%
-%%  This file is asmeconf-template.tex, a template to format ASME Conference papers according to
+%%  This file is asmeconf-template.tex, a LaTeX template to format ASME Conference papers according to
 %%  the requirements on ASME's conference web pages, and including hypertext support for the pdf.
 %%
-%%  This file is version 1.22 dated 2021/1/14
+%%  This file is version 1.27 dated 2021/12/26
 %%  
 %%  As of version 1.11, this template follows ASME's newer conference guidelines first posted July 2019.
 %% 			The new guidelines have changed the requested author block formatting to be inline. 
-%%			(This template continues to support the traditional grid format as a package option.)
+%%			(This LaTeX template continues to support the traditional grid format as a package option.)
 %%			Nomenclature now follows the abstract. Abstract text is set in italics.
 %%
 %%  Author: John H. Lienhard V
@@ -19,19 +19,18 @@
 %%  Class options include:
 %%
 %%          * Math options from M. Sharpe's newtxmath package: upright integrals [upint]; 
-%%          *    [varvw] for a v and w that are better distinguished from greek nu; and also 
+%%          *    [varvw] for a v and w that are better distinguished from Greek nu; and also 
 %%          *    [subscriptcorrection, smallerops, varg, frenchmath, varbb, cmbraces, slantedGreek,...] 
-%%			* 	 See newtx documentation for descriptions (at CTAN: http://ctan.org, v1.6 or higher best).
-%%
-%%          * Many options for calligraphic, script, and fraktur fonts from the mathalfa package; the
-%%          *    example shown here is: [mathalfa=cal=euler] to use Euler font for \mathcal.
-%%          *    Some other options for cal are: dutchcal, zapfc, cm (default), boondox,...
-%%          *    frak (fraktur), bb (blackboard bold), scr (script) may also be chosen this way.
-%%			*	 For details, refer to mathalfa documentation (at CTAN: http://ctan.org).
+%%			* 	 See newtx documentation for descriptions (at CTAN: http://ctan.org, v1.6 or higher is best).
 %%
 %%          * Options to: 	omit the ASME copyright footer [nofoot]; 
-%%							use government employee copyright notice [govt];
-%%							use government contractor copyright notice [contractor]
+%%			*				use government employee copyright notice [govt];
+%%			*				use government contractor copyright notice [contractor]
+%%
+%%          * An option to use the traditional grid arrangement of author names [grid].  
+%%			*	 With this option, line breaks (\\) may be inserted into the address as needed. 
+%%			*	 Author names that include commas should be enclosed in braces, e.g., {Joseph L. Smith, Jr.}.  
+%%			*	 Authors may be grouped above a single affiliation using braces, e.g., {Henry Tudor, Catherine Parr}.
 %%
 %%          * An option to balance the heights of columns on the last page [balance]. 
 %%          *    This option is NOT compatible with the [lineno] option.
@@ -44,11 +43,17 @@
 %%          *    just leave a blank line above the displayed equation while you are editing and then remove the 
 %%          *    blank line and [lineno] option when you move to your final version.
 %%
-%%          * An option to use the traditional grid arrangement of author names [authorgrid]. See Appendix B for usage,
-%%          *    because the authors and affiliations must be entered differently in this case. (Same as former option [oldauthors])
-%%
 %%			* Options for PDF/A compliance. [pdf-a] will produce PDF/A-3u compliance with sRGB OutputIntent.
 %%			*	 [pdfapart= 1 or 2 or 3] and [pdfaconformance= b or u] can enable levels 1b, 2b, 2u, and 3b.
+%%			*    The most recent versions of LaTeX (2021 and later) are moving toward integrated support for pdf-a, 
+%%			*    through \DeclareDocumentMetadata{..}. The asmeconf class supports these new features, which can 
+%%			*	 replace the aforementioned class options. (An up-to-date LaTeX installation is required to use this.)
+%%
+%%          * Many options for calligraphic, script, and fraktur fonts from the mathalfa package; the
+%%          *    example shown here is: [mathalfa=cal=euler] to use Euler font for \mathcal.
+%%          *    Some other options for cal are: dutchcal, zapfc, cm (default), boondox,...
+%%          *    frak (fraktur), bb (blackboard bold), scr (script) may also be chosen this way.
+%%			*	 For details, refer to mathalfa documentation (at CTAN: http://ctan.org).
 %%
 %%          * Option to use superiors font from newtxtext for footnotes [nodefaultsups] and
 %%          *    for slightly larger small capitals, [largesc], also from newtxtext.
@@ -60,12 +65,15 @@
 %%
 %%          * Options (used by the babel package) to include passages in languages other than English (e.g., a translation 
 %%			*    of the abstract). Languages are called as options, e.g. [french], [spanish], [greek], [russian], etc. 
-%%			*    See Appendix C for details.
+%%			*    Language support is greatest when running LuaLaTeX with the [fontspec] option.
+%%			*    See Appendix B for details.
 %%
 %%  The use of commands defined or modified by the asmeconf class is illustrated throughout this file. In particular, 
 %%  ASME requires capitalized, sans-serif section headings, and as a result some care is needed when using macros 
 %%  in section headings, as also illustrated below.
 %%
+%%  Use an up-to-date and complete installation of LaTeX, such as TeX Live 2020 or later. Errors may occur with old set-ups.
+%%
  %=========================================================
 %% 
 %% LICENSE: 
@@ -74,28 +82,31 @@
 %%
 %% Offered under the MIT license: https://ctan.org/license/mit 
 %%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-
-%% Class options are described above. If you are not using the languages options, remove them.
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% 
 
-\documentclass[authorgrid,upint,subscriptcorrection,varvw,mathalfa=cal=euler,pdf-a,spanish,french,greek,russian,japanese,fontspec,colorlinks]{asmeconf} % <=== remove colorlinks before your *final* submission to ASME! But keep it for other purposes.
+%% Class options are described above. Change these options as desired. 
+%%		If you are not using the language options, remove them (together with Appendices B and C)
+%%	 	Remove the [colorlinks] option before *final* submission to ASME, to get black text for printing,
+%%		but keep that option for other uses.
+ 
+\documentclass[grid,balance,upint,subscriptcorrection,varvw,mathalfa=cal=euler,spanish,french,greek,russian,vietnamese,colorlinks]{asmeconf}
 
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%  Fields to be completed   %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-%%%%%  pdf metadata          %%%%%%%%%%%%
-%%%%%  The user should edit  %%%%%%%%%%%%
+%%%%%  pdf metadata  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 \hypersetup{%
-	pdftitle={ASME Conference Paper Template},             % <=== change to YOUR pdf file title
-	pdfkeywords={ASME, Paper, Template, \LaTeX, Research}, % <=== change to YOUR pdf keywords
-	pdfauthor={John H. Lienhard},                          % <=== change to YOUR name[s]!
+	pdfauthor={John H. Lienhard},                       		      % <=== change to YOUR name[s]!
+	pdftitle={ASME Conference Paper LaTeX Template},                  % <=== change to YOUR pdf file title
+	pdfkeywords={ASME conference paper, LaTeX template, BibTeX style},% <=== change to YOUR pdf keywords
+	pdfsubject = {Describes the asmeconf LaTeX template with author grid},% <=== change to YOUR subject
+%	pdfurl={https://ctan.org/pkg/asmeconf},% may delete
+	pdflicenseurl={https://ctan.org/pkg/asmeconf},% may delete
 }
 
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 \begin{document}
+
 % Change these fields to the right content for your conference.
 % You can comment these out if for some reason you don't want a header.
 % Use title case (first letters capitalized), not all capitals
@@ -106,65 +117,66 @@
 \ConfCity{Cambridge, MA}
 \PaperNo{AIECE2021-0003}
 
-
-% Units of measure and other specialty lowercase terms in the title should be 
+% Units of measure (e.g., cm) and other specialty lowercase terms in the title should be 
 %   enclosed in \NoCaseChange{...} to maintain lower case type
 %   LaTeX will automatically set the rest of the title in all capital letters.
 
-\title{Place Title Here: Place Subtitle After Colon} % <=== change to YOUR title
-
-%%% This is the set-up for the traditional author block style (a grid of blocks) using option [authorgrid]
+\title{Place Title Here: Place Subtitle After Colon} 
+ 
+%   Put author names into the order you want. Use the same order for affiliations.
+%   \affil{#} tags the author's affiliation to the address in \SetAffiliation{#}.
+%   No space between last name and \affil{#}, separate names with commas.
+%
+%	For a sole author or a single affiliation for all authors, {#} may be left empty, as \affil{} and \SetAffiliation{} (but not with [grid] option!)
+%
+%   \CorrespondingAuthor{email} follows that author's affiliation, no spaces.  
+%   If multiple corresponding authors, put both email addresses in the same command and place after both authors.
+%
+%   \JointFirstAuthor, if applicable, follows the affiliation of the relevant authors, no spaces.
 
-% Change to your name[s] and addresses, in the desired order of authors. Up to nine author blocks.
-% Note usage below for joint first authors and for corresponding author.
-% First name, middle initial, last name
-% Use title case (upper and lower case letters)
 %    (Most of the names below are not real people, just very common names.)
 
-\SetAuthorBlock{Luis Hern\'{a}ndez\JointFirstAuthor}{Institution or Company Name \\ City, State} 
-\SetAuthorBlock{Maria Silva\JointFirstAuthor}{Institution or Company Name \\ City, Province, Canada}
-
-\SetAuthorBlock{Henry Tudor, Catherine Parr\CorrespondingAuthor{}}{Hampton Court Palace \\ Richmond, England}
-\SetAuthorBlock{Jinsoo Kim}{Institution or Company Name \\ City, Country}
-\SetAuthorBlock{Yusuf Yilmaz}{Institution or Company Name \\ City, Country}
-
-\SetAuthorBlock{Amelia Smith}{Institution or Company Name \\ City, Country}
-\SetAuthorBlock{Aadhya Acharya}{Institution or Company Name \\ City, Country}
-\SetAuthorBlock{Omar Abu Bakr}{Institution or Company Name \\ City, Country}
-
-% Give an empty argument for \CorrespondingAuthor{} if you are putting email address into the address block.
-% Can also put multiple emails into the argument and use command more than once for multiple 
-% corresponding authors. Only the *last* set of emails issued will be printed.
+\SetAuthors{%
+	Luis Hern\'{a}ndez\affil{1}\JointFirstAuthor, 
+	Maria Silva\affil{2}\JointFirstAuthor, 
+	{Henry Tudor,  Catherine~Parr\CorrespondingAuthor{}}\affil{3}, 
+	Jinsoo Kim\affil{1}, 
+	Yusuf Yilmaz\affil{1}, 
+	Amelia Smith\affil{1}, 
+	Aadhya Acharya\affil{1}, 
+	Omar Abu Bakr\affil{1}, 
+	John H.\ Lienhard\affil{4}\CorrespondingAuthor{lienhard@mit.edu, kate@thepalace.gov}
+}
 
-\SetAuthorBlock{John H.\ Lienhard V\CorrespondingAuthor{lienhard@mit.edu, kate@thepalace.com}\JointFirstAuthor}{%
-Massachusetts Institute of Technology \\  Cambridge, MA}
+\SetAffiliation{1}{Institution or Company Name\\ City, State}
+\SetAffiliation{2}{Institution or Company Name\\ City, Province, Canada}
+\SetAffiliation{3}{Hampton Court Palace\\ Richmond, England}
+\SetAffiliation{4}{Massachusetts Institute of Technology\\ Cambridge, MA }
 
-% be sure to issue [authorgrid] option when using this (otherwise your authorblock will not display!)
+% be sure to issue [grid] option
 
- 
 \maketitle
 
 %%% Use this footnote for tracking various versions of your draft. Change text to suit your own needs. 
-%%% REMOVE from final version of your paper.
 %%% \date{..} calls the same command. 
-
-\versionfootnote{Documentation for \texttt{asmeconf.cls}. Version \versionno; \today.}% <=== Delete before final submission.
+\versionfootnote{Documentation for \texttt{asmeconf.cls}: Version~\versionno, \today.}% <=== Delete before final submission.
 
 
 %%% Change these to your keywords.  Keywords are automatically printed at the end of the abstract.
 %%% This command MUST COME BEFORE the end of the abstract.
 %%% If you don't want keywords, leave the argument of \keywords{} empty (or use the abstract* environment)
 
-\keywords{ASME, Paper, Template, \LaTeX, Research}
+\keywords{ASME conference paper, \LaTeX\ Template, \hologo{BibTeX}}
 
-%%%%%%%%%%%%%%%%%%%%%  End of fields to be completed. Now write! %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%  End of fields to be completed. Now write your paper. %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 
-%%%%%%%%%  Abstract  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%  ABSTRACT  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%
-%% Abstract should be no more than 200 words
+%% Abstract should be 200 words or less
 \begin{abstract}
-This paper is an example of and a template for typesetting ASME Conference Papers in {\upshape\LaTeX} using the {\upshape\texttt{asmeconf}} class. This class follows ASME guidelines for margins, fonts, headings, captions, and reference formats as of 2020. The class is intended to be used with the {\upshape\texttt{asmeconf.bst} \hologo{BibTeX}} style, which is part of this distribution. The class incorporates the {\upshape\texttt{hyperref}} package, so that pdfs will contain hyperlinks, bookmarks, and metadata, and references can include the DOI and URL fields. Links may be colored, for online use, or black, for publication. The class enables inline author names, following ASME's current style, but can also produce the traditional grid style. Options include line numbering, final column balancing, various math options, government copyright, and archivability (PDF/A). In addition, section headers may contain mathematics, references, citations, and footnotes. The class is compatible with {\upshape\hologo{pdfLaTeX}} or {\upshape\hologo{LuaLaTeX}}.
+
+This paper is an example of and a  {\upshape\LaTeX} template for typesetting ASME conference papers using the {\upshape\texttt{asmeconf}} class. This  {\upshape\LaTeX} template follows ASME guidelines for margins, fonts, headings, captions, and reference formats as of 2021. The class is intended to be used with the {\upshape\texttt{asmeconf.bst} \hologo{BibTeX}} style for reference formatting, which is part of this distribution. The template produces pdfs that contain hyperlinks, bookmarks, and metadata; and references can include the DOI and URL fields. Links may be colored, for online use, or black, for publication. The class enables inline author names, following ASME's current style, but can also produce the traditional grid style. Options include line numbering, final column balancing, various math options, government copyright, and archivability (PDF/A). In addition, section headers may contain mathematics, references, citations, and footnotes. The class is compatible with {\upshape\hologo{pdfLaTeX}} or {\upshape\hologo{LuaLaTeX}}.
 \end{abstract}
 
 %%%%%%%%%  NOMENCLATURE (OPTIONAL) %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -172,9 +184,7 @@ This paper is an example of and a template for typesetting ASME Conference Paper
 %% To change space between the symbols and  definitions, use \begin{nomenclature}[Xcm] where X is a number 
 %% The unit cm can be replaced by any LaTeX unit of dimension: pt, in, ex, em, pc, etc.
 %% Default is 2em.
-
-%% \EntryHeading{Greek letters} produces an italicized subheading, e.g., \EntryHeading{Greek letters}
-%% (Leaving off the second argument of \entry, e.g. \entry{Greek letters}, has the same effect)
+%% \EntryHeading{..} produces an italicized subheading in the nomenclature list, e.g., \EntryHeading{Greek letters}
 
 \begin{nomenclature}
 \EntryHeading{Roman letters}
@@ -198,11 +208,13 @@ This paper is an example of and a template for typesetting ASME Conference Paper
 %%%%%%%%%  BODY OF PAPER %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 \section{Introduction}
-The \texttt{asmeconf} class typesets papers with margins, fonts, headings, captions, and reference formats that follow the specifications for conference papers of the American Society of Mechanical Engineers (ASME). In contrast to older ASME \LaTeX\ templates, \texttt{asmeconf} will set internal and external hyperlinks, and the pdf file will contain bookmarks and metadata. Many other useful features have been incorporated. This class is not a publication of ASME, but the author has published in ASME conferences since 1983. 
 
-The \texttt{.tex} file may be written using standard \LaTeX\ commands, although some specific initial commands are needed to format the blocks containing the author[s], title, and abstract.  This class loads a number of other packages, all of which are contained in up-to-date versions of \href{https://www.tug.org/texlive/}{\TeX\ Live}, \href{http://www.tug.org/mactex/}{Mac\TeX}, and similar platforms. If you find that you are missing one of these packages, you may obtain it at no cost from CTAN (\href{http://ctan.org}{ctan.org}).
+The \texttt{\hrefurl{https://ctan.org/pkg/asmeconf}{asmeconf}} class typesets papers with margins, fonts, headings, captions, and reference formats that follow the specifications for conference papers of the American Society of Mechanical Engineers (ASME). In contrast to older ASME \LaTeX\ templates, \texttt{asmeconf} will set internal and external hyperlinks, and the pdf file will contain bookmarks and metadata. Many other useful features have been incorporated. This class is not a publication of ASME, but the author has published in ASME conferences since 1983. 
+
+The \texttt{.tex} file may be written using standard \LaTeX\ commands, although some specific initial commands are needed to format the blocks containing the author[s], title, and abstract.  This class loads a number of other packages, all of which are contained in up-to-date versions of \hrefurl{https://www.tug.org/texlive/}{\TeX\ Live}, \hrefurl{http://www.tug.org/mactex/}{Mac\TeX}, and similar platforms. If you find that you are missing one of these packages, you may obtain it at no cost from CTAN (\hrefurl{https://ctan.org}{ctan.org}). 
 
 \subsection{Essential Initial Commands}
+
 To begin, fill in the fields to be completed at top of the \texttt{asmeconf-template.tex} file. These fields include the headers for your conference and your paper number. Specified metadata will be placed into the pdf file itself. 
 The title should be placed into \verb|\title{..}|. 
 
@@ -221,21 +233,20 @@ The abstract text must be placed into \verb|\begin{abstract}| \ldots \verb|\end{
 
 %% captions go below figures
 
-\begin{figure}[t]
+\begin{figure}
 \centering\includegraphics[width=0.7\linewidth]{sample-figure-1.pdf}
-\caption{Figure caption with math, eqn.~\eqref{eqn:fourier}: $z = (r,\phi)$ \cite{Lienhard2019b}\label{fig:1}}
+\caption{Caption with math, eqn.~\eqref{eqn:fourier}: $z = (r,\phi)$ \cite{Lienhard2019b}\label{fig:1}}
 \end{figure}
  
 %%%%%%%%%%%%% end figure %%%%%%%%%%%%%%%%%%%
 
-
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 \section{Referring to Citations, Figures, and Equations}
-Citations are automatically numbered \cite{ning2002}. They should be inserted at the appropriate point using a \verb|\cite{ref}| command~\cite{gibson2008,stevens1999}. The citations will be automatically sorted and compressed if they are given in a set \cite{stevens1999,ning2002,gibson2008,wions2005,smith2002,watson1982}. 
+
+Citations are automatically numbered \cite{ning2002}. They should be inserted in the text using a \verb|\cite{ref}| command~\cite{gibson2008,stevens1999}. The citations will be automatically sorted and compressed if they are given in a set \cite{stevens1999,ning2002,gibson2008,wions2005,smith2002,watson1982}. 
 A specific reference may be named with an abbreviation, as in Ref.~\cite{watson1982}.
-See the \texttt{asmeconf-sample.bib} file and Sect.~\ref{sec:references} for examples of how to enter your references.
+See the \texttt{asmeconf-sample.bib} file and Sect.~\ref{sec:references} for examples of entering references.
 
 For ASME conference papers, the labels Equation and Figure should be abbreviated when they do not start a sentence, as in  Eq.~\eqref{eqn:dw} and Fig.~\ref{fig:1}. Figure~\ref{fig:1} is spelled out when it starts a sentence. Equation~\eqref{eqn:dw} is spelled out when it starts a sentence. 
 
@@ -246,11 +257,13 @@ Equations are typeset in the usual way and will be automatically numbered.  The
 
 ASME prefers SI units. (U.S.\ style units may follow in parentheses.) Be sure to put all symbols into the nomenclature list, including their units.
 
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-%% Use title case for subsections and subsubsections
+%% Use title case for subsections and subsubsections (first letter of words capitalized)
 
 \section{Section Headings and Captions}
+
 ASME requires that section headings and captions be set in an uppercase, sans serif font.  The class will do this automatically.  You can place \verb|\cite{..}|, \verb|\ref{..}|, \verb|\label{..}|, and mathematics into headings and captions directly, as you would in the main text. Do not enclose them braces, e.g.\ \verb|{\cite{..}}|, which will cause errors. You can place \verb|\footnote{..}| into headings, but not into captions.\footnote{See \texttt{tex-stackexchange} for various approaches to footnotes in captions, if they seem necessary. For footnotes in tables, use the \texttt{tablefootnote} package.}\footnote{Sequential footnotes are automatically separated by a comma.}
 
 Text in section headings and captions will not be capitalized if enclosed in a \verb|\NoCaseChange{..}| command.
@@ -259,20 +272,23 @@ Sections may either be numbered or left unnumbered.
 
 Simple mathematical expressions can be used in either captions or section headings. For a section heading that includes more complicated math (and macros), you may use the optional argument of \verb|\section[..]{..}| to create a pdf bookmark without losing characters or producing warnings or errors. See the \texttt{asmeconf-template.tex} source file for examples of this procedure. These bookmarks should usually be text expressions, although some math is supported.  
 
-If you wish to override the default math format in captions, put \verb|\mathversion{normal}| in the caption.
+To override the \texttt{sansbold} math version in captions, put \verb|\NoCaseChange{\mathversion{normal}}| in the caption.
 
 \subsection{Subsection and Sub-subsection Headings}
+
 Subsections and sub-subsection headings should be entered in title case, with the first letter of primary words capitalized. Sub-subsections (i.e., paragraphs) are never numbered.
 
 
 %%%%%%%%%%%%%%% begin simple table %%%%%%%%%%%%%%%%%%%%%%%%%% 
 
-%% captions go above tables
+%% Captions go above tables
+%%
+%% Note that placement of figures and tables can managed with the [!tbhp] options. See: https://latexref.xyz/dev/latex2e.html#Floats
 
 \begin{table}[t]
 \caption[Table]{A simple table\label{tab:1}}
 \centering{%
-\begin{tabular}{l l r}
+\begin{tabular}{llr}
 \toprule
 Experiment & $u$ [m/s] & $T$ [\textdegree C] \\
 \midrule
@@ -304,6 +320,7 @@ Our competitor's test                &  72.321   &  141.384 \\
 
 %%%%%%%%%%%%%%%% end table  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% 
 
+
 %%%%%%%%%%%%%%% begin two column table %%%%%%%%%%%%%%%%%% 
 \begin{table*}
 \caption{A table spanning two columns\label{tab:3}}%
@@ -340,7 +357,7 @@ Our competitor's test                &  72.321   &  141.384 \\
 \section{Tables and Figures}
 
 Table \ref{tab:1} is an example of a simple table. Table captions should be placed above tables.
-The class loads the \texttt{booktabs} package (used for horizontal rules in both Table \ref{tab:1} and \ref{tab:2}), and the \texttt{array} and \texttt{dcolumn} packages which provide extended capabilities for columns in the \texttt{tabular} environment (used in Table \ref{tab:2}).  Table \ref{tab:3} is an example of a table that spans two columns. Two column tables (and figures) will always float to the top of a later page.
+The class loads the \texttt{booktabs} package (used for horizontal rules in Tables \ref{tab:1} and \ref{tab:2}), and the \texttt{array} and \texttt{dcolumn} packages which provide extended capabilities for columns in the \texttt{tabular} environment (see Table \ref{tab:2}).  Table \ref{tab:3} is an example of a table that spans two columns. Two column tables (and figures) will always float to the top of a later page.
 
 Figure captions go below figures. Figure~\ref{fig:2} is an example of a figure that spans two columns and includes subfigures. The text in figures (and tables) should be no smaller than 6~point type. Images in figures are handled by the standard \texttt{graphicx} package.
 
@@ -351,20 +368,20 @@ Landscape figures and tables may be produced at full-page size by putting \verb|
 
 \section{Reference Formatting with \NoCaseChange{\texttt{asmeconf.bst}}\footnote{If you have text in a section heading or caption that you do not want to be capitalized, such as an SI unit, enclose it in a \texttt{\textbackslash NoCaseChange} command.}}\label{sec:references}
 
-The {\upshape\texttt{asmeconf.bst}} \hologo{BibTeX}  style follows the reference styles shown on ASME's conference web site in  2020.\footnote{\texttt{asmeconf.bst} is intended as a replacement for the old \texttt{asmems4.bst}, which does not follow ASME's current reference formats or support DOI and URL.}
+The {\upshape\texttt{asmeconf.bst}} \hologo{BibTeX}  style follows the reference styles shown on ASME's conference web site in  2021.\footnote{\texttt{asmeconf.bst} is intended as a replacement for the old \texttt{asmems4.bst}, which does not follow ASME's current reference formats or support DOI and URL.}
 Examples for these and many other cases are given in the \texttt{asmeconf-sample.bib} file, which is part of this distribution. Citations and references are managed by the standard \texttt{natbib} package.  Nevertheless, a few comments are necessary. 
 
-%% sub-subsections should *not* be numbered
+%% sub-subsections should *not* be numbered according to ASME's style
 
 \subsubsection*{DOI, URL, and eprint} Include DOI numbers when they are available.  URL's may alternatively be given. ASME requests that URLs point to a document's abstract.
 
-Elementary support for \texttt{eprint} numbers is also included, generating a url at the end of the citation. The \texttt{archive} type may be specified using the macros \texttt{arxiv, googlebooks, hdl, jstore, oclc}, or \texttt{pubmed} (e.g., \texttt{archive=hdl},  \textit{without} braces). Both \texttt{eprint} and \texttt{archive} fields \textit{must} be given. Other root urls may be invoked using \verb|archive = {http://another.url.org/}|.
+Basic support for \texttt{eprint} numbers is also included, generating a url at the end of the citation. The \texttt{archive} type may be specified using the macros \texttt{arxiv, google\-books, hdl, jstore, oclc}, or \texttt{pubmed} (e.g., \texttt{archive=hdl},  \textit{without} braces). Both \texttt{eprint} and \texttt{archive} fields \textit{must} be given. Other root urls may be invoked using \verb|archive = {https://another.url.org/}|.
 
 \subsubsection*{Online Sources} A bibliography entry \verb|@online{..| is included for citation of online sources, such as web pages. A \texttt{url} or \texttt{eprint} with \texttt{archive} must be included. See the examples of use in the \texttt{asmeconf-sample.bib} file. 
 
 \subsubsection*{Date Accessed} The \verb|urldate={..}| field may be used to provide the date on which a given url was accessed. By default, the text printed will be \texttt{Accessed `date',}. The word ``Accessed'' may be changed using the \verb|urltype={..}| field.
 
-\subsubsection*{Conference Location and Date} For the entry types \verb|@inproceeedings{..| and \verb|@proceeedings{..|, you may include \verb|venue={..}| and \verb|eventdate={..}| to specify the city and the date of a conference.
+\subsubsection*{Conference Location and Date} For \verb|@inproceeedings{..| and \verb|@proceeedings{..|, you may include \verb|venue={..}| and \verb|eventdate={..}| to specify the city and date of a conference.
 
 \subsubsection*{Capitalization of Titles} ASME's bibliography style requires that document titles be in title case. The first letters of principal words are capitalized. Do this in the \texttt{.bib} file.
 
@@ -378,17 +395,18 @@ Elementary support for \texttt{eprint} numbers is also included, generating a ur
 \vspace*{1.7em}
 \centering{
   \includegraphics{sample-figure-2a.pdf}
-}
+}%
 \vspace*{1.7em}
-}
+}%
 \subcaption{Interior region\label{fig:interior-region}}
 \end{subfigure}%
 %%%%%%%%%%%%% no spaces or line breaks between these two subfigures
 \begin{subfigure}[t]{0.5\textwidth}
 \centering{%
 \includegraphics{sample-figure-2b.pdf}
+}%
 \subcaption{Exterior region\label{fig:exterior-region}}
-}\end{subfigure}
+\end{subfigure}
 \caption{A figure with two subfigures  \cite{Lienhard2019b}}\label{fig:2}
 \end{figure*}
 
@@ -397,7 +415,7 @@ Elementary support for \texttt{eprint} numbers is also included, generating a ur
 
 %%%%%%%%%%%%%%%  MORE ON MATH   %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-%% Dealing with complicated math in a section or subsection heading: 
+%% Here is an example of managing complicated math in a section or subsection heading: 
 %%    the optional argument to \section will provide the pdf bookmark
 %%    without losing characters or producing warnings/errors.
 %%
@@ -416,15 +434,15 @@ An example using \texttt{align} appears in Appendix~\ref{appendix:a}.
 
 An alternative solution may be to set large equations into two-column-wide tables or figures. While a package exists for setting equations that span two columns (\texttt{widetext.sty}), that code is erratic in relation to floats and page breaks.
 
-Math italics are used for roman and greek letters by default.  If you want an upright letter in math, you can use the relevant math alphabet, e.g., \verb|\mathrm, \mathbf, \mathsf|:
+Math italics are used for Roman and Greek letters by default.  If you want an upright letter in math, you can use the relevant math alphabet, e.g., \verb|\mathrm, \mathbf, \mathsf|:
 \begin{equation}\label{eqn:dw}
 \vec{F} = m \vec{a} \quad\textrm{or}\quad \vec{\mathrm{F}} = m \vec{\mathrm{a}} \quad\textrm{or}\quad \mathbf{F} = m \mathbf{a} \quad\textrm{or}\quad \vec{\mathsf{F}} = m \vec{\mathsf{a}}
 \end{equation}
-To get additional symbols in bold math, you can use \verb|\mathversion{bold}| or the \verb|\bm{..}| macro from the \texttt{bm} package, which is loaded by the class.
+To get additional symbols in bold math, use the \verb|\bm{..}| macro from the \texttt{bm} package (which is loaded by the class) or, for longer passages, use \verb|{\mathversion{bold}|\ldots\texttt{\}}.
 
-The class file also provides upright sans-serif greek letters with \verb|\sfalpha| and similar expressions (e.g., $\sfalpha, \sfbeta, \sfgamma, \sfdelta$ \ldots $\bm{\sfalpha, \sfbeta, \sfgamma, \sfdelta \ldots}$), in case they are needed (but note that the \verb|newtxmath| options \verb|frenchmath| and \verb|slantedGreek| also affect how greek letters are presented).
+The class file also provides upright sans-serif Greek letters with \verb|\sfalpha| and similar expressions (e.g., $\sfalpha, \sfbeta, \sfgamma, \sfdelta$ \ldots $\bm{\sfalpha, \sfbeta, \sfgamma, \sfdelta \ldots}$), in case they are needed (but note that the \verb|newtxmath| options \verb|frenchmath| and \verb|slantedGreek| also affect how Greek letters are presented).
 
-\subsection{The \texttt{newtxmath} and \texttt{mathalpha} Packages~\cite{sharpe1,sharpe2}} The \texttt{newtxmath} package~\cite{sharpe1}, loaded by default, includes a large number of options for mathematics, most of which can be called as options to \verb|\documentclass|. For example, the \texttt{upint} option of \texttt{newtxmath} selects upright integral signs (rather than slanted integral signs):
+\subsection{The \texttt{newtxmath} and \texttt{mathalpha} Packages~\cite{sharpe1,sharpe2}} The \texttt{newtxmath} package~\cite{sharpe1}, loaded by default, includes many options for mathematics, most of which can be called as options to \verb|\documentclass|. For example, the \texttt{upint} option selects upright integral signs (rather than slanted integral signs):
 \begin{quote}
 \verb|\documentclass[upint]{asmeconf}|. 
 \end{quote}  
@@ -434,7 +452,7 @@ In addition, many options for calligraphic, fraktur, and script fonts are availa
 \begin{center}
 \verb|\documentclass[mathalfa=cal=euler]{asmeconf}| 
 \end{center}
-which selects the Euler font for \verb|\mathcal| (this is our default). To find all the font options, refer to the \texttt{mathalfa} package documentation \cite{sharpe2}.
+which selects the Euler font for \verb|\mathcal|, as in $A \in \mathcal{P}(A)$. To find all the font options, refer to the \texttt{mathalfa} package documentation \cite{sharpe2}.
 
 The \texttt{asmeconf} class is designed to be used with \texttt{newtxmath} and does not support the \texttt{unicode-math} package.
 
@@ -455,23 +473,28 @@ This package will attempt to give equal height to the two columns on the last pa
 
 The \texttt{lineno} package is not compatible with the \texttt{flushend} package that makes final short columns the same height. Balancing is automatically disabled when this option is called. 
 
-\subsection{Grid-Style Author Block} The option \texttt{[authorgrid]} invokes ASME's grid-style arrangement of author names.  The authors and affiliations must be entered differently in this case. See Appendix \ref{appendix:b} for usage.
+\subsection{Grid-Style Author Block} The option \texttt{[grid]} invokes ASME's grid-style arrangement of author names. Author names are recognized by the commas that separate them. (To include a comma in a name, enclose it in braces.) Line breaks (\verb|\\|) may be inserted into the address of \verb|\SetAffiliation{n}{address}| as needed. 
+
+Note that ASME interprets the author order in the grid style by reading names from left-to-right in the top row, then left-to-right in each subsequent row.
 
 \subsection{Changing the Copyright Footer} The option \texttt{[nofoot]} will omit the ASME copyright from the page footer. The option \texttt{[govt]} will produce a copyright notice for authors who are employees of the U.\ S.\ Government.  The option \texttt{[contractor]} will produce a copyright
 notice for authors who are employed by a U.\ S.\ Government contractor.
 
-The footers are generated with the \texttt{fancyhdr} package~\cite{oostrum}, so you can change them in any way you like using the commands of that package. Only the default arrangement of footers matches ASME's style, however.
+The footers are generated with the \texttt{fancyhdr} package~\cite{oostrum} and can be changed using the commands of that package. Only the default arrangement matches ASME's style, however.
 
 \subsection{Archivability:~PDF/A} Compliance with PDF/A standards can be enabled using the option \texttt{[pdf-a]} 
 when running with \hologo{pdfLaTeX}. The default setting is for PDF/A-3u with sRGB OutputIntent (\texttt{sRGB.icc}). 
 If levels 1b, 2b, 2u, or 3b are preferred, use the options \texttt{[pdfapart=1 or 2 or 3]} and 
 \texttt{[pdfaconformance=b or u]}. Note that accessible conformance~(\texttt{a}) is not currently possible with \LaTeX.
 
-\subsection{Superiors Font} The \texttt{newtxtext} package includes a superiors font (both numbers and letters) for use in footnote markers and superscripts. To enable this font, use the option \texttt{[nodefaultsups]}. 
+As of late 2021, the \LaTeX 3 team is phasing in native support for PDF/A in the \LaTeX\ kernel, which will make these
+class options unnecessary when using up-to-date installations.
+
+\subsection{Superiors Font} The \texttt{newtxtext} package includes a superiors font (both numbers and letters) for use in footnote markers and text superscripts. To enable this font, use the option \texttt{[nodefaultsups]}. 
 
-\subsection{Typewriter Font Options} This font is the sans-serif \texttt{inconsolata}. By default, the word spacing is variable, but option \texttt{[mono]} ends this behavior. A slashed zero is default; option \texttt{[var0]} removes the slash. Option \texttt{[hyphenate]} enables hyphenation. (This option is not available if the \texttt{[fontspec]} option is used.)
+\subsection{Typewriter Font Options} This font is the sans-serif \texttt{inconsolata}. By default, the word spacing is variable, but option \texttt{[mono]} ends this behavior. A slashed zero is default; option \texttt{[var0]} removes the slash. Option \texttt{[hyphenate]} enables hyphenation. (The hyphenation option is not available if the \texttt{[fontspec]} option is used.)
 
-\subsection{Support for Other Languages}  The package can be adapted to incorporate (or entirely use) languages other than English. See Appendix \ref{appendix:c} for details.
+\subsection{Support for Other Languages}  This package can be adapted to incorporate (or entirely use) languages other than English. See Appendix \ref{appendix:b} for details.
 
 
 %%%%% Conclusions %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -486,18 +509,17 @@ Provide a brief conclusion (3-4 lines).
 Place any acknowledgments here.
 
 
-
 %%%  REFERENCES  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%
 %% Put your references into your .bib file in the usual way. Run latex once, bibtex once, then latex twice.
-%% The asmeconf.bst style allows: venue = {Location of Conference}, and eventdate = {Month, days}
-%%		for @inproceedings and @proceedings
-%%
+%% The asmeconf.bst style allows @inproceedings and @proceedings to include: 
+%%		venue = {Location of Conference}, 
+%%		eventdate = {Month, days},
 
-\nocite{*} %% <=== Delete this line unless you want to typeset the entire contents of your .bib file!
+\nocite{*}%% <=== Delete this line unless you want to typeset the entire contents of your .bib file!
 
-\bibliographystyle{asmeconf}   %% .bst file following ASME conference format. Do not change.
-\bibliography{asmeconf-sample} %% <=== change this to name of your bib file
+\bibliographystyle{asmeconf}  %% .bst file following ASME conference format. Do not change.
+\bibliography{asmeconf-sample}%% <=== change this to name of your bib file
 
 
 %%%  APPENDICES  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -518,35 +540,8 @@ consecutively, following those in the paper. Consider $\rho \neq \textrm{fn}(p)$
                    &{}= \iint_{\mathcal{S}}  \nabla p \times \nabla \left( \frac{1}{\rho}\right) \cdot d\mathbf{A}
 \end{align}
 
-\section{Option to Use an Author Grid}\label{appendix:b}
-
-ASME's most recent templates place author names inline, with affiliations for all authors in rows below. 
-This style is the default for this template.  
-
-The traditional style of putting authors with affiliation into a grid of blocks may be invoked with
-the option [\texttt{authorgrid}].  When using this form, the author names and addresses should be entered as below:
-
-\smallskip
-\noindent\verb|\SetAuthorBlock{Name\JointFirstAuthor}{%|
- \hbox{}\hfil\verb|Institution \\ City, State}| 
-\verb|\SetAuthorBlock{Name\JointFirstAuthor}{%|
- \hbox{}\hfil\verb|Institution \\ City, Country}|
-\verb|\SetAuthorBlock{Name, Name}{%|\hfil\hbox{}
- \hbox{}\hfil\verb|Institution \\ City, Country}|
-\verb|\SetAuthorBlock{John Lienhard\CorrespondingAuthor{%|
- \hbox{\qquad}\hfil\verb|lienhard@mit.edu}}{Institution \\ City, State}|
-\smallskip
-
-Code for the inline-author style is contained at the very end of this \texttt{.tex} file.
-
-Note that ASME interprets the author order in the grid style by reading names from left-to-right in the top row, then left-to-right in each
-subsequent row.
-
-%% directly usable code follows the \end{document} command below.
-
-%\end{document}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\section{Multilingual Support}\label{appendix:c}
+\section{Multilingual Support}\label{appendix:b}
 
 ASME publishes in English, but the \texttt{babel} package is loaded for 
 users who may wish to include other languages. For example, an author might wish to include an appendix that provides the 
@@ -556,60 +551,83 @@ When more than one language option is included in \verb|\documentclass[..]{asmec
 assumed to be the main language of the document. (To choose a different main language, set \texttt{[main=..]}).
 If no language options are given, the package defaults to English.  As examples, a passage in French is 
 shown in \selectlanguage{french}\appendixname~\ref{app:fourier}\selectlanguage{english}, followed by 
-\ifpdftex abstracts in Spanish, Greek, and Russian.\else abstracts in other languages.\fi
+\ifpdftex abstracts in Spanish, Greek, Russian, and Vietnamese.\else abstracts in other languages.\fi
 
-Font encoding is set to T1 with utf-8 input supported: 
+The input encoding can be utf-8, as for these glyphs:
 %% If you have trouble with the next line, your file may not be saved in utf-8 format. You can delete that line to resolve the issue.
-\typeout{If you have trouble with the next line, your file may not be saved in utf-8 format. You can delete that line to resolve the issue.}
+\typeout{If you have trouble with the next line, your file may not be saved in utf-8 format. You can delete that line to resolve the issue. Under LuaLaTeX, be sure to load the [fontspec] option}%
 àáâäæãåā  èéęëêēė  îïíīįì ôöòóœøōõ ûüùúū çćč ł ñń ßśš ÿ žźż.
 
-Fonts similar to Times/Helvetica are automatically used when the Greek, Vietnamese, or selected cyrillic-alphabet languages are called as options under {\upshape\hologo{pdfLaTeX}}. Using {\upshape\hologo{LuaLaTeX}} with the \texttt{[fontspec]} option, many additional scripts are available; see the supplemental notes for such usage~\cite{lienhard2021}. Possibilities include Arabic, Bengali, Chinese, Devanagari (e.g., for Hindi), Hangul (for Korean), Kana (for Japanese), and Tamil.
+Fonts similar to Times/Helvetica are automatically used when the Greek, Vietnamese, or selected cyrillic-alphabet languages are called as options under {\upshape\hologo{pdfLaTeX}}. Using {\upshape\hologo{LuaLaTeX}} with the \texttt{[fontspec]} option, many additional scripts are available; see the supplemental notes for such usage~\cite{lienhard2021}. Possibilities include Arabic, Bengali, Chinese, Devanagari (e.g., for Hindi), Hangul (for Korean), Kana (for Japanese), and Tamil. \textit{The {\upshape\texttt{[fontspec]}} option requires a \LaTeX\ installation dated October 2020 or later.}
 
-The bibliography style, \texttt{asmeconf.bst}, is designed in English and aimed at \hologo{BibTeX}.  Multilingual bibliographies 
-can be supported using \texttt{BibLaTeX}.
+The bibliography style, \texttt{asmeconf.bst}, is designed in English and aimed at \hologo{BibTeX}.  
+% Multilingual bibliographies can be supported using \texttt{BibLaTeX}.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-\begin{selectlanguage}{french}
+\begin{selectlanguage}{french}%
 \section{Discours Préliminaire de Fourier}\label{app:fourier}
 Les causes primordiales ne nous sont point con­nues; mais elles sont assujetties à des lois simples et constantes, que l'on peut découvrir par l'obser­vation, et dont l'étude est l'objet de la philosophie naturelle. 
 
 La chale ur pénètre, comme la gravité, toutes les substances de l'univers, ses rayons occupent toutes les parties de l'espace. Le but de notre ouvrage est d'exposer les lois mathématiques que suit cet élé­ment. Cette théorie formera désormais une des branches les plus importantes de la physique gé­nérale~\cite{fourier1822}. 
-\end{selectlanguage}
+\end{selectlanguage}%
+ 
+\begin{selectlanguage}{spanish}%
+\begin{abstract*}
+Este es el resumen del artículo. Escribimos en español. Se describen el problema, los métodos y los resultados. También se incluyen referencias.
+\end{abstract*}
+\end{selectlanguage}% edited by Aarón Montoya-Moraga
 
+%% If you have trouble with the following passages, you may deleting this stuff and remove the associated language option from \documentclass[..].
+\typeout{If you have trouble with the following passages, your file may not be saved in utf-8 format, or your LaTeX format may be old, or you may not have the assumed font installed. You can delete those lines to resolve the issue.}
 
 %% Examples of abstracts in other languages. The first three are intended for pdflatex, not lualatex.
 \ifpdftex
-    \begin{selectlanguage}{spanish}
+    \begin{selectlanguage}{greek}%
     \begin{abstract*}
-    Este es el resumen del artículo. Escribimos en español. Se describen el problema, los métodos y los resultados. También se incluyen referencias.
+    Αυτή είναι η περίληψη του άρθρου. Χρησιμοποιούμε την ελληνική γλώσσα. Περιγράφεται το πρόβλημα, οι μέθοδοι και τα αποτελέσματα. Περιλαμβάνονται επίσης αναφορές.
     \end{abstract*}
-    \end{selectlanguage}% edited by Aarón Montoya-Moraga
-%
-%  If you have trouble with the following passages, your file may not be saved in utf-8 format. You can delete this stuff to resolve the issue.
+    \end{selectlanguage}% Edited by George Barbastathis   
+    
+    \begin{selectlanguage}{russian}
+    \begin{abstract*}
+    Это резюме статьи. Пишем по русски. Описаны проблема, методы и результаты. Библиография также включена.%
+    \end{abstract*}
+    \end{selectlanguage}% edited by Steven Gerasimoff
+    
+    \begin{selectlanguage}{vietnamese}
+    \begin{abstract*}
+    Đây là phần tóm tắt của bài báo khoa học. Chúng tôi viết bằng tiếng Việt. Vấn đề, các phương pháp và các kết quả được mô tả trong phần này. Tài liệu tham khảo cũng được bao gồm.
+    \end{abstract*}
+    \end{selectlanguage}% Checked and edited by Nguyen Le and Thao Nguyen
+\fi
+   
+\iffontspecloaded %%% requires lualatex
 %
     \begin{selectlanguage}{greek}%
     \begin{abstract*}
     Αυτή είναι η περίληψη του άρθρου. Χρησιμοποιούμε την ελληνική γλώσσα. Περιγράφεται το πρόβλημα, οι μέθοδοι και τα αποτελέσματα. Περιλαμβάνονται επίσης αναφορές.
     \end{abstract*}
     \end{selectlanguage}% Edited by George Barbastathis   
-%
+%    
     \begin{selectlanguage}{russian}
     \begin{abstract*}
     Это резюме статьи. Пишем по русски. Описаны проблема, методы и результаты. Библиография также включена.%
     \end{abstract*}
     \end{selectlanguage}% edited by Steven Gerasimoff
 %
-\fi
-%
-\iffontspecloaded
-%
-    \begin{selectlanguage}{japanese}
+    \begin{selectlanguage}{vietnamese}
     \begin{abstract*}
-    %論文の要約です。日本語で記述します。問題、方法、および結果について説明します。また、参考文献も含めます。           
-    この論文の日本語での要約は以下のとおりです。問題、方法、および結果が説明されています。参考資料も添付してあります。
+    Đây là phần tóm tắt của bài báo khoa học. Chúng tôi viết bằng tiếng Việt. Vấn đề, các phương pháp và các kết quả được mô tả trong phần này. Tài liệu tham khảo cũng được bao gồm.
     \end{abstract*}
-    \end{selectlanguage}% Edited by Keiji Yano and Yoshiki Okamoto
+    \end{selectlanguage}% Checked and edited by Nguyen Le and Thao Nguyen
+%
+%    \begin{selectlanguage}{japanese}% Use class option [japanese] if you uncomment this passage.
+%    \begin{abstract*}
+%    % 論文の要約です。日本語で記述します。問題、方法、および結果について説明します。また、参考文献も含めます。           
+%    この論文の日本語での要約は以下のとおりです。問題、方法、および結果が説明されています。参考資料も添付してあります。
+%    \end{abstract*}
+%    \end{selectlanguage}% Edited by Keiji Yano and Yoshiki Okamoto
 %
     \begin{selectlanguage}{korean}
     \begin{abstract*}
@@ -629,23 +647,3 @@ La chale ur pénètre, comme la gravité, toutes les substances de l'univers, se
 
 \end{document}
 
-
-%%% This is the set-up for the inline author block style; don't use option [authorgrid]
-
-%   Put author names into the order you want. Use the same order for affiliations.
-%   \affil{#} tags the author's affiliation to the address in \SetAffiliation{#}.
-%   No space between last name and \affil{#}, separate names with commas.
-%
-%   \CorrespondingAuthor{email} follows that author's affiliation, no spaces.  
-%   If multiple corresponding authors, put both email addresses in the same command and place after both authors.
-%
-%   \JointFirstAuthor, if applicable, follows the affiliation of the relevant authors, no spaces.
-
-\SetAuthors{Luis Hern\'andez\affil{1}\JointFirstAuthor , Maria Silva\affil{2}\JointFirstAuthor, Henry Tudor\affil{3},  Catherine~Parr\affil{3}\CorrespondingAuthor{}, John H.\ Lienhard V\affil{4}\CorrespondingAuthor{lienhard@mit.edu, kate@thepalace.gov}}
-
-\SetAffiliation{1}{Institution or Company Name, City, State}
-\SetAffiliation{2}{Institution or Company Name, City, Province, Canada}
-\SetAffiliation{3}{Hampton Court Palace, Richmond, England}
-\SetAffiliation{4}{Massachusetts Institute of Technology, Cambridge, MA }
-%	Note: Luis and Maria are not real people.  Henry and Catherine have been dead for >450 years.
-
diff --git a/macros/latex/contrib/asmeconf/examples/asmeconf-fontspec.pdf b/macros/latex/contrib/asmeconf/examples/asmeconf-fontspec.pdf
index 51a514f86a..c2fc29a440 100644
--- a/macros/latex/contrib/asmeconf/examples/asmeconf-fontspec.pdf
+++ b/macros/latex/contrib/asmeconf/examples/asmeconf-fontspec.pdf
diff --git a/macros/latex/contrib/asmeconf/examples/asmeconf-fontspec.tex b/macros/latex/contrib/asmeconf/examples/asmeconf-fontspec.tex
index 5a10b7ccd5..c4ae6c0497 100644
--- a/macros/latex/contrib/asmeconf/examples/asmeconf-fontspec.tex
+++ b/macros/latex/contrib/asmeconf/examples/asmeconf-fontspec.tex
@@ -40,7 +40,7 @@
 \def\NotoAra@scale{0.93}% The serif font only; the default value is 0.91
 
 % Noto family is not as close to Tex Gyre Termes as I'd like, so for abstract examples in Latin script [only], use Noto Serif Italic for visual consistency
-\newfontfamily{\NotoSerifItal}{NotoSerif-Italic.ttf}[ItalicFont=*,Scale=\Noto@scale,WordSpace={1,1.4,1}]
+\newfontfamily{\NotoSerif}{NotoSerif}[UprightFont=*-Regular,ItalicFont=*-Italic, BoldItalicFont=*-BoldItalic, BoldFont=*-Bold, Extension=.ttf,Scale=\Noto@scale,WordSpace={1,1.4,1}]
 \newfontfamily{\NotoSerifItalns}{NotoSerif-Italic.ttf}[ItalicFont=*,Scale=\Noto@scale]% Turkish has trouble with WordSpace
 \makeatother
 
@@ -114,12 +114,12 @@
 
 \title{Language Support in ASMECONF: Non-Latin Alphabets, Lualatex, and fontspec}
  
-\SetAuthors{John H.\ Lienhard V\affil{1}\CorrespondingAuthor{lienhard@mit.edu}}
-\SetAffiliation{1}{Department of Mechanical Engineering \\ Massachusetts Institute of Technology, Cambridge, MA}
+\SetAuthors{John H.\ Lienhard V\affil{}\CorrespondingAuthor{lienhard@mit.edu}}
+\SetAffiliation{}{Department of Mechanical Engineering \\ Massachusetts Institute of Technology, Cambridge, MA}
 
 \maketitle
 
-\versionfootnote{Version~1.0, \today}
+\versionfootnote{Version~1.01, \today}
 
 \keywords{asmeconf, language support, non-Latin alphabets, fontspec, \LLT}
 
@@ -259,7 +259,7 @@ Examples of abstracts in various languages now follow. Reading the source \textt
 \end{abstract*}
 \end{selectlanguage}% edited by Zi Hao Foo
 
-{\NotoSerifItal
+{\NotoSerif
 \begin{selectlanguage}{spanish}
 \begin{abstract*}
 Este es el resumen del artículo. Escribimos en español. Se describen el problema, los métodos y los resultados. También se incluyen referencias.
@@ -291,7 +291,7 @@ This is the summary of the article. We write in English. The problem, methods, a
 \end{abstract*}
 \end{selectlanguage}% Edited by Omar Labban
 
-{\NotoSerifItal
+{\NotoSerif
 \begin{selectlanguage}{portuguese}
 \begin{abstract*}
 Este é o resumo do artigo. Escrevemos em português. O problema, métodos e resultados são descritos. Referências também estão incluídas.
@@ -318,7 +318,7 @@ Este é o resumo do artigo. Escrevemos em português. O problema, métodos e res
 \end{abstract*}
 \end{selectlanguage}% Edited by Vibhawari Deshmukh. (Note that proper fontspec renderer is needed for the combining characters.)
 
-{\NotoSerifItal
+{\NotoSerif
 \begin{selectlanguage}{turkish}
 \begin{abstract*}{\NotoSerifItalns
 Bu, makalenin özetidir. Türkçe yazıyoruz. Sorun, yöntemler ve sonuçlar açıklanmaktadır. Referanslar da dahildir.}%
@@ -332,7 +332,7 @@ Bu, makalenin özetidir. Türkçe yazıyoruz. Sorun, yöntemler ve sonuçlar aç
 \end{abstract*}
 \end{selectlanguage}% Edited by Hyung Won Chung.
 
-{\NotoSerifItal
+{\NotoSerif
 \begin{selectlanguage}{french}
 \begin{abstract*}
 Ceci est le résumé de l'article. Il est écrit en français. Le problème, les méthodes et les résultats sont décrits. Des références sont également incluses.
@@ -352,7 +352,7 @@ Hier ist die Zusammenfassung des Beitrags. Wir schreiben auf Deutsch. Die Frages
 \end{abstract*}
 \end{selectlanguage}% Edited by Jaichander Swaminathan. (Note that HarfBuzz is needed for combining characters to render correctly.)
 
-{\NotoSerifItal
+{\NotoSerif
 \begin{selectlanguage}{vietnamese}
 \begin{abstract*}
 Đây là phần tóm tắt của bài báo khoa học. Chúng tôi viết bằng tiếng Việt. Vấn đề, các phương pháp và các kết quả được mô tả trong phần này. Tài liệu tham khảo cũng được bao gồm.%
@@ -405,7 +405,7 @@ Matatizo, Mbinu na matokeo yameelezewa. Marejeleo pia yamejumuishwa.
 \end{abstract*}
 \end{selectlanguage}% confirmed by Bora Mikić
 
-{\NotoSerifItal
+{\NotoSerif
 \begin{selectlanguage}{latin}
 \begin{abstract*}
 Hoc argumentum in articulum. Latine scribere nobis. Quaestio est, modi, et describit eventus qui. Alia sunt opera citatis.
diff --git a/macros/latex/contrib/asmeconf/examples/asmeconf-lualatex-ode-example.pdf b/macros/latex/contrib/asmeconf/examples/asmeconf-lualatex-ode-example.pdf
index faeba45607..3443ed0425 100644
--- a/macros/latex/contrib/asmeconf/examples/asmeconf-lualatex-ode-example.pdf
+++ b/macros/latex/contrib/asmeconf/examples/asmeconf-lualatex-ode-example.pdf
diff --git a/macros/latex/contrib/asmeconf/examples/asmeconf-lualatex-ode-example.tex b/macros/latex/contrib/asmeconf/examples/asmeconf-lualatex-ode-example.tex
index 6db7d9c08a..891c2207d7 100644
--- a/macros/latex/contrib/asmeconf/examples/asmeconf-lualatex-ode-example.tex
+++ b/macros/latex/contrib/asmeconf/examples/asmeconf-lualatex-ode-example.tex
@@ -18,7 +18,7 @@
 %%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-\documentclass[varvw,colorlinks,nofoot]{asmeconf}
+\documentclass[grid,colorlinks,nofoot]{asmeconf}
 
 \hypersetup{%
 	pdftitle={Example of asmconf with LuaLaTeX to solve an ODE},
@@ -156,17 +156,17 @@ end
 \title{Example of \NoCaseChange{{\upshape\hologo{LuaLaTeX}}} with asmeconf.cls for ODE Integration}
  
 \SetAuthors{John H.\ Lienhard V\affil{1}\CorrespondingAuthor{lienhard@mit.edu}}
-\SetAffiliation{1}{Massachusetts Institute of Technology, Cambridge, MA}
+\SetAffiliation{1}{Department of Mechanical Engineering, Massachusetts Institute of Technology, Cambridge, MA}
 
 \maketitle
 
-\versionfootnote{Version~1.0, \today}
+\versionfootnote{Version~1.01, \today}
 
 \keywords{asmeconf, \hologo{LuaLaTeX}, ODE, pgfplots, landscape}
 
 %%%%%%%%%  ABSTRACT  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \begin{abstract}
-This paper is an example of using \texttt{asmeconf} with {\upshape\hologo{LuaLaTeX}} to solve an ODE initial value problem using a fourth-order Runge-Kutta method and to plot the result using \texttt{PGFPLOTS}. The use of a landscape figure is also illustrated. References are given for further reading.
+This paper is an example of using {\upshape\texttt{asmeconf}} with {\upshape\hologo{LuaLaTeX}} to solve an ODE initial value problem using a fourth-order Runge-Kutta method and to plot the result using {\upshape\texttt{PGFPLOTS}}. The use of a landscape figure is also illustrated. References are given for further reading.
 \end{abstract}
 
 %%%%%%%%%  NOMENCLATURE (OPTIONAL) %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -217,16 +217,16 @@ Landscape figures, such as Fig.~\ref{fig:1}, may be produced at full-page size b
      ]
 % tMax = 30, npoints = 400, A is the last argument
 \addLUADEDplot[color=Purple4,densely dashed,,very thick]{30}{400}{0.25};% color names are from xcolor package
-	\addlegendentry[fill=white]{$\mathsf{A = 0.25}$}; 
+	\addlegendentry[fill=white]{$\mathsf{A = 0.25}$} 
 \addLUADEDplot[color=Chartreuse4,dashdotted,very thick]{30}{400}{0.5};
-	\addlegendentry[fill=white]{$\mathsf{A = 0.5}$}; 
+	\addlegendentry[fill=white]{$\mathsf{A = 0.5}$} 
 \addLUADEDplot[color=Red3,densely dotted,very thick]{30}{400}{0.75};
-	\addlegendentry[fill=white]{$\mathsf{A = 0.75}$}; 
+	\addlegendentry[fill=white]{$\mathsf{A = 0.75}$}
 \addLUADEDplot[color=Blue3,smooth,very thick]{30}{400}{1};
-	\addlegendentry[fill=white]{$\mathsf{A = 1}$}; 
+	\addlegendentry[fill=white]{$\mathsf{A = 1}$} 
 \end{axis}
 \end{tikzpicture}
-\caption{A trial of pgfplot with Luacode Runge-Kutta integration\label{fig:1}}
+\caption{\MakeUppercase{A trial of pgfplot with Luacode Runge-Kutta integration}\label{fig:1}}
 \end{sidewaysfigure*}
 
 
diff --git a/macros/latex/contrib/asmejour/README.md b/macros/latex/contrib/asmejour/README.md
index 067d79afe3..32376dd7cf 100644
--- a/macros/latex/contrib/asmejour/README.md
+++ b/macros/latex/contrib/asmejour/README.md
@@ -1,7 +1,7 @@
  
   #asmejour: A template for ASME journal papers#
  
-  Version 1.16 dated 2021/12/23.
+  Version 1.17 dated 2021/12/26.
 
   ####Overview####
   This class provides a template to format preprints in the style of journal papers published by the American Society of Mechanical Engineers. 
@@ -64,6 +64,9 @@
  ---
  
  ####Change log####
+v1.17 (2021/12/26):
+ - Add code to warn about obsolete LaTeX installations. TeX Live 2020 or later is recommended for the asmejour package.
+
 v1.16 (2021/12/23):
  - suppress warnings about unused options when calling mathalfa and/or barcolor
  - eliminate use of \\entry{} with a single argument to produce subheadings in nomenclature; use \\EntryHeading{} instead. (**not backward compatible**)
diff --git a/macros/latex/contrib/asmejour/asmejour-template.pdf b/macros/latex/contrib/asmejour/asmejour-template.pdf
index 8d6ee337d4..fe57fe02e0 100644
--- a/macros/latex/contrib/asmejour/asmejour-template.pdf
+++ b/macros/latex/contrib/asmejour/asmejour-template.pdf
diff --git a/macros/latex/contrib/asmejour/asmejour-template.tex b/macros/latex/contrib/asmejour/asmejour-template.tex
index 9aba31970c..f1109b714b 100644
--- a/macros/latex/contrib/asmejour/asmejour-template.tex
+++ b/macros/latex/contrib/asmejour/asmejour-template.tex
@@ -3,7 +3,7 @@
 %% 
 %%  This file is asmejour-template.tex, a template to format papers in the style of ASME journal papers. 
 %%
-%%  This file is version 1.16 dated 2021/12/23
+%%  This file is version 1.17 dated 2021/12/26
 %%
 %%  Author: John H. Lienhard V
 %%          Department of Mechanical Engineering
@@ -90,7 +90,7 @@
 	pdftitle={ASME Journal Paper LaTeX Template},                  	% <=== change to YOUR pdf file title
 	pdfkeywords={ASME journal paper, LaTeX template, BibTeX style, asmejour class},% <=== change to YOUR pdf keywords
 	pdfsubject = {Describes the asmejour LaTeX template},			% <=== change to YOUR subject
-	pdfurl={https://ctan.org/pkg/asmejour},% may delete
+%	pdfurl={https://ctan.org/pkg/asmejour},% may delete
 	pdflicenseurl={https://ctan.org/pkg/asmejour},% may delete
 }
 
@@ -243,12 +243,12 @@ Landscape figures and tables may be produced at full-page size by putting \verb|
 \begin{figure*}[t]
 \begin{subfigure}[t]{0.5\textwidth} % You will get same result using \begin{minipage}[t]{0.5\textwidth}
 \vbox{
-\vspace*{1.7em}
+\vspace*{1.7em}%
 \centering{
   \includegraphics{sample-figure-2a.pdf}
-}
+}%
 \vspace*{1.7em}
-}
+}%
 \subcaption{\label{fig:interior-region}}
 \end{subfigure}%
 %%%%%%%% don't leave a break here
diff --git a/macros/latex/contrib/asmejour/asmejour.cls b/macros/latex/contrib/asmejour/asmejour.cls
index 48c33b0ed8..f4ac5c2826 100644
--- a/macros/latex/contrib/asmejour/asmejour.cls
+++ b/macros/latex/contrib/asmejour/asmejour.cls
@@ -6,8 +6,8 @@
 %%
 %%
 %%  This file's version and date are:
-		\def\versionno{1.16}
-		\def\versiondate{2021/12/23\space}
+		\def\versionno{1.17}
+		\def\versiondate{2021/12/26\space}
 %%
 %%  Author: John H. Lienhard V
 %%          Department of Mechanical Engineering
@@ -68,23 +68,51 @@
 \LoadClass[twoside,9pt,twocolumn]{extarticle}
 
 \ifdefined\NewDocumentCommand\else
-  \RequirePackage{xparse}
+  \RequirePackage{xparse}[2020/02/25]
 \fi 
 
-\RequirePackage{etoolbox}%  dropped xpatch 2020/02/28
+\RequirePackage{etoolbox}
 \RequirePackage{ifthen}
-\RequirePackage{iftex}%     check whether pdftex or another engine is used
 
-\providecommand\IfFormatAtLeastTF{\@ifl@t@r\fmtversion}% backward compatibility (Thanks Ulrike Fischer)
+%%%%%%%%%%%%%  Test compatibility of older distributions  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
+\providecommand\IfFormatAtLeastTF{\@ifl@t@r\fmtversion}% backward compatibility (thanks Ulrike Fischer)
+
+\IfFormatAtLeastTF{2020/02/25}{%
+	\ClassInfo{asmeconf}{Your LaTeX format is dated \fmtversion. LaTeX distributions 2020 or later are strongly recommended for best results}
+	}{%
+	\ClassError{asmeconf}{Your LaTeX format is dated \fmtversion.  Formats dated 2020 or later are recommended for the asmejour class. Older formats may generate errors or fail entirely}{Please UPDATE your LaTeX distribution to obtain best results. TeX Live is available for download at no charge: \string https://www.tug.org/texlive/.  (You can try to click past the errors for now, but your abstract will probably not compile properly.)}%
+}
+	
 \DeclareDocumentCommand\LogNote{m}{%   
 	\IfFormatAtLeastTF{2021/11/15}{% 
-		\ClassNoteNoLine{asmejour}{#1}% New with this recent format
+		\ClassNoteNoLine{asmejour}{#1}% New with the recent LaTeX format
 		}{%
 	    \ClassWarningNoLine{asmejour}{#1}%
 	}
 }
 
+%% provide iftex command \ifpdftex for those still running old distributions
+\IfFormatAtLeastTF{2019/11/07}{% 
+	\RequirePackage{iftex}% check whether pdftex or another engine is used
+	}{% 
+    \LogNote{The asmeconf class requires the missing package iftex---trying a work-around.}
+	% Code copied from iftex package written by the LaTeX3 Project (used under LPPL).
+    % \csname and \let construct useful for hiding \ifzzz tokens from outer level \if tests.
+    \def\IFTEX@let#1#2{%
+      \expandafter\let\csname if#1\expandafter\endcsname
+      \csname if#2\endcsname}
+    % pdftex (including in dvi mode)
+    \begingroup\expandafter\expandafter\expandafter\endgroup
+    \expandafter\ifx\csname pdftexversion\endcsname\relax
+      \IFTEX@let{pdftex}{false}
+    \else
+      \IFTEX@let{pdftex}{true}
+    \fi
+    \IFTEX@let{PDFTeX}{pdftex}
+}
+
+
 %%%%%%%%%%%%%% Options for the class %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 \RequirePackage{kvoptions}% this package calls kvsetkeys
@@ -327,7 +355,8 @@
   	\RequirePackage[utf8]{inputenc}% for backward compatibility with pre-2018 LaTeX distributions
 \else
 	\ifaj@setpdfa\ClassWarningNoLine{asmejour}{pdf-a option requires pdfLaTeX engine. Under LuaLaTeX, use %
-			\protect\DeclareDocumentMetadata{pdfstandard=A-3b} before \protect\begin{document}}\fi%
+			\protec\RequirePackage{pdfmanagement-testphase} %
+			\protect\DeclareDocumentMetadata{pdfstandard=A-3b} before \protect\documentclass[..]{asmejour}}\fi%
 	\ifluatex
     	\directlua{
             if pdf.getminorversion() \string~= 7 then
@@ -773,6 +802,8 @@
 \renewcommand{\doitext}{doi:~} % change the default, {doi:}, to this for ASME specification
 \RequirePackage{bookmark}	   % improves handling of pdf bookmarks
 
+\providecommand*{\toclevel@subfigure}{1}% <== to address unknown bookmark level of subfigure. 2021/12/24
+
 \providecommand\hrefurl[2]{\href{#1}{#2}}% to address certain issues around URL recognition with new pdf management code, 2021/12/22
 %% This alias is also incorporated into asmejour.bst
 
diff --git a/macros/latex/contrib/codebox/README.md b/macros/latex/contrib/codebox/README.md
new file mode 100644
index 0000000000..f5372b8900
--- /dev/null
+++ b/macros/latex/contrib/codebox/README.md
@@ -0,0 +1,68 @@
+Create code box and viewer based on tcolorbox and minted/listings
+=======
+
+`codebox` is a LaTeX3 package developed based on tcolorbox and minted/listings, which provides environments `codebox` and `codeview` to typset with environment body, and macros `\codefile` and `\cvfile` to typeset programming source code from a file in a fancy box.
+
+The starred version of all environments and macros are provided at the same time, such as `codebox*`, `codeview*`, `\codefile*` and `\cvfile*` which adds comment at bottom of the fancy box.
+
+You can read the manual (in Chinese/English) for more details and examples.
+
+Contributing
+------------
+
+1. github repository:
+    1. repository: [codebox](https://github.com/registor/codebox)
+    2. Issues and pull requests are welcome. [issue](https://github.com/registor/codebox/issues) or [pull request](https://github.com/registor/codebox/pulls).
+
+2. gitee repository:
+    1. repository: [codebox](https://gitee.com/nwafu_nan/codebox)
+    2. Issues and pull requests are welcome. [issue](https://gitee.com/nwafu_nan/codebox/issues) or [pull request](https://gitee.com/nwafu_nan/codebox/pulls).
+
+基于tcolorbox的终端模拟宏包
+=======
+
+`codebox`是一个基于tcolorbox的用LaTeX3开发的终端模拟LaTeX宏包，它提供了用于排版程序源代码盒子的环境和命令。
+
+其中`codebox`和`codeview`环境用于根据环境内容排版代码，`\codefile`和`\cvfile`命令用于根据文件内容排版代码。
+
+`codebox`同时提供了各环境和命令的星号版本，如`codebox*`和`codeview*`，`\codefile*`和`\cvfile*`，用于为代码盒子添加底线注释。
+
+可以通过阅读宏包手册(中文/英文)以也解该宏包更多的使用细节和使用样例。
+
+###  参与贡献
+---------------------
+
+1. github仓库:
+    (1). 仓库地址: [codebox](https://github.com/registor/codebox)
+    (2). Issues和PR: [issue](https://github.com/registor/codebox/issues) or [pull request](https://github.com/registor/codebox/pulls).
+
+2. gitee仓库:
+    (1). 仓库地址: [codebox](https://gitee.com/nwafu_nan/codebox)
+    (2). Issues and PR: [issue](https://gitee.com/nwafu_nan/codebox/issues) or [pull request](https://gitee.com/nwafu_nan/codebox/pulls).
+
+Copyright and Licence
+---------------------
+
+    Copyright (C) 2020-2021 by Nan Geng <nangeng@nwafu.edu.cn>
+    ----------------------------------------------------------------------
+
+    This work may be distributed and/or modified under the
+    conditions of the LaTeX Project Public License, either
+    version 1.3c of this license or (at your option) any later
+    version. This version of this license is in
+       http://www.latex-project.org/lppl/lppl-1-3c.txt
+    and the latest version of this license is in
+       http://www.latex-project.org/lppl.txt
+    and version 1.3 or later is part of all distributions of
+    LaTeX version 2005/12/01 or later.
+
+    This work has the LPPL maintenance status "maintained".
+
+    The Current Maintainer of this work is Nan Geng.
+
+    This package consists of the file  codebox.dtx,
+                 and the derived files codebox.sty,
+                                       codebox.pdf,
+                                       codebox.ins,
+                                       README.md (this file).
+
diff --git a/macros/latex/contrib/codebox/build.sh b/macros/latex/contrib/codebox/build.sh
new file mode 100755
index 0000000000..433e777e39
--- /dev/null
+++ b/macros/latex/contrib/codebox/build.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+xetex codebox.dtx &&\
+xelatex -shell-escape codebox.dtx &&\
+makeindex -s gind.ist -o codebox.ind codebox.idx &&\
+makeindex -s gglo.ist -o codebox.gls codebox.glo &&\
+xelatex -shell-escape codebox.dtx &&\
+xelatex -shell-escape codebox.dtx &&\
+xelatex -shell-escape codebox.dtx
diff --git a/macros/latex/contrib/codebox/codebox-doc-en.pdf b/macros/latex/contrib/codebox/codebox-doc-en.pdf
new file mode 100644
index 0000000000..50fca38b0a
--- /dev/null
+++ b/macros/latex/contrib/codebox/codebox-doc-en.pdf
diff --git a/macros/latex/contrib/codebox/codebox-doc-en.tex b/macros/latex/contrib/codebox/codebox-doc-en.tex
new file mode 100644
index 0000000000..cf4232e088
--- /dev/null
+++ b/macros/latex/contrib/codebox/codebox-doc-en.tex
@@ -0,0 +1,380 @@
+\documentclass{ctxdoc-en}
+\usepackage{minted}
+\usepackage{listings}
+\usepackage{xcolor}
+\usepackage{xcolor-material}
+\usepackage{codebox}
+
+\renewcommand{\thecodecounter}{\thesection.\arabic{codecounter}}
+\NewDocumentCommand{\init}{+v}{\hspace{\fill}Init~=~\textcolor{blue}{\bfseries#1}}
+\DeclareDocumentCommand\opt{m}{\texttt{#1}}
+\DeclareDocumentCommand\kvopt{mm}
+  {\texttt{#1\breakablethinspace=\breakablethinspace#2}}
+\def\breakablethinspace{\hskip 0.16667em\relax}
+
+\title{\bfseries\pkg{codebox}：programming code box}
+\author{Nan Geng\\ \url{nangeng@nwafu.edu.cn}}
+\date{2021/12/26\qquad v1.0.0\thanks{\url{https://github.com/registor/codebox}}
+\thanks{\url{https://gitee.com/nwafu_nan/codebox}}}
+
+\begin{document}
+
+\maketitle
+
+\begin{abstract}
+
+\pkg{codebox} is a \pkg{tcolorbox}-based package developed with \LaTeX3,
+which provides environments \env{codebox} and \env{codeview}, and macros
+\tn{codefile} and \tn{cvfile} for typsetting programming source code box.
+
+The environments create codebox with it's body and
+macros is used to read in the source code file and output is in the codebox.
+
+The starred environments and macros are also provided
+to get codebox with comments at the bottom of box.
+
+All codebox style can be setted by \tn{codeset} macro
+or environment's and macro's key-value \oarg{options}.
+
+\end{abstract}
+
+\tableofcontents
+
+\section{introduction}
+
+\pkg{codebox} is a \LaTeX3 package for typesetting programming source code box.
+
+Both \env{codebox} and \env{codeview} environment are provided with enironment body.
+At the same time, both \tn{codefile} and \tn{cvfile} macros are created
+for reading source code file.
+
+The starred environments(\env{codebox*} and \env{codeview*}) and
+macros(\tn{codefile*} and \tn{cvfile*}) are also provided
+to get codebox with comments at the bottom of box.
+
+\section{interface}
+
+\subsection{\env{codebox} and \env{codebox*} environments}
+
+\begin{function}[added=2021-12-25,updated=2021-12-25]{codebox,codebox*}
+  \begin{syntax}
+    \tn{begin}\{codebox\}\oarg{options}\Arg{codebox title}
+    .....
+    \tn{end}\{codebox\}
+    \tn{begin}\{codebox*\}\oarg{options}\Arg{codebox title}
+    .....
+    \tn{end}\{codebox*\}
+  \end{syntax}
+  Typesetting codebox with environment body.
+  You can set the title of the codebox with \Arg{codebox title}.
+
+  The appearance of the codebox is set by key-value in \oarg{options}.
+
+  The starred environment \env{codebox*} is used to add comments at the bottom of the codebox,
+  note that this needs to be done with \kvopt{\meta{comments}}{\meta{texts}} in \oarg{options}.
+
+  Of course the key-value \oarg{options} can alse be set
+  via the comma-separated key-value list of the \tn{codeset} macro.
+\end{function}
+
+\begin{Verbatim}[frame=none,numbers=left,gobble=2]
+  \centering
+  \begin{codebox}{CodeBox Title}
+    #include <stdio.h>
+    #include <stdlib.h>
+
+    int main(void)
+    {
+        printf("Hello World!\n");
+
+        return 0;
+    }
+  \end{codebox}
+\end{Verbatim}
+
+\begin{center}
+  \begin{minipage}{0.85\textwidth}
+    \begin{codebox}{CodeBox Title}
+      #include <stdio.h>
+      #include <stdlib.h>
+
+      int main(void)
+      {
+          printf("Hello World!\n");
+
+          return 0;
+      }
+    \end{codebox}
+  \end{minipage}
+\end{center}
+
+\subsection{\tn{codefile} and \tn{codefile*} macros}
+
+\begin{function}[added=2021-12-25,updated=2021-12-25]{\codefile,\codefile*}
+  \begin{syntax}
+    \tn{codefile}  \oarg{options} \Arg{codebox title} \Arg{code file}
+    \tn{codefile*} \oarg{options} \Arg{codebox title} \Arg{code file}
+  \end{syntax}
+  Typesetting codebox from a source code file.
+  You can set the title of the codebox with \Arg{codebox title}.
+
+  The appearance of the codebox is set by key-value in \oarg{options}.
+
+  The starred environment \tn{codefile*} is used to add comments at the bottom of the codebox,
+  note that this needs to be done with \kvopt{\meta{comments}}{\meta{texts}} in \oarg{options}.
+
+  Of course the key-value \oarg{options} can alse be set
+  via the comma-separated key-value list of the \tn{codeset} macro.
+\end{function}
+\newpage
+\begin{Verbatim}[frame=none,numbers=left,gobble=2]
+  \centering
+  \codefile{CodeBox Title}{test.c}
+\end{Verbatim}
+
+\begin{center}
+  \begin{minipage}{0.85\textwidth}
+    \codefile{CodeBox Title}{test.c}
+  \end{minipage}
+\end{center}
+
+\subsection{\env{codeview} and \env{codeview*} environments}
+
+\begin{function}[added=2021-12-26,updated=2021-12-26]{codeview,codeview*}
+  \begin{syntax}
+    \tn{begin}\{codeview\}\oarg{options}\Arg{codeview title}
+    .....
+    \tn{end}\{codeview\}
+    \tn{begin}\{codeview*\}\oarg{options}\Arg{codeview title}
+    .....
+    \tn{end}\{codeview*\}
+  \end{syntax}
+  Typesetting code viewer with environment body.
+  You can set the title of the code viewer with \Arg{codeview title}.
+
+  The appearance of the code viewer is set by key-value in \oarg{options}.
+
+  The starred environment \env{codeview*} is used to add comments at the bottom of the codebox,
+  note that this needs to be done with \kvopt{\meta{comments}}{\meta{texts}} in \oarg{options}.
+
+  Of course the key-value \oarg{options} can alse be set
+  via the comma-separated key-value list of the \tn{codeset} macro.
+\end{function}
+
+\begin{Verbatim}[frame=none,numbers=left,gobble=2]
+  \centering
+  \begin{codeview}{CodeViewer Title}
+    #include <stdio.h>
+    #include <stdlib.h>
+
+    int main(void)
+    {
+        printf("Hello World!\n");
+
+        return 0;
+    }
+  \end{codeview}
+\end{Verbatim}
+
+\begin{center}
+  \begin{minipage}{0.85\textwidth}
+    \begin{codeview}{CodeViewer Title}
+      #include <stdio.h>
+      #include <stdlib.h>
+
+      int main(void)
+      {
+          printf("Hello World!\n");
+
+          return 0;
+      }
+    \end{codeview}
+  \end{minipage}
+\end{center}
+
+\subsection{\tn{cvfile} and \tn{cvfile*} macros}
+
+\begin{function}[added=2021-12-26,updated=2021-12-26]{\cvfile,\cvfile*}
+  \begin{syntax}
+    \tn{cvfile}  \oarg{options} \Arg{codeview title} \Arg{code file}
+    \tn{cvfile*} \oarg{options} \Arg{codeview title} \Arg{code file}
+  \end{syntax}
+  Typesetting code viewer from a source code file.
+  You can set the title of the code viewer with \Arg{codeview title}.
+
+  The appearance of the code viewer is set by key-value in \oarg{options}.
+
+  The starred environment \tn{vcfile*} is used to add comments at the bottom of the codebox,
+  note that this needs to be done with \kvopt{\meta{comments}}{\meta{texts}} in \oarg{options}.
+
+  Of course the key-value \oarg{options} can alse be set
+  via the comma-separated key-value list of the \tn{codeset} macro.
+\end{function}
+
+\begin{Verbatim}[frame=none,numbers=left,gobble=2]
+  \centering
+  \cvfile*[comments=this is a simple C code]{CodeViewer Title}{test.c}
+\end{Verbatim}
+
+\begin{center}
+  \begin{minipage}{0.85\textwidth}
+    \cvfile*[comments=this is a simple C code]{CodeViewer Title}{test.c}
+  \end{minipage}
+\end{center}
+
+\section{Options}
+
+The \pkg{codebox} package provides a number of options to set the style of the codebox.
+The following options can be set with \tn{codeset} macro.
+Also, these options can be set with the all environment's
+or command's \oarg{options}.
+
+\subsection{code engine}
+
+\begin{function}[added=2021-12-26,updated=2021-12-26]{minted}
+  \begin{syntax}
+    minted = <\TTF> \init{true}
+  \end{syntax}
+  \opt{minted} is used to set code highlight engine, if it is \textbf{true} then
+  the \pkg{minted} package is used, if it is \textbf{false} then
+  the \pkg{listings} package is used. The default is \textbf{true}.
+\end{function}
+
+\subsection{language}
+
+\begin{function}[added=2021-12-26,updated=2021-12-26]{lang}
+  \begin{syntax}
+    lang = \Arg{source code language} \init{C}
+  \end{syntax}
+  \opt{lang} is used to set source code language.
+  The default is \textbf{C}.
+\end{function}
+
+\subsection{title prefix}
+
+\begin{function}[added=2021-12-26,updated=2021-12-26]{pretitle}
+  \begin{syntax}
+    pretitle = \Arg{title prefix} \init{Code}
+  \end{syntax}
+  \opt{pretitle} is used to set prefix of code counter.
+  The default is \textbf{Code}。
+\end{function}
+
+\subsection{code highlight style}
+
+\begin{function}[added=2021-12-26,updated=2021-12-26]{codestyle}
+  \begin{syntax}
+    codestyle = \Arg{highlight style} \init{codeblocks}
+  \end{syntax}
+  \opt{codestyle} is used to set code highlight style, valid only for the \pkg{minted} engine.
+  The default is \textbf{codeblocks}.
+\end{function}
+
+\subsection{code fontsize}
+
+\begin{function}[added=2021-12-26,updated=2021-12-26]{codesize}
+  \begin{syntax}
+    codesize = \Arg{fontsize macro} \init{\small}
+  \end{syntax}
+  \opt{codesize} is used to set code fontsize, valid only for \pkg{minted} engine.
+   The default is\textbf{\tn{small}}.
+\end{function}
+
+\subsection{comment contents}
+
+\begin{function}[added=2021-12-26,updated=2021-12-26]{comments}
+  \begin{syntax}
+    comments = \Arg{texts} \init{nothing}
+  \end{syntax}
+  \opt{comments} is used to set comment contents.
+   The default is \textbf{nothing}.
+\end{function}
+
+\subsection{comment format}
+
+\begin{function}[added=2021-12-26,updated=2021-12-26]{commentf}
+  \begin{syntax}
+    commentf = \Arg{format macros} \init{\small\sffamily}
+  \end{syntax}
+  \opt{commentf} is used to set comment format at codebox bottom.
+  The default is \textbf{\tn{small}\tn{sffamily}}.
+\end{function}
+
+\subsection{code baseline stretch}
+
+\begin{function}[added=2021-12-26,updated=2021-12-26]{codestretch}
+  \begin{syntax}
+    codestretch = \Arg{float number} \init{1.0}
+  \end{syntax}
+  \opt{codestretch} is used to set code baseline stretch, valid only for \pkg{minted} engine.
+  The default is\textbf{1.0}.
+\end{function}
+
+\subsection{seperation between line number and code}
+
+\begin{function}[added=2021-12-26,updated=2021-12-26]{linenumsep}
+  \begin{syntax}
+    linenumsep = \Arg{float number} \init{3.0}
+  \end{syntax}
+  \opt{linenumsep} is used to set the seperation between line number and code,
+  valid only for \pkg{minted} engine.
+  Note the unit is mm.
+  The default is\textbf{3.0}.
+\end{function}
+
+\section{Examples}
+
+The \pkg{codebox} package can be used in situations
+where the highlight programming source code needs to be typeset
+to avoid the use of screenshots.
+Code box can be with or without underline comments.
+
+\newpage
+
+\subsection{Java code}
+The language can be set with \tn{codeset} macro.
+
+\begin{Verbatim}[frame=none,numbers=left,gobble=2]
+  \centering
+  \codeset{lang=java}
+  \codefile{Java CodeBox}{hellojava.java}
+\end{Verbatim}
+
+\begin{center}
+  \begin{minipage}{0.85\textwidth}
+    \codeset{lang=java}
+    \codefile{Java CodeBox}{hellojava.java}
+  \end{minipage}
+\end{center}
+
+\subsection{Python code}
+The language can be set with \opt{options}.
+
+\begin{Verbatim}[frame=none,numbers=left,gobble=2]
+  \centering
+  \cvfile[lang=python]{Python CodeBox}{hellopy.py}
+\end{Verbatim}
+
+\begin{center}
+  \begin{minipage}{0.85\textwidth}
+    \cvfile[lang=python]{Python CodeBox}{hellopy.py}
+  \end{minipage}
+\end{center}
+
+\newpage
+
+\subsection{listings engine}
+\pkg{listings} engine can be set with \kvopt{\meta{minted}}{\meta{false}}.
+
+\begin{Verbatim}[frame=none,numbers=left,gobble=2]
+  \centering
+  \cvfile[minted=false,lang=c]{C CodeBox}{test.c}
+\end{Verbatim}
+
+\begin{center}
+  \begin{minipage}{0.85\textwidth}
+    \cvfile[minted=false,lang=c]{C CodeBox}{test.c}
+  \end{minipage}
+\end{center}
+
+\end{document}
diff --git a/macros/latex/contrib/codebox/codebox.dtx b/macros/latex/contrib/codebox/codebox.dtx
new file mode 100644
index 0000000000..fb9168b133
--- /dev/null
+++ b/macros/latex/contrib/codebox/codebox.dtx
@@ -0,0 +1,1157 @@
+% \iffalse meta-comment
+% !TEX program  = XeLaTeX
+%<*internal>
+\iffalse
+%</internal>
+%<*readme>
+Create code box and viewer based on tcolorbox and minted/listings
+=======
+
+`codebox` is a LaTeX3 package developed based on tcolorbox and minted/listings, which provides environments `codebox` and `codeview` to typset with environment body, and macros `\codefile` and `\cvfile` to typeset programming source code from a file in a fancy box.
+
+The starred version of all environments and macros are provided at the same time, such as `codebox*`, `codeview*`, `\codefile*` and `\cvfile*` which adds comment at bottom of the fancy box.
+
+You can read the manual (in Chinese/English) for more details and examples.
+
+Contributing
+------------
+
+1. github repository:
+    1. repository: [codebox](https://github.com/registor/codebox)
+    2. Issues and pull requests are welcome. [issue](https://github.com/registor/codebox/issues) or [pull request](https://github.com/registor/codebox/pulls).
+
+2. gitee repository:
+    1. repository: [codebox](https://gitee.com/nwafu_nan/codebox)
+    2. Issues and pull requests are welcome. [issue](https://gitee.com/nwafu_nan/codebox/issues) or [pull request](https://gitee.com/nwafu_nan/codebox/pulls).
+
+基于tcolorbox的终端模拟宏包
+=======
+
+`codebox`是一个基于tcolorbox的用LaTeX3开发的终端模拟LaTeX宏包，它提供了用于排版程序源代码盒子的环境和命令。
+
+其中`codebox`和`codeview`环境用于根据环境内容排版代码，`\codefile`和`\cvfile`命令用于根据文件内容排版代码。
+
+`codebox`同时提供了各环境和命令的星号版本，如`codebox*`和`codeview*`，`\codefile*`和`\cvfile*`，用于为代码盒子添加底线注释。
+
+可以通过阅读宏包手册(中文/英文)以也解该宏包更多的使用细节和使用样例。
+
+###  参与贡献
+---------------------
+
+1. github仓库:
+    (1). 仓库地址: [codebox](https://github.com/registor/codebox)
+    (2). Issues和PR: [issue](https://github.com/registor/codebox/issues) or [pull request](https://github.com/registor/codebox/pulls).
+
+2. gitee仓库:
+    (1). 仓库地址: [codebox](https://gitee.com/nwafu_nan/codebox)
+    (2). Issues and PR: [issue](https://gitee.com/nwafu_nan/codebox/issues) or [pull request](https://gitee.com/nwafu_nan/codebox/pulls).
+
+Copyright and Licence
+---------------------
+
+    Copyright (C) 2020-2021 by Nan Geng <nangeng@nwafu.edu.cn>
+    ----------------------------------------------------------------------
+
+    This work may be distributed and/or modified under the
+    conditions of the LaTeX Project Public License, either
+    version 1.3c of this license or (at your option) any later
+    version. This version of this license is in
+       http://www.latex-project.org/lppl/lppl-1-3c.txt
+    and the latest version of this license is in
+       http://www.latex-project.org/lppl.txt
+    and version 1.3 or later is part of all distributions of
+    LaTeX version 2005/12/01 or later.
+
+    This work has the LPPL maintenance status "maintained".
+
+    The Current Maintainer of this work is Nan Geng.
+
+    This package consists of the file  codebox.dtx,
+                 and the derived files codebox.sty,
+                                       codebox.pdf,
+                                       codebox.ins,
+                                       README.md (this file).
+
+%</readme>
+%<*internal>
+\fi
+\begingroup
+  \def\temp{LaTeX2e}
+\expandafter\endgroup\ifx\temp\fmtname\else
+\csname fi\endcsname
+%</internal>
+%<*install>
+
+\input ctxdocstrip %
+
+\let\MetaPrefix\relax
+
+\preamble
+
+    Copyright (C) 2020-2021 by Nan Geng <nangeng@nwafu.edu.cn>
+--------------------------------------------------------------------------
+
+    This work may be distributed and/or modified under the
+    conditions of the LaTeX Project Public License, either
+    version 1.3c of this license or (at your option) any later
+    version. This version of this license is in
+       http://www.latex-project.org/lppl/lppl-1-3c.txt
+    and the latest version of this license is in
+       http://www.latex-project.org/lppl.txt
+    and version 1.3 or later is part of all distributions of
+    LaTeX version 2005/12/01 or later.
+
+    This work has the LPPL maintenance status "maintained".
+
+    The Current Maintainer of this work is Nan Geng.
+
+--------------------------------------------------------------------------
+
+\endpreamble
+
+\postamble
+
+    This package consists of the file  codebox.dtx,
+                 and the derived files codebox.sty,
+                                       codebox.pdf,
+                                       codebox.ins,
+                                       README.md.
+\endpostamble
+
+\declarepostamble\emptypostamble
+\endpostamble
+
+\def\MetaPrefix{-- }
+
+
+\let\MetaPrefix\DoubleperCent
+
+\generate
+  {
+%</install>
+%<*internal>
+    \usedir{source/xelatex/codebox}
+    \file{codebox.ins} {\from{\jobname.dtx}{install}}
+%</internal>
+%<*install>
+    \usedir{xetex/xelatex/codebox}
+    \file{codebox.sty} {\from{\jobname.dtx}{package}}
+    \nopreamble\nopostamble
+    \usedir{doc/xelatex/codebox}
+    \file{README.md}   {\from{\jobname.dtx}{readme}}
+  }
+
+\endbatchfile
+%</install>
+%<*internal>
+\fi
+%</internal>
+%<package>\NeedsTeXFormat{LaTeX2e}[2020/10/01]
+%<package>\RequirePackage{expl3}
+%<+package>\GetIdInfo$Id: codebox.dtx 1.0.0 2021-12-26 08:00:00 +0800 Nan Geng <nangeng@nwafu.edu.cn> $
+%<package>  {Code Box with tcolorbox and minted/listings.}
+%<package>\ProvidesExplPackage{\ExplFileName}
+%<package>  {\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
+%<*driver>
+\documentclass{ctxdoc}
+\usepackage{minted}
+\usepackage{listings}
+\usepackage{xcolor}
+\usepackage{xcolor-material}
+\usepackage{codebox}
+\renewcommand{\thecodecounter}{\thesection.\arabic{codecounter}}
+\renewcommand*\marg[1]{\{\meta{#1}\}}
+\renewcommand*\oarg[1]{[\meta{#1}]}
+\renewcommand*\parg[1]{(\meta{#1})}
+\NewDocumentCommand{\init}{+v}{\hspace{\fill}初始值~=~\textcolor{blue}{\bfseries#1}}
+\DeclareDocumentCommand\opt{m}{\texttt{#1}}
+\DeclareDocumentCommand\kvopt{mm}
+  {\texttt{#1\breakablethinspace=\breakablethinspace#2}}
+\def\breakablethinspace{\hskip 0.16667em\relax}
+\begin{document}
+%<!--CODEDOC-->  \DisableImplementation
+  \EnableImplementation
+  \DocInput{\jobname.dtx}
+  \IndexLayout
+  \PrintChanges
+  \PrintIndex
+\end{document}
+%</driver>
+% \fi
+%
+% \changes{v1.0.0}{2021/12/25}{开始编写模板}
+%
+% \CheckSum{309}
+% \GetFileId{codebox.sty}
+%
+% \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
+%   Lower-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
+%   Digits        \0\1\2\3\4\5\6\7\8\9
+%   Exclamation   \!     Double quote  \"     Hash (number) \#
+%   Dollar        \$     Percent       \%     Ampersand     \&
+%   Acute accent  \'     Left paren    \(     Right paren   \)
+%   Asterisk      \*     Plus          \+     Comma         \,
+%   Minus         \-     Point         \.     Solidus       \/
+%   Colon         \:     Semicolon     \;     Less than     \<
+%   Equals        \=     Greater than  \>     Question mark \?
+%   Commercial at \@     Left bracket  \[     Backslash     \\
+%   Right bracket \]     Circumflex    \^     Underscore    \_
+%   Grave accent  \`     Left brace    \{     Vertical bar  \|
+%   Right brace   \}     Tilde         \~}
+%
+%
+% \title{\bfseries\pkg{codebox}：代码盒子排版宏包\\ \bfseries\pkg{codebox}：progrmming source code box}
+% \author{耿楠\\ \path{nangeng@nwafu.edu.cn}}
+% \date{\filedate\qquad\fileversion\thanks{\url{https://github.com/registor/codebox}}\thanks{\url{https://gitee.com/nwafu_nan/codebox}}}
+% \maketitle
+%
+% \begin{documentation}
+%
+% \begin{abstract}
+%
+% \pkg{codebox} 是一个基于\pkg{tcolorbox}用\LaTeX3 开发的 \LaTeX 宏包，它提供用于
+% 排版源代码盒子的环境和命令。
+% 其中，\env{codebox}和\env{codeview}环境用于根据环境内容排版代码，
+% \tn{codefile}和\tn{cvfile}命令用于根据文件内容排版代码。
+% 同时，\pkg{codebox}还提供了各环境和命令的星号版本，
+% 如\env{codebox*}和\env{codeview*}，\tn{codefile*}和\tn{cvfile*}，
+% 用于为代码盒子添加底线注释。
+%
+% \end{abstract}
+%
+% \tableofcontents
+%
+% \section{简介}
+%
+% \pkg{codebox} 是一个基于\pkg{tcolorbox}用\LaTeX3 开发的 \LaTeX 宏包，
+% 它可以根据用户设置使用\pkg{minted}或\pkg{listings}宏包实现代码盒子排版。
+%
+% 该宏包提供了\env{codebox}和\env{codeview}两个环境和
+% \tn{codefile}和\tn{cvfile}两个命令以排版代码盒子。
+%
+% 同时，\pkg{codebox}宏包还提供环境和命令的星号版本，
+% 用于为代码盒子添加底线注释。
+%
+% \section{用户接口}
+%
+% \subsection{\env{codebox}和\env{codebox*}环境}
+%
+% \begin{function}[added=2021-12-25,updated=2021-12-25]{codebox,codebox*}
+%   \begin{syntax}
+%     \tn{begin}\{codebox\}\oarg{外观选项}\Arg{盒子标题}
+%     .....
+%     \tn{end}\{codebox\}
+%     \tn{begin}\{codebox*\}\oarg{外观选项}\Arg{盒子标题}
+%     .....
+%     \tn{end}\{codebox*\}
+%   \end{syntax}
+%   使用环境内容排版代码盒子。
+%   可以通过\Arg{盒子标题}为代码盒子设置标题。
+%
+%   \oarg{外观选项}中通过key-value方式设置代码盒子外观。
+%
+%   星号环境\texttt{codebox*}用于为代码盒子添加底线注释，
+%   此时，需要在\oarg{外观选项}中用
+%   \kvopt{\meta{comments}}{\meta{底线注释}}选项提供\textbf{底线注释}内容。
+%
+%   代码盒子的外观也可以通过\tn{codeset}命令的逗号分隔
+%   key-value列表进行设置。
+%
+% \end{function}
+%   \begin{Verbatim}[frame=none,numbers=left,gobble=5]
+%     \centering
+%     \begin{codebox}{代码标题}
+%       #include <stdio.h>
+%       #include <stdlib.h>
+%
+%       int main(void)
+%       {
+%           printf("Hello World!\n");
+%
+%           return 0;
+%       }
+%     \end{codebox}
+%   \end{Verbatim}
+%
+%   \begin{center}
+%     \begin{minipage}{0.85\textwidth}
+%       \codefile{代码盒子标题}{test.c}
+%     \end{minipage}
+%   \end{center}
+%
+% \subsection{\tn{codefile}和\tn{codefile*}命令}
+%
+% \begin{function}[added=2021-12-25,updated=2021-12-25]{\codefile,\codefile*}
+%   \begin{syntax}
+%     \tn{codefile}  \oarg{外观选项} \Arg{盒子标题} \Arg{代码文件}
+%     \tn{codefile*} \oarg{外观选项} \Arg{盒子标题} \Arg{代码文件}
+%   \end{syntax}
+%
+%   用于排版代码盒子，源代码来自于\Arg{代码文件}，
+%   可以通过\Arg{盒子标题}为代码盒子设置标题。
+%
+%   \oarg{外观选项}中通过key-value方式设置代码盒子外观。
+%
+%   星号命令\texttt{codefile*}用于为代码盒子添加底线注释，
+%   此时，需要在\oarg{外观选项}中用
+%   \kvopt{\meta{comments}}{\meta{底线注释}}选项提供\textbf{底线注释}内容。
+%
+%   代码盒子的外观也可以通过\tn{codeset}命令的逗号分隔
+%   key-value列表进行设置。
+% \end{function}
+%
+% \newpage
+%   \begin{Verbatim}[frame=none,numbers=left,gobble=5]
+%     \centering
+%     \codefile{代码盒子标题}{test.c}
+%   \end{Verbatim}
+%
+%   \begin{center}
+%     \begin{minipage}{0.85\textwidth}
+%       \codefile{代码盒子标题}{test.c}
+%     \end{minipage}
+%   \end{center}
+%
+% \subsection{\env{codeview}和\env{codeview*}环境}
+%
+% \begin{function}[added=2021-12-26,updated=2021-12-26]{codeview,codeview*}
+%   \begin{syntax}
+%     \tn{begin}\{codeview\}\oarg{外观选项}\Arg{盒子标题}
+%     .....
+%     \tn{end}\{codeview\}
+%     \tn{begin}\{codeview*\}\oarg{外观选项}\Arg{盒子标题}
+%     .....
+%     \tn{end}\{codeview*\}
+%   \end{syntax}
+%   使用环境内容排版带编号代码盒子。
+%   可以通过\Arg{盒子标题}为代码盒子设置标题。
+%
+%   \oarg{外观选项}中通过key-value方式设置代码盒子外观。
+%
+%   星号环境\texttt{codeview*}用于为代码盒子添加底线注释，
+%   此时，需要在\oarg{外观选项}中用
+%   \kvopt{\meta{comments}}{\meta{底线注释}}选项提供\textbf{底线注释}内容。
+%
+%   代码盒子的外观也可以通过\tn{codeset}命令的逗号分隔
+%   key-value列表进行设置。
+% \end{function}
+%
+%   \begin{Verbatim}[frame=none,numbers=left,gobble=5]
+%     \centering
+%     \begin{codeview}{代码标题}
+%       #include <stdio.h>
+%       #include <stdlib.h>
+%
+%       int main(void)
+%       {
+%           printf("Hello World!\n");
+%
+%           return 0;
+%       }
+%     \end{codeview}
+%   \end{Verbatim}
+%
+%   \codeset{pretitle=代码}
+%   \begin{center}
+%     \begin{minipage}{0.85\textwidth}
+%       \cvfile{代码标题}{test.c}
+%     \end{minipage}
+%   \end{center}
+%
+% \subsection{\tn{cvfile}和\tn{cvfile*}命令}
+%
+% \begin{function}[added=2021-12-26,updated=2021-12-26]{\cvfile,\cvfile*}
+%   \begin{syntax}
+%     \tn{cvfile}  \oarg{外观选项} \Arg{盒子标题} \Arg{代码文件}
+%     \tn{cvfile*} \oarg{外观选项} \Arg{盒子标题} \Arg{代码文件}
+%   \end{syntax}
+%
+%   用于排版带编号代码盒子，源代码来自于\Arg{代码文件}，
+%   可以通过\Arg{盒子标题}为代码盒子设置标题。
+%
+%   \oarg{外观选项}中通过key-value方式设置代码盒子外观。
+%
+%   星号命令\texttt{cvfile*}用于为代码盒子添加底线注释，
+%   此时，需要在\oarg{外观选项}中用
+%   \kvopt{\meta{comments}}{\meta{底线注释}}选项提供\textbf{底线注释}内容。
+%
+%   代码盒子的外观也可以通过\tn{codeset}命令的逗号分隔
+%   key-value列表进行设置。
+% \end{function}
+%
+%   \begin{Verbatim}[frame=none,numbers=left,gobble=5]
+%     \centering
+%     \cvfile*[comments=这是一个简单的C语言代码]{代码标题}{test.c}
+%   \end{Verbatim}
+%
+%   \begin{center}
+%     \begin{minipage}{0.85\textwidth}
+%       \cvfile*[comments=这是一个简单的C语言代码]{代码标题}{test.c}
+%     \end{minipage}
+%   \end{center}
+%
+% \section{选项说明}
+%
+%   \pkg{codebox}宏包提供了一系列选项，以设置代码盒子的外观样式。
+%   载入\pkg{codebox}宏包后，以下选项均可通过用户接口命令\tn{codeset}进行设置。
+%   当然，这些选项也可以通过各个环境或命令的\oarg{外观选项}进行设置。
+%
+% \subsection{代码引擎}
+%
+% \begin{function}[added=2021-12-26,updated=2021-12-26]{minted}
+%   \begin{syntax}
+%     minted = <\TTF> \init{true}
+%   \end{syntax}
+%   \opt{minted} 用于设置代码排版引擎，如为\textbf{true}则使用\pkg{minted}宏包
+%   排版代码盒子中的内容，如为\textbf{false}则使用\pkg{listings}宏包排版
+%   代码盒子中的内容。默认值为\textbf{true}。
+% \end{function}
+%
+% \subsection{代码语言}
+%
+% \begin{function}[added=2021-12-26,updated=2021-12-26]{lang}
+%   \begin{syntax}
+%     lang = \Arg{代码语言} \init{C}
+%   \end{syntax}
+%   \opt{lang} 用于设置代码语言，默认值为\textbf{C语言}。
+% \end{function}
+%
+% \subsection{代码名称}
+%
+% \begin{function}[added=2021-12-26,updated=2021-12-26]{pretitle}
+%   \begin{syntax}
+%     pretitle = \Arg{代码名称} \init{Code}
+%   \end{syntax}
+%   \opt{pretitle} 用于代码编号前的代码名称前缀，默认值为\textbf{Code}。
+% \end{function}
+%
+% \subsection{代码样式}
+%
+% \begin{function}[added=2021-12-26,updated=2021-12-26]{codestyle}
+%   \begin{syntax}
+%     codestyle = \Arg{代码样式} \init{codeblocks}
+%   \end{syntax}
+%   \opt{codestyle} 用于设置代码盒子中代码的样式，仅对\textbf{minted}
+%   引擎有效，默认值为\textbf{codeblocks}。
+% \end{function}
+%
+% \subsection{代码字号}
+%
+% \begin{function}[added=2021-12-26,updated=2021-12-26]{codesize}
+%   \begin{syntax}
+%     codesize = \Arg{字号命令} \init{\small}
+%   \end{syntax}
+%   \opt{codesize} 用于设置代码盒子中代码的字号，仅对\textbf{minted}
+%   引擎有效，默认值为\textbf{\tn{small}}。
+% \end{function}
+%
+% \subsection{底线注释内容}
+%
+% \begin{function}[added=2021-12-26,updated=2021-12-26]{comments}
+%   \begin{syntax}
+%     comments = \Arg{注释内容} \init{无}
+%   \end{syntax}
+%   \opt{commentf} 用于设置代码盒子底线注释的内容，
+%   默认值为\textbf{无}。
+% \end{function}
+%
+% \subsection{底线注释格式}
+%
+% \begin{function}[added=2021-12-26,updated=2021-12-26]{commentf}
+%   \begin{syntax}
+%     commentf = \Arg{格式命令组} \init{\small\sffamily}
+%   \end{syntax}
+%   \opt{commentf} 用于设置代码盒子底线注释的格式，
+%   默认值为\textbf{\tn{small}\tn{sffamily}}。
+% \end{function}
+%
+% \subsection{代码行距}
+%
+% \begin{function}[added=2021-12-26,updated=2021-12-26]{codestretch}
+%   \begin{syntax}
+%     codestretch = \Arg{浮点数} \init{1.0}
+%   \end{syntax}
+%   \opt{codestretch} 用于设置代码盒子内容(代码)的行距，仅对\textbf{minted}
+%   引擎有效，取浮点数。默认值为\textbf{1.0}。
+% \end{function}
+%
+% \subsection{行号间距}
+%
+% \begin{function}[added=2021-12-26,updated=2021-12-26]{linenumsep}
+%   \begin{syntax}
+%     linenumsep = \Arg{浮点数} \init{3.0}
+%   \end{syntax}
+%   \opt{linenumsep} 用于设置代码盒子行号与代码的间距，仅对\textbf{minted}
+%   引擎有效，取浮点数，单位是mm。默认值为\textbf{3.0}。
+% \end{function}
+%
+% \newpage
+% \section{排版样例}
+%
+% \pkg{codebox}宏包可用于需要语法高亮代码排版场合，
+% 以避免使用代码截图。代码盒子可以带/不带底线注释。
+%
+% \subsection{Java代码}
+% 可以使用\tn{codeset}命令设置代码语言。
+%
+%   \begin{Verbatim}[frame=none,numbers=left,gobble=5]
+%     \centering
+%     \codeset{lang=java}
+%     \codefile{Java代码盒子}{hellojava.java}
+%   \end{Verbatim}
+%
+%   \begin{center}
+%     \begin{minipage}{0.85\textwidth}
+%       \codeset{lang=java}
+%       \codefile{Java代码盒子}{hellojava.java}
+%     \end{minipage}
+%   \end{center}
+%
+% \subsection{Python代码}
+% 还可以使用环境或命令的\oarg{外观选项}设置代码语言。
+%
+%   \begin{Verbatim}[frame=none,numbers=left,gobble=5]
+%     \centering
+%     \cvfile[lang=python]{Python代码示例}{hellopy.py}
+%   \end{Verbatim}
+%
+%   \begin{center}
+% %     \begin{minipage}{0.85\textwidth}
+%       \cvfile[lang=python]{Python代码示例}{hellopy.py}
+%     \end{minipage}
+%   \end{center}
+%
+% \subsection{listings引擎}
+% 在选项中使用\kvopt{\meta{minted}}{\meta{false}}
+% 以使用\pkg{listings}宏包排版代码。
+%
+%   \begin{Verbatim}[frame=none,numbers=left,gobble=5]
+%     \centering
+%     \cvfile[minted=false,lang=c]{C语言代码示例}{test.c}
+%   \end{Verbatim}
+%
+%   \begin{center}
+%     \begin{minipage}{0.85\textwidth}
+%       \cvfile[minted=false,lang=c]{C语言代码示例}{test.c}
+%     \end{minipage}
+%   \end{center}
+%
+%
+% \end{documentation}
+%
+% \StopEventually{}
+%
+% \begin{implementation}
+%
+% \section{代码实现}
+%
+% 该宏包使用 \LaTeX3 语法编写，依赖 \pkg{expl3} 环境，
+% 并需调用 \pkg{l3packages}、\pkg{tcolorbox}、\pkg{minted}
+% \pkg{listings}、\pkg{fontawesome5}等宏包。
+%
+% 按照 \LaTeX3 语法，代码中的空格、换行、回车与制表符会完全被忽略，
+% 而下划线“|_|”和冒号“|:|”则可作为一般字母使用。
+% 正常的空格可以使用“|~|”代替；至于 |~| 原来所表示的“带子”，
+% 则要用 \LaTeXe{} 的原始命令 \tn{nobreakspace} 代替。
+%
+% 以下代码中有一些形如 \textcolor[HTML]{2E3191}{\textsf{<*package>}}
+% 的标记，这是 \pkg{DocStrip} 中的“guard”，用来选择性地提取文件。
+% “\textsf{*}”和“\textsf{/}”分别表示该部分的开始和结束。不含
+% “\textsf{*}”和“\textsf{/}”的 guard 出现在行号右侧，它们用来确定
+% 单独一行代码的归属。这些 guard 的颜色深浅不一，用以明确嵌套关系。
+%
+% 另有若干形如 \textcolor[HTML]{AD1457}{\textsf{<@@=codebox>}} 的 guard，
+% 它们由 \pkg{l3docstrip} 定义，用来标识名字空间（模块）。
+%
+% \subsection{环境检测与准备}
+%
+%    \begin{macrocode}
+%<*package>
+%<@@=codebox>
+%    \end{macrocode}
+%
+% 载入必要的\LaTeX3 宏包
+%
+%    \begin{macrocode}
+\RequirePackage { xtemplate, l3keys2e, xparse }
+%    \end{macrocode}
+%
+% 检查\LaTeX3 宏包版本
+%
+%    \begin{macrocode}
+% \clist_map_inline:nn { xtemplate, l3keys2e }
+%   {
+%     \@ifpackagelater {#1} { 2020/07/17 }
+%       { } { \msg_error:nnn { codebox } { l3-too-old } {#1} }
+%   }
+% \msg_new:nnn { codebox } { l3-too-old }
+%   {
+%     Package~ "#1"~ is~ too~ old. \\\\
+%     Please~ update~ an~ up-to-date~ version~ of~ the~ bundles \\
+%     "l3kernel"~ and~ "l3packages"~ using~ your~ TeX~ package \\
+%     manager~ or~ from~ CTAN.
+%   }
+%
+%    \end{macrocode}
+%
+% \subsection{载入其它宏包}
+%
+% 载入\pkg{fontawesome5}、\pkg{tcolorbox}、\pkg{amssymb}、
+% \pkg{xcolor}宏包
+%
+%    \begin{macrocode}
+\RequirePackage {fontawesome5, tcolorbox, varwidth, xcolor, etoolbox}
+%    \end{macrocode}
+%
+% 解决Expl3中\pkg{tcolorbox}和\pkg{tikz}附加库无法加载的
+% 的补丁(需要\pkg{etoolbox}宏包支持)
+%
+% \url{https://tex.stackexchange.com/questions/57424/using-of-usetikzlibrary-in-an-expl3-package-fails}
+%
+%    \begin{macrocode}
+\ExplSyntaxOff
+\patchcmd
+{\tcb@input@library@in}
+  {%
+   \input\tcbpkgprefix#1\relax%
+  }
+  {%
+    \@pushfilename
+    \input\tcbpkgprefix#1\relax%
+    \@popfilename
+  }
+  {}{}
+
+\patchcmd
+{\pgfutil@InputIfFileExists}
+  {\input #1}
+  {%
+    \@pushfilename
+    \xdef\@currname{#1}%
+    \input #1 %
+    \@popfilename
+  }
+  {}{}
+\ExplSyntaxOn
+%    \end{macrocode}
+%
+% 载入\pkg{tcolorbox}和\pkg{tikz}附加库
+%
+%    \begin{macrocode}
+\tcbuselibrary{skins, xparse, breakable}
+\tcbuselibrary{minted,listings}
+\usetikzlibrary{shapes.geometric}
+%    \end{macrocode}
+%
+% \subsection{定义颜色}
+%
+%    \begin{macrocode}
+\definecolor{cvgrayc}{RGB}{247,247,247}
+\definecolor{cvgray}{RGB}{220,220,220}
+\definecolor{cvgrayb}{RGB}{153,153,153}
+\definecolor{cvblue}{RGB}{223,238,255}
+\definecolor{chengse}{RGB}{250,140,53}
+%    \end{macrocode}
+%
+% \subsection{代码盒子样式设计}
+%
+% 代码盒子lang样式
+%
+%    \begin{macrocode}
+\tcbset{%
+  skin=enhanced,
+  lang/.style={%
+    breakable,%
+    drop~shadow,%
+    colframe=gray!75!black,%
+    left=4.5mm,
+    enhanced,%
+    colframe=tcbcolback!60!black,%
+    colback=white,%
+    colbacktitle=tcbcolback!5!gray!10!white,%
+    fonttitle=\bfseries,%
+    coltitle=black,%
+    attach~boxed~title~to~top~center={%
+      yshift=-0.25mm-\tcboxedtitleheight/2,%
+      yshifttext=2mm-\tcboxedtitleheight/2%
+    },%
+    attach~boxed~title~to~top~left={%
+      xshift=1cm,%
+      yshift*=1mm-\tcboxedtitleheight%
+    },%
+    varwidth~boxed~title*=-3cm,%
+    boxed~title~style={%
+      frame~code={%
+        \path[fill=tcbcolback!30!black]([yshift=-1mm,xshift=-1mm]frame.north~west)%
+          arc[start~angle=0,end~angle=180,radius=1mm]([yshift=-1mm,xshift=1mm]frame.north~east)%
+          arc[start~angle=180,end~angle=0,radius=1mm];%
+        \path[left~color=tcbcolback!60!black,right~color=tcbcolback!60!black,
+          middle~color=tcbcolback!80!black]([xshift=-2mm]frame.north~west)%
+          --([xshift=2mm]frame.north~east)[rounded~corners=1mm]%
+          --([xshift=1mm,yshift=-1mm]frame.north~east)%
+          --(frame.south~east)%
+          --(frame.south~west)%
+          --([xshift=-1mm,yshift=-1mm]frame.north~west)[sharp~corners]%
+          --cycle;%
+      },%
+      interior~engine=empty%
+    },%
+    overlay={%
+      \begin{tcbclipinterior}
+        \fill[tcbcolback!80!black] (frame.south~west) rectangle
+         ([xshift=5mm]frame.north~west);
+      \end{tcbclipinterior}%
+    },
+  }%
+}%
+%    \end{macrocode}
+%
+% 代码盒子cv样式
+%
+%    \begin{macrocode}
+\tcbset{%
+  skin=enhanced,
+  cv/.style={
+    boxrule=0.4mm,
+    breakable,
+    top=0mm,
+    boxsep=1mm,
+    drop~shadow,
+    attach~boxed~title~to~top,
+    colframe=blue!75!black,
+    left=4.5mm,
+    right=0mm,
+    enhanced,
+    colframe=tcbcolback!60!black,
+    colback=white,
+    colbacktitle=cvgray,
+    fonttitle=\ttfamily,
+    coltitle=black,
+    % overlay~broken = {
+    %   \begin{tcbclipinterior}
+    %     \fill[cvblue] (frame.south~west) rectangle ([xshift=5.0mm]frame.north~west);
+    %   \end{tcbclipinterior}
+    % },
+    underlay~boxed~title = {
+      \begin{tcbclipinterior}
+        \fill[cvblue] (frame.south~west) rectangle ([xshift=5.0mm,yshift=0mm]frame.north~west);
+      \end{tcbclipinterior}
+    }
+  }
+}%
+%    \end{macrocode}
+%
+% \subsection{内部变量声明}
+%
+% \begin{variable}{\l_@@_minted_bool,
+% \l_@@_comment_bool,
+% \l_@@_language_tl,
+% \l_@@_code_style_tl,
+% \l_@@_code_fontsize_tl,
+% \l_@@_code_name_tl,
+% \l_@@_comment_contents_tl,
+% \l_@@_comment_format_tl,
+% \l_@@_baseline_stretch_fp,
+% \l_@@_linenumber_sep_fp
+%  }
+% 定义变量。
+%
+%    \begin{macrocode}
+\bool_new:N   \l_@@_minted_bool
+\bool_new:N   \l_@@_comment_bool
+
+\tl_new:N     \l_@@_language_tl
+\tl_new:N     \l_@@_code_style_tl
+\tl_new:N     \l_@@_code_fontsize_tl
+\tl_new:N     \l_@@_code_name_tl
+\tl_new:N     \l_@@_comment_contents_tl
+\tl_new:N     \l_@@_comment_format_tl
+\fp_new:N     \l_@@_baseline_stretch_fp
+\fp_new:N     \l_@@_linenumber_sep_fp
+%    \end{macrocode}
+% \end{variable}
+%
+% \subsection{选项处理}
+%
+% 定义 |codebox| 键值类。
+%    \begin{macrocode}
+\keys_define:nn { codebox }
+  {
+%    \end{macrocode}
+%
+% \begin{macro}{minted}
+% 是否使用minted宏包排版代码，默认为true。
+%    \begin{macrocode}
+    minted .bool_set:N = \l_@@_minted_bool,
+    minted .default:n = true,
+    minted .initial:n = true,
+%    \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{lang}
+% 设置排版代码语言，默认为C。
+%    \begin{macrocode}
+    lang .tl_set:N = \l_@@_language_tl,
+    lang .initial:n = C,
+%    \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{pretitle}
+% 代码名称前缀
+%    \begin{macrocode}
+    pretitle .tl_set:N = \l_@@_code_name_tl,
+    pretitle .initial:n = Code,
+%    \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{codestyle}
+% 代码样式
+%    \begin{macrocode}
+    codestyle .tl_set:N = \l_@@_code_style_tl,
+    codestyle .initial:n = default,
+%    \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{codesize}
+% 代码字号
+%    \begin{macrocode}
+    codesize .tl_set:N = \l_@@_code_fontsize_tl,
+    codesize .initial:n = \small,
+%    \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{comments}
+% 注释格式
+%    \begin{macrocode}
+    comments .tl_set:N = \l_@@_comment_contents_tl,
+    comments .initial:n = {},
+%    \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{commentf}
+% 注释格式
+%    \begin{macrocode}
+    commentf .tl_set:N = \l_@@_comment_format_tl,
+    commentf .initial:n = \small\sffamily,
+%    \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{codestretch}
+% 基线伸展系数
+%    \begin{macrocode}
+    codestretch .code:n = { \fp_set:Nn \l_@@_baseline_stretch_fp { #1 }
+                         },
+    codestretch .initial:n = 1.0,
+%    \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{linenumsep}
+% 行号与文本之间的距离(单位：mm)
+%    \begin{macrocode}
+    linenumsep .fp_set:N  = \l_@@_linenumber_sep_fp,
+    linenumsep .initial:n = 3.00,
+%    \end{macrocode}
+% \end{macro}
+%
+% 处理未知选项。
+%    \begin{macrocode}
+    unknown .code:n = { \@@_error:n { unknown-option } }
+  }
+\msg_new:nnn { codebox } { unknown-option }
+  { package~ option~ "\l_keys_key_tl"~ is~ unknown. }
+%    \end{macrocode}
+%
+% \subsection{选项设置用户接口}
+%
+% \begin{macro}{\codeset}
+% 选项设置用户接口。
+%    \begin{macrocode}
+\NewDocumentCommand \codeset { m }
+  { \keys_set:nn { codebox } {#1} }
+%    \end{macrocode}
+% \end{macro}
+%
+% \subsection{内部函数}
+%
+%    \begin{macrocode}
+% \bool_if:NTF \l_@@_minted_bool
+%   {
+%     \tcbuselibrary{minted}
+%   }{
+%     \tcbuselibrary{listings}
+%   }
+%    \end{macrocode}
+%
+% \begin{macro}{\@@_set_counter_parent:}
+% 设置代码编号计数器的父计数器。
+%
+%    \begin{macrocode}
+\cs_new:Npn \@@_set_counter_parent:
+  {
+    \ifdef{\thechapter}
+      {
+        \newcounter{codecounter}[chapter]%
+      }{
+        \newcounter{codecounter}[section]%
+      }
+  }
+%    \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\@@_code_engine_tcbset:}
+% 设置代码盒子minted宏包参数。
+%
+%    \begin{macrocode}
+\cs_new:Npn \@@_code_engine_tcbset:n #1
+  {
+    \bool_if:NTF \l_@@_minted_bool
+      {
+        \tcbset{
+          listing~engine=minted,%
+          minted~style=#1,
+          minted~options={%
+            % highlightlines={\ifodd\value{lstnumber}\value{lstnumber}\fi},
+            autogobble,
+            breaklines,%
+            fontsize=\tl_use:N \l_@@_code_fontsize_tl,%
+            baselinestretch=\fp_eval:n { \l_@@_baseline_stretch_fp },
+            breaksymbolleft={},%
+            linenos,%
+            numbersep=\fp_eval:n { \l_@@_linenumber_sep_fp }~mm,
+          },%
+          minted~language=\tl_use:N \l_@@_language_tl%
+        }
+       }{
+          \lstset{% general command to set parameter(s)
+            basicstyle=\ttfamily\tl_use:N \l_@@_code_fontsize_tl, % print whole listing small
+            keywordstyle=\color{chengse}\bfseries,%
+            identifierstyle=, % nothing happens
+            breaklines=true,
+            commentstyle=\itshape\color{gray},
+            stringstyle=\ttfamily, % typewriter type for strings
+            numbers=left,%
+            numberstyle=\tl_use:N \l_@@_code_fontsize_tl\sffamily\color[rgb]{0.5,0.5,1.0},%
+          }%
+          \tcbset{
+              overlay={%
+                \begin{tcbclipinterior}
+                  \fill[tcbcolback!80!black] (frame.south~west) rectangle
+                                             ([xshift=5mm]frame.north~west);
+                \end{tcbclipinterior}%
+              },%
+              listing~options={
+                language=\tl_use:N \l_@@_language_tl,
+                numbersep=\fp_eval:n { \l_@@_linenumber_sep_fp }~mm,
+                %linebackgroundcolor={\ifodd\value{lstnumber}\color{cvgray}\fi}
+              }
+            }%
+        }
+  }
+\cs_generate_variant:Nn \@@_code_engine_tcbset:n {V}
+%    \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\@@_comment_tcbset:}
+% 设置代码盒子底线注释。
+%
+%    \begin{macrocode}
+\cs_new:Npn \@@_comment_tcbset:
+  {
+    \bool_if:NTF { \l_@@_comment_bool }
+    {
+      \tcbset{%
+        listing~and~comment,%
+        colbacklower=tcbcolback!5!yellow!10!white,%
+        collower=tcbcolback!60!black,%
+        comment={\tl_use:N \l_@@_comment_format_tl~
+                 \tl_use:N \l_@@_comment_contents_tl},%
+      }
+    }{
+      \tcbset{ listing~only,}
+    }
+  }
+%    \end{macrocode}
+% \end{macro}
+%
+% \subsection{不计数代码盒子用户接口}
+%
+%  定义不带底线注释的代码盒子环境\env{codebox}
+%
+%    \begin{macrocode}
+\NewDocumentEnvironment{ codebox }{O{} m }
+  {
+    \bool_set_false:N  \l_@@_comment_bool
+    \group_begin:
+    \IfNoValueF{#1}{ \keys_set:nn { codebox } { #1 } }
+    \@@_code_engine_tcbset:V \l_@@_code_style_tl,
+    \@@_comment_tcbset:
+    \tcbset{lang, title={#2} }%
+    \tcblisting{}
+  }{
+    \endtcblisting
+    \group_end:
+  }
+%    \end{macrocode}
+%
+%  定义带底线注释的代码盒子环境\env{codebox*}
+%
+%    \begin{macrocode}
+\NewDocumentEnvironment{ codebox* }{O{} m }
+  {
+    \bool_set_false:N  \l_@@_comment_bool
+    \group_begin:
+    \IfNoValueF{#1}{ \keys_set:nn { codebox } { #1 } }
+    \@@_code_engine_tcbset:V \l_@@_code_style_tl,
+    \@@_comment_tcbset:
+    \tcbset{lang, title={#2} }%
+    \tcblisting{}
+  }{
+    \endtcblisting
+    \group_end:
+  }
+%    \end{macrocode}
+%
+%  定义带/不带底线注释的从文件读取内容的命令\tn{codefile}/\tn{codefile*}
+%
+%    \begin{macrocode}
+\NewDocumentCommand \codefile { s O{} m m }
+  {
+    \IfBooleanTF{#1}
+      {
+        \bool_set_true:N  \l_@@_comment_bool
+      }{
+        \bool_set_false:N \l_@@_comment_bool
+      }
+
+    \group_begin:
+    \IfNoValueF{#2}{ \keys_set:nn { codebox } { #2 } }
+    \@@_code_engine_tcbset:V \l_@@_code_style_tl,
+    \@@_comment_tcbset:
+    \tcbset{
+      lang,
+      title={#3},
+      listing~file={#4},
+    }%
+    \tcbinputlisting{  }
+    \group_end:
+  }
+%    \end{macrocode}
+%
+% \subsection{计数代码盒子用户接口}
+%
+%  设置代码盒子计算器
+%
+%    \begin{macrocode}
+\@@_set_counter_parent:
+%    \end{macrocode}
+%
+%  定义不带底线注释的代码盒子环境\env{codeview}
+%
+%    \begin{macrocode}
+\DeclareTCBListing[use~counter=codecounter]{codeviewaux}{m}
+  {
+    title={\tl_use:N \l_@@_code_name_tl\thecodecounter~#1},
+  }
+\NewDocumentEnvironment{ codeview }{O{} m }
+  {
+    \bool_set_false:N  \l_@@_comment_bool
+    \group_begin:
+    \IfNoValueF{#1}{ \keys_set:nn { codebox } { #1 } }
+    \@@_code_engine_tcbset:V \l_@@_code_style_tl,
+    \@@_comment_tcbset:
+    \tcbset{
+      cv,
+      overlay~unbroken~and~first ={
+        \begin{tcbclipinterior}
+          \node[inner~sep=0pt,anchor=north~east,yshift=-3pt,xshift=-5pt,text=cvgrayb]
+            at (frame.north~east){
+              \ttfamily\faFile*\ \faCode\ \faCodeBranch\ \faCopy\ \faExternalLink*\
+              \MakeUppercase{\tl_use:N \l_@@_language_tl}
+            };
+        \end{tcbclipinterior}
+      }
+    }%
+    \codeviewaux{#2}
+  }{
+    \endcodeviewaux
+    \group_end:
+  }
+%    \end{macrocode}
+%
+%  定义带底线注释的代码盒子环境\env{codeview*}
+%
+%    \begin{macrocode}
+\NewDocumentEnvironment{ codeview* }{O{} m }
+  {
+    \bool_set_true:N  \l_@@_comment_bool
+    \group_begin:
+    \IfNoValueF{#1}{ \keys_set:nn { codebox } { #1 } }
+    \@@_code_engine_tcbset:V \l_@@_code_style_tl,
+    \@@_comment_tcbset:
+    \tcbset{
+      cv,
+      overlay~unbroken~and~first ={
+        \begin{tcbclipinterior}
+          \node[inner~sep=0pt,anchor=north~east,yshift=-3pt,xshift=-5pt,text=cvgrayb]
+            at (frame.north~east){
+              \ttfamily\faFile*\ \faCode\ \faCodeBranch\ \faCopy\ \faExternalLink*\ 
+              \MakeUppercase{\tl_use:N \l_@@_language_tl}
+            };
+        \end{tcbclipinterior}
+      }
+    }%
+    \codeviewaux{#2}
+  }{
+    \endcodeviewaux
+    \group_end:
+  }
+%    \end{macrocode}
+%
+%  定义带/不带底线注释的从文件读取内容的命令\tn{cvfile}/\tn{cvfile*}
+%
+%    \begin{macrocode}
+\DeclareTCBInputListing[use~counter=codecounter]{\langfileaux}{m}
+  {
+    title={\tl_use:N \l_@@_code_name_tl\thecodecounter~#1},
+  }
+\NewDocumentCommand \cvfile { s O{} m m }
+  {
+    \IfBooleanTF{#1}
+      {
+        \bool_set_true:N  \l_@@_comment_bool
+      }{
+        \bool_set_false:N \l_@@_comment_bool
+      }
+
+    \group_begin:
+    \IfNoValueF{#2}{ \keys_set:nn { codebox } { #2 } }
+    \@@_code_engine_tcbset:V \l_@@_code_style_tl,
+    \@@_comment_tcbset:
+    \tcbset{
+      cv,
+      listing~file={#4},
+      overlay~unbroken~and~first ={
+        \begin{tcbclipinterior}
+          \node[inner~sep=0pt,anchor=north~east,yshift=-3pt,xshift=-5pt,text=cvgrayb]
+            at (frame.north~east){
+              \ttfamily\faFile*\ \faCode\ \faCodeBranch\ \faCopy\ \faExternalLink*\ 
+              \MakeUppercase{\tl_use:N \l_@@_language_tl}
+            };
+        \end{tcbclipinterior}
+      }
+    }%
+    \langfileaux{#3}
+    \group_end:
+  }
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+%</package>
+%    \end{macrocode}
+%
+% \end{implementation}
+%
+% \Finale
+%
+\endinput
diff --git a/macros/latex/contrib/codebox/codebox.pdf b/macros/latex/contrib/codebox/codebox.pdf
new file mode 100644
index 0000000000..05a15aa348
--- /dev/null
+++ b/macros/latex/contrib/codebox/codebox.pdf
diff --git a/macros/latex/contrib/codebox/ctxdoc-en.cls b/macros/latex/contrib/codebox/ctxdoc-en.cls
new file mode 100644
index 0000000000..68fab5f967
--- /dev/null
+++ b/macros/latex/contrib/codebox/ctxdoc-en.cls
@@ -0,0 +1,883 @@
+%%
+%% File ctxdoc.cls
+%%
+%%     Copyright (C) 2016--2020
+%%     CTEX.ORG and any individual authors listed in the documentation.
+%%---------------------------------------------------------------------
+%%
+%%     This work may be distributed and/or modified under the
+%%     conditions of the LaTeX Project Public License, either
+%%     version 1.3c of this license or (at your option) any later
+%%     version. This version of this license is in
+%%        http://www.latex-project.org/lppl/lppl-1-3c.txt
+%%     and the latest version of this license is in
+%%        http://www.latex-project.org/lppl.txt
+%%     and version 1.3 or later is part of all distributions of
+%%     LaTeX version 2005/12/01 or later.
+%%
+%%     This work has the LPPL maintenance status "maintained".
+%%
+%%---------------------------------------------------------------------
+%%
+\NeedsTeXFormat{LaTeX2e}
+\RequirePackage{expl3}
+\GetIdInfo$Id$
+  {ctex documentation (CTEX)}
+\ProvidesExplClass{ctxdoc}{\ExplFileDate}{}{\ExplFileDescription}
+\ExplSyntaxOff
+\DeclareOption*{\PassOptionsToClass{\CurrentOption}{l3doc}}
+\PassOptionsToClass{a4paper,full}{l3doc}
+\ProcessOptions
+\LoadClass{l3doc}
+\RequirePackage[UTF8, punct=kaiming, heading, linespread=1.2, sub3section,scheme=plain]{ctex}
+
+\RequirePackage[toc]{multitoc}
+\RequirePackage{geometry}
+\RequirePackage{tabularx}
+\RequirePackage{makecell}
+\RequirePackage{threeparttable}
+\RequirePackage{siunitx}
+\RequirePackage{unicode-math}
+\RequirePackage{xcolor}
+\RequirePackage{caption}
+\RequirePackage{fancyvrb-ex}
+\RequirePackage{zref-base}
+\geometry{includemp, hmargin={0mm,15mm}, vmargin={25mm,15mm}, footskip=7mm}
+\hypersetup{pdfstartview=FitH, bookmarksdepth=subparagraph}
+\setcounter{secnumdepth}{4}
+\setcounter{tocdepth}{2}
+\newcommand*\email{\nolinkurl}
+\setmainfont{texgyrepagella}[
+  Extension      = .otf,
+  UprightFont    = *-regular,
+  BoldFont       = *-bold,
+  ItalicFont     = *-italic,
+  BoldItalicFont = *-bolditalic]
+\setsansfont{texgyreheros}[
+  Extension      = .otf,
+  UprightFont    = *-regular,
+  BoldFont       = *-bold,
+  ItalicFont     = *-italic,
+  BoldItalicFont = *-bolditalic]
+\setmonofont{cmun}[
+  Extension      = .otf,
+  UprightFont    = *btl,
+  BoldFont       = *tb,
+  ItalicFont     = *bto,
+  BoldItalicFont = *tx,
+  HyphenChar     = None]
+\setmathfont{texgyrepagella-math.otf}
+\captionsetup{%
+  strut=off, labelsep=quad, labelfont+=bf,
+  figureposition = bottom, tableposition = top}
+%% <--- http://tex.stackexchange.com/a/40896
+\patchcmd{\@addtocurcol}%
+    {\vskip \intextsep}%
+    {\edef\save@first@penalty{\the\lastpenalty}\unpenalty
+     \ifnum \lastpenalty = \@M  % hopefully the OR penalty
+        \unpenalty
+     \else
+        \penalty \save@first@penalty \relax % put it back
+     \fi
+      \ifnum\outputpenalty <-\@Mii
+                         \addvspace\intextsep
+                         \vskip\parskip
+      \else
+                         \addvspace\intextsep
+      \fi}%
+    {\typeout{*** SUCCESS ***}}{\typeout{*** FAIL ***}}
+\patchcmd{\@addtocurcol}%
+    {\vskip\intextsep \ifnum\outputpenalty <-\@Mii \vskip -\parskip\fi}%
+    {\ifnum\outputpenalty <-\@Mii
+       \aftergroup\vskip\aftergroup\intextsep
+       \aftergroup\nointerlineskip
+     \else
+       \vskip\intextsep
+     \fi}%
+    {\typeout{*** SUCCESS ***}}{\typeout{*** FAIL ***}}
+\patchcmd{\@getpen}{\@M}{\@Mi}
+  {\typeout{*** SUCCESS ***}}{\typeout{*** FAIL ***}}
+%% --->
+%% 不对代码实现的 \section 以下标题编目录。
+\AtBeginEnvironment{implementation}{%
+  \ifnum\value{tocdepth}>\@ne
+    \addtocontents{toc}{\protect\value{tocdepth}=1\relax}%
+  \fi}
+\ifxetex
+  \let\ctexdocverbaddon\xeCJKVerbAddon
+  \def\ctexdisableecglue{\xeCJKsetup{CJKecglue}}
+  \def\ctexplainps{\xeCJKsetup{PunctStyle=plain}}
+  \appto\meta@font@select{\ifinner\ctexdisableecglue\fi}
+\else
+  \let\ctexdocverbaddon\relax
+  \let\ctexplainps\relax
+  \def\ctexdisableecglue{\ltjsetparameter{autoxspacing=false}}
+  \appto\meta@font@select{\ctexdisableecglue}
+\fi
+\setlist{noitemsep,topsep=\smallskipamount}
+\setlist[1]{labelindent=\parindent}
+\setlist[enumerate]{leftmargin=*}
+\setlist[itemize]{leftmargin=*}
+\newlist{optdesc}{description}{3}
+%% 设置间距为 \marginparsep，与 l3doc 一致
+\setlist[optdesc]{%
+  font=\mdseries\small\ttfamily,align=right,listparindent=\parindent,
+  labelsep=\marginparsep,labelindent=-\marginparsep,leftmargin=0pt}
+%% 重新定义 threeparttable 包的 tablenotes 环境
+\renewlist{tablenotes}{description}{1}
+\setlist[tablenotes]{%
+  format=\normalfont\tnote@item,align=right,listparindent=\parindent,
+  labelindent=\tabcolsep,leftmargin=*,rightmargin=\tabcolsep,
+  after=\@noparlisttrue}
+\AtBeginEnvironment{tablenotes}{%
+  \setlength\parindent{2\ccwd}%
+  \normalfont\footnotesize}
+\AtBeginEnvironment{threeparttable}{%
+  \stepcounter{tpt@id}%
+  \edef\curr@tpt@id{tpt@\arabic{tpt@id}}}
+\newcounter{tpt@id}
+\def\tnote@item#1{%
+  \Hy@raisedlink{\hyper@anchor{\curr@tpt@id-#1}}#1}
+\def\TPTtagStyle#1{\hyperlink{\curr@tpt@id-#1}{#1}}
+\fvset{
+  fontsize=\small,baselinestretch=1,numbersep=5pt,
+  formatcom=\ctexdocverbaddon,
+  listparameters=\setlength\topsep{\MacrocodeTopsep}}
+\DefineVerbatimEnvironment{frameverb}{Verbatim}{%
+  gobble=4,
+  frame=single,framesep=8pt,
+  listparameters=
+    \setlength\topsep{\medskipamount}%
+    \appto\FV@EndList{\nointerlineskip}}
+\DefineVerbatimEnvironment{ctexexam}{Verbatim}{%
+  gobble=4,
+  frame=single,framesep=10pt,
+  label=\rule{0pt}{12pt}\textnormal{\bfseries 例 \arabic{ctexexam}},
+  listparameters=
+    \setlength\topsep{\bigskipamount}%
+    \refstepcounter{ctexexam}\ctexexamlabelref
+    \appto\FV@EndList{\nointerlineskip}}
+\define@key{FV}{labelref}{\def\ctexexamlabelref{\label{#1}}}
+\let\ctexexamlabelref\empty
+\newcounter{ctexexam}
+\BeforeBeginEnvironment{function}{\par\nointerlineskip}
+\AtEndEnvironment{function}{%
+  \par\xdef\ctexfixprevdepth{\prevdepth=\the\prevdepth\space}}
+\AfterEndEnvironment{function}{\ctexfixprevdepth}
+\AtBeginEnvironment{syntax}{\linespread{1}\ctexplainps\ctexdisableecglue}
+\BeforeBeginEnvironment{SideBySideExample}{\par\addvspace{\medskipamount}}
+\newrobustcmd\exptarget{%
+  \AddLineBeginMainAux{\csgdef{Codedoc@expstar}{}}%
+  \Hy@raisedlink{\hypertarget{expstar}{}}}
+\newrobustcmd\rexptarget{%
+  \AddLineBeginMainAux{\csgdef{Codedoc@rexpstar}{}}%
+  \Hy@raisedlink{\hypertarget{rexpstar}{}}}
+\newrobustcmd\expstar{\hyperlink{expstar}{$\star$}}
+\newrobustcmd\rexpstar{\hyperlink{rexpstar}{\ding{73}}}
+\ExplSyntaxOn
+%% l3doc 会设置列表环境中 \listparindent=\z@，我们在这里恢复它。
+\cs_set_eq:NN \list \__codedoc_oldlist:nn
+\cs_new_nopar:Npn \zihaopt #1
+  {
+    \exp_last_unbraced:Nf \tl_head:w
+      { \prop_item:Nn \c__ctex_font_size_prop {#1} } { } \q_stop
+  }
+%% 抑制首段的 \parskip
+\ctex_patch_cmd_once:NnnnTF \__codedoc_function_descr_start:w
+  { }
+  { \noindent }
+  { \skip_vertical:n { -\parskip } \noindent }
+  { \iow_term:n { *** ~ SUCCESS ~ *** } }
+  { \iow_term:n { *** ~ FAIL ~ *** } }
+%% l3doc 会在 function 环境的 syntax 和 descr 盒子中间加上 \medskipamount 的距离。
+%% 但是若 syntax 盒子为空（未使用 syntax 环境），就会显得不好看。
+%% 此时我们通过将 \medskipamount 设置为零来修正。若盒子非空，则将 \parskip 还回去。
+\ctex_preto_cmd:NnnTF \__codedoc_function_assemble:
+  { }
+  { \ctex_doc_fix_yoffset: }
+  { \iow_term:n { *** ~ SUCCESS ~ *** } }
+  { \iow_term:n { *** ~ FAIL ~ *** } }
+\cs_new_protected_nopar:Npn \ctex_doc_fix_yoffset:
+  {
+    \box_if_empty:NTF \g__codedoc_syntax_box
+      { \skip_zero:N \medskipamount }
+      { \skip_add:Nn \medskipamount { \parskip } }
+  }
+%% 左侧边注的函数列表采用单倍行距
+\ctex_preto_cmd:NnnTF \__codedoc_typeset_functions:
+  { }
+  { \MacroFont }
+  { \iow_term:n { *** ~ SUCCESS ~ *** } }
+  { \iow_term:n { *** ~ FAIL ~ *** } }
+\ctex_patch_cmd_once:NnnnTF \__codedoc_macro_init:
+  { }
+  { \hbox:n }
+  { \MacroFont \hbox:n }
+  { \iow_term:n { *** ~ SUCCESS ~ *** } }
+  { \iow_term:n { *** ~ FAIL ~ *** } }
+\ctex_patch_cmd_once:NnnnTF \__codedoc_macro_dump:
+  { }
+  { \hbox_unpack_drop:N }
+  { \MacroFont \hbox_unpack_drop:N }
+  { \iow_term:n { *** ~ SUCCESS ~ *** } }
+  { \iow_term:n { *** ~ FAIL ~ *** } }
+\cs_set_eq:NN \__codedoc_macro_end_style:n \use_none:n
+\cs_set_protected:Npn \__codedoc_macro_typeset_one:nN #1#2
+  {
+    \vbox_set:Nn \l__codedoc_macro_box
+      {
+        \MacroFont
+        \vbox_unpack_drop:N \l__codedoc_macro_box
+        \hbox_set:Nn \l_tmpa_box
+          { \__codedoc_print_macroname:nN {#1} #2 }
+        \dim_set:Nn \l_tmpa_dim { \marginparwidth - \labelsep }
+        \dim_compare:nNnT { \box_wd:N \l_tmpa_box } > \l_tmpa_dim
+          {
+            \box_resize_to_wd_and_ht:Nnn \l_tmpa_box
+              { \l_tmpa_dim }
+              { \box_ht:N \l_tmpa_box }
+          }
+        \hbox_overlap_left:n
+          {
+            \box_use:N \l_tmpa_box
+            \skip_horizontal:n { \marginparsep - \labelsep }
+          }
+      }
+    \int_incr:N \l__codedoc_macro_int
+  }
+\cs_set_protected:Npn \__codedoc_print_macroname:nN #1#2
+  {
+    \strut
+    \__codedoc_get_hyper_target:xN
+      {
+        \exp_not:n {#1}
+        \bool_if:NT #2 { \tl_to_str:n {TF} }
+      }
+      \l__codedoc_tmpa_tl
+    \cs_if_exist:cTF { r@ \l__codedoc_tmpa_tl }
+      { \exp_args:NNo \label@hyperref [ \l__codedoc_tmpa_tl ] }
+      { \use:n }
+      {
+        \tl_set:Nn \l__codedoc_tmpa_tl {#1}
+        \tl_replace_all:Non \l__codedoc_tmpa_tl
+          { \c_catcode_other_space_tl }
+          { \fontspec_visible_space: }
+        \__codedoc_macroname_prefix:o \l__codedoc_tmpa_tl
+        \__codedoc_macroname_suffix:N #2
+      }
+  }
+\AtBeginEnvironment { syntax }
+  {
+    \char_set_catcode_active:N \|
+    \char_set_active_eq:NN \| \orbar
+    \char_set_catcode_active:N \(
+    \char_set_active_eq:NN \( \defaultvalaux
+  }
+%% 不对目录中出现的 \cs 和 \tn 等编索引
+\DeclareDocumentCommand \StopSpecialIndexModule { }
+  { \cs_set_eq:NN \__codedoc_special_index_module:nnnnN \use_none:nnnnn }
+\tl_map_inline:nn { \actualchar \encapchar \levelchar }
+  { \exp_args:Nx \DoNotIndex { \bslash \tl_to_str:N #1 } }
+\DeclareDocumentCommand \package { o m }
+  {
+    \exp_args:Nx \href
+      {
+        http \c_colon_str //www.ctan.org/pkg/
+        \IfNoValueTF {#1} { \str_lowercase:n {#2} } {#1}
+      }
+      { \pkg {#2} }
+  }
+\DeclareDocumentCommand \GetFileId { m }
+  {
+    \GetFileInfo {#1}
+    \file_get:nnNTF { \c_sys_jobname_str .id }
+      { \int_set:Nn \tex_endlinechar:D { -1 } } \l__ctxdoc_tmp_tl
+      { \exp_after:wN \GetIdInfo \l__ctxdoc_tmp_tl }
+      { \GetIdInfo $Id$ }
+      { \fileinfo }
+  }
+\cs_new_eq:NN \__ctxdoc_ltx_changes:nnn \changes@
+\cs_set_protected:Npn \changes@ #1#2
+  {
+    \__ctxdoc_save_version_date:nn {#1} {#2}
+    \tl_if_empty:nTF {#1}
+      { \__ctxdoc_ltx_changes:nnn }
+      { \__ctxdoc_version_zfill:wnnn #1 \q_stop }
+      {#1} {#2}
+  }
+\cs_new_protected:Npn \__ctxdoc_version_zfill:wnnn #1#2 \q_stop
+  {
+    \str_if_eq:nnTF {#1} { v }
+      { \__ctxdoc_version_zfill:nnnn {#2} }
+      { \__ctxdoc_ltx_changes:nnn }
+  }
+\cs_new_protected:Npn \__ctxdoc_version_zfill:nnnn #1#2
+  {
+    \tl_clear:N \l__ctxdoc_tmp_tl
+    \int_zero:N \l_tmpa_int
+    \seq_set_split:Nnn \l_tmpa_seq { . } {#1}
+    \seq_map_function:NN \l_tmpa_seq \__ctxdoc_version_zfill:n
+    \int_compare:nNnF \l_tmpa_int > 2
+      {
+        \tl_put_right:Nx \l__ctxdoc_tmp_tl
+          { \prg_replicate:nn { 3 - \l_tmpa_int } { 00000 } }
+      }
+    \__ctxdoc_ltx_changes:nnn { \l__ctxdoc_tmp_tl \actualchar #2 }
+  }
+\tl_new:N \l__ctxdoc_tmp_tl
+\cs_new_protected:Npn \__ctxdoc_version_zfill:n #1
+  {
+    \int_incr:N \l_tmpa_int
+    \tl_put_right:Nx \l__ctxdoc_tmp_tl
+      {
+        \prg_replicate:nn
+          { \int_max:nn { 0 } { 5 - \tl_count:n {#1} } } { 0 }
+        \exp_not:n {#1}
+      }
+  }
+\cs_new_protected:Npn \__ctxdoc_save_version_date:nn #1#2
+  {
+    \prop_get:NnNTF \g__ctxdoc_version_date_prop {#1} \l__ctxdoc_tmp_tl
+      { \exp_after:wN \__ctxdoc_save_version_date:nnnn \l__ctxdoc_tmp_tl {#2} {#1} }
+      { \__ctxdoc_save_version_date:nnn {#1} {#2} {#2} }
+  }
+\cs_new_protected:Npn \__ctxdoc_save_version_date:nnnn #1#2#3#4
+  {
+    \__ctxdoc_if_date_later:nnTF {#1} {#3}
+      { \__ctxdoc_save_version_date:nnn {#4} {#3} {#2} }
+      {
+        \__ctxdoc_if_date_later:nnT {#3} {#2}
+          { \__ctxdoc_save_version_date:nnn {#4} {#1} {#3} }
+      }
+  }
+\prg_new_conditional:Npnn \__ctxdoc_if_date_later:nn #1#2 { TF , T }
+  {
+    \if_int_compare:w \__ctxdoc_parse_date:w #1 / / / 0 \q_stop >
+                      \__ctxdoc_parse_date:w #2 / / / 0 \q_stop \exp_stop_f:
+      \prg_return_true: \else: \prg_return_false: \fi:
+  }
+\cs_new:Npn \__ctxdoc_parse_date:w #1/#2/#3/ #4 \q_stop
+  { #1#2#3 }
+\cs_new_protected:Npn \__ctxdoc_save_version_date:nnn #1#2#3
+  { \prop_gput:Nnn \g__ctxdoc_version_date_prop {#1} { {#2} {#3} } }
+\cs_new_protected:Npn \CTEX@versionitem #1 \efill
+  {
+    \@idxitem
+    \prop_get:NnNTF \g__ctxdoc_version_date_prop {#1} \l__ctxdoc_tmp_tl
+      { \exp_after:wN \__ctxdoc_version_item:nnn \l__ctxdoc_tmp_tl {#1} }
+      { \BOOM }
+  }
+\cs_new_protected:Npn \__ctxdoc_version_item:nnn #1#2#3
+  {
+    \noindent
+    \Hy@raisedlink { \belowpdfbookmark {#3} { HD.#3 } }
+    \textbf {#3} \hfill
+    \hbox:n
+      {
+        \footnotesize
+        \str_if_eq:nnTF {#1} {#2}
+          { ( #1 ) }
+          { ( #1 ~ -- ~ #2 ) }
+      }
+    \par \nopagebreak
+  }
+\prop_new:N \g__ctxdoc_version_date_prop
+\ctex_patch_cmd:Nnn \HDorg@theglossary
+  { \let \item \@idxitem }
+  { \let \item \CTEX@versionitem }
+\ctex_patch_cmd:Nnn \l@section    { 2.5em } { 1.5em }
+\ctex_patch_cmd:Nnn \l@subsection { 2.5em } { 1.5em }
+\ctex_patch_cmd:Nnn \@wrglossary
+  { hdpindex }
+  {
+    \ifnum \c@HD@hypercount = \z@
+      hdpindex
+    \else
+      hdclindex { \the \c@HD@hypercount }
+    \fi
+  }
+%% 重定义 macrocode 环境的实现，逐行处理
+\cs_set_protected_nopar:Npn \xmacro@code
+  { \__ctxdoc_marco_code:w }
+\cs_set_protected_nopar:Npn \sxmacro@code
+  {
+    \fontspec_print_visible_spaces:
+    \xmacro@code
+  }
+\cs_new_protected_nopar:Npn \__ctxdoc_marco_code:w
+  {
+    \ifcodeline@index
+      \__ctxdoc_marco_every_par:n { \__ctxdoc_code_line_no: }
+    \else:
+      \__ctxdoc_marco_every_par:n { }
+    \fi:
+    \exp_args:Nx \__ctxdoc_make_finish_tag:n { \@currenvir }
+    \__ctxdoc_verbatim_start:w
+  }
+\cs_new_protected:Npn \__ctxdoc_marco_every_par:n #1
+  {
+    \everypar
+      {
+        \everypar {#1}
+        \if@inlabel
+          \global \@inlabelfalse
+          \@noparlistfalse
+          \llap { \box \@labels \hskip \leftskip }
+        \fi
+        #1
+      }
+  }
+\ctex_patch_cmd:Nnn \macro@code
+  { \if@inlabel \leavevmode \fi }
+  { \partopsep \z@skip }
+\group_begin:
+  \int_set:Nn \tex_endlinechar:D { -1 }
+  \use:n
+    {
+      \char_set_catcode_active:n { 32 }
+      \tl_const:Nn \c__ctxdoc_active_space_tl
+    }
+    { }
+\group_end:
+\group_begin:
+  \char_set_catcode_active:n { 13 }
+  \cs_new_protected:Npx \__ctxdoc_make_finish_tag:n #1
+    {
+      \tl_set:Nn \exp_not:N \l__ctxdoc_verbatim_finish_tl
+        {
+          \c_percent_str
+          \prg_replicate:nn { 4 }
+            { \exp_not:o { \c__ctxdoc_active_space_tl } }
+          \exp_not:o { \active@escape@char } end
+          \c_left_brace_str #1 \c_right_brace_str
+          \exp_not:N ^^M
+        }
+    }
+  \cs_new_protected:Npn \__ctxdoc_verbatim_start:w #1
+    {
+      \str_if_eq:nnTF {#1} { ^^M }
+        { \__ctxdoc_verbatim_read_line:w }
+        { \__ctxdoc_verbatim_read_line:w #1 }
+    }
+  \cs_new_protected:Npn \__ctxdoc_verbatim_read_line:w #1 ^^M
+    {
+      \tl_set:Nn \l__ctxdoc_verbatim_line_tl { #1 ^^M }
+      \tl_if_eq:NNTF \l__ctxdoc_verbatim_line_tl \l__ctxdoc_verbatim_finish_tl
+        { \exp_args:Nx \end { \@currenvir } }
+        {
+          \__ctxdoc_verbatim_process_line:
+          \__ctxdoc_verbatim_read_line:w
+        }
+    }
+  \cs_new_protected:Npn \__ctxdoc_swap_cr:
+    { \exp_after:wN \__ctxdoc_swap_cr:w \l__ctxdoc_verbatim_line_tl }
+  \cs_new_protected:Npn \__ctxdoc_swap_cr:w #1 ^^M
+    {
+      \group_insert_after:N ^^M
+      \tl_set:Nn \l__ctxdoc_verbatim_line_tl {#1}
+    }
+  \tl_const:Nn \c__ctxdoc_active_cr_tl { ^^M }
+\group_end:
+\tl_new:N \l__ctxdoc_verbatim_line_tl
+\tl_new:N \l__ctxdoc_verbatim_finish_tl
+\tl_new:N \g__ctxdoc_verbatim_verb_stop_tl
+\cs_new_protected_nopar:Npn \__ctxdoc_process_normal_line:
+  {
+    \str_if_eq:eeTF
+      { \str_head:N \l__ctxdoc_verbatim_line_tl } { \c_percent_str }
+      { \__ctxdoc_check_angle:x { \tl_tail:N \l__ctxdoc_verbatim_line_tl } }
+      { \__ctxdoc_output_line: }
+  }
+\cs_new_protected_nopar:Npn \__ctxdoc_process_verb_line:
+  {
+    \tl_if_eq:NNTF \l__ctxdoc_verbatim_line_tl \g__ctxdoc_verbatim_verb_stop_tl
+      {
+        \tl_gclear:N \g__ctxdoc_verbatim_verb_stop_tl
+        \cs_gset_eq:NN \__ctxdoc_verbatim_process_line: \__ctxdoc_process_normal_line:
+        \__ctxdoc_output_module:nn
+          { \color { verb@guard } }
+          {
+            \__ctxdoc_swap_cr:
+            \__ctxdoc_module_pop:n { \l__ctxdoc_verbatim_line_tl }
+          }
+      }
+      { \tl_use:N \l__ctxdoc_verbatim_line_tl }
+  }
+\cs_new_eq:NN \__ctxdoc_verbatim_process_line: \__ctxdoc_process_normal_line:
+\DeclareDocumentCommand \CheckModules { }
+  { \cs_set_eq:NN \__ctxdoc_verbatim_process_line: \__ctxdoc_process_normal_line: }
+\DeclareDocumentCommand \DontCheckModules { }
+  { \cs_set_eq:NN \__ctxdoc_verbatim_process_line: \__ctxdoc_output_line: }
+\cs_new_protected:Npn \__ctxdoc_check_angle:n #1
+  {
+     \str_if_eq:eeTF { \str_head:n {#1} } { < }
+      { \__ctxdoc_check_module:x { \tl_tail:n {#1} } }
+      { \__ctxdoc_output_percent_line: }
+  }
+\cs_generate_variant:Nn \__ctxdoc_check_angle:n { x }
+\cs_new_protected:Npn \__ctxdoc_check_module:n #1
+  {
+    \exp_args:Nx \str_case:nnF { \str_head:n {#1} }
+      {
+        { * } { \__ctxdoc_module_star:w }
+        { / } { \__ctxdoc_module_slash:w }
+        { @ } { \__ctxdoc_module_at:w }
+        { < } { \__ctxdoc_module_verb:w }
+      }
+      { \__ctxdoc_module_pm:w }
+    #1 \q_stop
+  }
+\cs_generate_variant:Nn \__ctxdoc_check_module:n { x }
+\group_begin:
+  \char_set_catcode_active:N \>
+  \cs_new_protected:Npn \__ctxdoc_module_star:w #1 > #2 \q_stop
+    {
+      \__ctxdoc_output_module:nn
+        { \__ctxdoc_star_color: }
+        { \__ctxdoc_module_push:n { \__ctxdoc_module_angle:n {#1} } }
+      \__ctxdoc_output_line:n {#2}
+      \__ctxdoc_star_format:
+    }
+  \cs_new_protected:Npn \__ctxdoc_module_slash:w #1 > #2 \q_stop
+    {
+      \__ctxdoc_output_module:nn
+        { \__ctxdoc_slash_color: }
+        { \__ctxdoc_module_pop:n { \__ctxdoc_module_angle:n {#1} } }
+      \__ctxdoc_output_line:n {#2}
+      \__ctxdoc_slash_format:
+    }
+  \cs_new_protected:Npn \__ctxdoc_module_at:w @ @ = #1 > #2 \q_stop
+    {
+      \__ctxdoc_output_module:nn
+        { \color { at@guard } }
+        { \__ctxdoc_module_angle:n { @ @ = #1 } }
+      \tl_gset:Nn \g__codedoc_module_name_tl {#1}
+      \__ctxdoc_output_line:n {#2}
+    }
+  \cs_new_protected:Npn \__ctxdoc_module_pm:w #1 > #2 \q_stop
+    {
+      \tex_noindent:D
+      \hbox_overlap_left:n
+        {
+          \__ctxdoc_output_module:nn
+            { \__ctxdoc_pm_color: }
+            { \__ctxdoc_module_angle:n {#1} }
+          \skip_horizontal:n { \leftskip + \smallskipamount }
+        }
+      \group_begin:
+        \__ctxdoc_pm_format:
+        \__ctxdoc_output_line:n {#2}
+      \group_end:
+    }
+  \cs_new_protected:Npn \__ctxdoc_module_verb:w #1 \q_stop
+    {
+      \cs_gset_eq:NN \__ctxdoc_verbatim_process_line: \__ctxdoc_process_verb_line:
+      \tl_gset:Nx \g__ctxdoc_verbatim_verb_stop_tl
+        { \c_percent_str \tl_tail:n {#1} }
+      \__ctxdoc_output_module:nn
+        { \color { verb@guard } }
+        {
+          \__ctxdoc_swap_cr:
+          \__ctxdoc_module_push:n { \l__ctxdoc_verbatim_line_tl }
+        }
+    }
+\group_end:
+\cs_new_protected_nopar:Npn \__ctxdoc_output_line:
+  {
+    \tex_noindent:D
+    \__ctxdoc_replace_at_at:N \l__ctxdoc_verbatim_line_tl
+    \tl_use:N \l__ctxdoc_verbatim_line_tl
+  }
+\cs_new_protected:Npn \__ctxdoc_replace_at_at:N #1
+  {
+    \tl_if_empty:NF \g__codedoc_module_name_tl
+      {
+        \exp_args:NNo \__ctxdoc_replace_at_at_aux:Nn
+          #1 \g__codedoc_module_name_tl
+      }
+  }
+\cs_new_protected:Npx \__ctxdoc_replace_at_at_aux:Nn #1#2
+  {
+    \tl_replace_all:Nnn #1 { \token_to_str:N @ } { @ }
+    \tl_replace_all:Nnn #1 { \token_to_str:N _ } { _ }
+    \tl_replace_all:Nnn #1 { @ @ @ @ } { \token_to_str:N a a }
+    \tl_replace_all:Nnn #1 { _ _ @ @ } { _ _ #2 }
+    \tl_replace_all:Nnn #1 {   _ @ @ } { _ _ #2 }
+    \tl_replace_all:Nnn #1 {     @ @ } { _ _ #2 }
+    \tl_replace_all:Nnn #1 { \token_to_str:N a a } { @ @ }
+  }
+\cs_new_protected:Npn \__ctxdoc_output_line:n #1
+  {
+    \tl_set:Nn \l__ctxdoc_verbatim_line_tl {#1}
+    \tl_if_eq:NNTF \l__ctxdoc_verbatim_line_tl \c__ctxdoc_active_cr_tl
+      { \tl_use:N \l__ctxdoc_verbatim_line_tl }
+      {
+        \str_if_eq:eeTF
+          { \str_head:N \l__ctxdoc_verbatim_line_tl }
+          { \c_percent_str }
+          { \__ctxdoc_output_percent_line: }
+          { \__ctxdoc_output_line: }
+      }
+  }
+\cs_new_protected:Npn \__ctxdoc_output_percent_line:
+  {
+    \tex_noindent:D
+    \group_begin:
+      \color { code@gray }
+      \__ctxdoc_swap_cr:
+      \str_if_eq:eeTF { \f@shape } { \updefault }
+        { \slshape }
+        { \upshape }
+      \__ctxdoc_output_line:
+    \group_end:
+  }
+\cs_new_protected_nopar:Npn \__ctxdoc_module_push:n
+  { \exp_args:No \__ctxdoc_module_push_aux:nn { \int_use:N \c@HD@hypercount } }
+\cs_new_protected:Npn \__ctxdoc_module_push_aux:nn #1
+  {
+    \seq_gpush:Nn \g__ctxdoc_module_dest_seq {#1}
+    \hypersetup { hidelinks }
+    \exp_args:Nx \hdclindex
+      { \zref@extractdefault { HD.#1 } { guard@end } { 1 } } { }
+  }
+\cs_new_protected_nopar:Npn \__ctxdoc_module_pop:n
+  {
+    \seq_gpop:NNTF \g__ctxdoc_module_dest_seq \l__ctxdoc_tmp_tl
+      { \exp_args:No \__ctxdoc_module_pop_aux:nn { \l__ctxdoc_tmp_tl } }
+      { \BOOM \use:n }
+  }
+\cs_new_protected:Npn \__ctxdoc_module_pop_aux:nn #1
+  {
+    \zref@labelbylist { HD.#1 } { ctxdoc }
+    \hypersetup { hidelinks }
+    \hdclindex {#1} { }
+  }
+\seq_new:N \g__ctxdoc_module_dest_seq
+\zref@newlist { ctxdoc }
+\zref@newprop { guard@end } [ 1 ]
+  { \int_eval:n { \c@HD@hypercount - 1 } }
+\zref@addprop { ctxdoc } { guard@end }
+\cs_new_protected_nopar:Npn \__ctxdoc_star_format:
+  {
+    \seq_gpush:No \g__ctxdoc_slash_format_seq { \macro@font }
+    \seq_gpop:NNF \g__ctxdoc_star_format_seq \l__ctxdoc_format_tl
+      { \__ctxdoc_pop_format: }
+    \__ctxdoc_select_format:
+  }
+\cs_new_protected_nopar:Npn \__ctxdoc_slash_format:
+  {
+    \seq_gpop:NNTF \g__ctxdoc_slash_format_seq \l__ctxdoc_format_tl
+      {
+        \seq_gpush:No \g__ctxdoc_star_format_seq { \macro@font }
+        \__ctxdoc_select_format:
+      }
+      { \BOOM }
+  }
+\cs_new_protected_nopar:Npn \__ctxdoc_pm_format:
+  {
+    \seq_get:NNF \g__ctxdoc_star_format_seq \l__ctxdoc_format_tl
+      {
+        \__ctxdoc_pop_format:
+        \seq_gpush:No \g__ctxdoc_star_format_seq { \l__ctxdoc_format_tl }
+      }
+    \cs_if_eq:NNF \macro@font \l__ctxdoc_format_tl
+      { \l__ctxdoc_format_tl }
+  }
+\cs_new_protected_nopar:Npn \__ctxdoc_pop_format:
+  {
+    \seq_gpop_left:NN \g__ctxdoc_format_seq \l__ctxdoc_format_tl
+    \seq_gput_right:No \g__ctxdoc_format_seq { \l__ctxdoc_format_tl }
+  }
+\cs_new_protected_nopar:Npn \__ctxdoc_select_format:
+  {
+    \cs_if_eq:NNF \macro@font \l__ctxdoc_format_tl
+      {
+        \cs_gset_eq:NN \macro@font \l__ctxdoc_format_tl
+        \macro@font
+      }
+  }
+\tl_new:N \l__ctxdoc_format_tl
+\seq_new:N \g__ctxdoc_format_seq
+\seq_new:N \g__ctxdoc_star_format_seq
+\seq_new:N \g__ctxdoc_slash_format_seq
+\seq_gput_right:Nn \g__ctxdoc_format_seq { \MacroFont }
+\seq_gput_right:Nn \g__ctxdoc_format_seq { \AltMacroFont }
+\cs_set_protected:Npn \MacroFont
+  {
+    \linespread { 1 }
+    \small
+    \fontseries { \mddefault }
+    \fontshape  { \updefault }
+    \ttfamily
+    \ctexdocverbaddon
+  }
+\cs_set_protected:Npn \AltMacroFont
+  {
+    \linespread { 1 }
+    \small
+    \fontseries { \mddefault }
+    \fontshape  { \sldefault }
+    \ttfamily
+    \ctexdocverbaddon
+  }
+\AtBeginDocument
+  {
+    \tl_gset:Nx \macro@font
+      { \seq_item:Nn \g__ctxdoc_format_seq { 1 } }
+  }
+\cs_new_protected:Npn \__ctxdoc_output_module:nn #1#2
+  {
+    \tex_noindent:D
+    \group_begin:
+      #1
+      \footnotesize \normalfont \sffamily #2
+    \group_end:
+  }
+\cs_new_protected_nopar:Npn \__ctxdoc_star_color:
+  {
+    \seq_gpop:NNTF \g__ctxdoc_star_color_seq \current@color
+      { \set@color }
+      { \__ctxdoc_select_color: }
+    \seq_gpush:No \g__ctxdoc_slash_color_seq { \current@color }
+  }
+\cs_new_protected_nopar:Npn \__ctxdoc_slash_color:
+  {
+    \seq_gpop:NNTF \g__ctxdoc_slash_color_seq \current@color
+      {
+        \set@color
+        \seq_gpush:No \g__ctxdoc_star_color_seq { \current@color }
+      }
+      { \BOOM }
+  }
+\cs_new_protected_nopar:Npn \__ctxdoc_pm_color:
+  {
+    \seq_get:NNTF \g__ctxdoc_star_color_seq \current@color
+      { \set@color }
+      {
+        \__ctxdoc_select_color:
+        \seq_gpush:No \g__ctxdoc_star_color_seq { \current@color }
+      }
+  }
+\seq_new:N \g__ctxdoc_star_color_seq
+\seq_new:N \g__ctxdoc_slash_color_seq
+\cs_new_protected_nopar:Npn \__ctxdoc_select_color:
+  { \color { guard@series!!+ } }
+\definecolorseries { guard@series }
+  { cmyk } { last } { blue } { purple }
+\resetcolorseries [ 3 ] { guard@series }
+\definecolor { verb@guard } { rgb }  { 0.5  , 0.5 , 0 }
+\definecolor { at@guard }   { rgb }  { 0.5  , 0   , 0.5 }
+\definecolor { code@gray }  { gray } { 0.5 }
+\cs_new_protected:Npn \__ctxdoc_module_angle:n #1
+  { \textlangle #1 \textrangle }
+\cs_new_protected_nopar:Npn \__ctxdoc_code_line_no:
+  {
+    \int_gincr:N \c@CodelineNo
+    \hbox_overlap_left:n
+      {
+        \hbox_to_wd:nn
+          { \MacroIndent }
+          {
+            \HD@target
+            \tex_hss:D
+            \__ctxdoc_code_line_no_style:
+            \theCodelineNo \enspace
+          }
+        \tex_kern:D \@totalleftmargin
+      }
+  }
+\tl_set:Nn \theCodelineNo
+  { \arabic { CodelineNo } }
+\cs_new_protected_nopar:Npn \__ctxdoc_code_line_no_style:
+  { \color { code@gray } \normalfont \sffamily \tiny }
+\cs_set_protected:Npn \HD@SetMacroIndent #1
+  {
+    \group_begin:
+      \settowidth \MacroIndent
+        {
+          \__ctxdoc_code_line_no_style:
+          \prg_replicate:nn { \tl_count:n {#1} } { 0 }
+          \enspace
+        }
+      \dim_gset_eq:NN \MacroIndent \MacroIndent
+    \group_end:
+  }
+\ExplSyntaxOff
+\AtBeginDocument{\addtocontents{toc}{\StopSpecialIndexModule}}
+\pdfstringdefDisableCommands{%
+  \let\path\meta
+  \let\opt\@firstofone}
+\preto\@thehead{\cslet{MakeUppercase\space}{\@iden}}
+\def\orbar{\textup{\textbar}}
+\def\defaultval#1{\textbf{\textup{#1}}}
+\def\defaultvalaux#1){\defaultval{#1}}
+\def\TF{true\orbar false}
+\def\TTF{\defaultval{true}\orbar false}
+\def\TFF{true\orbar\defaultval{false}}
+\protected\def\opt{\texttt}
+\def\TeX{\hologo{TeX}}
+\def\pdfTeX{\hologo{pdfTeX}}
+\def\XeTeX{\hologo{XeTeX}}
+\def\XeLaTeX{\hologo{XeLaTeX}}
+\def\LuaLaTeX{\hologo{LuaLaTeX}}
+\def\pdfLaTeX{\hologo{pdfLaTeX}}
+\def\LaTeX{\hologo{LaTeX}}
+\def\LaTeXe{\hologo{LaTeX2e}}
+\def\LaTeXiii{\hologo{LaTeX3}}
+\def\dvipdfmx{\hologo{DVIPDFMx}}
+\def\TeXLive{\hologo{TeXLive}}
+\def\MiKTeX{\hologo{MiKTeX}}
+\def\pTeX{\hologo{pTeX}}
+\def\ApTeX{\hologo{ApTeX}}
+\def\upTeX{\hologo{upTeX}}
+\def\ApLaTeX{\hologo{ApLaTeX}}
+\def\upLaTeX{\hologo{upLaTeX}}
+\def\HoLogo@pTeX#1{p\kern -.15em \hologo{TeX}}
+\def\HoLogo@pLaTeX#1{p\kern -.05em \hologo{LaTeX}}
+\def\HoLogo@ApTeX#1{A\kern -.05em \hologo{pTeX}}
+\def\HoLogo@upTeX#1{u\kern -.05em \hologo{pTeX}}
+\def\HoLogo@ApLaTeX#1{A\kern -.05em \hologo{pLaTeX}}
+\def\HoLogo@upLaTeX#1{u\kern -.05em \hologo{pLaTeX}}
+\def\HoLogoBkm@pTeX#1{p\hologo{TeX}}
+\def\HoLogoBkm@pLaTeX#1{p\hologo{LaTeX}}
+\def\HoLogoBkm@ApTeX#1{A\hologo{pTeX}}
+\def\HoLogoBkm@upTeX#1{u\hologo{pTeX}}
+\def\HoLogoBkm@ApLaTeX#1{A\hologo{pLaTeX}}
+\def\HoLogoBkm@upLaTeX#1{u\hologo{pLaTeX}}
+\def\HoLogo@TeXLive#1{\TeX\ Live}
+\def\HoLogo@DVIPDFMx#1{DVIPDFM\ensuremath{x}}
+\def\bashcmd{\texttt}
+\def\BSTACK{\begin{tabular}[t]{@{}l@{}}}
+\def\ESTACK{\end{tabular}}
+\newenvironment{defaultcapconfig}{%
+  \MakePercentComment
+  \input{ctex-name-utf8.cfg}%
+  \ExplSyntaxOff
+  \MakePercentIgnore}{}
+\def\ctexkit{\href{https://github.com/CTeX-org/ctex-kit/}{\texttt{ctex-kit}}}
+\def\ctexkitrev#1{%
+  \href{https://github.com/CTeX-org/ctex-kit/commit/#1}{\texttt{ctex-kit} rev. #1}}
+\appto\GlossaryParms{%
+  \raggedcolumns
+  \let\Hy@writebookmark\HDorg@writebookmark
+  \def\@idxitem{\par\hangindent 2em }%
+  \def\subitem{\@idxitem\hspace*{1em}}%
+  \def\subsubitem{\@idxitem\hspace*{2em}}}
+\def\glossaryname{版本历史}
+\GlossaryPrologue{\section{\glossaryname}}
+\IndexPrologue{%
+  \section{\indexname}
+  \textit{意大利体的数字表示描述对应索引项的页码；
+  带下划线的数字表示定义对应索引项的代码行号；
+  罗马字体的数字表示使用对应索引项的代码行号。}}
+\def\IndexLayout{%
+  \newgeometry{hmargin=15mm,vmargin={25mm,15mm},footskip=7mm}%
+  \setlength\IndexMin{.5\textheight}%
+  \ctexset{section/numbering=false}%
+  \StopSpecialIndexModule}
+\EnableCrossrefs
+\CodelineIndex
+\RecordChanges
+%%
+%%
+%% End of file ctxdoc.cls.
diff --git a/macros/latex/contrib/codebox/hellojava.java b/macros/latex/contrib/codebox/hellojava.java
new file mode 100755
index 0000000000..1cf8d2e9bc
--- /dev/null
+++ b/macros/latex/contrib/codebox/hellojava.java
@@ -0,0 +1,5 @@
+public class HelloWorld {
+    public static void main(String[] args){
+        System.out.println("Hello World!");
+    }
+}
diff --git a/macros/latex/contrib/codebox/hellopy.py b/macros/latex/contrib/codebox/hellopy.py
new file mode 100755
index 0000000000..af687ef384
--- /dev/null
+++ b/macros/latex/contrib/codebox/hellopy.py
@@ -0,0 +1,32 @@
+import tensorflow as tf
+import numpy as np
+import os
+os.environ['TF_CPP_MIN_LOG_LEVEL'] = '2'
+
+# Create 100 phony x, y data points in Numpy, y = x * 0.1 + 0.3
+x_data = np.random.random(100).astype("float32")
+y_data = x_data * 0.1 + 0.3
+
+# Try to find values for W and b that compute y_data = W * x_data + b
+W = tf.Variable(tf.random_uniform([1], -1.0, 1.0))
+b = tf.Variable(tf.zeros([1]))
+y = W * x_data + b
+
+# Minimize the mean squared errors.
+loss = tf.reduce_mean(tf.square(y -y_data))
+optimizer = tf.train.GradientDescentOptimizer(0.5)
+train = optimizer.minimize(loss)
+
+# Before starting, initialize the variables. We will 'run' this first
+init = tf.global_variables_initializer()
+
+# Launch the graph.
+sess = tf.Session()
+sess.run(init)
+
+# Fit the line.
+for step in range(201):
+      sess.run(train)
+      if step % 20 == 0:
+          print(step, sess.run(W), sess.run(b))
+          
diff --git a/macros/latex/contrib/codebox/test.c b/macros/latex/contrib/codebox/test.c
new file mode 100644
index 0000000000..398d2d12bf
--- /dev/null
+++ b/macros/latex/contrib/codebox/test.c
@@ -0,0 +1,9 @@
+#include <stdio.h>
+#include <stdlib.h>
+
+int main(void)
+{
+    printf("Hello World!\n");
+
+    return 0;
+}
diff --git a/macros/latex/contrib/easybook/easybook.dtx b/macros/latex/contrib/easybook/easybook.dtx
index 99f5551d5d..86fed33e09 100644
--- a/macros/latex/contrib/easybook/easybook.dtx
+++ b/macros/latex/contrib/easybook/easybook.dtx
@@ -15,7 +15,7 @@
 %<*class>
 \NeedsTeXFormat{LaTeX2e}[2020/10/01]
 \RequirePackage{l3keys2e}
-\ProvidesExplClass{easybook}{2021/12/22}{1.42C}
+\ProvidesExplClass{easybook}{2021/12/26}{1.42E}
   {Typeset Chinese theses or books}
 
 \bool_set_false:N \l__eb_compile_draft_bool
@@ -307,7 +307,7 @@
 %<*package>
 \NeedsTeXFormat{LaTeX2e}[2020/10/01]
 \RequirePackage{l3keys2e,etoolbox}
-\ProvidesExplPackage{easybase}{2021/12/22}{1.42C}
+\ProvidesExplPackage{easybase}{2021/12/26}{1.42E}
   {Typeset Chinese theses or books}
 
 \cs_generate_variant:Nn \dim_set:Nn { NV }
@@ -2432,7 +2432,7 @@
   }
 %</package>
 %<*tcolorbox>
-\ProvidesExplFile{eb-tcolorbox.cfg}{2021/12/22}{1.42C}
+\ProvidesExplFile{eb-tcolorbox.cfg}{2021/12/26}{1.42E}
   {Customization of tcolorbox for easybook}
 
 \cs_set_protected:Npn \setexercise #1
@@ -2488,8 +2488,7 @@
   }
 \deftcbstyle{tc-exercise}
   {
-    blank,on~line,center,
-    sharpish~corners,
+    blank,center,sharpish~corners,
     fontupper         = \Large\sffamily,
     beforeafter~skip  = 5ex plus .2ex minus .1ex
   }
@@ -2499,7 +2498,6 @@
     center~title,
     sharpish~corners,
     left = 8pt,right = 8pt,
-    opacityback = 0.2,opacitybacktitle = 0.2,
     coltitle = black,colframe = black,
     top = \eb@tc@line@skip,bottom = \eb@tc@line@skip,
     middle = \eb@tc@line@skip,
@@ -2526,9 +2524,9 @@
   }
 \deftcbstyle{tc-ebfbox}
   {
-    on~line,sharpish~corners,
-    top = 1.5pt,bottom = 1.5pt,left = 1pt,right = 1pt,
-    leftrule = 0pt,rightrule = 0pt
+    standard~jigsaw,on~line,sharpish~corners,
+    top = 3pt,bottom = 3pt,left = 3pt,right = 3pt,
+    boxrule = 0.4pt,opacityback = 0.2
   }
 \tcbset
   {
@@ -2621,7 +2619,7 @@
     \bool_if:NT \g__eb_exer_clear_prologue_bool
       { \tl_gclear:N \eb@tc@list@prologue }
   }{}
-\DeclareTColorBox{easybox}{sO{Khaki}d()O{}}
+\DeclareTColorBox{easybox}{sO{PaleGoldenrod}d()O{}}
   {
     IfBooleanF = {#1}{frame~hidden,boxrule = 0pt},
     IfValueT = {#3}{title = #3},
@@ -2641,17 +2639,16 @@
       }{
         colback   = white,
         IfValueT  = {#3}{title = #3},
-        top = 0pt,bottom = 0pt,right = 0pt,toptitle = 0pt
+        top = 0pt,bottom = 0pt,right = 0pt
       },
     coltitle = #2,tc-ebparbox,#4
   }
-\DeclareTotalTCBox{\ebfbox}{O{Lime}vO{}}
+\DeclareTotalTCBox{\ebfbox}{O{Green}vO{}}
   {
-    colback = #1!10!white,
-    colframe = #1!50!black,
+    colback = #1,colframe = #1,
     tc-ebfbox,#3
   }{#2}
-\DeclareTotalTCBox{\ebemph}{O{DarkSeaGreen}vO{}}
+\DeclareTotalTCBox{\ebemph}{O{Yellow}vO{}}
   {
     fuzzy~halo = 2pt~with~#1,
     tc-ebemph,#3
diff --git a/macros/latex/contrib/easybook/easybook.pdf b/macros/latex/contrib/easybook/easybook.pdf
index 4bed13fdee..299886a6a5 100644
--- a/macros/latex/contrib/easybook/easybook.pdf
+++ b/macros/latex/contrib/easybook/easybook.pdf
diff --git a/macros/latex/contrib/easybook/easybook.tex b/macros/latex/contrib/easybook/easybook.tex
index 0aacb0e9c4..9179fa3002 100644
--- a/macros/latex/contrib/easybook/easybook.tex
+++ b/macros/latex/contrib/easybook/easybook.tex
@@ -20,8 +20,8 @@
     name            = easybook,
     color-scheme    = blue,
     title           = EASYBOOK 使用手册,
-    version         = v1.42C,
-    date            = 2021/12/22,
+    version         = v1.42E,
+    date            = 2021/12/26,
     authors         = 瞿毅,
     info            = 排版简体中文学位论文和书籍,
     email           = q1jx@foxmail.com,
@@ -1142,7 +1142,7 @@
   \command{ebemph}[\oarg{颜色名}\marg{内容}\oarg{配置选项}]
   盒子 \cs{ebemph} 具有模糊边缘类似高亮的效果。
   \command{ebfbox}[\oarg{颜色名}\marg{内容}\oarg{配置选项}]
-  盒子 \cs{ebfbox} 则有直角边缘并带有上下框线。
+  盒子 \cs{ebfbox} 则有直角边缘和四周框线，效果类似带颜色的 \cs*{fbox} 盒子。
 \end{commands}
 
 \section{更多用法}
diff --git a/macros/latex/contrib/termsim/ctxdoc-en.cls b/macros/latex/contrib/termsim/ctxdoc-en.cls
new file mode 100644
index 0000000000..68fab5f967
--- /dev/null
+++ b/macros/latex/contrib/termsim/ctxdoc-en.cls
@@ -0,0 +1,883 @@
+%%
+%% File ctxdoc.cls
+%%
+%%     Copyright (C) 2016--2020
+%%     CTEX.ORG and any individual authors listed in the documentation.
+%%---------------------------------------------------------------------
+%%
+%%     This work may be distributed and/or modified under the
+%%     conditions of the LaTeX Project Public License, either
+%%     version 1.3c of this license or (at your option) any later
+%%     version. This version of this license is in
+%%        http://www.latex-project.org/lppl/lppl-1-3c.txt
+%%     and the latest version of this license is in
+%%        http://www.latex-project.org/lppl.txt
+%%     and version 1.3 or later is part of all distributions of
+%%     LaTeX version 2005/12/01 or later.
+%%
+%%     This work has the LPPL maintenance status "maintained".
+%%
+%%---------------------------------------------------------------------
+%%
+\NeedsTeXFormat{LaTeX2e}
+\RequirePackage{expl3}
+\GetIdInfo$Id$
+  {ctex documentation (CTEX)}
+\ProvidesExplClass{ctxdoc}{\ExplFileDate}{}{\ExplFileDescription}
+\ExplSyntaxOff
+\DeclareOption*{\PassOptionsToClass{\CurrentOption}{l3doc}}
+\PassOptionsToClass{a4paper,full}{l3doc}
+\ProcessOptions
+\LoadClass{l3doc}
+\RequirePackage[UTF8, punct=kaiming, heading, linespread=1.2, sub3section,scheme=plain]{ctex}
+
+\RequirePackage[toc]{multitoc}
+\RequirePackage{geometry}
+\RequirePackage{tabularx}
+\RequirePackage{makecell}
+\RequirePackage{threeparttable}
+\RequirePackage{siunitx}
+\RequirePackage{unicode-math}
+\RequirePackage{xcolor}
+\RequirePackage{caption}
+\RequirePackage{fancyvrb-ex}
+\RequirePackage{zref-base}
+\geometry{includemp, hmargin={0mm,15mm}, vmargin={25mm,15mm}, footskip=7mm}
+\hypersetup{pdfstartview=FitH, bookmarksdepth=subparagraph}
+\setcounter{secnumdepth}{4}
+\setcounter{tocdepth}{2}
+\newcommand*\email{\nolinkurl}
+\setmainfont{texgyrepagella}[
+  Extension      = .otf,
+  UprightFont    = *-regular,
+  BoldFont       = *-bold,
+  ItalicFont     = *-italic,
+  BoldItalicFont = *-bolditalic]
+\setsansfont{texgyreheros}[
+  Extension      = .otf,
+  UprightFont    = *-regular,
+  BoldFont       = *-bold,
+  ItalicFont     = *-italic,
+  BoldItalicFont = *-bolditalic]
+\setmonofont{cmun}[
+  Extension      = .otf,
+  UprightFont    = *btl,
+  BoldFont       = *tb,
+  ItalicFont     = *bto,
+  BoldItalicFont = *tx,
+  HyphenChar     = None]
+\setmathfont{texgyrepagella-math.otf}
+\captionsetup{%
+  strut=off, labelsep=quad, labelfont+=bf,
+  figureposition = bottom, tableposition = top}
+%% <--- http://tex.stackexchange.com/a/40896
+\patchcmd{\@addtocurcol}%
+    {\vskip \intextsep}%
+    {\edef\save@first@penalty{\the\lastpenalty}\unpenalty
+     \ifnum \lastpenalty = \@M  % hopefully the OR penalty
+        \unpenalty
+     \else
+        \penalty \save@first@penalty \relax % put it back
+     \fi
+      \ifnum\outputpenalty <-\@Mii
+                         \addvspace\intextsep
+                         \vskip\parskip
+      \else
+                         \addvspace\intextsep
+      \fi}%
+    {\typeout{*** SUCCESS ***}}{\typeout{*** FAIL ***}}
+\patchcmd{\@addtocurcol}%
+    {\vskip\intextsep \ifnum\outputpenalty <-\@Mii \vskip -\parskip\fi}%
+    {\ifnum\outputpenalty <-\@Mii
+       \aftergroup\vskip\aftergroup\intextsep
+       \aftergroup\nointerlineskip
+     \else
+       \vskip\intextsep
+     \fi}%
+    {\typeout{*** SUCCESS ***}}{\typeout{*** FAIL ***}}
+\patchcmd{\@getpen}{\@M}{\@Mi}
+  {\typeout{*** SUCCESS ***}}{\typeout{*** FAIL ***}}
+%% --->
+%% 不对代码实现的 \section 以下标题编目录。
+\AtBeginEnvironment{implementation}{%
+  \ifnum\value{tocdepth}>\@ne
+    \addtocontents{toc}{\protect\value{tocdepth}=1\relax}%
+  \fi}
+\ifxetex
+  \let\ctexdocverbaddon\xeCJKVerbAddon
+  \def\ctexdisableecglue{\xeCJKsetup{CJKecglue}}
+  \def\ctexplainps{\xeCJKsetup{PunctStyle=plain}}
+  \appto\meta@font@select{\ifinner\ctexdisableecglue\fi}
+\else
+  \let\ctexdocverbaddon\relax
+  \let\ctexplainps\relax
+  \def\ctexdisableecglue{\ltjsetparameter{autoxspacing=false}}
+  \appto\meta@font@select{\ctexdisableecglue}
+\fi
+\setlist{noitemsep,topsep=\smallskipamount}
+\setlist[1]{labelindent=\parindent}
+\setlist[enumerate]{leftmargin=*}
+\setlist[itemize]{leftmargin=*}
+\newlist{optdesc}{description}{3}
+%% 设置间距为 \marginparsep，与 l3doc 一致
+\setlist[optdesc]{%
+  font=\mdseries\small\ttfamily,align=right,listparindent=\parindent,
+  labelsep=\marginparsep,labelindent=-\marginparsep,leftmargin=0pt}
+%% 重新定义 threeparttable 包的 tablenotes 环境
+\renewlist{tablenotes}{description}{1}
+\setlist[tablenotes]{%
+  format=\normalfont\tnote@item,align=right,listparindent=\parindent,
+  labelindent=\tabcolsep,leftmargin=*,rightmargin=\tabcolsep,
+  after=\@noparlisttrue}
+\AtBeginEnvironment{tablenotes}{%
+  \setlength\parindent{2\ccwd}%
+  \normalfont\footnotesize}
+\AtBeginEnvironment{threeparttable}{%
+  \stepcounter{tpt@id}%
+  \edef\curr@tpt@id{tpt@\arabic{tpt@id}}}
+\newcounter{tpt@id}
+\def\tnote@item#1{%
+  \Hy@raisedlink{\hyper@anchor{\curr@tpt@id-#1}}#1}
+\def\TPTtagStyle#1{\hyperlink{\curr@tpt@id-#1}{#1}}
+\fvset{
+  fontsize=\small,baselinestretch=1,numbersep=5pt,
+  formatcom=\ctexdocverbaddon,
+  listparameters=\setlength\topsep{\MacrocodeTopsep}}
+\DefineVerbatimEnvironment{frameverb}{Verbatim}{%
+  gobble=4,
+  frame=single,framesep=8pt,
+  listparameters=
+    \setlength\topsep{\medskipamount}%
+    \appto\FV@EndList{\nointerlineskip}}
+\DefineVerbatimEnvironment{ctexexam}{Verbatim}{%
+  gobble=4,
+  frame=single,framesep=10pt,
+  label=\rule{0pt}{12pt}\textnormal{\bfseries 例 \arabic{ctexexam}},
+  listparameters=
+    \setlength\topsep{\bigskipamount}%
+    \refstepcounter{ctexexam}\ctexexamlabelref
+    \appto\FV@EndList{\nointerlineskip}}
+\define@key{FV}{labelref}{\def\ctexexamlabelref{\label{#1}}}
+\let\ctexexamlabelref\empty
+\newcounter{ctexexam}
+\BeforeBeginEnvironment{function}{\par\nointerlineskip}
+\AtEndEnvironment{function}{%
+  \par\xdef\ctexfixprevdepth{\prevdepth=\the\prevdepth\space}}
+\AfterEndEnvironment{function}{\ctexfixprevdepth}
+\AtBeginEnvironment{syntax}{\linespread{1}\ctexplainps\ctexdisableecglue}
+\BeforeBeginEnvironment{SideBySideExample}{\par\addvspace{\medskipamount}}
+\newrobustcmd\exptarget{%
+  \AddLineBeginMainAux{\csgdef{Codedoc@expstar}{}}%
+  \Hy@raisedlink{\hypertarget{expstar}{}}}
+\newrobustcmd\rexptarget{%
+  \AddLineBeginMainAux{\csgdef{Codedoc@rexpstar}{}}%
+  \Hy@raisedlink{\hypertarget{rexpstar}{}}}
+\newrobustcmd\expstar{\hyperlink{expstar}{$\star$}}
+\newrobustcmd\rexpstar{\hyperlink{rexpstar}{\ding{73}}}
+\ExplSyntaxOn
+%% l3doc 会设置列表环境中 \listparindent=\z@，我们在这里恢复它。
+\cs_set_eq:NN \list \__codedoc_oldlist:nn
+\cs_new_nopar:Npn \zihaopt #1
+  {
+    \exp_last_unbraced:Nf \tl_head:w
+      { \prop_item:Nn \c__ctex_font_size_prop {#1} } { } \q_stop
+  }
+%% 抑制首段的 \parskip
+\ctex_patch_cmd_once:NnnnTF \__codedoc_function_descr_start:w
+  { }
+  { \noindent }
+  { \skip_vertical:n { -\parskip } \noindent }
+  { \iow_term:n { *** ~ SUCCESS ~ *** } }
+  { \iow_term:n { *** ~ FAIL ~ *** } }
+%% l3doc 会在 function 环境的 syntax 和 descr 盒子中间加上 \medskipamount 的距离。
+%% 但是若 syntax 盒子为空（未使用 syntax 环境），就会显得不好看。
+%% 此时我们通过将 \medskipamount 设置为零来修正。若盒子非空，则将 \parskip 还回去。
+\ctex_preto_cmd:NnnTF \__codedoc_function_assemble:
+  { }
+  { \ctex_doc_fix_yoffset: }
+  { \iow_term:n { *** ~ SUCCESS ~ *** } }
+  { \iow_term:n { *** ~ FAIL ~ *** } }
+\cs_new_protected_nopar:Npn \ctex_doc_fix_yoffset:
+  {
+    \box_if_empty:NTF \g__codedoc_syntax_box
+      { \skip_zero:N \medskipamount }
+      { \skip_add:Nn \medskipamount { \parskip } }
+  }
+%% 左侧边注的函数列表采用单倍行距
+\ctex_preto_cmd:NnnTF \__codedoc_typeset_functions:
+  { }
+  { \MacroFont }
+  { \iow_term:n { *** ~ SUCCESS ~ *** } }
+  { \iow_term:n { *** ~ FAIL ~ *** } }
+\ctex_patch_cmd_once:NnnnTF \__codedoc_macro_init:
+  { }
+  { \hbox:n }
+  { \MacroFont \hbox:n }
+  { \iow_term:n { *** ~ SUCCESS ~ *** } }
+  { \iow_term:n { *** ~ FAIL ~ *** } }
+\ctex_patch_cmd_once:NnnnTF \__codedoc_macro_dump:
+  { }
+  { \hbox_unpack_drop:N }
+  { \MacroFont \hbox_unpack_drop:N }
+  { \iow_term:n { *** ~ SUCCESS ~ *** } }
+  { \iow_term:n { *** ~ FAIL ~ *** } }
+\cs_set_eq:NN \__codedoc_macro_end_style:n \use_none:n
+\cs_set_protected:Npn \__codedoc_macro_typeset_one:nN #1#2
+  {
+    \vbox_set:Nn \l__codedoc_macro_box
+      {
+        \MacroFont
+        \vbox_unpack_drop:N \l__codedoc_macro_box
+        \hbox_set:Nn \l_tmpa_box
+          { \__codedoc_print_macroname:nN {#1} #2 }
+        \dim_set:Nn \l_tmpa_dim { \marginparwidth - \labelsep }
+        \dim_compare:nNnT { \box_wd:N \l_tmpa_box } > \l_tmpa_dim
+          {
+            \box_resize_to_wd_and_ht:Nnn \l_tmpa_box
+              { \l_tmpa_dim }
+              { \box_ht:N \l_tmpa_box }
+          }
+        \hbox_overlap_left:n
+          {
+            \box_use:N \l_tmpa_box
+            \skip_horizontal:n { \marginparsep - \labelsep }
+          }
+      }
+    \int_incr:N \l__codedoc_macro_int
+  }
+\cs_set_protected:Npn \__codedoc_print_macroname:nN #1#2
+  {
+    \strut
+    \__codedoc_get_hyper_target:xN
+      {
+        \exp_not:n {#1}
+        \bool_if:NT #2 { \tl_to_str:n {TF} }
+      }
+      \l__codedoc_tmpa_tl
+    \cs_if_exist:cTF { r@ \l__codedoc_tmpa_tl }
+      { \exp_args:NNo \label@hyperref [ \l__codedoc_tmpa_tl ] }
+      { \use:n }
+      {
+        \tl_set:Nn \l__codedoc_tmpa_tl {#1}
+        \tl_replace_all:Non \l__codedoc_tmpa_tl
+          { \c_catcode_other_space_tl }
+          { \fontspec_visible_space: }
+        \__codedoc_macroname_prefix:o \l__codedoc_tmpa_tl
+        \__codedoc_macroname_suffix:N #2
+      }
+  }
+\AtBeginEnvironment { syntax }
+  {
+    \char_set_catcode_active:N \|
+    \char_set_active_eq:NN \| \orbar
+    \char_set_catcode_active:N \(
+    \char_set_active_eq:NN \( \defaultvalaux
+  }
+%% 不对目录中出现的 \cs 和 \tn 等编索引
+\DeclareDocumentCommand \StopSpecialIndexModule { }
+  { \cs_set_eq:NN \__codedoc_special_index_module:nnnnN \use_none:nnnnn }
+\tl_map_inline:nn { \actualchar \encapchar \levelchar }
+  { \exp_args:Nx \DoNotIndex { \bslash \tl_to_str:N #1 } }
+\DeclareDocumentCommand \package { o m }
+  {
+    \exp_args:Nx \href
+      {
+        http \c_colon_str //www.ctan.org/pkg/
+        \IfNoValueTF {#1} { \str_lowercase:n {#2} } {#1}
+      }
+      { \pkg {#2} }
+  }
+\DeclareDocumentCommand \GetFileId { m }
+  {
+    \GetFileInfo {#1}
+    \file_get:nnNTF { \c_sys_jobname_str .id }
+      { \int_set:Nn \tex_endlinechar:D { -1 } } \l__ctxdoc_tmp_tl
+      { \exp_after:wN \GetIdInfo \l__ctxdoc_tmp_tl }
+      { \GetIdInfo $Id$ }
+      { \fileinfo }
+  }
+\cs_new_eq:NN \__ctxdoc_ltx_changes:nnn \changes@
+\cs_set_protected:Npn \changes@ #1#2
+  {
+    \__ctxdoc_save_version_date:nn {#1} {#2}
+    \tl_if_empty:nTF {#1}
+      { \__ctxdoc_ltx_changes:nnn }
+      { \__ctxdoc_version_zfill:wnnn #1 \q_stop }
+      {#1} {#2}
+  }
+\cs_new_protected:Npn \__ctxdoc_version_zfill:wnnn #1#2 \q_stop
+  {
+    \str_if_eq:nnTF {#1} { v }
+      { \__ctxdoc_version_zfill:nnnn {#2} }
+      { \__ctxdoc_ltx_changes:nnn }
+  }
+\cs_new_protected:Npn \__ctxdoc_version_zfill:nnnn #1#2
+  {
+    \tl_clear:N \l__ctxdoc_tmp_tl
+    \int_zero:N \l_tmpa_int
+    \seq_set_split:Nnn \l_tmpa_seq { . } {#1}
+    \seq_map_function:NN \l_tmpa_seq \__ctxdoc_version_zfill:n
+    \int_compare:nNnF \l_tmpa_int > 2
+      {
+        \tl_put_right:Nx \l__ctxdoc_tmp_tl
+          { \prg_replicate:nn { 3 - \l_tmpa_int } { 00000 } }
+      }
+    \__ctxdoc_ltx_changes:nnn { \l__ctxdoc_tmp_tl \actualchar #2 }
+  }
+\tl_new:N \l__ctxdoc_tmp_tl
+\cs_new_protected:Npn \__ctxdoc_version_zfill:n #1
+  {
+    \int_incr:N \l_tmpa_int
+    \tl_put_right:Nx \l__ctxdoc_tmp_tl
+      {
+        \prg_replicate:nn
+          { \int_max:nn { 0 } { 5 - \tl_count:n {#1} } } { 0 }
+        \exp_not:n {#1}
+      }
+  }
+\cs_new_protected:Npn \__ctxdoc_save_version_date:nn #1#2
+  {
+    \prop_get:NnNTF \g__ctxdoc_version_date_prop {#1} \l__ctxdoc_tmp_tl
+      { \exp_after:wN \__ctxdoc_save_version_date:nnnn \l__ctxdoc_tmp_tl {#2} {#1} }
+      { \__ctxdoc_save_version_date:nnn {#1} {#2} {#2} }
+  }
+\cs_new_protected:Npn \__ctxdoc_save_version_date:nnnn #1#2#3#4
+  {
+    \__ctxdoc_if_date_later:nnTF {#1} {#3}
+      { \__ctxdoc_save_version_date:nnn {#4} {#3} {#2} }
+      {
+        \__ctxdoc_if_date_later:nnT {#3} {#2}
+          { \__ctxdoc_save_version_date:nnn {#4} {#1} {#3} }
+      }
+  }
+\prg_new_conditional:Npnn \__ctxdoc_if_date_later:nn #1#2 { TF , T }
+  {
+    \if_int_compare:w \__ctxdoc_parse_date:w #1 / / / 0 \q_stop >
+                      \__ctxdoc_parse_date:w #2 / / / 0 \q_stop \exp_stop_f:
+      \prg_return_true: \else: \prg_return_false: \fi:
+  }
+\cs_new:Npn \__ctxdoc_parse_date:w #1/#2/#3/ #4 \q_stop
+  { #1#2#3 }
+\cs_new_protected:Npn \__ctxdoc_save_version_date:nnn #1#2#3
+  { \prop_gput:Nnn \g__ctxdoc_version_date_prop {#1} { {#2} {#3} } }
+\cs_new_protected:Npn \CTEX@versionitem #1 \efill
+  {
+    \@idxitem
+    \prop_get:NnNTF \g__ctxdoc_version_date_prop {#1} \l__ctxdoc_tmp_tl
+      { \exp_after:wN \__ctxdoc_version_item:nnn \l__ctxdoc_tmp_tl {#1} }
+      { \BOOM }
+  }
+\cs_new_protected:Npn \__ctxdoc_version_item:nnn #1#2#3
+  {
+    \noindent
+    \Hy@raisedlink { \belowpdfbookmark {#3} { HD.#3 } }
+    \textbf {#3} \hfill
+    \hbox:n
+      {
+        \footnotesize
+        \str_if_eq:nnTF {#1} {#2}
+          { ( #1 ) }
+          { ( #1 ~ -- ~ #2 ) }
+      }
+    \par \nopagebreak
+  }
+\prop_new:N \g__ctxdoc_version_date_prop
+\ctex_patch_cmd:Nnn \HDorg@theglossary
+  { \let \item \@idxitem }
+  { \let \item \CTEX@versionitem }
+\ctex_patch_cmd:Nnn \l@section    { 2.5em } { 1.5em }
+\ctex_patch_cmd:Nnn \l@subsection { 2.5em } { 1.5em }
+\ctex_patch_cmd:Nnn \@wrglossary
+  { hdpindex }
+  {
+    \ifnum \c@HD@hypercount = \z@
+      hdpindex
+    \else
+      hdclindex { \the \c@HD@hypercount }
+    \fi
+  }
+%% 重定义 macrocode 环境的实现，逐行处理
+\cs_set_protected_nopar:Npn \xmacro@code
+  { \__ctxdoc_marco_code:w }
+\cs_set_protected_nopar:Npn \sxmacro@code
+  {
+    \fontspec_print_visible_spaces:
+    \xmacro@code
+  }
+\cs_new_protected_nopar:Npn \__ctxdoc_marco_code:w
+  {
+    \ifcodeline@index
+      \__ctxdoc_marco_every_par:n { \__ctxdoc_code_line_no: }
+    \else:
+      \__ctxdoc_marco_every_par:n { }
+    \fi:
+    \exp_args:Nx \__ctxdoc_make_finish_tag:n { \@currenvir }
+    \__ctxdoc_verbatim_start:w
+  }
+\cs_new_protected:Npn \__ctxdoc_marco_every_par:n #1
+  {
+    \everypar
+      {
+        \everypar {#1}
+        \if@inlabel
+          \global \@inlabelfalse
+          \@noparlistfalse
+          \llap { \box \@labels \hskip \leftskip }
+        \fi
+        #1
+      }
+  }
+\ctex_patch_cmd:Nnn \macro@code
+  { \if@inlabel \leavevmode \fi }
+  { \partopsep \z@skip }
+\group_begin:
+  \int_set:Nn \tex_endlinechar:D { -1 }
+  \use:n
+    {
+      \char_set_catcode_active:n { 32 }
+      \tl_const:Nn \c__ctxdoc_active_space_tl
+    }
+    { }
+\group_end:
+\group_begin:
+  \char_set_catcode_active:n { 13 }
+  \cs_new_protected:Npx \__ctxdoc_make_finish_tag:n #1
+    {
+      \tl_set:Nn \exp_not:N \l__ctxdoc_verbatim_finish_tl
+        {
+          \c_percent_str
+          \prg_replicate:nn { 4 }
+            { \exp_not:o { \c__ctxdoc_active_space_tl } }
+          \exp_not:o { \active@escape@char } end
+          \c_left_brace_str #1 \c_right_brace_str
+          \exp_not:N ^^M
+        }
+    }
+  \cs_new_protected:Npn \__ctxdoc_verbatim_start:w #1
+    {
+      \str_if_eq:nnTF {#1} { ^^M }
+        { \__ctxdoc_verbatim_read_line:w }
+        { \__ctxdoc_verbatim_read_line:w #1 }
+    }
+  \cs_new_protected:Npn \__ctxdoc_verbatim_read_line:w #1 ^^M
+    {
+      \tl_set:Nn \l__ctxdoc_verbatim_line_tl { #1 ^^M }
+      \tl_if_eq:NNTF \l__ctxdoc_verbatim_line_tl \l__ctxdoc_verbatim_finish_tl
+        { \exp_args:Nx \end { \@currenvir } }
+        {
+          \__ctxdoc_verbatim_process_line:
+          \__ctxdoc_verbatim_read_line:w
+        }
+    }
+  \cs_new_protected:Npn \__ctxdoc_swap_cr:
+    { \exp_after:wN \__ctxdoc_swap_cr:w \l__ctxdoc_verbatim_line_tl }
+  \cs_new_protected:Npn \__ctxdoc_swap_cr:w #1 ^^M
+    {
+      \group_insert_after:N ^^M
+      \tl_set:Nn \l__ctxdoc_verbatim_line_tl {#1}
+    }
+  \tl_const:Nn \c__ctxdoc_active_cr_tl { ^^M }
+\group_end:
+\tl_new:N \l__ctxdoc_verbatim_line_tl
+\tl_new:N \l__ctxdoc_verbatim_finish_tl
+\tl_new:N \g__ctxdoc_verbatim_verb_stop_tl
+\cs_new_protected_nopar:Npn \__ctxdoc_process_normal_line:
+  {
+    \str_if_eq:eeTF
+      { \str_head:N \l__ctxdoc_verbatim_line_tl } { \c_percent_str }
+      { \__ctxdoc_check_angle:x { \tl_tail:N \l__ctxdoc_verbatim_line_tl } }
+      { \__ctxdoc_output_line: }
+  }
+\cs_new_protected_nopar:Npn \__ctxdoc_process_verb_line:
+  {
+    \tl_if_eq:NNTF \l__ctxdoc_verbatim_line_tl \g__ctxdoc_verbatim_verb_stop_tl
+      {
+        \tl_gclear:N \g__ctxdoc_verbatim_verb_stop_tl
+        \cs_gset_eq:NN \__ctxdoc_verbatim_process_line: \__ctxdoc_process_normal_line:
+        \__ctxdoc_output_module:nn
+          { \color { verb@guard } }
+          {
+            \__ctxdoc_swap_cr:
+            \__ctxdoc_module_pop:n { \l__ctxdoc_verbatim_line_tl }
+          }
+      }
+      { \tl_use:N \l__ctxdoc_verbatim_line_tl }
+  }
+\cs_new_eq:NN \__ctxdoc_verbatim_process_line: \__ctxdoc_process_normal_line:
+\DeclareDocumentCommand \CheckModules { }
+  { \cs_set_eq:NN \__ctxdoc_verbatim_process_line: \__ctxdoc_process_normal_line: }
+\DeclareDocumentCommand \DontCheckModules { }
+  { \cs_set_eq:NN \__ctxdoc_verbatim_process_line: \__ctxdoc_output_line: }
+\cs_new_protected:Npn \__ctxdoc_check_angle:n #1
+  {
+     \str_if_eq:eeTF { \str_head:n {#1} } { < }
+      { \__ctxdoc_check_module:x { \tl_tail:n {#1} } }
+      { \__ctxdoc_output_percent_line: }
+  }
+\cs_generate_variant:Nn \__ctxdoc_check_angle:n { x }
+\cs_new_protected:Npn \__ctxdoc_check_module:n #1
+  {
+    \exp_args:Nx \str_case:nnF { \str_head:n {#1} }
+      {
+        { * } { \__ctxdoc_module_star:w }
+        { / } { \__ctxdoc_module_slash:w }
+        { @ } { \__ctxdoc_module_at:w }
+        { < } { \__ctxdoc_module_verb:w }
+      }
+      { \__ctxdoc_module_pm:w }
+    #1 \q_stop
+  }
+\cs_generate_variant:Nn \__ctxdoc_check_module:n { x }
+\group_begin:
+  \char_set_catcode_active:N \>
+  \cs_new_protected:Npn \__ctxdoc_module_star:w #1 > #2 \q_stop
+    {
+      \__ctxdoc_output_module:nn
+        { \__ctxdoc_star_color: }
+        { \__ctxdoc_module_push:n { \__ctxdoc_module_angle:n {#1} } }
+      \__ctxdoc_output_line:n {#2}
+      \__ctxdoc_star_format:
+    }
+  \cs_new_protected:Npn \__ctxdoc_module_slash:w #1 > #2 \q_stop
+    {
+      \__ctxdoc_output_module:nn
+        { \__ctxdoc_slash_color: }
+        { \__ctxdoc_module_pop:n { \__ctxdoc_module_angle:n {#1} } }
+      \__ctxdoc_output_line:n {#2}
+      \__ctxdoc_slash_format:
+    }
+  \cs_new_protected:Npn \__ctxdoc_module_at:w @ @ = #1 > #2 \q_stop
+    {
+      \__ctxdoc_output_module:nn
+        { \color { at@guard } }
+        { \__ctxdoc_module_angle:n { @ @ = #1 } }
+      \tl_gset:Nn \g__codedoc_module_name_tl {#1}
+      \__ctxdoc_output_line:n {#2}
+    }
+  \cs_new_protected:Npn \__ctxdoc_module_pm:w #1 > #2 \q_stop
+    {
+      \tex_noindent:D
+      \hbox_overlap_left:n
+        {
+          \__ctxdoc_output_module:nn
+            { \__ctxdoc_pm_color: }
+            { \__ctxdoc_module_angle:n {#1} }
+          \skip_horizontal:n { \leftskip + \smallskipamount }
+        }
+      \group_begin:
+        \__ctxdoc_pm_format:
+        \__ctxdoc_output_line:n {#2}
+      \group_end:
+    }
+  \cs_new_protected:Npn \__ctxdoc_module_verb:w #1 \q_stop
+    {
+      \cs_gset_eq:NN \__ctxdoc_verbatim_process_line: \__ctxdoc_process_verb_line:
+      \tl_gset:Nx \g__ctxdoc_verbatim_verb_stop_tl
+        { \c_percent_str \tl_tail:n {#1} }
+      \__ctxdoc_output_module:nn
+        { \color { verb@guard } }
+        {
+          \__ctxdoc_swap_cr:
+          \__ctxdoc_module_push:n { \l__ctxdoc_verbatim_line_tl }
+        }
+    }
+\group_end:
+\cs_new_protected_nopar:Npn \__ctxdoc_output_line:
+  {
+    \tex_noindent:D
+    \__ctxdoc_replace_at_at:N \l__ctxdoc_verbatim_line_tl
+    \tl_use:N \l__ctxdoc_verbatim_line_tl
+  }
+\cs_new_protected:Npn \__ctxdoc_replace_at_at:N #1
+  {
+    \tl_if_empty:NF \g__codedoc_module_name_tl
+      {
+        \exp_args:NNo \__ctxdoc_replace_at_at_aux:Nn
+          #1 \g__codedoc_module_name_tl
+      }
+  }
+\cs_new_protected:Npx \__ctxdoc_replace_at_at_aux:Nn #1#2
+  {
+    \tl_replace_all:Nnn #1 { \token_to_str:N @ } { @ }
+    \tl_replace_all:Nnn #1 { \token_to_str:N _ } { _ }
+    \tl_replace_all:Nnn #1 { @ @ @ @ } { \token_to_str:N a a }
+    \tl_replace_all:Nnn #1 { _ _ @ @ } { _ _ #2 }
+    \tl_replace_all:Nnn #1 {   _ @ @ } { _ _ #2 }
+    \tl_replace_all:Nnn #1 {     @ @ } { _ _ #2 }
+    \tl_replace_all:Nnn #1 { \token_to_str:N a a } { @ @ }
+  }
+\cs_new_protected:Npn \__ctxdoc_output_line:n #1
+  {
+    \tl_set:Nn \l__ctxdoc_verbatim_line_tl {#1}
+    \tl_if_eq:NNTF \l__ctxdoc_verbatim_line_tl \c__ctxdoc_active_cr_tl
+      { \tl_use:N \l__ctxdoc_verbatim_line_tl }
+      {
+        \str_if_eq:eeTF
+          { \str_head:N \l__ctxdoc_verbatim_line_tl }
+          { \c_percent_str }
+          { \__ctxdoc_output_percent_line: }
+          { \__ctxdoc_output_line: }
+      }
+  }
+\cs_new_protected:Npn \__ctxdoc_output_percent_line:
+  {
+    \tex_noindent:D
+    \group_begin:
+      \color { code@gray }
+      \__ctxdoc_swap_cr:
+      \str_if_eq:eeTF { \f@shape } { \updefault }
+        { \slshape }
+        { \upshape }
+      \__ctxdoc_output_line:
+    \group_end:
+  }
+\cs_new_protected_nopar:Npn \__ctxdoc_module_push:n
+  { \exp_args:No \__ctxdoc_module_push_aux:nn { \int_use:N \c@HD@hypercount } }
+\cs_new_protected:Npn \__ctxdoc_module_push_aux:nn #1
+  {
+    \seq_gpush:Nn \g__ctxdoc_module_dest_seq {#1}
+    \hypersetup { hidelinks }
+    \exp_args:Nx \hdclindex
+      { \zref@extractdefault { HD.#1 } { guard@end } { 1 } } { }
+  }
+\cs_new_protected_nopar:Npn \__ctxdoc_module_pop:n
+  {
+    \seq_gpop:NNTF \g__ctxdoc_module_dest_seq \l__ctxdoc_tmp_tl
+      { \exp_args:No \__ctxdoc_module_pop_aux:nn { \l__ctxdoc_tmp_tl } }
+      { \BOOM \use:n }
+  }
+\cs_new_protected:Npn \__ctxdoc_module_pop_aux:nn #1
+  {
+    \zref@labelbylist { HD.#1 } { ctxdoc }
+    \hypersetup { hidelinks }
+    \hdclindex {#1} { }
+  }
+\seq_new:N \g__ctxdoc_module_dest_seq
+\zref@newlist { ctxdoc }
+\zref@newprop { guard@end } [ 1 ]
+  { \int_eval:n { \c@HD@hypercount - 1 } }
+\zref@addprop { ctxdoc } { guard@end }
+\cs_new_protected_nopar:Npn \__ctxdoc_star_format:
+  {
+    \seq_gpush:No \g__ctxdoc_slash_format_seq { \macro@font }
+    \seq_gpop:NNF \g__ctxdoc_star_format_seq \l__ctxdoc_format_tl
+      { \__ctxdoc_pop_format: }
+    \__ctxdoc_select_format:
+  }
+\cs_new_protected_nopar:Npn \__ctxdoc_slash_format:
+  {
+    \seq_gpop:NNTF \g__ctxdoc_slash_format_seq \l__ctxdoc_format_tl
+      {
+        \seq_gpush:No \g__ctxdoc_star_format_seq { \macro@font }
+        \__ctxdoc_select_format:
+      }
+      { \BOOM }
+  }
+\cs_new_protected_nopar:Npn \__ctxdoc_pm_format:
+  {
+    \seq_get:NNF \g__ctxdoc_star_format_seq \l__ctxdoc_format_tl
+      {
+        \__ctxdoc_pop_format:
+        \seq_gpush:No \g__ctxdoc_star_format_seq { \l__ctxdoc_format_tl }
+      }
+    \cs_if_eq:NNF \macro@font \l__ctxdoc_format_tl
+      { \l__ctxdoc_format_tl }
+  }
+\cs_new_protected_nopar:Npn \__ctxdoc_pop_format:
+  {
+    \seq_gpop_left:NN \g__ctxdoc_format_seq \l__ctxdoc_format_tl
+    \seq_gput_right:No \g__ctxdoc_format_seq { \l__ctxdoc_format_tl }
+  }
+\cs_new_protected_nopar:Npn \__ctxdoc_select_format:
+  {
+    \cs_if_eq:NNF \macro@font \l__ctxdoc_format_tl
+      {
+        \cs_gset_eq:NN \macro@font \l__ctxdoc_format_tl
+        \macro@font
+      }
+  }
+\tl_new:N \l__ctxdoc_format_tl
+\seq_new:N \g__ctxdoc_format_seq
+\seq_new:N \g__ctxdoc_star_format_seq
+\seq_new:N \g__ctxdoc_slash_format_seq
+\seq_gput_right:Nn \g__ctxdoc_format_seq { \MacroFont }
+\seq_gput_right:Nn \g__ctxdoc_format_seq { \AltMacroFont }
+\cs_set_protected:Npn \MacroFont
+  {
+    \linespread { 1 }
+    \small
+    \fontseries { \mddefault }
+    \fontshape  { \updefault }
+    \ttfamily
+    \ctexdocverbaddon
+  }
+\cs_set_protected:Npn \AltMacroFont
+  {
+    \linespread { 1 }
+    \small
+    \fontseries { \mddefault }
+    \fontshape  { \sldefault }
+    \ttfamily
+    \ctexdocverbaddon
+  }
+\AtBeginDocument
+  {
+    \tl_gset:Nx \macro@font
+      { \seq_item:Nn \g__ctxdoc_format_seq { 1 } }
+  }
+\cs_new_protected:Npn \__ctxdoc_output_module:nn #1#2
+  {
+    \tex_noindent:D
+    \group_begin:
+      #1
+      \footnotesize \normalfont \sffamily #2
+    \group_end:
+  }
+\cs_new_protected_nopar:Npn \__ctxdoc_star_color:
+  {
+    \seq_gpop:NNTF \g__ctxdoc_star_color_seq \current@color
+      { \set@color }
+      { \__ctxdoc_select_color: }
+    \seq_gpush:No \g__ctxdoc_slash_color_seq { \current@color }
+  }
+\cs_new_protected_nopar:Npn \__ctxdoc_slash_color:
+  {
+    \seq_gpop:NNTF \g__ctxdoc_slash_color_seq \current@color
+      {
+        \set@color
+        \seq_gpush:No \g__ctxdoc_star_color_seq { \current@color }
+      }
+      { \BOOM }
+  }
+\cs_new_protected_nopar:Npn \__ctxdoc_pm_color:
+  {
+    \seq_get:NNTF \g__ctxdoc_star_color_seq \current@color
+      { \set@color }
+      {
+        \__ctxdoc_select_color:
+        \seq_gpush:No \g__ctxdoc_star_color_seq { \current@color }
+      }
+  }
+\seq_new:N \g__ctxdoc_star_color_seq
+\seq_new:N \g__ctxdoc_slash_color_seq
+\cs_new_protected_nopar:Npn \__ctxdoc_select_color:
+  { \color { guard@series!!+ } }
+\definecolorseries { guard@series }
+  { cmyk } { last } { blue } { purple }
+\resetcolorseries [ 3 ] { guard@series }
+\definecolor { verb@guard } { rgb }  { 0.5  , 0.5 , 0 }
+\definecolor { at@guard }   { rgb }  { 0.5  , 0   , 0.5 }
+\definecolor { code@gray }  { gray } { 0.5 }
+\cs_new_protected:Npn \__ctxdoc_module_angle:n #1
+  { \textlangle #1 \textrangle }
+\cs_new_protected_nopar:Npn \__ctxdoc_code_line_no:
+  {
+    \int_gincr:N \c@CodelineNo
+    \hbox_overlap_left:n
+      {
+        \hbox_to_wd:nn
+          { \MacroIndent }
+          {
+            \HD@target
+            \tex_hss:D
+            \__ctxdoc_code_line_no_style:
+            \theCodelineNo \enspace
+          }
+        \tex_kern:D \@totalleftmargin
+      }
+  }
+\tl_set:Nn \theCodelineNo
+  { \arabic { CodelineNo } }
+\cs_new_protected_nopar:Npn \__ctxdoc_code_line_no_style:
+  { \color { code@gray } \normalfont \sffamily \tiny }
+\cs_set_protected:Npn \HD@SetMacroIndent #1
+  {
+    \group_begin:
+      \settowidth \MacroIndent
+        {
+          \__ctxdoc_code_line_no_style:
+          \prg_replicate:nn { \tl_count:n {#1} } { 0 }
+          \enspace
+        }
+      \dim_gset_eq:NN \MacroIndent \MacroIndent
+    \group_end:
+  }
+\ExplSyntaxOff
+\AtBeginDocument{\addtocontents{toc}{\StopSpecialIndexModule}}
+\pdfstringdefDisableCommands{%
+  \let\path\meta
+  \let\opt\@firstofone}
+\preto\@thehead{\cslet{MakeUppercase\space}{\@iden}}
+\def\orbar{\textup{\textbar}}
+\def\defaultval#1{\textbf{\textup{#1}}}
+\def\defaultvalaux#1){\defaultval{#1}}
+\def\TF{true\orbar false}
+\def\TTF{\defaultval{true}\orbar false}
+\def\TFF{true\orbar\defaultval{false}}
+\protected\def\opt{\texttt}
+\def\TeX{\hologo{TeX}}
+\def\pdfTeX{\hologo{pdfTeX}}
+\def\XeTeX{\hologo{XeTeX}}
+\def\XeLaTeX{\hologo{XeLaTeX}}
+\def\LuaLaTeX{\hologo{LuaLaTeX}}
+\def\pdfLaTeX{\hologo{pdfLaTeX}}
+\def\LaTeX{\hologo{LaTeX}}
+\def\LaTeXe{\hologo{LaTeX2e}}
+\def\LaTeXiii{\hologo{LaTeX3}}
+\def\dvipdfmx{\hologo{DVIPDFMx}}
+\def\TeXLive{\hologo{TeXLive}}
+\def\MiKTeX{\hologo{MiKTeX}}
+\def\pTeX{\hologo{pTeX}}
+\def\ApTeX{\hologo{ApTeX}}
+\def\upTeX{\hologo{upTeX}}
+\def\ApLaTeX{\hologo{ApLaTeX}}
+\def\upLaTeX{\hologo{upLaTeX}}
+\def\HoLogo@pTeX#1{p\kern -.15em \hologo{TeX}}
+\def\HoLogo@pLaTeX#1{p\kern -.05em \hologo{LaTeX}}
+\def\HoLogo@ApTeX#1{A\kern -.05em \hologo{pTeX}}
+\def\HoLogo@upTeX#1{u\kern -.05em \hologo{pTeX}}
+\def\HoLogo@ApLaTeX#1{A\kern -.05em \hologo{pLaTeX}}
+\def\HoLogo@upLaTeX#1{u\kern -.05em \hologo{pLaTeX}}
+\def\HoLogoBkm@pTeX#1{p\hologo{TeX}}
+\def\HoLogoBkm@pLaTeX#1{p\hologo{LaTeX}}
+\def\HoLogoBkm@ApTeX#1{A\hologo{pTeX}}
+\def\HoLogoBkm@upTeX#1{u\hologo{pTeX}}
+\def\HoLogoBkm@ApLaTeX#1{A\hologo{pLaTeX}}
+\def\HoLogoBkm@upLaTeX#1{u\hologo{pLaTeX}}
+\def\HoLogo@TeXLive#1{\TeX\ Live}
+\def\HoLogo@DVIPDFMx#1{DVIPDFM\ensuremath{x}}
+\def\bashcmd{\texttt}
+\def\BSTACK{\begin{tabular}[t]{@{}l@{}}}
+\def\ESTACK{\end{tabular}}
+\newenvironment{defaultcapconfig}{%
+  \MakePercentComment
+  \input{ctex-name-utf8.cfg}%
+  \ExplSyntaxOff
+  \MakePercentIgnore}{}
+\def\ctexkit{\href{https://github.com/CTeX-org/ctex-kit/}{\texttt{ctex-kit}}}
+\def\ctexkitrev#1{%
+  \href{https://github.com/CTeX-org/ctex-kit/commit/#1}{\texttt{ctex-kit} rev. #1}}
+\appto\GlossaryParms{%
+  \raggedcolumns
+  \let\Hy@writebookmark\HDorg@writebookmark
+  \def\@idxitem{\par\hangindent 2em }%
+  \def\subitem{\@idxitem\hspace*{1em}}%
+  \def\subsubitem{\@idxitem\hspace*{2em}}}
+\def\glossaryname{版本历史}
+\GlossaryPrologue{\section{\glossaryname}}
+\IndexPrologue{%
+  \section{\indexname}
+  \textit{意大利体的数字表示描述对应索引项的页码；
+  带下划线的数字表示定义对应索引项的代码行号；
+  罗马字体的数字表示使用对应索引项的代码行号。}}
+\def\IndexLayout{%
+  \newgeometry{hmargin=15mm,vmargin={25mm,15mm},footskip=7mm}%
+  \setlength\IndexMin{.5\textheight}%
+  \ctexset{section/numbering=false}%
+  \StopSpecialIndexModule}
+\EnableCrossrefs
+\CodelineIndex
+\RecordChanges
+%%
+%%
+%% End of file ctxdoc.cls.
diff --git a/macros/latex/contrib/termsim/termsim-doc-en.pdf b/macros/latex/contrib/termsim/termsim-doc-en.pdf
new file mode 100644
index 0000000000..9e38bc69c2
--- /dev/null
+++ b/macros/latex/contrib/termsim/termsim-doc-en.pdf
diff --git a/macros/latex/contrib/termsim/termsim-doc-en.tex b/macros/latex/contrib/termsim/termsim-doc-en.tex
new file mode 100644
index 0000000000..7616e696f4
--- /dev/null
+++ b/macros/latex/contrib/termsim/termsim-doc-en.tex
@@ -0,0 +1,563 @@
+\documentclass{ctxdoc}
+\usepackage{minted}
+\usepackage{listings}
+\usepackage{xcolor}
+\usepackage{xcolor-material}
+\usepackage{termsim}
+
+\NewDocumentCommand{\init}{+v}{\hspace{\fill}Init~=~\textcolor{blue}{\bfseries#1}}
+\DeclareDocumentCommand\opt{m}{\texttt{#1}}
+\DeclareDocumentCommand\kvopt{mm}
+  {\texttt{#1\breakablethinspace=\breakablethinspace#2}}
+\def\breakablethinspace{\hskip 0.16667em\relax}
+
+ \title{\bfseries\pkg{termsim}: terminal simulation pachage}
+ \author{nangeng\\ \url{nangeng@nwafu.edu.cn}}
+ \date{2021/12/26\qquad v1.1.1\thanks{\url{https://github.com/registor/termsim}}\thanks{\url{https://gitee.com/nwafu_nan/termsim}}}
+
+\begin{document}
+
+ \maketitle
+
+ \begin{abstract}
+
+ The \pkg{termsim} is a \pkg{tcolorbox}-based package developed with \LaTeX3,
+ which provides a \env{terminal} environment and a \tn{termfile} macro for simulationg
+ terminal in Win10, Mac or Ubuntu with dark, light or white color theme.
+ The \env{terminal} environment creates terminal with it's body and
+ the \tn{termfile} macro is used to read in the specified file and output it in the simulated terminal.
+ The starred \env{terminal*} environment and \tn{termfile*} macro are also provided
+ to simulate a terminal with comments at the bottom of terminal.
+ All style and color theme can be setted by \tn{termset} macro
+ or environment's and macro's key-value options.
+
+ \end{abstract}
+
+ \tableofcontents
+
+ \section{Introduction}
+
+ \pkg{termsim} is an \LaTeX package for simulating Win10, Mac or Ubuntu
+ terminal with dark, light or white color theme.
+
+ \section{Interface}
+
+ \subsection{\env{terminal} and \env{terminal*} environment}
+
+ \begin{function}[added=2021-12-17,updated=2021-12-17]{terminal,terminal*}
+   \begin{syntax}
+     \tn{begin}\{terminal\} \oarg{options} \Arg{terminal title}
+     .....
+     \tn{end}\{terminal\}
+
+     \tn{begin}\{terminal*\} \oarg{options} \oarg{comments} \Arg{terminal title}
+     .....
+     \tn{end}\{terminal*\}
+   \end{syntax}
+
+   Typesetting terminal with environment body.
+   You can set the title for the terminal by using \Arg{terminal title}.
+
+   The appearance of the terminal is set by key-value in \oarg{options}.
+
+   The starred environment \texttt{terminal*} is used to add comments at the bottom of terminal,
+   note that this needs to be done with \oarg{comments} after \oarg{options}.
+
+   Of course the key-value \oarg{options} can alse be set 
+   via the comma-separated key-value list of the \tn{termset} macro.
+
+ \end{function}
+   \begin{Verbatim}[frame=none,numbers=left,gobble=5]
+     \centering
+     \termset{os=win10,theme=dark,shstretch=1.0}
+     \bgin{terminal}{terminal title}
+       Volume in drive C is SSD_files
+       Volume Serial Number is 0001-C78B
+
+       Directory of C:\Users\Administrator
+
+       2018/07/21  15:39    <DIR>          .
+       2018/07/21  15:39    <DIR>          ..
+       2018/07/13  08:35    <DIR>          3D Objects
+       2018/07/13  08:35    <DIR>          Contacts
+       2018/08/06  07:46    <DIR>          Desktop
+                       2 File(s)      6,029,312 bytes
+                  18 Dir(s) 14,035,107,840 bytes free
+     \end{terminal}
+   \end{Verbatim}
+
+\begin{center}
+\begin{minipage}{0.85\textwidth}
+\termset{os=win10,theme=dark,shstretch=1.0}
+\begin{terminal}{terminal title}
+    Volume in drive C is SSD_files
+    Volume Serial Number is 0001-C78B
+    Directory of C:\Users\Administrator
+  2018/07/21  15:39    <DIR>          .
+  2018/07/21  15:39    <DIR>          ..
+  2018/07/13  08:35    <DIR>          3D Objects
+  2018/07/13  08:35    <DIR>          Contacts
+  2018/08/06  07:46    <DIR>          Desktop
+                  2 File(s)      6,029,312 bytes
+             18 Dir(s) 14,035,107,840 bytes free
+\end{terminal}
+\end{minipage}
+\end{center}
+
+ \subsection{\tn{termfile} and \tn{termfile*} macro}
+
+ \begin{function}[added=2021-12-18,updated=2021-12-18]{\termfile,\termfile*}
+   \begin{syntax}
+     \tn{termfile}  \oarg{options} \Arg{terminal title} \Arg{contents file}
+     \tn{termfile*} \oarg{options} \oarg{comments} \Arg{terminal title} \Arg{contentes file}
+   \end{syntax}
+
+   Typesetting terminal from a file.
+   You can set the title for the terminal by using \Arg{terminal title}.
+
+   The appearance of the terminal is set by key-value in \oarg{options}.
+
+   The starred macro \texttt{termfile*} is used to add comments at the bottom of terminal,
+   note that this needs to be done with \oarg{comments} after \oarg{options}.
+
+   Of course the key-value \oarg{options} can alse be set
+   via the comma-separated key-value list of the \tn{termset} macro.
+ \end{function}
+
+ \newpage
+
+   \begin{Verbatim}[frame=none,numbers=left,gobble=5]
+     \centering
+     \termfile{terminal title}{test.bat}
+   \end{Verbatim}
+
+\begin{center}
+\begin{minipage}{0.85\textwidth}
+\termfile{terminal title}{test.bat}
+\end{minipage}
+\end{center}
+
+\subsection{\tn{termset} macro}
+
+ \begin{function}[added=2021-12-18,updated=2021-12-18]{\termset}
+   \begin{syntax}
+     \tn{termset} \marg{key-values}
+   \end{syntax}
+   The arguments to \tn{termset} are a set of options separated by commas
+   in the form \kvopt{\meta{key}}{\meta{value}}.
+   The \meta{value} of some options can be omitted.
+   For the same option, subsequent settings will override previous settings.
+
+   Most options was initialized with default values.
+
+   \tn{termset}  uses \LaTeX3 style key settings,
+   supporting different types and multiple levels of option settings.
+   In the \kvopt{\meta{key}}{\meta{value}} list, the spaces around "|=|"
+   do not affect anything; However, it should be noted that \textbf{no blank lines}
+   are allowed in the list.
+   The "|= true|" in the parameter \kvopt{\meta{option}}{true} for the Boolean type can be omitted.
+
+ \end{function}
+
+ \section{Options}
+
+ The \pkg{termsim} package provides a number of options to set the style of the terminal.
+ The following options can be set with \tn{termset} macro.
+ Also, these options can be set with the \env{terminal}(\env{terminal*}) environment's
+ or the \tn{termfile}(\tn{termfile*}) command's \oarg{options}.
+
+ \subsection{shell code engine}
+
+ \begin{function}[added=2021-12-18,updated=2021-12-18]{minted}
+   \begin{syntax}
+     minted = <\TTF> \init{true}
+   \end{syntax}
+   \opt{minted} is used to set shell code engine, if it is \textbf{true} then
+   the \pkg{minted} package is used, if it is \textbf{false} then
+   the \pkg{listings} package is used. The default value is \textbf{true}.
+ \end{function}
+
+ \subsection{os type}
+
+ \begin{function}[added=2021-12-18,updated=2021-12-18]{os}
+   \begin{syntax}
+     os =  <win10|mac|ubuntu> \init{win10}
+   \end{syntax}
+   \opt{os} is used to set Operating System type. The default value is \textbf{win10}.
+ \end{function}
+
+ \subsection{color theme}
+
+ \begin{function}[added=2021-12-18,updated=2021-12-18]{theme}
+   \begin{syntax}
+     theme =  <dark|light|white> \init{dark}
+   \end{syntax}
+   \opt{theme} is used to set terminal color theme. The default value is \textbf{dark}.
+ \end{function}
+
+ \subsection{shell code style}
+
+ \begin{function}[added=2021-12-18,updated=2021-12-18]{shstyle}
+   \begin{syntax}
+     shstyle = \Arg{style} \init{bw}
+   \end{syntax}
+   \opt{shstyle} is used to set shell code style, valid only for the \pkg{minted} engine.
+   The default value is \textbf{bw}.
+ \end{function}
+
+ \subsection{shell code fontsize}
+
+ \begin{function}[added=2021-12-18,updated=2021-12-18]{shsize}
+   \begin{syntax}
+     shsize = \Arg{fontsize} \init{\small}
+   \end{syntax}
+   \opt{shsize} is used to set shell code fontsize, valid only for \pkg{minted} engine.
+   The default value is\textbf{\tn{small}}.
+ \end{function}
+
+ \subsection{comment format}
+
+ \begin{function}[added=2021-12-18,updated=2021-12-18]{commentf}
+   \begin{syntax}
+     commentf = \Arg{format group} \init{\small\sffamily}
+   \end{syntax}
+   \opt{commentf} is used to set comment format at terminal bottom.
+   The default value is \textbf{\tn{small}\tn{sffamily}}.
+ \end{function}
+
+ \subsection{shell code baseline stretch}
+
+ \begin{function}[added=2021-12-18,updated=2021-12-18]{shstretch}
+   \begin{syntax}
+     shstretch = \Arg{float number} \init{1.0}
+   \end{syntax}
+   \opt{shstretch} is used to set shell code baseline stretch, valid only for \pkg{minted} engine.
+   The default value is\textbf{1.0}.
+ \end{function}
+
+ \newpage
+
+ \section{Examples}
+
+ The \pkg{termsim} package can be used in situations
+ where the operating system terminal window needs to be typeset
+ to avoid the use of screenshots.
+ Terminal windows can be with or without underline comments
+ and can be dark, light or white color themes.
+
+ \subsection{Win10 terminal}
+
+ \subsubsection{\env{terminal} or \env{terminal*} environment}
+
+   \begin{Verbatim}[frame=none,numbers=left,gobble=5]
+     \centering
+     \termset{os=win10,theme=dark,shstretch=1.0}
+     \begin{terminal}{terminal title}
+       Volume in drive C is SSD_files
+       Volume Serial Number is 0001-C78B
+       Directory of C:\Users\Administrator
+       2018/07/21  15:39    <DIR>          .
+       2018/07/21  15:39    <DIR>          ..
+       2018/07/13  08:35    <DIR>          3D Objects
+       2018/07/13  08:35    <DIR>          Contacts
+       2018/08/06  07:46    <DIR>          Desktop
+                       2 File(s)      6,029,312 bytes
+                  18 Dir(s) 14,035,107,840 bytes free
+     \end{terminal}
+   \end{Verbatim}
+
+\begin{center}
+\begin{minipage}{0.85\textwidth}
+\termset{os=win10,theme=dark,shstretch=1.0}
+\begin{terminal}{terminal title}
+  Volume in drive C is SSD_files
+  Volume Serial Number is 0001-C78B
+  Directory of C:\Users\Administrator
+2018/07/21  15:39    <DIR>          .
+2018/07/21  15:39    <DIR>          ..
+2018/07/13  08:35    <DIR>          3D Objects
+2018/07/13  08:35    <DIR>          Contacts
+2018/08/06  07:46    <DIR>          Desktop
+                2 File(s)      6,029,312 bytes
+           18 Dir(s) 14,035,107,840 bytes free
+\end{terminal}
+\end{minipage}
+\end{center}
+
+   \begin{Verbatim}[frame=none,numbers=left,gobble=5]
+     \centering
+     \begin{terminal*}[os=win10,theme=light][comment text]{terminal title}
+       Volume in drive C is SSD_files
+       Volume Serial Number is 0001-C78B
+       Directory of C:\Users\Administrator
+       2018/07/21  15:39    <DIR>          .
+       2018/07/21  15:39    <DIR>          ..
+       2018/07/13  08:35    <DIR>          3D Objects
+       2018/07/13  08:35    <DIR>          Contacts
+       2018/08/06  07:46    <DIR>          Desktop
+                       2 File(s)      6,029,312 bytes
+                  18 Dir(s) 14,035,107,840 bytes free
+     \end{terminal*}
+   \end{Verbatim}
+
+\begin{center}
+\begin{minipage}{0.85\textwidth}
+\begin{terminal*}[os=win10,theme=light][comment text]{terminal title}
+  Volume in drive C is SSD_files
+  Volume Serial Number is 0001-C78B
+  Directory of C:\Users\Administrator
+2018/07/21  15:39    <DIR>          .
+2018/07/21  15:39    <DIR>          ..
+2018/07/13  08:35    <DIR>          3D Objects
+2018/07/13  08:35    <DIR>          Contacts
+2018/08/06  07:46    <DIR>          Desktop
+                2 File(s)      6,029,312 bytes
+           18 Dir(s) 14,035,107,840 bytes free
+\end{terminal*}
+\end{minipage}
+\end{center}
+
+ \subsubsection{\tn{termfile} or \tn{termfile*} macro}
+
+   \begin{Verbatim}[frame=none,numbers=left]
+     \centering
+     \termset{os=win10,theme=dark}
+     \termfile{terminal title}{test.bat}
+   \end{Verbatim}
+
+\begin{center}
+\begin{minipage}{0.85\textwidth}
+\termset{os=win10,theme=dark}
+\termfile{terminal title}{test.bat}
+\end{minipage}
+\end{center}
+
+   \begin{Verbatim}[frame=none,numbers=left]
+     \centering
+     \termfile*[os=win10,theme=light][comment text]{terminal title}{test.bat}
+   \end{Verbatim}
+
+\begin{center}
+\begin{minipage}{0.85\textwidth}
+\termfile*[os=win10,theme=light][comment text]{terminal title}{test.bat}
+\end{minipage}
+\end{center}
+
+ \newpage
+ \subsection{Mac terminal}
+
+ \subsubsection{\env{terminal} or \env{terminal*} environment}
+
+   \begin{Verbatim}[frame=none,numbers=left,gobble=5]
+     \centering
+     \termset{os=mac,theme=dark}
+     \begin{terminal}{terminal title}
+       xxxxxx@xxxxxx-lap:~$ ls
+       Desktop     Downloads   p2         Public   Templates   Videos
+       Documents   Music       Pictures   snap    '#test#'     workspace
+       xxxxxx@xxxxxx-lap:~$
+     \end{terminal}
+   \end{Verbatim}
+
+\begin{center}
+\begin{minipage}{0.85\textwidth}
+\termset{os=mac,theme=dark}
+\begin{terminal}{terminal title}
+  xxxxxx@xxxxxx-lap:~$ ls
+  Desktop     Downloads   p2         Public   Templates   Videos
+  Documents   Music       Pictures   snap    '#test#'     workspace
+  xxxxxx@xxxxxx-lap:~$
+\end{terminal}
+\end{minipage}
+\end{center}
+
+   \begin{Verbatim}[frame=none,numbers=left,gobble=5]
+     \centering
+     \begin{terminal*}[os=mac,theme=light][comment text]{terminal title}
+       xxxxxx@xxxxxx-lap:~$ ls
+       Desktop     Downloads   p2         Public   Templates   Videos
+       Documents   Music       Pictures   snap    '#test#'     workspace
+       xxxxxx@xxxxxx-lap:~$
+     \end{terminal*}
+   \end{Verbatim}
+
+\begin{center}
+\begin{minipage}{0.85\textwidth}
+\begin{terminal*}[os=mac,theme=light][comment text]{terminal title}
+  xxxxxx@xxxxxx-lap:~$ ls
+  Desktop     Downloads   p2         Public   Templates   Videos
+  Documents   Music       Pictures   snap    '#test#'     workspace
+  xxxxxx@xxxxxx-lap:~$
+\end{terminal*}
+\end{minipage}
+\end{center}
+
+ \subsubsection{\tn{termfile} or \tn{termfile*} macro}
+
+   \begin{Verbatim}[frame=none,numbers=left]
+     \centering
+     \termset{os=mac,theme=dark}
+     \termfile{terminal title}{testls}
+   \end{Verbatim}
+
+\begin{center}
+\begin{minipage}{0.85\textwidth}
+\termset{os=mac,theme=dark}
+\termfile{terminal title}{testls}
+\end{minipage}
+\end{center}
+ \newpage
+   \begin{Verbatim}[frame=none,numbers=left]
+     \centering
+     \termfile*[os=mac,theme=light][comment text]{terminal title}{testls}
+   \end{Verbatim}
+
+\begin{center}
+\begin{minipage}{0.85\textwidth}
+\termfile*[os=mac,theme=light][comment text]{terminal title}{testls}
+\end{minipage}
+\end{center}
+
+ \subsection{Ubuntu terminal}
+
+ \subsubsection{\env{terminal} or \env{terminal*} environment}
+
+   \begin{Verbatim}[frame=none,numbers=left,gobble=5]
+     \centering
+     \termset{os=ubuntu,theme=dark}
+     \begin{terminal}{terminal title}
+       xxxxxx@xxxxxx-lap:~/Desktop $
+       git clone git@gitee.com:xxxxxx/xxxxxx
+       Cloning into 'xxxxxx'...
+       remote: Enumerating objects: 106, done.
+       remote: Counting objects: 100% (106/106), done.
+       remote: Compressing objects: 100% (105/105), done.
+       remote: Total 106 (delta 9), reused 0 (delta 0)
+       Receiving objects: 100% (106/106), 237.88 MiB | 730.00 KiB/s, done.
+       Resolving delta: 100% (9/9), done.
+       Unpacking: 100% (75/75), done.
+       xxxxxx@xxxxxx-lap:~/Desktop $
+     \end{terminal}
+   \end{Verbatim}
+
+\begin{center}
+\begin{minipage}{0.85\textwidth}
+\termset{os=ubuntu,theme=dark}
+\begin{terminal}{terminal title}
+  xxxxxx@xxxxxx-lap:~/Desktop $
+  git clone git@gitee.com:xxxxxx/xxxxxx
+  Cloning into 'xxxxxx'...
+  remote: Enumerating objects: 106, done.
+  remote: Counting objects: 100% (106/106), done.
+  remote: Compressing objects: 100% (105/105), done.
+  remote: Total 106 (delta 9), reused 0 (delta 0)
+  Receiving objects: 100% (106/106), 237.88 MiB | 730.00 KiB/s, done.
+  Resolving delta: 100% (9/9), done.
+  Unpacking: 100% (75/75), done.
+  xxxxxx@xxxxxx-lap:~/Desktop $
+\end{terminal}
+\end{minipage}
+\end{center}
+
+   \begin{Verbatim}[frame=none,numbers=left,gobble=5]
+     \centering
+     \begin{terminal*}[os=ubuntu,theme=light][comment text]{terminal title}
+       xxxxxx@xxxxxx-lap:~/Desktop $
+       git clone git@gitee.com:xxxxxx/xxxxxx
+       Cloning into 'xxxxxx'...
+       remote: Enumerating objects: 106, done.
+       remote: Counting objects: 100% (106/106), done.
+       remote: Compressing objects: 100% (105/105), done.
+       remote: Total 106 (delta 9), reused 0 (delta 0)
+       Receiving objects: 100% (106/106), 237.88 MiB | 730.00 KiB/s, done.
+       Resolving delta: 100% (9/9), done.
+       Unpacking: 100% (75/75), done.
+       xxxxxx@xxxxxx-lap:~/Desktop $
+     \end{terminal*}
+   \end{Verbatim}
+\newpage
+\begin{center}
+\begin{minipage}{0.85\textwidth}
+\begin{terminal*}[os=ubuntu,theme=light][comment text]{terminal title}
+  xxxxxx@xxxxxx-lap:~/Desktop $
+  git clone git@gitee.com:xxxxxx/xxxxxx
+  Cloning into 'xxxxxx'...
+  remote: Enumerating objects: 106, done.
+  remote: Counting objects: 100% (106/106), done.
+  remote: Compressing objects: 100% (105/105), done.
+  remote: Total 106 (delta 9), reused 0 (delta 0)
+  Receiving objects: 100% (106/106), 237.88 MiB | 730.00 KiB/s, done.
+  Resolving delta: 100% (9/9), done.
+  Unpacking: 100% (75/75), done.
+  xxxxxx@xxxxxx-lap:~/Desktop $
+\end{terminal*}
+\end{minipage}
+\end{center}
+
+ \subsubsection{\tn{termfile} or \tn{termfile*} macro}
+
+   \begin{Verbatim}[frame=none,numbers=left]
+     \centering
+     \termset{os=ubuntu,theme=dark}
+     \termfile{terminal title}{testsh}
+   \end{Verbatim}
+
+\begin{center}
+\begin{minipage}{0.85\textwidth}
+\termset{os=ubuntu,theme=dark}
+\termfile{terminal title}{testsh}
+\end{minipage}
+\end{center}
+
+   \begin{Verbatim}[frame=none,numbers=left]
+     \centering
+     \termfile*[os=ubuntu,theme=light][comment text]{terminal title}{testsh}
+   \end{Verbatim}
+
+\begin{center}
+\begin{minipage}{0.85\textwidth}
+\termfile*[os=ubuntu,theme=light][comment text]{terminal title}{testsh}
+\end{minipage}
+\end{center}
+
+ You can also use the white color theme and
+ use black text on a white background for print on paper.
+
+   \begin{Verbatim}[frame=none,numbers=left,gobble=5]
+     \centering
+     \termset{os=ubuntu,theme=white}
+     \begin{terminal}{terminal title}
+       xxxxxx@xxxxxx-lap:~/Desktop $
+       git clone git@gitee.com:xxxxxx/xxxxxx
+       Cloning into 'xxxxxx'...
+       remote: Enumerating objects: 106, done.
+       remote: Counting objects: 100% (106/106), done.
+       remote: Compressing objects: 100% (105/105), done.
+       remote: Total 106 (delta 9), reused 0 (delta 0)
+       Receiving objects: 100% (106/106), 237.88 MiB | 730.00 KiB/s, done.
+       Resolving delta: 100% (9/9), done.
+       Unpacking: 100% (75/75), done.
+       xxxxxx@xxxxxx-lap:~/Desktop $
+     \end{terminal}
+   \end{Verbatim}
+
+\begin{center}
+\begin{minipage}{0.85\textwidth}
+\termset{os=ubuntu,theme=white}
+\begin{terminal}{terminal title}
+  xxxxxx@xxxxxx-lap:~/Desktop $
+  git clone git@gitee.com:xxxxxx/xxxxxx
+  Cloning into 'xxxxxx'...
+  remote: Enumerating objects: 106, done.
+  remote: Counting objects: 100% (106/106), done.
+  remote: Compressing objects: 100% (105/105), done.
+  remote: Total 106 (delta 9), reused 0 (delta 0)
+  Receiving objects: 100% (106/106), 237.88 MiB | 730.00 KiB/s, done.
+  Resolving delta: 100% (9/9), done.
+  Unpacking: 100% (75/75), done.
+  xxxxxx@xxxxxx-lap:~/Desktop $
+\end{terminal}
+\end{minipage}
+\end{center}
+
+\end{document}
diff --git a/macros/latex/contrib/termsim/termsim-en.pdf b/macros/latex/contrib/termsim/termsim-en.pdf
deleted file mode 100644
index cd46ee19ee..0000000000
--- a/macros/latex/contrib/termsim/termsim-en.pdf
+++ /dev/null
diff --git a/macros/latex/contrib/termsim/termsim-zh-cn.pdf b/macros/latex/contrib/termsim/termsim-zh-cn.pdf
deleted file mode 100644
index 4d472c1d58..0000000000
--- a/macros/latex/contrib/termsim/termsim-zh-cn.pdf
+++ /dev/null
diff --git a/macros/latex/contrib/termsim/termsim.dtx b/macros/latex/contrib/termsim/termsim.dtx
index dfd8010029..27e2df89f2 100644
--- a/macros/latex/contrib/termsim/termsim.dtx
+++ b/macros/latex/contrib/termsim/termsim.dtx
@@ -157,7 +157,7 @@ Copyright and Licence
 %</internal>
 %<package>\NeedsTeXFormat{LaTeX2e}[2020/10/01]
 %<package>\RequirePackage{expl3}
-%<+package>\GetIdInfo$Id: termsim.dtx 1.1.0 2021-12-24 08:00:00 +0800 Nan Geng <nangeng@nwafu.edu.cn> $
+%<+package>\GetIdInfo$Id: termsim.dtx 1.1.1 2021-12-26 08:00:00 +0800 Nan Geng <nangeng@nwafu.edu.cn> $
 %<package>  {Terminal simulation with tcolorbox and minted/listings.}
 %<package>\ProvidesExplPackage{\ExplFileName}
 %<package>  {\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
@@ -186,7 +186,7 @@ Copyright and Licence
 %
 % \changes{v1.0.0}{2021/12/14}{开始编写模板}
 %
-% \CheckSum{376}
+% \CheckSum{318}
 % \GetFileId{termsim.sty}
 %
 % \CharacterTable
@@ -206,7 +206,7 @@ Copyright and Licence
 %   Right brace   \}     Tilde         \~}
 %
 %
-% \title{\bfseries\pkg{termsim}：终端窗口模拟宏包\\\bfseries\pkg{termsim}：terminal simulation pachage}
+% \title{\bfseries\pkg{termsim}：终端窗口模拟宏包\\\bfseries\pkg{termsim}：terminal simulation package}
 % \author{耿楠\\ \path{nangeng@nwafu.edu.cn}}
 % \date{\filedate\qquad\fileversion\thanks{\url{https://github.com/registor/termsim}}\thanks{\url{https://gitee.com/nwafu_nan/termsim}}}
 % \maketitle
@@ -817,43 +817,6 @@ Copyright and Licence
 \ExplSyntaxOn
 %    \end{macrocode}
 %
-% 解决minted的autogobble选项与Python3的兼容性问题
-% 和fancyvrb宏包命令变更的问题
-%
-% \url{https://github.com/gpoore/minted/issues/316}
-%
-%    \begin{macrocode}
-\ExplSyntaxOff
-\RequirePackage {regexpatch} % for starred \xpatchcmd which can replace all
-\makeatletter
-% trick, in order to get the integer value from either a macro or register
-% in an expandable way
-\def\minted@use@FancyVerbStartNum{\the\numexpr\FancyVerbStartNum}
-\def\minted@use@FancyVerbStopNum{\the\numexpr\FancyVerbStopNum}
-
-% patch for fivesum computation
-\xpatchcmd*\minted@pygmentize
-  {\ifx\FancyVerbStartNum\z@ 0\else\FancyVerbStartNum\fi}
-  {\minted@use@FancyVerbStartNum}
-  {}{\PatchFailed}
-\xpatchcmd*\minted@pygmentize
-  {\ifx\FancyVerbStopNum\z@ 0\else\FancyVerbStopNum\fi}
-  {\minted@use@FancyVerbStopNum}
-  {}{\PatchFailed}
-
-% patch for option "autogobble"
-\xpatchcmd\minted@autogobble
-  {\ifx\FancyVerbStartNum\z@ 0\else\FancyVerbStartNum\fi}
-  {\minted@use@FancyVerbStartNum}
-  {}{\PatchFailed}
-\xpatchcmd\minted@autogobble
-  {\ifx\FancyVerbStopNum\z@ 0\else\FancyVerbStopNum\fi}
-  {\minted@use@FancyVerbStopNum}
-  {}{\PatchFailed}
-\makeatother
-\ExplSyntaxOn
-%    \end{macrocode}
-%
 % 载入\pkg{tcolorbox}和\pkg{tikz}附加库
 %
 %    \begin{macrocode}
@@ -1117,8 +1080,7 @@ Copyright and Licence
 % \l_@@_code_style_tl,
 % \l_@@_code_fontsize_tl,
 % \l_@@_comment_format_tl,
-% \l_@@_baseline_stretch_tl,
-% \l_@@_linenumber_sep_tl
+% \l_@@_shell_baseline_stretch_fp
 %  }
 % 定义变量。
 %
@@ -1131,8 +1093,7 @@ Copyright and Licence
 \tl_new:N     \l_@@_shell_style_tl
 \tl_new:N     \l_@@_shell_fontsize_tl
 \tl_new:N     \l_@@_comment_format_tl
-\tl_new:N     \l_@@_shell_baseline_stretch_tl
-\tl_new:N     \l_@@_linenumber_sep_tl
+\fp_new:N     \l_@@_shell_baseline_stretch_fp
 %    \end{macrocode}
 % \end{variable}
 %
@@ -1204,7 +1165,7 @@ Copyright and Licence
 % \begin{macro}{shstrech}
 % 基线伸展系数
 %    \begin{macrocode}
-    shstretch .tl_set:N  = \l_@@_shell_baseline_strech_tl,
+    shstretch .fp_set:N  = \l_@@_shell_baseline_strech_fp,
     shstretch .initial:n = 1.0,
 %    \end{macrocode}
 % \end{macro}
@@ -1249,12 +1210,12 @@ Copyright and Licence
   {
     \tcbset{
       listing~engine=minted,%
-      minted~style=\tl_use:N \l_@@_shell_style_tl,%
+      minted~style=#1,%
       minted~options={%
         autogobble,
         breaklines,%
         fontsize=\tl_use:N \l_@@_shell_fontsize_tl,%
-        baselinestretch=#1,%
+        baselinestretch=\fp_eval:n { \l_@@_shell_baseline_stretch_fp },%
         breaksymbolleft={},%
         linenos=false,%
       },%
@@ -1385,7 +1346,7 @@ Copyright and Licence
         \IfNoValueF{#1}{ \keys_set:nn { termsim } { #1 } }
         \@@_comment_tcbset:n { #2 }
         \@@_terminal_theme_select:
-        \@@_minted_tcbset:V \l_@@_shell_baseline_stretch_tl
+        \@@_minted_tcbset:V \l_@@_shell_style_tl
         \tcbset{ title={#3} }%
         \tcblisting{}
       }{
@@ -1404,7 +1365,7 @@ Copyright and Licence
         \IfNoValueF{#1}{ \keys_set:nn { termsim } { #1 } }
         \@@_comment_tcbset:n { #2 }
         \@@_terminal_theme_select:
-        \@@_minted_tcbset:V \l_@@_shell_baseline_stretch_tl
+        \@@_minted_tcbset:V \l_@@_shell_style_tl
         \tcbset{ title={#3} }%
         \tcblisting{}
       }{
@@ -1429,7 +1390,7 @@ Copyright and Licence
         \IfNoValueF{#2}{ \keys_set:nn { termsim } { #2 } }
         \@@_comment_tcbset:n { #3 }
         \@@_terminal_theme_select:
-        \@@_minted_tcbset:V \l_@@_shell_baseline_stretch_tl
+        \@@_minted_tcbset:V \l_@@_shell_style_tl
         \tcbset{
           title={#4},
           listing~file={#5},
diff --git a/macros/latex/contrib/termsim/termsim.pdf b/macros/latex/contrib/termsim/termsim.pdf
new file mode 100644
index 0000000000..40acf25e7e
--- /dev/null
+++ b/macros/latex/contrib/termsim/termsim.pdf
diff --git a/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl b/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
index 6acf250c03..ccf33e55fe 100644
--- a/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
+++ b/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
@@ -82,7 +82,6 @@ $mirrors = {
       'https://ctan.crest.fr/tex-archive/' => 1,
       'https://ctan.gutenberg.eu.org/' => 1,
       'https://ctan.mines-albi.fr/' => 1,
-      'https://ctan.tetaneutral.net/' => 1,
       'https://distrib-coffee.ipsl.jussieu.fr/pub/mirrors/ctan/' => 1,
       'https://mirror.ibcp.fr/pub/CTAN/' => 1,
       'https://mirrors.chevalier.io/CTAN/' => 1,
@@ -173,7 +172,6 @@ $mirrors = {
       'https://ctan.math.ca/tex-archive/' => 1,
       'https://ctan.mirror.globo.tech/' => 1,
       'https://ctan.mirror.rafal.ca/' => 1,
-      'https://mirror.csclub.uwaterloo.ca/CTAN/' => 1,
       'https://mirror.its.dal.ca/ctan/' => 1,
       'https://muug.ca/mirror/ctan/' => 1,
     },
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb b/systems/texlive/tlnet/tlpkg/texlive.tlpdb
index 024bd8fc35..46a8714ec3 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/61401
+depend revision/61408
 
 name 00texlive.image
 category TLCore
@@ -4502,7 +4502,7 @@ depend setting_available_architectures:aarch64-linux amd64-freebsd amd64-netbsd
 
 name 00texlive.installer
 category TLCore
-revision 61375
+revision 61403
 shortdesc TeX Live standalone installer package
 longdesc This package defines the files to go into the installer
 longdesc archives (install-tl-unx.tar.gz, install-tl.zip) built by the
@@ -36473,7 +36473,7 @@ catalogue-version 2.6.2
 
 name biblatex-apa
 category Package
-revision 56208
+revision 61406
 shortdesc BibLaTeX citation and reference style for APA
 relocated 1
 longdesc This is a fairly complete BibLaTeX style (citations and
@@ -36485,10 +36485,10 @@ longdesc every citation and reference example in the APA 7th edition
 longdesc style guide. This version of the package requires use of
 longdesc csquotes [?]4.3, BibLaTeX [?]3.4, and the biber backend for
 longdesc BibLaTeX [?]2.5.
-containersize 24868
-containerchecksum 59ffdb263b02b4934955037f377164297871b10ab3794dd8a11b70cecaf9e773bdd2b3b2aef24d5085672614a51956ed8083866c6f56c72a8c8eb4c1ef6a775a
-doccontainersize 322056
-doccontainerchecksum eec8f6cfd0244639f91142b3ac45be28eae14e10881a549d97f0711235cc46b6c25983f0d7742ec1c8894dc8c3c189070138874a6215f630f5e3fb710516290f
+containersize 27172
+containerchecksum ca4a3692e206075f07f172c2aed183ca61e900dbf297cedf5c28bd4a73b65a7e7149db60a6f67c57cbbe5233dfb8df571c285a4d279c0614187c428ce39a37c6
+doccontainersize 320848
+doccontainerchecksum 63333edc1f627c14ddd6b0172776167868cd8480d79d47ab659a74318998e7e49c02bfd1b37a340b20ce97dd8f251e2ec70ac3998dfd5a9811c66dc112bc4a87
 docfiles size=114
  RELOC/doc/latex/biblatex-apa/README details="Readme"
  RELOC/doc/latex/biblatex-apa/biblatex-apa-test-citations.bib
@@ -36497,7 +36497,7 @@ docfiles size=114
  RELOC/doc/latex/biblatex-apa/biblatex-apa-test.tex
  RELOC/doc/latex/biblatex-apa/biblatex-apa.pdf details="Package documentation"
  RELOC/doc/latex/biblatex-apa/biblatex-apa.tex
-runfiles size=102
+runfiles size=108
  RELOC/tex/latex/biblatex-apa/american-apa.lbx
  RELOC/tex/latex/biblatex-apa/apa.bbx
  RELOC/tex/latex/biblatex-apa/apa.cbx
@@ -36505,9 +36505,11 @@ runfiles size=102
  RELOC/tex/latex/biblatex-apa/austrian-apa.lbx
  RELOC/tex/latex/biblatex-apa/brazilian-apa.lbx
  RELOC/tex/latex/biblatex-apa/british-apa.lbx
+ RELOC/tex/latex/biblatex-apa/catalan-apa.lbx
  RELOC/tex/latex/biblatex-apa/danish-apa.lbx
  RELOC/tex/latex/biblatex-apa/dutch-apa.lbx
  RELOC/tex/latex/biblatex-apa/english-apa.lbx
+ RELOC/tex/latex/biblatex-apa/finnish-apa.lbx
  RELOC/tex/latex/biblatex-apa/french-apa.lbx
  RELOC/tex/latex/biblatex-apa/galician-apa.lbx
  RELOC/tex/latex/biblatex-apa/german-apa.lbx
@@ -36532,7 +36534,7 @@ catalogue-contact-repository https://github.com/plk/biblatex-apa.git
 catalogue-ctan /macros/latex/contrib/biblatex-contrib/biblatex-apa
 catalogue-license lppl1.3c
 catalogue-topics apa biblatex psychology journalpub
-catalogue-version 9.14
+catalogue-version 9.15
 
 name biblatex-apa6
 category Package
@@ -200500,24 +200502,24 @@ catalogue-version 1.1
 
 name minted
 category Package
-revision 44855
+revision 61405
 shortdesc Highlighted source code for LaTeX
 relocated 1
 longdesc The package that facilitates expressive syntax highlighting in
 longdesc LaTeX using the powerful Pygments library. The package also
 longdesc provides options to customize the highlighted source code
 longdesc output using fancyvrb.
-containersize 9496
-containerchecksum 5923b5e87e8bb2cf148a480035b906aab4b03b903308e8e9609f98376f82e23fedd529abca37bb4e9211719160abd9d4488f5c73a0283f67c7f11ee3e1f1d5fb
-doccontainersize 803632
-doccontainerchecksum 0187a04f9e42c1bf3e5d961c28b977e527dfc1b57c0f823eda047d5e6c888f3f8da1fed691c8e3128d09b3740deb1b324baa607b9abc20a4fe47ea0a29915e90
-docfiles size=200
- RELOC/doc/latex/minted/Makefile
+containersize 9592
+containerchecksum 6fcac84b07600e370004d4de702946a61ce1317506a775a2d0adbdd4e0326dac73f385c22b5984abd0787aa4153a0fafb73a0ef8c22b18f8500c129f05d0ac99
+doccontainersize 824148
+doccontainerchecksum 96bb1fd4f584b92c0605cfa65c658fe3eeb38b4bd30cba3d4ad197647567e910f3c322208b0b9b1718599c06540541cf92c7dbc1d82da2b5ea02810601a725c4
+docfiles size=208
  RELOC/doc/latex/minted/README details="Readme"
  RELOC/doc/latex/minted/minted.pdf details="Package documentation"
-srccontainersize 44376
-srccontainerchecksum 1595aac2da1fc9c7b9e50c92fd12eda866fc35e884e335b1f4883188a4b0f9603a39cffa252cc1bb11ffd4a67e16a80b05c5ecf2cd7440c50f0605e5fc44e302
-srcfiles size=49
+srccontainersize 45492
+srccontainerchecksum be79d451c6612a8c8d6be613cf502a5d2f8150ed21a9fa99a80a2462b687e5d8dc35ba0b4d7494d28a667935e628dcb2129b7e970a8e2457dcd2c811dc206ee9
+srcfiles size=51
+ RELOC/source/latex/minted/Makefile
  RELOC/source/latex/minted/minted.dtx
  RELOC/source/latex/minted/minted.ins
 runfiles size=15
@@ -200527,8 +200529,8 @@ catalogue-also texments verbments
 catalogue-contact-repository https://github.com/gpoore/minted
 catalogue-ctan /macros/latex/contrib/minted
 catalogue-license lppl1.3
-catalogue-topics listing
-catalogue-version 2.5
+catalogue-topics listing synt-hlt
+catalogue-version 2.6
 
 name mintspirit
 category Package
@@ -214938,7 +214940,7 @@ catalogue-version 0.51
 
 name newpx
 category Package
-revision 61250
+revision 61404
 shortdesc Alternative uses of the PX fonts, with improved metrics
 relocated 1
 longdesc This package, initially based on pxfonts, provides many fixes
@@ -214949,10 +214951,10 @@ longdesc options. For proper operation, the packages require that the
 longdesc packages newtxmath, pxfonts, and TeXGyrePagella be installed
 longdesc and their map files enabled.
 execute addMap newpx.map
-containersize 3889932
-containerchecksum 10f0399a7f14a33caf2956d8bdeb41bda119228542700db4ed225ead83c1a5c4648ca610f5bab70c95576bfa665d79c90cb8824058241eb7e4eab43a844d8fce
-doccontainersize 255964
-doccontainerchecksum bf4cfc1722557b2828069b4a947acdd8850abd121b8f8e5945ba6a9add62b08be0bcae4e977136d1a95b2020ed5a1c73e997d05dee84a6db5996f8a7faac709a
+containersize 2859480
+containerchecksum 8e5391da65c0f37b3f33d54b03896aa3b8740edace54e1233d36109819c1a2ca6a5a32882524a44c5f46013da55bce9b5f1383277ee65d5382d0eb9f59bd04ac
+doccontainersize 256024
+doccontainerchecksum de3d0142a43eeb416c2694a81a3c3d75fbb27925447598bddd9a569f330c13e7718a7f77616c3d5cb979ac2aaf208784bc518656a4466647f10233f7043591f4
 docfiles size=83
  RELOC/doc/fonts/newpx/ChangesInV1.4.txt
  RELOC/doc/fonts/newpx/MANIFEST-newpx.txt
@@ -214961,19 +214963,11 @@ docfiles size=83
  RELOC/doc/fonts/newpx/newpxdoc.tex
  RELOC/doc/fonts/newpx/newpxeg-crop.pdf
  RELOC/doc/fonts/newpx/pxfontseg-crop.pdf
-runfiles size=3042
+runfiles size=2504
  RELOC/fonts/afm/public/newpx/NewPXBMI.afm
  RELOC/fonts/afm/public/newpx/NewPXBMI_gnu.afm
  RELOC/fonts/afm/public/newpx/NewPXMI.afm
  RELOC/fonts/afm/public/newpx/NewPXMI_gnu.afm
- RELOC/fonts/afm/public/newpx/TeXGyrePagella-Regular.afm
- RELOC/fonts/afm/public/newpx/TeXGyrePagellaX-Bold.afm
- RELOC/fonts/afm/public/newpx/TeXGyrePagellaX-BoldItalic.afm
- RELOC/fonts/afm/public/newpx/TeXGyrePagellaX-BoldSlanted.afm
- RELOC/fonts/afm/public/newpx/TeXGyrePagellaX-Italic.afm
- RELOC/fonts/afm/public/newpx/TeXGyrePagellaX-Regular.afm
- RELOC/fonts/afm/public/newpx/TeXGyrePagellaX-Slanted.afm
- RELOC/fonts/afm/public/newpx/TeXGyrePagellaX.afm
  RELOC/fonts/afm/public/newpx/npxsups-Bold.afm
  RELOC/fonts/afm/public/newpx/npxsups-BoldItalic.afm
  RELOC/fonts/afm/public/newpx/npxsups-Italic.afm
@@ -215177,6 +215171,7 @@ runfiles size=3042
  RELOC/fonts/tfm/public/newpx/zpl-Italic-tosf-t1.tfm
  RELOC/fonts/tfm/public/newpx/zpl-Regular-lf-ly1.tfm
  RELOC/fonts/tfm/public/newpx/zpl-Regular-lf-ot1.tfm
+ RELOC/fonts/tfm/public/newpx/zpl-Regular-lf-ot1r.tfm
  RELOC/fonts/tfm/public/newpx/zpl-Regular-lf-sc-ly1.tfm
  RELOC/fonts/tfm/public/newpx/zpl-Regular-lf-sc-ot1.tfm
  RELOC/fonts/tfm/public/newpx/zpl-Regular-lf-sc-t1.tfm
@@ -215186,6 +215181,7 @@ runfiles size=3042
  RELOC/fonts/tfm/public/newpx/zpl-Regular-lf-t1.tfm
  RELOC/fonts/tfm/public/newpx/zpl-Regular-osf-ly1.tfm
  RELOC/fonts/tfm/public/newpx/zpl-Regular-osf-ot1.tfm
+ RELOC/fonts/tfm/public/newpx/zpl-Regular-osf-ot1r.tfm
  RELOC/fonts/tfm/public/newpx/zpl-Regular-osf-sc-ly1.tfm
  RELOC/fonts/tfm/public/newpx/zpl-Regular-osf-sc-ot1.tfm
  RELOC/fonts/tfm/public/newpx/zpl-Regular-osf-sc-t1.tfm
@@ -215195,6 +215191,7 @@ runfiles size=3042
  RELOC/fonts/tfm/public/newpx/zpl-Regular-osf-t1.tfm
  RELOC/fonts/tfm/public/newpx/zpl-Regular-tlf-ly1.tfm
  RELOC/fonts/tfm/public/newpx/zpl-Regular-tlf-ot1.tfm
+ RELOC/fonts/tfm/public/newpx/zpl-Regular-tlf-ot1r.tfm
  RELOC/fonts/tfm/public/newpx/zpl-Regular-tlf-sc-ly1.tfm
  RELOC/fonts/tfm/public/newpx/zpl-Regular-tlf-sc-ot1.tfm
  RELOC/fonts/tfm/public/newpx/zpl-Regular-tlf-sc-t1.tfm
@@ -215204,6 +215201,7 @@ runfiles size=3042
  RELOC/fonts/tfm/public/newpx/zpl-Regular-tlf-t1.tfm
  RELOC/fonts/tfm/public/newpx/zpl-Regular-tosf-ly1.tfm
  RELOC/fonts/tfm/public/newpx/zpl-Regular-tosf-ot1.tfm
+ RELOC/fonts/tfm/public/newpx/zpl-Regular-tosf-ot1r.tfm
  RELOC/fonts/tfm/public/newpx/zpl-Regular-tosf-sc-ly1.tfm
  RELOC/fonts/tfm/public/newpx/zpl-Regular-tosf-sc-ot1.tfm
  RELOC/fonts/tfm/public/newpx/zpl-Regular-tosf-sc-t1.tfm
@@ -215362,14 +215360,106 @@ runfiles size=3042
  RELOC/fonts/tfm/public/newpx/zplth-Italic-tlf-ly1.tfm
  RELOC/fonts/tfm/public/newpx/zplth-Italic-tlf-ot1.tfm
  RELOC/fonts/tfm/public/newpx/zplth-Italic-tlf-t1.tfm
+ RELOC/fonts/tfm/public/newpx/ztm-Bold-lf-ly1.tfm
+ RELOC/fonts/tfm/public/newpx/ztm-Bold-lf-ot1.tfm
+ RELOC/fonts/tfm/public/newpx/ztm-Bold-lf-sc-ly1.tfm
+ RELOC/fonts/tfm/public/newpx/ztm-Bold-lf-sc-ot1.tfm
+ RELOC/fonts/tfm/public/newpx/ztm-Bold-lf-sc-t1.tfm
+ RELOC/fonts/tfm/public/newpx/ztm-Bold-lf-t1.tfm
+ RELOC/fonts/tfm/public/newpx/ztm-Bold-osf-ly1.tfm
+ RELOC/fonts/tfm/public/newpx/ztm-Bold-osf-ot1.tfm
+ RELOC/fonts/tfm/public/newpx/ztm-Bold-osf-sc-ly1.tfm
+ RELOC/fonts/tfm/public/newpx/ztm-Bold-osf-sc-ot1.tfm
+ RELOC/fonts/tfm/public/newpx/ztm-Bold-osf-sc-t1.tfm
+ RELOC/fonts/tfm/public/newpx/ztm-Bold-osf-t1.tfm
+ RELOC/fonts/tfm/public/newpx/ztm-Bold-tlf-ly1.tfm
+ RELOC/fonts/tfm/public/newpx/ztm-Bold-tlf-ot1.tfm
+ RELOC/fonts/tfm/public/newpx/ztm-Bold-tlf-sc-ly1.tfm
+ RELOC/fonts/tfm/public/newpx/ztm-Bold-tlf-sc-ot1.tfm
+ RELOC/fonts/tfm/public/newpx/ztm-Bold-tlf-sc-t1.tfm
+ RELOC/fonts/tfm/public/newpx/ztm-Bold-tlf-t1.tfm
+ RELOC/fonts/tfm/public/newpx/ztm-Bold-tosf-ly1.tfm
+ RELOC/fonts/tfm/public/newpx/ztm-Bold-tosf-ot1.tfm
+ RELOC/fonts/tfm/public/newpx/ztm-Bold-tosf-sc-ly1.tfm
+ RELOC/fonts/tfm/public/newpx/ztm-Bold-tosf-sc-ot1.tfm
+ RELOC/fonts/tfm/public/newpx/ztm-Bold-tosf-sc-t1.tfm
+ RELOC/fonts/tfm/public/newpx/ztm-Bold-tosf-t1.tfm
+ RELOC/fonts/tfm/public/newpx/ztm-BoldItalic-lf-ly1.tfm
+ RELOC/fonts/tfm/public/newpx/ztm-BoldItalic-lf-ot1.tfm
+ RELOC/fonts/tfm/public/newpx/ztm-BoldItalic-lf-sc-ly1.tfm
+ RELOC/fonts/tfm/public/newpx/ztm-BoldItalic-lf-sc-ot1.tfm
+ RELOC/fonts/tfm/public/newpx/ztm-BoldItalic-lf-sc-t1.tfm
+ RELOC/fonts/tfm/public/newpx/ztm-BoldItalic-lf-t1.tfm
+ RELOC/fonts/tfm/public/newpx/ztm-BoldItalic-osf-ly1.tfm
+ RELOC/fonts/tfm/public/newpx/ztm-BoldItalic-osf-ot1.tfm
+ RELOC/fonts/tfm/public/newpx/ztm-BoldItalic-osf-sc-ly1.tfm
+ RELOC/fonts/tfm/public/newpx/ztm-BoldItalic-osf-sc-ot1.tfm
+ RELOC/fonts/tfm/public/newpx/ztm-BoldItalic-osf-sc-t1.tfm
+ RELOC/fonts/tfm/public/newpx/ztm-BoldItalic-osf-t1.tfm
+ RELOC/fonts/tfm/public/newpx/ztm-BoldItalic-tlf-ly1.tfm
+ RELOC/fonts/tfm/public/newpx/ztm-BoldItalic-tlf-ot1.tfm
+ RELOC/fonts/tfm/public/newpx/ztm-BoldItalic-tlf-sc-ly1.tfm
+ RELOC/fonts/tfm/public/newpx/ztm-BoldItalic-tlf-sc-ot1.tfm
+ RELOC/fonts/tfm/public/newpx/ztm-BoldItalic-tlf-sc-t1.tfm
+ RELOC/fonts/tfm/public/newpx/ztm-BoldItalic-tlf-t1.tfm
+ RELOC/fonts/tfm/public/newpx/ztm-BoldItalic-tosf-ly1.tfm
+ RELOC/fonts/tfm/public/newpx/ztm-BoldItalic-tosf-ot1.tfm
+ RELOC/fonts/tfm/public/newpx/ztm-BoldItalic-tosf-sc-ly1.tfm
+ RELOC/fonts/tfm/public/newpx/ztm-BoldItalic-tosf-sc-ot1.tfm
+ RELOC/fonts/tfm/public/newpx/ztm-BoldItalic-tosf-sc-t1.tfm
+ RELOC/fonts/tfm/public/newpx/ztm-BoldItalic-tosf-t1.tfm
+ RELOC/fonts/tfm/public/newpx/ztm-Italic-lf-ly1.tfm
+ RELOC/fonts/tfm/public/newpx/ztm-Italic-lf-ot1.tfm
+ RELOC/fonts/tfm/public/newpx/ztm-Italic-lf-sc-ly1.tfm
+ RELOC/fonts/tfm/public/newpx/ztm-Italic-lf-sc-ot1.tfm
+ RELOC/fonts/tfm/public/newpx/ztm-Italic-lf-sc-t1.tfm
+ RELOC/fonts/tfm/public/newpx/ztm-Italic-lf-t1.tfm
+ RELOC/fonts/tfm/public/newpx/ztm-Italic-osf-ly1.tfm
+ RELOC/fonts/tfm/public/newpx/ztm-Italic-osf-ot1.tfm
+ RELOC/fonts/tfm/public/newpx/ztm-Italic-osf-sc-ly1.tfm
+ RELOC/fonts/tfm/public/newpx/ztm-Italic-osf-sc-ot1.tfm
+ RELOC/fonts/tfm/public/newpx/ztm-Italic-osf-sc-t1.tfm
+ RELOC/fonts/tfm/public/newpx/ztm-Italic-osf-t1.tfm
+ RELOC/fonts/tfm/public/newpx/ztm-Italic-tlf-ly1.tfm
+ RELOC/fonts/tfm/public/newpx/ztm-Italic-tlf-ot1.tfm
+ RELOC/fonts/tfm/public/newpx/ztm-Italic-tlf-sc-ly1.tfm
+ RELOC/fonts/tfm/public/newpx/ztm-Italic-tlf-sc-ot1.tfm
+ RELOC/fonts/tfm/public/newpx/ztm-Italic-tlf-sc-t1.tfm
+ RELOC/fonts/tfm/public/newpx/ztm-Italic-tlf-t1.tfm
+ RELOC/fonts/tfm/public/newpx/ztm-Italic-tosf-ly1.tfm
+ RELOC/fonts/tfm/public/newpx/ztm-Italic-tosf-ot1.tfm
+ RELOC/fonts/tfm/public/newpx/ztm-Italic-tosf-sc-ly1.tfm
+ RELOC/fonts/tfm/public/newpx/ztm-Italic-tosf-sc-ot1.tfm
+ RELOC/fonts/tfm/public/newpx/ztm-Italic-tosf-sc-t1.tfm
+ RELOC/fonts/tfm/public/newpx/ztm-Italic-tosf-t1.tfm
+ RELOC/fonts/tfm/public/newpx/ztm-Regular-lf-ly1.tfm
+ RELOC/fonts/tfm/public/newpx/ztm-Regular-lf-ot1r.tfm
+ RELOC/fonts/tfm/public/newpx/ztm-Regular-lf-sc-ly1.tfm
+ RELOC/fonts/tfm/public/newpx/ztm-Regular-lf-sc-ot1.tfm
+ RELOC/fonts/tfm/public/newpx/ztm-Regular-lf-sc-t1.tfm
+ RELOC/fonts/tfm/public/newpx/ztm-Regular-lf-t1.tfm
+ RELOC/fonts/tfm/public/newpx/ztm-Regular-osf-ly1.tfm
+ RELOC/fonts/tfm/public/newpx/ztm-Regular-osf-ot1r.tfm
+ RELOC/fonts/tfm/public/newpx/ztm-Regular-osf-sc-ly1.tfm
+ RELOC/fonts/tfm/public/newpx/ztm-Regular-osf-sc-ot1.tfm
+ RELOC/fonts/tfm/public/newpx/ztm-Regular-osf-sc-t1.tfm
+ RELOC/fonts/tfm/public/newpx/ztm-Regular-osf-t1.tfm
+ RELOC/fonts/tfm/public/newpx/ztm-Regular-tlf-ly1.tfm
+ RELOC/fonts/tfm/public/newpx/ztm-Regular-tlf-ot1r.tfm
+ RELOC/fonts/tfm/public/newpx/ztm-Regular-tlf-sc-ly1.tfm
+ RELOC/fonts/tfm/public/newpx/ztm-Regular-tlf-sc-ot1.tfm
+ RELOC/fonts/tfm/public/newpx/ztm-Regular-tlf-sc-t1.tfm
+ RELOC/fonts/tfm/public/newpx/ztm-Regular-tlf-t1.tfm
+ RELOC/fonts/tfm/public/newpx/ztm-Regular-tosf-ly1.tfm
+ RELOC/fonts/tfm/public/newpx/ztm-Regular-tosf-ot1r.tfm
+ RELOC/fonts/tfm/public/newpx/ztm-Regular-tosf-sc-ly1.tfm
+ RELOC/fonts/tfm/public/newpx/ztm-Regular-tosf-sc-ot1.tfm
+ RELOC/fonts/tfm/public/newpx/ztm-Regular-tosf-sc-t1.tfm
+ RELOC/fonts/tfm/public/newpx/ztm-Regular-tosf-t1.tfm
  RELOC/fonts/type1/public/newpx/NewPXBMI.pfb
  RELOC/fonts/type1/public/newpx/NewPXBMI_gnu.pfb
  RELOC/fonts/type1/public/newpx/NewPXMI.pfb
  RELOC/fonts/type1/public/newpx/NewPXMI_gnu.pfb
- RELOC/fonts/type1/public/newpx/TeXGyrePagellaX-Bold.pfb
- RELOC/fonts/type1/public/newpx/TeXGyrePagellaX-BoldSlanted.pfb
- RELOC/fonts/type1/public/newpx/TeXGyrePagellaX-Regular.pfb
- RELOC/fonts/type1/public/newpx/TeXGyrePagellaX-Slanted.pfb
  RELOC/fonts/type1/public/newpx/npxsups-Bold.pfb
  RELOC/fonts/type1/public/newpx/npxsups-BoldItalic.pfb
  RELOC/fonts/type1/public/newpx/npxsups-Italic.pfb
@@ -215464,7 +215554,7 @@ runfiles size=3042
 catalogue-ctan /fonts/newpx
 catalogue-license lppl ofl
 catalogue-topics font font-body font-maths font-serif font-proportional font-type1 font-otf font-supp font-t1enc
-catalogue-version 1.502
+catalogue-version 1.503
 
 name newsletr
 category Package
@@ -215525,7 +215615,7 @@ catalogue-version 1.0
 
 name newtx
 category Package
-revision 60850
+revision 61408
 shortdesc Alternative uses of the TX fonts, with improved metrics
 relocated 1
 longdesc The bundle splits txfonts.sty (from the TX fonts distribution)
@@ -215540,11 +215630,11 @@ longdesc garamondx package, thus offering a garamond-alike
 longdesc text-with-maths combination.
 depend kastrup
 execute addMap newtx.map
-containersize 5635196
-containerchecksum a1e741767de40a1c512054be8bae23e2d0cd4c0c53de8698c3bd5168b45cd851508e7e0c8b81f421d754d1c95da2b4dd040d8c06973a441b4d44267118e375df
-doccontainersize 983000
-doccontainerchecksum 790e8dc05f677854646b15453a5de1250daff937861a98537b4bcd7db3e137d2e9424c8e0adbdd48e5d2ab9706d5105030adf9dca04808654f9d4e09336e499a
-docfiles size=434
+containersize 6537272
+containerchecksum b4a0df083e9d490bae747833ad505d1f5374dadcbbba63ca9a088104762f0096996b6b5b58cb30f74adfe2ec7ebb40d6fe7ea184389df3faca3fe55a8dd36f2e
+doccontainersize 633692
+doccontainerchecksum e6616264b98e0ef79f1df3beb0697387262831a4f3fd23dfeede9b8f66cda0c425b61ea50fc788609ce08e0301a43588cfc43047b980ba5d2598e60a9ca67fc3
+docfiles size=226
  RELOC/doc/fonts/newtx/MANIFEST-newtx.txt
  RELOC/doc/fonts/newtx/README details="Readme"
  RELOC/doc/fonts/newtx/implementation.pdf details="Implementation notes"
@@ -215559,7 +215649,7 @@ docfiles size=434
  RELOC/doc/fonts/newtx/sample-ntx-crop.pdf
  RELOC/doc/fonts/newtx/sample-ptmx-crop.pdf
  RELOC/doc/fonts/newtx/sample-tx-crop.pdf
-runfiles size=3318
+runfiles size=4231
  RELOC/fonts/afm/public/newtx/LibertineI-5nu.afm
  RELOC/fonts/afm/public/newtx/LibertineMathBMI.afm
  RELOC/fonts/afm/public/newtx/LibertineMathBMI5.afm
@@ -215601,10 +215691,12 @@ runfiles size=3318
  RELOC/fonts/afm/public/newtx/txsys.afm
  RELOC/fonts/afm/public/newtx/ztmb.afm
  RELOC/fonts/afm/public/newtx/ztmbi.afm
+ RELOC/fonts/afm/public/newtx/ztmbsl.afm
  RELOC/fonts/afm/public/newtx/ztmfigs-bsl.afm
  RELOC/fonts/afm/public/newtx/ztmfigs-sl.afm
  RELOC/fonts/afm/public/newtx/ztmr.afm
  RELOC/fonts/afm/public/newtx/ztmri.afm
+ RELOC/fonts/afm/public/newtx/ztmrsl.afm
  RELOC/fonts/enc/dvips/newtx/alt-mn-greek.enc
  RELOC/fonts/enc/dvips/newtx/libcaps.enc
  RELOC/fonts/enc/dvips/newtx/libertinealt.enc
@@ -215655,6 +215747,9 @@ runfiles size=3318
  RELOC/fonts/enc/dvips/newtx/ntxdenoms_LY1.enc
  RELOC/fonts/enc/dvips/newtx/ntxdenoms_OT1.enc
  RELOC/fonts/enc/dvips/newtx/ntxdenoms_T1.enc
+ RELOC/fonts/enc/dvips/newtx/ntxinf_ly1.enc
+ RELOC/fonts/enc/dvips/newtx/ntxinf_ot1.enc
+ RELOC/fonts/enc/dvips/newtx/ntxinf_t1.enc
  RELOC/fonts/enc/dvips/newtx/ntxmiaalt.enc
  RELOC/fonts/enc/dvips/newtx/ntxsups_ly1.enc
  RELOC/fonts/enc/dvips/newtx/ntxsups_ot1.enc
@@ -215662,8 +215757,10 @@ runfiles size=3318
  RELOC/fonts/map/dvips/newtx/newtx.map
  RELOC/fonts/opentype/public/newtx/TeXGyreTermesX-Bold.otf
  RELOC/fonts/opentype/public/newtx/TeXGyreTermesX-BoldItalic.otf
+ RELOC/fonts/opentype/public/newtx/TeXGyreTermesX-BoldSlanted.otf
  RELOC/fonts/opentype/public/newtx/TeXGyreTermesX-Italic.otf
  RELOC/fonts/opentype/public/newtx/TeXGyreTermesX-Regular.otf
+ RELOC/fonts/opentype/public/newtx/TeXGyreTermesX-Slanted.otf
  RELOC/fonts/opentype/public/newtx/ntxsups-Bold.otf
  RELOC/fonts/opentype/public/newtx/ntxsups-BoldItalic.otf
  RELOC/fonts/opentype/public/newtx/ntxsups-Italic.otf
@@ -215803,6 +215900,30 @@ runfiles size=3318
  RELOC/fonts/tfm/public/newtx/ntx-BoldItalic-tosf-scl-ot1.tfm
  RELOC/fonts/tfm/public/newtx/ntx-BoldItalic-tosf-scl-t1.tfm
  RELOC/fonts/tfm/public/newtx/ntx-BoldItalic-tosf-t1.tfm
+ RELOC/fonts/tfm/public/newtx/ntx-BoldSlanted-lf-ly1.tfm
+ RELOC/fonts/tfm/public/newtx/ntx-BoldSlanted-lf-ot1.tfm
+ RELOC/fonts/tfm/public/newtx/ntx-BoldSlanted-lf-sc-ly1.tfm
+ RELOC/fonts/tfm/public/newtx/ntx-BoldSlanted-lf-sc-ot1.tfm
+ RELOC/fonts/tfm/public/newtx/ntx-BoldSlanted-lf-sc-t1.tfm
+ RELOC/fonts/tfm/public/newtx/ntx-BoldSlanted-lf-t1.tfm
+ RELOC/fonts/tfm/public/newtx/ntx-BoldSlanted-osf-ly1.tfm
+ RELOC/fonts/tfm/public/newtx/ntx-BoldSlanted-osf-ot1.tfm
+ RELOC/fonts/tfm/public/newtx/ntx-BoldSlanted-osf-sc-ly1.tfm
+ RELOC/fonts/tfm/public/newtx/ntx-BoldSlanted-osf-sc-ot1.tfm
+ RELOC/fonts/tfm/public/newtx/ntx-BoldSlanted-osf-sc-t1.tfm
+ RELOC/fonts/tfm/public/newtx/ntx-BoldSlanted-osf-t1.tfm
+ RELOC/fonts/tfm/public/newtx/ntx-BoldSlanted-tlf-ly1.tfm
+ RELOC/fonts/tfm/public/newtx/ntx-BoldSlanted-tlf-ot1.tfm
+ RELOC/fonts/tfm/public/newtx/ntx-BoldSlanted-tlf-sc-ly1.tfm
+ RELOC/fonts/tfm/public/newtx/ntx-BoldSlanted-tlf-sc-ot1.tfm
+ RELOC/fonts/tfm/public/newtx/ntx-BoldSlanted-tlf-sc-t1.tfm
+ RELOC/fonts/tfm/public/newtx/ntx-BoldSlanted-tlf-t1.tfm
+ RELOC/fonts/tfm/public/newtx/ntx-BoldSlanted-tosf-ly1.tfm
+ RELOC/fonts/tfm/public/newtx/ntx-BoldSlanted-tosf-ot1.tfm
+ RELOC/fonts/tfm/public/newtx/ntx-BoldSlanted-tosf-sc-ly1.tfm
+ RELOC/fonts/tfm/public/newtx/ntx-BoldSlanted-tosf-sc-ot1.tfm
+ RELOC/fonts/tfm/public/newtx/ntx-BoldSlanted-tosf-sc-t1.tfm
+ RELOC/fonts/tfm/public/newtx/ntx-BoldSlanted-tosf-t1.tfm
  RELOC/fonts/tfm/public/newtx/ntx-Italic-lf-ly1.tfm
  RELOC/fonts/tfm/public/newtx/ntx-Italic-lf-ot1.tfm
  RELOC/fonts/tfm/public/newtx/ntx-Italic-lf-ot1r.tfm
@@ -215883,6 +216004,30 @@ runfiles size=3318
  RELOC/fonts/tfm/public/newtx/ntx-Regular-tosf-scl-ot1.tfm
  RELOC/fonts/tfm/public/newtx/ntx-Regular-tosf-scl-t1.tfm
  RELOC/fonts/tfm/public/newtx/ntx-Regular-tosf-t1.tfm
+ RELOC/fonts/tfm/public/newtx/ntx-Slanted-lf-ly1.tfm
+ RELOC/fonts/tfm/public/newtx/ntx-Slanted-lf-ot1.tfm
+ RELOC/fonts/tfm/public/newtx/ntx-Slanted-lf-sc-ly1.tfm
+ RELOC/fonts/tfm/public/newtx/ntx-Slanted-lf-sc-ot1.tfm
+ RELOC/fonts/tfm/public/newtx/ntx-Slanted-lf-sc-t1.tfm
+ RELOC/fonts/tfm/public/newtx/ntx-Slanted-lf-t1.tfm
+ RELOC/fonts/tfm/public/newtx/ntx-Slanted-osf-ly1.tfm
+ RELOC/fonts/tfm/public/newtx/ntx-Slanted-osf-ot1.tfm
+ RELOC/fonts/tfm/public/newtx/ntx-Slanted-osf-sc-ly1.tfm
+ RELOC/fonts/tfm/public/newtx/ntx-Slanted-osf-sc-ot1.tfm
+ RELOC/fonts/tfm/public/newtx/ntx-Slanted-osf-sc-t1.tfm
+ RELOC/fonts/tfm/public/newtx/ntx-Slanted-osf-t1.tfm
+ RELOC/fonts/tfm/public/newtx/ntx-Slanted-tlf-ly1.tfm
+ RELOC/fonts/tfm/public/newtx/ntx-Slanted-tlf-ot1.tfm
+ RELOC/fonts/tfm/public/newtx/ntx-Slanted-tlf-sc-ly1.tfm
+ RELOC/fonts/tfm/public/newtx/ntx-Slanted-tlf-sc-ot1.tfm
+ RELOC/fonts/tfm/public/newtx/ntx-Slanted-tlf-sc-t1.tfm
+ RELOC/fonts/tfm/public/newtx/ntx-Slanted-tlf-t1.tfm
+ RELOC/fonts/tfm/public/newtx/ntx-Slanted-tosf-ly1.tfm
+ RELOC/fonts/tfm/public/newtx/ntx-Slanted-tosf-ot1.tfm
+ RELOC/fonts/tfm/public/newtx/ntx-Slanted-tosf-sc-ly1.tfm
+ RELOC/fonts/tfm/public/newtx/ntx-Slanted-tosf-sc-ot1.tfm
+ RELOC/fonts/tfm/public/newtx/ntx-Slanted-tosf-sc-t1.tfm
+ RELOC/fonts/tfm/public/newtx/ntx-Slanted-tosf-t1.tfm
  RELOC/fonts/tfm/public/newtx/ntxbex.tfm
  RELOC/fonts/tfm/public/newtx/ntxbexa.tfm
  RELOC/fonts/tfm/public/newtx/ntxbexb.tfm
@@ -215909,6 +216054,24 @@ runfiles size=3318
  RELOC/fonts/tfm/public/newtx/ntxdenoms-Regular-ly1.tfm
  RELOC/fonts/tfm/public/newtx/ntxdenoms-Regular-ot1.tfm
  RELOC/fonts/tfm/public/newtx/ntxdenoms-Regular-t1.tfm
+ RELOC/fonts/tfm/public/newtx/ntxdnom-Bold-ly1.tfm
+ RELOC/fonts/tfm/public/newtx/ntxdnom-Bold-ot1.tfm
+ RELOC/fonts/tfm/public/newtx/ntxdnom-Bold-t1.tfm
+ RELOC/fonts/tfm/public/newtx/ntxdnom-BoldItalic-ly1.tfm
+ RELOC/fonts/tfm/public/newtx/ntxdnom-BoldItalic-ot1.tfm
+ RELOC/fonts/tfm/public/newtx/ntxdnom-BoldItalic-t1.tfm
+ RELOC/fonts/tfm/public/newtx/ntxdnom-BoldSlanted-ly1.tfm
+ RELOC/fonts/tfm/public/newtx/ntxdnom-BoldSlanted-ot1.tfm
+ RELOC/fonts/tfm/public/newtx/ntxdnom-BoldSlanted-t1.tfm
+ RELOC/fonts/tfm/public/newtx/ntxdnom-Italic-ly1.tfm
+ RELOC/fonts/tfm/public/newtx/ntxdnom-Italic-ot1.tfm
+ RELOC/fonts/tfm/public/newtx/ntxdnom-Italic-t1.tfm
+ RELOC/fonts/tfm/public/newtx/ntxdnom-Regular-ly1.tfm
+ RELOC/fonts/tfm/public/newtx/ntxdnom-Regular-ot1.tfm
+ RELOC/fonts/tfm/public/newtx/ntxdnom-Regular-t1.tfm
+ RELOC/fonts/tfm/public/newtx/ntxdnom-Slanted-ly1.tfm
+ RELOC/fonts/tfm/public/newtx/ntxdnom-Slanted-ot1.tfm
+ RELOC/fonts/tfm/public/newtx/ntxdnom-Slanted-t1.tfm
  RELOC/fonts/tfm/public/newtx/ntxebgbmi.tfm
  RELOC/fonts/tfm/public/newtx/ntxebgbmia.tfm
  RELOC/fonts/tfm/public/newtx/ntxebgmi.tfm
@@ -215917,6 +216080,24 @@ runfiles size=3318
  RELOC/fonts/tfm/public/newtx/ntxexb.tfm
  RELOC/fonts/tfm/public/newtx/ntxexmods.tfm
  RELOC/fonts/tfm/public/newtx/ntxexx.tfm
+ RELOC/fonts/tfm/public/newtx/ntxinf-Bold-ly1.tfm
+ RELOC/fonts/tfm/public/newtx/ntxinf-Bold-ot1.tfm
+ RELOC/fonts/tfm/public/newtx/ntxinf-Bold-t1.tfm
+ RELOC/fonts/tfm/public/newtx/ntxinf-BoldItalic-ly1.tfm
+ RELOC/fonts/tfm/public/newtx/ntxinf-BoldItalic-ot1.tfm
+ RELOC/fonts/tfm/public/newtx/ntxinf-BoldItalic-t1.tfm
+ RELOC/fonts/tfm/public/newtx/ntxinf-BoldSlanted-ly1.tfm
+ RELOC/fonts/tfm/public/newtx/ntxinf-BoldSlanted-ot1.tfm
+ RELOC/fonts/tfm/public/newtx/ntxinf-BoldSlanted-t1.tfm
+ RELOC/fonts/tfm/public/newtx/ntxinf-Italic-ly1.tfm
+ RELOC/fonts/tfm/public/newtx/ntxinf-Italic-ot1.tfm
+ RELOC/fonts/tfm/public/newtx/ntxinf-Italic-t1.tfm
+ RELOC/fonts/tfm/public/newtx/ntxinf-Regular-ly1.tfm
+ RELOC/fonts/tfm/public/newtx/ntxinf-Regular-ot1.tfm
+ RELOC/fonts/tfm/public/newtx/ntxinf-Regular-t1.tfm
+ RELOC/fonts/tfm/public/newtx/ntxinf-Slanted-ly1.tfm
+ RELOC/fonts/tfm/public/newtx/ntxinf-Slanted-ot1.tfm
+ RELOC/fonts/tfm/public/newtx/ntxinf-Slanted-t1.tfm
  RELOC/fonts/tfm/public/newtx/ntxmi.tfm
  RELOC/fonts/tfm/public/newtx/ntxmi0.tfm
  RELOC/fonts/tfm/public/newtx/ntxmi05.tfm
@@ -216175,12 +216356,15 @@ runfiles size=3318
  RELOC/fonts/type1/public/newtx/txsy5.pfb
  RELOC/fonts/type1/public/newtx/txsy7.pfb
  RELOC/fonts/type1/public/newtx/txsys.pfb
+ RELOC/fonts/type1/public/newtx/zplr.pfb
  RELOC/fonts/type1/public/newtx/ztmb.pfb
  RELOC/fonts/type1/public/newtx/ztmbi.pfb
+ RELOC/fonts/type1/public/newtx/ztmbsl.pfb
  RELOC/fonts/type1/public/newtx/ztmfigs-bsl.pfb
  RELOC/fonts/type1/public/newtx/ztmfigs-sl.pfb
  RELOC/fonts/type1/public/newtx/ztmr.pfb
  RELOC/fonts/type1/public/newtx/ztmri.pfb
+ RELOC/fonts/type1/public/newtx/ztmrsl.pfb
  RELOC/fonts/type1/public/newtx/zxlr-5nums.pfb
  RELOC/fonts/type1/public/newtx/zxlr-7nums.pfb
  RELOC/fonts/type1/public/newtx/zxlr.pfb
@@ -216317,7 +216501,8 @@ runfiles size=3318
  RELOC/tex/latex/newtx/lmsntxsy.fd
  RELOC/tex/latex/newtx/lmxntxexx.fd
  RELOC/tex/latex/newtx/ly1minlibertine.fd
- RELOC/tex/latex/newtx/ly1ntxdenoms.fd
+ RELOC/tex/latex/newtx/ly1ntxdnom.fd
+ RELOC/tex/latex/newtx/ly1ntxinf.fd
  RELOC/tex/latex/newtx/ly1ntxlf.fd
  RELOC/tex/latex/newtx/ly1ntxosf.fd
  RELOC/tex/latex/newtx/ly1ntxsups.fd
@@ -216331,6 +216516,7 @@ runfiles size=3318
  RELOC/tex/latex/newtx/newtx-ebgaramond-subs.tex
  RELOC/tex/latex/newtx/newtx-libertine-subs.tex
  RELOC/tex/latex/newtx/newtx-subs.tex
+ RELOC/tex/latex/newtx/newtx.sty
  RELOC/tex/latex/newtx/newtxmath.sty
  RELOC/tex/latex/newtx/newtxtext.sty
  RELOC/tex/latex/newtx/omlntxebgmi.fd
@@ -216341,7 +216527,8 @@ runfiles size=3318
  RELOC/tex/latex/newtx/omlzmnmi.fd
  RELOC/tex/latex/newtx/omlzutmi.fd
  RELOC/tex/latex/newtx/ot1minlibertine.fd
- RELOC/tex/latex/newtx/ot1ntxdenoms.fd
+ RELOC/tex/latex/newtx/ot1ntxdnom.fd
+ RELOC/tex/latex/newtx/ot1ntxinf.fd
  RELOC/tex/latex/newtx/ot1ntxlf.fd
  RELOC/tex/latex/newtx/ot1ntxosf.fd
  RELOC/tex/latex/newtx/ot1ntxsups.fd
@@ -216354,7 +216541,8 @@ runfiles size=3318
  RELOC/tex/latex/newtx/ot1ntxtt.fd
  RELOC/tex/latex/newtx/t1fxl1.fd
  RELOC/tex/latex/newtx/t1minlibertine.fd
- RELOC/tex/latex/newtx/t1ntxdenoms.fd
+ RELOC/tex/latex/newtx/t1ntxdnom.fd
+ RELOC/tex/latex/newtx/t1ntxinf.fd
  RELOC/tex/latex/newtx/t1ntxlf.fd
  RELOC/tex/latex/newtx/t1ntxosf.fd
  RELOC/tex/latex/newtx/t1ntxsups.fd
@@ -216381,7 +216569,7 @@ catalogue-also minion2newtx
 catalogue-ctan /fonts/newtx
 catalogue-license lppl1.3
 catalogue-topics font font-body font-maths font-serif font-proportional font-type1 font-otf font-supp font-t1enc
-catalogue-version 1.659
+catalogue-version 1.7
 
 name newtxsf
 category Package
@@ -252551,7 +252739,7 @@ catalogue-version 3.11a
 
 name pstricks-add
 category Package
-revision 60622
+revision 61407
 shortdesc A collection of add-ons and bugfixes for PSTricks
 relocated 1
 longdesc Collects together examples that have been posted to the
@@ -252563,11 +252751,11 @@ longdesc (e.g., logarithm axes); polar plots; plotting tangent lines of
 longdesc curves or functions; solving and printing differential
 longdesc equations; box plots; matrix plots; and pie charts. The package
 longdesc makes use of PostScript routines provided by pst-math.
-containersize 21292
-containerchecksum 901a48bf2be31d85c77b61db9d4842ac80c147bc8fd8e7f00c0a8ab3be3ddaae5811d0b1647c88c4bf19b5fd3d4cdf5818b098e1d9b352ce4518432209210996
-doccontainersize 10634380
-doccontainerchecksum 0a50bf20d89e2476d105d491eb91b90e1bec97b741c9ecf6a73b2fe7f804ab71da8ab7fdfe31ae100a25dd0d7a4504365a4b6ac73aae53e38c2d9bfa9efb71d7
-docfiles size=4528
+containersize 21888
+containerchecksum 85c329cfe915f85e3caa93296190041a0dc6078a1c7d7fdd3ded149ce1faa610780c962bda91ae6c0b0552ae131b0a679ab2b75334009cefd852c7dbf2957a75
+doccontainersize 9152100
+doccontainerchecksum 62b7f8dc64a071e70c358f1547dc3bf07bc3b336e0a2085806cc9390e41c5a77710245db515dd71064c08df0755cd3553e69088e083abf14ac5693acc285f755
+docfiles size=4947
  RELOC/doc/generic/pstricks-add/Changes
  RELOC/doc/generic/pstricks-add/History
  RELOC/doc/generic/pstricks-add/README details="Readme"
@@ -252583,18 +252771,21 @@ docfiles size=4528
  RELOC/doc/generic/pstricks-add/data/matrix.data
  RELOC/doc/generic/pstricks-add/data/matrix1.data
  RELOC/doc/generic/pstricks-add/data/matrix2.data
+ RELOC/doc/generic/pstricks-add/data/olympic.eps
+ RELOC/doc/generic/pstricks-add/data/olympic.pdf
+ RELOC/doc/generic/pstricks-add/data/olympic.tex
  RELOC/doc/generic/pstricks-add/data/pstricks-add-doc.data
  RELOC/doc/generic/pstricks-add/pstricks-add-doc.bib
  RELOC/doc/generic/pstricks-add/pstricks-add-doc.pdf details="Package documentation"
  RELOC/doc/generic/pstricks-add/pstricks-add-doc.tex
-runfiles size=25
+runfiles size=26
  RELOC/dvips/pstricks-add/pstricks-add.pro
  RELOC/tex/generic/pstricks-add/pstricks-add.tex
  RELOC/tex/latex/pstricks-add/pstricks-add.sty
 catalogue-ctan /graphics/pstricks/contrib/pstricks-add
 catalogue-license lppl
 catalogue-topics graphics-in-tex pstricks
-catalogue-version 3.91
+catalogue-version 3.92
 
 name pstricks_calcnotes
 category Package
@@ -297816,7 +298007,7 @@ docfiles size=376
 
 name texlive-scripts
 category TLCore
-revision 61394
+revision 61403
 shortdesc TeX Live infrastructure programs
 longdesc Includes install-tl, tl-portable, rungs, etc.; not needed for
 longdesc tlmgr to run but still ours. Not included in tlcritical.
@@ -297824,11 +298015,11 @@ depend texlive-scripts.ARCH
 depend texlive.infra
 execute addMap mathpple.map
 postaction shortcut type=menu name="TeX Live command-line"   cmd=TEXDIR/tlpkg/installer/tl-cmd.bat
-containersize 108300
-containerchecksum 71dc6aa68b80f06c53c0ea99acda1a71d4725daae85e7cc5ae6bfef0c160e7db504a3f9a1eac5c81ad37c881b5ced17e0dc7efdc721cf970e1dba0e93ab91287
-doccontainersize 402028
-doccontainerchecksum e29d5e7b797df3a0bb883a691a4c1d591c0d2262ab29a2557c0a22358b82b252e0e32b77bdde8e6b8ff0a6e3432e0b2b24431f2b481dbda6bc5fd5281794b231
-docfiles size=499
+containersize 108268
+containerchecksum dd5fa688b3d81df4a7ff7662641fa6d2b5e5edcf89fb0d07ace0ca3e0214f0e11031d80b75aef3b81158544567471e3bb43ce75f284a39c53eb63a4e582ac9cd
+doccontainersize 402264
+doccontainerchecksum 145b27ed1a045ce1a33f3f223a7489089dd894e7e48dbec9f6cb65e8cd75c2551e6b746ab03cd0832464e902fdcb945f3c9c7ccf135ecaaff779cdbd4616b65f
+docfiles size=500
  doc.html
  texmf-dist/doc/man/man1/fmtutil-sys.1
  texmf-dist/doc/man/man1/fmtutil-sys.man1.pdf
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
index 9fe5311eeb..4ada15d4f7 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
@@ -1 +1 @@
-bc1ce3b14f270f3d87cf3920d16dbf1b  texlive.tlpdb
+ae1296d19630638dc4ff1c6f5de32623  texlive.tlpdb
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
index 0ae6a24134..5bcac15702 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
@@ -1 +1 @@
-3022aa624735d61d0e8f99b9d00c46cfc721b4cb555e7dfef13e95d9cc4128771dee3dfaddf844e8f8d45d9197b443a2c20074e4aebe2e68d9bb2f6f8ff7c815  texlive.tlpdb
+11cc4b94c09f5e65cced48d08ff29a02b47fbf888a93fd67cbd25e1920df6fcc804a164a52cfb0070497abeea4fa401f8fff244387e4614bbc41022b6899eace  texlive.tlpdb
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
index a6d556c20c..198be27048 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-----
 
-iQEcBAEBCgAGBQJhxmt3AAoJEEzhh34ZQ4xwIpUH/0lCKHxktuza+QVRywX6QO/E
-vluh5iL//4qmOphPZDeJWkspvBzUQFu5Yuh6WqHz/jom6JsGjZLrKMh1pwPuTlR9
-+bFVviksGmaoRkxrsO7ED4hjyITY2nQnWp0PXh26g6/GEjiHEHTbTzh4UA82si1j
-dF7J+Aqdb5fDIFpkQIZ8CAGRjRuDg9RG7IXI4eShLCBupgs1M9E66WEUHrnAtFJr
-+q9bp6wuHJmCp09+gF0pfhIKGwExhck3pvbJgc14TrrkqV6veZqXHD/HvnkmMl44
-AuarQo5xp1hb6rs6oKmqadqj0s2JOkkFOnkf3qmVgcWIVJfiRSW18JUNaQ9Uy2o=
-=cSie
+iQEcBAEBCgAGBQJhx70iAAoJEEzhh34ZQ4xwydYH/jJ93enUlSmzngK/KNU+RfaR
+kGsKCww4xD5z3DHMS8FbUSNwYLlJOml+0sV0YMeGQ6A1qX2mB/npYvNN+zUUGX4C
+ia8QB89MPgqWMqv2yVFVAxTIW/AP714sbDpytNWBsQpCHa7KAnWz5tJ7vLUe9r46
+2ITx1qzyuEnn3CeUZ67IE563FUvvC80Hyp0jzWWNufLLmYSDnkVYaRmXLu+jzQdI
+4ih47V2HfNkrF13kdklrC6E9Vd9NlOWHVtm1TuV7oZp4N22dKAoH2i5wxmOQHmnR
+0YsiMPktZdMI5SnpbNkI0TQlhiN5vAvpBcqr7RlTJpw0tjDaMLzlgEdYRhMoamg=
+=438h
 -----END PGP SIGNATURE-----
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
index 4e9e0b5419..3b6073281c 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
diff --git a/systems/win32/miktex/tm/packages/next/pr.ini b/systems/win32/miktex/tm/packages/next/pr.ini
index c36f6b8fa1..45b9b460c3 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=1640467065

+date=1640553500

 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=2831c547f400932a7f6f11e65d9cea8b

+lstdigest=d0f0128a8bec2f0e328b0b71d8b4d040

 numpkg=5156

 relstate=next

-version=8029

+version=8030

 

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

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

-;;;; signature/miktex: Txlexwt+EoobOoggaZEDaSX/MqhD6cMdsuUMDQFIjaQWn1HzP0fBcApbcxhn8K1mVvAfVAvWLuT9RkimEqSDB0bMR/O5/SzonopzO4dRkY7zUW6pRyuyID98Xi8Y7MfwdQh1ywLWD4o0CHmuHkDsrNej074QiJdCKBvb1AKSvHtFIbcsw1xRXrnmOMJtdx1BuNpy3UZQ1pundci665Ad13eo67gGemd2oGbZfFRJf/eck+7ETACuNFGqMIgVnPJpPcBvgQ1IQGxXhCTikmWJnO/0ZuidlzXfcq7n/+FdOfyjQ2VuIACQb0er08RMBOEg4mxLBuMwLwEH5AWHlYoJlA==

+;;;; signature/miktex: ktdvl2vbe3nzPUS51EFHJr9sq9uso2sdZXq6cfSvIQ0thg0cXjPOooFJTHLargDfENSHiYuVDtciQ3TDLTUoQ+rBqLDDkp+VN3MZdldMc55LtqZ/SVHk41f61n4RTKTnOEreWWWhSUCr4z3sfXLEle4EaGYnJ0aFYyoaoVhob8WJajq/anzFzyncywSx7SkUcPKHc17V0+NwoGQ0kBDh2ePEl78xGG9fqWSLfRCzFjZRqkPCvUpKdVAlfYjY44bc8FeS3nYTNh3Z5I+00eWSXU5WHHMXqAVgsW3qPqQuzT4uWwFgAovW263KD+e+/N8mFYL3ISvcThW1wtBIpVm7DA==

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

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

 [repository]

-date=1640466716

+date=1640553106

 lastupd=miktex-misc ptex-fontmaps ptex-fontmaps__source arara arara__doc arara__source autopuncitems autopuncitems__doc autopuncitems__source beaulivre beaulivre__doc beaulivre__source biblatex-spbasic biblatex-spbasic__doc biblatex-spbasic__source colorist colorist__doc colorist__source easybook easybook__doc

-lstdigest=6b19d204733f15f1b8fe1d62247b6da8

+lstdigest=227869799ccee98b820efe8c06926828

 numpkg=5154

 relstate=stable

-version=8029

+version=8030

 

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

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

-;;;; signature/miktex: o2dMxiJqDzMNC6+0VhOhFB9GmzwvZbBmgXFAIO3cmhZdsyP2mpwTa9HyyWmhR+kJUR1wVVa6BKr3IsFEUo2tDQU84/3LnsY+aM3aU+9EOYKE9ixnLTisajLEPqmneCaQqxklJyXGVujqLgtH6tksGr4cYJj+GjXf1vqoZIcT3wTRRItFyVkwVMUgIGJ2T5g5Phg1pGRzr5hkgAI2wb0ZB8se8RdgkWzCQztT9Gn0Gen4w5tbn33GIW2uvt60A6EuQNTn4zh6K99uBwTpLRE9BR4cOu++OxymIHxBGpiynd5va1JDRkQXjSbDxCpTTHFtUgz1s8BvvX1rPFMlqHXUFQ==

+;;;; signature/miktex: ZNlcvqzz2W0aHjAES2wNin0M7EbvjHwqDv0305i8MizsFDRrOy/7n9ICz89SkNobDgJ95/TGoUC/sYcwZCtntpKcNGN9OSUSCw2EyKtKHXS949M2k90pmf8/VoEdCfmvnB5IusnnEVa0KLy3Ypq+MDXwi45cnNUIedOKhFgL8o5HF4Q+0/7rG/XTVTBp98buNn6lbfeLVBXsI55eswj9v0ZckHUtclXh4q7fuGo2kqtgdShjgvzHeWZQm8wNSN89v0zae3KmkuIE4Kq85XicWF/D2N3xJAD9BgI1hXZoTLtulrCFLHyTQEmhMEYk1DKwunkwpLk5i3DCNtRCYQx9+A==

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

diff --git a/timestamp b/timestamp
index 36075f7ff7..f8262ce67c 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-12-26-02-02
+2021-12-27-02-02