CTAN sync 202308030300

32 files changed, 1602 insertions, 1075 deletions

diff --git a/FILES.byname b/FILES.byname
index 690ca55bdc..a4eafb58d7 100644
--- a/FILES.byname
+++ b/FILES.byname
@@ -2056,12 +2056,12 @@
 2023/07/04 |       1675 | biblio/citation-style-language/README.md
 2023/07/04 |      12878 | biblio/citation-style-language/vancouver.csl
 2023/07/04 |    4522435 | biblio/citation-style-language.zip
-2023/08/01 |       1678 | biblio/ctan-bibdata/biblatex-ctan/ctan.bbx
+2023/08/02 |       1678 | biblio/ctan-bibdata/biblatex-ctan/ctan.bbx
 2022/10/08 |        127 | biblio/ctan-bibdata/biblatex-ctan/ctan.cbx
-2023/08/01 |    2797877 | biblio/ctan-bibdata/ctan.bib
-2023/08/01 |    3690212 | biblio/ctan-bibdata/ctan.pdf
+2023/08/02 |    2797876 | biblio/ctan-bibdata/ctan.bib
+2023/08/02 |    3689401 | biblio/ctan-bibdata/ctan.pdf
 2023/01/16 |       1489 | biblio/ctan-bibdata/README
-2023/08/01 |    4090124 | biblio/ctan-bibdata.zip
+2023/08/02 |    4089201 | biblio/ctan-bibdata.zip
 2023/02/23 |       3126 | biblio/pbibtex/pbibtex-base/cpp.awk
 2023/02/23 |       1009 | biblio/pbibtex/pbibtex-base/generate.sh
 2023/02/23 |      22362 | biblio/pbibtex/pbibtex-base/jabbrv.bst
@@ -2218,7 +2218,7 @@
 1989/12/11 |       6196 | biblio/tib/tib.man
 1989/03/29 |      23265 | biblio/tib/vitaMake
 2005/12/15 |     366385 | biblio/tib.zip
-2023/07/26 |      18356 | CTAN.sites
+2023/08/02 |      18274 | CTAN.sites
 1990/10/03 |       5032 | dviware/beebe/00readme.txt
 1990/10/03 |        479 | dviware/beebe/doc/00dir.cmd
 1990/10/03 |       1209 | dviware/beebe/doc/00dir.lst
@@ -5421,7 +5421,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
-2023/08/01 |     122678 | FILES.last07days
+2023/08/02 |     123889 | 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
@@ -194761,7 +194761,7 @@
 2020/01/31 |    1873940 | install/macros/unicodetex/latex/unicode-math.tds.zip
 2016/05/14 |     185871 | install/macros/xetex/generic/zhspacing.tds.zip
 2015/09/04 |     718623 | install/macros/xetex/latex/arabxetex.tds.zip
-2023/01/17 |    4890022 | install/macros/xetex/latex/bidi.tds.zip
+2023/08/02 |    4895119 | install/macros/xetex/latex/bidi.tds.zip
 2015/02/17 |      92757 | install/macros/xetex/latex/interchar.tds.zip
 2021/08/19 |     464024 | install/macros/xetex/latex/mynsfc.tds.zip
 2022/08/05 |    2009524 | install/macros/xetex/latex/xecjk.tds.zip
@@ -220678,15 +220678,15 @@
 2008/06/01 |     200380 | macros/latex/contrib/envlab/envlab.pdf
 1997/07/16 |       3824 | macros/latex/contrib/envlab/readme.v12
 2008/06/02 |     372141 | macros/latex/contrib/envlab.zip
-2023/07/01 |      47687 | macros/latex/contrib/eolang/cactus.pdf
-2023/07/01 |        172 | macros/latex/contrib/eolang/DEPENDS.txt
-2023/07/01 |        641 | macros/latex/contrib/eolang/eolang.bib
-2023/07/01 |      56263 | macros/latex/contrib/eolang/eolang.dtx
-2023/07/01 |       2628 | macros/latex/contrib/eolang/eolang.ins
-2023/07/01 |    2103161 | macros/latex/contrib/eolang/eolang.pdf
-2023/07/01 |       1083 | macros/latex/contrib/eolang/LICENSE.txt
-2023/07/01 |       1347 | macros/latex/contrib/eolang/README.md
-2023/07/01 |    2110255 | macros/latex/contrib/eolang.zip
+2023/08/02 |      47687 | macros/latex/contrib/eolang/cactus.pdf
+2023/08/02 |        462 | macros/latex/contrib/eolang/DEPENDS.txt
+2023/08/02 |        641 | macros/latex/contrib/eolang/eolang.bib
+2023/08/02 |      56524 | macros/latex/contrib/eolang/eolang.dtx
+2023/08/02 |       2628 | macros/latex/contrib/eolang/eolang.ins
+2023/08/02 |    1888881 | macros/latex/contrib/eolang/eolang.pdf
+2023/08/02 |       1083 | macros/latex/contrib/eolang/LICENSE.txt
+2023/08/02 |       1347 | macros/latex/contrib/eolang/README.md
+2023/08/02 |    1893265 | macros/latex/contrib/eolang.zip
 1991/01/31 |       1291 | macros/latex/contrib/epic/epic.readme
 2009/07/09 |      25846 | macros/latex/contrib/epic/epic.sty
 1991/01/31 |       2444 | macros/latex/contrib/epic/misc.sty
@@ -229115,13 +229115,13 @@
 2019/11/15 |      66637 | macros/latex/contrib/makerobust.zip
 2017/07/16 |        173 | macros/latex/contrib/maker/README
 2017/07/16 |     212725 | macros/latex/contrib/maker.zip
-2022/01/27 |      97019 | macros/latex/contrib/mandi/mandi.dtx
-2022/01/27 |      23242 | macros/latex/contrib/mandi/mandiexp.dtx
-2022/01/27 |       3881 | macros/latex/contrib/mandi/mandi.ins
-2022/01/27 |     500572 | macros/latex/contrib/mandi/mandi.pdf
-2022/01/27 |      66664 | macros/latex/contrib/mandi/mandistudent.dtx
-2022/01/27 |        463 | macros/latex/contrib/mandi/README.md
-2022/01/27 |     519765 | macros/latex/contrib/mandi.zip
+2023/08/01 |      99257 | macros/latex/contrib/mandi/mandi.dtx
+2023/08/01 |      25086 | macros/latex/contrib/mandi/mandiexp.dtx
+2023/08/01 |       3883 | macros/latex/contrib/mandi/mandi.ins
+2023/08/01 |     515270 | macros/latex/contrib/mandi/mandi.pdf
+2023/08/01 |      68106 | macros/latex/contrib/mandi/mandistudent.dtx
+2023/08/01 |        436 | macros/latex/contrib/mandi/README.md
+2023/08/02 |     534000 | macros/latex/contrib/mandi.zip
 1999/07/04 |      21515 | macros/latex/contrib/manfnt/manfnt.dtx
 1999/07/04 |       1768 | macros/latex/contrib/manfnt/manfnt.ins
 2020/04/03 |     249451 | macros/latex/contrib/manfnt/manfnt.pdf
@@ -254405,8 +254405,8 @@
 2023/07/14 |      19106 | macros/unicodetex/latex/einfart/LICENSE
 2023/07/14 |       1342 | macros/unicodetex/latex/einfart/README.md
 2023/07/14 |      12675 | macros/unicodetex/latex/einfart.zip
-2023/07/28 |     556184 | macros/unicodetex/latex/fontsetup/doc/fontsetup-doc.pdf
-2023/07/28 |      19809 | macros/unicodetex/latex/fontsetup/doc/fontsetup-doc.tex
+2023/08/02 |     584050 | macros/unicodetex/latex/fontsetup/doc/fontsetup-doc.pdf
+2023/08/02 |      19810 | macros/unicodetex/latex/fontsetup/doc/fontsetup-doc.tex
 2023/01/02 |      27714 | macros/unicodetex/latex/fontsetup/doc/fspsample-cmr.pdf
 2023/01/02 |      26645 | macros/unicodetex/latex/fontsetup/doc/fspsample-concrete.pdf
 2023/01/02 |      30994 | macros/unicodetex/latex/fontsetup/doc/fspsample-ebgaramond.pdf
@@ -254431,7 +254431,7 @@
 2023/02/25 |      14789 | macros/unicodetex/latex/fontsetup/fspdefault.sty
 2023/01/02 |        318 | macros/unicodetex/latex/fontsetup/fspebgaramondot.sty
 2023/07/28 |        441 | macros/unicodetex/latex/fontsetup/fsperewhon.sty
-2023/07/28 |       4381 | macros/unicodetex/latex/fontsetup/fspeulerot.sty
+2023/08/02 |       1503 | macros/unicodetex/latex/fontsetup/fspeulerot.sty
 2023/01/02 |        700 | macros/unicodetex/latex/fontsetup/fspfiraot.sty
 2023/01/02 |        671 | macros/unicodetex/latex/fontsetup/fspgfsartemisiaot.sty
 2023/01/02 |       1036 | macros/unicodetex/latex/fontsetup/fspgfsdidotclassicot.sty
@@ -254461,8 +254461,8 @@
 2021/01/28 |      20472 | macros/unicodetex/latex/fontsetup-nonfree/system-install-fonts/fsplpscel.otf
 2021/01/28 |      17944 | macros/unicodetex/latex/fontsetup-nonfree/system-install-fonts/fspmnscel.otf
 2021/05/03 |     591630 | macros/unicodetex/latex/fontsetup-nonfree.zip
-2023/02/25 |        369 | macros/unicodetex/latex/fontsetup/README
-2023/07/29 |    1041621 | macros/unicodetex/latex/fontsetup.zip
+2023/08/02 |        369 | macros/unicodetex/latex/fontsetup/README
+2023/08/02 |    1068494 | macros/unicodetex/latex/fontsetup.zip
 2022/01/15 |      22430 | macros/unicodetex/latex/fontspec/CHANGES.md
 2022/01/15 |        549 | macros/unicodetex/latex/fontspec/fontspec.cfg
 2022/01/15 |      12465 | macros/unicodetex/latex/fontspec/fontspec-code-api.dtx
@@ -255130,20 +255130,20 @@
 2022/02/13 |      29260 | macros/xetex/latex/bidi-atbegshi/test-RTL.pdf
 2022/02/13 |        586 | macros/xetex/latex/bidi-atbegshi/test-RTL.tex
 2022/02/13 |     192092 | macros/xetex/latex/bidi-atbegshi.zip
-2023/01/17 |       2936 | macros/xetex/latex/bidi/bidi-bibitem.pdf
-2023/01/17 |       1417 | macros/xetex/latex/bidi/bidi-doc-intro.ltx
-2023/01/17 |      23131 | macros/xetex/latex/bidi/bidi-doc-latex-basics.ltx
-2023/01/17 |       4547 | macros/xetex/latex/bidi/bidi-doc-latex-pkgs.ltx
-2023/01/17 |       6101 | macros/xetex/latex/bidi/bidi-doc-latex-pkgsupport.ltx
-2023/01/17 |       4497 | macros/xetex/latex/bidi/bidi-doc-latex-programming.ltx
-2023/01/17 |        534 | macros/xetex/latex/bidi/bidi-doc.ltx
-2023/01/17 |     176570 | macros/xetex/latex/bidi/bidi-doc.pdf
-2023/01/17 |       5823 | macros/xetex/latex/bidi/bidi-doc-plain-basics.ltx
-2023/01/17 |       1961 | macros/xetex/latex/bidi/bidi-doc-plain-programming.ltx
-2023/01/17 |       3596 | macros/xetex/latex/bidi/bidi-doc-preamble.ltx
-2023/01/17 |       2108 | macros/xetex/latex/bidi/bidi-doc-title.ltx
-2023/01/17 |    1078008 | macros/xetex/latex/bidi/bidi.dtx
-2023/01/17 |    3683556 | macros/xetex/latex/bidi/bidi.pdf
+2023/08/02 |       2936 | macros/xetex/latex/bidi/bidi-bibitem.pdf
+2023/08/02 |       1425 | macros/xetex/latex/bidi/bidi-doc-intro.ltx
+2023/08/02 |      23131 | macros/xetex/latex/bidi/bidi-doc-latex-basics.ltx
+2023/08/02 |       4547 | macros/xetex/latex/bidi/bidi-doc-latex-pkgs.ltx
+2023/08/02 |       6101 | macros/xetex/latex/bidi/bidi-doc-latex-pkgsupport.ltx
+2023/08/02 |       4497 | macros/xetex/latex/bidi/bidi-doc-latex-programming.ltx
+2023/08/02 |        534 | macros/xetex/latex/bidi/bidi-doc.ltx
+2023/08/02 |     176441 | macros/xetex/latex/bidi/bidi-doc.pdf
+2023/08/02 |       5823 | macros/xetex/latex/bidi/bidi-doc-plain-basics.ltx
+2023/08/02 |       1961 | macros/xetex/latex/bidi/bidi-doc-plain-programming.ltx
+2023/08/02 |       3596 | macros/xetex/latex/bidi/bidi-doc-preamble.ltx
+2023/08/02 |       2108 | macros/xetex/latex/bidi/bidi-doc-title.ltx
+2023/08/02 |    1080550 | macros/xetex/latex/bidi/bidi.dtx
+2023/08/02 |    3688262 | macros/xetex/latex/bidi/bidi.pdf
 2014/07/16 |      22035 | macros/xetex/latex/bidicontour/bidicontour-doc.pdf
 2014/07/15 |       1803 | macros/xetex/latex/bidicontour/bidicontour-doc.tex
 2014/07/15 |       7167 | macros/xetex/latex/bidicontour/bidicontour-example-copies.pdf
@@ -255153,7 +255153,7 @@
 2014/07/15 |       4087 | macros/xetex/latex/bidicontour/bidicontour.sty
 2014/07/15 |       1071 | macros/xetex/latex/bidicontour/README
 2014/07/16 |      38915 | macros/xetex/latex/bidicontour.zip
-2023/01/17 |     761651 | macros/xetex/latex/bidi/gull.jpg
+2023/08/02 |     761651 | macros/xetex/latex/bidi/gull.jpg
 2015/07/07 |      24129 | macros/xetex/latex/bidihl/bidihl-doc.pdf
 2015/07/06 |       1029 | macros/xetex/latex/bidihl/bidihl-doc.tex
 2015/07/06 |       7245 | macros/xetex/latex/bidihl/bidihl.sty
@@ -255166,7 +255166,7 @@
 2014/07/15 |      13019 | macros/xetex/latex/bidipagegrid/bidipagegrid.sty
 2014/07/15 |       1068 | macros/xetex/latex/bidipagegrid/README
 2014/07/16 |      29164 | macros/xetex/latex/bidipagegrid.zip
-2023/01/17 |       1693 | macros/xetex/latex/bidi/picture.jpg
+2023/08/02 |       1693 | macros/xetex/latex/bidi/picture.jpg
 2014/09/25 |      25208 | macros/xetex/latex/bidipresentation/bidiprescolors.cfg
 2014/09/25 |     159986 | macros/xetex/latex/bidipresentation/bidipresentation.cls
 2014/09/25 |       2479 | macros/xetex/latex/bidipresentation/fig-1.pdf
@@ -255174,14 +255174,14 @@
 2014/09/26 |      75608 | macros/xetex/latex/bidipresentation/sample.pdf
 2014/09/25 |      12758 | macros/xetex/latex/bidipresentation/sample.tex
 2014/09/26 |     107612 | macros/xetex/latex/bidipresentation.zip
-2023/01/17 |       1323 | macros/xetex/latex/bidi/README
+2023/08/02 |       1323 | macros/xetex/latex/bidi/README
 2014/07/16 |      18289 | macros/xetex/latex/bidishadowtext/bidishadowtext-demo.pdf
 2014/07/16 |       1203 | macros/xetex/latex/bidishadowtext/bidishadowtext-demo.tex
 2014/07/16 |     101629 | macros/xetex/latex/bidishadowtext/bidishadowtext-doc.pdf
 2014/07/16 |       1667 | macros/xetex/latex/bidishadowtext/bidishadowtext-doc.tex
 2014/07/16 |       2436 | macros/xetex/latex/bidishadowtext/bidishadowtext.sty
 2014/07/16 |     120948 | macros/xetex/latex/bidishadowtext.zip
-2023/01/17 |    4469104 | macros/xetex/latex/bidi.zip
+2023/08/02 |    4473944 | macros/xetex/latex/bidi.zip
 2022/07/29 |     101124 | macros/xetex/latex/buctthesis/buctthesis.dtx
 2022/03/06 |       2415 | macros/xetex/latex/buctthesis/buctthesis.ins
 2022/07/29 |     462539 | macros/xetex/latex/buctthesis/buctthesis.pdf
@@ -291522,9 +291522,9 @@
 2019/02/28 |       9796 | systems/texlive/tlnet/archive/captcont.source.r15878.tar.xz
 2019/02/28 |     216228 | systems/texlive/tlnet/archive/captdef.doc.r17353.tar.xz
 2019/02/28 |       1140 | systems/texlive/tlnet/archive/captdef.r17353.tar.xz
-2023/07/29 |     746492 | systems/texlive/tlnet/archive/caption.doc.r67752.tar.xz
-2023/07/29 |      61140 | systems/texlive/tlnet/archive/caption.r67752.tar.xz
-2023/07/29 |     216424 | systems/texlive/tlnet/archive/caption.source.r67752.tar.xz
+2023/08/02 |     746496 | systems/texlive/tlnet/archive/caption.doc.r67788.tar.xz
+2023/08/02 |      61220 | systems/texlive/tlnet/archive/caption.r67788.tar.xz
+2023/08/02 |     217360 | systems/texlive/tlnet/archive/caption.source.r67788.tar.xz
 2019/02/28 |      72600 | systems/texlive/tlnet/archive/capt-of.doc.r29803.tar.xz
 2019/02/28 |       1168 | systems/texlive/tlnet/archive/capt-of.r29803.tar.xz
 2019/02/28 |       3396 | systems/texlive/tlnet/archive/capt-of.source.r29803.tar.xz
@@ -299127,9 +299127,9 @@
 2020/07/28 |       2536 | systems/texlive/tlnet/archive/pinoutikz.r55966.tar.xz
 2019/02/28 |     110192 | systems/texlive/tlnet/archive/pitex.doc.r24731.tar.xz
 2019/02/28 |      22664 | systems/texlive/tlnet/archive/pitex.r24731.tar.xz
-2023/07/09 |     645784 | systems/texlive/tlnet/archive/piton.doc.r67584.tar.xz
-2023/07/09 |      13232 | systems/texlive/tlnet/archive/piton.r67584.tar.xz
-2023/07/09 |      38832 | systems/texlive/tlnet/archive/piton.source.r67584.tar.xz
+2023/08/02 |     676336 | systems/texlive/tlnet/archive/piton.doc.r67790.tar.xz
+2023/08/02 |      13556 | systems/texlive/tlnet/archive/piton.r67790.tar.xz
+2023/08/02 |      40736 | systems/texlive/tlnet/archive/piton.source.r67790.tar.xz
 2019/02/28 |     317704 | systems/texlive/tlnet/archive/pittetd.doc.r15878.tar.xz
 2019/02/28 |       8884 | systems/texlive/tlnet/archive/pittetd.r15878.tar.xz
 2019/02/28 |      38588 | systems/texlive/tlnet/archive/pittetd.source.r15878.tar.xz
@@ -299395,8 +299395,8 @@
 2019/02/28 |     378272 | systems/texlive/tlnet/archive/productbox.doc.r20886.tar.xz
 2019/02/28 |       4944 | systems/texlive/tlnet/archive/productbox.r20886.tar.xz
 2019/02/28 |      15512 | systems/texlive/tlnet/archive/productbox.source.r20886.tar.xz
-2023/07/05 |   11019484 | systems/texlive/tlnet/archive/profcollege.doc.r67545.tar.xz
-2023/07/05 |    1291712 | systems/texlive/tlnet/archive/profcollege.r67545.tar.xz
+2023/08/02 |   10753460 | systems/texlive/tlnet/archive/profcollege.doc.r67787.tar.xz
+2023/08/02 |    1303128 | systems/texlive/tlnet/archive/profcollege.r67787.tar.xz
 2022/04/27 |     134096 | systems/texlive/tlnet/archive/proflabo.doc.r63147.tar.xz
 2022/04/27 |       2748 | systems/texlive/tlnet/archive/proflabo.r63147.tar.xz
 2023/06/16 |    1975724 | systems/texlive/tlnet/archive/proflycee.doc.r67374.tar.xz
@@ -300003,8 +300003,8 @@
 2021/02/03 |     535064 | systems/texlive/tlnet/archive/quran-bn.r57602.tar.xz
 2020/03/09 |     129972 | systems/texlive/tlnet/archive/quran-de.doc.r54191.tar.xz
 2020/03/09 |     620164 | systems/texlive/tlnet/archive/quran-de.r54191.tar.xz
-2023/07/11 |     531136 | systems/texlive/tlnet/archive/quran.doc.r67605.tar.xz
-2023/07/11 |    1631708 | systems/texlive/tlnet/archive/quran.r67605.tar.xz
+2023/08/02 |    1032296 | systems/texlive/tlnet/archive/quran.doc.r67791.tar.xz
+2023/08/02 |    1631908 | systems/texlive/tlnet/archive/quran.r67791.tar.xz
 2021/02/03 |     153360 | systems/texlive/tlnet/archive/quran-ur.doc.r57597.tar.xz
 2021/02/03 |    1874644 | systems/texlive/tlnet/archive/quran-ur.r57597.tar.xz
 2020/09/12 |     599896 | systems/texlive/tlnet/archive/qyxf-book.doc.r56319.tar.xz
@@ -300654,9 +300654,9 @@
 2021/06/26 |     250232 | systems/texlive/tlnet/archive/siunits.doc.r59702.tar.xz
 2021/06/26 |       6040 | systems/texlive/tlnet/archive/siunits.r59702.tar.xz
 2021/06/26 |      34532 | systems/texlive/tlnet/archive/siunits.source.r59702.tar.xz
-2023/08/01 |    1289804 | systems/texlive/tlnet/archive/siunitx.doc.r67780.tar.xz
-2023/08/01 |      67352 | systems/texlive/tlnet/archive/siunitx.r67780.tar.xz
-2023/08/01 |     122220 | systems/texlive/tlnet/archive/siunitx.source.r67780.tar.xz
+2023/08/02 |    1290020 | systems/texlive/tlnet/archive/siunitx.doc.r67789.tar.xz
+2023/08/02 |      67348 | systems/texlive/tlnet/archive/siunitx.r67789.tar.xz
+2023/08/02 |     122252 | systems/texlive/tlnet/archive/siunitx.source.r67789.tar.xz
 2022/01/24 |     200108 | systems/texlive/tlnet/archive/skak.doc.r61719.tar.xz
 2019/02/28 |     316212 | systems/texlive/tlnet/archive/skaknew.doc.r20031.tar.xz
 2019/02/28 |     160064 | systems/texlive/tlnet/archive/skaknew.r20031.tar.xz
@@ -301569,7 +301569,7 @@
 2022/09/13 |        600 | systems/texlive/tlnet/archive/texlive-scripts.amd64-freebsd.r64356.tar.xz
 2022/09/13 |        596 | systems/texlive/tlnet/archive/texlive-scripts.amd64-netbsd.r64356.tar.xz
 2022/09/13 |        596 | systems/texlive/tlnet/archive/texlive-scripts.armhf-linux.r64356.tar.xz
-2023/08/01 |     428160 | systems/texlive/tlnet/archive/texlive-scripts.doc.r67776.tar.xz
+2023/08/02 |     428204 | systems/texlive/tlnet/archive/texlive-scripts.doc.r67785.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
@@ -301591,7 +301591,7 @@
 2022/09/13 |        592 | systems/texlive/tlnet/archive/texlive-scripts.i386-linux.r64356.tar.xz
 2022/09/13 |        596 | systems/texlive/tlnet/archive/texlive-scripts.i386-netbsd.r64356.tar.xz
 2022/09/13 |        596 | systems/texlive/tlnet/archive/texlive-scripts.i386-solaris.r64356.tar.xz
-2023/08/01 |     114072 | systems/texlive/tlnet/archive/texlive-scripts.r67776.tar.xz
+2023/08/02 |     114064 | systems/texlive/tlnet/archive/texlive-scripts.r67785.tar.xz
 2022/09/13 |        580 | systems/texlive/tlnet/archive/texlive-scripts.universal-darwin.r64356.tar.xz
 2023/05/14 |      60312 | systems/texlive/tlnet/archive/texlive-scripts.windows.r67095.tar.xz
 2022/09/13 |        596 | systems/texlive/tlnet/archive/texlive-scripts.x86_64-cygwin.r64356.tar.xz
@@ -303460,16 +303460,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
 2023/03/12 |     125532 | systems/texlive/tlnet/install-tl
-2023/08/01 |    5738087 | systems/texlive/tlnet/install-tl-unx.tar.gz
-2023/08/01 |        152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
-2023/08/01 |        488 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
+2023/08/02 |    5736768 | systems/texlive/tlnet/install-tl-unx.tar.gz
+2023/08/02 |        152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
+2023/08/02 |        488 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
 2023/05/13 |       5083 | systems/texlive/tlnet/install-tl-windows.bat
-2023/08/01 |   21036030 | systems/texlive/tlnet/install-tl-windows.exe
-2023/08/01 |        153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
-2023/08/01 |        488 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
-2023/08/01 |   26025435 | systems/texlive/tlnet/install-tl.zip
-2023/08/01 |        145 | systems/texlive/tlnet/install-tl.zip.sha512
-2023/08/01 |        488 | systems/texlive/tlnet/install-tl.zip.sha512.asc
+2023/08/02 |   21035605 | systems/texlive/tlnet/install-tl-windows.exe
+2023/08/02 |        153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
+2023/08/02 |        488 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
+2023/08/02 |   26025421 | systems/texlive/tlnet/install-tl.zip
+2023/08/02 |        145 | systems/texlive/tlnet/install-tl.zip.sha512
+2023/08/02 |        488 | systems/texlive/tlnet/install-tl.zip.sha512.asc
 2023/03/19 |       1229 | systems/texlive/tlnet/README.md
 2023/03/19 |          0 | systems/texlive/tlnet/TEXLIVE_2023
 2023/01/17 |       8401 | systems/texlive/tlnet/tlpkg/gpg/pubring.gpg
@@ -303479,7 +303479,7 @@
 2023/01/17 |       1280 | systems/texlive/tlnet/tlpkg/gpg/trustdb.gpg
 2023/06/25 |      49936 | systems/texlive/tlnet/tlpkg/installer/config.guess
 2010/11/11 |      11651 | systems/texlive/tlnet/tlpkg/installer/COPYING.MinGW-runtime.txt
-2023/07/31 |       7510 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
+2023/08/01 |       7464 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
 2023/05/31 |     215902 | 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
@@ -303521,12 +303521,12 @@
 2023/02/21 |      20371 | systems/texlive/tlnet/tlpkg/TeXLive/TLCrypto.pm
 2021/12/21 |       5429 | systems/texlive/tlnet/tlpkg/TeXLive/TLDownload.pm
 2023/04/08 |      28167 | systems/texlive/tlnet/tlpkg/TeXLive/TLPaper.pm
-2023/08/01 |   18171689 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
-2023/08/01 |         48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
+2023/08/02 |   18172010 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
+2023/08/02 |         48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
 2023/02/20 |      86803 | systems/texlive/tlnet/tlpkg/TeXLive/TLPDB.pm
-2023/08/01 |        144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
-2023/08/01 |        488 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
-2023/08/01 |    2460812 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
+2023/08/02 |        144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
+2023/08/02 |        488 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
+2023/08/02 |    2459824 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
 2023/02/20 |      58928 | systems/texlive/tlnet/tlpkg/TeXLive/TLPOBJ.pm
 2023/06/11 |      42749 | systems/texlive/tlnet/tlpkg/TeXLive/TLPSRC.pm
 2023/02/21 |      16138 | systems/texlive/tlnet/tlpkg/TeXLive/TLTREE.pm
@@ -314150,7 +314150,7 @@
 2014/07/05 |        611 | systems/win32/yandy/README
 2014/07/05 |    1004628 | systems/win32/yandy/yandy-src.tar.xz
 2014/07/05 |    1012416 | systems/win32/yandy.zip
-2023/08/02 |        186 | timestamp
+2023/08/03 |        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 cc83922aa5..b1ee2552b2 100644
--- a/FILES.byname.gz
+++ b/FILES.byname.gz
diff --git a/FILES.last07days b/FILES.last07days
index 6e9bc9bd7f..3bd9d2c119 100644
--- a/FILES.last07days
+++ b/FILES.last07days
@@ -1,4 +1,73 @@
+2023/08/02 |     761651 | macros/xetex/latex/bidi/gull.jpg
+2023/08/02 |     746496 | systems/texlive/tlnet/archive/caption.doc.r67788.tar.xz
+2023/08/02 |     676336 | systems/texlive/tlnet/archive/piton.doc.r67790.tar.xz
+2023/08/02 |      67348 | systems/texlive/tlnet/archive/siunitx.r67789.tar.xz
+2023/08/02 |        641 | macros/latex/contrib/eolang/eolang.bib
+2023/08/02 |      61220 | systems/texlive/tlnet/archive/caption.r67788.tar.xz
+2023/08/02 |       6101 | macros/xetex/latex/bidi/bidi-doc-latex-pkgsupport.ltx
+2023/08/02 |     584050 | macros/unicodetex/latex/fontsetup/doc/fontsetup-doc.pdf
+2023/08/02 |       5823 | macros/xetex/latex/bidi/bidi-doc-plain-basics.ltx
+2023/08/02 |    5736768 | systems/texlive/tlnet/install-tl-unx.tar.gz
+2023/08/02 |      56524 | macros/latex/contrib/eolang/eolang.dtx
+2023/08/02 |        534 | macros/xetex/latex/bidi/bidi-doc.ltx
+2023/08/02 |     534000 | macros/latex/contrib/mandi.zip
+2023/08/02 |         48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
+2023/08/02 |    4895119 | install/macros/xetex/latex/bidi.tds.zip
+2023/08/02 |        488 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
+2023/08/02 |        488 | systems/texlive/tlnet/install-tl.zip.sha512.asc
+2023/08/02 |        488 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
+2023/08/02 |        488 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
+2023/08/02 |      47687 | macros/latex/contrib/eolang/cactus.pdf
+2023/08/02 |        462 | macros/latex/contrib/eolang/DEPENDS.txt
+2023/08/02 |       4547 | macros/xetex/latex/bidi/bidi-doc-latex-pkgs.ltx
+2023/08/02 |       4497 | macros/xetex/latex/bidi/bidi-doc-latex-programming.ltx
+2023/08/02 |    4473944 | macros/xetex/latex/bidi.zip
+2023/08/02 |     428204 | systems/texlive/tlnet/archive/texlive-scripts.doc.r67785.tar.xz
+2023/08/02 |    4089201 | biblio/ctan-bibdata.zip
+2023/08/02 |      40736 | systems/texlive/tlnet/archive/piton.source.r67790.tar.xz
+2023/08/02 |        369 | macros/unicodetex/latex/fontsetup/README
+2023/08/02 |    3689401 | biblio/ctan-bibdata/ctan.pdf
+2023/08/02 |    3688262 | macros/xetex/latex/bidi/bidi.pdf
+2023/08/02 |       3596 | macros/xetex/latex/bidi/bidi-doc-preamble.ltx
+2023/08/02 |       2936 | macros/xetex/latex/bidi/bidi-bibitem.pdf
+2023/08/02 |    2797876 | biblio/ctan-bibdata/ctan.bib
+2023/08/02 |       2628 | macros/latex/contrib/eolang/eolang.ins
+2023/08/02 |   26025421 | systems/texlive/tlnet/install-tl.zip
+2023/08/02 |    2459824 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
+2023/08/02 |      23131 | macros/xetex/latex/bidi/bidi-doc-latex-basics.ltx
+2023/08/02 |     217360 | systems/texlive/tlnet/archive/caption.source.r67788.tar.xz
+2023/08/02 |       2108 | macros/xetex/latex/bidi/bidi-doc-title.ltx
+2023/08/02 |   21035605 | systems/texlive/tlnet/install-tl-windows.exe
+2023/08/02 |      19810 | macros/unicodetex/latex/fontsetup/doc/fontsetup-doc.tex
+2023/08/02 |       1961 | macros/xetex/latex/bidi/bidi-doc-plain-programming.ltx
+2023/08/02 |    1893265 | macros/latex/contrib/eolang.zip
+2023/08/02 |    1888881 | macros/latex/contrib/eolang/eolang.pdf
+2023/08/02 |      18274 | CTAN.sites
+2023/08/02 |   18172010 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
+2023/08/02 |     176441 | macros/xetex/latex/bidi/bidi-doc.pdf
+2023/08/02 |       1693 | macros/xetex/latex/bidi/picture.jpg
+2023/08/02 |       1678 | biblio/ctan-bibdata/biblatex-ctan/ctan.bbx
+2023/08/02 |    1631908 | systems/texlive/tlnet/archive/quran.r67791.tar.xz
+2023/08/02 |        153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
+2023/08/02 |        152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
+2023/08/02 |       1503 | macros/unicodetex/latex/fontsetup/fspeulerot.sty
+2023/08/02 |        145 | systems/texlive/tlnet/install-tl.zip.sha512
+2023/08/02 |        144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
+2023/08/02 |       1425 | macros/xetex/latex/bidi/bidi-doc-intro.ltx
+2023/08/02 |      13556 | systems/texlive/tlnet/archive/piton.r67790.tar.xz
+2023/08/02 |       1347 | macros/latex/contrib/eolang/README.md
+2023/08/02 |       1323 | macros/xetex/latex/bidi/README
+2023/08/02 |    1303128 | systems/texlive/tlnet/archive/profcollege.r67787.tar.xz
+2023/08/02 |    1290020 | systems/texlive/tlnet/archive/siunitx.doc.r67789.tar.xz
+2023/08/02 |     122252 | systems/texlive/tlnet/archive/siunitx.source.r67789.tar.xz
+2023/08/02 |     114064 | systems/texlive/tlnet/archive/texlive-scripts.r67785.tar.xz
+2023/08/02 |       1083 | macros/latex/contrib/eolang/LICENSE.txt
+2023/08/02 |    1080550 | macros/xetex/latex/bidi/bidi.dtx
+2023/08/02 |   10753460 | systems/texlive/tlnet/archive/profcollege.doc.r67787.tar.xz
+2023/08/02 |    1068494 | macros/unicodetex/latex/fontsetup.zip
+2023/08/02 |    1032296 | systems/texlive/tlnet/archive/quran.doc.r67791.tar.xz
 2023/08/01 |        996 | macros/latex/contrib/siunitx/README.md
+2023/08/01 |      99257 | macros/latex/contrib/mandi/mandi.dtx
 2023/08/01 |       9198 | macros/latex/contrib/siunitx/siunitx-symbol.dtx
 2023/08/01 |    9123899 | macros/latex/contrib/profcollege/doc/ProfCollege-doc.pdf
 2023/08/01 |       8866 | macros/latex/contrib/siunitx/siunitx-command.dtx
@@ -9,38 +78,33 @@
 2023/08/01 |      79072 | systems/texlive/tlnet/archive/dtk.doc.r67781.tar.xz
 2023/08/01 |     781466 | macros/luatex/latex/piton/piton.pdf
 2023/08/01 |      75791 | macros/latex/contrib/siunitx/CHANGELOG.md
+2023/08/01 |       7464 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
 2023/08/01 |        716 | macros/unicodetex/latex/quran/README
 2023/08/01 |     705593 | macros/latex/contrib/siunitx/siunitx.pdf
 2023/08/01 |      68743 | macros/luatex/latex/piton/piton-french.tex
-2023/08/01 |      67352 | systems/texlive/tlnet/archive/siunitx.r67780.tar.xz
+2023/08/01 |      68106 | macros/latex/contrib/mandi/mandistudent.dtx
 2023/08/01 |     649877 | macros/latex/contrib/siunitx/siunitx-code.pdf
 2023/08/01 |    6492612 | systems/texlive/tlnet/archive/newtx.r67778.tar.xz
 2023/08/01 |      60033 | macros/unicodetex/latex/quran/doc/quran-test.pdf
 2023/08/01 |       5831 | macros/latex/contrib/siunitx/siunitx-locale.dtx
 2023/08/01 |      58234 | macros/unicodetex/latex/quran/doc/quran-test1.pdf
-2023/08/01 |    5738087 | systems/texlive/tlnet/install-tl-unx.tar.gz
 2023/08/01 |      55313 | macros/latex/contrib/siunitx/siunitx-table.dtx
 2023/08/01 |      54466 | macros/latex/contrib/profcollege/latex/PfCLogoNumberHive.png
 2023/08/01 |      54122 | macros/unicodetex/latex/quran/doc/quran-doc.tex
 2023/08/01 |     523833 | macros/unicodetex/latex/quran/doc/quran-test2.pdf
-2023/08/01 |         48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
-2023/08/01 |        488 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
-2023/08/01 |        488 | systems/texlive/tlnet/install-tl.zip.sha512.asc
-2023/08/01 |        488 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
-2023/08/01 |        488 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
+2023/08/01 |     515270 | macros/latex/contrib/mandi/mandi.pdf
 2023/08/01 |       4748 | macros/latex/contrib/siunitx/siunitx-abbreviations.cfg
 2023/08/01 |       4697 | macros/unicodetex/latex/quran/tex/quran-translt.def
 2023/08/01 |       4564 | macros/unicodetex/latex/quran/tex/quran-transfr.def
 2023/08/01 |       4532 | macros/unicodetex/latex/quran/tex/quran-transfa.def
 2023/08/01 |       4526 | macros/unicodetex/latex/quran/tex/quran-transen.def
 2023/08/01 |       4524 | macros/unicodetex/latex/quran/tex/quran-transde.def
+2023/08/01 |        436 | macros/latex/contrib/mandi/README.md
 2023/08/01 |      43624 | macros/latex/contrib/siunitx/siunitx-compound.dtx
-2023/08/01 |     428160 | systems/texlive/tlnet/archive/texlive-scripts.doc.r67776.tar.xz
-2023/08/01 |    4090124 | biblio/ctan-bibdata.zip
 2023/08/01 |      39319 | macros/unicodetex/latex/quran/tex/quran.sty
+2023/08/01 |       3883 | macros/latex/contrib/mandi/mandi.ins
 2023/08/01 |      38831 | macros/latex/contrib/siunitx/siunitx-complex.dtx
 2023/08/01 |     373941 | macros/unicodetex/latex/quran/doc/quran-doc.pdf
-2023/08/01 |    3690212 | biblio/ctan-bibdata/ctan.pdf
 2023/08/01 |       3687 | macros/latex/contrib/siunitx/siunitx.ins
 2023/08/01 |      36555 | macros/latex/contrib/siunitx/siunitx-print.dtx
 2023/08/01 |    3654185 | macros/unicodetex/latex/quran.zip
@@ -48,47 +112,35 @@
 2023/08/01 |      31776 | macros/latex/contrib/siunitx/siunitx-emulation.dtx
 2023/08/01 |      31738 | macros/latex/contrib/siunitx/siunitx-version-1.cfg
 2023/08/01 |       2951 | macros/latex/contrib/siunitx/siunitx-binary.dtx
-2023/08/01 |    2797877 | biblio/ctan-bibdata/ctan.bib
 2023/08/01 |       2734 | macros/latex/contrib/profcollege/latex/PfCdobble.lua
 2023/08/01 |     273398 | macros/latex/contrib/siunitx/siunitx-v2.sty
 2023/08/01 |       2636 | macros/latex/contrib/siunitx/siunitx-code.tex
-2023/08/01 |   26025435 | systems/texlive/tlnet/install-tl.zip
-2023/08/01 |    2460812 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
+2023/08/01 |      25086 | macros/latex/contrib/mandi/mandiexp.dtx
 2023/08/01 |    2248866 | macros/latex/contrib/profcollege/doc/ProfCollege-doc.zip
 2023/08/01 |       2235 | macros/unicodetex/latex/quran/doc/quran-test2.tex
 2023/08/01 |      22242 | macros/latex/contrib/siunitx/siunitx.dtx
-2023/08/01 |   21036030 | systems/texlive/tlnet/install-tl-windows.exe
 2023/08/01 |     197070 | macros/luatex/latex/piton/piton.dtx
 2023/08/01 |      18516 | macros/latex/contrib/profcollege/latex/ProfCollege.sty
 2023/08/01 |     184544 | systems/texlive/tlnet/archive/quiver.doc.r67779.tar.xz
 2023/08/01 |      18298 | macros/latex/contrib/siunitx/siunitx-angle.dtx
-2023/08/01 |   18171689 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
 2023/08/01 |       1729 | macros/latex/contrib/siunitx/siunitx-binary.cfg
 2023/08/01 |       1688 | systems/texlive/tlnet/archive/collection-mathscience.r67779.tar.xz
 2023/08/01 |     168660 | macros/latex/contrib/siunitx/siunitx.tex
-2023/08/01 |       1678 | biblio/ctan-bibdata/biblatex-ctan/ctan.bbx
 2023/08/01 |    1660985 | macros/unicodetex/latex/quran/tex/qurantext-uthmani.def
 2023/08/01 |    1601541 | macros/unicodetex/latex/quran/tex/qurantext-fa.translation.def
 2023/08/01 |    1594393 | install/macros/latex/contrib/siunitx.tds.zip
 2023/08/01 |     159179 | macros/latex/contrib/siunitx/siunitx-number.dtx
 2023/08/01 |    1547496 | macros/latex/contrib/siunitx.zip
-2023/08/01 |        153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
-2023/08/01 |        152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
 2023/08/01 |      15153 | macros/latex/contrib/siunitx/siunitx-quantity.dtx
 2023/08/01 |    1463819 | macros/unicodetex/latex/quran/tex/qurantext-uthmani-min.def
 2023/08/01 |      14620 | systems/texlive/tlnet/archive/dtk.r67781.tar.xz
-2023/08/01 |        145 | systems/texlive/tlnet/install-tl.zip.sha512
-2023/08/01 |        144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
 2023/08/01 |    1448439 | macros/unicodetex/latex/quran/tex/qurantext-simple.def
 2023/08/01 |       1402 | macros/luatex/latex/piton/piton.ins
 2023/08/01 |   13791976 | macros/latex/contrib/profcollege.zip
 2023/08/01 |       1344 | systems/texlive/tlnet/archive/quiver.r67779.tar.xz
-2023/08/01 |    1289804 | systems/texlive/tlnet/archive/siunitx.doc.r67780.tar.xz
 2023/08/01 |    1251809 | macros/unicodetex/latex/quran/tex/qurantext-en.transliteration.def
 2023/08/01 |    1230277 | macros/unicodetex/latex/quran/tex/qurantext-de.translation.def
-2023/08/01 |     122220 | systems/texlive/tlnet/archive/siunitx.source.r67780.tar.xz
 2023/08/01 |    1210487 | macros/unicodetex/latex/quran/tex/qurantext-fr.translation.def
-2023/08/01 |     114072 | systems/texlive/tlnet/archive/texlive-scripts.r67776.tar.xz
 2023/08/01 |      11266 | macros/latex/contrib/siunitx/siunitx-abbreviation.dtx
 2023/08/01 |    1089910 | macros/unicodetex/latex/quran/tex/qurantext-en.translation.def
 2023/08/01 |       1067 | macros/unicodetex/latex/quran/doc/quran-test.tex
@@ -101,7 +153,6 @@
 2023/07/31 |       8089 | macros/latex/contrib/caption/caption-ams-smf.dtx
 2023/07/31 |      78170 | macros/latex/contrib/caption/caption2.pdf
 2023/07/31 |      75603 | usergrps/dante/dtk/doc/beispiel.pdf
-2023/07/31 |       7510 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
 2023/07/31 |       6856 | macros/latex/contrib/caption/caption-thesis.dtx
 2023/07/31 |      67305 | macros/latex/contrib/caption/caption-light.pdf
 2023/07/31 |      66826 | macros/latex/contrib/caption/bicaption.dtx
@@ -889,16 +940,13 @@
 2023/07/30 |       1009 | support/texlab/crates/symbols/src/workspace/snapshots/symbols__workspace__tests__filter_type_math.snap
 2023/07/30 |       1008 | support/texlab/crates/parser/src/test_data/bibtex/samples/averroes_1998.txt
 2023/07/29 |         84 | usergrps/dante/dtk/README.md
-2023/07/29 |     746492 | systems/texlive/tlnet/archive/caption.doc.r67752.tar.xz
 2023/07/29 |       6924 | systems/texlive/tlnet/archive/collection-latexextra.r67756.tar.xz
-2023/07/29 |      61140 | systems/texlive/tlnet/archive/caption.r67752.tar.xz
 2023/07/29 |       5452 | systems/texlive/tlnet/archive/textcase.source.r67755.tar.xz
 2023/07/29 |        516 | systems/texlive/tlnet/archive/defoldfonts.r67756.tar.xz
 2023/07/29 |       3660 | systems/texlive/tlnet/archive/defoldfonts.source.r67756.tar.xz
 2023/07/29 |       3073 | usergrps/dante/dtk/doc/beispiel.tex
 2023/07/29 |    2890420 | systems/texlive/tlnet/archive/simpleicons.r67750.tar.xz
 2023/07/29 |     225528 | systems/texlive/tlnet/archive/textcase.doc.r67755.tar.xz
-2023/07/29 |     216424 | systems/texlive/tlnet/archive/caption.source.r67752.tar.xz
 2023/07/29 |    2113496 | systems/texlive/tlnet/archive/simpleicons.doc.r67750.tar.xz
 2023/07/29 |     198940 | systems/texlive/tlnet/archive/defoldfonts.doc.r67756.tar.xz
 2023/07/29 |       1984 | systems/texlive/tlnet/archive/spacingtricks.r67754.tar.xz
@@ -909,7 +957,6 @@
 2023/07/29 |      12364 | systems/texlive/tlnet/archive/spacingtricks.source.r67754.tar.xz
 2023/07/29 |  115909415 | macros/context/latest/cont-tmf.zip
 2023/07/29 |    1102844 | systems/texlive/tlnet/archive/tex4ht.r67757.tar.xz
-2023/07/29 |    1041621 | macros/unicodetex/latex/fontsetup.zip
 2023/07/28 |       9981 | macros/latex/contrib/msu-thesis/samples/MSU-thesis-testfile.tex
 2023/07/28 |        996 | indexing/xindex/doc/tests/demo2.ind
 2023/07/28 |       9964 | macros/latex/contrib/defoldfonts/defoldfonts.dtx
@@ -980,7 +1027,6 @@
 2023/07/28 |     564001 | macros/latex/contrib/msu-thesis.zip
 2023/07/28 |      55985 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-x64-2.9.tar.lzma
 2023/07/28 |      55811 | systems/win32/miktex/tm/packages/reledmac.tar.lzma
-2023/07/28 |     556184 | macros/unicodetex/latex/fontsetup/doc/fontsetup-doc.pdf
 2023/07/28 |     554542 | systems/win32/miktex/tm/packages/lastpage__doc.tar.lzma
 2023/07/28 |      54978 | systems/win32/miktex/tm/packages/tidyres__doc.tar.lzma
 2023/07/28 |       5453 | macros/latex/contrib/defoldfonts/README.md
@@ -1008,7 +1054,6 @@
 2023/07/28 |        441 | macros/unicodetex/latex/fontsetup/fsperewhon.sty
 2023/07/28 |      44172 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-x64-2.9.tar.lzma
 2023/07/28 |      43824 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-x64-2.9.tar.lzma
-2023/07/28 |       4381 | macros/unicodetex/latex/fontsetup/fspeulerot.sty
 2023/07/28 |      43726 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin-x64.tar.lzma
 2023/07/28 |       4343 | systems/win32/miktex/tm/packages/ibrackets__source.tar.lzma
 2023/07/28 |     432100 | systems/texlive/tlnet/archive/circledsteps.doc.r67744.tar.xz
@@ -1144,7 +1189,6 @@
 2023/07/28 |    2002688 | fonts/simpleicons/opentype/SimpleIcons.otf
 2023/07/28 |     200157 | macros/latex/contrib/defoldfonts/defoldfonts.pdf
 2023/07/28 |    1985233 | systems/win32/miktex/tm/packages/erewhon-math__doc.tar.lzma
-2023/07/28 |      19809 | macros/unicodetex/latex/fontsetup/doc/fontsetup-doc.tex
 2023/07/28 |      19764 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-x64-2.9.tar.lzma
 2023/07/28 |      19665 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-x64-2.9.tar.lzma
 2023/07/28 |    1933898 | systems/win32/miktex/tm/packages/concmath-otf__doc.tar.lzma
@@ -1334,27 +1378,3 @@
 2023/07/27 |      11344 | fonts/newtx/tfm/ntx-Italic-tosf-t1.tfm
 2023/07/27 |       1124 | systems/texlive/tlnet/archive/ibrackets.r67736.tar.xz
 2023/07/27 |      10300 | systems/texlive/tlnet/archive/derivative.r67735.tar.xz
-2023/07/26 |      93437 | macros/latex/contrib/ibrackets/ibrackets.pdf
-2023/07/26 |      84776 | macros/latex/contrib/ibrackets.zip
-2023/07/26 |        829 | macros/latex/contrib/tidyres/README.md
-2023/07/26 |       8071 | macros/latex/contrib/ibrackets/ibrackets.dtx
-2023/07/26 |     765956 | fonts/newtx/doc/newtxdoc.pdf
-2023/07/26 |        743 | macros/latex/contrib/abntexto/abntexto.bib
-2023/07/26 |      71048 | macros/latex/contrib/tidyres/tidyres-doc.pdf
-2023/07/26 |      59072 | macros/latex/contrib/tidyres.zip
-2023/07/26 |       5834 | macros/latex/contrib/tidyres/tidyres-doc.tex
-2023/07/26 |      57738 | macros/latex/contrib/derivative/derivative.sty
-2023/07/26 |     517888 | systems/texlive/tlnet/archive/fcolumn.doc.r67729.tar.xz
-2023/07/26 |       4392 | systems/texlive/tlnet/archive/fcolumn.r67729.tar.xz
-2023/07/26 |       4024 | macros/latex/contrib/tidyres/tidyres.sty
-2023/07/26 |      28859 | macros/latex/contrib/abntexto/abntexto.cls
-2023/07/26 |     234870 | macros/latex/contrib/derivative.zip
-2023/07/26 |      23008 | systems/texlive/tlnet/archive/fcolumn.source.r67729.tar.xz
-2023/07/26 |     218718 | macros/latex/contrib/abntexto/abntexto.pdf
-2023/07/26 |     204460 | macros/latex/contrib/derivative/derivative.pdf
-2023/07/26 |       1993 | macros/latex/contrib/ibrackets/ibrackets.ins
-2023/07/26 |      18356 | CTAN.sites
-2023/07/26 |       1516 | macros/latex/contrib/derivative/README.md
-2023/07/26 |      13420 | macros/latex/contrib/abntexto/abntexto.tex
-2023/07/26 |     124898 | fonts/newtx/doc/newtxdoc.tex
-2023/07/26 |     122787 | macros/latex/contrib/derivative/derivative.tex
diff --git a/biblio/ctan-bibdata/ctan.bib b/biblio/ctan-bibdata/ctan.bib
index 24811b720a..ef819e16d4 100644
--- a/biblio/ctan-bibdata/ctan.bib
+++ b/biblio/ctan-bibdata/ctan.bib
@@ -1,7 +1,7 @@
 %% bib file of all CTAN packages
 %% (C) Herbert Voß
 %% 
-%% created at 02-08-2023, 02:00:57
+%% created at 03-08-2023, 02:01:18
 %% 
 
 %% This file is provided under the terms of the LPPL v1.3 or
@@ -8362,8 +8362,8 @@
   title      = {The \texttt{bidi} package},
   subtitle   = {Bidirectional typesetting in plain \TeX{} and \LaTeX{}, using XeTeX},
   author     = {Vafa Khalighi and {bidi-tex GitHub Organisation}},
-  date       = {2023-01-17},
-  version    = {39.7},
+  date       = {2023-08-02},
+  version    = {39.8},
   license    = {lppl1.3c},
   mirror     = {https://mirror.ctan.org/macros/xetex/latex/bidi},
   url        = {https://ctan.org/pkg/bidi},
@@ -22094,8 +22094,8 @@
   title      = {The \texttt{eolang} package},
   subtitle   = {Formulas and graphs for the EO programming language},
   author     = {Yegor Bugayenko},
-  date       = {2023-07-01},
-  version    = {0.13.0},
+  date       = {2023-08-02},
+  version    = {0.14.0},
   license    = {mit},
   mirror     = {https://mirror.ctan.org/macros/latex/contrib/eolang},
   url        = {https://ctan.org/pkg/eolang},
@@ -26621,8 +26621,8 @@
   title      = {The \texttt{fontsetup} package},
   subtitle   = {A front-end to fontspec, for selected fonts with math support},
   author     = {Antonis Tsolomitis},
-  date       = {2023-07-29},
-  version    = {1.5},
+  date       = {2023-08-02},
+  version    = {1.6},
   license    = {gpl3},
   mirror     = {https://mirror.ctan.org/macros/unicodetex/latex/fontsetup},
   url        = {https://ctan.org/pkg/fontsetup},
@@ -42698,8 +42698,8 @@
   title      = {The \texttt{mandi} package},
   subtitle   = {Macros for introductory physics and astronomy},
   author     = {Paul J. Heafner},
-  date       = {2022-01-27},
-  version    = {3.1.0},
+  date       = {2023-08-02},
+  version    = {3.2.0},
   license    = {lppl1.3},
   mirror     = {https://mirror.ctan.org/macros/latex/contrib/mandi},
   url        = {https://ctan.org/pkg/mandi},
@@ -45815,7 +45815,7 @@
   title      = {The \texttt{modeles-factures-belges-assocs} package},
   subtitle   = {Generate invoices for Belgian non-profit organizations},
   author     = {Robert Sebille and Rudy Cassart},
-  date       = {2019-02-12},
+  date       = {2023-08-02},
   version    = {1.0.1},
   license    = {lppl1.3c},
   mirror     = {https://mirror.ctan.org/macros/latex/contrib/modeles-factures-belges-assocs},
@@ -48892,7 +48892,7 @@
   title      = {The \texttt{novel} package},
   subtitle   = {Class for printing fiction, such as novels},
   author     = {Robert Allgeyer},
-  date       = {2023-05-11},
+  date       = {2023-08-02},
   version    = {1.81b},
   license    = {lppl1.3c,ofl},
   mirror     = {https://mirror.ctan.org/macros/luatex/latex/novel},
@@ -62578,8 +62578,8 @@
   title      = {The \texttt{siunitx} package},
   subtitle   = {A comprehensive (SI) units package},
   author     = {Joseph Wright},
-  date       = {2023-07-31},
-  version    = {3.3.0},
+  date       = {2023-08-02},
+  version    = {3.3.1},
   license    = {lppl1.3c},
   mirror     = {https://mirror.ctan.org/macros/latex/contrib/siunitx},
   url        = {https://ctan.org/pkg/siunitx},
diff --git a/biblio/ctan-bibdata/ctan.pdf b/biblio/ctan-bibdata/ctan.pdf
index db102b0c39..3c7cfe55e0 100644
--- a/biblio/ctan-bibdata/ctan.pdf
+++ b/biblio/ctan-bibdata/ctan.pdf
diff --git a/macros/latex/contrib/eolang/DEPENDS.txt b/macros/latex/contrib/eolang/DEPENDS.txt
index faa8e162c3..ea34111dee 100644
--- a/macros/latex/contrib/eolang/DEPENDS.txt
+++ b/macros/latex/contrib/eolang/DEPENDS.txt
@@ -1,13 +1,35 @@
-hard stmaryrd
-hard amsmath
+hard adjustbox
 hard amsfonts
+hard amsmath
+hard fancyvrb
+hard hyperref
 hard iexec
+hard pdftexcmds
 hard pgf
-hard fancyvrb
 hard pgfopts
-hard pdftexcmds
-hard ifluatex
-hard ifxetex
-hard adjustbox
-hard hyperref
-hard xstring
\ No newline at end of file
+hard stmaryrd
+hard xstring
+soft acmart
+soft biber
+soft biblatex
+soft booktabs
+soft caption
+soft cmap
+soft comment
+soft docshots
+soft environ
+soft href-ul
+soft hypdoc
+soft hyperxmp
+soft iexec
+soft ifmtarg
+soft l3build
+soft libertine
+soft ncctools
+soft scheme-basic
+soft setspace
+soft standalone
+soft textcase
+soft tools
+soft totpages
+soft xetex
\ No newline at end of file
diff --git a/macros/latex/contrib/eolang/eolang.dtx b/macros/latex/contrib/eolang/eolang.dtx
index 3260d2eacc..a2e4944689 100644
--- a/macros/latex/contrib/eolang/eolang.dtx
+++ b/macros/latex/contrib/eolang/eolang.dtx
@@ -50,7 +50,7 @@
 %<package>\NeedsTeXFormat{LaTeX2e}
 %<package>\ProvidesPackage{eolang}
 %<*package>
-[2023-07-01 0.13.0 Formulas and Graphs for EO Programming Language]
+[2023-08-02 0.14.0 Formulas and Graphs for EO Programming Language]
 %</package>
 %<*driver>
 \documentclass{ltxdoc}
@@ -219,15 +219,16 @@
 
 % The following markers are supported for a vertex:
 % \begin{itemize}\setlength\itemsep{0em}
-%   \item ``|tag:<math>|'' puts a custom label |<math>| into the circle,
+%   \item ``|tag:<math>|'' puts a custom label |<math>| into the circle;
 %   \item ``|data:[<box>]|'' makes it a data vertex with an optional attached ``|<box>|''
-%     (the content of the box may only be numeric data),
+%     (the content of the box may only be numeric data);
 %   \item ``|atom:[<box>]|'' makes it an atom with an optional attached ``|<box>|''
-%     (the content of the box is a math formula),
-%   \item ``|box:<txt>|'' attaches a ``|<box>|'' to it,
+%     (the content of the box is a math formula);
+%   \item ``|box:<txt>|'' attaches a ``|<box>|'' to it;
 %   \item ``|xy:<v>,<r>,<d>|'' places this vertex in a position relative to the vertex ``|<v>|,''
-%     shifting it right by ``|<r>|'' and down by ``|<d>|'' centimetres.
-%   \item ``|+:<v>|'' makes a copy of an existing vertex and all its kids.
+%     shifting it right by ``|<r>|'' and down by ``|<d>|'' centimetres;
+%   \item ``|+:<v>|'' makes a copy of an existing vertex and all its kids;
+%   \item ``|edgeless|'' removes the border from the vertex.
 % \end{itemize}
 
 % The following markers are supported for an edge:
@@ -691,7 +692,7 @@
 % \usetikzlibrary{fit}
 % \begin{document}
 % \begin{sodg}
-% v0
+% v0 edgeless
 % v11 xy:v0,-1,1 \\ v0->v11
 % v12 xy:v0,0,1 \\ v0->v12
 % v13 xy:v0,1,1 \\ v0->v13
@@ -799,7 +800,7 @@
 $macro = $ARGV[0];
 open(my $fh, '<', $ARGV[1]);
 my $tex; { local $/; $tex = <$fh>; }
-print "% This file is auto-generated by 0.13.0\n";
+print "% This file is auto-generated by 0.14.0\n";
 print '% There are ', length($tex),
   ' chars in the input: ', $ARGV[1], "\n";
 print '% ---', "\n";
@@ -1069,6 +1070,7 @@ print '\endinput';
 % \changes{0.6.0}{2022/11/13}{The \texttt{rrho} attribute is retired, now \texttt{rho} works just fine in all situations.}
 % \changes{0.8.0}{2022/11/20}{The \texttt{tag} attribute is introduced for changing labels inside a vertex circle.}
 % \changes{0.12.1}{2023/03/01}{The bug is fixed related to the formatting of indexes of vertices.}
+% \changes{0.14.0}{2023/07/26}{The \texttt{edgeless} tag of a vertex removes the border of it.}
 % Then, we create a Perl script for |sodg| graphs processing using |VerbatimOut| from
 % \href{https://ctan.org/pkg/fancyvrb}{fancyvrb}:
 %    \begin{macrocode}
@@ -1135,7 +1137,9 @@ for (my $c = 0; $c < 0+@cmds; $c++) {
     my ($q, $t) = split(/:/, $p);
     $opts{$q} = $t;
   }
-  if (index($head, '->') >= 0) {
+  if (index($head, '\\') == 0) {
+    print $cmd;
+  } elsif (index($head, '->') >= 0) {
     my $draw = '\draw[';
     if (exists $opts{'pi'}) {
       $draw = $draw . '<MB:phi-pi><F:draw=none>';
@@ -1306,6 +1310,9 @@ for (my $c = 0; $c < 0+@cmds; $c++) {
     } else {
       print ',phi-object';
     }
+    if (exists $opts{'edgeless'}) {
+      print ',draw=none';
+    }
     print ']';
     print ' (' . $head . ')';
     print ' {';
@@ -1326,8 +1333,6 @@ for (my $c = 0; $c < 0+@cmds; $c++) {
       print $head, '.south east) {';
       print $opts{'box'}, '}';
     }
-  } else {
-    print $cmd;
   }
   print ";\n";
 }
diff --git a/macros/latex/contrib/eolang/eolang.pdf b/macros/latex/contrib/eolang/eolang.pdf
index 1340ebad23..34a9d5bea0 100644
--- a/macros/latex/contrib/eolang/eolang.pdf
+++ b/macros/latex/contrib/eolang/eolang.pdf
diff --git a/macros/latex/contrib/mandi/README.md b/macros/latex/contrib/mandi/README.md
index b40227e66d..bc2d56ec0a 100644
--- a/macros/latex/contrib/mandi/README.md
+++ b/macros/latex/contrib/mandi/README.md
@@ -1,10 +1,9 @@
 `mandi` provides commands for introductory physics. To install, open a command
 line  and  type  the  following,  repeating 2-4 until there are no warnings:
 
-1. `lualatex mandi.ins`  (can also use latex)
-2. `lualatex mandi.dtx`  (lualatex is required)
-3. `makeindex -s gind.ist -o mandi.ind mandi.idx`
-4. `makeindex -s gglo.ist -o mandi.gls mandi.glo`
+  1. `lualatex mandi.ins`  (can also use latex)
+  2. `lualatex mandi.dtx`  (lualatex is required)
+  3. `makeindex -s gind.ist -o mandi.ind mandi.idx`
+  4. `makeindex -s gglo.ist -o mandi.gls mandi.glo`
 
-Move the `*.sty` files into a directory searched by TeX.
-The `vdemo.py` file is not needed and can be deleted.
+Move the `*.sty` files into a directory searched by TeX. Delete `vdemo.py`.
diff --git a/macros/latex/contrib/mandi/mandi.dtx b/macros/latex/contrib/mandi/mandi.dtx
index d3313fc5b4..745b779af6 100644
--- a/macros/latex/contrib/mandi/mandi.dtx
+++ b/macros/latex/contrib/mandi/mandi.dtx
@@ -1,7 +1,7 @@
 % \iffalse meta-comment
 % !TEX program = lualatexmk
 %
-% Copyright (C) 2021,2022 by Paul J. Heafner <heafnerj@gmail.com>
+% Copyright (C) 2023 by Paul J. Heafner <heafnerj@gmail.com>
 % ---------------------------------------------------------------------------
 % This  work may be  distributed and/or modified  under the conditions of the 
 % LaTeX Project Public  License, either  version 1.3  of this  license or (at 
@@ -24,7 +24,7 @@
 % and includes the derived files  mandi.sty
 %                                 mandistudent.sty
 %                                 mandiexp.sty
-%                                 vdemo.py
+%                                 vdemo.py (not needed)
 % ---------------------------------------------------------------------------
 %
 % \fi
@@ -58,9 +58,10 @@
 % This can be changed in a local ltxdoc.cfg file but it is 
 % easier to just use the article class and the doc package 
 % instead and force letterpaper size.
-% \documentclass[10pt]{ltxdoc}
-\documentclass[10pt,letterpaper]{article}
-\usepackage{doc}
+\documentclass[10pt,letterpaper]{ltxdoc}
+\SetupDoc{reportchangedates}
+%\documentclass[10pt,letterpaper]{article}
+%\usepackage[nohyperref,reportchangedates]{doc}          % doc v3 zzzz
 \PassOptionsToPackage{listings,documentation}{tcolorbox} % prevent option clash
 \usepackage{\jobname}                                    % load mandi.sty
 \usepackage{mandistudent}                                % load mandistudent.sty
@@ -72,6 +73,7 @@
 \usepackage[listings,documentation]{tcolorbox}           % workhorse package
 \tcbset{%                                                % tcolorbox options
   index german settings,%
+  index gather commands = false,%
   index colorize = false,%
   lefthand ratio = 0.50,%
   color hyperlink = blue,%
@@ -130,29 +132,6 @@
     }%
   }%
 
-% Clean up the Change History entries to get rid of General:
-% and add dates.
-%  See https://tex.stackexchange.com/a/283894/218142
-\renewcommand{\generalname}{} % gets rid of General
-\makeatletter
-\renewcommand*{\changes@}[3]{%
- \protected@edef\@tempa{%
-  \noexpand\glossary{#1 (#2)\levelchar
-   \ifx\saved@macroname\@empty
-    \space\actualchar\generalname
-   \else
-    \expandafter\@gobble\saved@macroname
-    \actualchar
-    \string\verb\quotechar*\verbatimchar\saved@macroname\verbatimchar
-   \fi
-   #3}}% gets rid of colon and adjusts spacing
- \@tempa
- \endgroup
- \@esphack
-}%
-\makeatother
-%%%%% End local hacks.
-
 % We need a new command for in-line listings to prevent overfull boxes.
 % Anything in |...| will be in small plain text.
 % Previously used !...! but that conflicts with colors.
@@ -168,31 +147,39 @@
   \DocInput{\jobname student.dtx} %
   \setcounter{CodelineNo}{0}      % reset line numbers if desired 
   \DocInput{\jobname exp.dtx}     %
-  \PrintIndex                     %
+  \phantomsection\addcontentsline{toc}{section}{Index}\PrintIndex%
 \end{document}                    % end main document
 %</driver>
 % \fi
 %
-% \IndexPrologue{\section{Index}Page numbers refer to page where the 
-%   corresponding entry is documented and/or referenced.}
+% ^^A Put unnumbered Index entry in TOC
+% \IndexPrologue{\section*{Index}Page numbers refer to page where the 
+%   corresponding entry is documented and/or referenced.\vspace{\baselineskip}}
 % 
-% \CheckSum{2156}
-%
-% \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         \~}
+% ^^A Local hack to Change History to remove `General:`
+% ^^A See https://tex.stackexchange.com/a/283894/218142
+% \makeatletter
+% \renewcommand{\generalname}{}
+% \renewcommand{\changes@}[3]{%
+%   \protected@edef\@tempa{\noexpand\glossary{#1%
+%     \ifdoc@reportchangedates%
+%       \space -- #2\fi%
+%     \levelchar%
+%     \ifx\saved@macroname\@empty%
+%       \quotechar!%
+%       \actualchar%
+%       \generalname%
+%     \else%
+%       \saved@indexname%
+%       \actualchar%
+%       \string\verb% % to fool emacs highlighting
+%       \quotechar*%
+%       \verbatimchar\saved@macroname%
+%       \verbatimchar%
+%     \fi%
+%     #3}}%
+%  \@tempa\endgroup\@esphack}%
+% \makeatother
 %
 % \title{The \href{https://ctan.org/pkg/mandi}{\mandi} Bundle}
 % \author{^^A
@@ -201,14 +188,14 @@
 %      {heafnerj@gmail.com}^^A
 %    }^^A
 % }^^A
-% \date{\today}
+% \date{Printed \today}
 %
 % \newgeometry{left=1.0in,right=1.0in,top=4.0in}
 %   \maketitle
 %   \thispagestyle{empty}
-%   \centerline{\mandi\ version \mandiversion}
-%   \centerline{\mandistudent\ version \mandistudentversion}
-%   \centerline{\mandiexp\ version \mandiexpversion}
+%   \centerline{\mandi{} version \mandiversion}
+%   \centerline{\mandistudent{} version \mandistudentversion}
+%   \centerline{\mandiexp{} version \mandiexpversion}
 %   ^^A\centerline{\textbf{PLEASE DO NOT DISTRIBUTE THIS BUILD.}}
 % \restoregeometry
 %
@@ -218,17 +205,17 @@
 %   \phantomsection
 %   \addcontentsline{toc}{section}{Acknowledgements}
 %   \section*{Acknowledgements}
-%   To all of the students who have learned \LaTeXe\ in my introductory
+%   To all of the students who have learned \LaTeXe{} in my introductory
 %   physics courses over the years, I say a heartfelt thank you. You
 %   have contributed directly to the state of this software and to its
 %   use in introductory physics courses and to innovating how physics
 %   is taught.
 %
-%   I also acknowledge the \LaTeXe\ developers who inhabit the
-%   \href{https://tex.stackexchange.com/}{\TeX\ StackExchange} site. 
+%   I also acknowledge the \LaTeXe{} developers who inhabit the
+%   \href{https://tex.stackexchange.com/}{\TeX{} StackExchange} site. 
 %   Entering a new culture is daunting for anyone, especially for
-%   newcomers; the \LaTeXe\ development culture is no exception. We all
-%   share a passion for creating beautiful documents and I have learned
+%   newcomers; the \LaTeXe{} development culture is no exception. We all
+%   share a passion for creating beautiful documents and I learned
 %   much over the summers of 2020 and 2021 that improved my ability to 
 %   do just that. There are too many of you to list individually, and I 
 %   would surely accidentally omit some were I to try. Collectively, I 
@@ -249,51 +236,53 @@
 %   \listoffigures
 % \restoregeometry
 %
-% \changes{v3.0.0}{2021-08-22}{\linktoplace{sec:mandipkg}{mandi} Initial release}
-% \changes{v3.0.0}{2021-08-22}{\linktoplace{sec:mandistudentpkg}{mandistudent} Initial release}
-% \changes{v3.0.0}{2021-08-22}{\linktoplace{sec:mandiexppkg}{mandiexp} Initial release}
-% \changes{v3.0.1}{2021-08-24}{\linktoplace{sec:mandipkg}{mandi} Minor doc changes}
-% \changes{v3.0.1}{2021-08-24}{\linktoplace{sec:mandistudentpkg}{mandistudent} Minor doc changes}
-% \changes{v3.0.1}{2021-08-24}{\linktoplace{sec:mandiexppkg}{mandiexp} Minor doc changes}
+% \changes{v3.0.0}{2021-08-22}{\linktoplace{sec:mandia}{mandi} Initial release}
+% \changes{v3.0.0}{2021-08-22}{\linktoplace{sec:mandib}{mandistudent} Initial release}
+% \changes{v3.0.0}{2021-08-22}{\linktoplace{sec:mandic}{mandiexp} Initial release}
+% \changes{v3.0.1}{2021-08-24}{\linktoplace{sec:mandia}{mandi} Minor doc changes}
+% \changes{v3.0.1}{2021-08-24}{\linktoplace{sec:mandib}{mandistudent} Minor doc changes}
+% \changes{v3.0.1}{2021-08-24}{\linktoplace{sec:mandic}{mandiexp} Minor doc changes}
+% \changes{v3.2.0}{2023-08-01}{\linktoplace{sec:mandia}{mandi} Source updated}
+% \changes{v3.2.0}{2023-08-01}{\linktoplace{sec:mandib}{mandistudent} Source updated}
+% \changes{v3.2.0}{2023-08-01}{\linktoplace{sec:mandic}{mandiexp} Source updated}
 %
 % \section{Introduction}
-%
 % The \mandi \footnote{The bundle name can be pronounced either with two 
 % syllables, to rhyme with \emph{candy}, or with three syllables, as 
 % \emph{M and I}.} bundle consists of three packages: \mandi, \mandistudent,
-% and \mandiexp. Package \linktoplace{sec:mandipkg}{mandi} provides the
+% and \mandiexp. Package \linktoplace{sec:mandia}{mandi} provides the
 % core functionality, namely correctly typesetting physical quantities
 % and constants with their correct SI units as either scalars or vectors,
 % depending on which is appropriate. Package 
-% \linktoplace{sec:mandistudentpkg}{mandistudent} provides other typesetting
+% \linktoplace{sec:mandib}{mandistudent} provides other typesetting
 % capability appropriate for written problem solutions. Finally, package
-% \linktoplace{sec:mandiexppkg}{mandiexp} provides commands for typesetting
+% \linktoplace{sec:mandic}{mandiexp} provides commands for typesetting
 % expressions from \emph{Matter \& Interactions}\footnote{See 
 % \href{https://www.wiley.com/en-us/Matter+and+Interactions%2C+4th+Edition-p-9781118875865}
 % {\emph{Matter \& Interactions}} and
 % \url{https://matterandinteractions.org/} for details.}
 %
-% \mandi\ has been completely rewritten from the ground up. It had gotten too
-% large and clumsy to use and maintain. It (unknowingly) used deprecated
-% packages. It had too many arcane ``features'' that were never used. It 
-% did not support Unicode. It was not compatible with modern engines, like
-% \lualatex. It did not have a key-value interface. Options could not be
-% changed on the fly within a document. In short, it was a mess. I hope 
-% this rewrite addresses all of the bad things and forms a better code base 
-% for maintenance, useability, and future improvements.
-%
 % So many changes have been made that I think the best approach for former,
 % as well as new, users is to treat this as a brand new experience. I think
 % the most important thing to keep in mind is that I assume users, 
-% expecially new users, will have a relatively recent TeX distribution 
-% (like TeX Live) that includes a recently updated \LaTeXe\ kernel. If users
+% especially new users, will have a relatively recent TeX distribution 
+% (like TeX Live) that includes a recently updated \LaTeXe{} kernel. If users
 % report that this is a major problem, I can provide some degree of
 % backwards compatibility. However, I use a fully updated TeX Live distribution.
+%
+% \section{Getting Help}
+% If you have a question about \mandi, first please read this documentation to make
+% sure your question is not addressed here. Then if you wish, email me. As a user,
+% you deserve courteous and timely help if you need it. You will never get a
+% response from me saying that because this software is free you are not entitled
+% to help using it. It is sad that some developers take that attitude. Using free 
+% software does not absolve the developer of helping users unless the license 
+% specifically says so. 
 % 
 % \changes{v3.1.0}{2022-01-27}
-%   {\linktoplace{sec:mandipkg}{mandi} Added GitHub links to code}
+%   {\linktoplace{sec:mandia}{mandi} Added GitHub links to code}
 % \section{Code Availability}
-% The \mandi\ source repository's \texttt{main} branch is at 
+% The \mandi{} source repository's \texttt{main} branch is at 
 % \url{https://github.com/heafnerj/mandi}. This code will usually coincide
 % with that found on \href{https://ctan.org/pkg/mandi}{CTAN}. The very latest
 % build can be found on the \texttt{dev} branch found at
@@ -301,9 +290,18 @@
 % academic users should probably get the \texttt{dev} branch code since it is
 % stable and may contain improvements over the \texttt{main} branch code.
 %
+% \changes{v3.2.0}{2023-08-01}
+%   {\linktoplace{sec:mandib}{mandistudent} Added statement about \textsc{beamer}
+%    compatibility}
+% \section{Compatibility with Other Packages and Classes}
+% When using \textsc{beamer}, certain commands in the \mandistudent{} package
+% are not defined. Because \textsc{beamer} uses the \pkg{enumitem} package, 
+% the \refEnv{physicsproblem} and \refEnv{physicsproblem*} environments are not 
+% defined. The \refCom{hilite}  command is also not defined because it does not 
+% work and I do not currently know why.
+%
 % \newpage
 % \section{Student/Instructor Quick Guide}
-%
 % Use \refCom{vec} to typeset the symbol for a vector. Use \refCom{magnitude}
 % to typeset the symbol for a vector's magnitude. Use \refCom{dirvec} to
 % typeset the symbol for a vector's direction. Use \refCom{changein} to
@@ -382,9 +380,9 @@
 % typeset \href{https://\vpurl}{VPython} program files. 
 %
 % \newpage
-% \section{The \mandi\ Package}\setplace{sec:mandipkg}
+% \section{The \mandi{} Package}\setplace{sec:mandia}
 %
-% Load \mandi\ as you would any package in your preamble. 
+% Load \mandi{} as you would any package in your preamble. 
 %
 %\iffalse
 %<*example>
@@ -403,7 +401,7 @@
   Typesets the current version and build date.
 \end{docCommand}
 \begin{dispExample*}{sidebyside = false}
-  The version is \mandiversion\ and is a stable build.
+  The version is \mandiversion{} and is a stable build.
 \end{dispExample*}
 %\iffalse
 %</example>
@@ -430,7 +428,7 @@
       doc description = {initially unspecified, set to \docValue{false}},%
     },%
   }%
-  Now \mandi\ uses a key-value interface for options.
+  Now \mandi{} uses a key-value interface for options.
   The \refKey{units} key can be set to \docValue{base}, \docValue{derived}, 
   or \docValue{alternate}. The \refKey{preciseconstants} key is always 
   either \docValue{true} or \docValue{false}.
@@ -462,10 +460,10 @@
 %</example>
 %\fi
 %
-% \subsection{\lualatex\ is Required}
+% \subsection{\lualatex{} is Required}
 %
-% In order to make use of better fonts and Unicode features, \mandi\ now
-% requires the \lualatex\ engine for processing documents. It will not
+% In order to make use of better fonts and Unicode features, \mandi{} now
+% requires the \lualatex{} engine for processing documents. It will not
 % work with other engines. 
 %
 % \newpage
@@ -498,7 +496,7 @@
     },%
   }%
   Command for momentum and its vector variants. The default units will depend 
-  on the options passed to \mandi\ at load time. Alternate units are the 
+  on the options passed to \mandi{} at load time. Alternate units are the 
   default. Other units can be forced as demonstrated. The vector variants can 
   take more than three components. Note the other variants for the quantity's 
   value and units.
@@ -544,7 +542,7 @@
 %\iffalse
 %<*example>
 %\fi
-\begin{docCommand}[doc updated = 2022-01-27]{checkquantity}{\marg{name}}
+\begin{docCommand}[doc updated = 2022-01-27]{CheckQuantity}{\marg{name}}
   Command to check and typeset the command, base units, 
   derived units, and alternate units of a defined physical 
   quantity.
@@ -558,7 +556,7 @@
 % Every other defined physical quantity can be treated similarly. Just replace 
 % |momentum| with the quantity's name. Obviously, the variants that begin with 
 % |\vector| will not be defined for scalar quantities. Here are all the 
-% physical quantities, with all their units, defined in \mandi. Rememeber that 
+% physical quantities, with all their units, defined in \mandi. Remember that 
 % units are not present with symbolic (algebraic) quantities, so do not use 
 % the |\vector| variants of these commands for symbolic components. 
 % Use \refCom{mivector} instead.
@@ -583,10 +581,10 @@
     },%
   }%
 \end{docCommands}
-\checkquantity{acceleration}
+\CheckQuantity{acceleration}
 \begin{docCommand}{amount}{\marg{magnitude}}
 \end{docCommand}
-\checkquantity{amount}
+\CheckQuantity{amount}
 \begin{docCommands}
   {%
     {%
@@ -604,10 +602,10 @@
     },%
   }%
 \end{docCommands}
-\checkquantity{angularacceleration}
+\CheckQuantity{angularacceleration}
 \begin{docCommand}{angularfrequency}{\marg{magnitude}}
 \end{docCommand}
-\checkquantity{angularfrequency}
+\CheckQuantity{angularfrequency}
 \begin{docCommands}
   {%
     {%
@@ -625,7 +623,7 @@
     },%
   }%
 \end{docCommands}
-\checkquantity{angularimpulse}
+\CheckQuantity{angularimpulse}
 \begin{docCommands}
   {%
     {%
@@ -643,7 +641,7 @@
     },%
   }%
 \end{docCommands}
-\checkquantity{angularmomentum}
+\CheckQuantity{angularmomentum}
 \begin{docCommands}
   {%
     {%
@@ -661,22 +659,22 @@
     },%
   }%
 \end{docCommands}
-\checkquantity{angularvelocity}
+\CheckQuantity{angularvelocity}
 \begin{docCommand}{area}{\marg{magnitude}}
 \end{docCommand}
-\checkquantity{area}
+\CheckQuantity{area}
 \begin{docCommand}{areachargedensity}{\marg{magnitude}}
 \end{docCommand}
-\checkquantity{areachargedensity}
+\CheckQuantity{areachargedensity}
 \begin{docCommand}{areamassdensity}{\marg{magnitude}}
 \end{docCommand}
-\checkquantity{areamassdensity}
+\CheckQuantity{areamassdensity}
 \begin{docCommand}{capacitance}{\marg{magnitude}}
 \end{docCommand}
-\checkquantity{capacitance}
+\CheckQuantity{capacitance}
 \begin{docCommand}{charge}{\marg{magnitude}}
 \end{docCommand}
-\checkquantity{charge}
+\CheckQuantity{charge}
 \begin{docCommands}
   {%
     {%
@@ -694,19 +692,19 @@
     },%
   }%
 \end{docCommands}
-\checkquantity{cmagneticfield}
+\CheckQuantity{cmagneticfield}
 \begin{docCommand}{conductance}{\marg{magnitude}}
 \end{docCommand}
-\checkquantity{conductance}
+\CheckQuantity{conductance}
 \begin{docCommand}{conductivity}{\marg{magnitude}}
 \end{docCommand}
-\checkquantity{conductivity}
+\CheckQuantity{conductivity}
 \begin{docCommand}{conventionalcurrent}{\marg{magnitude}}
 \end{docCommand}
-\checkquantity{conventionalcurrent}
+\CheckQuantity{conventionalcurrent}
 \begin{docCommand}{current}{\marg{magnitude}}
 \end{docCommand}
-\checkquantity{current}
+\CheckQuantity{current}
 \begin{docCommands}
   {%
     {%
@@ -724,10 +722,10 @@
     },%
   }%
 \end{docCommands}
-\checkquantity{currentdensity}
+\CheckQuantity{currentdensity}
 \begin{docCommand}{dielectricconstant}{\marg{magnitude}}
 \end{docCommand}
-\checkquantity{dielectricconstant}
+\CheckQuantity{dielectricconstant}
 \begin{docCommands}
   {%
     {%
@@ -745,7 +743,7 @@
     },%
   }%
 \end{docCommands}
-\checkquantity{direction}
+\CheckQuantity{direction}
 \begin{docCommands}
   {%
     {%
@@ -763,10 +761,10 @@
     },%
   }%
 \end{docCommands}
-\checkquantity{displacement}
+\CheckQuantity{displacement}
 \begin{docCommand}{duration}{\marg{magnitude}}
 \end{docCommand}
-\checkquantity{duration}
+\CheckQuantity{duration}
 \begin{docCommands}
   {%
     {%
@@ -783,7 +781,7 @@
     },%
   }%
 \end{docCommands}
-\checkquantity{electricdipolemoment}
+\CheckQuantity{electricdipolemoment}
 \begin{docCommands}
   {%
     {%
@@ -801,37 +799,37 @@
     },%
   }%
 \end{docCommands}
-\checkquantity{electricfield}
+\CheckQuantity{electricfield}
 \begin{docCommand}{electricflux}{\marg{magnitude}}
 \end{docCommand}
-\checkquantity{electricflux}
+\CheckQuantity{electricflux}
 \begin{docCommand}{electricpotential}{\marg{magnitude}}
 \end{docCommand}
-\checkquantity{electricpotential}
+\CheckQuantity{electricpotential}
 \begin{docCommand}[doc new = 2021-05-01]{electricpotentialdifference}{\marg{magnitude}}
 \end{docCommand}
-\checkquantity{electricpotentialdifference}
+\CheckQuantity{electricpotentialdifference}
 \begin{docCommand}{electroncurrent}{\marg{magnitude}}
 \end{docCommand}
-\checkquantity{electroncurrent}
+\CheckQuantity{electroncurrent}
 \begin{docCommand}{emf}{\marg{magnitude}}
 \end{docCommand}
-\checkquantity{emf}
+\CheckQuantity{emf}
 \begin{docCommand}{energy}{\marg{magnitude}}
 \end{docCommand}
-\checkquantity{energy}
+\CheckQuantity{energy}
 \begin{docCommand}[doc new = 2021-04-15]{energyinev}{\marg{magnitude}}
 \end{docCommand}
-\checkquantity{energyinev}
+\CheckQuantity{energyinev}
 \begin{docCommand}[doc new = 2021-04-15]{energyinkev}{\marg{magnitude}}
 \end{docCommand}
-\checkquantity{energyinkev}
+\CheckQuantity{energyinkev}
 \begin{docCommand}[doc new = 2021-04-15]{energyinmev}{\marg{magnitude}}
 \end{docCommand}
-\checkquantity{energyinmev}
+\CheckQuantity{energyinmev}
 \begin{docCommand}{energydensity}{\marg{magnitude}}
 \end{docCommand}
-\checkquantity{energydensity}
+\CheckQuantity{energydensity}
 \begin{docCommands}
   {%
     {%
@@ -849,10 +847,10 @@
     },%
   }%
 \end{docCommands}
-\checkquantity{energyflux}
+\CheckQuantity{energyflux}
 \begin{docCommand}{entropy}{\marg{magnitude}}
 \end{docCommand}
-\checkquantity{entropy}
+\CheckQuantity{entropy}
 \begin{docCommands}
   {%
     {%
@@ -870,10 +868,10 @@
     },%
   }%
 \end{docCommands}
-\checkquantity{force}
+\CheckQuantity{force}
 \begin{docCommand}{frequency}{\marg{magnitude}}
 \end{docCommand}
-\checkquantity{frequency}
+\CheckQuantity{frequency}
 \begin{docCommands}
   {%
     {%
@@ -891,13 +889,13 @@
     },%
   }%
 \end{docCommands}
-\checkquantity{gravitationalfield}
+\CheckQuantity{gravitationalfield}
 \begin{docCommand}{gravitationalpotential}{\marg{magnitude}}
 \end{docCommand}
-\checkquantity{gravitationalpotential}
+\CheckQuantity{gravitationalpotential}
 \begin{docCommand}[doc new = 2021-05-01]{gravitationalpotentialdifference}{\marg{magnitude}}
 \end{docCommand}
-\checkquantity{gravitationalpotentialdifference}
+\CheckQuantity{gravitationalpotentialdifference}
 \begin{docCommands}
   {%
     {%
@@ -915,28 +913,28 @@
     },%
   }%
 \end{docCommands}
-\checkquantity{impulse}
+\CheckQuantity{impulse}
 \begin{docCommand}{indexofrefraction}{\marg{magnitude}}
 \end{docCommand}
-\checkquantity{indexofrefraction}
+\CheckQuantity{indexofrefraction}
 \begin{docCommand}{inductance}{\marg{magnitude}}
 \end{docCommand}
-\checkquantity{inductance}
+\CheckQuantity{inductance}
 \begin{docCommand}{linearchargedensity}{\marg{magnitude}}
 \end{docCommand}
-\checkquantity{linearchargedensity}
+\CheckQuantity{linearchargedensity}
 \begin{docCommand}{linearmassdensity}{\marg{magnitude}}
 \end{docCommand}
-\checkquantity{linearmassdensity}
+\CheckQuantity{linearmassdensity}
 \begin{docCommand}[doc new = 2022-01-27]{lorentzfactor}{\marg{magnitude}}
 \end{docCommand}
-\checkquantity{lorentzfactor}
+\CheckQuantity{lorentzfactor}
 \begin{docCommand}[doc updated = 2021-05-02]{luminousintensity}{\marg{magnitude}}
 \end{docCommand}
-\checkquantity{luminousintensity}
+\CheckQuantity{luminousintensity}
 \begin{docCommand}{magneticcharge}{\marg{magnitude}}
 \end{docCommand}
-\checkquantity{magneticcharge}
+\CheckQuantity{magneticcharge}
 \begin{docCommands}
   {%
     {%
@@ -954,7 +952,7 @@
     },%
   }%
 \end{docCommands}
-\checkquantity{magneticdipolemoment}
+\CheckQuantity{magneticdipolemoment}
 \begin{docCommands}
   {%
     {%
@@ -972,19 +970,19 @@
     },%
   }%
 \end{docCommands}
-\checkquantity{magneticfield}
+\CheckQuantity{magneticfield}
 \begin{docCommand}{magneticflux}{\marg{magnitude}}
 \end{docCommand}
-\checkquantity{magneticflux}
+\CheckQuantity{magneticflux}
 \begin{docCommand}{mass}{\marg{magnitude}}
 \end{docCommand}
-\checkquantity{mass}
+\CheckQuantity{mass}
 \begin{docCommand}{mobility}{\marg{magnitude}}
 \end{docCommand}
-\checkquantity{mobility}
+\CheckQuantity{mobility}
 \begin{docCommand}{momentofinertia}{\marg{magnitude}}
 \end{docCommand}
-\checkquantity{momentofinertia}
+\CheckQuantity{momentofinertia}
 \begin{docCommands}
   {%
     {%
@@ -1004,7 +1002,7 @@
       doc parameter = \marg{\( c_1,\dots,c_n \)} },%
   }%
 \end{docCommands}
-\checkquantity{momentum}
+\CheckQuantity{momentum}
 \begin{docCommands}
   {%
     {%
@@ -1022,25 +1020,25 @@
     },%
   }%
 \end{docCommands}
-\checkquantity{momentumflux}
+\CheckQuantity{momentumflux}
 \begin{docCommand}{numberdensity}{\marg{magnitude}}
 \end{docCommand}
-\checkquantity{numberdensity}
+\CheckQuantity{numberdensity}
 \begin{docCommand}{permeability}{\marg{magnitude}}
 \end{docCommand}
-\checkquantity{permeability}
+\CheckQuantity{permeability}
 \begin{docCommand}{permittivity}{\marg{magnitude}}
 \end{docCommand}
-\checkquantity{permittivity}
+\CheckQuantity{permittivity}
 \begin{docCommand}{planeangle}{\marg{magnitude}}
 \end{docCommand}
-\checkquantity{planeangle}
+\CheckQuantity{planeangle}
 \begin{docCommand}{polarizability}{\marg{magnitude}}
 \end{docCommand}
-\checkquantity{polarizability}
+\CheckQuantity{polarizability}
 \begin{docCommand}{power}{\marg{magnitude}}
 \end{docCommand}
-\checkquantity{power}
+\CheckQuantity{power}
 \begin{docCommands}
   {%
     {%
@@ -1058,43 +1056,43 @@
     },%
   }%
 \end{docCommands}
-\checkquantity{poynting}
+\CheckQuantity{poynting}
 \begin{docCommand}{pressure}{\marg{magnitude}}
 \end{docCommand}
-\checkquantity{pressure}
+\CheckQuantity{pressure}
 \begin{docCommand}{relativepermeability}{\marg{magnitude}}
 \end{docCommand}
-\checkquantity{relativepermeability}
+\CheckQuantity{relativepermeability}
 \begin{docCommand}{relativepermittivity}{\marg{magnitude}}
 \end{docCommand}
-\checkquantity{relativepermittivity}
+\CheckQuantity{relativepermittivity}
 \begin{docCommand}{resistance}{\marg{magnitude}}
 \end{docCommand}
-\checkquantity{resistance}
+\CheckQuantity{resistance}
 \begin{docCommand}{resistivity}{\marg{magnitude}}
 \end{docCommand}
-\checkquantity{resistivity}
+\CheckQuantity{resistivity}
 \begin{docCommand}{solidangle}{\marg{magnitude}}
 \end{docCommand}
-\checkquantity{solidangle}
+\CheckQuantity{solidangle}
 \begin{docCommand}{specificheatcapacity}{\marg{magnitude}}
 \end{docCommand}
-\checkquantity{specificheatcapacity}
+\CheckQuantity{specificheatcapacity}
 \begin{docCommand}{springstiffness}{\marg{magnitude}}
 \end{docCommand}
-\checkquantity{springstiffness}
+\CheckQuantity{springstiffness}
 \begin{docCommand}{springstretch}{\marg{magnitude}}
 \end{docCommand}
-\checkquantity{springstretch}
+\CheckQuantity{springstretch}
 \begin{docCommand}{stress}{\marg{magnitude}}
 \end{docCommand}
-\checkquantity{stress}
+\CheckQuantity{stress}
 \begin{docCommand}{strain}{\marg{magnitude}}
 \end{docCommand}
-\checkquantity{strain}
+\CheckQuantity{strain}
 \begin{docCommand}{temperature}{\marg{magnitude}}
 \end{docCommand}
-\checkquantity{temperature}
+\CheckQuantity{temperature}
 \begin{docCommands}
   {%
     {%
@@ -1112,7 +1110,7 @@
     },%
   }%
 \end{docCommands}
-\checkquantity{torque}
+\CheckQuantity{torque}
 \begin{docCommands}
   {%
     {%
@@ -1130,7 +1128,7 @@
     },%
   }%
 \end{docCommands}
-\checkquantity{velocity}
+\CheckQuantity{velocity}
 \begin{docCommands}
   {%
     {%
@@ -1148,19 +1146,19 @@
     },%
   }%
 \end{docCommands}
-\checkquantity{velocityc}
+\CheckQuantity{velocityc}
 \begin{docCommand}{volume}{\marg{magnitude}}
 \end{docCommand}
-\checkquantity{volume}
+\CheckQuantity{volume}
 \begin{docCommand}{volumechargedensity}{\marg{magnitude}}
 \end{docCommand}
-\checkquantity{volumechargedensity}
+\CheckQuantity{volumechargedensity}
 \begin{docCommand}{volumemassdensity}{\marg{magnitude}}
 \end{docCommand}
-\checkquantity{volumemassdensity}
+\CheckQuantity{volumemassdensity}
 \begin{docCommand}{wavelength}{\marg{magnitude}}
 \end{docCommand}
-\checkquantity{wavelength}
+\CheckQuantity{wavelength}
 \begin{docCommands}
   {%
     {%
@@ -1178,13 +1176,13 @@
     },%
   }%
 \end{docCommands}
-\checkquantity{wavenumber}
+\CheckQuantity{wavenumber}
 \begin{docCommand}{work}{\marg{magnitude}}
 \end{docCommand}
-\checkquantity{work}
+\CheckQuantity{work}
 \begin{docCommand}{youngsmodulus}{\marg{magnitude}}
 \end{docCommand}
-\checkquantity{youngsmodulus}
+\CheckQuantity{youngsmodulus}
 %\iffalse
 %</example>
 %\fi
@@ -1200,18 +1198,18 @@
   {%
     {%
       doc new = 2021-02-16,%
-      doc name = newscalarquantity,%
+      doc name = NewScalarQuantity,%
     },%
     {%
       doc new = 2021-02-21,%
-      doc name = renewscalarquantity,%
+      doc name = RenewScalarQuantity,%
     },%
   }%
   Command to (re)define a new/existing scalar quantity. 
   If the derived or alternate units are omitted, they are 
   defined to be the same as the base units. Do not use both 
   this command and 
-  \refCom{newvectorquantity} or \refCom{renewvectorquantity} 
+  \refCom{NewVectorQuantity} or \refCom{RenewVectorQuantity} 
   to (re)define a quantity.
 \end{docCommands}
 %\iffalse
@@ -1227,18 +1225,18 @@
   {%
     {%
       doc new = 2021-02-16,%
-      doc name = newvectorquantity,%
+      doc name = NewVectorQuantity,%
     },%
     {%
       doc new = 2021-02-21,%
-      doc name = renewvectorquantity,%
+      doc name = RenewVectorQuantity,%
     },%
   }%
   Command to (re)define a new/existing vector quantity. 
   If the derived or alternate units are omitted, they are 
   defined to be the same as the base units. Do not use both 
   this command and 
-  \refCom{newscalarquantity} or \refCom{renewscalarquantity} 
+  \refCom{NewScalarQuantity} or \refCom{RenewScalarQuantity} 
   to (re)define a quantity.
 \end{docCommands}
 %\iffalse
@@ -1247,7 +1245,7 @@
 %
 % \subsubsection{Changing Units}\setplace{ssec:chgunits}
 %
-% Units are set when \mandi\ is loaded, but the default setting
+% Units are set when \mandi{} is loaded, but the default setting
 % can be easily overridden in four ways: command variants that
 % are defined when a \linktoplace{ssec:physquants}{physical quantity}
 % or \linktoplace{ssec:physconsts}{physical constant} is
@@ -1276,7 +1274,7 @@
     },%
   }%
   Modal commands (switches) for setting the default unit form for the entire 
-  document. When \mandi\ is loaded, one of these three commands is executed 
+  document. When \mandi{} is loaded, one of these three commands is executed 
   depending on whether the optional |units| key is provided. See the section 
   on loading the package for details. Alternate units are the default because 
   they are the most likely ones to be seen in introductory physics textbooks.
@@ -1300,7 +1298,7 @@
       doc name = hereusederivedunits,%
     },%
     {%
-      doc name = hereusedalternateunits,%
+      doc name = hereusealternateunits,%
     },%
   }%
   Commands for setting the unit form on the fly for a single instance. The 
@@ -1379,7 +1377,7 @@
 %\fi
 \begin{docCommand}[doc label = oofpezdemo]{oofpez}{}
   Command for the Coulomb constant. The constant's numerical precision and 
-  default units will depend on the options passed to \mandi\ at load time. 
+  default units will depend on the options passed to \mandi{} at load time. 
   Alternate units and approximate numerical values are the defaults. Other 
   units can be forced as demonstrated.
 \end{docCommand}
@@ -1404,7 +1402,7 @@
 %\iffalse
 %<*example>
 %\fi
-\begin{docCommand}[doc updated = 2022-01-27]{checkconstant}{\marg{name}}
+\begin{docCommand}[doc updated = 2022-01-27]{CheckConstant}{\marg{name}}
   Command to check and typeset the constant's name, mathematical symbol, 
   approximate value, precise value, base units, derived units, and 
   alternate units.
@@ -1429,115 +1427,115 @@
 %\fi
 \begin{docCommand}[doc description = exact]{avogadro}{}
 \end{docCommand}
-\checkconstant{avogadro}
+\CheckConstant{avogadro}
 \begin{docCommand}[doc new = 2021-02-02]{biotsavartconstant}{}
 \end{docCommand}
-\checkconstant{biotsavartconstant}
+\CheckConstant{biotsavartconstant}
 \begin{docCommand}{bohrradius}{}
 \end{docCommand}
-\checkconstant{bohrradius}
+\CheckConstant{bohrradius}
 \begin{docCommand}[doc description = exact]{boltzmann}{}
 \end{docCommand}
-\checkconstant{boltzmann}
+\CheckConstant{boltzmann}
 \begin{docCommand}[doc new = 2021-02-02]{coulombconstant}{}
 \end{docCommand}
-\checkconstant{coulombconstant}
+\CheckConstant{coulombconstant}
 \begin{docCommand}{earthmass}{}
 \end{docCommand}
-\checkconstant{earthmass}
+\CheckConstant{earthmass}
 \begin{docCommand}{earthmoondistance}{}
 \end{docCommand}
-\checkconstant{earthmoondistance}
+\CheckConstant{earthmoondistance}
 \begin{docCommand}{earthradius}{}
 \end{docCommand}
-\checkconstant{earthradius}
+\CheckConstant{earthradius}
 \begin{docCommand}{earthsundistance}{}
 \end{docCommand}
-\checkconstant{earthsundistance}
+\CheckConstant{earthsundistance}
 \begin{docCommand}{electroncharge}{}
 \end{docCommand}
-\checkconstant{electroncharge}
+\CheckConstant{electroncharge}
 \begin{docCommand}{electronCharge}{}
 \end{docCommand}
-\checkconstant{electronCharge}
+\CheckConstant{electronCharge}
 \begin{docCommand}{electronmass}{}
 \end{docCommand}
-\checkconstant{electronmass}
+\CheckConstant{electronmass}
 \begin{docCommand}[doc description = exact]{elementarycharge}{}
 \end{docCommand}
-\checkconstant{elementarycharge}
+\CheckConstant{elementarycharge}
 \begin{docCommand}{finestructure}{}
 \end{docCommand}
-\checkconstant{finestructure}
+\CheckConstant{finestructure}
 \begin{docCommand}{hydrogenmass}{}
 \end{docCommand}
-\checkconstant{hydrogenmass}
+\CheckConstant{hydrogenmass}
 \begin{docCommand}{moonearthdistance}{}
 \end{docCommand}
-\checkconstant{moonearthdistance}
+\CheckConstant{moonearthdistance}
 \begin{docCommand}{moonmass}{}
 \end{docCommand}
-\checkconstant{moonmass}
+\CheckConstant{moonmass}
 \begin{docCommand}{moonradius}{}
 \end{docCommand}
-\checkconstant{moonradius}
+\CheckConstant{moonradius}
 \begin{docCommand}{mzofp}{}
 \end{docCommand}
-\checkconstant{mzofp}
+\CheckConstant{mzofp}
 \begin{docCommand}{neutronmass}{}
 \end{docCommand}
-\checkconstant{neutronmass}
+\CheckConstant{neutronmass}
 \begin{docCommand}{oofpez}{}
 \end{docCommand}
-\checkconstant{oofpez}
+\CheckConstant{oofpez}
 \begin{docCommand}{oofpezcs}{}
 \end{docCommand}
-\checkconstant{oofpezcs}
+\CheckConstant{oofpezcs}
 \begin{docCommand}[doc description = exact]{planck}{}
 \end{docCommand}
-\checkconstant{planck}
+\CheckConstant{planck}
 \begin{docCommand}{planckbar}{}
 \end{docCommand}
-\checkconstant{planckbar}
+\CheckConstant{planckbar}
 \begin{docCommand}{planckc}{}
 \end{docCommand}
-\checkconstant{planckc}
+\CheckConstant{planckc}
 \begin{docCommand}{protoncharge}{}
 \end{docCommand}
-\checkconstant{protoncharge}
+\CheckConstant{protoncharge}
 \begin{docCommand}{protonCharge}{}
 \end{docCommand}
-\checkconstant{protonCharge}
+\CheckConstant{protonCharge}
 \begin{docCommand}{protonmass}{}
 \end{docCommand}
-\checkconstant{protonmass}
+\CheckConstant{protonmass}
 \begin{docCommand}{rydberg}{}
 \end{docCommand}
-\checkconstant{rydberg}
+\CheckConstant{rydberg}
 \begin{docCommand}[doc description = exact]{speedoflight}{}
 \end{docCommand}
-\checkconstant{speedoflight}
+\CheckConstant{speedoflight}
 \begin{docCommand}{stefanboltzmann}{}
 \end{docCommand}
-\checkconstant{stefanboltzmann}
+\CheckConstant{stefanboltzmann}
 \begin{docCommand}{sunearthdistance}{}
 \end{docCommand}
-\checkconstant{sunearthdistance}
+\CheckConstant{sunearthdistance}
 \begin{docCommand}{sunradius}{}
 \end{docCommand}
-\checkconstant{sunradius}
+\CheckConstant{sunradius}
 \begin{docCommand}{surfacegravfield}{}
 \end{docCommand}
-\checkconstant{surfacegravfield}
+\CheckConstant{surfacegravfield}
 \begin{docCommand}{universalgrav}{}
 \end{docCommand}
-\checkconstant{universalgrav}
+\CheckConstant{universalgrav}
 \begin{docCommand}{vacuumpermeability}{}
 \end{docCommand}
-\checkconstant{vacuumpermeability}
+\CheckConstant{vacuumpermeability}
 \begin{docCommand}{vacuumpermittivity}{}
 \end{docCommand}
-\checkconstant{vacuumpermittivity}
+\CheckConstant{vacuumpermittivity}
 %\iffalse
 %</example>
 %\fi
@@ -1556,11 +1554,11 @@
   {%
     {%
       doc new = 2021-02-16,%
-      doc name = newphysicalconstant,%
+      doc name = NewPhysicalConstant,%
     },%
     {%
       doc new = 2021-02-21,%
-      doc name = renewphysicalconstant,%
+      doc name = RenewPhysicalConstant,%
     },%
   }%
   Command to define/redefine a new/existing physical constant. 
@@ -1682,7 +1680,8 @@
     },%
     {%
       doc parameter = \marg{magnitude}\marg{unit},%
-      doc name = unit,%
+      doc updated = 2023-08-01,%
+      doc name = units,%
     },%
     {%
       doc name = emptyunit,%
@@ -1829,7 +1828,7 @@
 \begin{dispExample}
   \( \per \)                         \\
   \( \usk \)                         \\
-  \( \unit{3}{\meter\per\second} \)  \\
+  \( \units{3}{\meter\per\second} \)  \\
   \( \emptyunit \)                   \\
   \( \ampere \)                      \\
   \( \atomicmassunit \)              \\
@@ -1939,26 +1938,26 @@
 %</example>
 %\fi
 %
-% \StopEventually{}
+% \MaybeStop{}
 %
 % \newgeometry{left=0.50in,right=0.50in,top=1.00in,bottom=1.00in}
-% \subsection{\mandi\ Source Code}
+% \subsection{\mandi{} Source Code}
 %
 % \iffalse
 %<*package>
 % \fi
-% Definine the package version and date for global use, exploiting the fact
+% Define the package version and date for global use, exploiting the fact
 % that in a \pkg{.sty} file there is now no need for |\makeatletter| and
 % |\makeatother|. This simplifies defining internal commands (with |@| 
 % in the name) that are not for the user to know about.
 %
 % \changes{v3.1.0}{2022-01-27}
-%   {\linktoplace{sec:mandipkg}{mandi} Code formatted for better readability}
+%   {\linktoplace{sec:mandia}{mandi} Code formatted for better readability}
 %    \begin{macrocode}
-\def\mandi@version{3.1.0}
-\def\mandi@date{2022-01-27}
+\def\mandi@version{3.2.0}
+\def\mandi@date{2023-08-01}
 \NeedsTeXFormat{LaTeX2e}[2020-02-02]
-\DeclareRelease{v3.1.0}{2022-01-27}{mandi.sty}
+\DeclareRelease{v3.2.0}{2023-08-01}{mandi.sty}
 \DeclareCurrentRelease{v\mandi@version}{\mandi@date}
 \ProvidesPackage{mandi}
   [\mandi@date\space v\mandi@version\space Macros for physical quantities]
@@ -1972,44 +1971,83 @@
 %
 % Load third party packages, documenting why each one is needed.
 %
+% We need \pkg{pgfopts} for a key-value interface.
+%
+%    \begin{macrocode}
+\RequirePackage{pgfopts}
+%    \end{macrocode}
+%
+% We need \pkg{array} for |\chkquantity| and |\chkconstant|.
+%
+%    \begin{macrocode}
+\RequirePackage{array}
+%    \end{macrocode}
+%
+% We need \pkg{iftex} so we can require \lualatex.
+%
 %    \begin{macrocode}
-\RequirePackage{pgfopts}        % needed for key-value interface
-\RequirePackage{array}          % needed for \checkquantity and \checkconstant
-\RequirePackage{iftex}          % needed for requiring LuaLaTeX
-\RequirePackage{unicode-math}   % needed for Unicode support
+\RequirePackage{iftex}
 %    \end{macrocode}
 %
+% We need \pkg{mathtools} for intelligent delimiters.
+%
+%    \begin{macrocode}
+\RequirePackage{mathtools}
+%    \end{macrocode}
+%
+% We need \pkg{unicode-math} for Unicode support and changing fonts.
+%
+%    \begin{macrocode}
+\RequirePackage{unicode-math}
+%    \end{macrocode}
+%
+% Suppress some annoying warnings.
+%
+%    \begin{macrocode}
+\unimathsetup{warnings-off={mathtools-colon,mathtools-overbracket}}
+%    \end{macrocode}
+%
+% Load \pkg{xparse} if necessary.
+%
 % \changes{v3.1.0}{2022-01-27}
-%   {\linktoplace{sec:mandipkg}{mandi} \pkg{xparse} is loaded for older formats}
+%   {\linktoplace{sec:mandia}{mandi} \pkg{xparse} is loaded for older formats}
 %    \begin{macrocode}
-\IfFormatAtLeastTF {2020-10-01} % load xparse if necessary
+\IfFormatAtLeastTF{2020-10-01}
   {}%
   {\RequirePackage{xparse}}%
-\RequireLuaTeX                  % require this engine
+%    \end{macrocode}
+%
+% We require the \lualatex{} engine.
+%
+%    \begin{macrocode}
+\RequireLuaTeX
 %    \end{macrocode}
 %
 % Parts of the unit engine have been rewritten with 
 % \href{https://www.ctan.org/pkg/xparse}{\pkg{xparse}} for both clarity 
-% and power. Note that \pkg{xparse} is now part of the \LaTeXe\ kernel. 
-% Other parts have been rewriten in 
+% and power. Note that \pkg{xparse} is now part of the \LaTeXe{} kernel. 
+% Other parts have been rewritten in 
 % \href{https://www.ctan.org/pkg/expl}{\pkg{expl}} with a look to the 
 % future.
 %
-% Generic internal selectors.
+% Define some generic internal selectors.
 %
 %    \begin{macrocode}
 \newcommand*{\mandi@selectunits}{}
 \newcommand*{\mandi@selectprecision}{}
 %    \end{macrocode}
 %
-% Specific internal selectors.
+% Define some specific internal selectors. The first two are really just 
+% workalikes for |\@firstoftwo| and |\@secondoftwo|. The third, fourth, 
+% and fifth are |\@firstofthree|, |\@secondofthree|, and |\@thirdofthree| 
+% and apparently do not yet exist.
 %
 %    \begin{macrocode}
-\newcommand*{\mandi@selectapproximate}[2]{#1}    % really \@firstoftwo
-\newcommand*{\mandi@selectprecise}[2]{#2}        % really \@secondoftwo
-\newcommand*{\mandi@selectbaseunits}[3]{#1}      % really \@firstofthree
-\newcommand*{\mandi@selectderivedunits}[3]{#2}   % really \@secondofthree
-\newcommand*{\mandi@selectalternateunits}[3]{#3} % really \@thirdofthree
+\newcommand*{\mandi@selectapproximate}[2]{#1}
+\newcommand*{\mandi@selectprecise}[2]{#2}
+\newcommand*{\mandi@selectbaseunits}[3]{#1}
+\newcommand*{\mandi@selectderivedunits}[3]{#2}
+\newcommand*{\mandi@selectalternateunits}[3]{#3}
 %    \end{macrocode}
 %
 % Document level global switches.
@@ -2047,7 +2085,7 @@
 \NewDocumentEnvironment{usepreciseconstants}{}{\alwaysusepreciseconstants}{}%
 %    \end{macrocode}
 %
-% \mandi\ now has a key-value interface, implemented with 
+% \mandi{} now has a key-value interface, implemented with 
 % \href{https://www.ctan.org/pkg/pgfopts}{\pkg{pgfopts}} and 
 % \href{https://www.ctan.org/pkg/pgfkeys}{\pkg{pgfkeys}}.
 % There are two options:\newline
@@ -2061,7 +2099,7 @@
 % by the unit engine.
 %
 % \changes{v3.1.0}{2022-01-27}
-%   {\linktoplace{sec:mandipkg}{mandi} Unknown package options handled safely}
+%   {\linktoplace{sec:mandia}{mandi} Unknown package options handled safely}
 %    \begin{macrocode}
 \newif\ifusingpreciseconstants
 \pgfkeys{%
@@ -2119,7 +2157,8 @@
 %    \end{macrocode}
 %
 % Define a setup command that overrides the loadtime options
-% when called with new options. A new banner is written to the console.
+% when called with new options. A new banner is written to 
+% the console.
 %
 %    \begin{macrocode}
 \NewDocumentCommand{\mandisetup}{ m }%
@@ -2141,11 +2180,22 @@
 % We make use of |\symup{...}| from the \pkg{unicode-math} package.
 %
 % \changes{v3.1.0}{2022-01-27}
-%   {\linktoplace{sec:mandipkg}{mandi} Added a negative space to \refCom{lightspeed}}
+%   {\linktoplace{sec:mandia}{mandi} Added a negative space to \refCom{lightspeed}}
+% \changes{v3.2.0}{2023-08-01}
+%   {\linktoplace{sec:mandia}{mandi} Changed \cs{unit} to \cs{units}}
 %    \begin{macrocode}
 \NewDocumentCommand{\per}{}{/}
 \NewDocumentCommand{\usk}{}{\cdot}
-\NewDocumentCommand{\unit}{ m m }{{#1}{\,#2}}
+\NewDocumentCommand{\units}{ m m }%
+{%
+  \IfValueTF{#2}
+  {%
+    {#1}{\,#2}
+  }%
+  {%
+    {#1}{}
+  }%
+}%
 \NewDocumentCommand{\ampere}{}{\symup{A}}
 \NewDocumentCommand{\atomicmassunit}{}{\symup{u}}
 \NewDocumentCommand{\candela}{}{\symup{cd}}
@@ -2178,13 +2228,13 @@
 \NewDocumentCommand{\volt}{}{\symup{V}}
 \NewDocumentCommand{\watt}{}{\symup{W}}
 \NewDocumentCommand{\weber}{}{\symup{Wb}}
-\NewDocumentCommand{\tothetwo}{}{^2}             % postfix  2
-\NewDocumentCommand{\tothethree}{}{^3}           % postfix  3
-\NewDocumentCommand{\tothefour}{}{^4}            % postfix  4
-\NewDocumentCommand{\inverse}{}{^{-1}}           % postfix -1
-\NewDocumentCommand{\totheinversetwo}{}{^{-2}}   % postfix -2
-\NewDocumentCommand{\totheinversethree}{}{^{-3}} % postfix -3
-\NewDocumentCommand{\totheinversefour}{}{^{-4}}  % postfix -4
+\NewDocumentCommand{\tothetwo}{}{^{2}}
+\NewDocumentCommand{\tothethree}{}{^{3}}
+\NewDocumentCommand{\tothefour}{}{^{4}}
+\NewDocumentCommand{\inverse}{}{^{-1}}
+\NewDocumentCommand{\totheinversetwo}{}{^{-2}}
+\NewDocumentCommand{\totheinversethree}{}{^{-3}}
+\NewDocumentCommand{\totheinversefour}{}{^{-4}}
 \NewDocumentCommand{\emptyunit}{}{\mdlgwhtsquare}
 \NewDocumentCommand{\tento}{ m }{10^{#1}}
 \NewDocumentCommand{\timestento}{ m }{\times\tento{#1}}
@@ -2192,21 +2242,21 @@
 %    \end{macrocode}
 %
 % \changes{v3.1.0}{2022-01-27}
-%   {\linktoplace{sec:mandipkg}{mandi} \LaTeX3 code now conforms to formatting standards}
+%   {\linktoplace{sec:mandia}{mandi} \LaTeX3 code now conforms to formatting standards}
 %    \begin{macrocode}
 \ExplSyntaxOn
 \cs_new:Npn \__mandi_newscalarquantity:nnnn #1#2#3#4
   {
-    \cs_new:cpn {#1} ##1 {\unit{##1}{\mandi@selectunits{#2}{#3}{#4}}}
+    \cs_new:cpn {#1} ##1 {\units{##1}{\mandi@selectunits{#2}{#3}{#4}}}
     \cs_new:cpn {#1value} ##1 {##1}
-    \cs_new:cpn {#1baseunits} ##1 {\unit{##1}{\mandi@selectbaseunits{#2}{#3}{#4}}}
-    \cs_new:cpn {#1derivedunits} ##1 {\unit{##1}{\mandi@selectderivedunits{#2}{#3}{#4}}}
-    \cs_new:cpn {#1alternateunits} ##1 {\unit{##1}{\mandi@selectalternateunits{#2}{#3}{#4}}}
+    \cs_new:cpn {#1baseunits} ##1 {\units{##1}{\mandi@selectbaseunits{#2}{#3}{#4}}}
+    \cs_new:cpn {#1derivedunits} ##1 {\units{##1}{\mandi@selectderivedunits{#2}{#3}{#4}}}
+    \cs_new:cpn {#1alternateunits} ##1 {\units{##1}{\mandi@selectalternateunits{#2}{#3}{#4}}}
     \cs_new:cpn {#1onlybaseunits} {\mandi@selectbaseunits{#2}{#3}{#4}}
     \cs_new:cpn {#1onlyderivedunits} {\mandi@selectderivedunits{#2}{#3}{#4}}
     \cs_new:cpn {#1onlyalternateunits} {\mandi@selectalternateunits{#2}{#3}{#4}}
   }
-\NewDocumentCommand{\newscalarquantity}{ m m O{#2} O{#2} }
+\NewDocumentCommand{\NewScalarQuantity}{ m m O{#2} O{#2} }
   {
     \__mandi_newscalarquantity:nnnn { #1 }{ #2 }{ #3 }{ #4 }
   }
@@ -2219,16 +2269,16 @@
 \ExplSyntaxOn
 \cs_new:Npn \__mandi_renewscalarquantity:nnnn #1#2#3#4
   {
-    \cs_set:cpn {#1} ##1 {\unit{##1}{\mandi@selectunits{#2}{#3}{#4}}}
+    \cs_set:cpn {#1} ##1 {\units{##1}{\mandi@selectunits{#2}{#3}{#4}}}
     \cs_set:cpn {#1value} ##1 {##1}
-    \cs_set:cpn {#1baseunits} ##1 {\unit{##1}{\mandi@selectbaseunits{#2}{#3}{#4}}}
-    \cs_set:cpn {#1derivedunits} ##1 {\unit{##1}{\mandi@selectderivedunits{#2}{#3}{#4}}}
-    \cs_set:cpn {#1alternateunits} ##1 {\unit{##1}{\mandi@selectalternateunits{#2}{#3}{#4}}}
+    \cs_set:cpn {#1baseunits} ##1 {\units{##1}{\mandi@selectbaseunits{#2}{#3}{#4}}}
+    \cs_set:cpn {#1derivedunits} ##1 {\units{##1}{\mandi@selectderivedunits{#2}{#3}{#4}}}
+    \cs_set:cpn {#1alternateunits} ##1 {\units{##1}{\mandi@selectalternateunits{#2}{#3}{#4}}}
     \cs_set:cpn {#1onlybaseunits} {\mandi@selectbaseunits{#2}{#3}{#4}}
     \cs_set:cpn {#1onlyderivedunits} {\mandi@selectderivedunits{#2}{#3}{#4}}
     \cs_set:cpn {#1onlyalternateunits} {\mandi@selectalternateunits{#2}{#3}{#4}}
   }
-\NewDocumentCommand{\renewscalarquantity}{ m m O{#2} O{#2} }
+\NewDocumentCommand{\RenewScalarQuantity}{ m m O{#2} O{#2} }
   {
     \__mandi_renewscalarquantity:nnnn { #1 }{ #2 }{ #3 }{ #4 }
   }
@@ -2242,16 +2292,16 @@
 \cs_new:Npn \__mandi_newvectorquantity:nnnn #1#2#3#4
   {
     \__mandi_newscalarquantity:nnnn { #1 }{ #2 }{ #3 }{ #4 }
-    \cs_new:cpn {vector#1} ##1 {\unit{\mivector{##1}}{\mandi@selectunits{#2}{#3}{#4}}}
-    \cs_new:cpn {#1vector} ##1 {\unit{\mivector{##1}}{\mandi@selectunits{#2}{#3}{#4}}}
+    \cs_new:cpn {vector#1} ##1 {\units{\mivector{##1}}{\mandi@selectunits{#2}{#3}{#4}}}
+    \cs_new:cpn {#1vector} ##1 {\units{\mivector{##1}}{\mandi@selectunits{#2}{#3}{#4}}}
     \cs_new:cpn {vector#1value} ##1 {\mivector{##1}}
     \cs_new:cpn {#1vectorvalue} ##1 {\mivector{##1}}
-    \cs_new:cpn {vector#1baseunits} ##1 {\unit{\mivector{##1}}{\mandi@selectbaseunits{#2}{#3}{#4}}}
-    \cs_new:cpn {#1vectorbaseunits} ##1 {\unit{\mivector{##1}}{\mandi@selectbaseunits{#2}{#3}{#4}}}
-    \cs_new:cpn {vector#1derivedunits} ##1 {\unit{\mivector{##1}}{\mandi@selectderivedunits{#2}{#3}{#4}}}
-    \cs_new:cpn {#1vectorderivedunits} ##1 {\unit{\mivector{##1}}{\mandi@selectderivedunits{#2}{#3}{#4}}}
-    \cs_new:cpn {vector#1alternateunits} ##1 {\unit{\mivector{##1}}{\mandi@selectalternateunits{#2}{#3}{#4}}}
-    \cs_new:cpn {#1vectoralternateunits} ##1 {\unit{\mivector{##1}}{\mandi@selectalternateunits{#2}{#3}{#4}}}
+    \cs_new:cpn {vector#1baseunits} ##1 {\units{\mivector{##1}}{\mandi@selectbaseunits{#2}{#3}{#4}}}
+    \cs_new:cpn {#1vectorbaseunits} ##1 {\units{\mivector{##1}}{\mandi@selectbaseunits{#2}{#3}{#4}}}
+    \cs_new:cpn {vector#1derivedunits} ##1 {\units{\mivector{##1}}{\mandi@selectderivedunits{#2}{#3}{#4}}}
+    \cs_new:cpn {#1vectorderivedunits} ##1 {\units{\mivector{##1}}{\mandi@selectderivedunits{#2}{#3}{#4}}}
+    \cs_new:cpn {vector#1alternateunits} ##1 {\units{\mivector{##1}}{\mandi@selectalternateunits{#2}{#3}{#4}}}
+    \cs_new:cpn {#1vectoralternateunits} ##1 {\units{\mivector{##1}}{\mandi@selectalternateunits{#2}{#3}{#4}}}
     \cs_new:cpn {vector#1onlybaseunits} {\mandi@selectbaseunits{#2}{#3}{#4}}
     \cs_new:cpn {#1vectoronlybaseunits} {\mandi@selectbaseunits{#2}{#3}{#4}}
     \cs_new:cpn {vector#1onlyderivedunits} {\mandi@selectderivedunits{#2}{#3}{#4}}
@@ -2259,7 +2309,7 @@
     \cs_new:cpn {vector#1onlyalternateunits} {\mandi@selectalternateunits{#2}{#3}{#4}}
     \cs_new:cpn {#1vectoronlyalternateunits} {\mandi@selectalternateunits{#2}{#3}{#4}}
   }
-\NewDocumentCommand{\newvectorquantity}{ m m O{#2} O{#2} }
+\NewDocumentCommand{\NewVectorQuantity}{ m m O{#2} O{#2} }
   {
     \__mandi_newvectorquantity:nnnn { #1 }{ #2 }{ #3 }{ #4 }
   }
@@ -2273,16 +2323,16 @@
 \cs_new:Npn \__mandi_renewvectorquantity:nnnn #1#2#3#4
   {
     \__mandi_renewscalarquantity:nnnn { #1 }{ #2 }{ #3 }{ #4 }
-    \cs_set:cpn {vector#1} ##1 {\unit{\mivector{##1}}{\mandi@selectunits{#2}{#3}{#4}}}
-    \cs_set:cpn {#1vector} ##1 {\unit{\mivector{##1}}{\mandi@selectunits{#2}{#3}{#4}}}
+    \cs_set:cpn {vector#1} ##1 {\units{\mivector{##1}}{\mandi@selectunits{#2}{#3}{#4}}}
+    \cs_set:cpn {#1vector} ##1 {\units{\mivector{##1}}{\mandi@selectunits{#2}{#3}{#4}}}
     \cs_set:cpn {vector#1value} ##1 {\mivector{##1}}
     \cs_set:cpn {#1vectorvalue} ##1 {\mivector{##1}}
-    \cs_set:cpn {vector#1baseunits} ##1 {\unit{\mivector{##1}}{\mandi@selectbaseunits{#2}{#3}{#4}}}
-    \cs_set:cpn {#1vectorbaseunits} ##1 {\unit{\mivector{##1}}{\mandi@selectbaseunits{#2}{#3}{#4}}}
-    \cs_set:cpn {vector#1derivedunits} ##1 {\unit{\mivector{##1}}{\mandi@selectderivedunits{#2}{#3}{#4}}}
-    \cs_set:cpn {#1vectorderivedunits} ##1 {\unit{\mivector{##1}}{\mandi@selectderivedunits{#2}{#3}{#4}}}
-    \cs_set:cpn {vector#1alternateunits} ##1 {\unit{\mivector{##1}}{\mandi@selectalternateunits{#2}{#3}{#4}}}
-    \cs_set:cpn {#1vectoralternateunits} ##1 {\unit{\mivector{##1}}{\mandi@selectalternateunits{#2}{#3}{#4}}}
+    \cs_set:cpn {vector#1baseunits} ##1 {\units{\mivector{##1}}{\mandi@selectbaseunits{#2}{#3}{#4}}}
+    \cs_set:cpn {#1vectorbaseunits} ##1 {\units{\mivector{##1}}{\mandi@selectbaseunits{#2}{#3}{#4}}}
+    \cs_set:cpn {vector#1derivedunits} ##1 {\units{\mivector{##1}}{\mandi@selectderivedunits{#2}{#3}{#4}}}
+    \cs_set:cpn {#1vectorderivedunits} ##1 {\units{\mivector{##1}}{\mandi@selectderivedunits{#2}{#3}{#4}}}
+    \cs_set:cpn {vector#1alternateunits} ##1 {\units{\mivector{##1}}{\mandi@selectalternateunits{#2}{#3}{#4}}}
+    \cs_set:cpn {#1vectoralternateunits} ##1 {\units{\mivector{##1}}{\mandi@selectalternateunits{#2}{#3}{#4}}}
     \cs_set:cpn {vector#1onlybaseunits} {\mandi@selectbaseunits{#2}{#3}{#4}}
     \cs_set:cpn {#1vectoronlybaseunits} {\mandi@selectbaseunits{#2}{#3}{#4}}
     \cs_set:cpn {vector#1onlyderivedunits} {\mandi@selectderivedunits{#2}{#3}{#4}}
@@ -2290,7 +2340,7 @@
     \cs_set:cpn {vector#1onlyalternateunits} {\mandi@selectalternateunits{#2}{#3}{#4}}
     \cs_set:cpn {#1vectoronlyalternateunits} {\mandi@selectalternateunits{#2}{#3}{#4}}
   }
-\NewDocumentCommand{\renewvectorquantity}{ m m O{#2} O{#2} }
+\NewDocumentCommand{\RenewVectorQuantity}{ m m O{#2} O{#2} }
   {
     \__mandi_renewvectorquantity:nnnn { #1 }{ #2 }{ #3 }{ #4 }
   }
@@ -2303,21 +2353,21 @@
 \ExplSyntaxOn
 \cs_new:Npn \__mandi_newphysicalconstant:nnnnnnn #1#2#3#4#5#6#7
   {
-    \cs_new:cpn {#1} {\unit{\mandi@selectprecision{#3}{#4}}{\mandi@selectunits{#5}{#6}{#7}}}
+    \cs_new:cpn {#1} {\units{\mandi@selectprecision{#3}{#4}}{\mandi@selectunits{#5}{#6}{#7}}}
     \cs_new:cpn {#1mathsymbol} {#2}
     \cs_new:cpn {#1approximatevalue} {#3}
     \cs_new:cpn {#1precisevalue} {#4}
     \cs_new:cpn {#1baseunits} 
-      {\unit{\mandi@selectprecision{#3}{#4}}{\mandi@selectbaseunits{#5}{#6}{#7}}}
+      {\units{\mandi@selectprecision{#3}{#4}}{\mandi@selectbaseunits{#5}{#6}{#7}}}
     \cs_new:cpn {#1derivedunits} 
-      {\unit{\mandi@selectprecision{#3}{#4}}{\mandi@selectderivedunits{#5}{#6}{#7}}}
+      {\units{\mandi@selectprecision{#3}{#4}}{\mandi@selectderivedunits{#5}{#6}{#7}}}
     \cs_new:cpn {#1alternateunits} 
-      {\unit{\mandi@selectprecision{#3}{#4}}{\mandi@selectalternateunits{#5}{#6}{#7}}}
+      {\units{\mandi@selectprecision{#3}{#4}}{\mandi@selectalternateunits{#5}{#6}{#7}}}
     \cs_new:cpn {#1onlybaseunits} {\mandi@selectbaseunits{#5}{#6}{#7}}
     \cs_new:cpn {#1onlyderivedunits} {\mandi@selectderivedunits{#5}{#6}{#7}}
     \cs_new:cpn {#1onlyalternateunits} {\mandi@selectalternateunits{#5}{#6}{#7}}
   }
-\NewDocumentCommand{\newphysicalconstant}{ m m m m m O{#5} O{#5} }
+\NewDocumentCommand{\NewPhysicalConstant}{ m m m m m O{#5} O{#5} }
   {
     \__mandi_newphysicalconstant:nnnnnnn { #1 }{ #2 }{ #3 }{ #4 }{ #5 }{ #6 }{ #7 }
   }
@@ -2330,21 +2380,21 @@
 \ExplSyntaxOn
 \cs_new:Npn \__mandi_renewphysicalconstant:nnnnnnn #1#2#3#4#5#6#7
   {
-    \cs_set:cpn {#1} {\unit{\mandi@selectprecision{#3}{#4}}{\mandi@selectunits{#5}{#6}{#7}}}
+    \cs_set:cpn {#1} {\units{\mandi@selectprecision{#3}{#4}}{\mandi@selectunits{#5}{#6}{#7}}}
     \cs_set:cpn {#1mathsymbol} {#2}
     \cs_set:cpn {#1approximatevalue} {#3}
     \cs_set:cpn {#1precisevalue} {#4}
     \cs_set:cpn {#1baseunits} 
-      {\unit{\mandi@selectprecision{#3}{#4}}{\mandi@selectbaseunits{#5}{#6}{#7}}}
+      {\units{\mandi@selectprecision{#3}{#4}}{\mandi@selectbaseunits{#5}{#6}{#7}}}
     \cs_set:cpn {#1derivedunits} 
-      {\unit{\mandi@selectprecision{#3}{#4}}{\mandi@selectderivedunits{#5}{#6}{#7}}}
+      {\units{\mandi@selectprecision{#3}{#4}}{\mandi@selectderivedunits{#5}{#6}{#7}}}
     \cs_set:cpn {#1alternateunits} 
-      {\unit{\mandi@selectprecision{#3}{#4}}{\mandi@selectalternateunits{#5}{#6}{#7}}}
+      {\units{\mandi@selectprecision{#3}{#4}}{\mandi@selectalternateunits{#5}{#6}{#7}}}
     \cs_set:cpn {#1onlybaseunits} {\mandi@selectbaseunits{#5}{#6}{#7}}
     \cs_set:cpn {#1onlyderivedunits} {\mandi@selectderivedunits{#5}{#6}{#7}}
     \cs_set:cpn {#1onlyalternateunits} {\mandi@selectalternateunits{#5}{#6}{#7}}
   }
-\NewDocumentCommand{\renewphysicalconstant}{ m m m m m O{#5} O{#5} }
+\NewDocumentCommand{\RenewPhysicalConstant}{ m m m m m O{#5} O{#5} }
   {
     \__mandi_renewphysicalconstant:nnnnnnn { #1 }{ #2 }{ #3 }{ #4 }{ #5 }{ #6 }{ #7 }
   }
@@ -2352,331 +2402,438 @@
 %    \end{macrocode}
 %
 % Define every quantity we need in introductory physics, alphabetically
-% for convenience. This is really the core feature of \mandi\ that no other
+% for convenience. This is really the core feature of \mandi{} that no other
 % package offers. There are commands for quantities that have no dimensions 
 % or units, and these quantities are defined for semantic completeness.
 %
 %    \begin{macrocode}
-\newvectorquantity{acceleration}%
+\NewVectorQuantity{acceleration}%
   {\meter\usk\second\totheinversetwo}%
   [\newton\per\kilogram]%
   [\meter\per\second\tothetwo]%
-\newscalarquantity{amount}%
+\NewScalarQuantity{amount}%
   {\mole}%
-\newvectorquantity{angularacceleration}%
+\NewVectorQuantity{angularacceleration}%
   {\radian\usk\second\totheinversetwo}%
   [\radian\per\second\tothetwo]%
   [\radian\per\second\tothetwo]%
-\newscalarquantity{angularfrequency}%
+\NewScalarQuantity{angularfrequency}%
   {\radian\usk\second\inverse}%
   [\radian\per\second]%
   [\radian\per\second]%
-%\ifmandi@rotradians
-%  \newphysicalquantity{angularimpulse}%
-%    {\meter\tothetwo\usk\kilogram\usk\second\inverse\usk\radian\inverse}%
-%    [\joule\usk\second\per\radian]%
-%    [\newton\usk\meter\usk\second\per\radian]%
-%  \newphysicalquantity{angularmomentum}%
-%    {\meter\tothetwo\usk\kilogram\usk\second\inverse\usk\radian\inverse}%
-%    [\kilogram\usk\meter\tothetwo\per(\second\usk\radian)]%
-%    [\newton\usk\meter\usk\second\per\radian]%
-%\else
-\newvectorquantity{angularimpulse}%
+%    \end{macrocode}
+%
+% Angular impulse may also be |\newton\usk\meter\usk\second| or
+% |\joule\usk\second|.
+%
+%    \begin{macrocode}
+\NewVectorQuantity{angularimpulse}%
   {\kilogram\usk\meter\tothetwo\usk\second\inverse}%
-  [\kilogram\usk\meter\tothetwo\per\second]% % also \joule\usk\second
-  [\kilogram\usk\meter\tothetwo\per\second]% % also \newton\usk\meter\usk\second
-\newvectorquantity{angularmomentum}%
+  [\kilogram\usk\meter\tothetwo\per\second]%
+  [\kilogram\usk\meter\tothetwo\per\second]%
+%    \end{macrocode}
+%
+% Angular momentum may also be |\joule\usk\second| or 
+% |\newton\usk\meter\usk\second|.
+%
+%    \begin{macrocode}
+\NewVectorQuantity{angularmomentum}%
   {\kilogram\usk\meter\tothetwo\usk\second\inverse}%
-  [\kilogram\usk\meter\tothetwo\per\second]% % also \joule\usk\second
-  [\kilogram\usk\meter\tothetwo\per\second]% % also \newton\usk\meter\usk\second
-%\fi
-\newvectorquantity{angularvelocity}%
+  [\kilogram\usk\meter\tothetwo\per\second]%
+  [\kilogram\usk\meter\tothetwo\per\second]%
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+\NewVectorQuantity{angularvelocity}%
   {\radian\usk\second\inverse}%
   [\radian\per\second]%
   [\radian\per\second]%
-\newscalarquantity{area}%
+\NewScalarQuantity{area}%
   {\meter\tothetwo}%
-\newscalarquantity{areachargedensity}%
+\NewScalarQuantity{areachargedensity}%
   {\ampere\usk\second\usk\meter\totheinversetwo}%
   [\coulomb\per\meter\tothetwo]%
   [\coulomb\per\meter\tothetwo]%
-\newscalarquantity{areamassdensity}%
+\NewScalarQuantity{areamassdensity}%
   {\kilogram\usk\meter\totheinversetwo}%
   [\kilogram\per\meter\tothetwo]%
   [\kilogram\per\meter\tothetwo]%
-\newscalarquantity{capacitance}%
+%    \end{macrocode}
+%
+% Capacitance may also be |\coulomb\tothetwo\per\newton\usk\meter| or
+% |\second\per\ohm|.
+%
+%    \begin{macrocode}
+\NewScalarQuantity{capacitance}%
   {\ampere\tothetwo\usk\second\tothefour\usk\kilogram\inverse\usk\meter\totheinversetwo}%
   [\farad]%
-  [\coulomb\per\volt]% % also \coulomb\tothetwo\per\newton\usk\meter, \second\per\ohm
-\newscalarquantity{charge}%
+  [\coulomb\per\volt]%
+%    \end{macrocode}
+%
+% Charge may also be |\farad\usk\volt|.
+%
+%    \begin{macrocode}
+\NewScalarQuantity{charge}%
   {\ampere\usk\second}%
   [\coulomb]%
-  [\coulomb]% % also \farad\usk\volt
-\newvectorquantity{cmagneticfield}%
+  [\coulomb]%
+%    \end{macrocode}
+%
+% Magnetic field times \(\symup{c}\) may also be |\volt\per\meter|.
+%
+%    \begin{macrocode}
+\NewVectorQuantity{cmagneticfield}%
   {\kilogram\usk\meter\usk\ampere\inverse\usk\second\totheinversethree}%  
-  [\newton\per\coulomb]% % also \volt\per\meter
   [\newton\per\coulomb]%
-\newscalarquantity{conductance}%
+  [\newton\per\coulomb]%
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+\NewScalarQuantity{conductance}%
   {\ampere\tothetwo\usk\second\tothethree\usk\kilogram\inverse\usk\meter\totheinversetwo}%
   [\siemens]%
   [\ampere\per\volt]%
-\newscalarquantity{conductivity}%
+\NewScalarQuantity{conductivity}%
   {\ampere\tothetwo\usk\second\tothethree\usk\kilogram\inverse\usk\meter\totheinversethree}%
   [\siemens\per\meter]%
   [\ampere\per\volt\usk\meter]%
-\newscalarquantity{conventionalcurrent}%
+\NewScalarQuantity{conventionalcurrent}%
   {\ampere}%
   [\coulomb\per\second]%
   [\ampere]%
-\newscalarquantity{current}%
+\NewScalarQuantity{current}%
   {\ampere}%
-\newscalarquantity{currentdensity}%
+\NewScalarQuantity{currentdensity}%
   {\ampere\usk\meter\totheinversetwo}%
   [\coulomb\per\second\usk\meter\tothetwo]%
   [\ampere\per\meter\tothetwo]%
-\newscalarquantity{dielectricconstant}%
+\NewScalarQuantity{dielectricconstant}%
   {}%
-\newvectorquantity{direction}%
+\NewVectorQuantity{direction}%
   {}%
-\newvectorquantity{displacement}%
+\NewVectorQuantity{displacement}%
   {\meter}
-\newscalarquantity{duration}%
+\NewScalarQuantity{duration}%
   {\second}%
-\newvectorquantity{electricdipolemoment}%
+\NewVectorQuantity{electricdipolemoment}%
   {\ampere\usk\second\usk\meter}%
   [\coulomb\usk\meter]%
   [\coulomb\usk\meter]%
-\newvectorquantity{electricfield}%
+\NewVectorQuantity{electricfield}%
   {\kilogram\usk\meter\usk\ampere\inverse\usk\second\totheinversethree}%
   [\volt\per\meter]%
   [\newton\per\coulomb]%
-\newscalarquantity{electricflux}%
+\NewScalarQuantity{electricflux}%
   {\kilogram\usk\meter\tothethree\usk\ampere\inverse\usk\second\totheinversethree}%
   [\volt\usk\meter]%
   [\newton\usk\meter\tothetwo\per\coulomb]%
-\newscalarquantity{electricpotential}%
+%    \end{macrocode}
+%
+% Electric potential, electric potential difference, and emf 
+% may also be |\joule\per\coulomb|.
+%
+%    \begin{macrocode}
+\NewScalarQuantity{electricpotential}%
   {\kilogram\usk\meter\tothetwo\usk\ampere\inverse\usk\second\totheinversethree}%
-  [\volt]% % also \joule\per\coulomb
   [\volt]%
-\newscalarquantity{electricpotentialdifference}%
+  [\volt]%
+%    \end{macrocode}
+%
+%    \begin{macrocode} 
+\NewScalarQuantity{electricpotentialdifference}%
   {\kilogram\usk\meter\tothetwo\usk\ampere\inverse\usk\second\totheinversethree}%
-  [\volt]% % also \joule\per\coulomb
   [\volt]%
-\newscalarquantity{electroncurrent}%
+  [\volt]%
+\NewScalarQuantity{electroncurrent}%
   {\second\inverse}%
   [\ensuremath{\symup{e}}\per\second]%
   [\ensuremath{\symup{e}}\per\second]%
-\newscalarquantity{emf}%
+\NewScalarQuantity{emf}%
   {\kilogram\usk\meter\tothetwo\usk\ampere\inverse\usk\second\totheinversethree}%
-  [\volt]% % also \joule\per\coulomb
   [\volt]%
-\newscalarquantity{energy}%
+  [\volt]%
+%    \end{macrocode}
+%
+% Energy may also be |\newton\usk\meter|.
+%
+%    \begin{macrocode}
+\NewScalarQuantity{energy}%
   {\kilogram\usk\meter\tothetwo\usk\second\totheinversetwo}%
-  [\joule]% % also \newton\usk\meter
   [\joule]%
-\newscalarquantity{energyinev}%
+  [\joule]%
+%    \end{macrocode}
+%
+%    \begin{macrocode} 
+\NewScalarQuantity{energyinev}%
   {\electronvolt}%
-\newscalarquantity{energyinkev}%
+\NewScalarQuantity{energyinkev}%
   {\kiloelectronvolt}%
-\newscalarquantity{energyinmev}%
+\NewScalarQuantity{energyinmev}%
   {\megaelectronvolt}%
-\newscalarquantity{energydensity}%
+\NewScalarQuantity{energydensity}%
   {\kilogram\usk\meter\inverse\usk\second\totheinversetwo}%
   [\joule\per\meter\tothethree]%
   [\joule\per\meter\tothethree]%
-\newscalarquantity{energyflux}%
+\NewScalarQuantity{energyflux}%
   {\kilogram\usk\second\totheinversethree}%
   [\watt\per\meter\tothetwo]%
   [\watt\per\meter\tothetwo]%
-\newscalarquantity{entropy}%
+\NewScalarQuantity{entropy}%
   {\kilogram\usk\meter\tothetwo\usk\second\totheinversetwo\usk\kelvin\inverse}%
   [\joule\per\kelvin]%
   [\joule\per\kelvin]%
-\newvectorquantity{force}%
+%    \end{macrocode}
+%
+% Force may also be |\kilogram\usk\meter\per\second\tothetwo|.
+%
+%    \begin{macrocode}
+\NewVectorQuantity{force}%
   {\kilogram\usk\meter\usk\second\totheinversetwo}%
   [\newton]%
-  [\newton]% % also \kilogram\usk\meter\per\second\tothetwo
-\newscalarquantity{frequency}%
+  [\newton]%
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+\NewScalarQuantity{frequency}%
   {\second\inverse}%
   [\hertz]%
   [\hertz]%
-\newvectorquantity{gravitationalfield}%
+\NewVectorQuantity{gravitationalfield}%
   {\meter\usk\second\totheinversetwo}%
   [\newton\per\kilogram]%
   [\newton\per\kilogram]%
-\newscalarquantity{gravitationalpotential}%
+\NewScalarQuantity{gravitationalpotential}%
   {\meter\tothetwo\usk\second\totheinversetwo}%
   [\joule\per\kilogram]%
   [\joule\per\kilogram]%
-\newscalarquantity{gravitationalpotentialdifference}%
+\NewScalarQuantity{gravitationalpotentialdifference}%
   {\meter\tothetwo\usk\second\totheinversetwo}%
   [\joule\per\kilogram]%
   [\joule\per\kilogram]%
-\newvectorquantity{impulse}%
+\NewVectorQuantity{impulse}%
   {\kilogram\usk\meter\usk\second\inverse}%
   [\newton\usk\second]%
   [\newton\usk\second]%
-\newscalarquantity{indexofrefraction}%
+\NewScalarQuantity{indexofrefraction}%
   {}%
-\newscalarquantity{inductance}%
+%    \end{macrocode}
+%
+% Inductance may also be |\square\meter\usk\kilogram\per\coulomb\tothetwo| or
+% |\Wb\per\ampere|.
+%
+%    \begin{macrocode}
+\NewScalarQuantity{inductance}%
   {\kilogram\usk\meter\tothetwo\usk\ampere\totheinversetwo\usk\second\totheinversetwo}%
   [\henry]%
-  [\volt\usk\second\per\ampere]% % also \square\meter\usk\kilogram\per\coulomb\tothetwo, \Wb\per\ampere
-\newscalarquantity{linearchargedensity}%
+  [\volt\usk\second\per\ampere]%
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+\NewScalarQuantity{linearchargedensity}%
   {\ampere\usk\second\usk\meter\inverse}%
   [\coulomb\per\meter]%
   [\coulomb\per\meter]%
-\newscalarquantity{linearmassdensity}%
+\NewScalarQuantity{linearmassdensity}%
   {\kilogram\usk\meter\inverse}%
   [\kilogram\per\meter]%
   [\kilogram\per\meter]%
 %    \end{macrocode}
 %
 % \changes{v3.1.0}{2022-01-27}
-%   {\linktoplace{sec:mandipkg}{mandi} Added \refCom{lorentzfactor}}
+%   {\linktoplace{sec:mandia}{mandi} Added \refCom{lorentzfactor}}
 %    \begin{macrocode}
-\newscalarquantity{lorentzfactor}%
+\NewScalarQuantity{lorentzfactor}%
   {}%
-\newscalarquantity{luminousintensity}%
+\NewScalarQuantity{luminousintensity}%
   {\candela}%
-\newscalarquantity{magneticcharge}%
-  {\ampere\usk\meter}% % There is another convention. Be careful!
-\newvectorquantity{magneticdipolemoment}%
+%    \end{macrocode}
+%
+% There is another convention for magnetic charge, so be careful.
+%
+%    \begin{macrocode}
+\NewScalarQuantity{magneticcharge}%
+  {\ampere\usk\meter}%
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+\NewVectorQuantity{magneticdipolemoment}%
   {\ampere\usk\meter\tothetwo}%
   [\ampere\usk\meter\tothetwo]%
   [\joule\per\tesla]%
-\newvectorquantity{magneticfield}%
+%    \end{macrocode}
+%
+% Magnetic field may also be |\Wb\per\meter\tothetwo|.
+%
+%    \begin{macrocode}
+\NewVectorQuantity{magneticfield}%
   {\kilogram\usk\ampere\inverse\usk\second\totheinversetwo}%
-  [\newton\per\ampere\usk\meter]% % also \Wb\per\meter\tothetwo
+  [\newton\per\ampere\usk\meter]%
   [\tesla]%
-\newscalarquantity{magneticflux}%
+%    \end{macrocode}
+%
+% Magnetic flux may also be |\Wb| or
+% |\joule\per\ampere|.
+%
+%    \begin{macrocode}
+\NewScalarQuantity{magneticflux}%
   {\kilogram\usk\meter\tothetwo\usk\ampere\inverse\usk\second\totheinversetwo}%
   [\tesla\usk\meter\tothetwo]%
-  [\volt\usk\second]% % also \Wb and \joule\per\ampere
-\newscalarquantity{mass}%
+  [\volt\usk\second]%
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+\NewScalarQuantity{mass}%
   {\kilogram}%
-\newscalarquantity{mobility}%
+\NewScalarQuantity{mobility}%
   {\kilogram\usk\meter\tothetwo\usk\ampere\inverse\usk\second\totheinversefour}%
   [\meter\tothetwo\per\volt\usk\second]%
   [\coulomb\usk\meter\per\newton\usk\second]%
-\newscalarquantity{momentofinertia}%
+\NewScalarQuantity{momentofinertia}%
   {\kilogram\usk\meter\tothetwo}%
   [\joule\usk\second\tothetwo]%
   [\kilogram\usk\meter\tothetwo]%
-\newvectorquantity{momentum}%
+\NewVectorQuantity{momentum}%
   {\kilogram\usk\meter\usk\second\inverse}%
   [\kilogram\usk\meter\per\second]%
   [\kilogram\usk\meter\per\second]%
-\newvectorquantity{momentumflux}%
+\NewVectorQuantity{momentumflux}%
   {\kilogram\usk\meter\inverse\usk\second\totheinversetwo}%
   [\newton\per\meter\tothetwo]%
   [\newton\per\meter\tothetwo]%
-\newscalarquantity{numberdensity}%
+\NewScalarQuantity{numberdensity}%
   {\meter\totheinversethree}%
   [\per\meter\tothethree]%
   [\per\meter\tothethree]%
-\newscalarquantity{permeability}%
+\NewScalarQuantity{permeability}%
   {\kilogram\usk\meter\usk\ampere\totheinversetwo\usk\second\totheinversetwo}%
   [\henry\per\meter]%
   [\tesla\usk\meter\per\ampere]%
-\newscalarquantity{permittivity}%
+\NewScalarQuantity{permittivity}%
   {\ampere\tothetwo\usk\second\tothefour\usk\kilogram\inverse\usk\meter\totheinversethree}%
   [\farad\per\meter]%
   [\coulomb\tothetwo\per\newton\usk\meter\tothetwo]%
-\newscalarquantity{planeangle}%
+\NewScalarQuantity{planeangle}%
   {\meter\usk\meter\inverse}%
   [\radian]%
   [\radian]%
-\newscalarquantity{polarizability}%
+\NewScalarQuantity{polarizability}%
   {\ampere\tothetwo\usk\second\tothefour\usk\kilogram\inverse}%
   [\coulomb\usk\meter\tothetwo\per\volt]%
   [\coulomb\tothetwo\usk\meter\per\newton]%
-\newscalarquantity{power}%
+\NewScalarQuantity{power}%
   {\kilogram\usk\meter\tothetwo\usk\second\totheinversethree}%
   [\watt]%
   [\joule\per\second]%
-\newvectorquantity{poynting}%
+\NewVectorQuantity{poynting}%
   {\kilogram\usk\second\totheinversethree}%
   [\watt\per\meter\tothetwo]%
   [\watt\per\meter\tothetwo]%
-\newscalarquantity{pressure}%
+\NewScalarQuantity{pressure}%
   {\kilogram\usk\meter\inverse\usk\second\totheinversetwo}%
   [\pascal]%
   [\newton\per\meter\tothetwo]%
-\newscalarquantity{relativepermeability}
+\NewScalarQuantity{relativepermeability}
   {}%
-\newscalarquantity{relativepermittivity}%
+\NewScalarQuantity{relativepermittivity}%
   {}%
-\newscalarquantity{resistance}%
+%    \end{macrocode}
+%
+% Resistance may also be |\volt\per\ampere|.
+%
+%    \begin{macrocode}
+\NewScalarQuantity{resistance}%
   {\kilogram\usk\meter\tothetwo\usk\ampere\totheinversetwo\usk\second\totheinversethree}%
-  [\ohm]% % also \volt\per\ampere
   [\ohm]%
-\newscalarquantity{resistivity}%
+  [\ohm]%
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+\NewScalarQuantity{resistivity}%
   {\kilogram\usk\meter\tothethree\usk\ampere\totheinversetwo\usk\second\totheinversethree}%
   [\ohm\usk\meter]%
   [\volt\usk\meter\per\ampere]%
-\newscalarquantity{solidangle}%
+\NewScalarQuantity{solidangle}%
   {\meter\tothetwo\usk\meter\totheinversetwo}%
   [\steradian]%
   [\steradian]%
-\newscalarquantity{specificheatcapacity}%
+\NewScalarQuantity{specificheatcapacity}%
   {\meter\tothetwo\usk\second\totheinversetwo\usk\kelvin\inverse}%
   [\joule\per\kelvin\usk\kilogram]%
   [\joule\per\kelvin\usk\kilogram]
-\newscalarquantity{springstiffness}%
+\NewScalarQuantity{springstiffness}%
   {\kilogram\usk\second\totheinversetwo}%
   [\newton\per\meter]%
   [\newton\per\meter]%
-\newscalarquantity{springstretch}% % This is really just a displacement.
+%    \end{macrocode}
+%
+% Spring stretch is really just a displacement.
+%
+%    \begin{macrocode}
+\NewScalarQuantity{springstretch}%
   {\meter}%
-\newscalarquantity{stress}%
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+\NewScalarQuantity{stress}%
   {\kilogram\usk\meter\inverse\usk\second\totheinversetwo}%
   [\pascal]%
   [\newton\per\meter\tothetwo]%
-\newscalarquantity{strain}%
+\NewScalarQuantity{strain}%
   {}%
-\newscalarquantity{temperature}%
+\NewScalarQuantity{temperature}%
   {\kelvin}%
-%\ifmandi@rotradians
-%  \newphysicalquantity{torque}%
-%    {\kilogram\usk\meter\tothetwo\usk\second\totheinversetwo\usk\radian\inverse}%
-%    [\newton\usk\meter\per\radian]%
-%    [\newton\usk\meter\per\radian]%
-%\else
-\newvectorquantity{torque}%
+\NewVectorQuantity{torque}%
   {\kilogram\usk\meter\tothetwo\usk\second\totheinversetwo}%
   [\newton\usk\meter]%
   [\newton\usk\meter]%
-%\fi
-\newvectorquantity{velocity}%
+\NewVectorQuantity{velocity}%
   {\meter\usk\second\inverse}%
   [\meter\per\second]%
   [\meter\per\second]%
-\newvectorquantity{velocityc}%
+\NewVectorQuantity{velocityc}%
   {\lightspeed}%
   [\lightspeed]%
   [\lightspeed]%
-\newscalarquantity{volume}%
+\NewScalarQuantity{volume}%
   {\meter\tothethree}%
-\newscalarquantity{volumechargedensity}%
+\NewScalarQuantity{volumechargedensity}%
   {\ampere\usk\second\per\meter\totheinversethree}%
   [\coulomb\per\meter\tothethree]%
   [\coulomb\per\meter\tothethree]%
-\newscalarquantity{volumemassdensity}%
+\NewScalarQuantity{volumemassdensity}%
   {\kilogram\usk\meter\totheinversethree}%
   [\kilogram\per\meter\tothethree]%
   [\kilogram\per\meter\tothethree]%
-\newscalarquantity{wavelength}% % This is really just a displacement.
+%    \end{macrocode}
+%
+% Wavelength is really just a displacement.
+%
+%    \begin{macrocode}
+\NewScalarQuantity{wavelength}%
   {\meter}%
-\newvectorquantity{wavenumber}%
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+\NewVectorQuantity{wavenumber}%
   {\meter\inverse}%
   [\per\meter]%
   [\per\meter]%
-\newscalarquantity{work}%
+%    \end{macrocode}
+%
+% Work may also be |\newton\usk\meter| but this 
+% is discouraged to avoid confusion with torque.
+%
+%    \begin{macrocode}
+\NewScalarQuantity{work}%
   {\kilogram\usk\meter\tothetwo\usk\second\totheinversetwo}%
-  [\joule]% % also \newton\usk\meter but discouraged 
   [\joule]%
-\newscalarquantity{youngsmodulus}% % This is really just a stress.
+  [\joule]%
+%    \end{macrocode}
+%
+% Young's modulus is really just a stress.
+%
+%    \begin{macrocode}
+\NewScalarQuantity{youngsmodulus}%
   {\kilogram\usk\meter\inverse\usk\second\totheinversetwo}%
   [\pascal]%
   [\newton\per\meter\tothetwo]%
@@ -2685,14 +2842,19 @@
 % We need a better glyph for Planck's constant over \( 2\pi \).
 %
 % \changes{v3.1.0}{2022-01-27}
-%   {\linktoplace{sec:mandipkg}{mandi} Added \refCom{hbar}}
+%   {\linktoplace{sec:mandia}{mandi} Added \refCom{hbar}}
 %    \begin{macrocode}
 \AtBeginDocument{%
   \DeclareRobustCommand{\hbar}{{\mathpalette\hbar@\relax\symup{h}}}%
 }%
 \newcommand*{\hbar@}[2]{%
   \makebox[0pt][l]{\raisebox{-0.07\height}{\(\m@th#1\mkern-2mu\mathchar"AF\)}}%
-  % optional line to make the bar thicker; must use -0.11
+%    \end{macrocode}
+%
+% Optional line to make the bar thicker; must use \(-0.11\)
+% in |\raisebox|.
+%
+%    \begin{macrocode}
   \makebox[0pt][l]{\raisebox{-0.11\height}{\(\m@th#1\mkern-2mu\mathchar"AF\)}}%
 }%
 %    \end{macrocode}
@@ -2701,119 +2863,129 @@
 % for convenience.
 %
 % \changes{v3.1.0}{2022-01-27}
-%   {\linktoplace{sec:mandipkg}{mandi} Constants' values now use only \cs{times}}
+%   {\linktoplace{sec:mandia}{mandi} Constants' values now use only \cs{times}}
 %    \begin{macrocode}
-\newphysicalconstant{avogadro}%
-  {\symup{N_A}}%
-  {6\times10^{23}}{6.02214076\times10^{23}}% % exact 2019 value
+\NewPhysicalConstant{avogadro}%
+  {\symup{N_{A}}}%
+  {6\times10^{23}}{6.02214076\times10^{23}}%
   {\mole\inverse}%
   [\per\mole]%
   [\per\mole]%
-\newphysicalconstant{biotsavartconstant}% % alias for \mzofp
-  {\symup{\frac{\mu_o}{4\pi}}}%
+%    \end{macrocode}
+%
+% |\biotsavartconstant| is an alias for |\mzofp|.
+%
+%    \begin{macrocode}
+\NewPhysicalConstant{biotsavartconstant}%
+  {\symup{\frac{\mu_{o}}{4\pi}}}%
   {10^{-7}}{10^{-7}}%
   {\kilogram\usk\meter\usk\ampere\totheinversetwo\usk\second\totheinversetwo}%
   [\henry\per\meter]%
   [\tesla\usk\meter\per\ampere]%
-\newphysicalconstant{bohrradius}%
-  {\symup{a_o}}%
+\NewPhysicalConstant{bohrradius}%
+  {\symup{a_{o}}}%
   {5.3\times10^{-11}}{5.29177210903\times10^{-11}}%
   {\meter}%
-\newphysicalconstant{boltzmann}%
-  {\symup{k_B}}%
-  {1.4\times10^{-23}}{1.380649\times10^{-23}}% % exact 2019 value
+\NewPhysicalConstant{boltzmann}%
+  {\symup{k_{B}}}%
+  {1.4\times10^{-23}}{1.380649\times10^{-23}}%
   {\kilogram\usk\meter\tothetwo\usk\second\totheinversetwo\usk\kelvin\inverse}%
   [\joule\per\kelvin]%
   [\joule\per\kelvin]%
-\newphysicalconstant{coulombconstant}% % alias for \oofpez
-  {\symup{\frac{1}{4\pi\epsilon_o}}}%
+%    \end{macrocode}
+%
+% |\coulombconstant| is an alias for |\oofpez|.
+%
+%    \begin{macrocode}
+\NewPhysicalConstant{coulombconstant}%
+  {\symup{\frac{1}{4\pi\epsilon_{o}}}}%
   {9\times10^{9}}{8.9875517923\times10^{9}}%
   {\kilogram\usk\meter\tothethree\usk\ampere\totheinversetwo\usk\second\totheinversefour}%
   [\meter\per\farad]%
   [\newton\usk\meter\tothetwo\per\coulomb\tothetwo]%
-\newphysicalconstant{earthmass}%
+\NewPhysicalConstant{earthmass}%
   {\symup{M_{Earth}}}%
   {6.0\times10^{24}}{5.9722\times10^{24}}%
   {\kilogram}%
-\newphysicalconstant{earthmoondistance}%
+\NewPhysicalConstant{earthmoondistance}%
   {\symup{d_{EM}}}%
   {3.8\times10^{8}}{3.81550\times10^{8}}%
   {\meter}%
-\newphysicalconstant{earthradius}%
+\NewPhysicalConstant{earthradius}%
   {\symup{R_{Earth}}}%
   {6.4\times10^{6}}{6.3781\times10^{6}}%
   {\meter}%
-\newphysicalconstant{earthsundistance}%
+\NewPhysicalConstant{earthsundistance}%
   {\symup{d_{ES}}}%
   {1.5\times10^{11}}{1.496\times10^{11}}%
   {\meter}%
-\newphysicalconstant{electroncharge}%
-  {\symup{q_e}}%
+\NewPhysicalConstant{electroncharge}%
+  {\symup{q_{e}}}%
   {-\elementarychargeapproximatevalue}{-\elementarychargeprecisevalue}%
   {\ampere\usk\second}%
   [\coulomb]%
   [\coulomb]%
-\newphysicalconstant{electronCharge}%
-  {\symup{Q_e}}%
+\NewPhysicalConstant{electronCharge}%
+  {\symup{Q_{e}}}%
   {-\elementarychargeapproximatevalue}{-\elementarychargeprecisevalue}%
   {\ampere\usk\second}%
   [\coulomb]%
   [\coulomb]%
-\newphysicalconstant{electronmass}%
-  {\symup{m_e}}%
+\NewPhysicalConstant{electronmass}%
+  {\symup{m_{e}}}%
   {9.1\times10^{-31}}{9.1093837015\times10^{-31}}%
   {\kilogram}%
-\newphysicalconstant{elementarycharge}%
+\NewPhysicalConstant{elementarycharge}%
   {\symup{e}}%
-  {1.6\times10^{-19}}{1.602176634\times10^{-19}}% % exact 2019 value
+  {1.6\times10^{-19}}{1.602176634\times10^{-19}}%
   {\ampere\usk\second}%
   [\coulomb]%
   [\coulomb]%
-\newphysicalconstant{finestructure}%
+\NewPhysicalConstant{finestructure}%
   {\symup{\alpha}}%
   {\frac{1}{137}}{7.2973525693\times10^{-3}}%
   {}%
-\newphysicalconstant{hydrogenmass}%
-  {\symup{m_H}}%
+\NewPhysicalConstant{hydrogenmass}%
+  {\symup{m_{H}}}%
   {1.7\times10^{-27}}{1.6737236\times10^{-27}}%
   {\kilogram}%
-\newphysicalconstant{moonearthdistance}%
+\NewPhysicalConstant{moonearthdistance}%
   {\symup{d_{ME}}}%
   {3.8\times10^{8}}{3.81550\times10^{8}}%
   {\meter}%
-\newphysicalconstant{moonmass}%
+\NewPhysicalConstant{moonmass}%
   {\symup{M_{Moon}}}%
   {7.3\times10^{22}}{7.342\times10^{22}}%
   {\kilogram}%
-\newphysicalconstant{moonradius}%
+\NewPhysicalConstant{moonradius}%
   {\symup{R_{Moon}}}%
   {1.7\times10^{6}}{1.7371\times10^{6}}%
   {\meter}%
-\newphysicalconstant{mzofp}%
-  {\symup{\frac{\mu_o}{4\pi}}}%
+\NewPhysicalConstant{mzofp}%
+  {\symup{\frac{\mu_{o}}{4\pi}}}%
   {10^{-7}}{10^{-7}}%
   {\kilogram\usk\meter\usk\ampere\totheinversetwo\usk\second\totheinversetwo}%
   [\henry\per\meter]%
   [\tesla\usk\meter\per\ampere]%
-\newphysicalconstant{neutronmass}%
-  {\symup{m_n}}%
+\NewPhysicalConstant{neutronmass}%
+  {\symup{m_{n}}}%
   {1.7\times10^{-27}}{1.67492749804\times10^{-27}}%
   {\kilogram}%
-\newphysicalconstant{oofpez}%
-  {\symup{\frac{1}{4\pi\epsilon_o}}}%
+\NewPhysicalConstant{oofpez}%
+  {\symup{\frac{1}{4\pi\epsilon_{o}}}}%
   {9\times10^{9}}{8.9875517923\times10^{9}}%
   {\kilogram\usk\meter\tothethree\usk\ampere\totheinversetwo\usk\second\totheinversefour}%
   [\meter\per\farad]%
   [\newton\usk\meter\tothetwo\per\coulomb\tothetwo]%
-\newphysicalconstant{oofpezcs}%
-  {\symup{\frac{1}{4\pi\epsilon_o c^2}}}%
+\NewPhysicalConstant{oofpezcs}%
+  {\symup{\frac{1}{4\pi\epsilon_{o} c^2}}}%
   {10^{-7}}{10^{-7}}%
   {\kilogram\usk\meter\usk\ampere\totheinversetwo\usk\second\totheinversetwo}%
   [\tesla\usk\meter\tothetwo]%
   [\newton\usk\second\tothetwo\per\coulomb\tothetwo]%
-\newphysicalconstant{planck}%
+\NewPhysicalConstant{planck}%
   {\symup{h}}%
-  {6.6\times10^{-34}}{6.62607015\times10^{-34}}% % exact 2019 value
+  {6.6\times10^{-34}}{6.62607015\times10^{-34}}%
   {\kilogram\usk\meter\tothetwo\usk\second\inverse}%
   [\joule\usk\second]%
   [\joule\usk\second]%
@@ -2822,81 +2994,93 @@
 % See \url{https://tex.stackexchange.com/a/448565/218142}.
 %
 %    \begin{macrocode}
-\newphysicalconstant{planckbar}%
+\NewPhysicalConstant{planckbar}%
   {\hbar}%
   {1.1\times10^{-34}}{1.054571817\times10^{-34}}%
   {\kilogram\usk\meter\tothetwo\usk\second\inverse}%
   [\joule\usk\second]%
   [\joule\usk\second]
-\newphysicalconstant{planckc}%
+\NewPhysicalConstant{planckc}%
   {\symup{hc}}%
   {2.0\times10^{-25}}{1.98644586\times10^{-25}}%
   {\kilogram\usk\meter\tothethree\usk\second\totheinversetwo}%
   [\joule\usk\meter]%
   [\joule\usk\meter]%
-\newphysicalconstant{protoncharge}%
+\NewPhysicalConstant{protoncharge}%
   {\symup{q_p}}%
   {+\elementarychargeapproximatevalue}{+\elementarychargeprecisevalue}%
   {\ampere\usk\second}%
   [\coulomb]%
   [\coulomb]%
-\newphysicalconstant{protonCharge}%
+\NewPhysicalConstant{protonCharge}%
   {\symup{Q_p}}%
   {+\elementarychargeapproximatevalue}{+\elementarychargeprecisevalue}%
   {\ampere\usk\second}%
   [\coulomb]%
   [\coulomb]%
-\newphysicalconstant{protonmass}%
+\NewPhysicalConstant{protonmass}%
   {\symup{m_p}}%
   {1.7\times10^{-27}}{1.672621898\times10^{-27}}%
   {\kilogram}%
-\newphysicalconstant{rydberg}%
+\NewPhysicalConstant{rydberg}%
   {\symup{R_{\infty}}}%
   {1.1\times10^{7}}{1.0973731568160\times10^{7}}%
   {\meter\inverse}%
-\newphysicalconstant{speedoflight}%
+\NewPhysicalConstant{speedoflight}%
   {\symup{c}}%
-  {3\times10^{8}}{2.99792458\times10^{8}}% % exact value
+  {3\times10^{8}}{2.99792458\times10^{8}}%
   {\meter\usk\second\inverse}%
   [\meter\per\second]%
   [\meter\per\second]
-\newphysicalconstant{stefanboltzmann}%
+\NewPhysicalConstant{stefanboltzmann}%
   {\symup{\sigma}}%
   {5.7\times10^{-8}}{5.670374\times10^{-8}}%
   {\kilogram\usk\second\totheinversethree\usk\kelvin\totheinversefour}%
   [\watt\per\meter\tothetwo\usk\kelvin\tothefour]%
   [\watt\per\meter\tothetwo\usk\kelvin\tothefour]
-\newphysicalconstant{sunearthdistance}%
+\NewPhysicalConstant{sunearthdistance}%
   {\symup{d_{SE}}}%
   {1.5\times10^{11}}{1.496\times10^{11}}%
   {\meter}%
-\newphysicalconstant{sunmass}%
+\NewPhysicalConstant{sunmass}%
   {\symup{M_{Sun}}}%
   {2.0\times10^{30}}{1.98855\times10^{30}}%
   {\kilogram}%
-\newphysicalconstant{sunradius}%
+\NewPhysicalConstant{sunradius}%
   {\symup{R_{Sun}}}%
   {7.0\times10^{8}}{6.957\times10^{8}}%
   {\meter}%
-\newphysicalconstant{surfacegravfield}%
+\NewPhysicalConstant{surfacegravfield}%
   {\symup{g}}%
   {9.8}{9.807}%
   {\meter\usk\second\totheinversetwo}%
   [\newton\per\kilogram]%
   [\newton\per\kilogram]%
-\newphysicalconstant{universalgrav}%
+%    \end{macrocode}
+%
+% The gravitational constant may also have units of 
+% |\joule\usk\meter\per\kilogram\tothetwo|.
+%
+%    \begin{macrocode}
+\NewPhysicalConstant{universalgrav}%
   {\symup{G}}%
   {6.7\times10^{-11}}{6.67430\times10^{-11}}%
   {\meter\tothethree\usk\kilogram\inverse\usk\second\totheinversetwo}%
-  [\newton\usk\meter\tothetwo\per\kilogram\tothetwo]% % also \joule\usk\meter\per\kilogram\tothetwo
   [\newton\usk\meter\tothetwo\per\kilogram\tothetwo]%
-\newphysicalconstant{vacuumpermeability}%
+  [\newton\usk\meter\tothetwo\per\kilogram\tothetwo]%
+%    \end{macrocode}
+%
+% As of 2018 the vacuum permeability is no longer defined as
+% \( 4\pi\times10^{-7} \).
+%
+%    \begin{macrocode}
+\NewPhysicalConstant{vacuumpermeability}%
   {\symup{\mu_o}}%
-  {4\pi\times10^{-7}}{4\pi\times10^{-7}}% % as of 2018 no longer 4\pi\times10^{-7}
+  {4\pi\times10^{-7}}{4\pi\times10^{-7}}%
   {\kilogram\usk\meter\usk\ampere\totheinversetwo\usk\second\totheinversetwo}%
   [\henry\per\meter]%
   [\tesla\usk\meter\per\ampere]%
-\newphysicalconstant{vacuumpermittivity}%
+\NewPhysicalConstant{vacuumpermittivity}%
   {\symup{\epsilon_o}}%
   {9\times10^{-12}}{8.854187817\times10^{-12}}%
   {\ampere\tothetwo\usk\second\tothefour\usk\kilogram\inverse\usk\meter\totheinversethree}%
@@ -2908,9 +3092,9 @@
 % represent physical quantities and constants.
 %
 % \changes{v3.1.0}{2022-01-27}
-%   {\linktoplace{sec:mandipkg}{mandi} Improved \refCom{checkquantity}}
+%   {\linktoplace{sec:mandia}{mandi} Improved \refCom{CheckQuantity}}
 % \changes{v3.1.0}{2022-01-27}
-%   {\linktoplace{sec:mandipkg}{mandi} Improved \refCom{checkconstant}}
+%   {\linktoplace{sec:mandia}{mandi} Improved \refCom{CheckConstant}}
 %    \begin{macrocode}
 \ExplSyntaxOn
 \NewDocumentCommand{\@aux}{ m }
@@ -2923,7 +3107,7 @@
   }
 \ExplSyntaxOff
 \newcolumntype{M}{>{\(}p{0.25\linewidth}<{\)}}
-\NewDocumentCommand{\checkquantity}{ m }
+\NewDocumentCommand{\CheckQuantity}{ m }
   {%
     \begin{center}
       \begin{tabular}{MMM}
@@ -2933,7 +3117,7 @@
       \end{tabular}
     \end{center}
   }%
-\NewDocumentCommand{\checkconstant}{ m }
+\NewDocumentCommand{\CheckConstant}{ m }
   {%
     \begin{center}
       \begin{tabular}{MMM}
@@ -2951,7 +3135,7 @@
 % See \url{https://tex.stackexchange.com/a/39054/218142}.
 %
 % \changes{v3.1.0}{2022-01-27}
-%   {\linktoplace{sec:mandipkg}{mandi} \refCom{mivector} now
+%   {\linktoplace{sec:mandia}{mandi} \refCom{mivector} now
 %     requires more than one component}
 %    \begin{macrocode}
 \ExplSyntaxOn
diff --git a/macros/latex/contrib/mandi/mandi.ins b/macros/latex/contrib/mandi/mandi.ins
index 45abce7e59..e235a16fbe 100644
--- a/macros/latex/contrib/mandi/mandi.ins
+++ b/macros/latex/contrib/mandi/mandi.ins
@@ -6,7 +6,7 @@
 %%
 %% mandi.dtx  (with options: `install')
 %% 
-%%  Copyright (C) 2021,2022 by Paul J. Heafner <heafnerj@gmail.com>
+%%  Copyright (C) 2023 by Paul J. Heafner <heafnerj@gmail.com>
 %%  ---------------------------------------------------------------------------
 %%  This  work may be  distributed and/or modified  under the conditions of the
 %%  LaTeX Project Public  License, either  version 1.3  of this  license or (at
@@ -38,7 +38,7 @@
 \usedir{tex/latex/mandi}
 \preamble
 
- Copyright (C) 2021,2022 by Paul J. Heafner <heafnerj@gmail.com>
+ Copyright (C) 2023 by Paul J. Heafner <heafnerj@gmail.com>
  ---------------------------------------------------------------------------
  This  work may be  distributed and/or modified  under the conditions of the
  LaTeX Project Public  License, either  version 1.3  of this  license or (at
@@ -73,18 +73,18 @@
           \file{vdemo.py}{\from{mandistudent.dtx}{vdemo}}}
 
 \obeyspaces
-\Msg{*************************************************************}
-\Msg{*                                                           *}
-\Msg{* To finish the  installation, open a command line and      *}
-\Msg{* type the following, repeating 2-4 until there are no      *}
-\Msg{* warnings:                                                 *}
-\Msg{*   2. lualatex mandi.dtx  (lualatex is required)           *}
-\Msg{*   3. makeindex -s gind.ist -o mandi.ind mandi.idx         *}
-\Msg{*   4. makeindex -s gglo.ist -o mandi.gls mandi.glo         *}
-\Msg{* Move the *.sty files into a directory searched by TeX.    *}
-\Msg{* The vdemo.py file can be deleted.                         *}
-\Msg{*                                                           *}
-\Msg{*************************************************************}
+\Msg{**************************************************************}
+\Msg{*                                                            *}
+\Msg{*   To finish the  installation, open a command line and     *}
+\Msg{*   type the following, repeating 2-4 until there are no     *}
+\Msg{*   warnings:                                                *}
+\Msg{*     2. lualatex mandi.dtx  (lualatex is required)          *}
+\Msg{*     3. makeindex -s gind.ist -o mandi.ind mandi.idx        *}
+\Msg{*     4. makeindex -s gglo.ist -o mandi.gls mandi.glo        *}
+\Msg{*   Move the *.sty files into a directory searched by TeX.   *}
+\Msg{*   Delete vdemo.py.                                         *}
+\Msg{*                                                            *}
+\Msg{**************************************************************}
 \endbatchfile
 \endinput
 %%
diff --git a/macros/latex/contrib/mandi/mandi.pdf b/macros/latex/contrib/mandi/mandi.pdf
index 4fb21eac80..02dbcf4efd 100644
--- a/macros/latex/contrib/mandi/mandi.pdf
+++ b/macros/latex/contrib/mandi/mandi.pdf
diff --git a/macros/latex/contrib/mandi/mandiexp.dtx b/macros/latex/contrib/mandi/mandiexp.dtx
index 507263bd63..3e4f83f419 100644
--- a/macros/latex/contrib/mandi/mandiexp.dtx
+++ b/macros/latex/contrib/mandi/mandiexp.dtx
@@ -1,7 +1,7 @@
 % \iffalse meta-comment
 % !TEX program = lualatexmk
 %
-% Copyright (C) 2021,2022 by Paul J. Heafner <heafnerj@gmail.com>
+% Copyright (C) 2023 by Paul J. Heafner <heafnerj@gmail.com>
 % ---------------------------------------------------------------------------
 % This  work may be  distributed and/or modified  under the conditions of the 
 % LaTeX Project Public  License, either  version 1.3  of this  license or (at 
@@ -24,7 +24,7 @@
 % and includes the derived files  mandi.sty
 %                                 mandistudent.sty
 %                                 mandiexp.sty
-%                                 vdemo.py
+%                                 vdemo.py (not needed)
 % ---------------------------------------------------------------------------
 %
 % \fi
@@ -65,40 +65,24 @@
 %</driver>
 % \fi
 %
-% \CheckSum{225}
-%
-% \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         \~}
-%
 % ^^A DO NOT TRY TO COMPILE THIS DTX FILE BY ITSELF. IT WILL FAIL.
 %
-% \section{The \mandiexp\ Package}\setplace{sec:mandiexppkg}
+% \section{The \mandiexp{} Package}\setplace{sec:mandic}
 %
-% \mandi\ comes with an accessory package \mandiexp\  
-% which includes commands specific to 
+% \mandi{} comes with an accessory package \mandiexp{}  
+% which extends \mandi{} with commands specific to 
 % \emph{Matter \& Interactions}.\footnote{See 
 % \href{https://www.wiley.com/en-us/Matter+and+Interactions%2C+4th+Edition-p-9781118875865}
 % {\emph{Matter \& Interactions}} and
 % \url{https://matterandinteractions.org/} for details.} 
 % The commands are primarily for typesetting 
-% mathematical expressions used in that text. Note that \mandiexp\
-% requires, and loads, \mandi\ but \mandi\ doesn't require, 
-% and doesn't load, \mandiexp.
+% mathematical expressions used in that text. \mandiexp{}
+% requires, and loads, \mandi{} but \mandi{} doesn't require, 
+% and doesn't load, \mandiexp. \mandiexp{} requires the \cs{vec*}
+% command and so loads \mandistudent{} if it has not already been
+% loaded.
 %
-% Load \mandiexp\ as you would any package in your preamble. 
+% Load \mandiexp{} as you would any package in your preamble. 
 % There are no package options.
 %
 %\iffalse
@@ -118,7 +102,7 @@
   Typesets the current version and build date.
 \end{docCommand}
 \begin{dispExample*}{sidebyside = false}
-  The version is \mandiexpversion\ and is a stable build.
+  The version is \mandiexpversion{} and is a stable build.
 \end{dispExample*}
 %\iffalse
 %</example>
@@ -334,7 +318,7 @@
 %</example>
 %\fi
 %
-% \subsection{Other Expressions}
+% \subsection{Other Symbols}
 %
 %\iffalse
 %<*example>
@@ -575,10 +559,10 @@
 %</example>
 %\fi
 %
-% \StopEventually{}
+% \MaybeStop{}
 %
 % \newgeometry{left=0.50in,right=0.50in,top=1.00in,bottom=1.00in}
-% \subsection{\mandiexp\ Source Code}
+% \subsection{\mandiexp{} Source Code}
 %
 % \iffalse
 %<*package>
@@ -589,14 +573,14 @@
 % in the name, that are not for the user to know about.
 %
 % \changes{v3.1.0}{2022-01-27}
-%   {\linktoplace{sec:mandiexppkg}{mandiexp} Version number works}
+%   {\linktoplace{sec:mandic}{mandiexp} Version number works}
 % \changes{v3.1.0}{2022-01-27}
-%   {\linktoplace{sec:mandiexppkg}{mandiexp} Code formatted for better readability}
+%   {\linktoplace{sec:mandic}{mandiexp} Code formatted for better readability}
 %    \begin{macrocode}
-\def\mandiexp@version{3.1.0}
-\def\mandiexp@date{2022-01-27}
+\def\mandiexp@version{3.2.0}
+\def\mandiexp@date{2023-08-01}
 \NeedsTeXFormat{LaTeX2e}[2020-02-02]
-\DeclareRelease{v3.1.0}{2022-01-27}{mandiexp.sty}
+\DeclareRelease{v3.2.0}{2023-08-01}{mandiexp.sty}
 \DeclareCurrentRelease{v\mandiexp@version}{\mandiexp@date}
 \ProvidesPackage{mandiexp}
   [\mandiexp@date\space v\mandiexp@version\space Macros for Matter & Interactions]
@@ -608,26 +592,55 @@
 \newcommand*{\mandiexpversion}{v\mandiexp@version\space dated \mandiexp@date}
 %    \end{macrocode}
 %
+% We need \mandi{} to load \pkg{mathtools} and \pkg{unicode-math}.
+%
+%    \begin{macrocode}
+\IfPackageLoadedTF{mandi}%
+  {}%
+  {%
+    \RequirePackage{mandi}%
+  }%
+%    \end{macrocode}
+%
+% \changes{v3.2.0}{2023-08-01}
+%   {\linktoplace{sec:mandic}{mandiexp} \pkg{mandistudent} is loaded for \cs{vec*}}
+%
+% We need \mandistudent{} for the new \cs{vec*} command.
+%
 %    \begin{macrocode}
-\RequirePackage{mandi}
+\IfPackageLoadedTF{mandistudent}%
+  {}%
+  {%
+    \RequirePackage{mandistudent}%
+  }%
 %    \end{macrocode}
 %
+% Load \pkg{xparse} if necessary.
+%
 % \changes{v3.1.0}{2022-01-27}
-%   {\linktoplace{sec:mandiexppkg}{mandiexp} \pkg{xparse} is loaded for older formats}
+%   {\linktoplace{sec:mandic}{mandiexp} \pkg{xparse} is loaded for older formats}
 %    \begin{macrocode}
-\IfFormatAtLeastTF {2020-10-01} % load xparse if necessary
+\IfFormatAtLeastTF{2020-10-01}%
   {}%
   {\RequirePackage{xparse}}%
 %    \end{macrocode}
 %
+% We require the \lualatex{} engine.
+%
+%    \begin{macrocode}
+\RequireLuaTeX
+%    \end{macrocode}
+%
 %    \begin{macrocode}
 \typeout{}%
 \typeout{mandiexp: You are using mandiexp \mandiexpversion.}
 \typeout{mandiexp: This package requires LuaLaTeX.}%
 \typeout{}%
+%    \end{macrocode}
+%
+% The momentum principle's lefthand and righthand sides.
 %
-% Commands specific to Matter & Interactions
-% The momentum principle
+%    \begin{macrocode}
 \NewDocumentCommand{\lhsmomentumprinciple}{ s }%
   {%
     \Delta
@@ -651,6 +664,12 @@
       }%
     \sb{\symup{sys,net}}\,\Delta t%
   }%
+%    \end{macrocode}
+%
+% The momentum principle in update form, lefthand and 
+% righthand sides.
+%
+%    \begin{macrocode}
 \NewDocumentCommand{\lhsmomentumprincipleupdate}{ s }%
   {%
     \IfBooleanTF{#1}%
@@ -681,6 +700,11 @@
       }%
     \sb{\symup{sys,net}}\,\Delta t%
   }%
+%    \end{macrocode}
+%
+% The full momentum principle as an expression.
+%
+%    \begin{macrocode}
 \NewDocumentCommand{\momentumprinciple}{ s }%
   {%
     \IfBooleanTF{#1}%
@@ -691,6 +715,11 @@
         \lhsmomentumprinciple = \rhsmomentumprinciple%
       }%
   }%
+%    \end{macrocode}
+%
+% The full momentum principle in update form as an expression.
+%
+%    \begin{macrocode}
 \NewDocumentCommand{\momentumprincipleupdate}{ s }%
   {%
     \IfBooleanTF{#1}%
@@ -701,7 +730,11 @@
         \lhsmomentumprincipleupdate = \rhsmomentumprincipleupdate%
       }%
   }%
-% The momentum principle
+%    \end{macrocode}
+%
+% The energy principle's lefthand and righthand sides.
+%
+%    \begin{macrocode}
 \NewDocumentCommand{\lhsenergyprinciple}{}%
   {%
     \Delta E_{\symup{sys}}%
@@ -710,6 +743,12 @@
   {%
     W_{\symup{ext}}#1%
   }%
+%    \end{macrocode}
+%
+% The energy principle in update form, lefthand and 
+% righthand sides.
+%
+%    \begin{macrocode}
 \NewDocumentCommand{\lhsenergyprincipleupdate}{}%
   {%
     E_{\symup{sys,final}}%
@@ -719,15 +758,29 @@
     E_{\symup{sys,initial}}+%
     W_{\symup{ext}}#1%
   }%
+%    \end{macrocode}
+%
+% The full energy principle as an expression.
+%
+%    \begin{macrocode}
 \NewDocumentCommand{\energyprinciple}{ O{} }%
   {%
     \lhsenergyprinciple = \rhsenergyprinciple[#1]%
   }%
+%    \end{macrocode}
+%
+% The full energy principle in update form as an expression.
+%
+%    \begin{macrocode}
 \NewDocumentCommand{\energyprincipleupdate}{ O{} }%
   {%
     \lhsenergyprincipleupdate = \rhsenergyprincipleupdate[#1]%
   }%
-% The angular momentum principle
+%    \end{macrocode}
+%
+% The angular momentum principle's lefthand and righthand sides.
+%
+%    \begin{macrocode}
 \NewDocumentCommand{\lhsangularmomentumprinciple}{ s }%
   {%
     \Delta%
@@ -751,6 +804,12 @@
       }%
     \sb{A\symup{,sys,net}}\,\Delta t%
   }%
+%    \end{macrocode}
+%
+% The energy principle in update form, lefthand and 
+% righthand sides.
+%
+%    \begin{macrocode}
 \NewDocumentCommand{\lhsangularmomentumprincipleupdate}{ s }%
   {%
     \IfBooleanTF{#1}%
@@ -781,6 +840,11 @@
       }%
     \sb{A\symup{,sys,net}}\,\Delta t%
   }%
+%    \end{macrocode}
+%
+% The full angular momentum principle as an expression.
+%
+%    \begin{macrocode}
 \NewDocumentCommand{\angularmomentumprinciple}{ s }%
   {%
     \IfBooleanTF{#1}%
@@ -791,6 +855,11 @@
         \lhsangularmomentumprinciple = \rhsangularmomentumprinciple%
       }%
   }%
+%    \end{macrocode}
+%
+% The full angular momentum principle in update form as an expression.
+%
+%    \begin{macrocode}
 \NewDocumentCommand{\angularmomentumprincipleupdate}{ s }%
   {%
     \IfBooleanTF{#1}%
@@ -801,6 +870,11 @@
         \lhsangularmomentumprincipleupdate = \rhsangularmomentumprincipleupdate%
       }%
   }%
+%    \end{macrocode}
+%
+% The symbol for an arbitrary entity.
+%
+%    \begin{macrocode}
 \NewDocumentCommand{\energyof}{ m o }%
   {%
     E_{#1%
@@ -808,6 +882,11 @@
           {,#2}%
       }%
   }%
+%    \end{macrocode}
+%
+% The symbol for a system's energy.
+%
+%    \begin{macrocode}
 \NewDocumentCommand{\systemenergy}{ o }%
   {%
     E_{\symup{sys}%
@@ -815,6 +894,11 @@
           {,#1}%
       }%
   }%
+%    \end{macrocode}
+%
+%
+%
+%    \begin{macrocode}
 \NewDocumentCommand{\particleenergy}{ o }%
   {%
     E_{\symup{particle}%
@@ -822,6 +906,11 @@
           {,#1}%
       }%
   }%
+%    \end{macrocode}
+%
+% The symbol for a particle's rest energy.
+%
+%    \begin{macrocode}
 \NewDocumentCommand{\restenergy}{ o }%
   {%
     E_{\symup{rest}%
@@ -829,6 +918,11 @@
           {,#1}%
       }%
   }%
+%    \end{macrocode}
+%
+% The symbol for a system's internal energy.
+%
+%    \begin{macrocode}
 \NewDocumentCommand{\internalenergy}{ o }%
   {%
     E_{\symup{internal}%
@@ -836,6 +930,11 @@
           {,#1}%
       }%
   }%
+%    \end{macrocode}
+%
+% The symbol for a system's chemical energy.
+%
+%    \begin{macrocode}
 \NewDocumentCommand{\chemicalenergy}{ o }%
   {%
     E_{\symup{chem}%
@@ -843,6 +942,11 @@
           {,#1}%
       }%
   }%
+%    \end{macrocode}
+%
+% The symbol for a system's thermal energy.
+%
+%    \begin{macrocode}
 \NewDocumentCommand{\thermalenergy}{ o }%
   {%
     E_{\symup{therm}%
@@ -850,6 +954,11 @@
           {,#1}%
       }%
   }%
+%    \end{macrocode}
+%
+% The symbol for a photon's energy.
+%
+%    \begin{macrocode}
 \NewDocumentCommand{\photonenergy}{ o }%
   {%
     E_{\symup{photon}%
@@ -857,11 +966,16 @@
           {,#1}%
       }%
   }%
+%    \end{macrocode}
+%
+% The symbol for translational kinetic energy.
+% |d[]| must be used because of the way consecutive optional
+% arguments are handled. See \pkg{xparse} docs for details.\newline
+% See \url{https://tex.stackexchange.com/a/569011/218142}.
+%
+%    \begin{macrocode}
 \NewDocumentCommand{\translationalkineticenergy}{ s d[] }%
   {%
-    % d[] must be used because of the way consecutive optional
-    %  arguments are handled. See xparse docs for details.
-    %  See https://tex.stackexchange.com/a/569011/218142
     \IfBooleanTF{#1}%
       {%
         E_\bgroup \symup{K}%
@@ -872,11 +986,13 @@
             \IfValueT{#2}{,#2}%
           \egroup%
   }%
+%    \end{macrocode}
+%
+% The symbol for rotational kinetic energy.
+%
+%    \begin{macrocode}
 \NewDocumentCommand{\rotationalkineticenergy}{ s d[] }%
   {%
-    % d[] must be used because of the way consecutive optional
-    %  arguments are handled. See xparse docs for details.
-    %  See https://tex.stackexchange.com/a/569011/218142
     \IfBooleanTF{#1}%
       {%
         E_\bgroup%
@@ -887,11 +1003,13 @@
             \symup{rot}\IfValueT{#2}{,#2}%
           \egroup%
   }%
+%    \end{macrocode}
+%
+% The symbol for vibrational kinetic energy.
+%
+%    \begin{macrocode}
 \NewDocumentCommand{\vibrationalkineticenergy}{ s d[] }%
   {%
-    % d[] must be used because of the way consecutive optional
-    %  arguments are handled. See xparse docs for details.
-    %  See https://tex.stackexchange.com/a/569011/218142
     \IfBooleanTF{#1}%
       {%
         E_\bgroup%
@@ -902,6 +1020,11 @@
             \symup{vib}\IfValueT{#2}{,#2}%
           \egroup%
   }%
+%    \end{macrocode}
+%
+% The symbol for a system's gravitational potential energy.
+%
+%    \begin{macrocode}
 \NewDocumentCommand{\gravitationalpotentialenergy}{ o }%
   {%
     U_{\symup{g}%
@@ -909,6 +1032,11 @@
           {,#1}%
     }%
   }%
+%    \end{macrocode}
+%
+% The symbol for a system's electric potential energy.
+%
+%    \begin{macrocode}
 \NewDocumentCommand{\electricpotentialenergy}{ o }%
   {%
     U_{\symup{e}%
@@ -916,6 +1044,11 @@
           {,#1}%
       }%
   }%
+%    \end{macrocode}
+%
+% The symbol for a system's spring potential energy.
+%
+%    \begin{macrocode}
 \NewDocumentCommand{\springpotentialenergy}{ o }%
   {%
     U_{\symup{s}%
diff --git a/macros/latex/contrib/mandi/mandistudent.dtx b/macros/latex/contrib/mandi/mandistudent.dtx
index d27bc93ac5..90b4a3dbd7 100644
--- a/macros/latex/contrib/mandi/mandistudent.dtx
+++ b/macros/latex/contrib/mandi/mandistudent.dtx
@@ -1,7 +1,7 @@
 % \iffalse meta-comment
 % !TEX program = lualatexmk
 %
-% Copyright (C) 2021,2022 by Paul J. Heafner <heafnerj@gmail.com>
+% Copyright (C) 2023 by Paul J. Heafner <heafnerj@gmail.com>
 % ---------------------------------------------------------------------------
 % This  work may be  distributed and/or modified  under the conditions of the 
 % LaTeX Project Public  License, either  version 1.3  of this  license or (at 
@@ -24,7 +24,7 @@
 % and includes the derived files  mandi.sty
 %                                 mandistudent.sty
 %                                 mandiexp.sty
-%                                 vdemo.py
+%                                 vdemo.py (not needed)
 % ---------------------------------------------------------------------------
 %
 % \fi
@@ -111,37 +111,19 @@ while t < 10:
 %</driver>
 % \fi
 %
-% \CheckSum{745}
-%
-% \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         \~}
-%
 % ^^A DO NOT TRY TO COMPILE THIS DTX FILE BY ITSELF. IT WILL FAIL.
 %
-% \section{The \mandistudent\ Package}\setplace{sec:mandistudentpkg}
+% \section{The \mandistudent{} Package}\setplace{sec:mandib}
 %
-% \mandi\ comes with an accessory package \mandistudent,
-% which provides a collection of commands physics students can 
-% use for writing problem solutions. This package focuses on 
-% the most frequently needed tools. These commands should always 
-% be used in math mode. Note that \mandistudent\ requires, and 
-% loads, \mandi\ but \mandi\ doesn't require, and doesn't load, 
-% \mandistudent.
+% \mandi{} comes with an accessory package \mandistudent,
+% which extends \mandi{} with a collection of commands physics
+% students can use for writing problem solutions. This package 
+% focuses on the most frequently needed tools. These commands 
+% should always be used in math mode. \mandistudent{} requires, 
+% and loads, \mandi{} but \mandi{} doesn't require, and doesn't 
+% load, \mandistudent.
 %
-% Load \mandistudent\ as you would any package in your preamble. 
+% Load \mandistudent{} as you would any package in your preamble. 
 % There are no package options.
 %
 %\iffalse
@@ -161,7 +143,7 @@ while t < 10:
   Typesets the current version and build date.
 \end{docCommand}
 \begin{dispExample*}{sidebyside = false}
-  The version is \mandistudentversion\ and is a stable build.
+  The version is \mandistudentversion{} and is a stable build.
 \end{dispExample*}
 %\iffalse
 %</example>
@@ -470,7 +452,7 @@ while t < 10:
 %<*example>
 %\fi
 \begin{docEnvironments}[%
-    doc new = 2021-02-03,%
+    doc updated = 2023-08-01,%
     doc parameter = \marg{title},%
     doclang/environment content = problem,%
   ]%
@@ -490,11 +472,14 @@ while t < 10:
   }%
   Provides an environment for stating physics problems. Each problem will 
   begin on a new page. See the examples for how to handle single and 
-  multiple part problems.
+  multiple part problems. Due to incompatibilities with \textsc{beamer}
+  and the \pkg{enumitem} package, these environments are not defined if
+  \textsc{beamer} is loaded.
 \end{docEnvironments}
-\begin{docCommand}[doc new = 2021-02-03]{problempart}{}
+\begin{docCommand}[doc updated = 2023-08-01]{problempart}{}
   Denotes a part of a problem within a \refEnv{parts}
-  environment.
+  environment. This command is not defined if \textsc{beamer} 
+  is loaded.
 \end{docCommand}
 \begin{dispExample*}{sidebyside = false}
   \begin{physicsproblem}{Problem 1}
@@ -629,12 +614,12 @@ while t < 10:
 %\iffalse
 %<*example>
 %\fi
-\begin{docCommand}[doc new = 2021-02-06]{hilite}{%
+\begin{docCommand}[doc updated = 2023-08-01]{hilite}{%
     \oarg{color}\marg{target}\oarg{shape}
   }%
   Hilites the desired target, which can be an entire mathematical expression 
   or a part thereof. The default color is magenta and the default shape is a
-  rectangle.
+  rectangle. This command is not defined if \textsc{beamer} is loaded.
 \end{docCommand} 
 \begin{dispListing*}{sidebyside = false,listing only}
   \begin{align*}
@@ -880,7 +865,7 @@ while t < 10:
 %\fi
 %
 % \changes{v3.1.0}{2022-01-27}
-%   {\linktoplace{sec:mandistudentpkg}{mandistudent} \cs{diff} renamed to 
+%   {\linktoplace{sec:mandib}{mandistudent} \cs{diff} renamed to 
 %    \refCom{df} for compatibility with the \pkg{numerica} package}
 %\iffalse
 %<*example>
@@ -905,9 +890,9 @@ while t < 10:
 %\fi
 %
 % \changes{v3.1.0}{2022-01-27}
-%   {\linktoplace{sec:mandistudentpkg}{mandistudent} All instances of 
+%   {\linktoplace{sec:mandib}{mandistudent} All instances of 
 %    \texttt{GlowScript} have been changed to \texttt{Web VPython}}
-% \subsection{\WebVPython\ and \VPython\ Program Listings}
+% \subsection{\WebVPython{} and \VPython{} Program Listings}
 %
 % \href{https://\gsurl}{\WebVPython}
 % \footnote{On November 9, 2021 \texttt{GlowScript} was renamed to 
@@ -917,7 +902,7 @@ while t < 10:
 % \href{https://\vpurl}{VPython}\footnote{\href{https://\vpurl}{https://\vpurl}} 
 % are programming environments (both use \href{https://www.python.org}{Python})
 % frequently used in introductory physics to introduce students
-% for modeling physical systems. \mandi\ makes including code listings
+% for modeling physical systems. \mandi{} makes including code listings
 % very simple for students.
 %
 % \subsection{The \texttt{\small webvpythonblock} Environment}
@@ -931,29 +916,32 @@ while t < 10:
   ]%
   {%
     {%
-      doc updated = 2022-01-27,%
+      doc updated = 2023-08-01,%
       doc name = webvpythonblock,%    
       doc description = now includes a QR code,%
     },%
     {%
-      doc new = 2022-01-27,%
+      doc updated = 2023-08-01,%
       doc name = webvpythonblock*,%
       doc description = use this variant to omit QR code,%
     },%
   }%
   Code placed here is nicely formatted and optionally linked to its source on 
   \href{https://\gsurl}{\WebVPythonorg}, which must be in a public (not private)
-  folder. Clicking anywhere in the code window will open the link in the default 
-  browser. A caption is mandatory, and a label is internally generated. The 
-  listing always begins on a new page. A URL shortening utility is recommended 
-  to keep the URL from getting unruly. For convenience, |https://| is 
-  automatically prepended to the URL and can thus be omitted. The |#| character 
-  in a URL should not cause problems. The default URL is that of the \WebVPython\ 
+  folder. Clicking anywhere in the code window (between the black horizontal bars) 
+  or on the URL will open the link in the default browser. A caption is mandatory, 
+  and a label is internally generated. The listing always begins on a new page. 
+  A URL shortening utility is recommended to keep the URL from getting unruly
+  especially if it generates an overfull box error. For convenience, |https://| 
+  is automatically prepended to the URL and can be omitted. The |#| character 
+  in a URL should not cause problems. The default URL is that of the \WebVPython{} 
   home page.
 \end{docEnvironments}
 \begin{dispListing*}{sidebyside = false}
-\begin{webvpythonblock}(tinyurl.com/y3lnqyn3){A \texttt{Web VPython} Program With QR Code}
-GlowScript 3.0 vpython
+\begin{webvpythonblock}
+  (glowscript.org/#/user/heafnerj/folder/mandidemo/program/mandidemo)
+  {Example With QR Code}
+Web VPython 3.2
 
 scene.width = 400
 scene.height = 760
@@ -998,8 +986,10 @@ while t < 10:
     t = t + deltat
 \end{webvpythonblock}
 \end{dispListing*}
-\begin{webvpythonblock}(tinyurl.com/y3lnqyn3){A \texttt{Web VPython} Program With QR Code}
-GlowScript 3.0 vpython
+\begin{webvpythonblock}
+  (glowscript.org/#/user/heafnerj/folder/mandidemo/program/mandidemo)
+  {Example With QR Code}
+Web VPython 3.2
 
 scene.width = 400
 scene.height = 760
@@ -1056,7 +1046,7 @@ while t < 10:
 %<*example>
 %\fi
 \begin{dispExample*}{sidebyside = false}
-  \WebVPython\ program \ref{gs:1} is nice. 
+  \WebVPython{} program \ref{gs:1} is nice. 
   It's called \nameref{gs:1} and is on page \pageref{gs:1}.
 \end{dispExample*}
 %\iffalse
@@ -1069,8 +1059,10 @@ while t < 10:
 %<*example>
 %\fi
 \begin{dispListing*}{sidebyside = false}
-\begin{webvpythonblock*}(tinyurl.com/y3lnqyn3){A \texttt{Web VPython} Program Without QR Code}
-GlowScript 3.0 vpython
+\begin{webvpythonblock*}
+  (glowscript.org/#/user/heafnerj/folder/mandidemo/program/mandidemo)
+  {Example Without QR Code}
+Web VPython 3.2
 
 scene.width = 400
 scene.height = 760
@@ -1115,8 +1107,10 @@ while t < 10:
     t = t + deltat
 \end{webvpythonblock*}
 \end{dispListing*}
-\begin{webvpythonblock*}(tinyurl.com/y3lnqyn3){A \texttt{Web VPython} Program Without QR Code}
-GlowScript 3.0 vpython
+\begin{webvpythonblock*}
+  (glowscript.org/#/user/heafnerj/folder/mandidemo/program/mandidemo)
+  {Example Without QR Code}
+Web VPython 3.2
 
 scene.width = 400
 scene.height = 760
@@ -1161,7 +1155,7 @@ while t < 10:
     t = t + deltat
 \end{webvpythonblock*}
 \begin{dispExample*}{sidebyside = false}
-  \WebVPython\ program \ref{gs:2} is nice. 
+  \WebVPython{} program \ref{gs:2} is nice. 
   It's called \nameref{gs:2} and is on page \pageref{gs:2}.
 \end{dispExample*}
 %  
@@ -1174,20 +1168,21 @@ while t < 10:
 %\iffalse
 %<*example>
 %\fi
-\begin{docCommand}[doc updated = 2022-01-27]{vpythonfile}
+\begin{docCommand}[doc updated = 2023-08-01]{vpythonfile}
   {\oarg{options}(\meta{link})\marg{file}\marg{caption}}
-  Command to load and typeset a \VPython\ program, read from local file
-  \marg{file}. Clicking anywhere in the code window can optionally open 
-  a link, passed as an option, in the default browser. A caption is mandatory, 
-  and a label is internally generated. The listing always begins on a new page. 
-  A URL shortening utility is recommended to keep the URL from getting unruly. 
-  For convenience, |https://| is automatically prepended to the URL and can 
-  thus be omitted. The default URL is that of the \VPython\ home page.
+  Command to load and typeset a \VPython{} program, read from local file
+  \marg{file}. Clicking anywhere in the code window (between the black 
+  horizontal bars) or on the URL will open the link in the default browser. 
+  A caption is mandatory,  and a label is internally generated. The listing 
+  always begins on a new page. A URL shortening utility is recommended to 
+  keep the URL from getting unruly especially if it generates an overfull 
+  box error. For convenience, |https://| is automatically prepended to the 
+  URL and can be omitted. The default URL is that of the \VPython{} home page.
 \end{docCommand}
 \begin{dispListing*}{sidebyside = false}
-\vpythonfile{vdemo.py}{A \VPython\ Program}
+\vpythonfile{vdemo.py}{A \VPython{} Program}
 \end{dispListing*}
-\vpythonfile{vdemo.py}{A \VPython\ Program}
+\vpythonfile{vdemo.py}{A \VPython{} Program}
 %\iffalse
 %</example>
 %\fi
@@ -1196,7 +1191,7 @@ while t < 10:
 %<*example>
 %\fi
 \begin{dispExample*}{sidebyside = false}
-  \VPython\ program \ref{vp:1} is nice. 
+  \VPython{} program \ref{vp:1} is nice. 
   It's called \nameref{vp:1} and is on page \pageref{vp:1}.
 \end{dispExample*}
 %  
@@ -1227,17 +1222,19 @@ while t < 10:
   less than one line long.
 \end{docCommands}
 \begin{dispExample*}{sidebyside = false}
-  \WebVPython\ programs begin with \webvpythoninline{GlowScript 3.0 VPython}
-  and \VPython\ programs begin with \vpythoninline{from vpython import *}. 
+  \WebVPython{} programs begin with \webvpythoninline{Web VPython 3.2}. 
+\end{dispExample*}
+\begin{dispExample*}{sidebyside = false}
+  \VPython{} programs begin with \vpythoninline{from vpython import *}. 
 \end{dispExample*}
 %\iffalse
 %</example>
 %\fi
 %
-% \StopEventually{}
+% \MaybeStop{}
 %
 % \newgeometry{left=0.50in,right=0.50in,top=1.00in,bottom=1.00in}
-% \subsection{\mandistudent\ Source Code}
+% \subsection{\mandistudent{} Source Code}
 %
 % \iffalse
 %<*package>
@@ -1248,14 +1245,14 @@ while t < 10:
 % in the name, that are not for the user to know about.
 %
 % \changes{v3.1.0}{2022-01-27}
-%   {\linktoplace{sec:mandistudentpkg}{mandistudent} Version number works}
+%   {\linktoplace{sec:mandib}{mandistudent} Version number works}
 % \changes{v3.1.0}{2022-01-27}
-%   {\linktoplace{sec:mandistudentpkg}{mandistudent} Code formatted for better readability}
+%   {\linktoplace{sec:mandib}{mandistudent} Code formatted for better readability}
 %    \begin{macrocode}
-\def\mandistudent@version{3.1.0}
-\def\mandistudent@date{2022-01-27}
+\def\mandistudent@version{3.2.0}
+\def\mandistudent@date{2023-08-01}
 \NeedsTeXFormat{LaTeX2e}[2020-02-02]
-\DeclareRelease{v3.1.0}{2022-01-27}{mandistudent.sty}
+\DeclareRelease{v3.2.0}{2023-08-01}{mandistudent.sty}
 \DeclareCurrentRelease{v\mandistudent@version}{\mandistudent@date}
 \ProvidesPackage{mandistudent}
   [\mandistudent@date\space v\mandistudent@version\space Macros for introductory physics]
@@ -1269,70 +1266,157 @@ while t < 10:
 %
 % Load third party packages, documenting why each one is needed.
 %
+% AMS goodness. Don't load \pkg{amssymb} or \pkg{amsfonts}.
+%
+%    \begin{macrocode}
+\RequirePackage{amsmath}
+%    \end{macrocode}
+%
+% We need \pkg{enumitem} for the |physicsproblem| environment.
+%
+% \textsc{beamer} is not compatible with \pkg{enumitem} so if
+% \textsc{beamer} is loaded certain commands are not defined.
+%
+%    \begin{macrocode}
+\IfClassLoadedTF{beamer}%
+  {}%
+  {%
+    \RequirePackage[inline]{enumitem}%
+  }%
+%    \end{macrocode}
+%
+% We need \pkg{eso-pic} for |\hilite|.
+%
+%    \begin{macrocode}
+\RequirePackage{eso-pic}
+%    \end{macrocode}
+%
+% We need \pkg{esvect} for nice vector arrows, style g.
+%
 %    \begin{macrocode}
-\RequirePackage{amsmath}             % AMS goodness (don't load amssymb or amsfonts)
-\RequirePackage[inline]{enumitem}    % needed for physicsproblem environment
-\RequirePackage{eso-pic}             % needed for \hilite
-\RequirePackage[g]{esvect}           % needed for nice vector arrow, style g
-\RequirePackage{pgfopts}             % needed for key-value interface
-\RequirePackage{iftex}               % needed for requiring LuaLaTeX
-\RequirePackage{makebox}             % needed for consistent \dirvect; \makebox
-\RequirePackage{mandi}
-\RequirePackage{mathtools}           % needed for paired delimiters; extends amsmath
-\RequirePackage{nicematrix}          % needed for column and row vectors
-\RequirePackage{qrcode}              % needed for QR codes in webvpythonblock
-\qrset{height=1.5cm}                 % set default size of QR code
-\RequirePackage[most]{tcolorbox}     % needed for program listings
-\RequirePackage{tensor}              % needed for index notation
-\RequirePackage{tikz}                % needed for \hilite
-\usetikzlibrary{shapes,fit,tikzmark} % needed for \hilite
-\RequirePackage{unicode-math}        % needed for Unicode support
+\RequirePackage[g]{esvect}
 %    \end{macrocode}
 %
+% We need \pkg{pgfopts} for a key-value interface.
+%
+%    \begin{macrocode}
+\RequirePackage{pgfopts}
+%    \end{macrocode}
+%
+% We need \pkg{iftex} so we can require \lualatex.
+%
+%    \begin{macrocode}
+\RequirePackage{iftex}
+%    \end{macrocode}
+%
+% We need \pkg{makebox} for consistent |\dirvect| notation.
+%
+%    \begin{macrocode}
+\RequirePackage{makebox}
+%    \end{macrocode}
+%
+% We need \mandi{} to load \pkg{mathtools} and \pkg{unicode-math}.
+%
+%    \begin{macrocode}
+\IfPackageLoadedTF{mandi}%
+  {}%
+  {%
+    \RequirePackage{mandi}%
+  }%
+%    \end{macrocode}
+%
+% We need \pkg{nicematrix} for column and row vectors.
+%
+%    \begin{macrocode}
+\RequirePackage{nicematrix}
+%    \end{macrocode}
+%
+% We need \pkg{qrcode} for QR codes in |webvpythonblock|.
+%
+%    \begin{macrocode}
+\RequirePackage{qrcode}
+%    \end{macrocode}
+%
+% Set the default size for QR codes.
+%
+%    \begin{macrocode}
+\qrset{height=1.5cm}
+%    \end{macrocode}
+%
+% We need \pkg{tcolorbox} for program listings.
+%
+%    \begin{macrocode}
+\RequirePackage[most]{tcolorbox}
+%    \end{macrocode}
+%
+% We need \pkg{tensor} for index notation.
+%
+%    \begin{macrocode}
+\RequirePackage{tensor}
+%    \end{macrocode}
+%    \begin{macrocode}
+%
+% We need \pkg{tikz} for |\hilite|..
+%
+\RequirePackage{tikz}
+\usetikzlibrary{shapes,fit,tikzmark}
+%    \end{macrocode}
+%
+% Load \pkg{xparse} if necessary.
 %
 % \changes{v3.1.0}{2022-01-27}
-%   {\linktoplace{sec:mandistudentpkg}{mandistudent} \pkg{xparse} is loaded for older formats}
+%   {\linktoplace{sec:mandib}{mandistudent} \pkg{xparse} is loaded for older formats}
 %    \begin{macrocode}
-\IfFormatAtLeastTF {2020-10-01}      % load xparse if necessary
+\IfFormatAtLeastTF{2020-10-01}
   {}%
   {\RequirePackage{xparse}}%
-\RequirePackage{hyperref}            % load last
-\RequireLuaTeX                       % require this engine
+%    \end{macrocode}
+%
+% Always load \pkg{hyperref} last if possible.
+%
+%    \begin{macrocode}
+\RequirePackage{hyperref}
+%    \end{macrocode}
+%
+% We require the \lualatex{} engine.
+%
+%    \begin{macrocode}
+\RequireLuaTeX
 %    \end{macrocode}
 %
 % Set up the fonts to be consistent with ISO 80000-2 notation.
 % The \href{https://www.ctan.org/pkg/unicode-math}{\pkg{unicode-math}} package 
 % loads the \href{https://www.ctan.org/pkg/fontspec}{\pkg{fontspec}} and 
 % \href{https://www.ctan.org/pkg/xparse}{\pkg{xparse}}
-% packages. Note that \pkg{xparse} is now part of the \LaTeXe\ kernel.
-% Because \pkg{unicode-math} is required, all documents using \mandi\ must
-% be compiled with an engine that supports Unicode. We recommend \lualatex.
+% packages. Note that \pkg{xparse} is now part of the \LaTeXe{} kernel.
+% Because \pkg{unicode-math} is required, all documents using \mandi{} must
+% be compiled with an engine that supports Unicode, and I recommend \lualatex.
 %
 %    \begin{macrocode}
 \unimathsetup{math-style=ISO}
-\unimathsetup{warnings-off={mathtools-colon,mathtools-overbracket}}
 %    \end{macrocode}
 %
 % Use normal math letters from Latin Modern Math for familiarity with 
-% textbooks.
+% textbooks. This gives a better J.
 %
 %    \begin{macrocode}
 \setmathfont[Scale=MatchLowercase]
-  {Latin Modern Math}    % default math font; better J
+  {Latin Modern Math}
 %    \end{macrocode}
 %
-% Borrow from TeX Gyre DejaVu Math for vectors and tensors to get single-storey g.
+% Borrow from TeX Gyre DejaVu Math for vectors and tensors to get 
+% single-storey lowercase g.
 %
 %    \begin{macrocode}
 \setmathfont[Scale=MatchLowercase,range={sfit/{latin},bfsfit/{latin}}]
-  {TeX Gyre DejaVu Math} % single-storey lowercase g
+  {TeX Gyre DejaVu Math}
 %    \end{macrocode}
 %
-% Borrow from TeX Gyre DejaVu Math to get single-storey g.
+% Borrow from TeX Gyre DejaVu Math to get single-storey lowercase g.
 %
 %    \begin{macrocode}
 \setmathfont[Scale=MatchLowercase,range={sfup/{latin},bfsfup/{latin}}]
-  {TeX Gyre DejaVu Math} % single-storey lowercase g
+  {TeX Gyre DejaVu Math}
 %    \end{macrocode}
 %
 % Borrow |mathscr| and |mathbfscr| from XITS Math.\newline
@@ -1349,14 +1433,18 @@ while t < 10:
 \setmathfont[Scale=MatchLowercase,range={\mathcal,\mathbfcal},StylisticSet=1]{XITS Math}
 %    \end{macrocode}
 %
-% Borrow Greek sfup and sfit letters from STIX Two Math.
+% Borrow Greek |sfup| and |sfit| letters from STIX Two Math.
 % Since this isn't officially supported in \pkg{unicode-math}
 % we have to manually set this up.
 %
 %    \begin{macrocode}
 \setmathfont[Scale=MatchLowercase,range={"E17C-"E1F6}]{STIX Two Math}
 \newfontfamily{\symsfgreek}{STIX Two Math}
-% I don't understand why \text{...} is necessary.
+%    \end{macrocode}
+%
+% I don't understand why |\text{...}| is necessary.
+%
+%    \begin{macrocode}
 \newcommand{\symsfupalpha}      {\text{\symsfgreek{^^^^e196}}}
 \newcommand{\symsfupbeta}       {\text{\symsfgreek{^^^^e197}}}
 \newcommand{\symsfupgamma}      {\text{\symsfgreek{^^^^e198}}}
@@ -1465,12 +1553,17 @@ while t < 10:
 \typeout{mandistudent: This package requires LuaLaTeX.}%
 \typeout{mandistudent: This package changes the default math font(s).}%
 \typeout{mandistudent: This package redefines the \protect\vec\space command.}%
+\IfClassLoadedTF{beamer}%
+  {%
+    \typeout{mandistudent: BEAMER detected. Certain commands will not be defined.}%
+  }%
+  {}%
 \typeout{}%
 %    \end{macrocode}
 %
 % A better, intelligent coordinate-free \refCom{vec} command. Note the use of 
 % the |e{_^}| type of optional argument. This accounts for much of the 
-% flexibility and power of this command. Also note the use of the \TeX\ 
+% flexibility and power of this command. Also note the use of the \TeX{} 
 % primitives |\sb{}| and |\sp{}|. Why doesn't it work when I put spaces 
 % around |#3| or |#4|? Because outside of |\ExplSyntaxOn...\ExplSyntaxOff|, 
 % the |_| character has a different catcode and is treated as a mathematical 
@@ -1479,28 +1572,22 @@ while t < 10:
 % See also \url{https://tex.stackexchange.com/a/531037/218142}.
 %
 % \changes{v3.1.0}{2022-01-27}
-%   {\linktoplace{sec:mandistudentpkg}{mandistudent} \refCom{vec}%
+%   {\linktoplace{sec:mandib}{mandistudent} \refCom{vec}%
 %    no longer adds \cs{scriptspace} when no sub/superscript is given}
 %    \begin{macrocode}
 \RenewDocumentCommand{\vec}{ s m e{_^} }%
   {%
-    % Note the \, used to make superscript look better.
     \IfBooleanTF{#1}
       {%
-        \vv{#2}%      % * gives an arrow
-        % Use \sp{} primitive for superscript.
-        % Adjust superscript for the arrow.
+        \vv{#2}%
         \IfValueT{#4}%
           {\sp{\,#4\vphantom{\smash[t]{\big|}}}}
       }%
       {%
-        \symbfit{#2}  % no * gives us bold
-        % Use \sp{} primitive for superscript.
-        % No superscript adjustment needed.
+        \symbfit{#2}
         \IfValueT{#4}%
           {\sp{#4\vphantom{\smash[t]{\big|}}}}
       }%
-      % Use \sb{} primitive for subscript.
     \IfValueT{#3}%
       {\sb{#3\vphantom{\smash[b]{|}}}}
   }%
@@ -1513,7 +1600,7 @@ while t < 10:
 % See \url{https://tex.stackexchange.com/a/391204/218142}.
 %
 % \changes{v3.1.0}{2022-01-27}
-%   {\linktoplace{sec:mandistudentpkg}{mandistudent} \refCom{dirvec}%
+%   {\linktoplace{sec:mandib}{mandistudent} \refCom{dirvec}%
 %    no longer adds \cs{scriptspace} when no sub/superscript is given}
 %    \begin{macrocode}
 \NewDocumentCommand{\dirvec}{ s m e{_^} }%
@@ -1555,7 +1642,7 @@ while t < 10:
 % See \url{https://tex.stackexchange.com/a/39054/218142}.
 %
 % \changes{v3.1.0}{2022-01-27}
-%   {\linktoplace{sec:mandistudentpkg}{mandistudent} \LaTeX3 code now conforms to formatting standards}
+%   {\linktoplace{sec:mandib}{mandistudent} \LaTeX3 code now conforms to formatting standards}
 %    \begin{macrocode}
 \ExplSyntaxOn
 \NewDocumentCommand{\colvec}{ O{,} m }
@@ -1621,34 +1708,41 @@ while t < 10:
 %    \end{macrocode}
 %
 % An environment for problem statements. The starred variant gives 
-% in-line lists.
+% in-line lists. These are not defined if \textsc{beamer} is loaded.
 %
+% \changes{v3.2.0}{2023-08-01}
+%   {\linktoplace{sec:mandib}{mandistudent} \refEnv{physicsproblem} and
+%   \refEnv{physicsproblem*} are not defined if \textsc{beamer} is loaded}
 %    \begin{macrocode}
-\NewDocumentEnvironment{physicsproblem}{ m }%
-  {%
-    \newpage%
-    \section*{#1}%
-    \newlist{parts}{enumerate}{2}%
-    \setlist[parts]{label=\bfseries(\alph*)}%
-  }%
+\IfClassLoadedTF{beamer}
   {}%
-\NewDocumentEnvironment{physicsproblem*}{ m }%
   {%
-    \newpage%
-    \section*{#1}%
-    \newlist{parts}{enumerate*}{2}%
-    \setlist[parts]{label=\bfseries(\alph*)}%
+    \NewDocumentEnvironment{physicsproblem}{ m }%
+      {%
+        \newpage%
+        \section*{#1}%
+        \newlist{parts}{enumerate}{2}%
+        \setlist[parts]{label=\bfseries(\alph*)}%
+      }%
+      {}%
+    \NewDocumentEnvironment{physicsproblem*}{ m }%
+      {%
+        \newpage%
+        \section*{#1}%
+        \newlist{parts}{enumerate*}{2}%
+        \setlist[parts]{label=\bfseries(\alph*)}%
+      }%
+      {}%
+    \NewDocumentCommand{\problempart}{}{\item}%
   }%
-  {}%
-\NewDocumentCommand{\problempart}{}{\item}%
 %    \end{macrocode}
 %
-% An environment for problem solutions.
+% An environment for problem solutions. Equation numbering
+% is consecutive through the document.
 %
 %    \begin{macrocode}
 \NewDocumentEnvironment{physicssolution}{ +b }%
   {%
-    % Make equation numbering consecutive through the document.
     \begin{align}
       #1
     \end{align}
@@ -1656,7 +1750,6 @@ while t < 10:
   {}%
 \NewDocumentEnvironment{physicssolution*}{ +b }%
   {%
-    % Make equation numbering consecutive through the document.
     \begin{align*}
       #1
     \end{align*}
@@ -1664,7 +1757,7 @@ while t < 10:
   {}%
 %    \end{macrocode}
 %
-% See \url{https://tex.stackexchange.com/q/570223/218142}.
+%  See \url{https://tex.stackexchange.com/q/570223/218142}.
 %
 %    \begin{macrocode}
 \NewDocumentCommand{\reason}{ O{4cm} m }%
@@ -1674,14 +1767,18 @@ while t < 10:
 %    \end{macrocode}
 %
 % Command for highlighting parts of, or entire, mathematical expressions.\newline
-%  See \url{https://texample.net/tikz/examples/beamer-arrows/}.\newline
-%  See also \url{https://tex.stackexchange.com/a/406084/218142}.\newline
-%  See also \url{https://tex.stackexchange.com/a/570858/218142}.\newline
-%  See also \url{https://tex.stackexchange.com/a/570789/218142}.\newline
-%  See also \url{https://tex.stackexchange.com/a/79659/218142}.\newline
-%  See also \url{https://tex.stackexchange.com/q/375032/218142}.\newline
-%  See also \url{https://tex.stackexchange.com/a/571744/218142}%
-%
+% This command is not defined if \textsc{beamer} is loaded.\newline
+% See \url{https://texample.net/tikz/examples/beamer-arrows/}.\newline
+% See also \url{https://tex.stackexchange.com/a/406084/218142}.\newline
+% See also \url{https://tex.stackexchange.com/a/570858/218142}.\newline
+% See also \url{https://tex.stackexchange.com/a/570789/218142}.\newline
+% See also \url{https://tex.stackexchange.com/a/79659/218142}.\newline
+% See also \url{https://tex.stackexchange.com/q/375032/218142}.\newline
+% See also \url{https://tex.stackexchange.com/a/571744/218142}%
+%
+% \changes{v3.2.0}{2023-08-01}
+%   {\linktoplace{sec:mandib}{mandistudent} \refCom{hilite} is
+%   not defined if \textsc{beamer} is loaded}
 %    \begin{macrocode}
 \newcounter{tikzhighlightnode}
 \NewDocumentCommand{\hilite}{ O{magenta!60} m O{rectangle} }%
@@ -1705,7 +1802,7 @@ while t < 10:
 % See \url{https://tex.stackexchange.com/a/614478/218142}.
 %
 % \changes{v3.1.0}{2022-01-27}
-%   {\linktoplace{sec:mandistudentpkg}{mandistudent} Slightly modified \refCom{image}}
+%   {\linktoplace{sec:mandib}{mandistudent} Slightly modified \refCom{image}}
 %    \begin{macrocode}
 \NewDocumentCommand{\image}{ O{scale=1} m m m }%
   {%
@@ -1725,10 +1822,11 @@ while t < 10:
 % notations. Use starred form for index notation, unstarred form for 
 % coordinate-free.
 %
+% Consider renaming these to |\vectorsym| and |\tensorsym|.
+%
 %    \begin{macrocode}
 \NewDocumentCommand{\veccomp}{ s m }%
   {%
-    % Consider renaming this to \vectorsym.
     \IfBooleanTF{#1}
       {%
         \symnormal{#2}%
@@ -1739,7 +1837,6 @@ while t < 10:
   }%
 \NewDocumentCommand{\tencomp}{ s m }%
   {%
-    % Consider renaming this to \tensororsym.
     \IfBooleanTF{#1}%
       {%
         \symsfit{#2}%
@@ -1782,28 +1879,48 @@ while t < 10:
 %    \end{macrocode}
 %
 % Intelligent slot command for coordinate-free tensor notation.
+% |d[]| must be used because of the way consecutive optional
+% arguments are handled. See \pkg{xparse} docs for details.
 %
 %    \begin{macrocode}
 \NewDocumentCommand{\slot}{ s d[] }%
   {%
-    % d[] must be used because of the way consecutive optional
-    %  arguments are handled. See xparse docs for details.
     \IfBooleanTF{#1}
     {%
       \IfValueTF{#2}
-      {% Insert a vector, but don't show the slot.
+%    \end{macrocode}
+%
+% Insert a vector, but don't show the slot.
+%
+%    \begin{macrocode}
+      {%
         \smash{\makebox[1.5em]{\ensuremath{#2}}}
       }%
-      {% No vector, no slot.
+%    \end{macrocode}
+%
+% No vector, no slot.
+%
+%    \begin{macrocode}
+      {%
         \smash{\makebox[1.5em]{\ensuremath{}}}
       }%
     }%
     {%
       \IfValueTF{#2}
-        {% Insert a vector and show the slot.
+%    \end{macrocode}
+%
+% Insert a vector and show the slot.
+%
+%    \begin{macrocode}
+        {%
           \underline{\smash{\makebox[1.5em]{\ensuremath{#2}}}}
         }%
-        {% No vector; just show the slot.
+%    \end{macrocode}
+%
+% No vector; just show the slot.
+%
+%    \begin{macrocode}
+        {%
           \underline{\smash{\makebox[1.5em]{\ensuremath{}}}}
         }%
     }%
@@ -1843,36 +1960,39 @@ while t < 10:
 % \href{https://www.ctan.org/pkg/tcolorbox}{\pkg{tcolorbox}}.\newline
 % See \url{https://tex.stackexchange.com/a/529421/218142}.
 %
+% We set a new font for listings and some new colors (background gray, gray,
+% green, orange, peach, pearl, and plum).
+%
 %    \begin{macrocode}
-\newfontfamily{\gsfontfamily}{DejaVuSansMono}    % new font for listings
-\definecolor{gsbggray}     {rgb}{0.90,0.90,0.90} % background gray
-\definecolor{gsgray}       {rgb}{0.30,0.30,0.30} % gray
-\definecolor{gsgreen}      {rgb}{0.00,0.60,0.00} % green
-\definecolor{gsorange}     {rgb}{0.80,0.45,0.12} % orange
-\definecolor{gspeach}      {rgb}{1.00,0.90,0.71} % peach
-\definecolor{gspearl}      {rgb}{0.94,0.92,0.84} % pearl
-\definecolor{gsplum}       {rgb}{0.74,0.46,0.70} % plum
+\newfontfamily{\gsfontfamily}{DejaVuSansMono}
+\definecolor{gsbggray}     {rgb}{0.90,0.90,0.90}
+\definecolor{gsgray}       {rgb}{0.30,0.30,0.30}
+\definecolor{gsgreen}      {rgb}{0.00,0.60,0.00}
+\definecolor{gsorange}     {rgb}{0.80,0.45,0.12}
+\definecolor{gspeach}      {rgb}{1.00,0.90,0.71}
+\definecolor{gspearl}      {rgb}{0.94,0.92,0.84}
+\definecolor{gsplum}       {rgb}{0.74,0.46,0.70}
 \lstdefinestyle{vpython}%
-  {%                                            % style for listings
-    backgroundcolor=\color{gsbggray},%          % background color
-    basicstyle=\colordigits\footnotesize,%      % default style
-    breakatwhitespace=true%                     % break at whitespace
-    breaklines=true,%                           % break long lines
-    captionpos=b,%                              % position caption
-    classoffset=1,%                             % STILL DON'T UNDERSTAND THIS
-    commentstyle=\color{gsgray},%               % font for comments
-    deletekeywords={print},%                    % delete keywords from the given language
-    emph={self,cls,@classmethod,@property},%    % words to emphasize
-    emphstyle=\color{gsorange}\itshape,%        % font for emphasis
+  {%
+    backgroundcolor=\color{gsbggray},%           % background color
+    basicstyle=\colordigits\footnotesize,%       % default style
+    breakatwhitespace=true%                      % break at whitespace
+    breaklines=true,%                            % break long lines
+    captionpos=b,%                               % position caption
+    classoffset=1,%                              % STILL DON'T UNDERSTAND THIS
+    commentstyle=\color{gsgray},%                % font for comments
+    deletekeywords={print},%                     % delete keywords from the given language
+    emph={self,cls,@classmethod,@property},%     % words to emphasize
+    emphstyle=\color{gsorange}\itshape,%         % font for emphasis
     escapeinside={(*@}{@*)},%                    % add LaTeX within your code
-    frame=tb,%                                  % frame style
-    framerule=2.0pt,%                           % frame thickness
-    framexleftmargin=5pt,%                      % extra frame left margin
-    %identifierstyle=\sffamily,%                % style for identifiers
-    keywordstyle=\gsfontfamily\color{gsplum},%  % color for keywords
-    language=Python,%                           % select language
-    linewidth=\linewidth,%                      % width of listings
-    morekeywords={%                             % VPython/Web VPython specific keywords
+    frame=tb,%                                   % frame style
+    framerule=2.0pt,%                            % frame thickness
+    framexleftmargin=5pt,%                       % extra frame left margin
+    %identifierstyle=\sffamily,%                 % style for identifiers
+    keywordstyle=\gsfontfamily\color{gsplum},%   % color for keywords
+    language=Python,%                            % select language
+    linewidth=\linewidth,%                       % width of listings
+    morekeywords={%                              % VPython/Web VPython specific keywords
       __future__,abs,acos,align,ambient,angle,append,append_to_caption,%
       append_to_title,arange,arrow,asin,astuple,atan,atan2,attach_arrow,%
       attach_trail,autoscale,axis,background,billboard,bind,black,blue,border,%
@@ -1896,18 +2016,18 @@ while t < 10:
       texture,textures,thickness,title,trail_color,trail_object,trail_radius,%
       trail_type,triangle,trigger,True,twist,unbind,up,upper_left,upper_right,%
       userpan,userspin,userzoom,vec,vector,vertex,vertical_spacing,visible,%
-      visual,vpython,VPython,waitfor,WebVPython,white,width,world,xtitle,%
+      visual,vpython,VPython,waitfor,Web,VPython,white,width,world,xtitle,%
       yellow,yoffset,ytitle%
     },%
-    morekeywords={print,None,TypeError},%      % additional keywords
-    morestring=[b]{"""},%                      % treat triple quotes as strings
-    numbers=left,%                             % where to put line numbers
-    numbersep=10pt,%                           % how far line numbers are from code
-    numberstyle=\bfseries\tiny,%               % set to 'none' for no line numbers
-    showstringspaces=false,%                   % show spaces in strings
-    showtabs=false,%                           % show tabs within strings
-    stringstyle=\gsfontfamily\color{gsgreen},% % color for strings
-    upquote=true,%                             % how to typeset quotes
+    morekeywords={print,None,TypeError},%        % additional keywords
+    morestring=[b]{"""},%                        % treat triple quotes as strings
+    numbers=left,%                               % where to put line numbers
+    numbersep=10pt,%                             % how far line numbers are from code
+    numberstyle=\bfseries\tiny,%                 % set to 'none' for no line numbers
+    showstringspaces=false,%                     % show spaces in strings
+    showtabs=false,%                             % show tabs within strings
+    stringstyle=\gsfontfamily\color{gsgreen},%   % color for strings
+    upquote=true,%                               % how to typeset quotes
   }%
 %    \end{macrocode}
 %
@@ -1915,10 +2035,13 @@ while t < 10:
 % See \url{https://tex.stackexchange.com/a/232208/218142}.
 %
 % \changes{v3.1.0}{2022-01-27}
-%   {\linktoplace{sec:mandistudentpkg}{mandistudent} URLs fixed in \refEnv{webvpythonblock}}
+%   {\linktoplace{sec:mandib}{mandistudent} URLs fixed in \refEnv{webvpythonblock}}
 % \changes{v3.1.0}{2022-01-27}
-%   {\linktoplace{sec:mandistudentpkg}{mandistudent} \refEnv{webvpythonblock} now automatically
+%   {\linktoplace{sec:mandib}{mandistudent} \refEnv{webvpythonblock} now automatically
 %    generates QR codes for program listings}
+% \changes{v3.2.0}{2023-08-01}
+%   {\linktoplace{sec:mandib}{mandistudent} \refEnv{webvpythonblock} now shows
+%    URL in header}
 %    \begin{macrocode}
 \AtBeginEnvironment{webvpythonblock}{\catcode`\#=12}
 \AtEndEnvironment{webvpythonblock}{\catcode`\#=6}
@@ -1939,8 +2062,9 @@ while t < 10:
     title = \begin{minipage}{1.5cm}%
               \protect\qrcode*{https://#2}%
             \end{minipage}\hspace{5mm}%
-            \begin{minipage}{0.7\textwidth}%
-              \texttt{Web VPython} Program \thetcbcounter: #3%
+            \begin{minipage}{0.8\textwidth}%
+              \texttt{Web VPython} Program \thetcbcounter: #3\\
+              \footnotesize{\href{https://#2}{\color{white}{https://#2}}}%
             \end{minipage},%
     width = 0.9\textwidth,%
     {#1},
@@ -1950,8 +2074,11 @@ while t < 10:
 % Here is a variant that omits the QR code.
 %
 % \changes{v3.1.0}{2022-01-27}
-%   {\linktoplace{sec:mandistudentpkg}{mandistudent} \refEnv{webvpythonblock*} is a variant
+%   {\linktoplace{sec:mandib}{mandistudent} \refEnv{webvpythonblock*} is a variant
 %    of \refEnv{webvpythonblock} that omits the QR code}
+% \changes{v3.2.0}{2023-08-01}
+%   {\linktoplace{sec:mandib}{mandistudent} \refEnv{webvpythonblock*} now shows
+%    URL in header}
 %    \begin{macrocode}
 \AtBeginEnvironment{webvpythonblock*}{\catcode`\#=12}
 \AtEndEnvironment{webvpythonblock*}{\catcode`\#=6}
@@ -1970,13 +2097,14 @@ while t < 10:
       listing only,%
       listing style = vpython,%
       nameref = {#3},%
-      title =   \texttt{Web VPython} Program \thetcbcounter: #3,%
+      title =   \texttt{Web VPython} Program \thetcbcounter: #3\\%
+                \footnotesize{\href{https://#2}{\color{white}{https://#2}}},%
       width = 0.9\textwidth,%
       {#1},
     }%
 %    \end{macrocode}
 %
-% A new command for generating a list of \WebVPython\ programs.
+% A new command for generating a list of \WebVPython{} programs.
 %
 %    \begin{macrocode}
 \NewDocumentCommand{\listofwebvpythonprograms}{}%
@@ -1989,10 +2117,13 @@ while t < 10:
 % See \url{https://tex.stackexchange.com/q/616205/218142}.
 % 
 % \changes{v3.1.0}{2022-01-27}
-%   {\linktoplace{sec:mandistudentpkg}{mandistudent} URLs fixed in \refCom{vpythonfile}}
+%   {\linktoplace{sec:mandib}{mandistudent} URLs fixed in \refCom{vpythonfile}}
 % \changes{v3.1.0}{2022-01-27}
-%   {\linktoplace{sec:mandistudentpkg}{mandistudent} Default URL for \refCom{vpythonfile}
+%   {\linktoplace{sec:mandib}{mandistudent} Default URL for \refCom{vpythonfile}
 %    is now \vpurl}
+% \changes{v3.2.0}{2023-08-01}
+%   {\linktoplace{sec:mandib}{mandistudent} \refCom{vpythonfile} now shows
+%    URL in header}
 %    \begin{macrocode}
 \newcommand*{\vpythonfile}{\catcode`\#=12 \vpythonfile@auxA}
 \NewDocumentCommand{\vpythonfile@auxA}{ O{} D(){vpython.org} m m }%
@@ -2022,7 +2153,7 @@ while t < 10:
     }%
 %    \end{macrocode}
 %
-%  A new command for generating a list of \VPython\ programs.
+%  A new command for generating a list of \VPython{} programs.
 %
 %    \begin{macrocode}
 \NewDocumentCommand{\listofvpythonprograms}{}%
@@ -2054,7 +2185,7 @@ while t < 10:
   {\lstinline[style = vpython]{#1}}%
 %    \end{macrocode}
 %
-% Define \refCom{vpythoninline}, a semantic alias for \VPython\ 
+% Define \refCom{vpythoninline}, a semantic alias for \VPython{} 
 % in-line listings.
 %
 %    \begin{macrocode}
diff --git a/macros/unicodetex/latex/fontsetup/README b/macros/unicodetex/latex/fontsetup/README
index 2c6b3916cd..472a898d2f 100644
--- a/macros/unicodetex/latex/fontsetup/README
+++ b/macros/unicodetex/latex/fontsetup/README
@@ -1,5 +1,5 @@
                The fontsetup package
-               (Version 1.5, GPL3)
+               (Version 1.6, GPL3)
 
 This simple package makes it trivial to switch quickly between 
 different quality fonts supporting Mathematics. 
diff --git a/macros/unicodetex/latex/fontsetup/doc/fontsetup-doc.pdf b/macros/unicodetex/latex/fontsetup/doc/fontsetup-doc.pdf
index 5b0cedc0dc..6b90a5bab1 100644
--- a/macros/unicodetex/latex/fontsetup/doc/fontsetup-doc.pdf
+++ b/macros/unicodetex/latex/fontsetup/doc/fontsetup-doc.pdf
diff --git a/macros/unicodetex/latex/fontsetup/doc/fontsetup-doc.tex b/macros/unicodetex/latex/fontsetup/doc/fontsetup-doc.tex
index f56fcc39c9..870bc36f03 100644
--- a/macros/unicodetex/latex/fontsetup/doc/fontsetup-doc.tex
+++ b/macros/unicodetex/latex/fontsetup/doc/fontsetup-doc.tex
@@ -14,8 +14,8 @@
     \textit{by}\\[1ex]
     {\large Antonis Tsolomitis}\\
 University of the Aegean\\ Department of Mathematics\\[1ex]
-	  \textsc{28} July \textsc{2023}\\[1ex]
-	  Version 1.5, \textsc{gpl3}
+	  \textsc{2} August \textsc{2023}\\[1ex]
+	  Version 1.6, \textsc{gpl3}
   \end{center}
 
   This package is a simple wrapper-type package that makes the setup of fonts easy and
diff --git a/macros/unicodetex/latex/fontsetup/fspeulerot.sty b/macros/unicodetex/latex/fontsetup/fspeulerot.sty
index 3be2bc9f5f..55442dfe1c 100644
--- a/macros/unicodetex/latex/fontsetup/fspeulerot.sty
+++ b/macros/unicodetex/latex/fontsetup/fspeulerot.sty
@@ -4,58 +4,25 @@
 \setmainfont[ItalicFont=cmunoti.otf,
 	 BoldFont=cmunobx.otf,
 	 BoldItalicFont=cmunobi.otf,
-         % RawFeature=+pnum,% variable width numbers
-SmallCapsFeatures={Numbers=OldStyle}]{cmunorm.otf}
+     % RawFeature=+pnum,% variable width numbers
+     SmallCapsFeatures={Numbers=OldStyle}]{cmunorm.otf}
 \defaultfontfeatures{Scale=MatchLowercase}
 
 
 %\setmathfont{LibertinusMath-Regular.otf}
-\setmathfont{texgyrepagella-math.otf}
+\setmathfont{euler-math.otf}
+%Get missing glyphs (in euler-math) from Tex Gyre Pagella Math
 \setmathfont[%
-  range={"21-"7E,"A0,"A3,"A5,"A7-"A8,"AC,"AE-"AF,"B1,"B4-"B7,"D7,"F0,"F7,"127,
-    "131,"1B5,"237,"2C6-"2C7,"2D8-"2DA,"2DC,"300-"30C,"30F,"311,"323-"325,"32E-"332,"338,
-    "34D,"391-"3A1,"3A3-"3A9,"3B1-"3C1,"3C3-"3C9,"3D1,"3D5-"3D6,"3F0,"3F4-"3F6,"2000-"200A,
-    "2010-"2016,"2018-"2019,"2020-"2022,"2026,"2030-"2037,"2044,"2057,"20AC,"20D0-"20D2,
-    "20D5-"20D7,"20DB-"20DF,"20E1,"20E4,"20E8-"20E9,"20EC-"20F0,"2102,"2107,"210B-"2113,
-    "2115,"2118-"211D,"2124,"2126-"2128,"212B-"212D,"2130-"2133,"2135-"2138,"213C-"2141,
-    "214B,"2190-"219B,"219E-"21A7,"21A9-"21AE,"21B0-"21B3,"21B6-"21B7,"21BA-"21DD,
-    "21E0-"21E3,"21E6-"21E9,"21F5-"21F6,"2200-"22AF,"22B2-"22F1,"2300,"2305-"2306,
-    "2308-"230B,"2310,"2319,"231C-"2323,"2329-"232A,"239B-"23B1,"23B4-"23B5,"23B7,
-    "23DC-"23DF,"2422-"2423,"24C7-"24C8,"25A0-"25A1,"25AA-"25AD,"25B2-"25B9,
-    "25BC-"25C3,"25C6-"25C7,"25CA-"25CB,"25CF,"25E6,"25EF,"25FB-"25FE,"2605,"2660-"2667,
-    "266D-"266F,"26AA-"26AC,"2713,"2720,"27C2,"27CB,"27CD,"27D8-"27DE,"27E0-"27E3,
-    "27E6-"27EB,"27F4-"27FF,"2906-"2907,"2933,"2980-"2981,"29EB,"29F5,"2A00-"2A06,"2A09,
-    "2A0C,"2A11,"2A1D,"2A2F,"2A3F,"2A5E-"2A5F,"2A7D-"2A7E,"2A85-"2A8C,"2A95-"2A96,
-    "2A9B-"2A9C,"2AAF-"2ABA,"2AC5-"2AC6,"2ACB-"2ACC,"2AF9-"2AFA,"2B1A-"2B1E,"2B24-"2B2B,
-    "2B31,"2B33,"2B3F,"E010-"E01F,"E021,"E045-"E048,"E08D-"E08F,"E098-"E099,"E09C-"E09F,
-    "E0A2-"E0AF,"E0C0-"E0C9,"E0CB,"E0D0-"E0D9,"E0DB,"E143-"E14D,"E1D3-"E1D4,"E1E3,
-    "E1F3,"E223,"E22A-"E22B,"E22E-"E22F,"E233,"E243,"E253,"E263,"E283,"E293,"E2A3,
-    "E311-"E318,"E321-"E328,"E331-"E338,"E341-"E348,"E351-"E358,"E35A-"E35F,"E361-"E368,
-    "E371-"E378,"E381-"E388,"E391-"E398,"E3A1-"E3A4,"E3AA-"E3AB,"E3D1-"E3D4,"E3D9,
-    "E3E1-"E3E4,"E3E9,"E3F1-"E3F4,"E3F9,"E4A0-"E4BB,"E4BD-"E4C7,"E500-"E507,"E50E-"E517,
-    "E520-"E527,"E530-"E544,"E551-"E554,"E561-"E564,"E570-"E57F,"E581-"E584,"E590-"E591,
-    "E593-"E596,"E598-"E599,"E59B-"E59E,"E5A0-"E5B1,"E5B3,"E5B8-"E5BA,"E5BF-"E5CF,
-    "E741-"E75A,"E761-"E77A,"E800-"E809,"E80B,"E810-"E819,"E820-"E853,"E856,"E862,"E867,
-    "E86A,"E86D,"E86F,"E871,"E873-"E874,"E876,"E878-"E882,"E884-"E885,"E887-"E893,
-    "E8A0-"E8D3,"E8D5-"E8DC,"E8E0-"E8F9,"E900-"E909,"E90B,"E910-"E919,"E920-"E953,
-    "E958-"E95A,"E962-"E963,"E967,"E96A,"E96D,"E96F,"E971,"E973-"E974,"E976-"E986,
-    "E988-"E995,"E9A0-"E9D3,"E9D5-"E9DA,"E9DE-"E9F9,"EA00-"EA01,"EA05-"EA0B,"EA0D-"EA14,
-    "EA16-"EA19,"EA1C-"EA1E,"EA21,"EA23,"EA25,"EA27,"EA29-"EA36,"EA38,"EA3B,"EA3D-"EA4B,
-    "EA50-"EA61,"EA6C-"EA6F,"EA71-"EA7B,"EA7F-"EA81,"EA85-"EA86,"EA88-"EA90,"EA99-"EA9A,
-    "EAA8-"EAAA,"EAAC-"EAAD,"EABE-"EACF,"EAD8-"EAD9,"EADD-"EADF,"EB00-"EB0E,"EB10-"EB14,
-    "EB20-"EB23,"EB30-"EB33,"EC00-"EC09,"EC0B,"EC10-"EC19,"EC20-"EC53,"EC56,"EC62,"EC67,
-    "EC6A,"EC6D,"EC6F,"EC71,"EC73-"EC74,"EC76,"EC78-"EC82,"EC84-"EC85,"EC87-"EC93,
-    "ECA0-"ECD3,"ECD5-"ECDC,"ECE0-"ECF9,"ED00-"ED09,"ED0B,"ED10-"ED19,"ED20-"ED53,
-    "ED58-"ED5A,"ED62-"ED63,"ED67,"ED6A,"ED6D,"ED6F,"ED71,"ED73-"ED74,"ED76-"ED86,
-    "ED88-"ED95,"EDA0-"EDD3,"EDD5-"EDDA,"EDDE-"EDF9,"EE00-"EE01,"EE05-"EE0B,"EE0D-"EE14,
-    "EE16-"EE19,"EE1C-"EE1E,"EE21,"EE23,"EE25,"EE27,"EE29-"EE36,"EE38,"EE3B,"EE3D-"EE41,
-    "EE60-"EE61,"EE6C-"EE6F,"EE71-"EE76,"EE7A-"EE7B,"EE7F-"EE81,"EE86,"EE88-"EE8B,
-    "EE99-"EE9A,"EEA8-"EEAA,"EEAC-"EEAD,"EEBE-"EECF,"EED8-"EED9,"EEDD-"EEDF,
-    "1D400-"1D49C,"1D49E-"1D49F,"1D4A2,"1D4A5-"1D4A6,"1D4A9-"1D4AC,"1D4AE-"1D4B5,
-    "1D4D0-"1D4E9,"1D504-"1D505,"1D507-"1D50A,"1D50D-"1D514,"1D516-"1D51C,"1D51E-"1D539,
-    "1D53B-"1D53E,"1D540-"1D544,"1D546,"1D54A-"1D550,"1D552-"1D6A5,"1D6A8-"1D6D2,
-    "1D6D4-"1D6DF,"1D6E1-"1D70C,"1D70E-"1D719,"1D71B-"1D746,"1D748-"1D753,"1D755-"1D789,
-    "1D790-"1D7C3,"1D7CE-"1D7FF}]{Euler-Math.otf}
+  range={"00A2,"00A6,"00A9,"00AB,"00B0,"00B8,"00BB,"00BF,"00C0-"00D6,"00D8-"00EF,
+          "00F1-"00F6,"00F8-"0107,"010C-"0126,"0128-"130,"0132-"01B4,"0218-"021B,
+          "02DB,"02DD,"0326,"032C,"032D,"0333,"033F,"03C2,"03F1,"0E3F,"1EA0-"1EF9,
+          "2017,"201A,"201C-"201D,"2039-"203D,"2052,"2061,"20A1,"20AB,"20B1,"20B2,
+          "20D3,"20D4,"20D8,"20DC,"20DB,"20D5,"20D6,"20EA,"20EB,"2103,"2109,"210A,
+          "2116,"2117,"211E-"2122,"212A,"212E,"212F,"2134,"2145,"2149,"21B4,"21B5,
+          "21F3,"23B2,"23B3,"23D0,"23E0,"23E1,"2500-"259F,"266A,"26AD,"26AE,"27A1,
+          "27EE,"27EF,"2B04-"2B07,"2B0C,"2B0D,"2E18,"3016,"3017,"01D4B6-"01D4CF,
+          "01D4EA-"01D503,"01D6D3-"01D6E0,"01D70D-"01D71A,"01D747-"01D754,
+          "01D78A-"01D78F,"01D764-"01D7C9}]{texgyrepagella-math.otf}
 \setmathfont[range=up/{greek,Greek}, script-features={}, sscript-features={}
             ]{Euler-Math.otf}
 \setmathfont[range=up/{latin,Latin,num}, script-features={}, sscript-features={}
diff --git a/macros/xetex/latex/bidi/README b/macros/xetex/latex/bidi/README
index 60fcee8d1c..29b3fad76c 100644
--- a/macros/xetex/latex/bidi/README
+++ b/macros/xetex/latex/bidi/README
@@ -1,6 +1,6 @@
 ___________________
 The bidi package
-v39.7
+v39.8
 
 This package provides a convenient interface for typesetting
 bidirectional texts in Plain TeX and LaTeX, using XeTeX engine.
@@ -25,7 +25,7 @@ The announcements for the new releases of the package will
 also appear in the Discussions space under the Announcements
 category.
 
-Current version release date: 2023/01/18
+Current version release date: 2023/08/02
 
 ___________________________________________
 Vafa Khalighi
diff --git a/macros/xetex/latex/bidi/bidi-doc-intro.ltx b/macros/xetex/latex/bidi/bidi-doc-intro.ltx
index 91de6e02ef..cfea0b9ca2 100644
--- a/macros/xetex/latex/bidi/bidi-doc-intro.ltx
+++ b/macros/xetex/latex/bidi/bidi-doc-intro.ltx
@@ -20,7 +20,7 @@ If you use \textsf{bidi} package to write any input \TeX\ document, and then run
 * Copyright (c) 2007--2023 Vafa Khalighi
 * Copyright (c) 2018--2020 bidi-tex GitHub Organization
 * 
-* v39.7 (Release Serge Lang), 2023/01/18
+* v39.8 (Release Donald Ervin Knuth), 2023/08/02
 * 
 * License: LaTeX Project Public License, version
 * 1.3c or higher (your choice)
diff --git a/macros/xetex/latex/bidi/bidi-doc-title.ltx b/macros/xetex/latex/bidi/bidi-doc-title.ltx
index 49d6163ff2..91bb5e5ed6 100644
--- a/macros/xetex/latex/bidi/bidi-doc-title.ltx
+++ b/macros/xetex/latex/bidi/bidi-doc-title.ltx
@@ -3,7 +3,7 @@
 \begin{document}
 \title{\textcolor{blue!65!black}{\Huge The \textsf{bidi} \textit{Package}}\\
 \LARGE Bidirectional typesetting in plain \TeX{} and \LaTeX, using \XeTeX{} engine\\[5pt]
-\large User documentation for \textcolor{blue!65!black}{version 39.7}}
+\large User documentation for \textcolor{blue!65!black}{version 39.8}}
 \author{Vafa Khalighi\thanks{Thanks to the bidi-tex GitHub organization consisted of David Carlisle and other members of the  {\LaTeX} team to maintain the package in the period 2018--2020.}}
 \setcounter{page}{0}
 \thispagestyle{empty}
@@ -13,7 +13,7 @@
 \textcolor{blue!65!black}{\Huge The \textsf{bidi} \textit{Package}}
 
 \Large
-User documentation for \textcolor{blue!65!black}{version 39.7}}
+User documentation for \textcolor{blue!65!black}{version 39.8}}
 
 \vskip 0pt plus 3fill
 \textit{\large to my Master, \textbf{Ferdowsi The Great}}
diff --git a/macros/xetex/latex/bidi/bidi-doc.ltx b/macros/xetex/latex/bidi/bidi-doc.ltx
index 76d56ae9ef..d14af80d44 100644
--- a/macros/xetex/latex/bidi/bidi-doc.ltx
+++ b/macros/xetex/latex/bidi/bidi-doc.ltx
@@ -1,7 +1,7 @@
 \documentclass{ltxdoc}
 \input{bidi-doc-preamble.ltx}
 \hypersetup{%
-  pdftitle={User documentation for version 39.7 of the bidi
+  pdftitle={User documentation for version 39.8 of the bidi
                 package}%
 }
 \begin{document}
diff --git a/macros/xetex/latex/bidi/bidi-doc.pdf b/macros/xetex/latex/bidi/bidi-doc.pdf
index c861748d85..ce2217e82f 100644
--- a/macros/xetex/latex/bidi/bidi-doc.pdf
+++ b/macros/xetex/latex/bidi/bidi-doc.pdf
diff --git a/macros/xetex/latex/bidi/bidi.dtx b/macros/xetex/latex/bidi/bidi.dtx
index a24d9572f4..b18945de1e 100644
--- a/macros/xetex/latex/bidi/bidi.dtx
+++ b/macros/xetex/latex/bidi/bidi.dtx
@@ -5,7 +5,7 @@
 %<*readme>
 ___________________
 The bidi package
-v39.7
+v39.8
 
 This package provides a convenient interface for typesetting
 bidirectional texts in Plain TeX and LaTeX, using XeTeX engine.
@@ -30,7 +30,7 @@ The announcements for the new releases of the package will
 also appear in the Discussions space under the Announcements
 category.
   
-Current version release date: 2023/01/18
+Current version release date: 2023/08/02
 
 ___________________________________________
 Vafa Khalighi
@@ -267,7 +267,7 @@ by Vafa Khalighi.
 \documentclass{ltxdoc}
 \input{bidi-doc-preamble.ltx}
 \hypersetup{%
-  pdftitle={Source documentation for version 39.7 of the bidi
+  pdftitle={Source documentation for version 39.8 of the bidi
                 package}%
 }
 \EnableCrossrefs
@@ -286,7 +286,7 @@ by Vafa Khalighi.
 % \GetFileInfo{\jobname.dtx}
 % \title{\textcolor{blue!65!black}{\Huge The \textsf{bidi} \textit{Package}}\\
 %\LARGE Bidirectional typesetting in plain \TeX{} and \LaTeX, using \XeTeX{} engine\\[5pt]
-%\large Source documentation for \textcolor{blue!65!black}{version 39.7}}
+%\large Source documentation for \textcolor{blue!65!black}{version 39.8}}
 % \author{Vafa Khalighi\thanks{Thanks to the bidi-tex GitHub organization consisted of David Carlisle and other members of the  {\LaTeX} team to maintain the package in the period 2018--2020.}}
 %\setcounter{page}{0}
 %\thispagestyle{empty}
@@ -296,7 +296,7 @@ by Vafa Khalighi.
 %\textcolor{blue!65!black}{\Huge The \textsf{bidi} \textit{Package}}
 %
 %\Large
-%Source documentation for \textcolor{blue!65!black}{version 39.7}}
+%Source documentation for \textcolor{blue!65!black}{version 39.8}}
 %
 %\vskip 0pt plus 3fill
 %\textit{\large to my Master, \textbf{Ferdowsi The Great}}
@@ -345,7 +345,7 @@ by Vafa Khalighi.
 %\iffalse
 %<*table>
 %\fi
-%% \CheckSum{58794}
+%% \CheckSum{58884}
 %% \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
@@ -1989,7 +1989,35 @@ by Vafa Khalighi.
 %\fi
 % \section{File \texttt{beamerbaseauxtemplates-xetex-bidi.def}}
 %    \begin{macrocode}
-\ProvidesFile{beamerbaseauxtemplates-xetex-bidi.def}[2022/06/06 v0.2 bidi adaptations for beamerbaseauxtemplates package for XeTeX engine]
+\ProvidesFile{beamerbaseauxtemplates-xetex-bidi.def}[2023/08/02 v0.3 bidi adaptations for beamerbaseauxtemplates package for XeTeX engine]
+\bidi@csundef{beamer@@tmpop@subsection in toc@sections numbered}
+
+\bidi@csundef{beamer@@tmpop@subsubsection in toc@sections numbered}
+
+\bidi@csundef{beamer@@tmpop@section in toc@subsections numbered}
+
+\bidi@csundef{beamer@@tmpop@subsection in toc@subsections numbered}
+
+\bidi@csundef{beamer@@tmpop@subsubsection in toc@subsections numbered}
+
+\defbeamertemplate{subsection in toc}{sections numbered}
+{\leavevmode\bidi@beamer@leftskip=2.5em\inserttocsubsection\par}
+
+\defbeamertemplate{subsubsection in toc}{sections numbered}
+{\leavevmode\normalsize\usebeamerfont{subsection in toc}\bidi@beamer@leftskip=3.5em\usebeamerfont{subsubsection in toc}%
+  \inserttocsubsubsection\par}
+  
+\defbeamertemplate{section in toc}{subsections numbered}
+{\leavevmode\bidi@beamer@leftskip=2em\inserttocsection\par}
+
+\defbeamertemplate{subsection in toc}{subsections numbered}
+{\leavevmode\bidi@beamer@leftskip=2em\rlap{\hskip-2em\inserttocsectionnumber.\inserttocsubsectionnumber}\inserttocsubsection\par}
+
+\defbeamertemplate{subsubsection in toc}{subsections numbered}
+{\leavevmode\normalsize\usebeamerfont{subsection in
+    toc}\bidi@beamer@leftskip=3em\usebeamerfont{subsubsection in toc}%
+  \inserttocsubsubsection\par}
+  
 \bidi@csundef{beamer@@tmpop@section in toc@circle}
 
 \bidi@csundef{beamer@@tmpop@subsection in toc@circle}
@@ -2033,7 +2061,7 @@ by Vafa Khalighi.
 \bidi@csundef{beamer@@tmpop@enumerate mini template@square}
 
 \defbeamertemplate{section in toc}{square}
-{\leavevmode\bidi@beamer@leftskip=1.75ex%
+{\leavevmode\bidi@beamer@leftskip=3ex%
   \llap{{%
     \usebeamerfont*{section number projected}%
     \usebeamercolor[bg]{section number projected}%
@@ -2047,8 +2075,8 @@ by Vafa Khalighi.
       \hskip-2.25ex%
       \vrule width2.25ex height1.85ex depth.4ex%
     \fi
-    }}%
-  \kern1.25ex\inserttocsection\par}
+    }\kern1.25ex}%
+  \inserttocsection\par}
   
 \defbeamertemplate{subsection in toc}{square}
 {\leavevmode\bidi@beamer@leftskip=5ex\llap{{%
@@ -2148,6 +2176,28 @@ by Vafa Khalighi.
   }}%
 }
 
+\bidi@csundef{beamer@@tmpop@section in toc@ball unnumbered}
+
+\bidi@csundef{beamer@@tmpop@subsection in toc@ball unnumbered}
+
+\bidi@csundef{beamer@@tmpop@subsubsection in toc@ball unnumbered}
+
+\defbeamertemplate{section in toc}{ball unnumbered}
+{\leavevmode\bidi@beamer@leftskip=2.25ex%
+  \llap{%
+    \raise0.1ex\beamer@usesphere{section number projected}{bigsphere}\kern1.25ex}%
+  \inserttocsection\par}
+
+\defbeamertemplate{subsection in toc}{ball unnumbered}
+{\leavevmode\bidi@beamer@leftskip=5.1ex\llap{%
+    \raise0.2ex\beamer@usesphere{subsection number projected}{smallsphere}\kern1ex}\inserttocsubsection\par}
+
+\defbeamertemplate{subsubsection in toc}{ball unnumbered}
+{\leavevmode\normalsize\usebeamerfont{subsection in
+    toc}\bidi@beamer@leftskip=8.2ex\usebeamerfont{subsubsection in toc}%
+  \llap{%
+    \beamer@usesphere{subsubsection number projected}{smallsphere}\kern0.75ex}\inserttocsubsubsection\par}
+    
 \bidi@csundef{beamer@@tmpop@section in toc@ball}
 
 \bidi@csundef{beamer@@tmpop@subsection in toc@ball}
@@ -2218,6 +2268,22 @@ by Vafa Khalighi.
     \usebeamerfont{block body example}%
 }%
 
+\bidi@csundef{beamer@@tmpop@caption@caption name own line}
+
+\defbeamertemplate{caption}{caption name own line}
+{%
+  \begin{minipage}{\textwidth}
+    \leavevmode
+    \bidi@beamer@ragged
+  {%
+    \usebeamercolor[fg]{caption name}%
+    \usebeamerfont*{caption name}%
+    \insertcaptionname%
+    }\\
+      \insertcaption
+    \end{minipage}
+}
+
 %    \end{macrocode}
 % \iffalse
 %</beamerbaseauxtemplates-xetex-bidi.def>
@@ -2430,7 +2496,7 @@ by Vafa Khalighi.
 %\fi
 % \section{File \texttt{beamerbaseframecomponents-xetex-bidi.def}}
 %    \begin{macrocode}
-\ProvidesFile{beamerbaseframecomponents-xetex-bidi.def}[2023/01/18 v0.5 bidi adaptations for beamerbaseframecomponents package for XeTeX engine]
+\ProvidesFile{beamerbaseframecomponents-xetex-bidi.def}[2023/08/02 v0.6 bidi adaptations for beamerbaseframecomponents package for XeTeX engine]
 \renewcommand{\setbeamersize}[1]{%
   \beamer@dogeometryfalse%
   \setkeys{beamer@margin}{#1}%
@@ -2589,7 +2655,7 @@ by Vafa Khalighi.
     \endgroup%
   }
   \def\@oddfoot{{\normalcolor{\hfil%
-    \setbox\beamer@tempbox=\hbox{\usebeamertemplate***{navigation symbols}\hskip-\Gm@rmargin\hskip2pt}%
+    \setbox\beamer@tempbox=\hbox{\usebeamertemplate***{navigation symbols}\hskip-\bidi@beamer@Gm@rmargin\hskip2pt}%
     \ht\beamer@tempbox=0pt%
     \dp\beamer@tempbox=0pt%
     \box\beamer@tempbox}}}
@@ -4589,9 +4655,9 @@ by Vafa Khalighi.
 % \section{File \texttt{bidi.sty}}
 %    \begin{macrocode}
 \NeedsTeXFormat{LaTeX2e}
-\def\bididate{2023/01/18}
-\def\bidi@version{39.7}
-\def\bidi@releasename{Serge Lang}
+\def\bididate{2023/08/02}
+\def\bidi@version{39.8}
+\def\bidi@releasename{Donald Ervin Knuth}
 \newcommand*{\bidireleasename}{\bidi@releasename}
 \ProvidesPackage{bidi}[\bididate\space v\bidi@version\space (Release \bidi@releasename)\space
 Bidirectional typesetting in plain TeX and LaTeX]
@@ -4679,7 +4745,7 @@ Bidirectional typesetting in plain TeX and LaTeX]
 }
 \newcommand*{\@bidi@pdfcustomproperties}{%
   This is the bidi package, Version \bidi@version\space (Release \bidi@releasename),
-  Released January 18, 2023. 
+  Released August 2, 2023. 
 }
 \newcommand*{\bidi@beamer@ragged}{}
 \@RTLmainfalse
@@ -4923,10 +4989,10 @@ Bidirectional typesetting in plain TeX and LaTeX]
 %\fi
 % \section{File \texttt{bidi.tex}}
 %    \begin{macrocode}
-\def\bididate{2023/01/18}
+\def\bididate{2023/08/02}
 \catcode`@=11
-\def\bidi@version{39.7}
-\def\bidi@releasename{Serge Lang}
+\def\bidi@version{39.8}
+\def\bidi@releasename{Donald Ervin Knuth}
 \def\bidireleasename{\bidi@releasename}
 \let \protect \relax
 \newlinechar`\^^J
@@ -5029,7 +5095,7 @@ Bidirectional typesetting in plain TeX and LaTeX]
 }
 \def\@bidi@pdfcustomproperties{%
   This is the bidi package, Version \bidi@version\space (Release \bidi@releasename),
-  Released January 18, 2023. 
+  Released August 2, 2023. 
 }
 \def\bidi@pdfm@mark{%
   \special{pdf:%
@@ -12545,7 +12611,7 @@ bidi implementation of tufte title]
 %\fi
 % \section{File \texttt{extrafootnotefeatures-xetex-bidi.def}}
 %    \begin{macrocode}
-\ProvidesFile{extrafootnotefeatures-xetex-bidi.def}[2023/01/18 v2.5 bidi extra footnote features for XeTeX engine]
+\ProvidesFile{extrafootnotefeatures-xetex-bidi.def}[2023/08/02 v2.6 bidi extra footnote features for XeTeX engine]
 \newdimen\bidi@columnwidth
 \def\bidi@floathook{%
   \bidi@columnwidth\columnwidth
@@ -12872,7 +12938,7 @@ bidi implementation of tufte title]
   \fi
 }
 \def\bidi@reinsertfootnote#1#2#3{%
-  \ifvoid#1
+  \ifvoid#1%
   \else
     \insert\footins{#2#3}%
   \fi
@@ -25885,7 +25951,8 @@ to\rtside{\box\bslice\hfil}}
 %\fi
 % \section{File \texttt{tocloft-xetex-bidi.def}}
 %    \begin{macrocode}
-\ProvidesFile{tocloft-xetex-bidi.def}[2010/07/25 v0.2 bidi adaptations for tocloft package for XeTeX engine]
+\ProvidesFile{tocloft-xetex-bidi.def}[2023/08/02 v0.3 bidi adaptations for tocloft package for XeTeX engine]
+\renewcommand{\cftpnumalign}{\if@RTL l\else r\fi}
 \let\cftdot\@SepMark
 \if@cfthaspart
 \renewcommand*{\l@part}[2]{
diff --git a/macros/xetex/latex/bidi/bidi.pdf b/macros/xetex/latex/bidi/bidi.pdf
index 7b6538b76f..478ea3814f 100644
--- a/macros/xetex/latex/bidi/bidi.pdf
+++ b/macros/xetex/latex/bidi/bidi.pdf
diff --git a/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl b/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
index a1d96dd6e9..1ad2a72da6 100644
--- a/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
+++ b/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
@@ -17,7 +17,6 @@ $mirrors = {
       'https://mirrors.cloud.tencent.com/CTAN/' => 1,
       'https://mirrors.cqu.edu.cn/CTAN/' => 1,
       'https://mirrors.hit.edu.cn/CTAN/' => 1,
-      'https://mirrors.jlu.edu.cn/CTAN/' => 1,
       'https://mirrors.nju.edu.cn/CTAN/' => 1,
       'https://mirrors.pku.edu.cn/ctan/' => 1,
       'https://mirrors.sjtug.sjtu.edu.cn/ctan/' => 1,
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb b/systems/texlive/tlnet/tlpkg/texlive.tlpdb
index 9abaa25a6b..b01b3924a6 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb
@@ -26,11 +26,11 @@ depend container_split_src_files/1
 depend frozen/0
 depend minrelease/2016
 depend release/2023
-depend revision/67791
+depend revision/67798
 
 name 00texlive.image
 category TLCore
-revision 67779
+revision 67796
 shortdesc TeX Live files only in the source repository
 longdesc The files here are not copied by the installer and containers
 longdesc are not built for them; they exist only in the source
@@ -4771,7 +4771,7 @@ depend setting_available_architectures:aarch64-linux amd64-freebsd amd64-netbsd
 
 name 00texlive.installer
 category TLCore
-revision 67785
+revision 67793
 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
@@ -41748,17 +41748,17 @@ catalogue-version 2.2
 
 name bidi
 category Package
-revision 65572
+revision 67798
 shortdesc Bidirectional typesetting in plain TeX and LaTeX, using XeTeX
 relocated 1
 longdesc A convenient interface for typesetting bidirectional texts with
 longdesc plain TeX and LaTeX. The package includes adaptations for use
 longdesc with many other commonly-used packages.
-containersize 132944
-containerchecksum b4d94dc0e539c0c0e4d91586ff9d121fe58af5c4729c603d6eb22f16a19e5edbea722b7576faf2b56a46f6fc68fc3e1cdc3c2f1941bba51a60337f091a248045
-doccontainersize 4231356
-doccontainerchecksum 002f65b1fff0798a2bdb87999910c848d94ce1e03c5dd4e61fd173cde8bdb5e153086616274cc1d97b711ee9a2d0d11b06e11de303d03e38ff577c2f941e1caa
-docfiles size=1167
+containersize 133180
+containerchecksum e589f50dbd63df9d711540ad90b53384e52a5a0b353e2ba050657af3273f3dd7b65925101465d89831ea133504701c6d05d01ef959fcaa2570bb1188384c621d
+doccontainersize 4236404
+doccontainerchecksum 09ac7b97d9d1a93b80e8dac120cd6e70932ca9239dc94202449a476979caadd596677a210b27700e3638c3cf0bcecf98c4f903ea228f94545a2cf5cb206abcc8
+docfiles size=1168
  RELOC/doc/xelatex/bidi/README details="Readme"
  RELOC/doc/xelatex/bidi/bidi-bibitem.pdf
  RELOC/doc/xelatex/bidi/bidi-doc.pdf details="Package user documentation"
@@ -41783,8 +41783,8 @@ docfiles size=1167
  RELOC/doc/xelatex/bidi/test2-colortbl.tex
  RELOC/doc/xelatex/bidi/test2-wrapfig.tex
  RELOC/doc/xelatex/bidi/test3-wrapfig.tex
-srccontainersize 149772
-srccontainerchecksum e43b88ae4423bb1075a432f9034bf51ebe403bf5e5b8c0ab899e49a46257e45228b65ea4b0150542748830c74e3d9cbc59e9df49d75fdaf2fabc0b33b0a59714
+srccontainersize 149884
+srccontainerchecksum 1bdd170bb3065027106944aa23b99311482fd90a019a6bd1e87044f03a04f672e0b01a31d4d09e213db7b228718f7e9ad15d77acfcef7412af8ae180935fd77c
 srcfiles size=288
  RELOC/source/xelatex/bidi/bidi-doc-intro.ltx
  RELOC/source/xelatex/bidi/bidi-doc-latex-basics.ltx
@@ -41970,7 +41970,7 @@ catalogue-contact-support https://github.com/kvafa/bidi/discussions
 catalogue-ctan /macros/xetex/latex/bidi
 catalogue-license lppl1.3c
 catalogue-topics typesetting xetex bidi class
-catalogue-version 39.7
+catalogue-version 39.8
 
 name bidi-atbegshi
 category Package
@@ -110202,7 +110202,7 @@ catalogue-version 1.2
 
 name eolang
 category Package
-revision 67524
+revision 67795
 shortdesc Formulas and graphs for the EO programming language
 relocated 1
 longdesc This LaTeX package helps you write [?] -calculus formulas and
@@ -110214,19 +110214,19 @@ depend iexec
 depend pgf
 depend pgfopts
 depend stmaryrd
-containersize 7124
-containerchecksum 06c739381e2a381d26290db96c6ca06378c9a6d39ce111dbbcc90b11ac4278fca0fbecaf279eb6affd969d223db9907ad172c410d8a7690b455fb83fd66a31e3
-doccontainersize 1644144
-doccontainerchecksum 2e12b07fe31376879fe6f444fcd669c60404fba8123536a069fed03a72a8eeb535aa33a9b8e605a423fd7516d46c60d3f6c26643cb4192d355b9bada2a150cd8
-docfiles size=530
+containersize 7132
+containerchecksum baed0790fbb51832f931aec7207c0f49d78fc5e847606edc0a1960a97c882b07b703d8be94b3112b280e703af568e7c3e74a18a2521aa0eb3fe5fecbd44cbb63
+doccontainersize 1426348
+doccontainerchecksum d1e90e2ffc731a88e52e65139e60170449d05c860674951ff91c942c5583dbb30add9ad3a1a49846a30d2d9719652aa5a82c2bbd15e2256d99e5842ead21cac9
+docfiles size=478
  RELOC/doc/latex/eolang/DEPENDS.txt
  RELOC/doc/latex/eolang/LICENSE.txt
  RELOC/doc/latex/eolang/README.md details="Readme"
  RELOC/doc/latex/eolang/cactus.pdf
  RELOC/doc/latex/eolang/eolang.bib
  RELOC/doc/latex/eolang/eolang.pdf details="Package documentation"
-srccontainersize 15844
-srccontainerchecksum 7367e138361dc0ea85cb1e3ef0da19c3a7e3a68d2612a3f760fe24108a74dcdc58f88d4e37a8a3118932064f6f3aa64bd1724e34c86a340e54849a889d9ba379
+srccontainersize 15904
+srccontainerchecksum 1dcf91294f3300ba52033d51e38f862a5e029659d4419e7c6525f2d5fc31c753eacbb6e10825a936c2e3f2f291858f9da9c8e2c72825661f9101012bb9934b27
 srcfiles size=15
  RELOC/source/latex/eolang/eolang.dtx
  RELOC/source/latex/eolang/eolang.ins
@@ -110236,7 +110236,7 @@ catalogue-contact-repository https://github.com/objectionary/eolang.sty
 catalogue-ctan /macros/latex/contrib/eolang
 catalogue-license mit
 catalogue-topics diagram program-doc
-catalogue-version 0.13.0
+catalogue-version 0.14.0
 
 name epigrafica
 category Package
@@ -128240,17 +128240,17 @@ catalogue-version 0.7.3
 
 name fontsetup
 category Package
-revision 67765
+revision 67797
 shortdesc A front-end to fontspec, for selected fonts with math support
 relocated 1
 longdesc This package facilitates the use of fontspec for users who do
 longdesc not wish to bother with details, with a special focus on
 longdesc quality fonts supporting Mathematics.
-containersize 7884
-containerchecksum 72e3bcd42b93a24eea17c06d90c0548364da70f95ebf0902e9a48fbf2dfd2bc21a7c59dc01f27b89a248c5a5865359d86890fedf988ee8d6d9ad25da9ce8ec87
-doccontainersize 553624
-doccontainerchecksum 6ba83d7f343fc93684e8a3c68edb03a8c7536dcea697167aa9295dc4321860a5a68599bfdccd2d919ffb811b9720b61eae08eca546bd79ccd3ff846a1e5c68f2
-docfiles size=276
+containersize 7108
+containerchecksum 272acb08c731ff72e156fedb7cbe83fb44091e20f9c9f44e27e4b8bce3de96441b3bfd5fb2287b418612a73848e5d2a8a81386647e0d457124a9f083d339c977
+doccontainersize 581876
+doccontainerchecksum b79a946a177f68ed086159c9e5b307cda837beb61df3d72cfc8a1d17fe42ec834de034459b5cd4d5e33040896d8fb96e12456ce35ff19683aac3b86d0eb4b32a
+docfiles size=283
  RELOC/doc/latex/fontsetup/README details="Readme"
  RELOC/doc/latex/fontsetup/fontsetup-doc.pdf details="Package documentation"
  RELOC/doc/latex/fontsetup/fontsetup-doc.tex
@@ -128273,7 +128273,7 @@ docfiles size=276
  RELOC/doc/latex/fontsetup/fspsample-times.pdf
  RELOC/doc/latex/fontsetup/fspsample-xcharter.pdf
  RELOC/doc/latex/fontsetup/fspsample.tex
-runfiles size=26
+runfiles size=25
  RELOC/tex/latex/fontsetup/fontsetup.sty
  RELOC/tex/latex/fontsetup/fspconcrete.sty
  RELOC/tex/latex/fontsetup/fspdefault.sty
@@ -128296,7 +128296,7 @@ catalogue-also fontsetup-nonfree
 catalogue-ctan /macros/unicodetex/latex/fontsetup
 catalogue-license gpl3
 catalogue-topics font-sel font-supp xetex luatex maths
-catalogue-version 1.5
+catalogue-version 1.6
 
 name fontsize
 category Package
@@ -200367,25 +200367,26 @@ catalogue-version 2.1
 
 name mandi
 category Package
-revision 61764
+revision 67796
 shortdesc Macros for introductory physics and astronomy
 relocated 1
 longdesc The package contains commands for students and teachers of
 longdesc introductory physics. Commands for physical quantities
 longdesc intelligently handle SI units so the user need not do so. There
 longdesc are other features that should make LaTeX easy for introductory
-longdesc physics students.
-containersize 11988
-containerchecksum 9bac7973ac229756b5263ee0e8a8a4381bf64400a1ee58b0abafa6765e1cea6dae0b660243e1dfa87a8072f1caf1851c11c88db81dae1b231ec6def9f965991a
-doccontainersize 483900
-doccontainerchecksum 4debcb2b892563755cd0779db9c1784f7feba4d0e35118cdb00569bc4eaddf23423f1236f0cf28adb1c399e220b5f348ef898b0e7f1c59e031891056b9148fdb
-docfiles size=125
+longdesc physics students. The name of the package can be pronounced as
+longdesc "M&I" and refers to the physics textbook Matter & Interactions.
+containersize 11220
+containerchecksum 6ffa01589223987c1dfabfaa49f5dcde492afda55cd0429f2db2d719dc73b904cff9594014c21777006dee4f835df36576b94f994e43e71eb9ac8fc6ac5bcba7
+doccontainersize 498100
+doccontainerchecksum d789e2243a8c97aebeebab8160272c43971de71ba6ee27ed71c5bb784fdf43c2a892fa149655ba0ac8125c724f6c9fc11c4436eff74348738b6dc87a1b978371
+docfiles size=128
  RELOC/doc/latex/mandi/README.md details="Readme"
  RELOC/doc/latex/mandi/mandi.pdf details="Package documentation"
  RELOC/doc/latex/mandi/vdemo.py
-srccontainersize 30480
-srccontainerchecksum 1cf1912cd6db652bd927378970a1740153906f0c14e92da47a428c564c04f66f3496be8f639fcf3f0f0caab48fff0909ae72dd81085f2bd8a92d5ae08fce07a0
-srcfiles size=48
+srccontainersize 31092
+srccontainerchecksum a0a18e66916e841ecba54b8d5b32cead92a423ca52a5ea65214d35efed2ee7dcaa365fca5784d7965447de9d954981e44d3267c82d2394fc72e66ca79ec7989e
+srcfiles size=50
  RELOC/source/latex/mandi/mandi.dtx
  RELOC/source/latex/mandi/mandi.ins
  RELOC/source/latex/mandi/mandiexp.dtx
@@ -200396,12 +200397,11 @@ runfiles size=17
  RELOC/tex/latex/mandi/mandistudent.sty
 catalogue-also siunitx
 catalogue-contact-bugs https://github.com/heafnerj/mandi/issues
-catalogue-contact-home https://github.com/heafnerj/mandi
 catalogue-contact-repository https://github.com/heafnerj/mandi
 catalogue-ctan /macros/latex/contrib/mandi
 catalogue-license lppl1.3
 catalogue-topics physics
-catalogue-version 3.1.0
+catalogue-version 3.2.0
 
 name manfnt
 category Package
@@ -313849,7 +313849,7 @@ docfiles size=376
 
 name texlive-scripts
 category TLCore
-revision 67785
+revision 67793
 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.
@@ -313857,10 +313857,10 @@ depend texlive-scripts.ARCH
 depend texlive.infra
 execute addMap mathpple.map
 postaction shortcut type=menu name="TeX Live command-line"   cmd=TEXDIR/tlpkg/installer/tl-cmd.bat
-containersize 114064
-containerchecksum 114f4fb7ff34362ab9fbc4266f41a37f01829ccddad0a37b9ae910547884b43a8a3be58dc6c974939b88733d59ef3360800737f4560796ac96900e01c13b626f
-doccontainersize 428204
-doccontainerchecksum f428a74e0a6a154f8a52ad2633d3dc915319e25801df577261fb7c639ed71af6c5e8744d0e751141bdf0d85e61455b21e8dd4ebf68752556001b369182ca530d
+containersize 114052
+containerchecksum d19aa61bd7552597e694feebc44d48408d01e54275f6aecfbdf3f6ca6fc19c7dd6d66d9f4c957d016e173a773e974a763330825362eddc79ed01ce72ec40be91
+doccontainersize 428200
+doccontainerchecksum 3667bbb82ee3a45188e4e40dc3834a8a5d78956f4a95568c340795a53e7aeddd49ce734a08d53f993e80f58894043d54d8c356d12e8c4f1d0959daea4125a1f2
 docfiles size=548
  doc.html
  texmf-dist/doc/man/man1/fmtutil-sys.1
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
index 95905c5e20..e81029e85c 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
@@ -1 +1 @@
-77582d571783756b63845c377a0d0896  texlive.tlpdb
+3778dc797d3063417edbcd95a67dc99c  texlive.tlpdb
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
index f387243f63..c7d8ea8e7c 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
@@ -1 +1 @@
-fa60bef575aeb996984bfd821bff86234ffcc64265bed64fc98e22f3aafd14f836e17827b06cda3d1c9f2751684cec704d54c09585e2f4e69c9ed4ac65667450  texlive.tlpdb
+52bac0e5727237e009bfea2f0a73547fcb4896629738c519b994c79d9b0adf29257fb956cdc81e97ed5cef6cb2841ddea805bd217ec6b4e4c6ef195a837c545c  texlive.tlpdb
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
index d7330c030c..29cc9b0a52 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
@@ -1,11 +1,11 @@
 -----BEGIN PGP SIGNATURE-----
 
-iQEzBAEBCgAdFiEE2PL4YFeoV+QqiBBqTOGHfhlDjHAFAmTJmQQACgkQTOGHfhlD
-jHC2zAf/b5gbgBHwMqf186jN+oDvdcgbOno23OtUbsi/QdpU6b6ras25x5OgnxdD
-7SFQ4jSN24x+Ma4eHfSXCYDbdyRFZKCVNky/MKSekMepum6JJ5S5IH8Oh23WqOuc
-u+4yhGQAJU7FYGKbIyM8CW9phOma5vbPx6S1yPJaLj3fVtbU2SOAixNEg7oMDpWf
-w7IhNEFe1A3wMI+XxTdwOSXRhZBCBrii0JKVWHcCWp47AzScwVvwAwupPiFVhUtl
-RapU0ARhSiNZbJ1s82+JWPmJNAKriiI4PJ/iN89Fcs8tJdfDfZmh7nhA+H3RH0fH
-yHfhbJeF0wiX5GcmRgo3Sn8Tno0OJA==
-=XwUU
+iQEzBAEBCgAdFiEE2PL4YFeoV+QqiBBqTOGHfhlDjHAFAmTK6nAACgkQTOGHfhlD
+jHBj3QgArrspL4d69WSGZWR5lCakUmE5t9TiuJGIKOJK2GwyN/Y0kpExSsa49F25
+e6QPGoHgIwCJQxqAKBC9G1IbUY7LV4dvS+u2KJzRTtk5NeunJI/76Quri/QdCkhy
+HK2HFGAVJnyOkjtKqvtMYwOsgwSkBs296ifxK6PW2Ox5FnnZ946BOezcspVwmHPC
+Yqwx7XH27441RPibo/L1lFGBgv4wsAaSwYABqLkL59GSsiV4Vp7Lp87B7rKJKqh9
+MeZqUHgxq5PG8xlthYDqCJBheQC1VV44FU/S0BwZaFehk0N3NGxcbTvXjHGKB0/S
+RvxNrAWO/7xRzZnQ+L4moCEylTOBTA==
+=3NoC
 -----END PGP SIGNATURE-----
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
index 9957961a16..34aa94287f 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
diff --git a/timestamp b/timestamp
index c7a23d5b07..fee7c63715 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:
-2023-08-02-02-02
+2023-08-03-02-02