CTAN sync 202211280303

44 files changed, 2579 insertions, 1108 deletions

diff --git a/CTAN.sites b/CTAN.sites
index f1cab62f4f..fc957ce0ee 100644
--- a/CTAN.sites
+++ b/CTAN.sites
@@ -301,6 +301,9 @@ by country):
   mirror.dogado.de (Germany)            
    URL: https://mirror.dogado.de/tex-archive/
 
+  mirror.funkfreundelandshut.de (Germany)
+   URL: http://mirror.funkfreundelandshut.de/latex/
+
   mirror.informatik.hs-fulda.de (Germany)
    URL: rsync://mirror.informatik.hs-fulda.de/CTAN/
    URL: https://mirror.informatik.hs-fulda.de/tex-archive/
diff --git a/FILES.byname b/FILES.byname
index 5c6388a1c2..180410a4c2 100644
--- a/FILES.byname
+++ b/FILES.byname
@@ -2035,12 +2035,12 @@
 2022/09/23 |       1673 | biblio/citation-style-language/README.md
 2022/09/23 |      11958 | biblio/citation-style-language/vancouver.csl
 2022/09/23 |     591448 | biblio/citation-style-language.zip
-2022/11/26 |       1678 | biblio/ctan-bibdata/biblatex-ctan/ctan.bbx
+2022/11/27 |       1678 | biblio/ctan-bibdata/biblatex-ctan/ctan.bbx
 2022/10/08 |        127 | biblio/ctan-bibdata/biblatex-ctan/ctan.cbx
-2022/11/26 |    2747285 | biblio/ctan-bibdata/ctan.bib
-2022/11/26 |    3625594 | biblio/ctan-bibdata/ctan.pdf
+2022/11/27 |    2747283 | biblio/ctan-bibdata/ctan.bib
+2022/11/27 |    3626063 | biblio/ctan-bibdata/ctan.pdf
 2022/10/08 |       1415 | biblio/ctan-bibdata/README
-2022/11/26 |    4018880 | biblio/ctan-bibdata.zip
+2022/11/27 |    4018774 | biblio/ctan-bibdata.zip
 2022/02/06 |       3110 | biblio/pbibtex/pbibtex-base/cpp.awk
 2022/02/06 |       1009 | biblio/pbibtex/pbibtex-base/generate.sh
 2022/02/06 |      22422 | biblio/pbibtex/pbibtex-base/jabbrv.bst
@@ -5414,7 +5414,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
-2022/11/26 |      55043 | FILES.last07days
+2022/11/27 |      56154 | 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
@@ -190216,7 +190216,7 @@
 2022/10/29 |    1943892 | install/macros/generic/tracklang.tds.zip
 2022/09/17 |     591247 | install/macros/generic/unicode-data.tds.zip
 2022/06/11 |    4242531 | install/macros/generic/xint.tds.zip
-2022/07/13 |   10946453 | install/macros/jptex/latex/jlreq.tds.zip
+2022/11/27 |   10971100 | install/macros/jptex/latex/jlreq.tds.zip
 2022/09/14 |     970564 | install/macros/jptex/latex/jsclasses.tds.zip
 2021/12/11 |    1827908 | install/macros/jptex/latex/platex.tds.zip
 2021/05/31 |     907477 | install/macros/jptex/latex/uplatex.tds.zip
@@ -190425,7 +190425,7 @@
 2022/09/22 |   12773767 | install/macros/latex/contrib/oberdiek.tds.zip
 2022/08/04 |      34729 | install/macros/latex/contrib/ocgx2.tds.zip
 2012/12/08 |    1025300 | install/macros/latex/contrib/ocgx.tds.zip
-2022/11/20 |     429803 | install/macros/latex/contrib/pagecolor.tds.zip
+2022/11/27 |     444159 | install/macros/latex/contrib/pagecolor.tds.zip
 2009/09/03 |     151471 | install/macros/latex/contrib/pagenote.tds.zip
 2015/12/21 |     991192 | install/macros/latex/contrib/pageslts.tds.zip
 2011/08/22 |     435116 | install/macros/latex/contrib/papermas.tds.zip
@@ -204531,25 +204531,25 @@
 2021/03/07 |       3600 | macros/jptex/latex/jlreq-deluxe/vf/zjlreq--uprubyminr-h.vf
 2021/03/07 |       3532 | macros/jptex/latex/jlreq-deluxe/vf/zjlreq--uprubyminr-v.vf
 2021/03/13 |    1138379 | macros/jptex/latex/jlreq-deluxe.zip
-2022/02/18 |       5662 | macros/jptex/latex/jlreq/jfm-jlreq-jidori.lua
-2022/02/18 |      49222 | macros/jptex/latex/jlreq/jfm-jlreq.lua
-2022/07/13 |     284079 | macros/jptex/latex/jlreq/jlreq.cls
-2022/07/13 |      10200 | macros/jptex/latex/jlreq/jlreq-complements.sty
-2022/07/12 |      21198 | macros/jptex/latex/jlreq/jlreq-helpers.sty
-2022/07/13 |     371560 | macros/jptex/latex/jlreq/jlreq-ja.pdf
-2022/07/13 |     119802 | macros/jptex/latex/jlreq/jlreq.pdf
-2022/07/13 |       7878 | macros/jptex/latex/jlreq/jlreq-trimmarks-ja.md
-2022/07/13 |       6560 | macros/jptex/latex/jlreq/jlreq-trimmarks.md
-2022/07/13 |      48330 | macros/jptex/latex/jlreq/jlreq-trimmarks.sty
-2022/07/13 |       1348 | macros/jptex/latex/jlreq/LICENSE
-2022/01/07 |      11487 | macros/jptex/latex/jlreq/luajfm2pl.lua
-2022/07/13 |       9274 | macros/jptex/latex/jlreq/Makefile
-2022/02/18 |       5652 | macros/jptex/latex/jlreq/make_variant_jfm.lua
-2022/07/13 |      45772 | macros/jptex/latex/jlreq/README-ja.md
-2022/07/13 |       6802 | macros/jptex/latex/jlreq/README.md
-2019/04/01 |       3094 | macros/jptex/latex/jlreq/README-template.html
-2022/01/07 |       3315 | macros/jptex/latex/jlreq/README-template.tex
-2022/07/13 |     603041 | macros/jptex/latex/jlreq.zip
+2022/09/24 |       5662 | macros/jptex/latex/jlreq/jfm-jlreq-jidori.lua
+2022/11/27 |      50951 | macros/jptex/latex/jlreq/jfm-jlreq.lua
+2022/11/27 |     287627 | macros/jptex/latex/jlreq/jlreq.cls
+2022/11/27 |      10466 | macros/jptex/latex/jlreq/jlreq-complements.sty
+2022/11/27 |      21198 | macros/jptex/latex/jlreq/jlreq-helpers.sty
+2022/11/27 |     376976 | macros/jptex/latex/jlreq/jlreq-ja.pdf
+2022/11/27 |     120615 | macros/jptex/latex/jlreq/jlreq.pdf
+2022/11/27 |       9044 | macros/jptex/latex/jlreq/jlreq-trimmarks-ja.md
+2022/11/27 |       7538 | macros/jptex/latex/jlreq/jlreq-trimmarks.md
+2022/11/27 |      50840 | macros/jptex/latex/jlreq/jlreq-trimmarks.sty
+2022/09/24 |       1348 | macros/jptex/latex/jlreq/LICENSE
+2022/11/27 |      11878 | macros/jptex/latex/jlreq/luajfm2pl.lua
+2022/09/24 |       9274 | macros/jptex/latex/jlreq/Makefile
+2022/09/24 |       5652 | macros/jptex/latex/jlreq/make_variant_jfm.lua
+2022/11/27 |      49065 | macros/jptex/latex/jlreq/README-ja.md
+2022/11/27 |       7060 | macros/jptex/latex/jlreq/README.md
+2022/09/24 |       3094 | macros/jptex/latex/jlreq/README-template.html
+2022/09/24 |       3315 | macros/jptex/latex/jlreq/README-template.tex
+2022/11/27 |     612042 | macros/jptex/latex/jlreq.zip
 2022/09/14 |     198551 | macros/jptex/latex/jsclasses/jsclasses.dtx
 2022/09/14 |        561 | macros/jptex/latex/jsclasses/jsclasses.ins
 2022/09/14 |     426004 | macros/jptex/latex/jsclasses/jsclasses.pdf
@@ -224043,11 +224043,11 @@
 2017/11/25 |      11699 | macros/latex/contrib/lt3graph/lt3graph.tex
 2017/11/25 |       1335 | macros/latex/contrib/lt3graph/README
 2017/11/26 |     586460 | macros/latex/contrib/lt3graph.zip
-2022/11/26 |      51905 | macros/latex/contrib/lt3rawobjects/lt3rawobjects.dtx
-2022/11/26 |       2220 | macros/latex/contrib/lt3rawobjects/lt3rawobjects.ins
-2022/11/26 |     538908 | macros/latex/contrib/lt3rawobjects/lt3rawobjects.pdf
-2022/11/26 |       1305 | macros/latex/contrib/lt3rawobjects/README.md
-2022/11/26 |     544502 | macros/latex/contrib/lt3rawobjects.zip
+2022/11/27 |      51908 | macros/latex/contrib/lt3rawobjects/lt3rawobjects.dtx
+2022/11/27 |       2220 | macros/latex/contrib/lt3rawobjects/lt3rawobjects.ins
+2022/11/27 |     538768 | macros/latex/contrib/lt3rawobjects/lt3rawobjects.pdf
+2022/11/27 |       1305 | macros/latex/contrib/lt3rawobjects/README.md
+2022/11/27 |     544276 | macros/latex/contrib/lt3rawobjects.zip
 2012/05/25 |     230943 | macros/latex/contrib/ltablex/ltablex.pdf
 2014/08/13 |       6021 | macros/latex/contrib/ltablex/ltablex.sty
 2013/04/04 |       4146 | macros/latex/contrib/ltablex/ltablex.tex
@@ -226990,11 +226990,11 @@
 2018/05/05 |     141016 | macros/latex/contrib/padcount/padcount.pdf
 2018/05/05 |        923 | macros/latex/contrib/padcount/README
 2018/05/05 |     150526 | macros/latex/contrib/padcount.zip
-2022/11/20 |      41799 | macros/latex/contrib/pagecolor/pagecolor.dtx
-2022/11/20 |      81832 | macros/latex/contrib/pagecolor/pagecolor-example.pdf
-2022/11/20 |     339411 | macros/latex/contrib/pagecolor/pagecolor.pdf
-2022/11/20 |       4991 | macros/latex/contrib/pagecolor/README
-2022/11/20 |     421301 | macros/latex/contrib/pagecolor.zip
+2022/11/27 |      44185 | macros/latex/contrib/pagecolor/pagecolor.dtx
+2022/11/27 |      92870 | macros/latex/contrib/pagecolor/pagecolor-example.pdf
+2022/11/27 |     342986 | macros/latex/contrib/pagecolor/pagecolor.pdf
+2022/11/27 |       5136 | macros/latex/contrib/pagecolor/README
+2022/11/27 |     436012 | macros/latex/contrib/pagecolor.zip
 2009/05/26 |       6685 | macros/latex/contrib/pagecont/pagecont.dtx
 2009/05/26 |        652 | macros/latex/contrib/pagecont/pagecont.ins
 2009/05/26 |      82436 | macros/latex/contrib/pagecont/pagecont.pdf
@@ -228670,15 +228670,15 @@
 2022/05/05 |      80898 | macros/latex/contrib/prociagssymp/TestprocIAGssymp.pdf
 2022/05/05 |       6335 | macros/latex/contrib/prociagssymp/TestprocIAGssymp.tex
 2022/05/06 |      86110 | macros/latex/contrib/prociagssymp.zip
-2022/11/02 |    9348583 | macros/latex/contrib/profcollege/doc/ProfCollege-doc.pdf
-2022/11/02 |    2263550 | macros/latex/contrib/profcollege/doc/ProfCollege-doc.zip
+2022/11/26 |    9452788 | macros/latex/contrib/profcollege/doc/ProfCollege-doc.pdf
+2022/11/26 |    2269245 | macros/latex/contrib/profcollege/doc/ProfCollege-doc.zip
 2021/08/22 |      23478 | macros/latex/contrib/profcollege/latex/PfCEquationComposition2.tex
 2021/08/22 |      19350 | macros/latex/contrib/profcollege/latex/PfCEquationLaurent1.tex
 2021/08/22 |      20438 | macros/latex/contrib/profcollege/latex/PfCEquationPose1.tex
 2021/08/22 |      27165 | macros/latex/contrib/profcollege/latex/PfCEquationSoustraction2.tex
 2021/08/22 |      15309 | macros/latex/contrib/profcollege/latex/PfCEquationSymbole1.tex
 2021/08/22 |      22791 | macros/latex/contrib/profcollege/latex/PfCEquationTerme1.tex
-2022/11/02 |    1004663 | macros/latex/contrib/profcollege/latex/ProfCollege.sty
+2022/11/26 |    1037252 | macros/latex/contrib/profcollege/latex/ProfCollege.sty
 2021/11/06 |       8247 | macros/latex/contrib/profcollege/metapost/datastest/PfCafganistan.dat
 2021/11/06 |      10915 | macros/latex/contrib/profcollege/metapost/datastest/PfCafriquesud1.dat
 2021/11/06 |        218 | macros/latex/contrib/profcollege/metapost/datastest/PfCafriquesud2.dat
@@ -228887,12 +228887,12 @@
 2022/05/26 |      13296 | macros/latex/contrib/profcollege/metapost/PfCCalculatrice.mp
 2022/05/26 |        431 | macros/latex/contrib/profcollege/metapost/PfCConstantes.mp
 2022/10/12 |       2335 | macros/latex/contrib/profcollege/metapost/PfCEngrenages.mp
-2022/08/02 |      40881 | macros/latex/contrib/profcollege/metapost/PfCGeometrie.mp
+2022/11/26 |      40881 | macros/latex/contrib/profcollege/metapost/PfCGeometrie.mp
 2022/10/12 |       6547 | macros/latex/contrib/profcollege/metapost/PfCLabyNombre.mp
 2022/08/16 |       1682 | macros/latex/contrib/profcollege/metapost/PfCLaTeX.mp
 2022/05/27 |      42844 | macros/latex/contrib/profcollege/metapost/PfCMonde-futurenew.mp
 2022/05/26 |       9412 | macros/latex/contrib/profcollege/metapost/PfCMosaique.mp
-2022/11/02 |      66795 | macros/latex/contrib/profcollege/metapost/PfCObjets.mp
+2022/11/26 |      67988 | macros/latex/contrib/profcollege/metapost/PfCObjets.mp
 2022/11/02 |      63245 | macros/latex/contrib/profcollege/metapost/PfCPseudo.mp
 2022/11/02 |     106510 | macros/latex/contrib/profcollege/metapost/PfCScratch.mp
 2022/11/02 |     108384 | macros/latex/contrib/profcollege/metapost/PfCScratchpdf.mp
@@ -228900,7 +228900,7 @@
 2022/05/26 |       6652 | macros/latex/contrib/profcollege/metapost/PfCSvgnames.mp
 2022/11/02 |       1683 | macros/latex/contrib/profcollege/metapost/PfCTurtleTestRemplis.mp
 2021/01/18 |        435 | macros/latex/contrib/profcollege/README
-2022/11/02 |   13857824 | macros/latex/contrib/profcollege.zip
+2022/11/27 |   13971205 | macros/latex/contrib/profcollege.zip
 2022/04/26 |     130555 | macros/latex/contrib/proflabo/doc/ProfLabo-doc.pdf
 2022/04/26 |      16528 | macros/latex/contrib/proflabo/doc/ProfLabo-doc.tex
 2022/04/26 |        323 | macros/latex/contrib/proflabo/README.md
@@ -239554,12 +239554,12 @@
 2021/10/07 |       9854 | macros/luatex/generic/luaxml/luaxml-transform.lua
 2021/10/07 |       1155 | macros/luatex/generic/luaxml/README
 2021/10/07 |     161975 | macros/luatex/generic/luaxml.zip
-2022/10/22 |      11855 | macros/luatex/generic/lutabulartools/lutabulartools.lua
-2022/10/22 |     110213 | macros/luatex/generic/lutabulartools/lutabulartools.pdf
-2022/10/22 |       8854 | macros/luatex/generic/lutabulartools/lutabulartools.sty
-2022/10/22 |      16156 | macros/luatex/generic/lutabulartools/lutabulartools.tex
-2022/10/22 |       1623 | macros/luatex/generic/lutabulartools/README.md
-2022/10/22 |      97934 | macros/luatex/generic/lutabulartools.zip
+2022/11/27 |      14243 | macros/luatex/generic/lutabulartools/lutabulartools.lua
+2022/11/27 |     114054 | macros/luatex/generic/lutabulartools/lutabulartools.pdf
+2022/11/27 |       9958 | macros/luatex/generic/lutabulartools/lutabulartools.sty
+2022/11/27 |      16744 | macros/luatex/generic/lutabulartools/lutabulartools.tex
+2022/11/27 |       1623 | macros/luatex/generic/lutabulartools/README.md
+2022/11/27 |     100718 | macros/luatex/generic/lutabulartools.zip
 2022/03/03 |      13827 | macros/luatex/generic/minim/EUPL-1.2-EN.txt
 2022/03/03 |      13827 | macros/luatex/generic/minim-math/EUPL-1.2-EN.txt
 2022/03/03 |      11866 | macros/luatex/generic/minim-math/minim-math.doc
@@ -250095,12 +250095,12 @@
 2011/05/07 |       5176 | macros/xetex/latex/unisugar/unisugar.sty
 2011/05/07 |      25480 | macros/xetex/latex/unisugar/unisugar.tex
 2011/05/08 |     495308 | macros/xetex/latex/unisugar.zip
-2022/11/23 |       2861 | macros/xetex/latex/xduts/README.md
-2022/11/23 |     881135 | macros/xetex/latex/xduts/xdulogo.pdf
-2022/11/23 |     238127 | macros/xetex/latex/xduts/xduts.dtx
-2022/11/23 |       1111 | macros/xetex/latex/xduts/xduts.ins
-2022/11/23 |     711387 | macros/xetex/latex/xduts/xduts.pdf
-2022/11/23 |    1617193 | macros/xetex/latex/xduts.zip
+2022/11/27 |       3125 | macros/xetex/latex/xduts/README.md
+2022/11/27 |     881135 | macros/xetex/latex/xduts/xdulogo.pdf
+2022/11/27 |     239042 | macros/xetex/latex/xduts/xduts.dtx
+2022/11/27 |       1111 | macros/xetex/latex/xduts/xduts.ins
+2022/11/27 |     722686 | macros/xetex/latex/xduts/xduts.pdf
+2022/11/27 |    1628543 | macros/xetex/latex/xduts.zip
 2017/08/03 |      11999 | macros/xetex/latex/xechangebar/cbtest1.tex
 2017/08/03 |        338 | macros/xetex/latex/xechangebar/README
 2017/08/03 |      35213 | macros/xetex/latex/xechangebar/xechangebar.sty
@@ -290781,9 +290781,9 @@
 2022/10/25 |     487888 | systems/texlive/tlnet/archive/lt3luabridge.doc.r64801.tar.xz
 2022/10/25 |       3004 | systems/texlive/tlnet/archive/lt3luabridge.r64801.tar.xz
 2022/10/25 |       4192 | systems/texlive/tlnet/archive/lt3luabridge.source.r64801.tar.xz
-2022/08/04 |     532092 | systems/texlive/tlnet/archive/lt3rawobjects.doc.r64038.tar.xz
-2022/08/04 |       3508 | systems/texlive/tlnet/archive/lt3rawobjects.r64038.tar.xz
-2022/08/04 |       9848 | systems/texlive/tlnet/archive/lt3rawobjects.source.r64038.tar.xz
+2022/11/27 |     536008 | systems/texlive/tlnet/archive/lt3rawobjects.doc.r65109.tar.xz
+2022/11/27 |       3532 | systems/texlive/tlnet/archive/lt3rawobjects.r65109.tar.xz
+2022/11/27 |      10044 | systems/texlive/tlnet/archive/lt3rawobjects.source.r65109.tar.xz
 2019/02/28 |     233152 | systems/texlive/tlnet/archive/ltablex.doc.r34923.tar.xz
 2019/02/28 |       2492 | systems/texlive/tlnet/archive/ltablex.r34923.tar.xz
 2019/02/28 |     267928 | systems/texlive/tlnet/archive/ltabptch.doc.r17533.tar.xz
@@ -295479,7 +295479,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
-2022/11/26 |     423348 | systems/texlive/tlnet/archive/texlive-scripts.doc.r65101.tar.xz
+2022/11/27 |     423348 | systems/texlive/tlnet/archive/texlive-scripts.doc.r65108.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
@@ -295503,7 +295503,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
-2022/11/26 |     113696 | systems/texlive/tlnet/archive/texlive-scripts.r65101.tar.xz
+2022/11/27 |     113704 | systems/texlive/tlnet/archive/texlive-scripts.r65108.tar.xz
 2022/09/13 |        580 | systems/texlive/tlnet/archive/texlive-scripts.universal-darwin.r64356.tar.xz
 2022/04/19 |      36296 | systems/texlive/tlnet/archive/texlive-scripts.win32.r63068.tar.xz
 2022/09/13 |        596 | systems/texlive/tlnet/archive/texlive-scripts.x86_64-cygwin.r64356.tar.xz
@@ -296445,8 +296445,8 @@
 2022/10/24 |     134736 | systems/texlive/tlnet/archive/unigrazpub.doc.r64797.tar.xz
 2022/10/24 |       5952 | systems/texlive/tlnet/archive/unigrazpub.r64797.tar.xz
 2022/10/24 |       8892 | systems/texlive/tlnet/archive/unigrazpub.source.r64797.tar.xz
-2022/11/23 |      45772 | systems/texlive/tlnet/archive/unimath-plain-xetex.doc.r65085.tar.xz
-2022/11/23 |       6264 | systems/texlive/tlnet/archive/unimath-plain-xetex.r65085.tar.xz
+2022/11/27 |      49976 | systems/texlive/tlnet/archive/unimath-plain-xetex.doc.r65110.tar.xz
+2022/11/27 |       6788 | systems/texlive/tlnet/archive/unimath-plain-xetex.r65110.tar.xz
 2020/12/30 |      63868 | systems/texlive/tlnet/archive/uninormalize.doc.r57257.tar.xz
 2020/12/30 |       5720 | systems/texlive/tlnet/archive/uninormalize.r57257.tar.xz
 2019/12/18 |     291268 | systems/texlive/tlnet/archive/uniquecounter.doc.r53162.tar.xz
@@ -297352,16 +297352,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
 2022/07/17 |     124404 | systems/texlive/tlnet/install-tl
-2022/11/26 |    5834646 | systems/texlive/tlnet/install-tl-unx.tar.gz
-2022/11/26 |        152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
-2022/11/26 |        455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
+2022/11/27 |    5834463 | systems/texlive/tlnet/install-tl-unx.tar.gz
+2022/11/27 |        152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
+2022/11/27 |        455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
 2021/04/11 |       4945 | systems/texlive/tlnet/install-tl-windows.bat
-2022/11/26 |   20435919 | systems/texlive/tlnet/install-tl-windows.exe
-2022/11/26 |        153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
-2022/11/26 |        455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
-2022/11/26 |   25518535 | systems/texlive/tlnet/install-tl.zip
-2022/11/26 |        145 | systems/texlive/tlnet/install-tl.zip.sha512
-2022/11/26 |        455 | systems/texlive/tlnet/install-tl.zip.sha512.asc
+2022/11/27 |   20435452 | systems/texlive/tlnet/install-tl-windows.exe
+2022/11/27 |        153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
+2022/11/27 |        455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
+2022/11/27 |   25518530 | systems/texlive/tlnet/install-tl.zip
+2022/11/27 |        145 | systems/texlive/tlnet/install-tl.zip.sha512
+2022/11/27 |        455 | systems/texlive/tlnet/install-tl.zip.sha512.asc
 2022/04/03 |       1229 | systems/texlive/tlnet/README.md
 2022/04/03 |          0 | systems/texlive/tlnet/TEXLIVE_2022
 2022/02/28 |       7791 | systems/texlive/tlnet/tlpkg/gpg/pubring.gpg
@@ -297371,7 +297371,7 @@
 2022/02/28 |       1280 | systems/texlive/tlnet/tlpkg/gpg/trustdb.gpg
 2022/10/09 |      49938 | systems/texlive/tlnet/tlpkg/installer/config.guess
 2010/11/11 |      11651 | systems/texlive/tlnet/tlpkg/installer/COPYING.MinGW-runtime.txt
-2022/11/25 |       7352 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
+2022/11/26 |       7354 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
 2022/10/13 |     225403 | 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
@@ -297414,12 +297414,12 @@
 2021/05/16 |      20371 | systems/texlive/tlnet/tlpkg/TeXLive/TLCrypto.pm
 2021/12/21 |       5429 | systems/texlive/tlnet/tlpkg/TeXLive/TLDownload.pm
 2021/12/21 |      27582 | systems/texlive/tlnet/tlpkg/TeXLive/TLPaper.pm
-2022/11/26 |   17876003 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
-2022/11/26 |         48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
+2022/11/27 |   17876155 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
+2022/11/27 |         48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
 2022/04/18 |      86658 | systems/texlive/tlnet/tlpkg/TeXLive/TLPDB.pm
-2022/11/26 |        144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
-2022/11/26 |        455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
-2022/11/26 |    2432388 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
+2022/11/27 |        144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
+2022/11/27 |        455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
+2022/11/27 |    2431016 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
 2022/09/14 |      58922 | systems/texlive/tlnet/tlpkg/TeXLive/TLPOBJ.pm
 2022/10/04 |      42404 | systems/texlive/tlnet/tlpkg/TeXLive/TLPSRC.pm
 2021/12/21 |      16130 | systems/texlive/tlnet/tlpkg/TeXLive/TLTREE.pm
@@ -302851,7 +302851,7 @@
 2022/11/01 |       5115 | systems/win32/miktex/tm/packages/filehook.tar.lzma
 2012/12/04 |     924573 | systems/win32/miktex/tm/packages/fileinfo.tar.lzma
 2011/09/21 |     281409 | systems/win32/miktex/tm/packages/filemod.tar.lzma
-2022/11/26 |     751170 | systems/win32/miktex/tm/packages/files.csv.lzma
+2022/11/27 |     751240 | systems/win32/miktex/tm/packages/files.csv.lzma
 2001/05/14 |       5617 | systems/win32/miktex/tm/packages/finbib.tar.lzma
 2015/10/20 |      44379 | systems/win32/miktex/tm/packages/findhyph.tar.lzma
 2011/10/21 |      89323 | systems/win32/miktex/tm/packages/fink.tar.lzma
@@ -304043,9 +304043,9 @@
 2022/11/01 |     489654 | systems/win32/miktex/tm/packages/lt3luabridge__doc.tar.lzma
 2022/11/01 |       5402 | systems/win32/miktex/tm/packages/lt3luabridge__source.tar.lzma
 2022/11/01 |       3119 | systems/win32/miktex/tm/packages/lt3luabridge.tar.lzma
-2022/08/11 |     534525 | systems/win32/miktex/tm/packages/lt3rawobjects__doc.tar.lzma
-2022/08/11 |      10170 | systems/win32/miktex/tm/packages/lt3rawobjects__source.tar.lzma
-2022/08/11 |       3668 | systems/win32/miktex/tm/packages/lt3rawobjects.tar.lzma
+2022/11/27 |     538405 | systems/win32/miktex/tm/packages/lt3rawobjects__doc.tar.lzma
+2022/11/27 |      10352 | systems/win32/miktex/tm/packages/lt3rawobjects__source.tar.lzma
+2022/11/27 |       3669 | systems/win32/miktex/tm/packages/lt3rawobjects.tar.lzma
 2014/08/19 |     236809 | systems/win32/miktex/tm/packages/ltablex.tar.lzma
 2010/03/30 |     272798 | systems/win32/miktex/tm/packages/ltabptch.tar.lzma
 2017/04/13 |      49206 | systems/win32/miktex/tm/packages/ltb2bib.tar.lzma
@@ -304499,7 +304499,7 @@
 2022/07/26 |      94055 | systems/win32/miktex/tm/packages/miktex-lua53-bin-2.9.tar.lzma
 2022/11/25 |     103521 | systems/win32/miktex/tm/packages/miktex-lua53-bin-x64-2.9.tar.lzma
 2022/07/26 |    1733266 | systems/win32/miktex/tm/packages/miktex-luatex-bin-2.9.tar.lzma
-2022/11/25 |    2018560 | systems/win32/miktex/tm/packages/miktex-luatex-bin-x64-2.9.tar.lzma
+2022/11/27 |    1999208 | systems/win32/miktex/tm/packages/miktex-luatex-bin-x64-2.9.tar.lzma
 2016/11/06 |      11511 | systems/win32/miktex/tm/packages/miktex-luatex.tar.lzma
 2022/07/26 |      67910 | systems/win32/miktex/tm/packages/miktex-lzma-bin-2.9.tar.lzma
 2022/11/25 |      73942 | systems/win32/miktex/tm/packages/miktex-lzma-bin-x64-2.9.tar.lzma
@@ -304567,7 +304567,7 @@
 2021/03/08 |    8242908 | systems/win32/miktex/tm/packages/miktex-qt5-bin.tar.lzma
 2021/03/08 |    9576187 | systems/win32/miktex/tm/packages/miktex-qt5-bin-x64.tar.lzma
 2022/07/26 |    1355602 | systems/win32/miktex/tm/packages/miktex-runtime-bin-2.9.tar.lzma
-2022/11/25 |    1512127 | systems/win32/miktex/tm/packages/miktex-runtime-bin-x64-2.9.tar.lzma
+2022/11/27 |    1512702 | systems/win32/miktex/tm/packages/miktex-runtime-bin-x64-2.9.tar.lzma
 2022/07/26 |      42689 | systems/win32/miktex/tm/packages/miktex-synctex-bin-2.9.tar.lzma
 2022/11/25 |      52713 | systems/win32/miktex/tm/packages/miktex-synctex-bin-x64-2.9.tar.lzma
 2020/05/17 |      74366 | systems/win32/miktex/tm/packages/miktex-tdsutil-bin-2.9.tar.lzma
@@ -304621,9 +304621,9 @@
 2018/01/12 |     157226 | systems/win32/miktex/tm/packages/miktex-zip-bin-x64.tar.lzma
 2022/07/26 |      39695 | systems/win32/miktex/tm/packages/miktex-zlib-bin-2.9.tar.lzma
 2022/11/25 |      43705 | systems/win32/miktex/tm/packages/miktex-zlib-bin-x64-2.9.tar.lzma
-2022/11/26 |     304838 | systems/win32/miktex/tm/packages/miktex-zzdb1-2.9.tar.lzma
-2022/11/26 |    1854338 | systems/win32/miktex/tm/packages/miktex-zzdb2-2.9.tar.lzma
-2022/11/26 |    1627167 | systems/win32/miktex/tm/packages/miktex-zzdb3-2.9.tar.lzma
+2022/11/27 |     304895 | systems/win32/miktex/tm/packages/miktex-zzdb1-2.9.tar.lzma
+2022/11/27 |    1853083 | systems/win32/miktex/tm/packages/miktex-zzdb2-2.9.tar.lzma
+2022/11/27 |    1627337 | systems/win32/miktex/tm/packages/miktex-zzdb3-2.9.tar.lzma
 2022/07/26 |      13519 | systems/win32/miktex/tm/packages/miktex-zzip-bin-2.9.tar.lzma
 2022/11/25 |      14427 | systems/win32/miktex/tm/packages/miktex-zzip-bin-x64-2.9.tar.lzma
 2016/07/15 |      35914 | systems/win32/miktex/tm/packages/mil3.tar.lzma
@@ -304876,102 +304876,102 @@
 2022/11/01 |     230073 | systems/win32/miktex/tm/packages/newverbs__doc.tar.lzma
 2022/11/01 |       7969 | systems/win32/miktex/tm/packages/newverbs__source.tar.lzma
 2022/11/01 |       3030 | systems/win32/miktex/tm/packages/newverbs.tar.lzma
-2022/11/26 |     751204 | systems/win32/miktex/tm/packages/next/files.csv.lzma
-2022/11/26 |      57185 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-x64-2.9.tar.lzma
-2022/11/26 |    1168235 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-x64-2.9.tar.lzma
-2022/11/26 |      31705 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-x64-2.9.tar.lzma
-2022/11/26 |      35299 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-x64-2.9.tar.lzma
-2022/11/26 |      65935 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-x64-2.9.tar.lzma
-2022/11/26 |     101738 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-x64-2.9.tar.lzma
-2022/11/26 |      77650 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-x64-2.9.tar.lzma
-2022/11/26 |      31602 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-x64-2.9.tar.lzma
-2022/11/26 |     395054 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-x64-2.9.tar.lzma
-2022/11/26 |      37068 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-x64-2.9.tar.lzma
-2022/11/26 |      57891 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-x64-2.9.tar.lzma
-2022/11/26 |     271437 | systems/win32/miktex/tm/packages/next/miktex-console-bin-x64-2.9.tar.lzma
-2022/11/26 |     196623 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-x64-2.9.tar.lzma
-2022/11/26 |     103662 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-x64-2.9.tar.lzma
-2022/11/26 |      24084 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-x64-2.9.tar.lzma
-2022/11/26 |     473048 | systems/win32/miktex/tm/packages/next/miktex-doc.tar.lzma
-2022/11/26 |      52654 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-x64-2.9.tar.lzma
-2022/11/26 |     327413 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-x64-2.9.tar.lzma
-2022/11/26 |      45789 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-x64-2.9.tar.lzma
-2022/11/26 |     135938 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-x64-2.9.tar.lzma
-2022/11/26 |    1454364 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-x64-2.9.tar.lzma
-2022/11/26 |     121135 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-x64-2.9.tar.lzma
-2022/11/26 |      48925 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-x64-2.9.tar.lzma
-2022/11/26 |      28756 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-x64-2.9.tar.lzma
-2022/11/26 |      62763 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-x64-2.9.tar.lzma
-2022/11/26 |     156064 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-x64-2.9.tar.lzma
-2022/11/26 |      79726 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-x64-2.9.tar.lzma
-2022/11/26 |      81478 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-x64-2.9.tar.lzma
-2022/11/26 |     296293 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-x64-2.9.tar.lzma
-2022/11/26 |      25209 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-x64-2.9.tar.lzma
-2022/11/26 |     113238 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-x64-2.9.tar.lzma
-2022/11/26 |      73342 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-x64-2.9.tar.lzma
-2022/11/26 |     115742 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-x64-2.9.tar.lzma
-2022/11/26 |      44087 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-x64-2.9.tar.lzma
-2022/11/26 |     572021 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-x64-2.9.tar.lzma
-2022/11/26 |     247489 | systems/win32/miktex/tm/packages/next/miktex-hitex-bin-x64.tar.lzma
-2022/11/26 |     175431 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-x64-2.9.tar.lzma
-2022/11/26 |     109708 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-x64-2.9.tar.lzma
-2022/11/26 |      18357 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-x64-2.9.tar.lzma
-2022/11/26 |      30492 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-x64-2.9.tar.lzma
-2022/11/26 |     702097 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-x64-2.9.tar.lzma
-2022/11/26 |     600144 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-x64-2.9.tar.lzma
-2022/11/26 |     529682 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-x64-2.9.tar.lzma
-2022/11/26 |     103709 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-x64-2.9.tar.lzma
-2022/11/26 |    2000142 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-x64-2.9.tar.lzma
-2022/11/26 |      73933 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-x64-2.9.tar.lzma
-2022/11/26 |      32399 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-x64-2.9.tar.lzma
-2022/11/26 |       8823 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-x64-2.9.tar.lzma
-2022/11/26 |     209101 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-x64-2.9.tar.lzma
-2022/11/26 |     287106 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-x64-2.9.tar.lzma
-2022/11/26 |     105357 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-x64-2.9.tar.lzma
-2022/11/26 |     140720 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-x64-2.9.tar.lzma
-2022/11/26 |     326530 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-x64-2.9.tar.lzma
-2022/11/26 |     181654 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-x64-2.9.tar.lzma
-2022/11/26 |      55793 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-x64-2.9.tar.lzma
-2022/11/26 |      35230 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-x64-2.9.tar.lzma
-2022/11/26 |      43873 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-x64-2.9.tar.lzma
-2022/11/26 |      48143 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-x64-2.9.tar.lzma
-2022/11/26 |      52539 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-x64-2.9.tar.lzma
-2022/11/26 |     214051 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-x64-2.9.tar.lzma
-2022/11/26 |      41708 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin-x64.tar.lzma
-2022/11/26 |     826522 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-x64-2.9.tar.lzma
-2022/11/26 |     203431 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-x64-2.9.tar.lzma
-2022/11/26 |     245689 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-x64-2.9.tar.lzma
-2022/11/26 |      88414 | systems/win32/miktex/tm/packages/next/miktex-png-bin-x64-2.9.tar.lzma
-2022/11/26 |    1337125 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-x64-2.9.tar.lzma
-2022/11/26 |      24036 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-x64-2.9.tar.lzma
-2022/11/26 |      37404 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-x64-2.9.tar.lzma
-2022/11/26 |      72816 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-x64-2.9.tar.lzma
-2022/11/26 |      58696 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-x64-2.9.tar.lzma
-2022/11/26 |     759288 | systems/win32/miktex/tm/packages/next/miktex-ptex-bin-x64.tar.lzma
-2022/11/26 |    1516019 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-x64-2.9.tar.lzma
-2022/11/26 |      52726 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-x64-2.9.tar.lzma
-2022/11/26 |      64380 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-x64.tar.lzma
-2022/11/26 |      27650 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-x64-2.9.tar.lzma
-2022/11/26 |      18486 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-x64-2.9.tar.lzma
-2022/11/26 |      71233 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-x64-2.9.tar.lzma
-2022/11/26 |     173410 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-x64-2.9.tar.lzma
-2022/11/26 |      69142 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-x64-2.9.tar.lzma
-2022/11/26 |     109299 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-x64-2.9.tar.lzma
-2022/11/26 |    2832034 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-x64-2.9.tar.lzma
-2022/11/26 |      61697 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-x64-2.9.tar.lzma
-2022/11/26 |      42476 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin-x64.tar.lzma
-2022/11/26 |      33889 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-x64-2.9.tar.lzma
-2022/11/26 |      74419 | systems/win32/miktex/tm/packages/next/miktex-web-bin-x64-2.9.tar.lzma
-2022/11/26 |     352526 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-x64-2.9.tar.lzma
-2022/11/26 |      57425 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin-x64.tar.lzma
-2022/11/26 |     637797 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-x64-2.9.tar.lzma
-2022/11/26 |      43714 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-x64-2.9.tar.lzma
-2022/11/26 |     304888 | systems/win32/miktex/tm/packages/next/miktex-zzdb1-2.9.tar.lzma
-2022/11/26 |    1855013 | systems/win32/miktex/tm/packages/next/miktex-zzdb2-2.9.tar.lzma
-2022/11/26 |    1627477 | systems/win32/miktex/tm/packages/next/miktex-zzdb3-2.9.tar.lzma
-2022/11/26 |      14446 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-x64-2.9.tar.lzma
+2022/11/27 |     751204 | systems/win32/miktex/tm/packages/next/files.csv.lzma
+2022/11/27 |      57192 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-x64-2.9.tar.lzma
+2022/11/27 |    1165605 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-x64-2.9.tar.lzma
+2022/11/27 |      31718 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-x64-2.9.tar.lzma
+2022/11/27 |      35350 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-x64-2.9.tar.lzma
+2022/11/27 |      65884 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-x64-2.9.tar.lzma
+2022/11/27 |     101573 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-x64-2.9.tar.lzma
+2022/11/27 |      77650 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-x64-2.9.tar.lzma
+2022/11/27 |      31605 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-x64-2.9.tar.lzma
+2022/11/27 |     394897 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-x64-2.9.tar.lzma
+2022/11/27 |      37099 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-x64-2.9.tar.lzma
+2022/11/27 |      57821 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-x64-2.9.tar.lzma
+2022/11/27 |     271288 | systems/win32/miktex/tm/packages/next/miktex-console-bin-x64-2.9.tar.lzma
+2022/11/27 |     196622 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-x64-2.9.tar.lzma
+2022/11/27 |     103504 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-x64-2.9.tar.lzma
+2022/11/27 |      24150 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-x64-2.9.tar.lzma
+2022/11/27 |     472949 | systems/win32/miktex/tm/packages/next/miktex-doc.tar.lzma
+2022/11/27 |      52691 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-x64-2.9.tar.lzma
+2022/11/27 |     327483 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-x64-2.9.tar.lzma
+2022/11/27 |      45841 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-x64-2.9.tar.lzma
+2022/11/27 |     135891 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-x64-2.9.tar.lzma
+2022/11/27 |    1457024 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-x64-2.9.tar.lzma
+2022/11/27 |     121105 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-x64-2.9.tar.lzma
+2022/11/27 |      48949 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-x64-2.9.tar.lzma
+2022/11/27 |      28772 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-x64-2.9.tar.lzma
+2022/11/27 |      62732 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-x64-2.9.tar.lzma
+2022/11/27 |     155958 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-x64-2.9.tar.lzma
+2022/11/27 |      79738 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-x64-2.9.tar.lzma
+2022/11/27 |      81534 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-x64-2.9.tar.lzma
+2022/11/27 |     296235 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-x64-2.9.tar.lzma
+2022/11/27 |      25213 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-x64-2.9.tar.lzma
+2022/11/27 |     112994 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-x64-2.9.tar.lzma
+2022/11/27 |      73327 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-x64-2.9.tar.lzma
+2022/11/27 |     115793 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-x64-2.9.tar.lzma
+2022/11/27 |      44075 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-x64-2.9.tar.lzma
+2022/11/27 |     572244 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-x64-2.9.tar.lzma
+2022/11/27 |     247475 | systems/win32/miktex/tm/packages/next/miktex-hitex-bin-x64.tar.lzma
+2022/11/27 |     175368 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-x64-2.9.tar.lzma
+2022/11/27 |     109736 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-x64-2.9.tar.lzma
+2022/11/27 |      18362 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-x64-2.9.tar.lzma
+2022/11/27 |      30492 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-x64-2.9.tar.lzma
+2022/11/27 |     702712 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-x64-2.9.tar.lzma
+2022/11/27 |     599868 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-x64-2.9.tar.lzma
+2022/11/27 |     529862 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-x64-2.9.tar.lzma
+2022/11/27 |     103736 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-x64-2.9.tar.lzma
+2022/11/27 |    1986087 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-x64-2.9.tar.lzma
+2022/11/27 |      73942 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-x64-2.9.tar.lzma
+2022/11/27 |      32396 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-x64-2.9.tar.lzma
+2022/11/27 |       8833 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-x64-2.9.tar.lzma
+2022/11/27 |     209068 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-x64-2.9.tar.lzma
+2022/11/27 |     287081 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-x64-2.9.tar.lzma
+2022/11/27 |     105357 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-x64-2.9.tar.lzma
+2022/11/27 |     140913 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-x64-2.9.tar.lzma
+2022/11/27 |     326901 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-x64-2.9.tar.lzma
+2022/11/27 |     181876 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-x64-2.9.tar.lzma
+2022/11/27 |      55745 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-x64-2.9.tar.lzma
+2022/11/27 |      35204 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-x64-2.9.tar.lzma
+2022/11/27 |      43857 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-x64-2.9.tar.lzma
+2022/11/27 |      48174 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-x64-2.9.tar.lzma
+2022/11/27 |      52508 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-x64-2.9.tar.lzma
+2022/11/27 |     213905 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-x64-2.9.tar.lzma
+2022/11/27 |      41727 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin-x64.tar.lzma
+2022/11/27 |     833245 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-x64-2.9.tar.lzma
+2022/11/27 |     203478 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-x64-2.9.tar.lzma
+2022/11/27 |     245768 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-x64-2.9.tar.lzma
+2022/11/27 |      88480 | systems/win32/miktex/tm/packages/next/miktex-png-bin-x64-2.9.tar.lzma
+2022/11/27 |    1338792 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-x64-2.9.tar.lzma
+2022/11/27 |      24029 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-x64-2.9.tar.lzma
+2022/11/27 |      37410 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-x64-2.9.tar.lzma
+2022/11/27 |      72686 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-x64-2.9.tar.lzma
+2022/11/27 |      58483 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-x64-2.9.tar.lzma
+2022/11/27 |     759637 | systems/win32/miktex/tm/packages/next/miktex-ptex-bin-x64.tar.lzma
+2022/11/27 |    1515659 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-x64-2.9.tar.lzma
+2022/11/27 |      52692 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-x64-2.9.tar.lzma
+2022/11/27 |      64358 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-x64.tar.lzma
+2022/11/27 |      27611 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-x64-2.9.tar.lzma
+2022/11/27 |      18489 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-x64-2.9.tar.lzma
+2022/11/27 |      71238 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-x64-2.9.tar.lzma
+2022/11/27 |     173440 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-x64-2.9.tar.lzma
+2022/11/27 |      69238 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-x64-2.9.tar.lzma
+2022/11/27 |     109335 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-x64-2.9.tar.lzma
+2022/11/27 |    2831530 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-x64-2.9.tar.lzma
+2022/11/27 |      61693 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-x64-2.9.tar.lzma
+2022/11/27 |      42455 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin-x64.tar.lzma
+2022/11/27 |      33898 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-x64-2.9.tar.lzma
+2022/11/27 |      74365 | systems/win32/miktex/tm/packages/next/miktex-web-bin-x64-2.9.tar.lzma
+2022/11/27 |     352576 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-x64-2.9.tar.lzma
+2022/11/27 |      57401 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin-x64.tar.lzma
+2022/11/27 |     637091 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-x64-2.9.tar.lzma
+2022/11/27 |      43703 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-x64-2.9.tar.lzma
+2022/11/27 |     304855 | systems/win32/miktex/tm/packages/next/miktex-zzdb1-2.9.tar.lzma
+2022/11/27 |    1853714 | systems/win32/miktex/tm/packages/next/miktex-zzdb2-2.9.tar.lzma
+2022/11/27 |    1627443 | systems/win32/miktex/tm/packages/next/miktex-zzdb3-2.9.tar.lzma
+2022/11/27 |      14445 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-x64-2.9.tar.lzma
 2019/03/12 |       1412 | systems/win32/miktex/tm/packages/nextpage.tar.lzma
-2022/11/26 |       1150 | systems/win32/miktex/tm/packages/next/pr.ini
+2022/11/27 |       1150 | systems/win32/miktex/tm/packages/next/pr.ini
 2018/07/06 |     145915 | systems/win32/miktex/tm/packages/nexus-otf.tar.lzma
 2017/03/30 |     191149 | systems/win32/miktex/tm/packages/nfssext-cfr.tar.lzma
 2012/12/20 |     612251 | systems/win32/miktex/tm/packages/nicefilelist.tar.lzma
@@ -305498,7 +305498,7 @@
 2022/02/22 |       6917 | systems/win32/miktex/tm/packages/preview.tar.lzma
 2019/06/20 |     375963 | systems/win32/miktex/tm/packages/prftree.tar.lzma
 2021/04/23 |     274028 | systems/win32/miktex/tm/packages/principia.tar.lzma
-2022/11/26 |       1048 | systems/win32/miktex/tm/packages/pr.ini
+2022/11/27 |       1023 | systems/win32/miktex/tm/packages/pr.ini
 2010/09/27 |     248469 | systems/win32/miktex/tm/packages/printlen.tar.lzma
 2008/06/17 |      77313 | systems/win32/miktex/tm/packages/proba.tar.lzma
 2017/07/12 |     988486 | systems/win32/miktex/tm/packages/probsoln.tar.lzma
@@ -306859,9 +306859,9 @@
 2022/10/15 |     129483 | systems/win32/miktex/tm/packages/unigrazpub__doc.tar.lzma
 2022/10/15 |      14893 | systems/win32/miktex/tm/packages/unigrazpub__source.tar.lzma
 2022/10/15 |       6140 | systems/win32/miktex/tm/packages/unigrazpub.tar.lzma
-2022/11/24 |      42838 | systems/win32/miktex/tm/packages/unimath-plain-xetex__doc.tar.lzma
-2022/11/24 |       4084 | systems/win32/miktex/tm/packages/unimath-plain-xetex__source.tar.lzma
-2022/11/24 |       6254 | systems/win32/miktex/tm/packages/unimath-plain-xetex.tar.lzma
+2022/11/27 |      46361 | systems/win32/miktex/tm/packages/unimath-plain-xetex__doc.tar.lzma
+2022/11/27 |       4724 | systems/win32/miktex/tm/packages/unimath-plain-xetex__source.tar.lzma
+2022/11/27 |       6801 | systems/win32/miktex/tm/packages/unimath-plain-xetex.tar.lzma
 2021/01/02 |      70067 | systems/win32/miktex/tm/packages/uninormalize.tar.lzma
 2019/12/20 |     298441 | systems/win32/miktex/tm/packages/uniquecounter.tar.lzma
 2022/05/04 |     197277 | systems/win32/miktex/tm/packages/unisc__doc.tar.lzma
@@ -307511,7 +307511,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
-2022/11/27 |        186 | timestamp
+2022/11/28 |        186 | timestamp
 2002/08/26 |      61898 | usergrps/dante/antrag.pdf
 2002/08/26 |     118217 | usergrps/dante/antrag.ps
 2022/02/28 |        917 | usergrps/dante/dtk/doc/beispiel.bib
diff --git a/FILES.byname.gz b/FILES.byname.gz
index bf033e339f..76914c682b 100644
--- a/FILES.byname.gz
+++ b/FILES.byname.gz
diff --git a/FILES.last07days b/FILES.last07days
index ff2d3e289b..738c5e1818 100644
--- a/FILES.last07days
+++ b/FILES.last07days
@@ -1,153 +1,205 @@
+2022/11/27 |       9958 | macros/luatex/generic/lutabulartools/lutabulartools.sty
+2022/11/27 |      92870 | macros/latex/contrib/pagecolor/pagecolor-example.pdf
+2022/11/27 |       9044 | macros/jptex/latex/jlreq/jlreq-trimmarks-ja.md
+2022/11/27 |      88480 | systems/win32/miktex/tm/packages/next/miktex-png-bin-x64-2.9.tar.lzma
+2022/11/27 |       8833 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-x64-2.9.tar.lzma
+2022/11/27 |     881135 | macros/xetex/latex/xduts/xdulogo.pdf
+2022/11/27 |     833245 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-x64-2.9.tar.lzma
+2022/11/27 |      81534 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-x64-2.9.tar.lzma
+2022/11/27 |      79738 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-x64-2.9.tar.lzma
+2022/11/27 |      77650 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-x64-2.9.tar.lzma
+2022/11/27 |     759637 | systems/win32/miktex/tm/packages/next/miktex-ptex-bin-x64.tar.lzma
+2022/11/27 |       7538 | macros/jptex/latex/jlreq/jlreq-trimmarks.md
+2022/11/27 |     751240 | systems/win32/miktex/tm/packages/files.csv.lzma
+2022/11/27 |     751204 | systems/win32/miktex/tm/packages/next/files.csv.lzma
+2022/11/27 |      74365 | systems/win32/miktex/tm/packages/next/miktex-web-bin-x64-2.9.tar.lzma
+2022/11/27 |      73942 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-x64-2.9.tar.lzma
+2022/11/27 |      73327 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-x64-2.9.tar.lzma
+2022/11/27 |      72686 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-x64-2.9.tar.lzma
+2022/11/27 |     722686 | macros/xetex/latex/xduts/xduts.pdf
+2022/11/27 |      71238 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-x64-2.9.tar.lzma
+2022/11/27 |       7060 | macros/jptex/latex/jlreq/README.md
+2022/11/27 |     702712 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-x64-2.9.tar.lzma
+2022/11/27 |      69238 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-x64-2.9.tar.lzma
+2022/11/27 |       6801 | systems/win32/miktex/tm/packages/unimath-plain-xetex.tar.lzma
+2022/11/27 |       6788 | systems/texlive/tlnet/archive/unimath-plain-xetex.r65110.tar.xz
+2022/11/27 |      65884 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-x64-2.9.tar.lzma
+2022/11/27 |      64358 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-x64.tar.lzma
+2022/11/27 |     637091 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-x64-2.9.tar.lzma
+2022/11/27 |      62732 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-x64-2.9.tar.lzma
+2022/11/27 |      61693 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-x64-2.9.tar.lzma
+2022/11/27 |     612042 | macros/jptex/latex/jlreq.zip
+2022/11/27 |     599868 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-x64-2.9.tar.lzma
+2022/11/27 |      58483 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-x64-2.9.tar.lzma
+2022/11/27 |    5834463 | systems/texlive/tlnet/install-tl-unx.tar.gz
+2022/11/27 |      57821 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-x64-2.9.tar.lzma
+2022/11/27 |      57401 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin-x64.tar.lzma
+2022/11/27 |     572244 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-x64-2.9.tar.lzma
+2022/11/27 |      57192 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-x64-2.9.tar.lzma
+2022/11/27 |      55745 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-x64-2.9.tar.lzma
+2022/11/27 |     544276 | macros/latex/contrib/lt3rawobjects.zip
+2022/11/27 |     538768 | macros/latex/contrib/lt3rawobjects/lt3rawobjects.pdf
+2022/11/27 |     538405 | systems/win32/miktex/tm/packages/lt3rawobjects__doc.tar.lzma
+2022/11/27 |     536008 | systems/texlive/tlnet/archive/lt3rawobjects.doc.r65109.tar.xz
+2022/11/27 |     529862 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-x64-2.9.tar.lzma
+2022/11/27 |      52692 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-x64-2.9.tar.lzma
+2022/11/27 |      52691 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-x64-2.9.tar.lzma
+2022/11/27 |      52508 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-x64-2.9.tar.lzma
+2022/11/27 |      51908 | macros/latex/contrib/lt3rawobjects/lt3rawobjects.dtx
+2022/11/27 |       5136 | macros/latex/contrib/pagecolor/README
+2022/11/27 |      50951 | macros/jptex/latex/jlreq/jfm-jlreq.lua
+2022/11/27 |      50840 | macros/jptex/latex/jlreq/jlreq-trimmarks.sty
+2022/11/27 |      49976 | systems/texlive/tlnet/archive/unimath-plain-xetex.doc.r65110.tar.xz
+2022/11/27 |      49065 | macros/jptex/latex/jlreq/README-ja.md
+2022/11/27 |         48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
+2022/11/27 |      48949 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-x64-2.9.tar.lzma
+2022/11/27 |      48174 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-x64-2.9.tar.lzma
+2022/11/27 |     472949 | systems/win32/miktex/tm/packages/next/miktex-doc.tar.lzma
+2022/11/27 |       4724 | systems/win32/miktex/tm/packages/unimath-plain-xetex__source.tar.lzma
+2022/11/27 |      46361 | systems/win32/miktex/tm/packages/unimath-plain-xetex__doc.tar.lzma
+2022/11/27 |      45841 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-x64-2.9.tar.lzma
+2022/11/27 |        455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
+2022/11/27 |        455 | systems/texlive/tlnet/install-tl.zip.sha512.asc
+2022/11/27 |        455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
+2022/11/27 |        455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
+2022/11/27 |     444159 | install/macros/latex/contrib/pagecolor.tds.zip
+2022/11/27 |      44185 | macros/latex/contrib/pagecolor/pagecolor.dtx
+2022/11/27 |      44075 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-x64-2.9.tar.lzma
+2022/11/27 |      43857 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-x64-2.9.tar.lzma
+2022/11/27 |      43703 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-x64-2.9.tar.lzma
+2022/11/27 |     436012 | macros/latex/contrib/pagecolor.zip
+2022/11/27 |      42455 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin-x64.tar.lzma
+2022/11/27 |     423348 | systems/texlive/tlnet/archive/texlive-scripts.doc.r65108.tar.xz
+2022/11/27 |      41727 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin-x64.tar.lzma
+2022/11/27 |    4018774 | biblio/ctan-bibdata.zip
+2022/11/27 |     394897 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-x64-2.9.tar.lzma
+2022/11/27 |     376976 | macros/jptex/latex/jlreq/jlreq-ja.pdf
+2022/11/27 |      37410 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-x64-2.9.tar.lzma
+2022/11/27 |      37099 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-x64-2.9.tar.lzma
+2022/11/27 |       3669 | systems/win32/miktex/tm/packages/lt3rawobjects.tar.lzma
+2022/11/27 |    3626063 | biblio/ctan-bibdata/ctan.pdf
+2022/11/27 |      35350 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-x64-2.9.tar.lzma
+2022/11/27 |       3532 | systems/texlive/tlnet/archive/lt3rawobjects.r65109.tar.xz
+2022/11/27 |     352576 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-x64-2.9.tar.lzma
+2022/11/27 |      35204 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-x64-2.9.tar.lzma
+2022/11/27 |     342986 | macros/latex/contrib/pagecolor/pagecolor.pdf
+2022/11/27 |      33898 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-x64-2.9.tar.lzma
+2022/11/27 |     327483 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-x64-2.9.tar.lzma
+2022/11/27 |     326901 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-x64-2.9.tar.lzma
+2022/11/27 |      32396 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-x64-2.9.tar.lzma
+2022/11/27 |      31718 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-x64-2.9.tar.lzma
+2022/11/27 |      31605 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-x64-2.9.tar.lzma
+2022/11/27 |       3125 | macros/xetex/latex/xduts/README.md
+2022/11/27 |      30492 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-x64-2.9.tar.lzma
+2022/11/27 |     304895 | systems/win32/miktex/tm/packages/miktex-zzdb1-2.9.tar.lzma
+2022/11/27 |     304855 | systems/win32/miktex/tm/packages/next/miktex-zzdb1-2.9.tar.lzma
+2022/11/27 |     296235 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-x64-2.9.tar.lzma
+2022/11/27 |      28772 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-x64-2.9.tar.lzma
+2022/11/27 |     287627 | macros/jptex/latex/jlreq/jlreq.cls
+2022/11/27 |     287081 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-x64-2.9.tar.lzma
+2022/11/27 |    2831530 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-x64-2.9.tar.lzma
+2022/11/27 |      27611 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-x64-2.9.tar.lzma
+2022/11/27 |    2747283 | biblio/ctan-bibdata/ctan.bib
+2022/11/27 |     271288 | systems/win32/miktex/tm/packages/next/miktex-console-bin-x64-2.9.tar.lzma
+2022/11/27 |   25518530 | systems/texlive/tlnet/install-tl.zip
+2022/11/27 |      25213 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-x64-2.9.tar.lzma
+2022/11/27 |     247475 | systems/win32/miktex/tm/packages/next/miktex-hitex-bin-x64.tar.lzma
+2022/11/27 |     245768 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-x64-2.9.tar.lzma
+2022/11/27 |    2431016 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
+2022/11/27 |      24150 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-x64-2.9.tar.lzma
+2022/11/27 |      24029 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-x64-2.9.tar.lzma
+2022/11/27 |     239042 | macros/xetex/latex/xduts/xduts.dtx
+2022/11/27 |       2220 | macros/latex/contrib/lt3rawobjects/lt3rawobjects.ins
+2022/11/27 |     213905 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-x64-2.9.tar.lzma
+2022/11/27 |      21198 | macros/jptex/latex/jlreq/jlreq-helpers.sty
+2022/11/27 |     209068 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-x64-2.9.tar.lzma
+2022/11/27 |   20435452 | systems/texlive/tlnet/install-tl-windows.exe
+2022/11/27 |     203478 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-x64-2.9.tar.lzma
+2022/11/27 |    1999208 | systems/win32/miktex/tm/packages/miktex-luatex-bin-x64-2.9.tar.lzma
+2022/11/27 |    1986087 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-x64-2.9.tar.lzma
+2022/11/27 |     196622 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-x64-2.9.tar.lzma
+2022/11/27 |    1853714 | systems/win32/miktex/tm/packages/next/miktex-zzdb2-2.9.tar.lzma
+2022/11/27 |    1853083 | systems/win32/miktex/tm/packages/miktex-zzdb2-2.9.tar.lzma
+2022/11/27 |      18489 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-x64-2.9.tar.lzma
+2022/11/27 |      18362 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-x64-2.9.tar.lzma
+2022/11/27 |     181876 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-x64-2.9.tar.lzma
+2022/11/27 |   17876155 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
+2022/11/27 |     175368 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-x64-2.9.tar.lzma
+2022/11/27 |     173440 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-x64-2.9.tar.lzma
+2022/11/27 |       1678 | biblio/ctan-bibdata/biblatex-ctan/ctan.bbx
+2022/11/27 |      16744 | macros/luatex/generic/lutabulartools/lutabulartools.tex
+2022/11/27 |    1628543 | macros/xetex/latex/xduts.zip
+2022/11/27 |    1627443 | systems/win32/miktex/tm/packages/next/miktex-zzdb3-2.9.tar.lzma
+2022/11/27 |    1627337 | systems/win32/miktex/tm/packages/miktex-zzdb3-2.9.tar.lzma
+2022/11/27 |       1623 | macros/luatex/generic/lutabulartools/README.md
+2022/11/27 |     155958 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-x64-2.9.tar.lzma
+2022/11/27 |        153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
+2022/11/27 |        152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
+2022/11/27 |    1515659 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-x64-2.9.tar.lzma
+2022/11/27 |    1512702 | systems/win32/miktex/tm/packages/miktex-runtime-bin-x64-2.9.tar.lzma
+2022/11/27 |        145 | systems/texlive/tlnet/install-tl.zip.sha512
+2022/11/27 |    1457024 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-x64-2.9.tar.lzma
+2022/11/27 |        144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
+2022/11/27 |      14445 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-x64-2.9.tar.lzma
+2022/11/27 |      14243 | macros/luatex/generic/lutabulartools/lutabulartools.lua
+2022/11/27 |     140913 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-x64-2.9.tar.lzma
+2022/11/27 |   13971205 | macros/latex/contrib/profcollege.zip
+2022/11/27 |     135891 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-x64-2.9.tar.lzma
+2022/11/27 |    1338792 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-x64-2.9.tar.lzma
+2022/11/27 |       1305 | macros/latex/contrib/lt3rawobjects/README.md
+2022/11/27 |     121105 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-x64-2.9.tar.lzma
+2022/11/27 |     120615 | macros/jptex/latex/jlreq/jlreq.pdf
+2022/11/27 |      11878 | macros/jptex/latex/jlreq/luajfm2pl.lua
+2022/11/27 |    1165605 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-x64-2.9.tar.lzma
+2022/11/27 |     115793 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-x64-2.9.tar.lzma
+2022/11/27 |       1150 | systems/win32/miktex/tm/packages/next/pr.ini
+2022/11/27 |     114054 | macros/luatex/generic/lutabulartools/lutabulartools.pdf
+2022/11/27 |     113704 | systems/texlive/tlnet/archive/texlive-scripts.r65108.tar.xz
+2022/11/27 |     112994 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-x64-2.9.tar.lzma
+2022/11/27 |       1111 | macros/xetex/latex/xduts/xduts.ins
+2022/11/27 |     109736 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-x64-2.9.tar.lzma
+2022/11/27 |   10971100 | install/macros/jptex/latex/jlreq.tds.zip
+2022/11/27 |     109335 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-x64-2.9.tar.lzma
+2022/11/27 |     105357 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-x64-2.9.tar.lzma
+2022/11/27 |      10466 | macros/jptex/latex/jlreq/jlreq-complements.sty
+2022/11/27 |     103736 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-x64-2.9.tar.lzma
+2022/11/27 |      10352 | systems/win32/miktex/tm/packages/lt3rawobjects__source.tar.lzma
+2022/11/27 |     103504 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-x64-2.9.tar.lzma
+2022/11/27 |       1023 | systems/win32/miktex/tm/packages/pr.ini
+2022/11/27 |     101573 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-x64-2.9.tar.lzma
+2022/11/27 |     100718 | macros/luatex/generic/lutabulartools.zip
+2022/11/27 |      10044 | systems/texlive/tlnet/archive/lt3rawobjects.source.r65109.tar.xz
 2022/11/26 |     973696 | systems/texlive/tlnet/archive/tex4ht.r65105.tar.xz
-2022/11/26 |      88414 | systems/win32/miktex/tm/packages/next/miktex-png-bin-x64-2.9.tar.lzma
+2022/11/26 |    9452788 | macros/latex/contrib/profcollege/doc/ProfCollege-doc.pdf
 2022/11/26 |     883135 | systems/win32/miktex/tm/packages/achemso__doc.tar.lzma
-2022/11/26 |       8823 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-x64-2.9.tar.lzma
 2022/11/26 |     880816 | systems/texlive/tlnet/archive/achemso.doc.r65103.tar.xz
-2022/11/26 |     826522 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-x64-2.9.tar.lzma
-2022/11/26 |      81478 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-x64-2.9.tar.lzma
-2022/11/26 |      79726 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-x64-2.9.tar.lzma
-2022/11/26 |      77650 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-x64-2.9.tar.lzma
-2022/11/26 |     759288 | systems/win32/miktex/tm/packages/next/miktex-ptex-bin-x64.tar.lzma
-2022/11/26 |     751204 | systems/win32/miktex/tm/packages/next/files.csv.lzma
-2022/11/26 |     751170 | systems/win32/miktex/tm/packages/files.csv.lzma
-2022/11/26 |      74419 | systems/win32/miktex/tm/packages/next/miktex-web-bin-x64-2.9.tar.lzma
-2022/11/26 |      73933 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-x64-2.9.tar.lzma
-2022/11/26 |      73342 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-x64-2.9.tar.lzma
-2022/11/26 |      72816 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-x64-2.9.tar.lzma
-2022/11/26 |      71233 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-x64-2.9.tar.lzma
-2022/11/26 |     702097 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-x64-2.9.tar.lzma
-2022/11/26 |      69142 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-x64-2.9.tar.lzma
-2022/11/26 |      65935 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-x64-2.9.tar.lzma
-2022/11/26 |      64380 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-x64.tar.lzma
-2022/11/26 |     637797 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-x64-2.9.tar.lzma
-2022/11/26 |      62763 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-x64-2.9.tar.lzma
-2022/11/26 |      61697 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-x64-2.9.tar.lzma
+2022/11/26 |       7354 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
+2022/11/26 |      67988 | macros/latex/contrib/profcollege/metapost/PfCObjets.mp
 2022/11/26 |      61325 | macros/xetex/plain/unimath-plain-xetex.zip
-2022/11/26 |     600144 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-x64-2.9.tar.lzma
-2022/11/26 |      58696 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-x64-2.9.tar.lzma
-2022/11/26 |    5834646 | systems/texlive/tlnet/install-tl-unx.tar.gz
-2022/11/26 |      57891 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-x64-2.9.tar.lzma
-2022/11/26 |      57425 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin-x64.tar.lzma
-2022/11/26 |     572021 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-x64-2.9.tar.lzma
-2022/11/26 |      57185 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-x64-2.9.tar.lzma
-2022/11/26 |      55793 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-x64-2.9.tar.lzma
 2022/11/26 |    5545988 | systems/texlive/tlnet/archive/bib2gls.doc.r65104.tar.xz
 2022/11/26 |    5489110 | systems/win32/miktex/tm/packages/bib2gls__doc.tar.lzma
-2022/11/26 |     544502 | macros/latex/contrib/lt3rawobjects.zip
-2022/11/26 |     538908 | macros/latex/contrib/lt3rawobjects/lt3rawobjects.pdf
-2022/11/26 |     529682 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-x64-2.9.tar.lzma
-2022/11/26 |      52726 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-x64-2.9.tar.lzma
-2022/11/26 |      52654 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-x64-2.9.tar.lzma
-2022/11/26 |      52539 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-x64-2.9.tar.lzma
-2022/11/26 |      51905 | macros/latex/contrib/lt3rawobjects/lt3rawobjects.dtx
-2022/11/26 |         48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
-2022/11/26 |      48925 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-x64-2.9.tar.lzma
-2022/11/26 |      48143 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-x64-2.9.tar.lzma
 2022/11/26 |      47677 | macros/xetex/plain/unimath-plain-xetex/doc/unimath-plain-xetex-doc.pdf
-2022/11/26 |     473048 | systems/win32/miktex/tm/packages/next/miktex-doc.tar.lzma
-2022/11/26 |      45789 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-x64-2.9.tar.lzma
-2022/11/26 |        455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
-2022/11/26 |        455 | systems/texlive/tlnet/install-tl.zip.sha512.asc
-2022/11/26 |        455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
-2022/11/26 |        455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
-2022/11/26 |      44087 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-x64-2.9.tar.lzma
-2022/11/26 |      43873 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-x64-2.9.tar.lzma
-2022/11/26 |      43714 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-x64-2.9.tar.lzma
-2022/11/26 |      42476 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin-x64.tar.lzma
-2022/11/26 |     423348 | systems/texlive/tlnet/archive/texlive-scripts.doc.r65101.tar.xz
-2022/11/26 |      41708 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin-x64.tar.lzma
 2022/11/26 |      40885 | macros/xetex/plain/unimath-plain-xetex/tex/unimath-plain-alphafams.tex
-2022/11/26 |    4018880 | biblio/ctan-bibdata.zip
-2022/11/26 |     395054 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-x64-2.9.tar.lzma
-2022/11/26 |      37404 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-x64-2.9.tar.lzma
-2022/11/26 |      37068 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-x64-2.9.tar.lzma
-2022/11/26 |    3625594 | biblio/ctan-bibdata/ctan.pdf
-2022/11/26 |      35299 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-x64-2.9.tar.lzma
-2022/11/26 |     352526 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-x64-2.9.tar.lzma
-2022/11/26 |      35230 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-x64-2.9.tar.lzma
-2022/11/26 |      33889 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-x64-2.9.tar.lzma
-2022/11/26 |     327413 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-x64-2.9.tar.lzma
-2022/11/26 |     326530 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-x64-2.9.tar.lzma
-2022/11/26 |      32399 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-x64-2.9.tar.lzma
+2022/11/26 |      40881 | macros/latex/contrib/profcollege/metapost/PfCGeometrie.mp
 2022/11/26 |      31899 | systems/win32/miktex/tm/packages/achemso__source.tar.lzma
-2022/11/26 |      31705 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-x64-2.9.tar.lzma
-2022/11/26 |      31602 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-x64-2.9.tar.lzma
 2022/11/26 |      31496 | systems/texlive/tlnet/archive/achemso.source.r65103.tar.xz
-2022/11/26 |      30492 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-x64-2.9.tar.lzma
-2022/11/26 |     304888 | systems/win32/miktex/tm/packages/next/miktex-zzdb1-2.9.tar.lzma
-2022/11/26 |     304838 | systems/win32/miktex/tm/packages/miktex-zzdb1-2.9.tar.lzma
-2022/11/26 |     296293 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-x64-2.9.tar.lzma
-2022/11/26 |      28756 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-x64-2.9.tar.lzma
-2022/11/26 |     287106 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-x64-2.9.tar.lzma
-2022/11/26 |    2832034 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-x64-2.9.tar.lzma
-2022/11/26 |      27650 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-x64-2.9.tar.lzma
-2022/11/26 |    2747285 | biblio/ctan-bibdata/ctan.bib
 2022/11/26 |    2729312 | systems/win32/miktex/tm/packages/simpleicons.tar.lzma
-2022/11/26 |     271437 | systems/win32/miktex/tm/packages/next/miktex-console-bin-x64-2.9.tar.lzma
 2022/11/26 |    2704520 | systems/texlive/tlnet/archive/simpleicons.r65102.tar.xz
-2022/11/26 |   25518535 | systems/texlive/tlnet/install-tl.zip
-2022/11/26 |      25209 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-x64-2.9.tar.lzma
-2022/11/26 |     247489 | systems/win32/miktex/tm/packages/next/miktex-hitex-bin-x64.tar.lzma
-2022/11/26 |     245689 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-x64-2.9.tar.lzma
-2022/11/26 |    2432388 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
-2022/11/26 |      24084 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-x64-2.9.tar.lzma
-2022/11/26 |      24036 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-x64-2.9.tar.lzma
-2022/11/26 |       2220 | macros/latex/contrib/lt3rawobjects/lt3rawobjects.ins
-2022/11/26 |     214051 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-x64-2.9.tar.lzma
-2022/11/26 |     209101 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-x64-2.9.tar.lzma
-2022/11/26 |   20435919 | systems/texlive/tlnet/install-tl-windows.exe
+2022/11/26 |    2269245 | macros/latex/contrib/profcollege/doc/ProfCollege-doc.zip
 2022/11/26 |      20418 | macros/xetex/plain/unimath-plain-xetex/tex/unimath-plain-xetex.tex
-2022/11/26 |     203431 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-x64-2.9.tar.lzma
-2022/11/26 |    2000142 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-x64-2.9.tar.lzma
 2022/11/26 |    1991266 | systems/win32/miktex/tm/packages/simpleicons__doc.tar.lzma
 2022/11/26 |    1985216 | systems/texlive/tlnet/archive/simpleicons.doc.r65102.tar.xz
 2022/11/26 |      19684 | systems/win32/miktex/tm/packages/achemso.tar.lzma
-2022/11/26 |     196623 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-x64-2.9.tar.lzma
 2022/11/26 |      19300 | systems/texlive/tlnet/archive/achemso.r65103.tar.xz
-2022/11/26 |    1855013 | systems/win32/miktex/tm/packages/next/miktex-zzdb2-2.9.tar.lzma
-2022/11/26 |    1854338 | systems/win32/miktex/tm/packages/miktex-zzdb2-2.9.tar.lzma
-2022/11/26 |      18486 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-x64-2.9.tar.lzma
-2022/11/26 |      18357 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-x64-2.9.tar.lzma
 2022/11/26 |    1831440 | systems/texlive/tlnet/archive/bib2gls.r65104.tar.xz
 2022/11/26 |    1830661 | systems/win32/miktex/tm/packages/bib2gls.tar.lzma
-2022/11/26 |     181654 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-x64-2.9.tar.lzma
 2022/11/26 |      17881 | systems/win32/miktex/tm/packages/simpleicons__source.tar.lzma
-2022/11/26 |   17876003 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
-2022/11/26 |     175431 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-x64-2.9.tar.lzma
-2022/11/26 |     173410 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-x64-2.9.tar.lzma
 2022/11/26 |    1725803 | systems/win32/miktex/tm/packages/bib2gls__source.tar.lzma
 2022/11/26 |    1723124 | systems/texlive/tlnet/archive/bib2gls.source.r65104.tar.xz
-2022/11/26 |       1678 | biblio/ctan-bibdata/biblatex-ctan/ctan.bbx
-2022/11/26 |    1627477 | systems/win32/miktex/tm/packages/next/miktex-zzdb3-2.9.tar.lzma
-2022/11/26 |    1627167 | systems/win32/miktex/tm/packages/miktex-zzdb3-2.9.tar.lzma
-2022/11/26 |     156064 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-x64-2.9.tar.lzma
-2022/11/26 |        153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
-2022/11/26 |        152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
-2022/11/26 |    1516019 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-x64-2.9.tar.lzma
-2022/11/26 |        145 | systems/texlive/tlnet/install-tl.zip.sha512
-2022/11/26 |    1454364 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-x64-2.9.tar.lzma
-2022/11/26 |        144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
-2022/11/26 |      14446 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-x64-2.9.tar.lzma
-2022/11/26 |     140720 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-x64-2.9.tar.lzma
 2022/11/26 |     136384 | systems/texlive/tlnet/archive/tex4ht.doc.r65105.tar.xz
-2022/11/26 |     135938 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-x64-2.9.tar.lzma
-2022/11/26 |    1337125 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-x64-2.9.tar.lzma
-2022/11/26 |       1305 | macros/latex/contrib/lt3rawobjects/README.md
 2022/11/26 |    1288632 | systems/texlive/tlnet/archive/tex4ht.source.r65105.tar.xz
-2022/11/26 |     121135 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-x64-2.9.tar.lzma
-2022/11/26 |    1168235 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-x64-2.9.tar.lzma
-2022/11/26 |     115742 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-x64-2.9.tar.lzma
-2022/11/26 |       1150 | systems/win32/miktex/tm/packages/next/pr.ini
 2022/11/26 |      11407 | macros/xetex/plain/unimath-plain-xetex/doc/unimath-plain-xetex-doc.tex
-2022/11/26 |     113696 | systems/texlive/tlnet/archive/texlive-scripts.r65101.tar.xz
-2022/11/26 |     113238 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-x64-2.9.tar.lzma
-2022/11/26 |     109708 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-x64-2.9.tar.lzma
-2022/11/26 |     109299 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-x64-2.9.tar.lzma
-2022/11/26 |     105357 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-x64-2.9.tar.lzma
-2022/11/26 |       1048 | systems/win32/miktex/tm/packages/pr.ini
-2022/11/26 |     103709 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-x64-2.9.tar.lzma
-2022/11/26 |     103662 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-x64-2.9.tar.lzma
-2022/11/26 |     101738 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-x64-2.9.tar.lzma
+2022/11/26 |    1037252 | macros/latex/contrib/profcollege/latex/ProfCollege.sty
 2022/11/25 |    9247550 | systems/win32/miktex/tm/packages/miktex-icu-bin-x64.tar.lzma
 2022/11/25 |     917174 | macros/latex/contrib/achemso.zip
 2022/11/25 |      88396 | systems/win32/miktex/tm/packages/miktex-png-bin-x64-2.9.tar.lzma
@@ -160,7 +212,6 @@
 2022/11/25 |     760514 | systems/win32/miktex/tm/packages/miktex-ptex-bin-x64.tar.lzma
 2022/11/25 |      74277 | systems/win32/miktex/tm/packages/miktex-web-bin-x64-2.9.tar.lzma
 2022/11/25 |      73942 | systems/win32/miktex/tm/packages/miktex-lzma-bin-x64-2.9.tar.lzma
-2022/11/25 |       7352 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
 2022/11/25 |      73361 | systems/win32/miktex/tm/packages/miktex-graphite2-bin-x64-2.9.tar.lzma
 2022/11/25 |      72811 | systems/win32/miktex/tm/packages/miktex-ps2pk-bin-x64-2.9.tar.lzma
 2022/11/25 |      71231 | systems/win32/miktex/tm/packages/miktex-tex4ht-bin-x64-2.9.tar.lzma
@@ -254,7 +305,6 @@
 2022/11/25 |     209572 | support/TeX4ht/source/ChangeLog
 2022/11/25 |     209022 | systems/win32/miktex/tm/packages/miktex-metafont-bin-x64-2.9.tar.lzma
 2022/11/25 |     203441 | systems/win32/miktex/tm/packages/miktex-pixman-bin-x64-2.9.tar.lzma
-2022/11/25 |    2018560 | systems/win32/miktex/tm/packages/miktex-luatex-bin-x64-2.9.tar.lzma
 2022/11/25 |    1975666 | fonts/simpleicons/doc/simpleicons.pdf
 2022/11/25 |     196603 | systems/win32/miktex/tm/packages/miktex-curl-bin-x64-2.9.tar.lzma
 2022/11/25 |      19369 | macros/latex/contrib/achemso/CHANGELOG.md
@@ -269,7 +319,6 @@
 2022/11/25 |      16202 | macros/latex/contrib/achemso/achemso-demo.tex
 2022/11/25 |       1559 | fonts/simpleicons/tex/simpleicons.sty
 2022/11/25 |     155796 | systems/win32/miktex/tm/packages/miktex-fontconfig-bin-x64-2.9.tar.lzma
-2022/11/25 |    1512127 | systems/win32/miktex/tm/packages/miktex-runtime-bin-x64-2.9.tar.lzma
 2022/11/25 |     149476 | macros/latex/contrib/achemso/achemso.dtx
 2022/11/25 |    1458983 | systems/win32/miktex/tm/packages/miktex-dvisvgm-bin-x64-2.9.tar.lzma
 2022/11/25 |      14427 | systems/win32/miktex/tm/packages/miktex-zzip-bin-x64-2.9.tar.lzma
@@ -330,7 +379,6 @@
 2022/11/24 |       6332 | systems/win32/miktex/tm/packages/eolang.tar.lzma
 2022/11/24 |        630 | support/bib2gls/bib2gls.sh
 2022/11/24 |      62792 | systems/win32/miktex/tm/packages/luacas.tar.lzma
-2022/11/24 |       6254 | systems/win32/miktex/tm/packages/unimath-plain-xetex.tar.lzma
 2022/11/24 |      61070 | support/bib2gls/examples/sample-markuplanguages.pdf
 2022/11/24 |        604 | graphics/pstricks/contrib/pst-ode/examples/ode.tex
 2022/11/24 |      59076 | support/bib2gls/examples/sample-units2.pdf
@@ -358,9 +406,7 @@
 2022/11/24 |      44644 | support/bib2gls/examples/sample-units3.pdf
 2022/11/24 |       4446 | support/bib2gls/examples/people.bib
 2022/11/24 |     441613 | systems/win32/miktex/tm/packages/ufrgscca__doc.tar.lzma
-2022/11/24 |      42838 | systems/win32/miktex/tm/packages/unimath-plain-xetex__doc.tar.lzma
 2022/11/24 |     411738 | systems/win32/miktex/tm/packages/pagecolor__doc.tar.lzma
-2022/11/24 |       4084 | systems/win32/miktex/tm/packages/unimath-plain-xetex__source.tar.lzma
 2022/11/24 |       4078 | support/bib2gls/src/bib2gls-cite.bib
 2022/11/24 |      40752 | support/bib2gls/convertgls2bib.jar
 2022/11/24 |       4053 | support/bib2gls/examples/usergroups.bib
@@ -489,32 +535,24 @@
 2022/11/24 |       1031 | support/bib2gls/examples/baseunits.bib
 2022/11/24 |   10118762 | systems/win32/miktex/tm/packages/pstricks-add__doc.tar.lzma
 2022/11/24 |      10114 | systems/win32/miktex/tm/packages/luakeys.tar.lzma
-2022/11/23 |     881135 | macros/xetex/latex/xduts/xdulogo.pdf
 2022/11/23 |      76424 | systems/texlive/tlnet/archive/cweb.doc.r65081.tar.xz
-2022/11/23 |     711387 | macros/xetex/latex/xduts/xduts.pdf
 2022/11/23 |        689 | macros/luatex/latex/luaquotes/README
-2022/11/23 |       6264 | systems/texlive/tlnet/archive/unimath-plain-xetex.r65085.tar.xz
 2022/11/23 |      57184 | systems/texlive/tlnet/archive/lua-widow-control.source.r65084.tar.xz
 2022/11/23 |     460080 | systems/texlive/tlnet/archive/lwarp.source.r65083.tar.xz
-2022/11/23 |      45772 | systems/texlive/tlnet/archive/unimath-plain-xetex.doc.r65085.tar.xz
 2022/11/23 |     411028 | systems/texlive/tlnet/archive/pagecolor.doc.r65086.tar.xz
 2022/11/23 |      35177 | macros/luatex/latex/luaquotes/luaquotes-documentation.tex
 2022/11/23 |    3169212 | systems/texlive/tlnet/archive/lwarp.doc.r65083.tar.xz
 2022/11/23 |       2936 | systems/texlive/tlnet/archive/pagecolor.r65086.tar.xz
 2022/11/23 |       2877 | macros/latex209/contrib/picinpar/picinpar-en.tex
-2022/11/23 |       2861 | macros/xetex/latex/xduts/README.md
 2022/11/23 |      24352 | systems/texlive/tlnet/archive/cweb.r65081.tar.xz
-2022/11/23 |     238127 | macros/xetex/latex/xduts/xduts.dtx
 2022/11/23 |     214587 | macros/latex209/contrib/picinpar/picinpar-en.pdf
 2022/11/23 |     212828 | systems/texlive/tlnet/archive/lwarp.r65083.tar.xz
 2022/11/23 |    2084888 | systems/texlive/tlnet/archive/kpfonts-otf.doc.r65082.tar.xz
 2022/11/23 |      19916 | systems/texlive/tlnet/archive/lua-widow-control.r65084.tar.xz
 2022/11/23 |     175871 | macros/latex209/contrib/picinpar/picinpar-de.pdf
 2022/11/23 |      16615 | macros/latex209/contrib/picinpar/picinpar.sty
-2022/11/23 |    1617193 | macros/xetex/latex/xduts.zip
 2022/11/23 |     117004 | macros/luatex/latex/luaquotes.zip
 2022/11/23 |    1118500 | systems/texlive/tlnet/archive/lua-widow-control.doc.r65084.tar.xz
-2022/11/23 |       1111 | macros/xetex/latex/xduts/xduts.ins
 2022/11/23 |     111052 | macros/luatex/latex/luaquotes/luaquotes-documentation.pdf
 2022/11/23 |      11104 | systems/texlive/tlnet/archive/pagecolor.source.r65086.tar.xz
 2022/11/23 |      10917 | macros/luatex/latex/luaquotes/luaquotes.sty
@@ -668,31 +706,3 @@
 2022/11/21 |       1200 | graphics/pstricks/contrib/pstricks-add/Changes
 2022/11/21 |       1179 | macros/luatex/generic/luakeys/luakeys-debug.tex
 2022/11/21 |     106121 | graphics/pstricks/contrib/pst-plot/tex/pst-plot.tex
-2022/11/20 |        968 | macros/latex/contrib/proflycee/doc/cap.csv
-2022/11/20 |      81832 | macros/latex/contrib/pagecolor/pagecolor-example.pdf
-2022/11/20 |     756363 | macros/latex/contrib/nicematrix/nicematrix.dtx
-2022/11/20 |     738301 | macros/latex/contrib/proflycee/doc/ProfLycee-doc.pdf
-2022/11/20 |        736 | macros/latex/contrib/proflycee/doc/perroquet.csv
-2022/11/20 |        529 | macros/latex/contrib/proflycee/doc/testscript.py
-2022/11/20 |     510884 | macros/latex/contrib/nicematrix/nicematrix-french.pdf
-2022/11/20 |       4991 | macros/latex/contrib/pagecolor/README
-2022/11/20 |     498460 | systems/texlive/tlnet/archive/latexmk.doc.r65054.tar.xz
-2022/11/20 |     429803 | install/macros/latex/contrib/pagecolor.tds.zip
-2022/11/20 |     421301 | macros/latex/contrib/pagecolor.zip
-2022/11/20 |      41799 | macros/latex/contrib/pagecolor/pagecolor.dtx
-2022/11/20 |     343818 | macros/latex/contrib/docshots.zip
-2022/11/20 |     340651 | macros/latex/contrib/docshots/docshots.pdf
-2022/11/20 |     339411 | macros/latex/contrib/pagecolor/pagecolor.pdf
-2022/11/20 |         32 | macros/latex/contrib/proflycee/doc/basique.csv
-2022/11/20 |       2634 | macros/latex/contrib/docshots/docshots.ins
-2022/11/20 |      21566 | macros/latex/contrib/docshots/docshots.dtx
-2022/11/20 |     203476 | macros/latex/contrib/proflycee/doc/ProfLycee-doc.tex
-2022/11/20 |    1993403 | macros/latex/contrib/nicematrix.zip
-2022/11/20 |     189259 | support/TeX4ht/source/tex4ht-fonts-stix.tex
-2022/11/20 |       1453 | macros/latex/contrib/docshots/README.md
-2022/11/20 |    1324741 | macros/latex/contrib/nicematrix/nicematrix.pdf
-2022/11/20 |        129 | macros/latex/contrib/docshots/DEPENDS.txt
-2022/11/20 |    1271317 | graphics/pstricks/contrib/pst-plot/doc/pst-plot-doc.pdf
-2022/11/20 |     118344 | macros/latex/contrib/proflycee/tex/ProfLycee.sty
-2022/11/20 |       1083 | macros/latex/contrib/docshots/LICENSE.txt
-2022/11/20 |     106356 | systems/texlive/tlnet/archive/latexmk.r65054.tar.xz
diff --git a/biblio/ctan-bibdata/ctan.bib b/biblio/ctan-bibdata/ctan.bib
index 2173a28473..d910b22050 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 27-11-2022, 02:01:37
+%% created at 28-11-2022, 02:00:59
 %% 
 
 %% This file is provided under the terms of the LPPL v1.3 or
@@ -34581,7 +34581,7 @@
   title      = {The \texttt{jlreq} package},
   subtitle   = {Japanese document class based on requirements for Japanese text layout},
   author     = {Noriyuki Abe},
-  date       = {2022-07-31},
+  date       = {2022-11-27},
   version    = {},
   license    = {bsd2},
   mirror     = {https://mirror.ctan.org/macros/jptex/latex/jlreq},
@@ -40177,8 +40177,8 @@
   title      = {The \texttt{lt3rawobjects} package},
   subtitle   = {Objects and proxies in \LaTeX{}3},
   author     = {Paolo De Donato},
-  date       = {2022-11-26},
-  version    = {2.1},
+  date       = {2022-11-27},
+  version    = {2.1.1},
   license    = {gpl3+},
   mirror     = {https://mirror.ctan.org/macros/latex/contrib/lt3rawobjects},
   url        = {https://ctan.org/pkg/lt3rawobjects},
@@ -49728,19 +49728,11 @@
   title      = {The \texttt{pagecolor} package},
   subtitle   = {Interrogate page colour},
   author     = {Hans-Martin Münch},
-  date       = {2022-11-20},
-  version    = {1.1a},
+  date       = {2022-11-27},
+  version    = {1.2a},
   license    = {lppl1.3c},
   mirror     = {https://mirror.ctan.org/macros/latex/contrib/pagecolor},
   url        = {https://ctan.org/pkg/pagecolor},
-  annotation = {This package provides the command , which
-      gives the current page (background) colour, i. e. the argument
-      used with the most recent call of . The
-      command  gives the same colour as
-      , except when the page background colour is
-      “none” (e.g., as a result of using the  command).
-      In that case  is “white” and
-       is “none”.},
 }
 
 @manual{ctan-pagecont,
@@ -53654,8 +53646,8 @@
   title      = {The \texttt{ProfCollege} package},
   subtitle   = {A \LaTeX{} package for French maths teachers in college},
   author     = {Christophe Poulain},
-  date       = {2022-11-02},
-  version    = {0.99-z-b},
+  date       = {2022-11-27},
+  version    = {0.99-z-c},
   license    = {lppl1.3c},
   mirror     = {https://mirror.ctan.org/macros/latex/contrib/profcollege},
   url        = {https://ctan.org/pkg/profcollege},
@@ -75084,8 +75076,8 @@
   title      = {The \texttt{xduts} package},
   subtitle   = {Xidian University \TeX{} Suite},
   author     = {{Unknown}},
-  date       = {2022-11-23},
-  version    = {2.14.1.3},
+  date       = {2022-11-27},
+  version    = {2.16.1.3},
   license    = {lppl1.3c},
   mirror     = {https://mirror.ctan.org/macros/xetex/latex/xduts},
   url        = {https://ctan.org/pkg/xduts},
diff --git a/biblio/ctan-bibdata/ctan.pdf b/biblio/ctan-bibdata/ctan.pdf
index 77b6bb1674..0961310e2c 100644
--- a/biblio/ctan-bibdata/ctan.pdf
+++ b/biblio/ctan-bibdata/ctan.pdf
diff --git a/macros/jptex/latex/jlreq/README-ja.md b/macros/jptex/latex/jlreq/README-ja.md
index 78766ca570..a34b2b1a96 100644
--- a/macros/jptex/latex/jlreq/README-ja.md
+++ b/macros/jptex/latex/jlreq/README-ja.md
@@ -164,6 +164,7 @@ pLaTeX / upLaTeX / LuaLaTeX上で動きます．以下のパッケージを内�
 * `sidenote_keyword_font=<フォント設定コード>`：`sidenote_symbol=symbol`の時に，注のついている単語のフォント指定．デフォルトは無し（強調しない）
 * `endnote_second_indent=<寸法>`: 後柱の二行目以降の字下げ量を指定します．一行目からの相対字下げ量です．
 * `endnote_position=[headings/paragraph/{_<見出し名1>,_<見出し名2>,...}]`：後注の出力場所を指定します．`headings`は各見出しの直前（デフォルト），`paragraph`は改段落の際に出力します．また，`endnote_position={_chapter,_section}`とすると，`\chapter`と`\section`の直前に出力します．`<_見出し名>`を指定するためには，対象の見出しが本クラスファイルの機能を使って作られていなければいけません．
+* `warichu_opening=<コード>`, `warichu_closing=<コード>`：それぞれ，割注の前と後ろに挿入されます．デフォルトは`（`と`）`です．
 
 ### キャプション
 図表のキャプションを`\jlreqsetup`で変更できます．全ての設定で，各環境ごとの設定をすることができます．例えば`caption_font=\normalsize,table=\Large`とすると，table環境内では`\Large`が適用され，そのほかの環境内では`\normalsize`が適用されます．他の設定も同様です．
@@ -185,14 +186,6 @@ pLaTeX / upLaTeX / LuaLaTeX上で動きます．以下のパッケージを内�
 * `itemization_beforeafter_space=<寸法>`：箇条書きの前後の空きを指定します．`itemization_beforeafter_space={i=<寸法>}`とするとトップレベルのみに設定を行います．`itemization_beforeafter_space={0pt,i=10pt,ii=5pt}`とすれば，レベル1の箇条書きに10ptを，レベル2のそれに5ptを，それ以外には0ptを設定します．レベルは上記のように小文字ローマ数字で指定します．
 * `itemization_itemsep=<寸法>`：項目同士の空きを指定します．
 
-### 定理環境
-`\jlreqsetup`で指定します．
-* `theorem_beforeafter_space=<寸法>`：定理環境の前後の空きを指定します．
-* `theorem_label_font=<フォント設定コード>`：定理環境のラベル部分のフォントを設定します．
-* `theorem_font=<フォント設定コード>`：定理環境本体のフォントを設定します．
-
-`amsthm`パッケージが読み込まれると，新しい定理スタイル`jlreq`が定義され，現在のスタイルが`jlreq`へと変更されます．このとき，上記設定はこの`jlreq`スタイルへの設定として機能します．
-
 ### 前付きなど
 `\frontmatter` / `\mainmatter` / `\backmatter` / `\appendix`での処理を`\jlreqsetup`で指定できます．
 * `frontmatter_pagebreak=[cleardoublepage/clearpage/]`：`\frontmatter`実行時の改ページを実行する命令名を指定します．空にすると何もしません．
@@ -380,6 +373,38 @@ JFMの名前は次の通りです．`[]`で囲まれている文字は設定に�
 ## その他
 * クラスオプション`jlreq_notes`が渡されると，日本語組版処理の記述と矛盾する設定が行われた場合に通知がされます．
 
+## jlreq-complements
+`jlreq-complements`パッケージはLaTeXのドキュメントクラスで標準的に提供される環境などをカスタマイズ可能なものに変更するパッケージです．以下のように使います．次のオプションを受け付けます．
+* `platex`, `uplatex`, `lulalatex`：エンジンの指定です．
+* `setupname=<名前>`：カスタマイズするための命令名を指定します．デフォルトでは`jlreqcomplementssetup`で，`jlreqcomplementssetup{<設定項目>}`とプリアンブルに書くことで設定できます．
+
+`jlreq`内では`\usepackage[<jlreq内で認識しているエンジン>,setupname=jlreqsetup]{jlreq-complements}`相当で読み込みがされていますので，今までの`\jlreqsetup`で環境のカスタマイズをすることができます．なお，このように既存の名前を指定してうまく行くためにはもともとの命令と整合的である必要があります．通常は避けた方がよいでしょう．
+
+### `thebibliography`環境
+* `thebibliography_heading=<コード>`：`thebibliography`環境の見出しを出力する命令を指定します．
+* `thebibliography_after_label_space=<寸法>`：`thebibliography`環境における各項目のラベル以降の空きを指定します．
+* `thebibliography_indent=<寸法>`：`thebibliography`環境全体の字下げ量を指定します．
+* `thebibliography_mark=<コード>`：`thebibliography`環境の見出しを柱に登録するためのコードを指定します．
+* `thebibliography_precode=<コード>`，`thebibliography_postcode=<コード>`：それぞれ，`thebibliography`環境の前後に実行されるコードを指定します．
+
+### `theindex`環境
+* `theindex_heading=<コード>`：`theindex`環境の見出しを出力する命令を指定します．
+* `theindex_mark=<コード>`：`theindex`環境の見出しを柱に登録するためのコードを指定します．
+* `theindex_twocolumn=[true/false]`：`theindex`環境を二段組みで出力するかを指定します．
+* `theindex_column_gap=<寸法>`：`theindex_twocolumn=true`の時の`theindex`環境内での段間を指定します．
+* `theindex_column_rule_width=<寸法>`：`theindex_twocolumn=true`の時の`theindex`環境内での`\columnseprule`の値を指定します．
+* `theindex_pagestyle=<ページスタイル名>`：`theindex`環境でのページスタイルを指定します．
+* `theindex_postcode=<コード>`，`theindex_precode=<コード>`：それぞれ，`theindex`環境の前後に実行されるコードを指定します．
+
+### 定理環境
+* `theorem_beforeafter_space=<寸法>`：定理環境の前後の空きを指定します．
+* `theorem_label_font=<フォント設定コード>`：定理環境のラベル部分のフォントを設定します．
+* `theorem_font=<フォント設定コード>`：定理環境本体のフォントを設定します．
+* `theorem_indent=<寸法>`：定理環境本体の字下げ量を指定します．
+* `proof_label_font=<フォント設定コード>`：`amsthm`パッケージが読み込まれたときのみ有効な設定です．
+
+`amsthm`パッケージが読み込まれると，新しい定理スタイル`jlreq`が定義され，現在のスタイルが`jlreq`へと変更されます．このとき，上記設定はこの`jlreq`スタイルへの設定として機能します．
+
 ## ライセンス
 このパッケージは二条項BSDライセンスの元で配布されています．詳しくは[LICENSE](LICENSE)をご覧ください．
 
@@ -540,6 +565,11 @@ JFMの名前は次の通りです．`[]`で囲まれている文字は設定に�
     - バグ修正．
 * 2022-07-13
     - 右側の柱が正しく配置されないバグ修正．
+* 2022-11-28
+    - `\SetBlockHeadingSpaces`時に柱への登録が行われなかったバグを修正．
+    - ISO C4の用紙サイズが間違っていたのを修正．
+    - `jlreq-complements`を追加．
+    - その他バグ修正やその他のパッケージとの調整など．
 
 --------------
 Noriyuki Abe
diff --git a/macros/jptex/latex/jlreq/README.md b/macros/jptex/latex/jlreq/README.md
index 9d9506678b..27ad1eee81 100644
--- a/macros/jptex/latex/jlreq/README.md
+++ b/macros/jptex/latex/jlreq/README.md
@@ -175,6 +175,11 @@ This package is distributed under the BSD 2-Clause License. See [LICENSE](LICENS
     - Fixed a bug.
 * 2022-07-13
     - Fixed a bug: The position of running heads were not correct.
+* 2022-11-28
+    - Fixed a bug: did not register to running head when `\SetBlockHeadingSpaces` is used.
+    - Fixed a bug: wrong papersize for ISO C4.
+    - Added a package `jlreq-complements`
+    - Fixed some other bugs and adjust with some other packages.
 
 --------------
 Noriyuki Abe
diff --git a/macros/jptex/latex/jlreq/jfm-jlreq.lua b/macros/jptex/latex/jlreq/jfm-jlreq.lua
index 6172b1b463..e2a2e0a68d 100644
--- a/macros/jptex/latex/jlreq/jfm-jlreq.lua
+++ b/macros/jptex/latex/jlreq/jfm-jlreq.lua
@@ -695,6 +695,14 @@ local jfm = {
 		]]
 		},
 	},
+
+	[161] = { -- 半角カナ
+      chars = {'ｦ', 'ｧ', 'ｨ', 'ｩ', 'ｪ', 'ｫ', 'ｬ', 'ｭ', 'ｮ', 'ｯ', 'ｰ', 'ｱ', 'ｲ', 'ｳ', 'ｴ', 'ｵ', 'ｶ', 'ｷ', 'ｸ', 'ｹ', 'ｺ', 'ｻ', 'ｼ', 'ｽ', 'ｾ', 'ｿ', 'ﾀ', 'ﾁ', 'ﾂ', 'ﾃ', 'ﾄ', 'ﾅ', 'ﾆ', 'ﾇ', 'ﾈ', 'ﾉ', 'ﾊ', 'ﾋ', 'ﾌ', 'ﾍ', 'ﾎ', 'ﾏ', 'ﾐ', 'ﾑ', 'ﾒ', 'ﾓ', 'ﾔ', 'ﾕ', 'ﾖ', 'ﾗ', 'ﾘ', 'ﾙ', 'ﾚ', 'ﾛ', 'ﾜ', 'ﾝ'},
+		width = 0.5, height = 0.88, depth = 0.12,
+		align = 'left',
+		glue = {} -- あとで
+	},
+
 	
 	--[[
 	[17] = { -- 等号類
@@ -750,6 +758,30 @@ local jfm = {
 		]]
 		},
 	},
+	[191] = { -- 1/2数字，よくわからないので漢字等と同じ扱いにする
+		left = 0,
+		chars = {"AJ1-247","AJ1-248","AJ1-249","AJ1-250","AJ1-251","AJ1-252","AJ1-253","AJ1-254","AJ1-255","AJ1-256"},
+		align = 'left',
+		width = 0.5,height = 0.88,depth = 0.12,
+		glue = { -- あとで処理
+		},
+	},
+	[192] = { -- 1/3数字，同様
+		left = 0,
+		chars = {"AJ1-9758","AJ1-9759","AJ1-9760","AJ1-9761","AJ1-9762","AJ1-9763","AJ1-9764","AJ1-9765","AJ1-9766","AJ1-9767"},
+		align = 'left',
+		width = 1/3,height = 0.88,depth = 0.12,
+		glue = { -- あとで処理
+		},
+	},
+	[193] = { -- 1/4数字，同様
+		left = 0,
+		chars = {"AJ1-9738","AJ1-9739","AJ1-9740","AJ1-9741","AJ1-9742","AJ1-9743","AJ1-9744","AJ1-9745","AJ1-9746","AJ1-9747"},
+		align = 'left',
+		width = 1/4,height = 0.88,depth = 0.12,
+		glue = { -- あとで処理
+		},
+	},
 
 	
 	--[[
@@ -1191,5 +1223,21 @@ if jlreq ~= nil then
 	end
 end
 
+local function copy_jfm(from,to)
+	if jfm[from].glue ~= nil then jfm[to].glue = table.fastcopy(jfm[from].glue) end
+	for tc,_ in pairs(jfm) do
+		if type(tc) == "number" then
+			if jfm[tc].glue[from] ~= nil then
+				jfm[tc].glue[to] = table.fastcopy(jfm[tc].glue[from])
+			end
+		end
+	end
+end
+
+copy_jfm(0,191)
+copy_jfm(0,192)
+copy_jfm(0,193)
+copy_jfm(16,161)
+
 
 luatexja.jfont.define_jfm(jfm)
diff --git a/macros/jptex/latex/jlreq/jlreq-complements.sty b/macros/jptex/latex/jlreq/jlreq-complements.sty
index 2e20114fe6..144bc21b57 100644
--- a/macros/jptex/latex/jlreq/jlreq-complements.sty
+++ b/macros/jptex/latex/jlreq/jlreq-complements.sty
@@ -1,6 +1,6 @@
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{jlreq-complements}[2022/07/13 jlreq-complements]
-\RequirePackage{jlreq-helpers}[2021/08/12]
+\ProvidesPackage{jlreq-complements}[2022/11/28 jlreq-complements]
+\RequirePackage{jlreq-helpers}[2022/11/28]
 \RequirePackage{l3keys2e}
 
 \ExplSyntaxOn
@@ -40,7 +40,7 @@
     \int_compare_p:n { (\ltjgetparameter{direction}-(\ltjgetparameter{direction}/8)*8) == 3 } 
   }
 }{
-  \prg_new_conditional:Nnn \__jlreq_complements_iftdir: { T, F, TF} { \legacy_if_p:n { tdir } }
+  \prg_new_conditional:Nnn \__jlreq_complements_iftdir: { T, F, TF} { \iftdir \prg_return_true: \else \prg_return_false: \fi }
 }
 
 \@ifundefined{jlreq@zw}{
@@ -129,7 +129,7 @@
 \bool_new:N \g__jlreq_complements_theindex_restorepagestyle_bool
 \keys_define:Vn \g__jlreq_complements_setupname_str {
   theindex_yoko .bool_gset:N = \g__jlreq_complements_theindex_yoko_bool,
-  theindex_twocolumn .bool_gset:N = \g__jlreq_complements_theindex_twcolumn_bool,
+  theindex_twocolumn .bool_gset:N = \g__jlreq_complements_theindex_twocolumn_bool,
 }
 
 \keys_set:Vn \g__jlreq_complements_setupname_str {
@@ -146,14 +146,15 @@
   { \keys_set:Vn \g__jlreq_complements_setupname_str { theindex_yoko = false } }
   { \keys_set:Vn \g__jlreq_complements_setupname_str { theindex_yoko = true } }
 
-
 \bool_new:N \l__jlreq_complements_resttate_bool
+\bool_new:N \l__jlreq_complements_theindex_maincolumn_bool
 \renewenvironment{theindex}{%
   \prop_item:Nn \g__jlreq_complements_theindex_prop { precode }
   \bool_set_false:N \l__jlreq_complements_resttate_bool
   \bool_if:NT \g__jlreq_complements_theindex_yoko_bool {
     \__jlreq_complements_iftdir:T { \clearpage \yoko \bool_set_true:N \l__jlreq_complements_resttate_bool }
   }
+  \bool_set:Nn \l__jlreq_complements_theindex_maincolumn_bool { \legacy_if_p:n { @twocolumn } }
   \bool_if:NTF \g__jlreq_complements_theindex_twocolumn_bool {
     \setlength{\columnseprule}{ \prop_item:Nn \g__jlreq_complements_theindex_prop { column_rule_width } }
     \setlength{\columnsep} { \prop_item:Nn \g__jlreq_complements_theindex_prop { column_gap } }
@@ -168,14 +169,15 @@
   }
   \prop_item:Nn \g__jlreq_complements_theindex_prop { mark }
   \tl_set:Nx \l__jlreq_tmpa_tl { \exp_not:N \pagestyle { \prop_item:Nn \g__jlreq_complements_theindex_prop { pagestyle } } }
+  \l__jlreq_tmpa_tl
   \parindent\z@
   \parskip\z@ \@plus .03\jlreq@zh\relax
   \let\item\@idxitem
 }{%
   \bool_if:NTF \g__jlreq_complements_theindex_twocolumn_bool {
-    \legacy_if:nF { @twocolumn } { \onecolumn }
+    \bool_if:NF \l__jlreq_complements_theindex_maincolumn_bool { \onecolumn }
   }{
-    \legacy_if:nT { @twocolumn } { \twocolumn }
+    \bool_if:NT \l__jlreq_complements_theindex_maincolumn_bool { \twocolumn }
   }
   \clearpage
   \bool_if:NT \l__jlreq_complements_resttate_bool { \tate }
diff --git a/macros/jptex/latex/jlreq/jlreq-helpers.sty b/macros/jptex/latex/jlreq/jlreq-helpers.sty
index ea475e87dd..ab61fe0709 100644
--- a/macros/jptex/latex/jlreq/jlreq-helpers.sty
+++ b/macros/jptex/latex/jlreq/jlreq-helpers.sty
@@ -1,7 +1,7 @@
 % エンジン非依存のマクロ集
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{jlreq-helpers}[2021/08/12 jlreq-helpers]
+\ProvidesPackage{jlreq-helpers}[2022/11/28 jlreq-helpers]
 
 \ExplSyntaxOn
 %. helper1
@@ -441,7 +441,7 @@
 
 \@namedef{jlreq@helper@papersizelist@c2paper}{{458mm}{648mm}}
 \@namedef{jlreq@helper@papersizelist@c3paper}{{324mm}{458mm}}
-\@namedef{jlreq@helper@papersizelist@c4paper}{{229mm}{354mm}}
+\@namedef{jlreq@helper@papersizelist@c4paper}{{229mm}{324mm}}
 \@namedef{jlreq@helper@papersizelist@c5paper}{{162mm}{229mm}}
 \@namedef{jlreq@helper@papersizelist@c6paper}{{114mm}{162mm}}
 \@namedef{jlreq@helper@papersizelist@c7paper}{{81mm}{114mm}}
diff --git a/macros/jptex/latex/jlreq/jlreq-ja.pdf b/macros/jptex/latex/jlreq/jlreq-ja.pdf
index 2fa852d4e9..a34ef0753d 100644
--- a/macros/jptex/latex/jlreq/jlreq-ja.pdf
+++ b/macros/jptex/latex/jlreq/jlreq-ja.pdf
diff --git a/macros/jptex/latex/jlreq/jlreq-trimmarks-ja.md b/macros/jptex/latex/jlreq/jlreq-trimmarks-ja.md
index aace5bbeb3..2e86b26b30 100644
--- a/macros/jptex/latex/jlreq/jlreq-trimmarks-ja.md
+++ b/macros/jptex/latex/jlreq/jlreq-trimmarks-ja.md
@@ -137,6 +137,24 @@ dviドライバの指定です．エンジンに`lualatex`を利用する場合�
     - `black` -> `\color{black}`
     - `[cmyk]0.5,0.5,0.5,0` -> `\color[cmyk]{0.5,0.5,0.5,0}`
 
+### `trimmarks_pattern`
+トンボの形．直接の描画コードを指定します．次のように`centers`に指定すると，上下左右の真ん中のトンボの形が変わります．指定するのは上の真ん中のトンボの描画コードであり，そのほかの場所にはそれを回転したものが描画されます．なお，指定前に`graphicx`パッケージを読み込んでおく必要があります．また`\jlreqtrimmarkswidth`には
+```latex
+\jlreqtrimmarkssetup{
+  trimmarks_pattern = {
+    centers = {
+      \raisebox{3mm}{
+        \vrule width10mm height\jlreqtrimmarkswidth depth 0pt
+        \vrule height10mm width\jlreqtrimmarkswidth depth 3mm
+        \vrule width10mm height\jlreqtrimmarkswidth depth 0pt
+      }
+    }
+  }
+}
+```
+上下左右の形を個別に指定することもできます．例えば上の真ん中のみ変更するには`top-center=<描画コード>`を指定します．同様に`bottom-center`，`left-center`，`right-center`が指定できます．個別指定には`graphicx`パッケージは不要です．
+
+
 ## ライセンス
 このパッケージは二条項BSDライセンスの元で配布されています．詳しくは[LICENSE](LICENSE)をご覧ください．
 
@@ -167,6 +185,8 @@ dviドライバの指定です．エンジンに`lualatex`を利用する場合�
     - `etoolbox`に依存しないようにした．
 * 2022-07-13
     - 読み込み時にエラーが出るバグ修正．
+* 2022-11-28
+    - `trimmarks_pattern`を`\jlreqtrimmarkssetup`に追加．
 
 --------------
 Noriyuki Abe
diff --git a/macros/jptex/latex/jlreq/jlreq-trimmarks.md b/macros/jptex/latex/jlreq/jlreq-trimmarks.md
index 3f4e72e4d3..a196aef39e 100644
--- a/macros/jptex/latex/jlreq/jlreq-trimmarks.md
+++ b/macros/jptex/latex/jlreq/jlreq-trimmarks.md
@@ -131,6 +131,24 @@ Set the color of the trim marks. You have to load a package which defines `\colo
 * `black` -> `\color{black}`
 * `[cmyk]0.5,0.5,0.5,0` -> `\color[cmyk]{0.5,0.5,0.5,0}`
 
+### `trimmarks_pattern`
+Set the shape of the trim marks by the code. You can change the shapes of trim marks at the centers of top, bottom, left and right by the following code. Here, the specified code is the code for the top-center trim marks and rotated ones are put at the other places. Here, `graphicx` code should be loaded.
+```latex
+\jlreqtrimmarkssetup{
+  trimmarks_pattern = {
+    centers = {
+      \raisebox{3mm}{
+        \vrule width10mm height\jlreqtrimmarkswidth depth 0pt
+        \vrule height10mm width\jlreqtrimmarkswidth depth 3mm
+        \vrule width10mm height\jlreqtrimmarkswidth depth 0pt
+      }
+    }
+  }
+}
+```
+You can specify shapes for top, bottom, left and right independently. For example, you can change the shape at the top-center by `top-center=<code>`. Similarly one can use `bottom-center`，`left-center`，`right-center`. `graphix` package is not needed for these keys.
+
+
 ## LICENSE
 This package is distributed under the BSD 2-Clause License. See [LICENSE](LICENSE).
 
@@ -161,6 +179,8 @@ This package is distributed under the BSD 2-Clause License. See [LICENSE](LICENS
     - Removed dependence on `etoolbox` package.
 * 2022-07-13
     - Fixed a bug: an error occurred when loading.
+* 2022-11-28
+    - Added `trimmarks_pattern` to `\jlreqtrimmarkssetup`.
 
 --------------
 Noriyuki Abe
diff --git a/macros/jptex/latex/jlreq/jlreq-trimmarks.sty b/macros/jptex/latex/jlreq/jlreq-trimmarks.sty
index b21bdcc453..f2e72aeddc 100644
--- a/macros/jptex/latex/jlreq/jlreq-trimmarks.sty
+++ b/macros/jptex/latex/jlreq/jlreq-trimmarks.sty
@@ -1,7 +1,7 @@
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{jlreq-trimmarks}[2022/07/13 jlreq-trimmarks]
+\ProvidesPackage{jlreq-trimmarks}[2022/11/28 jlreq-trimmarks]
 \RequirePackage{l3keys2e}
-\RequirePackage{jlreq-helpers}
+\RequirePackage{jlreq-helpers}[2022/11/28]
 
 \ExplSyntaxOn
 % check \tombowdatetrue
@@ -184,9 +184,7 @@
         }[\PackageError{jlreq-trimmarks}{Unknown~value~`##1'~in~the~option~`show'}{\@ehc}]
       }
     }
-  }
-}
-\keys_define:nn { jlreq-trimmarks } {
+  },
   bleed_margin .code:n = {
     \begingroup
       \def\jlreq@do{}%
@@ -337,6 +335,33 @@
   \jlreq@do
 }
 
+\tl_new:N \g__jlreq_trimmarks_pattern_center_top_tl
+\tl_new:N \g__jlreq_trimmarks_pattern_center_bottom_tl
+\tl_new:N \g__jlreq_trimmarks_pattern_center_left_tl
+\tl_new:N \g__jlreq_trimmarks_pattern_center_right_tl
+\cs_set:Nn \__jlreq_check_rotatebox:n {
+  \@ifundefined{rotatebox}{
+    \PackageError{jlreq-trimmarks}{`\string\rotatebox'~is~needed~to~use~#1,~please~load~the~package~`graphicx'~or~its~variant}{\@ehc}
+  }{}
+}
+\keys_define:nn { jlreq-trimmarks-pattern } {
+  top-center .tl_gset:N = \g__jlreq_trimmarks_pattern_center_top_tl,
+  center-top .tl_gset:N = \g__jlreq_trimmarks_pattern_center_top_tl,
+  bottom-center .tl_gset:N = \g__jlreq_trimmarks_pattern_center_bottom_tl,
+  center-bottom .tl_gset:N = \g__jlreq_trimmarks_pattern_center_bottom_tl,
+  center-left .tl_gset:N = \g__jlreq_trimmarks_pattern_center_left_tl,
+  left-center .tl_gset:N = \g__jlreq_trimmarks_pattern_center_left_tl,
+  center-right .tl_gset:N = \g__jlreq_trimmarks_pattern_center_right_tl,
+  right-center .tl_gset:N = \g__jlreq_trimmarks_pattern_center_right_tl,
+  centers .code:n = {
+    \__jlreq_check_rotatebox:n { trimmarks_pattern/centers }
+    \tl_gset:Nn \g__jlreq_trimmarks_pattern_center_top_tl {#1}
+    \tl_gset:Nn \g__jlreq_trimmarks_pattern_center_left_tl { \rotatebox[origin=cb]{90}{#1} }
+    \tl_gset:Nn \g__jlreq_trimmarks_pattern_center_bottom_tl { \rotatebox[origin=cb]{180}{#1} }
+    \tl_gset:Nn \g__jlreq_trimmarks_pattern_center_right_tl { \rotatebox[origin=cb]{270}{#1} }
+  },
+}
+
 \keys_define:nn { jlreqtrimmarkssetup } {
   banner .code:n = {
     \clist_map_variable:nNn { odd,even } \@tempa {
@@ -437,11 +462,15 @@
         }%
       }%
     }%
-  }%
+  },
+  trimmarks_pattern .code:n = {
+    \keys_set:nn { jlreq-trimmarks-pattern } {#1}
+  }
 }
 \NewDocumentCommand { \jlreqtrimmarkssetup } { +m } {
   \keys_set:nn { jlreqtrimmarkssetup } {#1}
 }
+\def\jlreqtrimmarkswidth{\@tombowwidth}
 \@onlypreamble\jlreqtrimmarkssetup
 \@bannertoken{%
   \jobname\space(\number\year-\two@digits\month-\two@digits\day
@@ -450,7 +479,27 @@
 \jlreqtrimmarkssetup{
   banner={\the\@bannertoken},
   banner_font={\@bannerfont},
-  color={}
+  color={},
+  trimmarks_pattern = {
+    top-center = {
+      \vrule width10mm~height\@tombowwidth depth\z@
+      \vrule height10mm~width\@tombowwidth depth\z@
+      \vrule width10mm~height\@tombowwidth depth\z@
+    },
+    bottom-center = {
+      \vrule width10mm~depth\@tombowwidth height\z@
+      \vrule depth10mm~width\@tombowwidth height\z@
+      \vrule width10mm~depth\@tombowwidth height\z@
+    },
+    center-right = {
+      \vrule height 10mm depth10mm width\@tombowwidth
+      \vrule height.5\@tombowwidth depth.5\@tombowwidth width10mm
+    },
+    center-left = {
+      \vrule width10mm height.5\@tombowwidth depth.5\@tombowwidth
+      \vrule height10mm depth10mm width\@tombowwidth
+    }
+  }
 }
 
 \ifx\jlreq@trimmarks@engine\@undefined
@@ -559,7 +608,14 @@
         \hfill
         \setbox\jlreq@tempboxa=\hbox{% \@TC
           \yoko
-          \vrule width10mm height\@tombowwidth depth\z@
+          \setbox\jlreq@tempboxb=\hbox{
+            \g__jlreq_trimmarks_pattern_center_top_tl
+          }%
+          \jlreq@tempdima=\wd\jlreq@tempboxb\relax
+          \ht\jlreq@tempboxb=0pt \dp\jlreq@tempboxb=0pt \wd\jlreq@tempboxb=0pt
+          \kern -0.5\jlreq@tempdima\relax
+          \box\jlreq@tempboxb
+          \kern 0.5\jlreq@tempdima\relax
           \jlreq@trimmarks@outputbanner{before@top@center}{%
             \setbox\jlreq@tempboxa=\hbox to 0pt{\hss\jlreq@trimmarks@bannerfont##1\hskip 5mm}%
             \ht\jlreq@tempboxa=0pt \dp\jlreq@tempboxa=0pt \wd\jlreq@tempboxa=0pt
@@ -572,13 +628,11 @@
             \ht\jlreq@tempboxa=0pt \dp\jlreq@tempboxa=0pt \wd\jlreq@tempboxa=0pt
             \kern-\jlreq@tempdimb\raise-\jlreq@tempdima\box\jlreq@tempboxa\kern\jlreq@tempdimb
           }%
-          \vrule height10mm width\@tombowwidth depth\z@
           \jlreq@trimmarks@outputbanner{after@top@center}{%
             \setbox\jlreq@tempboxa=\hbox to 0pt{\hskip 5mm\jlreq@trimmarks@bannerfont##1\hss}%
             \ht\jlreq@tempboxa=0pt \dp\jlreq@tempboxa=0pt \wd\jlreq@tempboxa=0pt
             \raise 4pt\box\jlreq@tempboxa
           }%
-          \vrule width10mm height\@tombowwidth depth\z@
         }%
         \dp\jlreq@tempboxa=0pt
         \box\jlreq@tempboxa
@@ -664,7 +718,7 @@
       \hbox to\@@paperwidth{%
         \hbox to\z@{% \@CL
           \yoko\hss
-          \vrule width10mm height.5\@tombowwidth depth.5\@tombowwidth
+          \g__jlreq_trimmarks_pattern_center_left_tl
           \jlreq@trimmarks@outputbanner{before@center@left}{%
             \setbox\jlreq@tempboxa=\hbox to 0pt{\tate\hss\adjustbaseline\jlreq@trimmarks@bannerfont##1\hskip 5mm}%
             \ifx l\jlreq@trimmarks@engine
@@ -685,7 +739,6 @@
             \dp\jlreq@tempboxa=0pt \ht\jlreq@tempboxa=0pt \wd\jlreq@tempboxa=0pt
             \kern-\jlreq@tempdima\box\jlreq@tempboxa\kern\jlreq@tempdima
           }%
-          \vrule height10mm depth10mm width\@tombowwidth
           \jlreq@trimmarks@outputbanner{in@center@left}{%
             \setbox\jlreq@tempboxa=\hbox{\tate\adjustbaseline\jlreq@trimmarks@bannerfont##1}%
             \ifx l\jlreq@trimmarks@engine
@@ -714,7 +767,6 @@
             \dp\jlreq@tempboxa=0pt \ht\jlreq@tempboxa=0pt \wd\jlreq@tempboxa=0pt
             \kern-\jlreq@tempdima\raise\jlreq@tempdimb\box\jlreq@tempboxa\kern\jlreq@tempdima
           }%
-          \vrule height10mm depth10mm width\@tombowwidth
           \jlreq@trimmarks@outputbanner{before@center@right}{%
             \setbox\jlreq@tempboxa=\hbox to 0pt{\tate\hss\adjustbaseline\jlreq@trimmarks@bannerfont##1\hskip 5mm}%
             \jlreq@tempdima=\dimexpr 4pt \ifx l\jlreq@trimmarks@engine + \dp\jlreq@tempboxa\fi\relax
@@ -727,7 +779,8 @@
             \dp\jlreq@tempboxa=0pt \ht\jlreq@tempboxa=0pt \wd\jlreq@tempboxa=0pt
             \kern\jlreq@tempdima\box\jlreq@tempboxa\kern-\jlreq@tempdima
           }%
-          \vrule height.5\@tombowwidth depth.5\@tombowwidth width10mm\hss
+          \g__jlreq_trimmarks_pattern_center_right_tl
+          \hss
         }%
       }%
       \vfill
@@ -811,9 +864,17 @@
         \ht\jlreq@tempboxa=0pt
         \box\jlreq@tempboxa
         \hfill
+        \jlreq@tempafalse
         \setbox\jlreq@tempboxa=\hbox{% \@BC
           \yoko
-          \vrule width10mm depth\@tombowwidth height\z@
+          \setbox\jlreq@tempboxb=\hbox{
+            \g__jlreq_trimmarks_pattern_center_bottom_tl
+          }%
+          \jlreq@tempdimb=\wd\jlreq@tempboxb
+          \ht\jlreq@tempboxb=0pt \dp\jlreq@tempboxb=0pt \wd\jlreq@tempboxb=0pt
+          \kern-0.5\jlreq@tempdimb
+          \box\jlreq@tempboxb
+          \kern 0.5\jlreq@tempdimb
           \jlreq@trimmarks@outputbanner{before@bottom@center}{%
             \setbox\jlreq@tempboxa=\hbox to 0pt{\hss\jlreq@trimmarks@bannerfont##1\hskip 5mm}%
             \jlreq@tempdima=\dimexpr\ht\jlreq@tempboxa + 4pt\relax
@@ -827,14 +888,12 @@
             \ht\jlreq@tempboxa=0pt \dp\jlreq@tempboxa=0pt \wd\jlreq@tempboxa=0pt
             \kern-\jlreq@tempdimb\raise\jlreq@tempdima\box\jlreq@tempboxa\kern\jlreq@tempdimb
           }%
-          \vrule depth10mm width\@tombowwidth height\z@
           \jlreq@trimmarks@outputbanner{before@bottom@center}{%
             \setbox\jlreq@tempboxa=\hbox to 0pt{\hskip 5mm\jlreq@trimmarks@bannerfont##1\hss}%
             \jlreq@tempdima=\dimexpr\ht\jlreq@tempboxa + 4pt\relax
             \ht\jlreq@tempboxa=0pt \dp\jlreq@tempboxa=0pt
             \raise-\jlreq@tempdima\box\jlreq@tempboxa
           }%
-          \vrule width10mm depth\@tombowwidth height\z@
         }%
         \ht\jlreq@tempboxa=0pt
         \box\jlreq@tempboxa
diff --git a/macros/jptex/latex/jlreq/jlreq.cls b/macros/jptex/latex/jlreq/jlreq.cls
index 8615e3bf30..d6ce3e2eb0 100644
--- a/macros/jptex/latex/jlreq/jlreq.cls
+++ b/macros/jptex/latex/jlreq/jlreq.cls
@@ -5,10 +5,10 @@
 %%
 % (based on JLReq 20200811 https://www.w3.org/TR/2020/NOTE-jlreq-20200811/)
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{jlreq}[2022/07/13 jlreq]
+\ProvidesClass{jlreq}[2022/11/28 jlreq]
 \RequirePackage{l3keys2e}
 \RequirePackage{etoolbox}
-\RequirePackage{jlreq-helpers}[2021/08/12]
+\RequirePackage{jlreq-helpers}[2022/11/28]
 
 \ExplSyntaxOn
 \int_new:N \l__jlreq_tmpa_int
@@ -1669,19 +1669,19 @@
 
 %. 見出し関係 (4.1)
 % \clear***page
-\NewDocumentCommand{\cleartooddpage}{ O{} }{
+\newcommand{\jlreq@cleartooddpage}[1][]{
   \clearpage
   \ifodd\c@page\else
-    \jlreq@ifempty{#1}{}{\thispagestyle{#1}}%
+    \tl_if_empty:nF {#1} { \thispagestyle{#1} }%
     \hbox{}%
     \newpage
     \if@twocolumn\hbox{}\newpage\fi
   \fi
 }
-\NewDocumentCommand{\cleartoevenpage}{ O{} }{
+\newcommand{\jlreq@cleartoevenpage}[1][]{
   \clearpage
   \ifodd\c@page
-    \jlreq@ifempty{#1}{}{\thispagestyle{#1}}%
+    \tl_if_empty:nF {#1} { \thispagestyle{#1} }%
     \hbox{}%
     \newpage
     \if@twocolumn\hbox{}\newpage\fi
@@ -1826,7 +1826,7 @@
       }%
       \noexpand\def\exp_not:c {jlreq@headingcs@#1}{%
         % 改丁．これでよいのかな．
-        \unexpanded{\if@twocolumn\onecolumn\@restonecoltrue\else\@restonecolfalse\fi\cleartooddpage[empty]}%
+        \unexpanded{\if@twocolumn\onecolumn\@restonecoltrue\else\@restonecolfalse\fi\jlreq@cleartooddpage[empty]}%
         \ifx\jlreq@pagestyle\@empty\else\noexpand\thispagestyle{\exp_not:o {\jlreq@pagestyle}}\fi
         \noexpand\secdef{\exp_not:c {jlreq@TobiraHeading@start@#1}}{\exp_not:c {jlreq@TobiraHeading@start@s@#1}}}%
       \noexpand\def\exp_not:c {#1}{%
@@ -1886,20 +1886,27 @@
 
 % {1 = 命令}{2 = レベル}{3 = スペース関連}{4 = 全フォーマット}{5 = *}{6 = running head}{7 = 見出し}{8 = 副題}
 \long\def\jlreq@BlockHeading@start@@@@#1#2#3#4#5#6#7#8{%
+  \global\advance\jlreq@BlockHeading@spaces@current@count by 1
+  \tl_gput_right:Nn \jlreq@BlockHeading@spaces@current@sequence {_#1}%
   \edef\jlreq@tempa##1##2##3##4##5##6##7{%
     \unexpanded{\jlreq@BlockHeading@start@makeoutput{#1}{#2}}{{##1}{##2}{##3}}{\exp_not:o {\jlreq@BlockHeading@start@eachformat}}{\exp_not:o {\jlreq@BlockHeading@start@format}}\unexpanded{{#5}{#6}{#7}{#8}}%
     \unexpanded{\def\jlreq@tempb}{{##4}{##5}{##6}}% 縦方向空き
     \noexpand\jlreq@ifempty{##7}{\noexpand\jlreq@tempatrue}{\noexpand\jlreq@tempafalse}% 偶数ページのみで改ページするならば\jlreq@tempatrue
   }%
   \jlreq@tempa#3%
-  \global\advance\jlreq@BlockHeading@spaces@current@count by 1
-  \tl_gput_right:Nn \jlreq@BlockHeading@spaces@current@sequence {_#1}%
+  \expandafter\xdef\csname jlreq@BlockHeading@spaces@current@afteroutsidebox@\the\jlreq@BlockHeading@spaces@current@count\endcsname{%
+    \exp_not:o { \jlreq@resultc }
+  }%
   % 連続する見出しの間の処理をするために，即時では出力せず，いったんマクロに格納する．
+  % \jlreq@BlockHeading@spaces@current@beforeoutsideiffirst@<n>
   % \jlreq@BlockHeading@spaces@current@before@<n>
   % \jlreq@BlockHeading@start@gyodori\jlreq@BlockHeading@spaces@current@space@<n>{jlreq@BlockHeading@spaces@current@output@<n>}
   % ↑\jlreq@BlockHeading@spaces@current@format@<n>で整形される．
   % \jlreq@BlockHeading@spaces@current@after@<n>
+  % \jlreq@BlockHeading@spaces@current@afteroutsidebox@<n>
+  % \jlreq@BlockHeading@spaces@current@afteroutsideiflast@<n>
   % として後に呼び出される．（spaceは書き換えられる可能性がある．）
+  % outsideとついているものは全体が行取りされた場合はその外に出される．
   \expandafter\xdef\csname jlreq@BlockHeading@spaces@current@output@\the\jlreq@BlockHeading@spaces@current@count\endcsname{%
     \exp_not:o {\jlreq@resultb}%
   }%
@@ -1907,28 +1914,31 @@
     \exp_not:o {\jlreq@tempb}%
   }%
   \long\def\@tempa##1##2##3{##1}%
-  \expandafter\xdef\csname jlreq@BlockHeading@spaces@current@before@\the\jlreq@BlockHeading@spaces@current@count\endcsname{%
+  \expandafter\xdef\csname jlreq@BlockHeading@spaces@current@beforeoutsideiffirst@\the\jlreq@BlockHeading@spaces@current@count\endcsname{%
     \exp_not:o {\@tempa#4}%
-    \exp_not:o {\jlreq@resulta}%
     \ifjlreq@tempa\unexpanded{%
       \jlreq@setcurrentpage
       \edef\jlreq@BlockHeading@currentpage{\the\jlreq@currentpage}%
     }\fi
   }%
+  \expandafter\xdef\csname jlreq@BlockHeading@spaces@current@before@\the\jlreq@BlockHeading@spaces@current@count\endcsname{%
+    \exp_not:o {\jlreq@resulta}%
+  }%
   \long\def\@tempa##1##2##3{##2}%
   \expandafter\xdef\csname jlreq@BlockHeading@spaces@current@format@\the\jlreq@BlockHeading@spaces@current@count\endcsname{%
     \exp_not:o {\@tempa#4}%
   }%
   \long\def\@tempa##1##2##3{##3}%
-  \expandafter\xdef\csname jlreq@BlockHeading@spaces@current@after@\the\jlreq@BlockHeading@spaces@current@count\endcsname{%
-    \exp_not:o {\jlreq@resultc}%
+  \expandafter\gdef\csname jlreq@BlockHeading@spaces@current@after@\the\jlreq@BlockHeading@spaces@current@count\endcsname{%
+  }%
+  \expandafter\xdef\csname jlreq@BlockHeading@spaces@current@afteroutsideiflast@\the\jlreq@BlockHeading@spaces@current@count\endcsname{%
     \ifjlreq@tempa\unexpanded{%
       \ifx\jlreq@BlockHeading@currentpage\@empty\nobreak\else
         \ifodd\jlreq@BlockHeading@currentpage\nobreak\else\allowbreak\fi
       \fi
     }\else\noexpand\nobreak\fi
     \exp_not:o {\@tempa#4}%
-  }%
+  }
   \ifx\jlreq@BlockHeading@spaces@headingslist\@empty
     \expandafter\jlreq@BlockHeading@spaces@outputwospace
     \expandafter\ignorespaces
@@ -2362,8 +2372,8 @@
       pagebreak / clearpage            .code:n = {\def\jlreq@pagebreak{\clearpage}\jlreq@column@spanning@possibletrue},
       pagebreak / cleardoublepage      .code:n = {\def\jlreq@pagebreak{\cleardoublepage}\jlreq@column@spanning@possibletrue},
       pagebreak / clearcolumn          .code:n = {\if@twocolumn\def\jlreq@pagebreak{\newpage}\else\def\jlreq@pagebreak{}\fi\jlreq@column@spanning@possiblefalse},
-      pagebreak / begin_with_even_page .code:n = {\def\jlreq@pagebreak{\cleartoevenpage[empty]}\jlreq@column@spanning@possibletrue},
-      pagebreak / begin_with_odd_page  .code:n = {\def\jlreq@pagebreak{\cleartooddpage[empty]}\jlreq@column@spanning@possibletrue},
+      pagebreak / begin_with_even_page .code:n = {\def\jlreq@pagebreak{\jlreq@cleartoevenpage[empty]}\jlreq@column@spanning@possibletrue},
+      pagebreak / begin_with_odd_page  .code:n = {\def\jlreq@pagebreak{\jlreq@cleartooddpage[empty]}\jlreq@column@spanning@possibletrue},
       pagebreak / nariyuki             .code:n = {\def\jlreq@pagebreak{}\jlreq@column@spanning@possiblefalse},
       pagestyle .tl_set:N = \l__jlreq_pagestyle_tl,
       % 後々数字を受け付けるようになったりするかもしれないので……
@@ -2558,7 +2568,7 @@
 %     それ以外：空き量
 %       最初や最後に空き量指定がある場合は，全体への指定に組み込むことにする．
 %
-% 現在状況保存に以下のマクロを使う
+% 現在状況保存に以下のマクロを使う，nは1から始まる．
 % \jlreq@BlockHeading@spaces@current@sequence
 %   : 現在どのような見出しが続いているかリスト．
 % \jlreq@BlockHeading@spaces@current@space@<n>
@@ -2569,8 +2579,14 @@
 %   : 現在処理中のn番目の見出しのフォーマット．行取りマクロを包み込むようにする．
 % \jlreq@BlockHeading@spaces@current@before@<n>
 %   : n番目の見出しの前に出すもの
+% \jlreq@BlockHeading@spaces@current@beforeoutsideiffirst@<n>
+%   : n番目の見出しの前に出すもの．現在処理中の最初の見出しの時はボックスの前に出す．
 % \jlreq@BlockHeading@spaces@current@after@<n>
 %   : n番目の見出しの後ろに出すもの
+% \jlreq@BlockHeading@spaces@current@afteroutsideiflast@<n>
+%   : n番目の見出しの前に出すもの．現在処理中の最後の見出しの時はボックスのあとに出す．
+% \jlreq@BlockHeading@spaces@current@afteroutsidebox@<n>
+%   : n番目の見出しの後ろに出すが，ボックスの外に出すもの（\markなどが想定）
 % \jlreq@BlockHeading@spaces@current@count
 %   : 現在いくつの連続する見出しを処理しているかのカウンター
 \newcount\jlreq@BlockHeading@spaces@current@count
@@ -2739,7 +2755,10 @@
 \def\jlreq@BlockHeading@spaces@outputwospace@{%
   \ifnum\jlreq@tempcnta<\jlreq@BlockHeading@spaces@current@count
     \advance\jlreq@tempcnta by 1
-    \tl_put_right:Nx \jlreq@do {\exp_args:Nc \exp_not:o {jlreq@BlockHeading@spaces@current@before@\the\jlreq@tempcnta}}%
+    \tl_put_right:Nx \jlreq@do {
+      \exp_args:Nc \exp_not:o {jlreq@BlockHeading@spaces@current@beforeoutsideiffirst@\the\jlreq@tempcnta}
+      \exp_args:Nc \exp_not:o {jlreq@BlockHeading@spaces@current@before@\the\jlreq@tempcnta}
+    }%
     \edef\jlreq@tempa{%
       \unexpanded{\long\def\jlreq@tempa##1}{\exp_args:Nc \exp_not:o {jlreq@BlockHeading@spaces@current@format@\the\jlreq@tempcnta}}%
     }%
@@ -2751,7 +2770,12 @@
           {\exp_args:Nc \exp_not:o {jlreq@BlockHeading@spaces@current@output@\the\jlreq@tempcnta}}%
       }}%
     }%
-    \tl_put_right:Nx \jlreq@do {\jlreq@tempb\exp_args:Nc \exp_not:o {jlreq@BlockHeading@spaces@current@after@\the\jlreq@tempcnta}}%
+    \tl_put_right:Nx \jlreq@do {
+      \jlreq@tempb
+      \exp_args:Nc \exp_not:o {jlreq@BlockHeading@spaces@current@afteroutsidebox@\the\jlreq@tempcnta}%
+      \exp_args:Nc \exp_not:o {jlreq@BlockHeading@spaces@current@after@\the\jlreq@tempcnta}%
+      \exp_args:Nc \exp_not:o {jlreq@BlockHeading@spaces@current@afteroutsideiflast@\the\jlreq@tempcnta}%
+    }%
     \expandafter\jlreq@BlockHeading@spaces@outputwospace@
   \fi
 }
@@ -2759,45 +2783,61 @@
 \def\jlreq@BlockHeading@spaces@output@#1#2\jlreq@endmark{%
   \def\jlreq@result{}%
   \jlreq@tempcnta=0
-  \jlreq@BlockHeading@spaces@output@@#2\jlreq@endmark
   \jlreq@tempatrue % 周りの行取り処理が必要か
   \tl_if_empty:nT {#1} {\jlreq@tempafalse}%
   \tl_if_eq:nnT {#1} {{}{}{}} { \jlreq@tempafalse }
-  \edef\jlreq@do{%
-    \ifjlreq@tempa
-      \unexpanded{\jlreq@BlockHeading@start@gyodori#1}{%
-        \exp_not:o {\jlreq@result}%
-      }%
-    \else
-      \exp_not:o {\jlreq@result}%
-    \fi
-  }%
+  \legacy_if:nTF { jlreq@tempa } {
+    \jlreq@BlockHeading@spaces@output@@{*}#2\jlreq@endmark
+    \tl_set:Nx \l__jlreq_do_tl {
+      \exp_args:Nc \exp_not:o {jlreq@BlockHeading@spaces@current@beforeoutsideiffirst@1}
+      \exp_not:n { \jlreq@BlockHeading@start@gyodori#1 } {
+        \exp_not:o { \jlreq@result }
+      }
+    }
+    \int_step_inline:nnn { 1 } { \jlreq@BlockHeading@spaces@current@count } {
+      \tl_put_right:Nx \l__jlreq_do_tl {
+        \exp_args:Nc \exp_not:o {jlreq@BlockHeading@spaces@current@afteroutsidebox@##1}
+      }
+    }
+    \tl_put_right:Nx \l__jlreq_do_tl {
+      \exp_args:Nc \exp_not:o {jlreq@BlockHeading@spaces@current@afteroutsideiflast@\the\jlreq@BlockHeading@spaces@current@count}
+    }
+  }{
+    \jlreq@BlockHeading@spaces@output@@{}#2\jlreq@endmark
+    \tl_set:Nx \l__jlreq_do_tl { \exp_not:o { \jlreq@result } }
+  }
   \jlreq@BlockHeading@spaces@clear
-  \jlreq@do
+%  \message{[[output~headings]]}
+%  \message{\exp_not:o \l__jlreq_do_tl}
+  \l__jlreq_do_tl
 }
 % jlreq@resultに出力すべきものを入れていく
-\def\jlreq@BlockHeading@spaces@output@@#1{%
-  \jlreq@ifendmark{#1}{}{%
-    \str_if_eq:eeTF {\str_head:n {#1}} {_} {
+% #1: 全体の行取り処理をする場合は*
+\def\jlreq@BlockHeading@spaces@output@@#1#2{%
+  \jlreq@ifendmark{#2}{}{%
+    \str_if_eq:eeTF {\str_head:n {#2}} {_} {
       \advance\jlreq@tempcnta by 1
-      \expandafter\jlreq@BlockHeading@spaces@output@@@\expandafter{\@gobble #1}%
+      \tl_set:Nx \l__jlreq_tmpa_tl {
+        \exp_not:N \jlreq@BlockHeading@spaces@output@@@ {#1} { \exp_not:o { \@gobble #2 } }
+      }
+      \l__jlreq_tmpa_tl
     }{%
-      \tl_put_right:Nn \jlreq@result {\vskip\glueexpr #1\relax}%
+      \tl_put_right:Nn \jlreq@result {\vskip\glueexpr #2\relax}%
     }%
-    \jlreq@BlockHeading@spaces@output@@
+    \jlreq@BlockHeading@spaces@output@@{#1}
   }%
 }
-\def\jlreq@BlockHeading@spaces@output@@@#1{%
+\def\jlreq@BlockHeading@spaces@output@@@#1#2{%
   \edef\jlreq@do{%
-    \noexpand\jlreq@BlockHeading@spaces@output@@@@
-    \jlreq@iffirsttoken@ignorespaces{#1}{*}{{*}\exp_not:o {\@gobble #1}}{\unexpanded{{}#1}}%
+    \noexpand\jlreq@BlockHeading@spaces@output@@@@{#1}
+    \jlreq@iffirsttoken@ignorespaces{#2}{*}{{*}\exp_not:o {\@gobble #2}}{\unexpanded{{}#2}}%
       \exp_args:Nc \exp_not:o {jlreq@BlockHeading@spaces@current@space@\the\jlreq@tempcnta}%
       {\exp_args:Nc \exp_not:o {jlreq@BlockHeading@spaces@current@output@\the\jlreq@tempcnta}}%
   }%
   \jlreq@do
 }
-% #1: デフォルト値を使うならば*，#2#3#4が設定された値，#5#6#7がデフォルト値，#8は偶数ページの，#9が出力
-\def\jlreq@BlockHeading@spaces@output@@@@#1#2#3#4#5#6#7#8{%
+% #2: デフォルト値を使うならば*，#3#4#5が設定された値，#6#7#8がデフォルト値，#9は偶数ページの
+\def\jlreq@BlockHeading@spaces@output@@@@#1#2#3#4#5#6#7#8#9{%
   \edef\jlreq@tempa{%
     \unexpanded{\long\def\jlreq@tempa##1}{\exp_args:Nc \exp_not:o {jlreq@BlockHeading@spaces@current@format@\the\jlreq@tempcnta}}%
   }%
@@ -2805,17 +2845,26 @@
   \edef\jlreq@tempb{%
     \noexpand\exp_not:o {\noexpand\jlreq@tempa{%
       \noexpand\jlreq@BlockHeading@start@gyodori
-      \jlreq@ifempty{#1}{\unexpanded{{#2}{#3}{#4}}}{%
-        {\jlreq@ifempty{#2}{\unexpanded{#5}}{\unexpanded{#2}}}%
+      \jlreq@ifempty{#2}{\unexpanded{{#3}{#4}{#5}}}{%
         {\jlreq@ifempty{#3}{\unexpanded{#6}}{\unexpanded{#3}}}%
         {\jlreq@ifempty{#4}{\unexpanded{#7}}{\unexpanded{#4}}}%
-      }\unexpanded{{#8}}%
+        {\jlreq@ifempty{#5}{\unexpanded{#8}}{\unexpanded{#5}}}%
+      }\unexpanded{{#9}}%
     }}%
   }%
   \tl_put_right:Nx \jlreq@result {%
+    \bool_if:nT { \tl_if_empty_p:n {#1} || \int_compare_p:n { \jlreq@tempcnta > 0 } } {
+      \exp_args:Nc \exp_not:o {jlreq@BlockHeading@spaces@current@beforeoutsideiffirst@\the\jlreq@tempcnta}%
+    }
     \exp_args:Nc \exp_not:o {jlreq@BlockHeading@spaces@current@before@\the\jlreq@tempcnta}%
     \jlreq@tempb
+    \tl_if_empty:nT { #1 } {
+      \exp_args:Nc \exp_not:o {jlreq@BlockHeading@spaces@current@afteroutsidebox@\the\jlreq@tempcnta}%
+    }
     \exp_args:Nc \exp_not:o {jlreq@BlockHeading@spaces@current@after@\the\jlreq@tempcnta}%
+    \bool_if:nT { \tl_if_empty_p:n {#1} || \int_compare_p:n { \jlreq@tempcnta < \jlreq@BlockHeading@spaces@current@count } } {
+      \exp_args:Nc \exp_not:o {jlreq@BlockHeading@spaces@current@afteroutsideiflast@\the\jlreq@tempcnta}%
+    }
   }%
 }
 
@@ -2828,7 +2877,10 @@
       \expandafter\global\expandafter\let\csname jlreq@BlockHeading@spaces@current@space@\the\jlreq@tempcnta\endcsname=\@undefined
       \expandafter\global\expandafter\let\csname jlreq@BlockHeading@spaces@current@output@\the\jlreq@tempcnta\endcsname=\@undefined
       \expandafter\global\expandafter\let\csname jlreq@BlockHeading@spaces@current@before@\the\jlreq@tempcnta\endcsname=\@undefined
+      \expandafter\global\expandafter\let\csname jlreq@BlockHeading@spaces@current@beforeoutsideiffirst@\the\jlreq@tempcnta\endcsname=\@undefined
       \expandafter\global\expandafter\let\csname jlreq@BlockHeading@spaces@current@after@\the\jlreq@tempcnta\endcsname=\@undefined
+      \expandafter\global\expandafter\let\csname jlreq@BlockHeading@spaces@current@afteroutsideiflast@\the\jlreq@tempcnta\endcsname=\@undefined
+      \expandafter\global\expandafter\let\csname jlreq@BlockHeading@spaces@current@afteroutsidebox@\the\jlreq@tempcnta\endcsname=\@undefined
     }%
     \gdef\jlreq@BlockHeading@spaces@current@sequence{}%
     \global\jlreq@BlockHeading@spaces@current@count=0
@@ -5069,7 +5121,8 @@
   \vskip\abovecaptionskip
   \edef\jlreq@do{\unexpanded{\def\jlreq@tempa##1}{\jlreq@jlreqsetup@withenv@nameuse{jlreq@@makecaption@label@format@setting}{\jlreq@tempb}}}%
   \jlreq@do
-  \setbox\jlreq@tempboxa=\hbox{\jlreq@jlreqsetup@withenv@nameuse{jlreq@@makecaption@label@font@setting}{\jlreq@tempb}#1}%
+  % 最後の\relaxはhttps://github.com/abenori/jlreq/issues/112のため．
+  \setbox\jlreq@tempboxa=\hbox{\jlreq@jlreqsetup@withenv@nameuse{jlreq@@makecaption@label@font@setting}{\jlreq@tempb}#1\relax}%
   \ifdim\wd\jlreq@tempboxa=0pt
     \edef\jlreq@tempa{{\jlreq@jlreqsetup@withenv@nameuse{jlreq@@makecaption@font@setting}{\jlreq@tempb}\unexpanded{#2}}}%
   \else
@@ -6537,7 +6590,7 @@
     \ifx p\jlreq@engine platex\fi
     \ifx u\jlreq@engine uplatex\fi
     ,setupname=jlreqsetup
-  ]{jlreq-complements}[2022-07-13]
+  ]{jlreq-complements}[2022/11/28]
 }
 \l__jlreq_tmpa_tl
 \jlreqsetup{
diff --git a/macros/jptex/latex/jlreq/jlreq.pdf b/macros/jptex/latex/jlreq/jlreq.pdf
index 495dd58d85..7bc6b4dc1a 100644
--- a/macros/jptex/latex/jlreq/jlreq.pdf
+++ b/macros/jptex/latex/jlreq/jlreq.pdf
diff --git a/macros/jptex/latex/jlreq/luajfm2pl.lua b/macros/jptex/latex/jlreq/luajfm2pl.lua
index 5aceea506d..bccba0cb3d 100644
--- a/macros/jptex/latex/jlreq/luajfm2pl.lua
+++ b/macros/jptex/latex/jlreq/luajfm2pl.lua
@@ -1,6 +1,6 @@
 kpse.set_program_name("texlua","lualatex")
 
-no_jis_chars = {'｟','〘','〖','«','〝','｠','〙','〗','»','〟','‼','⁇','⁈','⁉','〳','〴','〵','〻','ゕ','ゖ','ㇰ','ㇱ','ㇲ','ㇳ','ㇴ','ㇵ','ㇶ','ㇷ','ㇸ','ㇹ','ㇺ','ㇻ','ㇼ','ㇽ','ㇾ','ㇿ','ㇷ゚','€','№','㏋','ℓ','㌃','㌍','㌔','㌘','㌢','㌣','㌦','㌧','㌫','㌶','㌻','㍉','㍊','㍍','㍑','㍗','㎎','㎏','㎜','㎝','㎞','㎡','㏄','ゔ','か゚','き゚','く゚','け゚','こ゚','ヷ','ヸ','ヹ','ヺ','カ゚','キ゚','ク゚','ケ゚','コ゚','セ゚','ツ゚','ト゚','゠','–'}
+no_jis_chars = {'｟','〘','〖','«','〝','｠','〙','〗','»','〟','‼','⁇','⁈','⁉','〳','〴','〵','〻','ゕ','ゖ','ㇰ','ㇱ','ㇲ','ㇳ','ㇴ','ㇵ','ㇶ','ㇷ','ㇸ','ㇹ','ㇺ','ㇻ','ㇼ','ㇽ','ㇾ','ㇿ','ㇷ゚','€','№','㏋','ℓ','㌃','㌍','㌔','㌘','㌢','㌣','㌦','㌧','㌫','㌶','㌻','㍉','㍊','㍍','㍑','㍗','㎎','㎏','㎜','㎝','㎞','㎡','㏄','ゔ','か゚','き゚','く゚','け゚','こ゚','ヷ','ヸ','ヹ','ヺ','カ゚','キ゚','ク゚','ケ゚','コ゚','セ゚','ツ゚','ト゚','゠','–','ｦ', 'ｧ', 'ｨ', 'ｩ', 'ｪ', 'ｫ', 'ｬ', 'ｭ', 'ｮ', 'ｯ', 'ｰ', 'ｱ', 'ｲ', 'ｳ', 'ｴ', 'ｵ', 'ｶ', 'ｷ', 'ｸ', 'ｹ', 'ｺ', 'ｻ', 'ｼ', 'ｽ', 'ｾ', 'ｿ', 'ﾀ', 'ﾁ', 'ﾂ', 'ﾃ', 'ﾄ', 'ﾅ', 'ﾆ', 'ﾇ', 'ﾈ', 'ﾉ', 'ﾊ', 'ﾋ', 'ﾌ', 'ﾍ', 'ﾎ', 'ﾏ', 'ﾐ', 'ﾑ', 'ﾒ', 'ﾓ', 'ﾔ', 'ﾕ', 'ﾖ', 'ﾗ', 'ﾘ', 'ﾙ', 'ﾚ', 'ﾛ', 'ﾜ', 'ﾝ'}
 
 if arg[1] == nil then
 	print('Usage: texlua luajfm2pl.lua [--noutf] <JFM for LuaTeX-ja> [<PL file name>]')
diff --git a/macros/latex/contrib/lt3rawobjects/lt3rawobjects.dtx b/macros/latex/contrib/lt3rawobjects/lt3rawobjects.dtx
index 8fd31317c8..a151fc48ee 100644
--- a/macros/latex/contrib/lt3rawobjects/lt3rawobjects.dtx
+++ b/macros/latex/contrib/lt3rawobjects/lt3rawobjects.dtx
@@ -22,11 +22,11 @@
 %
 % \iffalse
 %<*driver>
-\ProvidesFile{lt3rawobjects.dtx}[2022/11/26 2.1 Objects and proxies in LaTeX3]
+\ProvidesFile{lt3rawobjects.dtx}[2022/11/27 2.1.1 Objects and proxies in LaTeX3]
 %</driver>
 %<package>\NeedsTeXFormat{LaTeX2e}
 %<package>\RequirePackage{expl3}[2022-04-10]
-%<package>\ProvidesExplPackage{lt3rawobjects}{2022/11/26}{ 2.1 }{Objects and proxies in LaTeX3}
+%<package>\ProvidesExplPackage{lt3rawobjects}{2022/11/27}{ 2.1.1 }{Objects and proxies in LaTeX3}
 %<*driver>
 \documentclass[full]{l3doc}
 \usepackage{lt3rawobjects}
@@ -38,8 +38,8 @@
 % \fi
 %
 % \NewDocumentCommand{\thpkg}{}{\pkg{lt3rawobjects}}
-% \NewDocumentCommand{\thvsn}{}{2.1}
-% \NewDocumentCommand{\thdta}{}{2022/11/26}
+% \NewDocumentCommand{\thvsn}{}{2.1.1}
+% \NewDocumentCommand{\thdta}{}{2022/11/27}
 % \NewDocumentCommand{\fromV}{ m }{{\ttfamily From: #1}}
 %
 % \title{The \pkg{lt3rawobjects} package}
@@ -942,7 +942,7 @@
 
 \cs_new_protected:Nn \object_member_set:nnn
   {
-    \object_member_set_eq:nnvn { #1 }{ #2 }
+    \object_member_set:nnvn { #1 }{ #2 }
       {
         \object_rcmember_adr:nnn { #1 }
           { #2 _ type }{ str }
diff --git a/macros/latex/contrib/lt3rawobjects/lt3rawobjects.pdf b/macros/latex/contrib/lt3rawobjects/lt3rawobjects.pdf
index ff46b3c3ca..68851dde03 100644
--- a/macros/latex/contrib/lt3rawobjects/lt3rawobjects.pdf
+++ b/macros/latex/contrib/lt3rawobjects/lt3rawobjects.pdf
diff --git a/macros/latex/contrib/pagecolor/README b/macros/latex/contrib/pagecolor/README
index 0bae5caeb6..be71d8d8c8 100644
--- a/macros/latex/contrib/pagecolor/README
+++ b/macros/latex/contrib/pagecolor/README
@@ -1,4 +1,4 @@
-README for pagecolor package, 2022-11-20, v1.1a
+README for pagecolor package, 2022-11-27, v1.2a
 
 
 TABLE OF CONTENTS
@@ -27,6 +27,9 @@ When \nopagecolor is unknown or broken (crop package),
 this package provides a replacement.
 Similar to \newgeometry and \restoregeometry of the geometry package
 \newpagecolor{...} and \restorepagecolor are provided.
+For use with the crop package \backgroundpagecolor{...}
+as well as \newbackgroundpagecolor{...} and
+\restorebackgroundpagecolor are provided.
 
 This material is published under the LPPL 1.3c: This work may be
 distributed and/or modified under the conditions of the LaTeX Project
@@ -36,13 +39,13 @@ https://www.latex-project.org/lppl/lppl-1-3c.txt
 and the latest version of this license is in
 https://www.latex-project.org/lppl.txt
 and version 1.3c or later is part of all distributions of LaTeX version
-2008-05-04 or later.
+2005-12-01 or later.
 
 
 2 DOWNLOAD
 ==========
 
-`pagecolor' is available on CTAN:
+"pagecolor" is available on CTAN:
 https://www.ctan.org/pkg/pagecolor
 
 Also a ZIP file is provided that contains the files:
@@ -60,7 +63,7 @@ https://mirrors.ctan.org/install/macros/latex/contrib/pagecolor.tds.zip
 
 Installation with ZIP file in TDS format
 ----------------------------------------
-The ZIP file `pagecolor.tds.zip' contains the files
+The ZIP file "pagecolor.tds.zip" contains the files
 sorted in a TDS tree. Thus you can directly unpack the
 ZIP file inside a TDS tree.
 See https://www.ctan.org/TDS-guidelines for an explanation
@@ -79,9 +82,9 @@ a) Download the pagecolor files from CTAN.
    If necessary, unpack them.
 b) Generate the package and driver files:
      tex pagecolor.dtx
-c) Install the file `pagecolor.sty' in your TDS tree:
+c) Install the file "pagecolor.sty" in your TDS tree:
      cp pagecolor.sty TDS:tex/latex/pagecolor/
-   Replace `TDS:' by the prefix of your TDS tree
+   Replace "TDS:" by the prefix of your TDS tree
    (texmf directory).
 d) Create the documentation, if necessary, e.g.
      pdflatex pagecolor.dtx
@@ -105,8 +108,8 @@ g) Copy the documentation files to
 =====================
 
 pagecolor loads other packages:
-kvoptions and 
-xcolor, if the color package has not been loaded before pagecolor 
+- kvoptions and 
+- xcolor, if the color package has not been loaded before pagecolor 
 which again load other packages
 (see the result of the \listfiles command in the log-file
  of the example).
@@ -115,7 +118,7 @@ which again load other packages
 5 PACKAGE COMPATIBILITY
 =======================
 
-pagecolor should be loaded quite early, i. e. before
+pagecolor should be loaded quite early, i.e. before
 \pagecolor{...} is used by some other package
 (but can be loaded later using the pagecolor={...} option
 with accordingly chosen value), but must be loaded after
@@ -138,8 +141,8 @@ A bug report should contain:
   warning messages.
 * \errorcontextlines=\maxdimen can be added in the
   TeX code to get more information in TeX error messages.
-* Minimal test file that shows the problem, but does not
-  contain any unnecessary packages and code.
+* Minimal test file that shows the problem,
+  but does not contain any unnecessary packages and code.
 * Used drivers/programs.
 * Version information about used packages and programs.
 * If you are using LaTeX, then add "\listfiles" to the document.
diff --git a/macros/latex/contrib/pagecolor/pagecolor-example.pdf b/macros/latex/contrib/pagecolor/pagecolor-example.pdf
index ae63e8048c..2f542a3184 100644
--- a/macros/latex/contrib/pagecolor/pagecolor-example.pdf
+++ b/macros/latex/contrib/pagecolor/pagecolor-example.pdf
diff --git a/macros/latex/contrib/pagecolor/pagecolor.dtx b/macros/latex/contrib/pagecolor/pagecolor.dtx
index c23d9c4b86..3c57dacf55 100644
--- a/macros/latex/contrib/pagecolor/pagecolor.dtx
+++ b/macros/latex/contrib/pagecolor/pagecolor.dtx
@@ -1,7 +1,8 @@
 % \iffalse meta-comment
 %
 % File: pagecolor.dtx
-% Version: 2022-11-20 v1.1a
+% Version: 2022-11-27 v1.2a
+% Info: Provides thepagecolor
 %
 % Copyright (C) 2011 - 2022 by
 %    H.-Martin Muench <Martin dot Muench at Uni-Bonn dot de>
@@ -10,9 +11,9 @@
 % conditions of the LaTeX Project Public License, either
 % version 1.3c of this license or (at your option) any later
 % version. This version of this license is in
-%    http://www.latex-project.org/lppl/lppl-1-3c.txt
+%    https://www.latex-project.org/lppl/lppl-1-3c.txt
 % and the latest version of this license is in
-%    http://www.latex-project.org/lppl.txt
+%    https://www.latex-project.org/lppl.txt
 % and version 1.3c or later is part of all distributions of
 % LaTeX version 2005-12-01 or later.
 %
@@ -26,7 +27,7 @@
 %    pagecolor.ins, pagecolor.drv,
 %    pagecolor-example.tex, pagecolor-example.pdf.
 %
-% 'pagecolor' is available on CTAN:
+% "pagecolor" is available on CTAN:
 % https://www.ctan.org/pkg/pagecolor
 %
 % Also a TDS.ZIP file is provided that contains all the files
@@ -48,7 +49,7 @@
 \input docstrip.tex
 \Msg{******************************************************************}
 \Msg{* Installation                                                   *}
-\Msg{* Package: pagecolor 2022-11-20 v1.1a Provides thepagecolor (HMM)*}
+\Msg{* Package: pagecolor 2022-11-27 v1.2a Provides thepagecolor (HMM)*}
 \Msg{******************************************************************}
 
 \keepsilent
@@ -60,16 +61,11 @@
 This is a generated file.
 
 Project: pagecolor
-Version: 2022-11-20 v1.1a
+Version: 2022-11-27 v1.2a
 
 Copyright (C) 2011 - 2022 by
     H.-Martin Muench <Martin dot Muench at Uni-Bonn dot de>
 
-The usual disclaimer applies:
-If it does not work right that is your problem.
-(Nevertheless, send an e-mail to the maintainer
- when you find an error in this package.)
-
 This work may be distributed and/or modified under the
 conditions of the LaTeX Project Public License, either
 version 1.3c of this license or (at your option) any later
@@ -150,7 +146,7 @@ In memoriam
 %<*driver>
 \NeedsTeXFormat{LaTeX2e}[2021-11-15]
 \ProvidesFile{pagecolor.drv}%
-  [2022-11-20 v1.1a Provides thepagecolor (HMM)]
+  [2022-11-27 v1.2a Provides thepagecolor (HMM)]
 \documentclass{ltxdoc}[2020/12/05]% v2.1b
 \usepackage{xcolor}[2021/10/31]% v2.13
 \usepackage{holtxdoc}[2019/12/09]% v0.30
@@ -178,7 +174,6 @@ In memoriam
 \end{document}
 %</driver>
 %    \end{macrocode}
-%
 % \fi
 %
 % \GetFileInfo{pagecolor.drv}
@@ -200,14 +195,14 @@ In memoriam
 %
 % \DoNotIndex{\,,\@bsphack,\@esphack,\\}
 % \DoNotIndex{\documentclass,\usepackage,\begin,\end,\pagenumbering,\bigskip,\smallskip}
-% \DoNotIndex{\space,\newline,\noindent,\pagebreak,\section,\textbf,\textsf,\color,\gdef}
+% \DoNotIndex{\space,\newline,\noindent,\linebreak,\pagebreak,\section,\textbf,\textsf,\textit}
 % \DoNotIndex{\GenerateLogMacros,\holtxdoc,\Oberdiek,\hyperref,\kvoptions,\options,\OCG}
-% \DoNotIndex{\lipsum,\ifdefined,\IfPackageAtLeastTF,\IfPackageLoadedTF,\ifx,\listfiles}
-% \DoNotIndex{\M\"{u}nch,\Alternatives,\transparent,\newcommand,\verb}
-% \DoNotIndex{\pagecolor@info@noline,\pagecolor@warning,\pagecolor@warning@noline}
+% \DoNotIndex{\color,\gdef,\lipsum,\ifdefined,\IfPackageAtLeastTF,\IfPackageLoadedTF,\ifx}
+% \DoNotIndex{\M\"{u}nch,\Alternatives,\transparent,\newcommand,\verb,\listfiles}
+% \DoNotIndex{\pagecolor@info,\pagecolor@info@noline,\pagecolor@warning,\pagecolor@warning@noline}
 %
 % \title{The \xpackage{pagecolor} package}
-% \date{2022-11-20 v1.1a}
+% \date{2022-11-27 v1.2a}
 % \author{H.-Martin Münch\\\xemail{Martin.Muench at Uni-Bonn.de}}
 %
 % \maketitle
@@ -224,7 +219,10 @@ In memoriam
 % broken, this package provides a replacement.\\
 % Similar to |\newgeometry| and |\restoregeometry| of the \xpackage{geometry}
 % package |\newpagecolor{<|\textit{some color}|>}| and |\restorepagecolor|
-% are provided.
+% are provided.\\
+% For use with the \xpackage{crop} package |\backgroundpagecolor{<|\textit{some color}|>}|
+% as well as |\newbackgroundpagecolor{<|\textit{some color}|>}| and \newline
+% |\restorebackgroundpagecolor| are provided.
 % \end{abstract}
 %
 % \bigskip
@@ -242,7 +240,7 @@ In memoriam
 % \section{Introduction}
 % \indent This \LaTeX{} package provides the command |\thepagecolor|,
 % which gives the current page (background) color,
-% \hbox{i.\,e. the} argument used with the most recent call of |\pagecolor{...}|. 
+% \hbox{i.\,e. the} argument used with the most recent call of |\pagecolor{...}|.
 % (\verb|\pagecolor| needs to be defined before by the \xpackage{xcolor} or
 % \xpackage{color} package.) The \xpackage{pagecolor} package should be loaded
 % before any package sets a page (background) color, but obviously after
@@ -255,11 +253,14 @@ In memoriam
 % |\nopagecolor| command). In that case |\thepagecolor| is |white| and
 % |\thepagecolornone| is |none|.
 % When |\nopagecolor| is unknown or in case of the \xpackage{crop} package
-% broken, this package provides a replacement depending on option |nopagecolor|. 
-% Similar to |\newgeometry| and |\restoregeometry| of the \xpackage{geometry}
-% package\linebreak
-% |\newpagecolor{<|\textit{some color}|>}| and |\restorepagecolor|
-% are provided.
+% broken, this package provides a replacement depending on option |nopagecolor|.
+% Commands to change the background/outer/physical page color when using
+% \xpackage{crop} are provided. Similar to |\newgeometry| and |\restoregeometry|
+% of the \xpackage{geometry} package |\newpagecolor{<|\textit{some color}|>}|
+% and |\restorepagecolor| are provided.\\
+% For use with the \xpackage{crop} package |\backgroundpagecolor{<|\textit{some color}|>}|
+% as well as |\newbackgroundpagecolor{<|\textit{some color}|>}| and
+% |\restorebackgroundpagecolor| are provided.
 %
 % \section{Usage}
 %
@@ -283,13 +284,18 @@ In memoriam
 %  just one page and do not want to (or cannot) manually determine where that page ends,\\
 % |\newpagecolor{<|\textit{some color}|>}\afterpage{\restorepagecolor}|\\
 % does the trick (and requires a |\usepackage{afterpage}| in the document's
-% preamble), or for short\\
-% |\newcommand{\onepagecolor}[1]{%|\\
-% |  \newpagecolor{#1}\afterpage{\restorepagecolor}}|\\
-% in the preamble and\\
-% |\onepagecolor{<|\textit{some color}|>}| in the document.
+% preamble), or for short
 %
-% \pagebreak
+% \newpage
+%
+% \noindent|\newcommand{\onepagecolor}[1]{%|\\
+% |  \newpagecolor{#1}\afterpage{\restorepagecolor}}|\\
+% in the preamble and |\onepagecolor{<|\textit{some color}|>}| in the document.\\
+% When the \xpackage{crop} package is used, |\backgroundpagecolor{<|\textit{some color}|>}|
+% can be used to change the background/outer/physical page color and\\
+% |\newbackgroundpagecolor{<|\textit{some color}|>}%|\\
+% |\afterpage{\restorebackgroundpagecolor}%|\\
+% for changing just one background/outer/physical page color.
 %
 % \subsection{Options}
 % \DescribeMacro{options}
@@ -368,8 +374,10 @@ In memoriam
  % The xcolor package would not be needed for just using the base colors.
  % The color package would be sufficient for that.
 
+ % \usepackage[cam,center,a3]{crop}[2017/11/19]% 1.10 
+
 \usepackage[pagecolor={LightGoldenrod1},%
-  nopagecolor={none}]{pagecolor}[2022-11-20]% v1.1a
+  nopagecolor={none}]{pagecolor}[2022-11-27]% v1.2a
 
 \usepackage{afterpage}[2014/10/28]% v1.08
  % The afterpage package is generally not needed,
@@ -386,7 +394,7 @@ In memoriam
 \section*{Example for pagecolor}
 
 This example demonstrates the use of package\newline
-\textsf{pagecolor}, v1.1a as of 2022-11-20 (HMM).\newline
+\textsf{pagecolor}, v1.2a as of 2022-11-27 (HMM).\newline
 The used options were\newline
 \verb|pagecolor={LightGoldenrod1}|\newline
 (\verb|pagecolor={none}| would be the default), and\newline
@@ -459,14 +467,26 @@ here (i.\,e. green).}
 The page color was changed back at the end of the page -- 
 in mid-sentence!
 
+\pagebreak
+
+\backgroundpagecolor{pink}
+
+When activating the loading of the crop package in the preamble of this
+document, \verb|\backgroundpagecolor{<|\textit{some color}\verb|>}|
+changes the color of the background/outer/physical page.
+
+
+Analogous to \verb|\newpagecolor{...}| and \verb|\restorepagecolor|,
+for the background/outer/physical page
+\verb|\newbackgroundpagecolor{<|\textit{some color}\verb|>}| and\linebreak
+\verb|\restorebackgroundpagecolor| are provided (but not demonstrated
+here).
 \end{document}
 %</example>
 %    \end{macrocode}
 %
 % \StopEventually{}
 %
-% \newpage
-%
 % \section{The implementation}
 %
 % We start off by checking that we are loading into \LaTeXe{} and
@@ -478,7 +498,7 @@ in mid-sentence!
 %
 %    \begin{macrocode}
 \NeedsTeXFormat{LaTeX2e}[2021-11-15]
-\ProvidesPackage{pagecolor}[2022-11-20 1.1a
+\ProvidesPackage{pagecolor}[2022-11-27 1.2a
             Provides thepagecolor (HMM)]
 %    \end{macrocode}
 %
@@ -486,7 +506,8 @@ in mid-sentence!
 %
 %    \begin{macrocode}
 %% Provides the \thepagecolor, \thepagecolornone, \newpagecolor{...},
-%% and \restorepagecolor commands and a replacement for the
+%% \restorepagecolor, \backgroundpagecolor, \newbackgroundpagecolor{...},
+%% and \restorebackgroundpagecolor commands and a replacement for the
 %% \nopagecolor command, if this is not available.
 %    \end{macrocode}
 %
@@ -549,9 +570,6 @@ in mid-sentence!
   \def\pagecolortmpb{none}
   \edef\pagecolortmpa{\pagecolor@nopagecolor}
   \ifx\pagecolortmpa\pagecolortmpb
-%    \end{macrocode}
-% \pagebreak
-%    \begin{macrocode}
     \pagecolor@warning@noline{%
       Option nopagecolor=none requested but \string\nopagecolor\ %
       unknown: \\%
@@ -592,8 +610,7 @@ in mid-sentence!
 %    \end{macrocode}
 %
 % before we redefine it to include a definition of |\thepagecolor|
-% and\linebreak
-% |\thepagecolornone|:
+% and \linebreak |\thepagecolornone|:
 %
 %    \begin{macrocode}
 \renewcommand{\pagecolor}[1]{\@bsphack%
@@ -638,46 +655,26 @@ in mid-sentence!
 \gdef\pagecolor@cl{0}
 \IfPackageLoadedTF{crop}{% crop loaded
   \gdef\pagecolor@cl{1}
-  \IfPackageAtLeastTF{crop}{2017/11/20}{
-     % later than 2017/11/19 v1.10 might be OK
-     \pagecolor@warning@noline{%
-       \string\nopagecolor\ did not work with package \\%
-       crop 2017/11/19 v1.10. A newer version is used, %
-       which the pagecolor package does not know how to handle. %
-       Please contact the maintainer of the pagecolor package!%
-       }%
-     % Let us just hope everything got fixed:
-     \renewcommand{\nopagecolor}{%
-       \xdef\thepagecolor{white}%
-       \xdef\thepagecolornone{none}%
-       \orignopagecolor%
-       % That will not have any effect except when things got fixed!
-       }%
-    }{% else: older package version
-      \pagecolor@warning@noline{%
-        \string\nopagecolor\ does not work with %
-        the used crop package. Using \\%
-        \pagecolor@nopagecolor\ \\%
-        as nopagecolor now.%
-        }
-      \def\pagecolortmpb{none}
-      \edef\pagecolortmpa{\pagecolor@nopagecolor}
-      \ifx\pagecolortmpa\pagecolortmpb\relax
-        \pagecolor@warning@noline{%
-          Option nopagecolor=none requested %
-          but this does not work with the crop package. %
-          By option nopagecolor the "color" to be used with %
-          \string\nopagecolor\ %
-          is set. The current value is "none" (maybe by default), %
-          but the crop package broke \string\nopagecolor . %
-          Therefore the color cannot be "none". %
-          Please change the option accordingly! %
-          As first aid nopagecolor is now set to white.%
-         }
-        \setkeys{pagecolor}{nopagecolor=white}
-      \fi
-      \renewcommand{\nopagecolor}{\pagecolor{\pagecolor@nopagecolor}}
+  \pagecolor@info{\string\nopagecolor\space did not work with the crop package %
+    2017/11/19 v1.10. Using \\%
+    \pagecolor@nopagecolor\ \\%
+    as nopagecolor now.%
+    }
+  \def\pagecolortmpb{none}
+  \edef\pagecolortmpa{\pagecolor@nopagecolor}
+  \ifx\pagecolortmpa\pagecolortmpb\relax
+    \pagecolor@warning@noline{%
+      Option nopagecolor=none requested but this does not work with the %
+      crop package. By option nopagecolor the "color" to be used with %
+      \string\nopagecolor\ is set. The current value is "none" (maybe by %
+      default), but the crop package broke \string\nopagecolor . %
+      Therefore the color cannot be "none". %
+      Please change the option accordingly! %
+      As first aid nopagecolor is now set to white.%
      }
+    \setkeys{pagecolor}{nopagecolor=white}
+  \fi
+  \renewcommand{\nopagecolor}{\pagecolor{\pagecolor@nopagecolor}}
  }{% crop not loaded
    \ifdefined\nopagecolor\relax
      \gdef\pagecolortmpa{none}
@@ -747,13 +744,85 @@ in mid-sentence!
 
 %    \end{macrocode}
 % is just a precaution for |\restorecolor| being used when no |\newpagecolor{...}|
-% was used before it.\\
+% was used before it.
 %
 % When you want to change the color for just one page and do not want to
 % (or cannot) manually determine where the page ends,\\
 % |\newpagecolor{<|\textit{some color}|>}\afterpage{\restorepagecolor}|\\
 % does the trick (and requires an additional |\usepackage{afterpage}| in the
-% document's preamble).\\
+% document's preamble).
+%
+%    \begin{macro}{\backgroundpagecolor}
+% When the \xpackage{crop} package has been loaded, the background/outer/physical page color
+% is determined by the last |\pagecolor{...}| in the preamble after \newline
+% |\usepackage[...]{crop}| and cannot be changed in the document. When the |\pagecolor{...}|
+% is given before |\usepackage[...]{crop}|, a |\nopagecolor| works at the
+% background/outer/physical page and not at the inner/foreground/logic page.
+% |\nopagecolor| is fixed above. To change the background/outer/physical page color
+% during the document, |\backgroundpagecolor{<|\textit{some color}|>}| is provided:
+%
+%    \begin{macrocode}
+\newcommand{\backgroundpagecolor}[1]{%
+  \IfPackageLoadedTF{crop}{%
+%    \end{macrocode}
+% Remember current inner/foreground/logic page color:
+%    \begin{macrocode}
+    \xdef\pagecolortmpd{\thepagecolor}%
+%    \end{macrocode}
+% Set inner/foreground page color to color whished for background/\allowbreak outer/\allowbreak
+% physical page color:
+%    \begin{macrocode}
+    \pagecolor{#1}%
+%    \end{macrocode}
+% Get that color, for example, |\pagecolor{blue}| might result in |\CROP@pagecolor|
+% to be |0 0 1 rg 0 0 1 RG|:
+%    \begin{macrocode}
+    \xdef\pagecolortmpe{\CROP@pagecolor}%
+%    \end{macrocode}
+% Set the inner/foreground/logic page color back to the color before changing it:
+%    \begin{macrocode}
+    \pagecolor{\pagecolortmpd}%
+%    \end{macrocode}
+% Set the background/outer/physical page color:
+%    \begin{macrocode}
+    \xdef\CROP@stockcolor{\pagecolortmpe}%
+    }{\pagecolor@info{\string\backgroundpagecolor\ does not do %
+           anything when the crop package has not been loaded.}%
+%    \end{macrocode}
+% - except giving this information.
+%    \begin{macrocode}
+    }%
+  }
+
+%    \end{macrocode}
+%    \end{macro}
+%
+%    \begin{macro}{\newbackgroundpagecolor}
+% Analogous to |\newpagecolor| and |\restorepagecolor|,
+% for the background/\allowbreak outer/\allowbreak physical page we define:
+%
+%    \begin{macrocode}
+\newcommand{\newbackgroundpagecolor}[1]{%
+  \IfPackageLoadedTF{crop}{%
+    \xdef\pagecolortmpf{\CROP@stockcolor}%
+    \backgroundpagecolor{#1}%
+    }{\pagecolor@info{\string\newbackgroundpagecolor\ does not do %
+              anything when the crop package has not been loaded.}%
+     }%
+  }
+
+%    \end{macrocode}
+%    \end{macro}
+%    \begin{macro}{\newbackgroundpagecolor}
+%    \begin{macrocode}
+\newcommand{\restorebackgroundpagecolor}{%
+  \IfPackageLoadedTF{crop}{\xdef\CROP@stockcolor{\pagecolortmpf}}{%
+    \pagecolor@info{\string\newbackgroundpagecolor\ does not do %
+             anything when the crop package has not been loaded.}}%
+  }
+
+%    \end{macrocode}
+%    \end{macro}
 %
 % We checked whether the \xpackage{crop} package had been loaded before
 % the \xpackage{pagecolor} package, but maybe it has been loaded afterwards.
@@ -766,48 +835,26 @@ in mid-sentence!
     % crop not loaded before pagecolor, but maybe afterwards:
     \IfPackageLoadedTF{crop}{% crop indeed loaded afterwards.
       \gdef\pagecolor@cl{1}%
-%    \end{macrocode}
-% \pagebreak
-%    \begin{macrocode}
-      \IfPackageAtLeastTF{crop}{2017/11/20}{%
-        % later than 2017/11/19 v1.10 might be OK
-        \pagecolor@warning{%
-          \string\nopagecolor\ did not work with package \\%
-          crop 2017/11/19 v1.10. A newer version is used, %
-          which the pagecolor package does not know how to handle. %
-          Please contact the maintainer of the pagecolor package!%
-          }%
-        % Let us just hope everything got fixed:
-        \renewcommand{\nopagecolor}{%
-          \xdef\thepagecolor{white}%
-          \xdef\thepagecolornone{none}%
-          \orignopagecolor%
-          % That will not have any effect except when things got fixed!
-          }%
-        }{% else: older package version
-          \pagecolor@warning{pagecolor}{%
-            \string\nopagecolor\space does not work with %
-            the used crop package. Using \\%
-            \pagecolor@nopagecolor\ \\%
-            as nopagecolor now.%
-            }%
-          \def\pagecolortmpb{none}%
-          \edef\pagecolortmpa{\pagecolor@nopagecolor}%
-          \ifx\pagecolortmpa\pagecolortmpb%
-            \pagecolor@warning{%
-              Option nopagecolor=none requested %
-              but this does not work with the crop package. %
-              By option nopagecolor the "color" to be used with %
-              \string\nopagecolor\ is set. The current value is "none" %
-              (maybe by default), but the crop package broke %
-              \string\nopagecolor . Therefore the color cannot be "none". %
-              Please change the option accordingly! \\%
-              As first aid nopagecolor is now set to white.%
-             }%
-            \setkeys{pagecolor}{nopagecolor=white}%
-          \fi%
-          \renewcommand{\nopagecolor}{\pagecolor{\pagecolor@nopagecolor}}%
+      \pagecolor@info{\string\nopagecolor\space did not work with the crop package %
+        2017/11/19 v1.10. Using \\%
+        \pagecolor@nopagecolor\ \\%
+        as nopagecolor now.%
+        }%
+      \def\pagecolortmpb{none}%
+      \edef\pagecolortmpa{\pagecolor@nopagecolor}%
+      \ifx\pagecolortmpa\pagecolortmpb\relax%
+        \pagecolor@warning@noline{%
+          Option nopagecolor=none requested but this does not work with %
+          the crop package. By option nopagecolor the "color" to be used %
+          with \string\nopagecolor\ is set. The current value is "none" %
+          (maybe by default), but the crop package broke %
+          \string\nopagecolor . Therefore the color cannot be "none". %
+          Please change the option accordingly! %
+          As first aid nopagecolor is now set to white.%
          }%
+        \setkeys{pagecolor}{nopagecolor=white}%
+      \fi%
+      \renewcommand{\nopagecolor}{\pagecolor{\pagecolor@nopagecolor}}%
      }{% crop neither loaded afterwards.
       }%
   \fi%
@@ -819,8 +866,6 @@ in mid-sentence!
 %</package>
 %    \end{macrocode}
 %
-% \newpage
-%
 % \section{Installation}
 % \subsection{Downloads}
 % Everything is available at \url{https://www.ctan.org},
@@ -867,7 +912,7 @@ in mid-sentence!
 % The |pagecolor-example.tex| requires the same file as all
 % documents using the \xpackage{pagecolor} package, i.\,e.
 % \begin{description}
-% \item[-] package \xpackage{pagecolor}, 2022-11-20, v1.1a,
+% \item[-] package \xpackage{pagecolor}, 2022-11-27, v1.2a,
 %   \url{https://www.ctan.org/pkg/pagecolor}\\
 %   (Well, it is the example file for this package, and because you are reading the
 %    documentation for the \xpackage{pagecolor} package, it~can be assumed that you already
@@ -893,6 +938,8 @@ in mid-sentence!
 %           This package is only needed for some blind text.
 % \end{description}
 %
+% \newpage
+%
 % \DescribeMacro{Alternatives}
 % \DescribeMacro{transparent}
 % \DescribeMacro{OCG}
@@ -1042,9 +1089,9 @@ in mid-sentence!
 %
 % \subsection{Refresh file name databases}
 %
-% If your \TeX~distribution (\TeX{} Live, \mikTeX, \teTeX, \dots) relies on 
-% file name databases, you must refresh these. For example, \teTeX{} users run
-% \verb|texhash| or \verb|mktexlsr|.
+% If your \TeX~distribution (\TeX\,Live, \mikTeX, \dots) relies on
+% file name databases, you must refresh these. For example, \TeX\,Live\ users
+% run \verb|texhash| or \verb|mktexlsr|.
 %
 % \subsection{Some details for the interested}
 %
@@ -1090,6 +1137,8 @@ in mid-sentence!
 % The example file, \textsf{pagecolor-example.tex}, can be compiled via\\
 % |(pdf)latex pagecolor-example.tex|.
 %
+% \newpage
+%
 % \section{Acknowledgements}
 %
 % I would like to thank \textsc{Heiko Oberdiek} for providing a lot of
@@ -1107,8 +1156,6 @@ in mid-sentence!
 % and to \textsc{Reuben Thomas} for suggestions for improvements
 % of this documentation.
 %
-% \pagebreak
-%
 % \phantomsection
 % \begin{History}\label{History}
 %   \begin{Version}{2011/07/16 v1.0a}
@@ -1147,8 +1194,6 @@ in mid-sentence!
 %             but some of the related code must already be performed earlier.
 %             Bug found by \textsc{Heiner Richter} and reported by
 %             \textsc{Johannes B\"{o}ttcher}, thanks!
-%     \item This version has been archived at\\
-%             \url{https://web.archive.org/web/20161114093809/https://mirror.ctan.org/install/macros/latex/contrib/pagecolor.tds.zip}
 %   \end{Version}
 %   \begin{Version}{2017/05/29 v1.0i}
 %     \item Documentation update following suggestions for improvements by
@@ -1157,13 +1202,18 @@ in mid-sentence!
 %             \url{https://web.archive.org/web/20220120221237/https://mirror.ctan.org/install/macros/latex/contrib/pagecolor.tds.zip}
 %   \end{Version}
 %   \begin{Version}{2022-11-20 v1.1a}
-%     \item Conversion to UTF-8.
-%     \item Update to \LaTeX{} format 2021-11-15.
+%     \item Replaced all |colour| (with |u|) by |color| (without |u|).
+%     \item Converted to UTF-8.
+%     \item Updated to \LaTeX{} format 2021-11-15.
 %     \item Corrected an error in the example.
-%     \item \XeLaTeX{} and others now do know \verb|\nopagecolor|.
-%     \item Package \xpackage{crop} has been updated, but \verb|\nopagecolor|
+%     \item \XeLaTeX{} and others now do know |\nopagecolor|.
+%     \item Package \xpackage{crop} has been updated, but |\nopagecolor|
 %             still applies to the physical background sheet instead of the logical foreground area.
 %     \item Now using the \xpackage{hardwrap} package.
+%   \end{Version}
+%   \begin{Version}{2022-11-27 v1.2a}
+%     \item Now also handling the background/outer/physical page color,
+%             when the \xpackage{crop} package is used.
 %     \item Documentation updates.
 %   \end{Version}
 % \end{History}
@@ -1173,6 +1223,8 @@ in mid-sentence!
 % When you find a mistake or have a suggestion for an improvement of this package,
 % please send an e-mail to the maintainer, thanks! (Please see BUG REPORTS in the README.)
 %
+% \newpage
+%
 % \PrintIndex
 %
 % \Finale
diff --git a/macros/latex/contrib/pagecolor/pagecolor.pdf b/macros/latex/contrib/pagecolor/pagecolor.pdf
index 08642c75e5..edbc7cbde2 100644
--- a/macros/latex/contrib/pagecolor/pagecolor.pdf
+++ b/macros/latex/contrib/pagecolor/pagecolor.pdf
diff --git a/macros/latex/contrib/profcollege/doc/ProfCollege-doc.pdf b/macros/latex/contrib/profcollege/doc/ProfCollege-doc.pdf
index 73f0d7167d..65f4d3e66e 100644
--- a/macros/latex/contrib/profcollege/doc/ProfCollege-doc.pdf
+++ b/macros/latex/contrib/profcollege/doc/ProfCollege-doc.pdf
diff --git a/macros/latex/contrib/profcollege/latex/ProfCollege.sty b/macros/latex/contrib/profcollege/latex/ProfCollege.sty
index e6cc0a8a68..5238a5e97e 100644
--- a/macros/latex/contrib/profcollege/latex/ProfCollege.sty
+++ b/macros/latex/contrib/profcollege/latex/ProfCollege.sty
@@ -4,7 +4,7 @@
 \NeedsTeXFormat{LaTeX2e}%
 \def\filedate{2022/12/01}%
 \let\PfCfiledate\filedate%
-\def\fileversion{0.99-z-b}%
+\def\fileversion{0.99-z-c}%
 \let\PfCfileversion\fileversion%
 \ProvidesPackage{ProfCollege}[\filedate\space v\fileversion\space Aide pour utiliser LaTeX au college]
 
@@ -51,6 +51,7 @@
 \RequirePackage{iftex}
 
 \ifluatex
+\RequirePackage{luacas}
 \RequirePackage{luamplib}
 \everymplib{input PfCSvgnames; input PfCConstantes; input PfCGeometrie; input PfCAfficheur; beginfig(1);}
 \everyendmplib{endfig;}
@@ -347,6 +348,954 @@
 }
 
 %%%
+% Barres de calculs
+%%%
+\setKVdefault[SuiteBarre]{Litteral=false,Perso=false,Decimaux=false}
+
+\NewDocumentCommand\BarresCalculs{o m m}{%
+  \useKVdefault[SuiteBarre]%
+  \setKV[SuiteBarre]{#1}%
+  \xdef\PfCListeCalculsBarre{}%
+  \xdef\PfCListeResultatsBarre{}%
+  \ignoreemptyitems%
+  \ifboolKV[SuiteBarre]{Perso}{%
+    \setsepchar[*]{,*§}%
+    \readlist*\PfCListeBarresCalculs{#2}%
+    \foreachitem\compteur\in\PfCListeBarresCalculs{%
+      \StrChar{#3}{\compteurcnt}[\PfCLettreB]%
+      \StrSubstitute[0]{\PfCLettreB}{*}{Départ}[\PfCLettreC]%
+      \xdef\PfCListeResultatsBarre{\PfCListeResultatsBarre \PfCLettreC,}%
+    }%
+    \setsepchar{,}%
+    \readlist*\PfCListeResultats{\PfCListeResultatsBarre}%
+    \begin{NiceTabular}{ccc}[hvlines]
+      \xintFor* ##1 in{\xintSeq{1}{\PfCListeResultatslen}}\do{%
+        \xintifForFirst{\Block{2-1}{}}{\Block{2-1}{\ifboolKV[SuiteBarre]{Decimaux}{%
+              \num{\fpeval{\PfCListeBarresCalculs[\fpeval{##1-1},1]}}%
+              }{%
+                \begin{CAS}
+              c = \PfCListeBarresCalculs[\fpeval{##1-1},1]
+            \end{CAS}$\print{c:autosimplify()}$}%
+        }}&\Block{2-1}{\PfCListeResultats[##1]}&\Block{2-1}{$\PfCListeBarresCalculs[##1,2]$}\\
+        &&\\
+      }%
+    \end{NiceTabular}
+  }{%
+    \setsepchar{,}%\ignoreemptyitems%
+    \readlist*\PfCListeBarresCalculs{#2}%
+    \ifboolKV[SuiteBarre]{Litteral}{%
+      \foreachitem\compteur\in\PfCListeBarresCalculs{%
+        \StrChar{#3}{\compteurcnt}[\PfCLettreB]%
+        \StrSubstitute[0]{\PfCLettreB}{*}{Départ}[\PfCLettreC]%
+        \xdef\PfCListeResultatsBarre{\PfCListeResultatsBarre \PfCLettreC,}%
+      }%
+      \setsepchar[*]{,*/}%
+      \readlist*\PfCListeResultats{\PfCListeResultatsBarre}%
+      \setsepchar{,}%
+      \readlist*\PfCListeCalculs{#2}%
+      \begin{NiceTabular}{ccc}[hvlines]
+        \xintFor* ##1 in{\xintSeq{1}{\PfCListeResultatslen}}\do{%
+          \xintifForFirst{\Block{2-1}{}}{\Block{2-1}{$\print{c:expand():topolynomial()}$}}&\Block{2-1}{\PfCListeResultats[##1,1]}&\Block{2-1}{\begin{CAS}
+              vars('x')
+              c = \PfCListeCalculs[##1]
+            \end{CAS}$\print{c}$}\\
+          &&\\
+        }%
+      \end{NiceTabular}
+    }{%
+      \foreachitem\compteur\in\PfCListeBarresCalculs{%
+        \StrChar{#3}{\compteurcnt}[\PfCLettreB]%
+        \StrSubstitute[0]{\PfCLettreB}{*}{Départ}[\PfCLettreC]%
+        \xdef\PfCListeResultatsBarre{\PfCListeResultatsBarre \num{\fpeval{\compteur}}/\PfCLettreC,}%
+        \StrSubstitute[0]{\compteur}{*}{\times}[\PfCListeResultatEtapeA]%
+        \StrSubstitute[0]{\PfCListeResultatEtapeA}{/}{\div}[\PfCListeResultatEtapeB]%
+        \StrSubstitute[0]{\PfCListeResultatEtapeB}{(}{\left(}[\PfCListeResultatEtapeC]%
+          \StrSubstitute[0]{\PfCListeResultatEtapeC}{)}{\right)}[\PfCListeResultatEtapeD]%
+        \xdef\PfCListeCalculsBarre{\PfCListeCalculsBarre $\PfCListeResultatEtapeD$,}%
+      }%
+      \setsepchar[*]{,*/}%
+      \readlist*\PfCListeResultats{\PfCListeResultatsBarre}%
+      \setsepchar{,}%
+      \readlist*\PfCListeCalculs{\PfCListeCalculsBarre}%
+      \begin{NiceTabular}{ccc}[hvlines]
+        \xintFor* ##1 in{\xintSeq{1}{\PfCListeResultatslen}}\do{%
+          \xintifForFirst{\Block{2-1}{}}{\Block{2-1}{\PfCListeResultats[\fpeval{##1-1},1]}}&\Block{2-1}{\PfCListeResultats[##1,2]}&\Block{2-1}{\PfCListeCalculs[##1]}\\
+          &&\\
+        }%
+      \end{NiceTabular}
+    }%
+  }%
+  \reademptyitems%
+}%
+
+%%%
+% Solide et sections
+%%%
+\setKVdefault[ClesSolides]{Nom=cube,Aretes,Sommets,Pointilles,Largeur=1.5,Hauteur=1,Profondeur=0.75,ListeSommets={A,B,C,D,E,F,G,H},Rho=1500,Phi=30,Theta=20,Distance=50,Code=false,Couleur=white,Anglex=0,RayonCone=1,HauteurCone=2,HauteurPyramide=2,SommetsPyramide=5,Reguliere=false,DecalageSommet={(0,0,0)},RayonCylindre=1,HauteurCylindre=2,RayonSphere=1,AutoLabel=true,Sections=false,CoefSection=0.3,Axes=false,PointsSection={M,N,O,P},RemplisSection=false,ObjetSection={0.5,E,H,0.25,F,G,G,B}}%
+\defKV[ClesSolides]{Traces=\setKV[ClesSolides]{Code}}%
+\defKV[ClesSolides]{Section=\setKV[ClesSolides]{Sections}}%
+\defKV[ClesSolides]{CouleurSection=\setKV[ClesSolides]{RemplisSection}}%
+
+\newcommand\MPSolideCylindre[3]{%
+  \ifluatex
+  \mplibforcehmode
+  \begin{mplibcode}
+    input PfCSolid;
+    
+    boolean NommeSommets,Code,Sections,Axes,RemplisSection;
+    NommeSommets=\useKV[ClesSolides]{Sommets};
+    Code=\useKV[ClesSolides]{Code};
+    Sections:=\useKV[ClesSolides]{Sections};
+    Axes:=\useKV[ClesSolides]{Axes};
+    RemplisSection=\useKV[ClesSolides]{RemplisSection};
+    if RemplisSection:color CouleurSection;CouleurSection=\useKV[ClesSolides]{CouleurSection};fi;
+    %Initialisation
+    PfCRho=\useKV[ClesSolides]{Rho};
+    PfCPhi=\useKV[ClesSolides]{Phi};
+    PfCTheta=\useKV[ClesSolides]{Theta};
+    PfCDistance=\useKV[ClesSolides]{Distance};
+    CoefSection=\useKV[ClesSolides]{CoefSection};
+    anglerotationx=\useKV[ClesSolides]{Anglex};
+    rayoncylindre=\useKV[ClesSolides]{RayonCylindre};
+    hauteurcylindre=\useKV[ClesSolides]{HauteurCylindre};
+
+    string Section;
+    if Sections:Section=\useKV[ClesSolides]{Section};fi;
+        
+    color PfCOutColor;
+    PfCOutColor=\useKV[ClesSolides]{Couleur};
+    
+    vardef BaseCylindre(text t)=
+    save Cer;
+    picture Cer;
+    save n;
+    n:=0;
+    for p_=t:
+    if color p_:
+    n:=n+1;
+    _T[n]:=p_;
+    fi;
+    endfor;
+    pascercle:=5;
+    color ptcer[];
+    for k=0 step pascercle until (360+pascercle) :
+    ptcer[k div pascercle]-_T[1]=Distance(_T[1],_T[2])*((_T[4]-_T[3])*cosd(k)/Distance(_T[3],_T[4])+(_T[5]-_T[3])*sind(k)/Distance(_T[3],_T[5]));
+    endfor;
+    %
+    color ddcer,cccer;
+    nbpointilles:=0;
+    nbtraces:=0;
+    path PathSection[];
+    nbpathsection:=0;
+    Cer=image(%
+    for k=0 step pascercle until 360:
+    ddcer:=Oeil-ptcer[k div pascercle];
+    cccer:=-Normal(ptcer[k div pascercle],ptcer[(k+pascercle) div pascercle],ptcer[k div pascercle]+Sommet1-Sommet2);
+    if (ProduitScalaire(ddcer,cccer)>=0):
+    nbtraces:=nbtraces+1;
+    if (nbtraces=1) and (nbpointilles>0):
+    draw chemin(ptcer[k div pascercle],ptcer[k div pascercle]+Sommet1-Sommet2);
+    fi;
+    nbpathsection:=nbpathsection+1;
+    PathSection[nbpathsection]=chemin(ptcer[k div pascercle],ptcer[(k+pascercle) div pascercle]);
+    draw chemin(ptcer[k div pascercle],ptcer[(k+pascercle) div pascercle]);
+    draw chemin(ptcer[k div pascercle]+Sommet1-Sommet2,ptcer[(k+pascercle) div pascercle]+Sommet1-Sommet2);
+    else:
+    nbpointilles:=nbpointilles+1;
+    nbtraces:=0;
+    if (nbpointilles=1):
+    draw chemin(ptcer[k div pascercle],ptcer[k div pascercle]+Sommet1-Sommet2);
+    fi;
+    if k mod (2*pascercle)=0:
+    nbpathsection:=nbpathsection+1;
+    PathSection[nbpathsection]=chemin(ptcer[k div pascercle],ptcer[(k+pascercle) div pascercle]);
+    draw chemin(ptcer[k div pascercle],ptcer[(k+pascercle) div pascercle]);
+    draw chemin(ptcer[k div pascercle]+Sommet1-Sommet2,ptcer[(k+pascercle) div pascercle]+Sommet1-Sommet2);
+    fi;
+    fi;
+    endfor;
+    );
+    Cer
+    enddef;
+
+    Figure(-10u,-10u,10u,10u);
+    Initialisation(PfCRho,PfCPhi,PfCTheta,PfCDistance);
+%    Initialisation(1500,30,20,50);
+    typetrace:="3D";
+    typerepre:="persp";
+    eclairage:=false;
+    nb:=36;%36
+    subh:=1;%
+    incolor:=white;
+    outcolor:=PfCOutColor;
+    Ferme1:=true;
+    angx:=anglerotationx;
+    Objetcylindre1("r="&decimal(rayoncylindre),"h="&decimal(hauteurcylindre));
+    eclairage:=false;
+%    traits:=false;
+%    AffichageObjet1;
+
+    color O,S,A,M,B,C,D,Sommet[];
+    Sommet2=(0,0,0);
+    Sommet1-Sommet2=(0,0,hauteurcylindre);
+    Sommet3-Sommet2=rayoncylindre*(cosd(0),-sind(0),0);
+    Sommet4-Sommet2=rayoncylindre*(cosd(90),-sind(90),0);
+    color MSection[];
+    MSection[1]-Sommet2=rayoncylindre*(CoefSection,sin(arccos(CoefSection)),0);
+    MSection[7]-Sommet2=rayoncylindre*(CoefSection+0.01,sin(arccos(CoefSection+0.01)),0);
+    MSection[2]-Sommet2=rayoncylindre*(CoefSection,-sin(arccos(CoefSection)),0);
+    MSection[3]-MSection[2]=Sommet1-Sommet2;
+    MSection[4]-MSection[1]=Sommet1-Sommet2;
+    MSection[5]-Sommet2=CoefSection[Sommet1,Sommet2];
+    MSection[6]-MSection[5]=MSection[2]-MSection[1];
+    Sommet1:=RotXYZ(Sommet1);
+    Sommet2:=RotXYZ(Sommet2);
+    Sommet3:=RotXYZ(Sommet3);
+    Sommet4:=RotXYZ(Sommet4);
+    MSection[1]:=RotXYZ(MSection[1]);
+    MSection[2]:=RotXYZ(MSection[2]);
+    MSection[3]:=RotXYZ(MSection[3]);
+    MSection[4]:=RotXYZ(MSection[4]);
+    MSection[5]:=RotXYZ(MSection[5]);
+    MSection[6]:=RotXYZ(MSection[6]);
+    MSection[7]:=RotXYZ(MSection[7]);
+
+    trace BaseCylindre(Sommet2,Sommet3,Sommet2,Sommet3,Sommet4);
+    currentpicture:=nullpicture;
+    
+    if Sections:
+    if Section="parallele":
+    if RemplisSection:
+    fill polygone(MSection[1],MSection[2],MSection[3],MSection[4]) withcolor CouleurSection;
+    fi;
+    color dcer,ccer;
+    invnormale:=if CoefSection<=0:-1 else:1 fi;
+    %1er côté et 3eme côté : face "basse" et face "haute"
+    dcer:=Oeil-Sommet3;
+    ccer:=-Normal(Sommet3,MSection1,MSection2);
+    draw chemin(MSection1,MSection2) if (ProduitScalaire(dcer,ccer)<0):dashed evenly fi;
+    draw chemin(MSection3,MSection4) if (ProduitScalaire(dcer,ccer)>0):dashed evenly fi;
+    % 2eme côté et 4eme coté
+    dcer:=Oeil-MSection7;
+    ccer:=-Normal(MSection7,MSection4,MSection1);
+    draw chemin(MSection4,MSection1) if (ProduitScalaire(dcer,ccer)<0):dashed evenly fi;
+    draw chemin(MSection2,MSection3) if (ProduitScalaire(dcer,ccer)>0):dashed evenly fi;
+    else:
+    if RemplisSection:
+    fill (PathSection[1] for p_=2 upto nbpathsection:--PathSection[p_] endfor--cycle) shifted(Projette(CoefSection[Sommet1,Sommet2]-Sommet2)) withcolor CouleurSection;
+    fi;
+    for p_=1 upto nbpathsection:
+    draw (PathSection[p_] shifted(Projette(CoefSection[Sommet1,Sommet2]-Sommet2)));
+    endfor;
+    fi;
+    fi;
+    
+    trace BaseCylindre(Sommet2,Sommet3,Sommet2,Sommet3,Sommet4);
+
+    color dcer,ccer;
+    dcer:=Oeil-Sommet2;
+    ccer:=Normal(Sommet2,Sommet3,Sommet4);
+    if (ProduitScalaire(dcer,ccer)>=0):
+    draw Cercles(Sommet2,Sommet3,Sommet2,Sommet3,Sommet4);
+    fi;
+    dcer:=Oeil-Sommet1;
+    ccer:=Normal(Sommet1,Sommet4+Sommet1-Sommet2,Sommet3+Sommet1-Sommet2);
+    if (ProduitScalaire(dcer,ccer)>=0):
+    draw Cercles(Sommet1,Sommet3+Sommet1-Sommet2,Sommet1,Sommet3+Sommet1-Sommet2,Sommet4+Sommet1-Sommet2);
+    fi;
+
+    vardef EcrireSommets(text t)=
+    nb:=0;
+    for p_=t:
+    nb:=nb+1;
+    if bluepart(Sommet1)>bluepart(Sommet2):
+    if nb=1:
+    label.ulft(TEX(p_),Projette(Sommet1));%p_
+    elseif nb=2:
+    dotlabel.rt(TEX(p_),Projette(Sommet2));%p_
+    fi;
+    else:
+    if nb=1:
+    label.bot(TEX(p_),Projette(Sommet1));
+    elseif nb=2:
+    dotlabel.ulft(TEX(p_),Projette(Sommet2));
+    fi;
+    fi;
+    endfor;
+    enddef;
+
+    DefinirSommets(#1);
+    DefinirSommetsSection(#3);
+    
+    if Axes:
+    draw segment(1.5[Sommet1,Sommet2],1.5[Sommet2,Sommet1]) dashed dashpattern(on6 off3 on3 off 3);
+    remplis (fullcircle scaled 1mm) shifted(Projette(Sommet1));
+    remplis (fullcircle scaled 1mm) shifted(Projette(Sommet2));
+    fi;
+    
+    if Code:
+    \useKV[ClesSolides]{Traces};
+    fi;
+    
+  \end{mplibcode}
+  \fi
+}
+
+\newcommand\MPSolidePyramide[4]{%
+  \ifluatex
+  \mplibforcehmode
+  \begin{mplibcode}
+
+    input PfCSolid;
+    
+    boolean Pointilles,TraceArete,NommeSommets,Code,Reguliere,AutoLabel,Sections,RemplisSection;
+    Sections:=\useKV[ClesSolides]{Sections};
+    RemplisSection=\useKV[ClesSolides]{RemplisSection};
+    if RemplisSection:color CouleurSection;CouleurSection=\useKV[ClesSolides]{CouleurSection};fi;
+    AutoLabel:=\useKV[ClesSolides]{AutoLabel};
+    Pointilles=\useKV[ClesSolides]{Pointilles};
+    TraceArete=\useKV[ClesSolides]{Aretes};
+    NommeSommets=\useKV[ClesSolides]{Sommets};
+    Code=\useKV[ClesSolides]{Code};
+    Reguliere:=\useKV[ClesSolides]{Reguliere};
+    % Initialisation
+    PfCRho=\useKV[ClesSolides]{Rho};
+    PfCPhi=\useKV[ClesSolides]{Phi};
+    PfCTheta=\useKV[ClesSolides]{Theta};
+    PfCDistance=\useKV[ClesSolides]{Distance};
+    CoefSection=\useKV[ClesSolides]{CoefSection};
+    anglerotationx=\useKV[ClesSolides]{Anglex};
+    hauteurpyramide=\useKV[ClesSolides]{HauteurPyramide};
+    nombresommets=\useKV[ClesSolides]{SommetsPyramide};
+    color PfCOutColor,DecalageSommet;
+    PfCOutColor=\useKV[ClesSolides]{Couleur};
+    DecalageSommet=if Reguliere:(0,0,0) else: #3 fi;
+    
+    Figure(-10u,-10u,10u,10u);
+    Initialisation(PfCRho,PfCPhi,PfCTheta,PfCDistance);
+    typetrace:="3D";
+    typerepre:="persp";
+    if Pointilles=false:
+    pointilles:="non";
+    fi;
+
+    Ferme1:=true;
+
+    color O,A[],S;
+    O=(0,0,0);
+    S-O=(0,0,hauteurpyramide)+DecalageSommet;
+
+    NbS:=nombresommets;
+    Sommet1:=S;
+    ecartangle=360/(NbS-1);
+    for k=2 upto NbS:
+    if Reguliere:
+    repereangle:=(k-2)*ecartangle;
+    else:
+    repereangle:=(k-2)*ecartangle+(ecartangle*0.25+uniformdeviate(floor(ecartangle/2)));
+    fi;
+    Sommet[k]:=(cosd(repereangle),-sind(repereangle),0);
+    endfor;
+    Sommet[NbS+1]:=Sommet[2];
+
+    color TS[];
+    for k=1 upto (NbS+1):
+    TS[k]=Sommet[k];
+    endfor;
+    color PiedHauteur;
+    PiedHauteur=ProjectionsurPlan(Sommet1,Sommet2,Sommet3,Sommet4);
+    eclairage:=false;
+    traits:=false;
+    outcolor:=PfCOutColor;
+    angx:=anglerotationx;
+    for k=1 upto (NbS+1):
+    TS[k]:=RotXYZ(TS[k]);
+    endfor;
+    angx:=0;
+
+    color MSection[];
+    for p_=2 upto NbS:
+    MSection[p_-1]=CoefSection[Sommet[1],Sommet[p_]];
+    endfor;
+
+    DefinirSommetsSection(#4);
+    
+    vardef SectionPyramide(expr fracsection)=
+    save Section;
+    picture Section;
+    Section=image(%
+    if RemplisSection:
+    remplis polygone(fracsection[Sommet1,Sommet2],for p_=3 upto NbS-1:fracsection[Sommet1,Sommet[p_]],endfor fracsection[Sommet1,Sommet[NbS]]) withcolor CouleurSection;
+    fi;
+    color dcer,ccer;
+    for p_=2 upto NbS:
+    dcer:=Oeil-Sommet[p_];
+    ccer:=-Normal(Sommet1,Sommet[p_],Sommet[p_+1]);
+    if (ProduitScalaire(dcer,ccer)>=0):
+    draw chemin(fracsection[Sommet1,Sommet[p_]],fracsection[Sommet1,Sommet[p_+1]]);
+    else:
+    draw chemin(fracsection[Sommet1,Sommet[p_]],fracsection[Sommet1,Sommet[p_+1]]) dashed evenly;
+    fi;
+    endfor;
+    );
+    Section
+    enddef;
+    
+    ObjetNew1(%
+    TS1, for k=2 upto NbS:TS[k], endfor TS[NbS+1]
+    )(%
+    NbS-1, for p_=2 upto NbS:p_, endfor 
+    for p=2 upto NbS:
+    3,1,p+1,p,%
+    endfor);
+    AffichageObjet1;
+
+    Sommet[NbS+1]:=Sommet[2];
+
+    if Sections:
+    draw SectionPyramide(CoefSection);
+    fi;
+    
+    NF:=NbS;%nombresommets;
+    % Fc[100] est la base
+    Fc[100]:=NbS-1;
+    for k=2 upto NbS:
+    Fc[100+k-1]:=k;
+    endfor;
+    for k=2 upto NF:
+    Fc[k*100]:=3;
+    Fc[k*100+1]:=1;
+    Fc[k*100+2]:=k+1;
+    Fc[k*100+3]:=k;
+    endfor;
+    DessineObjet;
+
+    vardef EcrireSommets(text t)=
+    if AutoLabel:
+    nb:=0;
+    for p_=t:
+    nb:=nb+1;
+    if nb<NbS+1:
+    if nb>1:
+    label(TEX(""&p_&""),1.1[Projette(Sommet1),Projette(Sommet[nb])]);
+    else:
+    label(TEX(p_),1.1[Projette(Sommet[2]),Projette(Sommet[1])]);
+    fi;
+    fi;
+    endfor;
+    fi;
+    enddef;
+     
+    DefinirSommets(#1);
+
+    if TraceArete=false:
+    currentpicture:=nullpicture;    
+    fi;
+    if NommeSommets:
+    EcrireSommets(#2);
+    fi;
+    u:=0.25u;
+    marque_p:="croix";
+    nbcroix=0;
+    for p_=#1:
+    nbcroix:=nbcroix+1;
+    if nbcroix<NbS+1:
+    pointe(p_);
+    fi;
+    endfor;
+    u:=1cm;
+    if Code:
+    \useKV[ClesSolides]{Traces};
+    fi;
+
+  \end{mplibcode}
+  \fi
+}
+
+\newcommand\MPSolideCone[3]{%
+  \ifluatex
+  \mplibforcehmode
+  \begin{mplibcode}
+    boolean NommeSommets,Code,Sections,Axes,RemplisSection;
+    NommeSommets=\useKV[ClesSolides]{Sommets};
+    Code=\useKV[ClesSolides]{Code};
+    Axes:=\useKV[ClesSolides]{Axes};
+    Sections=\useKV[ClesSolides]{Sections};
+    RemplisSection=\useKV[ClesSolides]{RemplisSection};
+    if RemplisSection:color CouleurSection;CouleurSection=\useKV[ClesSolides]{CouleurSection};fi;
+    %Initialisation
+    PfCRho=\useKV[ClesSolides]{Rho};
+    PfCPhi=\useKV[ClesSolides]{Phi};
+    PfCTheta=\useKV[ClesSolides]{Theta};
+    PfCDistance=\useKV[ClesSolides]{Distance};
+    CoefSection=\useKV[ClesSolides]{CoefSection};
+    anglerotationx=\useKV[ClesSolides]{Anglex};
+    rayoncone=\useKV[ClesSolides]{RayonCone};
+    hauteurcone=\useKV[ClesSolides]{HauteurCone};
+    
+    color PfCOutColor;
+    PfCOutColor=\useKV[ClesSolides]{Couleur};
+    input PfCSolid;
+    
+    vardef BaseCone(text t)=
+    save Cer;
+    picture Cer;
+    save n;
+    n:=0;
+    for p_=t:
+    if color p_:
+    n:=n+1;
+    _T[n]:=p_;
+    fi;
+    endfor;
+    pascercle:=5;
+    color ptcer[];
+    for k=0 step pascercle until (360+pascercle) :
+    ptcer[k div pascercle]-_T[1]=Distance(_T[1],_T[2])*((_T[4]-_T[3])*cosd(k)/Distance(_T[3],_T[4])+(_T[5]-_T[3])*sind(k)/Distance(_T[3],_T[5]));
+    endfor;
+    %
+    color ddcer,cccer;
+    nbpointilles:=0;
+    nbtraces:=0;
+    Cer=image(%
+    for k=0 step pascercle until 360:
+    ddcer:=Oeil-ptcer[k div pascercle];
+    cccer:=-Normal(Sommet1,ptcer[k div pascercle],ptcer[(k+pascercle) div pascercle]);
+    if (ProduitScalaire(ddcer,cccer)>=0):
+    nbtraces:=nbtraces+1;
+    if (nbtraces=1) and (nbpointilles>0):
+    draw chemin(ptcer[k div pascercle],Sommet1);
+    fi;
+    draw chemin(ptcer[k div pascercle],ptcer[(k+pascercle) div pascercle]);
+    else:
+    nbpointilles:=nbpointilles+1;
+    nbtraces:=0;
+    if (nbpointilles=1):
+    draw chemin(ptcer[k div pascercle],Sommet1);
+    fi;
+    if k mod (2*pascercle)=0:
+    draw chemin(ptcer[k div pascercle],ptcer[(k+pascercle) div pascercle]);
+    fi;
+    fi;
+    endfor;
+    );
+    Cer
+    enddef;
+
+    Figure(-10u,-10u,10u,10u);
+    Initialisation(PfCRho,PfCPhi,PfCTheta,PfCDistance);
+    typetrace:="3D";
+    typerepre:="persp";
+    eclairage:=false;
+    nb:=36;%36
+    subh:=1;%
+    incolor:=white;
+    outcolor:=PfCOutColor;
+    Ferme1:=true;
+    angx:=anglerotationx;
+    Objetcone1("r="&decimal(rayoncone),"h="&decimal(hauteurcone));
+    traits:=false;
+    AffichageObjet1;
+
+    color Sommet[];%O,S,A,M,B,C,D,
+    Sommet2=(0,0,0);
+    Sommet1-Sommet2=(0,0,hauteurcone);
+    Sommet3-Sommet2=rayoncone*(cosd(0),-sind(0),0);
+    Sommet4-Sommet2=rayoncone*(cosd(90),-sind(90),0);
+    Sommet1:=RotXYZ(Sommet1);
+    Sommet3:=RotXYZ(Sommet3);
+    Sommet4:=RotXYZ(Sommet4);
+
+    color MSection[];
+    MSection[1]=CoefSection[Sommet1,Sommet2];
+
+    DefinirSommetsSection(#3);
+    
+    if Sections:
+    if RemplisSection:
+    remplis Cercles(CoefSection[Sommet1,Sommet2],CoefSection[Sommet1,Sommet3],CoefSection[Sommet1,Sommet2],CoefSection[Sommet1,Sommet3],CoefSection[Sommet1,Sommet4]) withcolor CouleurSection;
+    fi;
+    trace BaseCone(CoefSection[Sommet1,Sommet2],CoefSection[Sommet1,Sommet3],CoefSection[Sommet1,Sommet2],CoefSection[Sommet1,Sommet3],CoefSection[Sommet1,Sommet4]);
+    fi;
+
+    trace BaseCone(Sommet2,Sommet3,Sommet2,Sommet3,Sommet4);
+    color dcer,ccer;
+    dcer:=Oeil-Sommet2;
+    ccer:=Normal(Sommet2,Sommet3,Sommet4);
+    if (ProduitScalaire(dcer,ccer)>=0):
+    draw Cercles(Sommet2,Sommet3,Sommet2,Sommet3,Sommet4);
+    fi;
+
+    vardef EcrireSommets(text t)=
+    nb:=0;
+    for p_=t:
+    nb:=nb+1;
+    if bluepart(Sommet1)>bluepart(Sommet2):
+    if nb=1:
+    label.ulft(TEX(p_),Projette(Sommet1));
+    elseif nb=2:
+    dotlabel.rt(TEX(p_),Projette(Sommet2));
+    fi;
+    else:
+    if nb=1:
+    label.bot(TEX(p_),Projette(Sommet1));
+    elseif nb=2:
+    dotlabel.ulft(TEX(p_),Projette(Sommet2));
+    fi;
+    fi;
+    endfor;
+    enddef;
+
+    DefinirSommets(#1);
+
+    if Axes:
+    draw segment(1.5[Sommet1,Sommet2],1.5[Sommet2,Sommet1]) dashed dashpattern(on6 off3 on3 off 3);
+    remplis (fullcircle scaled 1mm) shifted(Projette(Sommet1));
+    remplis (fullcircle scaled 1mm) shifted(Projette(Sommet2));
+    fi;
+
+    if Code:
+    \useKV[ClesSolides]{Traces};
+    fi;
+
+  \end{mplibcode}
+  \fi
+}
+
+\newcommand\MPSolidePave[5]{%
+  \ifluatex
+  \mplibforcehmode
+  \begin{mplibcode}
+    input PfCSolid;
+    
+    boolean Pointilles,TraceArete,NommeSommets,Code,AutoLabel,Sections,RemplisSection;
+    AutoLabel:=\useKV[ClesSolides]{AutoLabel};
+    Pointilles=\useKV[ClesSolides]{Pointilles};
+    TraceArete=\useKV[ClesSolides]{Aretes};
+    NommeSommets=\useKV[ClesSolides]{Sommets};
+    Code=\useKV[ClesSolides]{Code};
+    Sections:=\useKV[ClesSolides]{Sections};
+    RemplisSection=\useKV[ClesSolides]{RemplisSection};
+    if RemplisSection:color CouleurSection;CouleurSection=\useKV[ClesSolides]{CouleurSection};fi;
+
+    string Section;
+    if Sections:Section=\useKV[ClesSolides]{Section};fi;
+    
+    %Initialisation
+    PfCRho=\useKV[ClesSolides]{Rho};
+    PfCPhi=\useKV[ClesSolides]{Phi};
+    PfCTheta=\useKV[ClesSolides]{Theta};
+    PfCDistance=\useKV[ClesSolides]{Distance};
+    
+    Figure(-10u,-10u,10u,10u);
+    Initialisation(PfCRho,PfCPhi,PfCTheta,PfCDistance);
+    typetrace:="3D";
+    typerepre:="persp";
+    if Pointilles=false:
+    pointilles:="non";
+    fi;
+    color A,B,C,D,E,F,G,H;
+    color Sommet[];
+    trace Pave(A,B,C,D,E,F,G,H)(#3);
+    currentpicture:=nullpicture;
+    Sommet1=A;
+    Sommet2=B;
+    Sommet3=C;
+    Sommet4=D;
+    Sommet5=E;
+    Sommet6=F;
+    Sommet7=G;
+    Sommet8=H;
+
+    DefinirSommets(#1);
+    
+    color MSection[];
+    numeric RetiensSection[];
+    numretienssection:=0;
+    color RetiensDefSection[];
+    numretiensdefsection:=0;
+    if Sections:
+    if Section="arete":
+    for p_=#5:
+    if numeric p_:
+    numretienssection:=numretienssection+1;
+    RetiensSection[numretienssection]=p_;
+    elseif color p_:
+    numretiensdefsection:=numretiensdefsection+1;
+    RetiensDefSection[numretiensdefsection]=p_;
+    fi;    
+    endfor;
+    % On dessine la section
+    MSection[1]=(RetiensSection[1])[RetiensDefSection[1],RetiensDefSection[2]];
+    MSection[2]=(RetiensSection[2])[RetiensDefSection[3],RetiensDefSection[4]];
+    MSection[3]-MSection[2]=RetiensDefSection[6]-RetiensDefSection[5];
+    MSection[4]-MSection[1]=RetiensDefSection[6]-RetiensDefSection[5];
+    if RemplisSection:
+    fill polygone(MSection1,MSection2,MSection3,MSection4) withcolor CouleurSection;
+    fi;
+%    DotLabel.top(TEX("M1"),MSection[1]);
+%    DotLabel.top(TEX("M2"),MSection[2]);
+%    DotLabel.top(TEX("M3"),MSection[3]);
+%    DotLabel.top(TEX("M4"),MSection[4]);
+%    if RemplisSection:
+%    fill polygone(MSection1,MSection2,MSection3,MSection4) withcolor CouleurSection;
+%    fi;
+%    trace polygone(MSection1,MSection2,MSection3,MSection4);
+    color dcer,ccer;
+    % 1er cote -> ok
+    dcer:=Oeil-RetiensDefSection[4];
+    ccer:=Normal(RetiensDefSection[4],RetiensDefSection[2],RetiensDefSection[1]);
+    draw chemin(MSection1,MSection2) if (ProduitScalaire(dcer,ccer)<0):dashed evenly fi;
+    % 2eme cote
+    dcer:=Oeil-RetiensDefSection[4];
+    ccer:=Normal(RetiensDefSection[4],RetiensDefSection[3],RetiensDefSection[4]+RetiensDefSection[6]-RetiensDefSection[5]);
+    draw chemin(MSection2,MSection3) if (ProduitScalaire(dcer,ccer)<0):dashed evenly fi;
+    % 3eme cote
+    dcer:=Oeil-RetiensDefSection[4];
+    ccer:=Normal(RetiensDefSection[4],RetiensDefSection[2],RetiensDefSection[1]);
+    draw chemin(MSection3,MSection4) if (ProduitScalaire(dcer,ccer)>=0):dashed evenly fi;
+    % 4eme cote
+    dcer:=Oeil-RetiensDefSection[4];
+    ccer:=Normal(RetiensDefSection[4],RetiensDefSection[3],RetiensDefSection[4]+RetiensDefSection[6]-RetiensDefSection[5]);
+    draw chemin(MSection4,MSection1) if (ProduitScalaire(dcer,ccer)>=0):dashed evenly fi;
+    else:
+    %face 
+    for p_=#5:
+    if numeric p_:
+    numretienssection:=numretienssection+1;
+    RetiensSection[numretienssection]=p_;
+    elseif color p_:
+    numretiensdefsection:=numretiensdefsection+1;
+    RetiensDefSection[numretiensdefsection]=p_;
+    fi;    
+    endfor;
+    % On dessine la section
+    MSection[1]=(RetiensSection[1])[RetiensDefSection[1],RetiensDefSection[2]];
+    MSection[2]-MSection[1]=RetiensDefSection[4]-RetiensDefSection[3];
+    MSection[3]-MSection[2]=RetiensDefSection[5]-RetiensDefSection[4];
+    MSection[4]-MSection[1]=MSection[3]-MSection[2];
+%    DotLabel.top(TEX("M1"),MSection[1]);
+%    DotLabel.top(TEX("M2"),MSection[2]);
+%    DotLabel.top(TEX("M3"),MSection[3]);
+%    DotLabel.top(TEX("M4"),MSection[4]);
+    if RemplisSection:
+    fill polygone(MSection1,MSection2,MSection3,MSection4) withcolor CouleurSection;
+    fi;
+    color dcer,ccer;
+    % 1er cote -> ok
+    dcer:=Oeil-RetiensDefSection[4];
+    ccer:=Normal(RetiensDefSection[4],RetiensDefSection[2],RetiensDefSection[1]);
+    draw chemin(MSection1,MSection2) if (ProduitScalaire(dcer,ccer)<0):dashed evenly fi;
+    % 2eme cote
+    dcer:=Oeil-RetiensDefSection[4];
+    ccer:=Normal(RetiensDefSection[5],RetiensDefSection[4],RetiensDefSection[5]+RetiensDefSection[1]-RetiensDefSection[2]);
+    draw chemin(MSection2,MSection3) if (ProduitScalaire(dcer,ccer)<0):dashed evenly fi;
+    % 3eme cote
+    dcer:=Oeil-RetiensDefSection[4];
+    ccer:=Normal(RetiensDefSection[4],RetiensDefSection[2],RetiensDefSection[1]);
+    draw chemin(MSection3,MSection4) if (ProduitScalaire(dcer,ccer)>=0):dashed evenly fi;
+    % 4eme cote
+    dcer:=Oeil-RetiensDefSection[4];
+    ccer:=Normal(RetiensDefSection[5],RetiensDefSection[4],RetiensDefSection[5]+RetiensDefSection[1]-RetiensDefSection[2]);
+    draw chemin(MSection4,MSection1) if (ProduitScalaire(dcer,ccer)>=0):dashed evenly fi;
+    fi;
+    %On trace la section considérée
+    %trace polygone(MSection1,MSection2,MSection3,MSection4);
+    fi;
+
+    trace Pave(A,B,C,D,E,F,G,H)(#3);
+    
+    DefinirSommetsSection(#4);
+    
+    if TraceArete=false:
+    currentpicture:=nullpicture;    
+    fi;
+    if NommeSommets:
+    EcrireSommetsPave(#2);
+    fi;
+    u:=0.25u;
+    marque_p:="croix";
+    nbcroix=0;
+    for p_=#1:
+    nbcroix:=nbcroix+1;
+    if nbcroix=4:
+    if Pointilles:
+    pointe(p_);
+    fi;
+    else:
+    pointe(p_);
+    fi;
+    endfor;
+    u:=1cm;
+    if Code:
+    \useKV[ClesSolides]{Traces};
+    fi;
+  \end{mplibcode}
+  \fi
+}
+
+\newcommand\MPSolideSphere[3]{%
+  \ifluatex
+  \mplibforcehmode
+  \begin{mplibcode}
+    boolean NommeSommets,Code,Sections,Axes,RemplisSection;
+    NommeSommets=\useKV[ClesSolides]{Sommets};
+    Code=\useKV[ClesSolides]{Code};
+    Axes:=\useKV[ClesSolides]{Axes};
+    Sections=\useKV[ClesSolides]{Sections};
+    RemplisSection=\useKV[ClesSolides]{RemplisSection};
+    if RemplisSection:color CouleurSection;CouleurSection=\useKV[ClesSolides]{CouleurSection};fi;
+    %Initialisation
+    PfCRho=\useKV[ClesSolides]{Rho};
+    PfCPhi=0;%\useKV[ClesSolides]{Phi};
+    PfCTheta=10;%\useKV[ClesSolides]{Theta};
+    PfCDistance=\useKV[ClesSolides]{Distance};
+    CoefSection=\useKV[ClesSolides]{CoefSection};
+    anglerotationx=\useKV[ClesSolides]{Anglex};
+    rayonsphere=\useKV[ClesSolides]{RayonSphere};
+    
+    color PfCOutColor;
+    PfCOutColor=\useKV[ClesSolides]{Couleur};
+    input PfCSolid;
+    
+    vardef BaseSphere=
+    save Cer;
+    picture Cer;
+    color PtInter.iso,PtInter[];
+    vardef Famille(expr u,v)=(R*(cos(u)*cos(v),cos(u)*sin(v),sin(u))) enddef;
+    subh:=72;
+    Cer=image(%
+    if Sections:
+    if RemplisSection:fill (Cercles(Image((0,0,0)),Image((0,1,0)),Image((0,0,0)),Image((0,1,0)),Image((-1,0,0))) scaled (sqrt(1-(abs(CoefSection+0.02))**2))) shifted(Projette(MSection1-Sommet1)) withcolor CouleurSection; fi;
+    fi;
+    %Equateur
+    umin:=0; umax:=pi/nb; upas:=pi/nb;
+    vmin:=0; vpas:=2*pi/subh; vmax:=2*pi;
+    for l=0 upto subh-1:
+    PtInter[1]:=Image(Famille(umin+(0+1)*upas,vmin+l*vpas));
+    PtInter[2]:=Image(Famille(umin+0*upas,vmin+l*vpas));
+    PtInter[3]:=Image(Famille(umin+0*upas,vmin+(l+1)*vpas));
+    PtInter[4]:=Image(Famille(umin+(0+1)*upas,vmin+(l+1)*vpas));
+    PtInter.iso:=(PtInter[1]+PtInter[2]+PtInter[3]+PtInter[4])/4;
+    if ProduitScalaire(Oeil-PtInter.iso,Normal(PtInter.iso,PtInter[4],PtInter[1]))>=0:
+    if Sections:
+    draw (segment(PtInter[3],PtInter[2]) scaled (sqrt(1-(abs(CoefSection+0.02))**2))) shifted(Projette(MSection1-Sommet1));
+    fi;
+    draw segment(PtInter[3],PtInter[2]);
+    else:
+    if l mod 2=0:
+    if Sections:
+    draw (segment(PtInter[3],PtInter[2]) scaled (sqrt(1-(abs(CoefSection+0.02))**2))) shifted(Projette(MSection1-Sommet1));
+    fi;
+    draw segment(PtInter[3],PtInter[2]);
+    fi;
+    fi;
+    endfor;
+    
+    % "Exterieur"
+    nb:=72;
+    subh:=18;
+    umin:=-pi; umax:=pi; upas:=2*pi/nb;
+    vpas:=2*pi/subh; vmin:=pi/2; vmax:=2*pi;
+    for k=0 upto nb-1:
+    PtInter[1]:=Image(Famille(umin+(k+1)*upas,vmin+0*vpas));
+    PtInter[2]:=Image(Famille(umin+k*upas,vmin+0*vpas));
+    PtInter[3]:=Image(Famille(umin+k*upas,vmin+(0+1)*vpas));
+    PtInter[4]:=Image(Famille(umin+(k+1)*upas,vmin+(0+1)*vpas));
+    PtInter.iso:=(PtInter[1]+PtInter[2]+PtInter[3]+PtInter[4])/4;
+    draw segment(PtInter[2],PtInter[1]);
+    endfor;
+    );
+    Cer
+    enddef;
+
+    Figure(-10u,-10u,10u,10u);
+    Initialisation(PfCRho,PfCPhi,PfCTheta,PfCDistance);
+    typetrace:="3D";
+    typerepre:="persp";
+    eclairage:=false;
+    nb:=24;%36
+    subh:=36;%
+    incolor:=blue;
+    outcolor:=white;%PfCOutColor;
+    Ferme1:=true;
+    angx:=anglerotationx;
+    Objetsphere1("R="&decimal(rayonsphere));
+    % traits:=false;
+    % AffichageObjet1;
+    color Sommet[],SommetN,SommetS,SommetB;
+    Sommet1=(0,0,0);
+    Sommet2=(0,rayonsphere,0);
+    Sommet3=(-rayonsphere,0,0);
+    Sommet4=(0,0,rayonsphere);
+    SommetN=Sommet4;
+    SommetS=(0,0,-rayonsphere);
+    SommetB=(rayonsphere,0,0);
+    Sommet2:=RotXYZ(Sommet2);
+    Sommet3:=RotXYZ(Sommet3);
+    Sommet4:=RotXYZ(Sommet4);
+    SommetN:=RotXYZ(SommetN);
+    SommetS:=RotXYZ(SommetS);
+    SommetB:=RotXYZ(SommetB);
+    color MSection[];
+    MSection[1]=CoefSection[Sommet1,SommetN];
+    MSection[2]=Image((0,sqrt(1-CoefSection**2),CoefSection));    
+
+    trace BaseSphere;
+
+    DefinirSommets(#1);
+    DefinirSommetsSection(#3);
+
+    if Axes:
+    draw segment(1.25[SommetN,SommetS],1.25[SommetS,SommetN]) dashed dashpattern(on6 off3 on3 off3);
+    remplis (fullcircle scaled 1mm) shifted(Projette(SommetN));
+    remplis (fullcircle scaled 1mm) shifted(Projette(SommetS));
+    fi;
+
+    if Code:
+    \useKV[ClesSolides]{Traces};
+    fi;
+
+  \end{mplibcode}
+  \fi
+}
+
+\def\UpdatetoksSolide#1\nil{\addtotok\toksolidelistesommets{"#1",}}
+\newtoks\toksolidelistesommets%
+\newtoks\toksolidelistepointssections%
+
+\newcommand\Solide[1][]{%
+  \useKVdefault[ClesSolides]%
+  \setKV[ClesSolides]{#1}%
+  \setsepchar{,}\ignoreemptyitems%
+  \xdef\foo{\useKV[ClesSolides]{ListeSommets}}%
+  \readlist*\ListeNomSommet{\foo}%\showitems\ListeNomSommet
+  \reademptyitems%
+  \toksolidelistesommets{}
+  \foreachitem\compteur\in\ListeNomSommet{\expandafter\UpdatetoksSolide\compteur\nil}%\the\toksolidelistesommets%
+  \IfStrEqCase{\useKV[ClesSolides]{Nom}}{%
+    {cube}{%
+      \MPSolidePave{\useKV[ClesSolides]{ListeSommets}}{\the\toksolidelistesommets}{1,1,1}{\useKV[ClesSolides]{PointsSection}}{\useKV[ClesSolides]{ObjetSection}}%
+    }%
+    {pave}{%
+      \MPSolidePave{\useKV[ClesSolides]{ListeSommets}}{\the\toksolidelistesommets}{\useKV[ClesSolides]{Profondeur},\useKV[ClesSolides]{Largeur},\useKV[ClesSolides]{Hauteur}}{\useKV[ClesSolides]{PointsSection}}{\useKV[ClesSolides]{ObjetSection}}%
+    }%
+    {cone}{%
+      \MPSolideCone{\useKV[ClesSolides]{ListeSommets}}{\the\toksolidelistesommets}{\useKV[ClesSolides]{PointsSection}}%
+    }%
+    {pyramide}{%
+      \MPSolidePyramide{\useKV[ClesSolides]{ListeSommets}}{\the\toksolidelistesommets}{\useKV[ClesSolides]{DecalageSommet}}{\useKV[ClesSolides]{PointsSection}}%
+    }%
+    {cylindre}{%
+      \MPSolideCylindre{\useKV[ClesSolides]{ListeSommets}}{\the\toksolidelistesommets}{\useKV[ClesSolides]{PointsSection}}%
+    }%
+    {sphere}{%
+      \MPSolideSphere{\useKV[ClesSolides]{ListeSommets}}{\the\toksolidelistesommets}{\useKV[ClesSolides]{PointsSection}}%
+    }%
+  }%
+}%
+
+%%%
 % Vue Cubes
 %%%
 \setKVdefault[VueCubes]{Solution=false,Hauteur=5,Profondeur=4,Largeur=3,Angle=60,Nom=Ex1,Trou=false,Echelle=0.25,CouleurCube=LightSteelBlue,CouleurFleche=LightGray,Face=false,Creation=false,Grilles=false}
@@ -7933,68 +8882,9 @@ couleur indiquée, le nombre de cases donné par le résultat du calcul.
 }%
 
 %%% Dessin Gradue %%%
-\setKVdefault[DessinGradue]{Lignes=10,Debut=-5,Fin=5,Pas=10,Solution=false,EcartVertical=1.5,LignesIdentiques,Longueur=10,Echelle=1,Droites=false}
+\setKVdefault[DessinGradue]{Lignes=10,Debut=-5,Fin=5,Pas=10,Solution=false,EcartVertical=1.5,LignesIdentiques,Longueur=10,Echelle=1,Droites=false,DemiDroites=false}
 
-\def\TraceDessinGradue#1#2#3#4{%
-  \ifluatex
-  \mplibforcehmode
-  \begin{mplibcode}
-    pair La,Lb,Lab[];
-    La=(0,0);
-    Lb-La=u*(\useKV[DessinGradue]{Longueur},0);
-    for k=0 upto #4:
-    Lab[k]=(k/#4)[La,Lb];
-    endfor;
-    picture EnsembleLignes,Lignes;
-    Lignes=image(
-    trace segment(La,Lb);
-    for k=0 upto #4:
-    trace (Lab[k]+u*(0,-0.1))--(Lab[k]+u*(0,0.1));
-    endfor;
-    labeloffset:=labeloffset*1.5;
-    label.top(TEX("\num{"&decimal(#2)&"}"),La);
-    label.top(TEX("\num{"&decimal(#3)&"}"),Lb);
-    labeloffset:=labeloffset/1.5;
-    );
-    EnsembleLignes=image(
-    for k=0 upto #1-1:
-    trace Lignes shifted(k*u*(0,-\useKV[DessinGradue]{EcartVertical}));
-    label(TEX("(\num{"&decimal(k+1)&"})"),La+u*(-1.5,-k*\useKV[DessinGradue]{EcartVertical}));
-    endfor;
-    );
-    trace EnsembleLignes scaled \useKV[DessinGradue]{Echelle};
-  \end{mplibcode}
-  \else
-  \begin{mpost}[mpsettings={numeric LongueurLigne; LongueurLigne=\useKV[DessinGradue]{Longueur};numeric EcartVertical; EcartVertical=\useKV[DessinGradue]{EcartVertical}; numeric Echelle; Echelle=\useKV[DessinGradue]{Echelle};}]
-    pair La,Lb,Lab[];
-    La=(0,0);
-    Lb-La=u*(LongueurLigne,0);
-    for k=0 upto #4:
-    Lab[k]=(k/#4)[La,Lb];
-    endfor;
-    picture EnsembleLignes,Lignes;
-    Lignes=image(
-    trace segment(La,Lb);
-    for k=0 upto #4:
-    trace (Lab[k]+u*(0,-0.1))--(Lab[k]+u*(0,0.1));
-    endfor;
-    labeloffset:=labeloffset*1.5;
-    label.top(LATEX("\num{"&decimal(#2)&"}"),La);
-    label.top(LATEX("\num{"&decimal(#3)&"}"),Lb);
-    labeloffset:=labeloffset/1.5;
-    );
-    EnsembleLignes=image(
-    for k=0 upto #1-1:
-    trace Lignes shifted(k*u*(0,-EcartVertical));
-    label(LATEX("(\num{"&decimal(k+1)&"})"),La+u*(-1.5,-k*EcartVertical));
-    endfor;
-    );
-    trace EnsembleLignes scaled Echelle;
-  \end{mpost}
-  \fi
-}
-
-\def\TraceDessinGradueSolution#1#2#3#4#5#6{%
+\def\TraceDessinGradue#1#2#3#4#5#6{%
   \ifluatex
   \mplibforcehmode
   \begin{mplibcode}
@@ -8002,12 +8892,20 @@ couleur indiquée, le nombre de cases donné par le résultat du calcul.
     pair 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,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',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'';
     La=(0,0);
     Lb-La=u*(\useKV[DessinGradue]{Longueur},0);
+    boolean Solution;
+    Solution=\useKV[DessinGradue]{Solution};
     for k=0 upto #4:
     Lab[k]=(k/#4)[La,Lb];
     endfor;
     picture EnsembleLignes,Lignes;
     Lignes=image(
+    if \useKV[DessinGradue]{Droites}:
+    drawarrow 1.05[Lb,La]--1.05[La,Lb];
+    elseif \useKV[DessinGradue]{DemiDroites}:
+    drawarrow La--1.05[La,Lb];
+    else:
     trace segment(La,Lb);
+    fi;
     for k=0 upto #4:
     trace (Lab[k]+u*(0,-0.1))--(Lab[k]+u*(0,0.1));
     endfor;
@@ -8016,13 +8914,16 @@ couleur indiquée, le nombre de cases donné par le résultat du calcul.
     label.top(TEX("\num{"&decimal(#3)&"}"),Lb);
     labeloffset:=labeloffset/1.5;
     );
-    EnsembleLignes=image(%
+    EnsembleLignes=image(
+    if Solution:
     drawoptions(withcolor 0.5white);
+    fi;
     for k=0 upto #1-1:
     trace Lignes shifted(k*u*(0,-\useKV[DessinGradue]{EcartVertical}));
-    label(TEX("(\num{"&decimal(k+1)&"})"),La+u*(-1.5,k*(-\useKV[DessinGradue]{EcartVertical})));
+    label(TEX("(\num{"&decimal(k+1)&"})"),La+u*(-1.5,-k*\useKV[DessinGradue]{EcartVertical}));
     endfor;
     drawoptions();
+    if Solution:
     n:=0;
     numeric nblignes,nbpas;
     for p_=#5:
@@ -8038,11 +8939,12 @@ couleur indiquée, le nombre de cases donné par le résultat du calcul.
     for p_=#6:
     trace p_ withpen pencircle scaled 1.5;
     endfor;
+    fi;
     );
     trace EnsembleLignes scaled \useKV[DessinGradue]{Echelle};
   \end{mplibcode}
   \else
-  \begin{mpost}[mpsettings={numeric LongueurLigne; LongueurLigne=\useKV[DessinGradue]{Longueur};numeric EcartVertical; EcartVertical=\useKV[DessinGradue]{EcartVertical}; numeric Echelle; Echelle=\useKV[DessinGradue]{Echelle};}]
+  \begin{mpost}[mpsettings={numeric LongueurLigne; LongueurLigne=\useKV[DessinGradue]{Longueur};numeric EcartVertical; EcartVertical=\useKV[DessinGradue]{EcartVertical}; numeric Echelle; Echelle=\useKV[DessinGradue]{Echelle}; boolean Solution,Droites,DemiDroites; Solution=\useKV[DessinGradue]{Solution};Droites=\useKV[DessinGradue]{Droites};DemiDroites=\useKV[DessinGradue]{DemiDroites};}]
     pair La,Lb,Lab[];
     pair 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,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',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'';
     La=(0,0);
@@ -8052,7 +8954,13 @@ couleur indiquée, le nombre de cases donné par le résultat du calcul.
     endfor;
     picture EnsembleLignes,Lignes;
     Lignes=image(
+    if Droites:
+    drawarrow 1.05[Lb,La]--1.05[La,Lb];
+    elseif DemiDroites:
+    drawarrow La--1.05[La,Lb];
+    else:
     trace segment(La,Lb);
+    fi;
     for k=0 upto #4:
     trace (Lab[k]+u*(0,-0.1))--(Lab[k]+u*(0,0.1));
     endfor;
@@ -8062,12 +8970,15 @@ couleur indiquée, le nombre de cases donné par le résultat du calcul.
     labeloffset:=labeloffset/1.5;
     );
     EnsembleLignes=image(
+    if Solution:
     drawoptions(withcolor 0.5white);
+    fi;
     for k=0 upto #1-1:
     trace Lignes shifted(k*u*(0,-EcartVertical));
-    label(LATEX("(\num{"&decimal(k+1)&"})"),La+u*(-1.5,k*(-EcartVertical)));
+    label(LATEX("(\num{"&decimal(k+1)&"})"),La+u*(-1.5,-k*EcartVertical));
     endfor;
     drawoptions();
+    if Solution:
     n:=0;
     numeric nblignes,nbpas;
     for p_=#5:
@@ -8083,99 +8994,54 @@ couleur indiquée, le nombre de cases donné par le résultat du calcul.
     for p_=#6:
     trace p_ withpen pencircle scaled 1.5;
     endfor;
+    fi;
     );
     trace EnsembleLignes scaled Echelle;
   \end{mpost}
   \fi
 }
 
-\def\TraceDessinGradueMul#1{%
+\def\TraceDessinGradueMul#1#2#3{%
   \ifluatex
   \mplibforcehmode
   \begin{mplibcode}
     pair La,Lb,Lab[];
     La=(0,0);
+    pair 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,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',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'';
     Lb-La=u*(\useKV[DessinGradue]{Longueur},0);
+    EcartVertical=\useKV[DessinGradue]{EcartVertical};
+    boolean Solution;
+    Solution=\useKV[DessinGradue]{Solution};
     picture EnsembleLignes,Lignes;
     EnsembleLignes=image(
+    if Solution:
+    drawoptions(withcolor 0.5white);
+    fi;
     n:=0;
     m:=0;
     for p_=#1:
     n:=n+1;
-    trace segment(La,Lb) shifted((n-1)*u*(0,-\useKV[DessinGradue]{EcartVertical}));
-    label(TEX("(\num{"&decimal(n)&"})"),La+u*(-1.5,-(n-1)*\useKV[DessinGradue]{EcartVertical}));
-    for k=0 upto bluepart(p_):
-    m:=bluepart(p_);
-    Lab[k]:=(k/m)[La,Lb];
-    trace ((Lab[k]+u*(0,-0.1))--(Lab[k]+u*(0,0.1))) shifted((n-1)*u*(0,-\useKV[DessinGradue]{EcartVertical}));
-    endfor;
-    labeloffset:=labeloffset*1.5;
-    label.top(TEX("\num{"&decimal(redpart(p_))&"}"),La shifted((n-1)*u*(0,-\useKV[DessinGradue]{EcartVertical})));
-    label.top(TEX("\num{"&decimal(greenpart(p_))&"}"),Lb shifted((n-1)*u*(0,-\useKV[DessinGradue]{EcartVertical})));
-    labeloffset:=labeloffset/1.5;
-    endfor;
-    );
-    trace EnsembleLignes scaled \useKV[DessinGradue]{Echelle};
-  \end{mplibcode}
-  \else
-  \begin{mpost}[mpsettings={numeric LongueurLigne; LongueurLigne=\useKV[DessinGradue]{Longueur};numeric EcartVertical; EcartVertical=\useKV[DessinGradue]{EcartVertical}; numeric Echelle; Echelle=\useKV[DessinGradue]{Echelle};}]
-    pair La,Lb,Lab[];
-    La=(0,0);
-    Lb-La=u*(LongueurLigne,0);
-    picture EnsembleLignes,Lignes;
-    EnsembleLignes=image(
-    n:=0;
-    m:=0;
-    for p_=#1:
-    n:=n+1;
+    if \useKV[DessinGradue]{Droites}:
+    drawarrow (1.05[Lb,La]--1.05[La,Lb]) shifted((n-1)*u*(0,-EcartVertical));
+    elseif \useKV[DessinGradue]{DemiDroites}:
+    drawarrow (La--1.05[La,Lb]) shifted((n-1)*u*(0,-EcartVertical));
+    else:
     trace segment(La,Lb) shifted((n-1)*u*(0,-EcartVertical));
+    fi;
+    label(TEX("(\num{"&decimal(n)&"})"),La+u*(-1.5,-(n-1)*EcartVertical));
     for k=0 upto bluepart(p_):
     m:=bluepart(p_);
+    retienspas[n]:=m;
     Lab[k]:=(k/m)[La,Lb];
     trace ((Lab[k]+u*(0,-0.1))--(Lab[k]+u*(0,0.1))) shifted((n-1)*u*(0,-EcartVertical));
-    label(LATEX("(\num{"&decimal(n)&"})"),La+u*(-1.5,-(n-1)*\useKV[DessinGradue]{EcartVertical}));
-    endfor;
-    labeloffset:=labeloffset*1.5;
-    label.top(LATEX("\num{"&decimal(redpart(p_))&"}"),La shifted((n-1)*u*(0,-EcartVertical)));
-    label.top(LATEX("\num{"&decimal(greenpart(p_))&"}"),Lb shifted((n-1)*u*(0,-EcartVertical)));
-    labeloffset:=labeloffset/1.5;
-    endfor;
-    );
-    trace EnsembleLignes scaled Echelle;
-  \end{mpost}
-  \fi
-}
-
-\def\TraceDessinGradueMulSolution#1#2#3{%
-  \ifluatex
-  \mplibforcehmode
-  \begin{mplibcode}
-    pair La,Lb,Lab[];
-    pair 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,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',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'';
-    La=(0,0);
-    Lb-La=u*(\useKV[DessinGradue]{Longueur},0);
-    picture EnsembleLignes,Lignes;
-    EnsembleLignes=image(%
-    drawoptions(withcolor 0.5white);
-    n:=0;
-    m:=0;
-    numeric retienspas[];
-    for p_=#1:
-    n:=n+1;
-    trace segment(La,Lb) shifted((n-1)*u*(0,-\useKV[DessinGradue]{EcartVertical}));
-    label(TEX("(\num{"&decimal(n)&"})"),La+u*(-1.5,-(n-1)*\useKV[DessinGradue]{EcartVertical}));
-    for k=0 upto bluepart(p_):
-    m:=bluepart(p_);
-    retienspas[n]:=bluepart(p_);
-    Lab[k]:=(k/m)[La,Lb];
-    trace ((Lab[k]+u*(0,-0.1))--(Lab[k]+u*(0,0.1))) shifted((n-1)*u*(0,-\useKV[DessinGradue]{EcartVertical}));
     endfor;
     labeloffset:=labeloffset*1.5;
-    label.top(TEX("\num{"&decimal(redpart(p_))&"}"),La shifted((n-1)*u*(0,-\useKV[DessinGradue]{EcartVertical})));
-    label.top(TEX("\num{"&decimal(greenpart(p_))&"}"),Lb shifted((n-1)*u*(0,-\useKV[DessinGradue]{EcartVertical})));
+    label.top(TEX("\num{"&decimal(redpart(p_))&"}"),La shifted((n-1)*u*(0,-EcartVertical)));
+    label.top(TEX("\num{"&decimal(greenpart(p_))&"}"),Lb shifted((n-1)*u*(0,-EcartVertical)));
     labeloffset:=labeloffset/1.5;
     endfor;
     drawoptions();
+    if Solution:
     n:=0;
     numeric nblignes,nbpas;
     for p_=#2:
@@ -8192,37 +9058,46 @@ couleur indiquée, le nombre de cases donné par le résultat du calcul.
     for p_=#3:
     trace p_ withpen pencircle scaled 1.5;
     endfor;
+    fi;
     );
     trace EnsembleLignes scaled \useKV[DessinGradue]{Echelle};
   \end{mplibcode}
   \else
-  \begin{mpost}[mpsettings={numeric LongueurLigne; LongueurLigne=\useKV[DessinGradue]{Longueur};numeric EcartVertical; EcartVertical=\useKV[DessinGradue]{EcartVertical}; numeric Echelle; Echelle=\useKV[DessinGradue]{Echelle};}]
+  \begin{mpost}[mpsettings={numeric LongueurLigne; LongueurLigne=\useKV[DessinGradue]{Longueur};numeric EcartVertical; EcartVertical=\useKV[DessinGradue]{EcartVertical}; numeric Echelle; Echelle=\useKV[DessinGradue]{Echelle}; boolean Solution,Droites,DemiDroites; Solution=\useKV[DessinGradue]{Solution}; Droites=\useKV[DessinGradue]{Droites}; DemiDroites=\useKV[DessinGradue]{DemiDroites};}]
     pair La,Lb,Lab[];
-    pair 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,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',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'';
     La=(0,0);
+    pair 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,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',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'';
     Lb-La=u*(LongueurLigne,0);
     picture EnsembleLignes,Lignes;
     EnsembleLignes=image(
+    if Solution:
+    drawoptions(withcolor 0.5white);
+    fi;
     n:=0;
     m:=0;
-    numeric retienspas[];
-    drawoptions(withcolor 0.5white);
     for p_=#1:
     n:=n+1;
+    if Droites:
+    drawarrow (1.05[Lb,La]--1.05[La,Lb]) shifted((n-1)*u*(0,-EcartVertical));
+    elseif DemiDroites:
+    drawarrow (La--1.05[La,Lb]) shifted((n-1)*u*(0,-EcartVertical));
+    else:
     trace segment(La,Lb) shifted((n-1)*u*(0,-EcartVertical));
-    label(LATEX("(\num{"&decimal(n)&"})"),La+u*(-1.5,-(n-1)*\useKV[DessinGradue]{EcartVertical}));
+    fi;
+    label(LATEX("(\num{"&decimal(n)&"})"),La+u*(-1.5,-(n-1)*EcartVertical));
     for k=0 upto bluepart(p_):
     m:=bluepart(p_);
-    retienspas[n]:=bluepart(p_);
+    retienspas[n]:=m;
     Lab[k]:=(k/m)[La,Lb];
     trace ((Lab[k]+u*(0,-0.1))--(Lab[k]+u*(0,0.1))) shifted((n-1)*u*(0,-EcartVertical));
     endfor;
     labeloffset:=labeloffset*1.5;
-    label.top(TEX("\num{"&decimal(redpart(p_))&"}"),La shifted((n-1)*u*(0,-EcartVertical)));
-    label.top(TEX("\num{"&decimal(greenpart(p_))&"}"),Lb shifted((n-1)*u*(0,-EcartVertical)));
+    label.top(LATEX("\num{"&decimal(redpart(p_))&"}"),La shifted((n-1)*u*(0,-EcartVertical)));
+    label.top(LATEX("\num{"&decimal(greenpart(p_))&"}"),Lb shifted((n-1)*u*(0,-EcartVertical)));
     labeloffset:=labeloffset/1.5;
     endfor;
     drawoptions();
+    if Solution:
     n:=0;
     numeric nblignes,nbpas;
     for p_=#2:
@@ -8239,6 +9114,7 @@ couleur indiquée, le nombre de cases donné par le résultat du calcul.
     for p_=#3:
     trace p_ withpen pencircle scaled 1.5;
     endfor;
+    fi;
     );
     trace EnsembleLignes scaled Echelle;
   \end{mpost}
@@ -8253,47 +9129,36 @@ couleur indiquée, le nombre de cases donné par le résultat du calcul.
 \newcommand\DessinGradue[4][]{%
   \useKVdefault[DessinGradue]%
   \setKV[DessinGradue]{#1}%
-  \ifboolKV[DessinGradue]{Droites}{%
-    %en travail
-    \setsepchar[*]{,*/}%
-    \readlist\ListeDefDroites{#2}%
-    \newtoks\toklistedefdroites%
-    \foreachitem\compteur\in\ListeDefDroites{\expandafter\UpdateDefDroites\compteur\nil}%
-    %en travail
-  }{%
-    \ifboolKV[DessinGradue]{LignesIdentiques}{%
-      \ifboolKV[DessinGradue]{Solution}{%
-        \setsepchar[*]{,*/}%
-        \readlist\ListePG{#3}%
-        \setsepchar[*]{§*/}%
-        \readlist\ListeTraces{#4}%
-        \newtoks\toklisteptsgrad%
-        \foreachitem\compteur\in\ListePG{\expandafter\UpdateLignes\compteur\nil}%
-        \newtoks\toklistetracesgrad%
-        \foreachitem\compteur\in\ListeTraces{\expandafter\UpdateTraces\compteur\nil}%
-        \TraceDessinGradueSolution{\useKV[DessinGradue]{Lignes}}{\useKV[DessinGradue]{Debut}}{\useKV[DessinGradue]{Fin}}{\useKV[DessinGradue]{Pas}}{\the\toklisteptsgrad}{\the\toklistetracesgrad}%
-      }{%
-        \TraceDessinGradue{\useKV[DessinGradue]{Lignes}}{\useKV[DessinGradue]{Debut}}{\useKV[DessinGradue]{Fin}}{\useKV[DessinGradue]{Pas}}%
-      }%
-    }{%
+  \ifboolKV[DessinGradue]{LignesIdentiques}{%
+    \newtoks\toklisteptsgrad%
+    \newtoks\toklistetracesgrad%
+    \ifboolKV[DessinGradue]{Solution}{%
       \setsepchar[*]{,*/}%
-      \readlist\ListeDefLigne{#2}%
-      \newtoks\toklistedefligne%
-      \foreachitem\compteur\in\ListeDefLigne{\expandafter\UpdateDefLignes\compteur\nil}%
-      \ifboolKV[DessinGradue]{Solution}{%
-        \setsepchar[*]{,*/}%
-        \readlist\ListePG{#3}%
-        \setsepchar[*]{§*/}%
-        \readlist\ListeTraces{#4}%
-        \newtoks\toklisteptsgrad%
-        \foreachitem\compteur\in\ListePG{\expandafter\UpdateLignes\compteur\nil}%
-        \newtoks\toklistetracesgrad%
-        \foreachitem\compteur\in\ListeTraces{\expandafter\UpdateTraces\compteur\nil}%
-        \TraceDessinGradueMulSolution{\the\toklistedefligne}{\the\toklisteptsgrad}{\the\toklistetracesgrad}%
-      }{%
-        \TraceDessinGradueMul{\the\toklistedefligne}%
-      }%
+      \readlist\ListePG{#3}%
+      \setsepchar[*]{§*/}%
+      \readlist\ListeTraces{#4}%
+      \foreachitem\compteur\in\ListePG{\expandafter\UpdateLignes\compteur\nil}%
+      \foreachitem\compteur\in\ListeTraces{\expandafter\UpdateTraces\compteur\nil}%
+    }{}%
+    \TraceDessinGradue{\useKV[DessinGradue]{Lignes}}{\useKV[DessinGradue]{Debut}}{\useKV[DessinGradue]{Fin}}{\useKV[DessinGradue]{Pas}}{\the\toklisteptsgrad}{\the\toklistetracesgrad}%
+  }{%
+    \setsepchar[*]{,*/}%
+    \readlist\ListeDefLigne{#2}%
+    \xdef\toklistedefligne{}%
+    \foreachitem\compteur\in\ListeDefLigne{%
+      \xdef\toklistedefligne{\toklistedefligne (\ListeDefLigne[\compteurcnt,1],\ListeDefLigne[\compteurcnt,2],\ListeDefLigne[\compteurcnt,3]),}%
     }%
+    \newtoks\toklisteptsgrad%
+    \newtoks\toklistetracesgrad%
+    \ifboolKV[DessinGradue]{Solution}{%
+      \setsepchar[*]{,*/}%
+      \readlist\ListePG{#3}%
+      \setsepchar[*]{§*/}%
+      \readlist\ListeTraces{#4}%
+      \foreachitem\compteur\in\ListePG{\expandafter\UpdateLignes\compteur\nil}%
+      \foreachitem\compteur\in\ListeTraces{\expandafter\UpdateTraces\compteur\nil}%
+    }{}%
+    \TraceDessinGradueMul{\toklistedefligne}{\the\toklisteptsgrad}{\the\toklistetracesgrad}%
   }%
 }%
 
@@ -19024,7 +19889,7 @@ Barre=false,Longueur=10cm,Hauteur=5mm,Bicolore=false,EcartBarre=0%Grille est dis
 %%%
 % Fonction
 %%%
-\setKVdefault[ClesFonction]{Nom=f,Variable=x,Calcul=x,Tableau=false,Largeur=5mm,Ecriture=false,Definition=false,Points=false,Tangentes=false,PasX=1,PasY=1,UniteX=1,UniteY=1,Prolonge=false,Trace=false}
+\setKVdefault[ClesFonction]{Nom=f,Variable=x,Calcul=x,Tableau=false,Largeur=5mm,Ecriture=false,Definition=false,Points=false,Tangentes=false,PasX=1,PasY=1,UniteX=1,UniteY=1,Prolonge=false,Trace=false,Catmull=false,Epaisseur=1}
 
 \newtoks\toklistePtsFn%pour la discipline
 
@@ -19109,10 +19974,10 @@ Barre=false,Longueur=10cm,Hauteur=5mm,Bicolore=false,EcartBarre=0%Grille est dis
     draw Fn[0]
     for k=1 upto N:
     ..Fn[k]
-    endfor;
+    endfor withpen pencircle scaled \useKV[ClesFonction]{Epaisseur};
   \end{mplibcode}
   \else
-  \begin{mpost}
+  \begin{mpost}[mpsettings={numeric Epaisseur; Epaisseur=\useKV[ClesFonction]{Epaisseur};}]
     x.u:=#2;
     y.u:=#3;
     X.u:=#4;
@@ -19181,7 +20046,7 @@ Barre=false,Longueur=10cm,Hauteur=5mm,Bicolore=false,EcartBarre=0%Grille est dis
     draw Fn[0]
     for k=1 upto N:
     ..Fn[k]
-    endfor;
+    endfor withpen pencircle scaled Epaisseur;
   \end{mpost}
   \fi
 }
@@ -19267,11 +20132,11 @@ Barre=false,Longueur=10cm,Hauteur=5mm,Bicolore=false,EcartBarre=0%Grille est dis
     for k=1 upto (N-1):
     ..{dir dirav[k]}Fn[k]{dir dirap[k]}
     endfor
-    ..{dir dirav[N]}Fn[N];
+    ..{dir dirav[N]}Fn[N] withpen pencircle scaled \useKV[ClesFonction]{Epaisseur};
   \end{mplibcode}
   \else
-  \begin{mpost}
-        x.u:=#2;
+  \begin{mpost}[mpsettings={numeric Epaisseur; Epaisseur=\useKV[ClesFonction]{Epaisseur};}]
+    x.u:=#2;
     y.u:=#3;
     X.u:=#4;
     Y.u:=#5;
@@ -19310,7 +20175,7 @@ Barre=false,Longueur=10cm,Hauteur=5mm,Bicolore=false,EcartBarre=0%Grille est dis
     MaxY:=ypart(Gn[k]);
     fi;
     endfor;
-        if #6=0:
+    if #6=0:
     for k=MinY-1 step y.u until MaxY+1:
     draw cm*((MinX-1)*X.u,k*Y.u)--cm*((MaxX+1)*X.u,k*Y.u) withcolor 0.75white;
     endfor;
@@ -19348,11 +20213,129 @@ Barre=false,Longueur=10cm,Hauteur=5mm,Bicolore=false,EcartBarre=0%Grille est dis
     for k=1 upto (N-1):
     ..{dir dirav[k]}Fn[k]{dir dirap[k]}
     endfor
-    ..{dir dirav[N]}Fn[N];
+    ..{dir dirav[N]}Fn[N] withpen pencircle scaled Epaisseur;
   \end{mpost}
   \fi
 }
 
+\def\MPCatmull#1#2#3#4#5{%
+  % #1 la liste des points
+  % #2: pas en x
+  % #3: pas en y
+  % #4: unit\'e en x
+  % #5: unit\'e en y
+  \ifluatex
+  \mplibforcehmode
+  \begin{mplibcode}
+    x.u:=#2;
+    y.u:=#3;
+    X.u:=#4;
+    Y.u:=#5;
+    numeric dirav[],dirap[];
+    pair Fn[],Gn[];
+    n=0;
+    for p_=#1:
+    Gn[n]=p_;
+    Fn[n]=cm*(X.u*xpart(p_),Y.u*ypart(p_));
+    n:=n+1;
+    endfor;
+    N:=(n-1);
+    MinX=999;
+    MaxX=-999;
+    MinY=999;
+    MaxY=-999;
+    for k=0 upto N:
+    if xpart(Gn[k])<MinX:
+    MinX:=xpart(Gn[k]);
+    fi;
+    if xpart(Gn[k])>MaxX:
+    MaxX:=xpart(Gn[k]);
+    fi;
+    if ypart(Gn[k])<MinY:
+    MinY:=ypart(Gn[k]);
+    fi;
+    if ypart(Gn[k])>MaxY:
+    MaxY:=ypart(Gn[k]);
+    fi;
+    endfor;
+    for k=MinY-1 step y.u until MaxY+1:
+    draw cm*((MinX-1)*X.u,k*Y.u)--cm*((MaxX+1)*X.u,k*Y.u) withcolor 0.75white;
+    endfor;
+    for k=MinX-1 step x.u until MaxX+1:
+    draw cm*(k*X.u,(MinY-1)*Y.u)--cm*(k*X.u,(MaxY+1)*Y.u) withcolor 0.75white;
+    endfor;
+    for k=0 upto N:
+    fill cercles(Fn[k],0.5mm);
+    endfor;
+    drawarrow (0,(MinY-1)*Y.u*cm)--(0,(MaxY+1)*Y.u*cm);
+    drawarrow ((MinX-1)*X.u*cm,0)--((MaxX+1)*X.u*cm,0);
+    %
+    label.llft(btex O etex,(0,0));
+    dotlabel.bot(btex 1 etex,cm*X.u*(1,0));
+    dotlabel.lft(btex 1 etex,cm*Y.u*(0,1));
+    %
+    draw Fn[1]
+    for k=2 upto N-1:
+    ..{dir angle(Fn[k+1]-Fn[k-1])}Fn[k]{dir angle(Fn[k+1]-Fn[k-1])}
+    endfor withpen pencircle scaled \useKV[ClesFonction]{Epaisseur};
+  \end{mplibcode}
+  \else
+  \begin{mpost}[mpsettings={numeric Epaisseur; Epaisseur=\useKV[ClesFonction]{Epaisseur};}]
+    x.u:=#2;
+    y.u:=#3;
+    X.u:=#4;
+    Y.u:=#5;
+    numeric dirav[],dirap[];
+    pair Fn[],Gn[];
+    n=0;
+    for p_=#1:
+    Gn[n]=p_;
+    Fn[n]=cm*(X.u*xpart(p_),Y.u*ypart(p_));
+    n:=n+1;
+    endfor;
+    N:=(n-1);
+    MinX=999;
+    MaxX=-999;
+    MinY=999;
+    MaxY=-999;
+    for k=0 upto N:
+    if xpart(Gn[k])<MinX:
+    MinX:=xpart(Gn[k]);
+    fi;
+    if xpart(Gn[k])>MaxX:
+    MaxX:=xpart(Gn[k]);
+    fi;
+    if ypart(Gn[k])<MinY:
+    MinY:=ypart(Gn[k]);
+    fi;
+    if ypart(Gn[k])>MaxY:
+    MaxY:=ypart(Gn[k]);
+    fi;
+    endfor;
+    for k=MinY-1 step y.u until MaxY+1:
+    draw cm*((MinX-1)*X.u,k*Y.u)--cm*((MaxX+1)*X.u,k*Y.u) withcolor 0.75white;
+    endfor;
+    for k=MinX-1 step x.u until MaxX+1:
+    draw cm*(k*X.u,(MinY-1)*Y.u)--cm*(k*X.u,(MaxY+1)*Y.u) withcolor 0.75white;
+    endfor;
+    for k=0 upto N:
+    fill cercles(Fn[k],0.5mm);
+    endfor;
+    drawarrow (0,(MinY-1)*Y.u*cm)--(0,(MaxY+1)*Y.u*cm);
+    drawarrow ((MinX-1)*X.u*cm,0)--((MaxX+1)*X.u*cm,0);
+    % 
+    label.llft(btex O etex,(0,0));
+    dotlabel.bot(btex 1 etex,cm*X.u*(1,0));
+    dotlabel.lft(btex 1 etex,cm*Y.u*(0,1));
+    % 
+    draw Fn[1]
+    for k=2 upto N-1:
+    ..{dir angle(Fn[k+1]-Fn[k-1])}Fn[k]{dir angle(Fn[k+1]-Fn[k-1])}
+    endfor withpen pencircle scaled Epaisseur;
+  \end{mpost}
+  \fi
+}%
+
 \newcommand\Fonction[2][]{%
   \useKVdefault[ClesFonction]%
   \setKV[ClesFonction]{#1}%
@@ -19365,23 +20348,32 @@ Barre=false,Longueur=10cm,Hauteur=5mm,Bicolore=false,EcartBarre=0%Grille est dis
       \toklistePtsFn{}%
       \setsepchar[*]{§*/}%\ignoreemptyitems%
       \readlist*\ListePoints{#2}%
-      \ifboolKV[ClesFonction]{Tangentes}{%
+      \ifboolKV[ClesFonction]{Catmull}{%
+        \xdef\PfCFooListePoints{(\ListePoints[1,2],\ListePoints[1,3]),}
         \foreachitem\compteur\in\ListePoints{%
-          \expandafter\UpdatePtsFn\compteur\nil%
-        }%
-        \ifboolKV[ClesFonction]{Prolonge}{%
-          \MPCourbe{\the\toklistePtsFn}{\useKV[ClesFonction]{PasX}}{\useKV[ClesFonction]{PasY}}{\useKV[ClesFonction]{UniteX}}{\useKV[ClesFonction]{UniteY}}{1}%
-        }{%
-          \MPCourbe{\the\toklistePtsFn}{\useKV[ClesFonction]{PasX}}{\useKV[ClesFonction]{PasY}}{\useKV[ClesFonction]{UniteX}}{\useKV[ClesFonction]{UniteY}}{0}%
+          \xdef\PfCFooListePoints{\PfCFooListePoints (\ListePoints[\compteurcnt,2],\ListePoints[\compteurcnt,3]),}%
         }%
+        \xdef\PfCFooListePoints{\PfCFooListePoints (\ListePoints[\ListePointslen,2],\ListePoints[\ListePointslen,3]),}%
+        \MPCatmull{\PfCFooListePoints}{\useKV[ClesFonction]{PasX}}{\useKV[ClesFonction]{PasY}}{\useKV[ClesFonction]{UniteX}}{\useKV[ClesFonction]{UniteY}}%
       }{%
-        \foreachitem\compteur\in\ListePoints{%
-          \expandafter\UpdatePtsFN\compteur\nil%
-        }%
-        \ifboolKV[ClesFonction]{Prolonge}{%
-          \MPCourbePoints{\the\toklistePtsFn}{\useKV[ClesFonction]{PasX}}{\useKV[ClesFonction]{PasY}}{\useKV[ClesFonction]{UniteX}}{\useKV[ClesFonction]{UniteY}}{1}%
+        \ifboolKV[ClesFonction]{Tangentes}{%
+          \foreachitem\compteur\in\ListePoints{%
+            \expandafter\UpdatePtsFn\compteur\nil%
+          }%
+          \ifboolKV[ClesFonction]{Prolonge}{%
+            \MPCourbe{\the\toklistePtsFn}{\useKV[ClesFonction]{PasX}}{\useKV[ClesFonction]{PasY}}{\useKV[ClesFonction]{UniteX}}{\useKV[ClesFonction]{UniteY}}{1}%
+          }{%
+            \MPCourbe{\the\toklistePtsFn}{\useKV[ClesFonction]{PasX}}{\useKV[ClesFonction]{PasY}}{\useKV[ClesFonction]{UniteX}}{\useKV[ClesFonction]{UniteY}}{0}%
+          }%
         }{%
-          \MPCourbePoints{\the\toklistePtsFn}{\useKV[ClesFonction]{PasX}}{\useKV[ClesFonction]{PasY}}{\useKV[ClesFonction]{UniteX}}{\useKV[ClesFonction]{UniteY}}{0}%
+          \foreachitem\compteur\in\ListePoints{%
+            \expandafter\UpdatePtsFN\compteur\nil%
+          }%
+          \ifboolKV[ClesFonction]{Prolonge}{%
+            \MPCourbePoints{\the\toklistePtsFn}{\useKV[ClesFonction]{PasX}}{\useKV[ClesFonction]{PasY}}{\useKV[ClesFonction]{UniteX}}{\useKV[ClesFonction]{UniteY}}{1}%
+          }{%
+            \MPCourbePoints{\the\toklistePtsFn}{\useKV[ClesFonction]{PasX}}{\useKV[ClesFonction]{PasY}}{\useKV[ClesFonction]{UniteX}}{\useKV[ClesFonction]{UniteY}}{0}%
+          }%
         }%
       }%
     }{%
@@ -19419,7 +20411,7 @@ Barre=false,Longueur=10cm,Hauteur=5mm,Bicolore=false,EcartBarre=0%Grille est dis
 %%%
 % Diff\'erentes représentations graphiques
 %%%
-\setKVdefault[TraceG]{Grille=false,Graduations=false,PasGradX=1,PasGradY=1,PasGrilleX=1,PasGrilleY=1,Xmin=-5.5,Xmax=5.5,Xstep=1,Ymin=-5.5,Ymax=5.5,Ystep=1,Bornea=-5.5,Borneb=5.5,LabelX={},LabelY={},LabelC=0.5,NomCourbe={},Origine={(5.5,5.5)},Fonction=false,Points=false,Invisible=false,CouleurPoint=red,CouleurTrace=black,Relie=false,RelieSegment=false,Marque=dot}
+\setKVdefault[TraceG]{Grille=false,Graduations=false,PasGradX=1,PasGradY=1,PasGrilleX=1,PasGrilleY=1,Xmin=-5.5,Xmax=5.5,Xstep=1,Ymin=-5.5,Ymax=5.5,Ystep=1,Bornea=-5.5,Borneb=5.5,LabelX={},LabelY={},LabelC=0.5,NomCourbe={},Origine={(5.5,5.5)},Fonction=false,Points=false,Invisible=false,CouleurPoint=red,CouleurTrace=black,Epaisseur=1,Relie=false,RelieSegment=false,Marque=dot}
 
 \newcommand\TraceGraphique[2][]{%
   \useKVdefault[TraceG]%
@@ -19637,7 +20629,8 @@ Barre=false,Longueur=10cm,Hauteur=5mm,Bicolore=false,EcartBarre=0%Grille est dis
     gradx=\useKV[TraceG]{PasGradX};
     grady=\useKV[TraceG]{PasGradY};
     pos=\useKV[TraceG]{LabelC};
-
+    Epaisseur:=\useKV[TraceG]{Epaisseur};
+    
     color colortrace;
     colortrace=\useKV[TraceG]{CouleurTrace};
     
@@ -19720,12 +20713,12 @@ Barre=false,Longueur=10cm,Hauteur=5mm,Bicolore=false,EcartBarre=0%Grille est dis
     dotlabel.lft(TEX("\num{"&decimal(k)&"}"),(xpart(Origine*cm),k*y.u+ypart(Origine*cm)));
     endfor;
     fi;
-    drawoptions(withpen pencircle scaled1.5);
+    drawoptions(withpen pencircle scaled(1));
     drawarrow (u*(0,ymin)--u*(0,ymax)) shifted (u*(xpart(Origine),0));
     drawarrow (u*(xmin,0)--u*(xmax,0)) shifted (u*(0,ypart(Origine)));
     label.llft(btex 0 etex,u*Origine);
     drawoptions();
-    draw courbe1(borneinf,bornesup,100)(#2) withcolor colortrace;
+    draw courbe1(borneinf,bornesup,100)(#2) withpen (pencircle scaled Epaisseur) withcolor colortrace;
     % labelisation
     numeric t;
     t=pos*length Cb1;
@@ -19743,7 +20736,7 @@ Barre=false,Longueur=10cm,Hauteur=5mm,Bicolore=false,EcartBarre=0%Grille est dis
     \usepackage{ProfCollege}
     \setKV[TraceG]{#1}
   }
-  \begin{mpost}[mpsettings={borneinf=\useKV[TraceG]{Bornea};bornesup=\useKV[TraceG]{Borneb};xmin=\useKV[TraceG]{Xmin};xmax=\useKV[TraceG]{Xmax};ymin=\useKV[TraceG]{Ymin};ymax=\useKV[TraceG]{Ymax};pasx=\useKV[TraceG]{Xstep};pasy=\useKV[TraceG]{Ystep};xu=1cm/\useKV[TraceG]{Xstep};yu=1cm/\useKV[TraceG]{Ystep};grillex=\useKV[TraceG]{PasGrilleX};grilley=\useKV[TraceG]{PasGrilleY};pos=\useKV[TraceG]{LabelC};color colortrace;colortrace=\useKV[TraceG]{CouleurTrace};boolean Grille;Grille=\useKV[TraceG]{Grille};boolean Graduations;Graduations=\useKV[TraceG]{Graduations};
+  \begin{mpost}[mpsettings={borneinf=\useKV[TraceG]{Bornea};bornesup=\useKV[TraceG]{Borneb};xmin=\useKV[TraceG]{Xmin};xmax=\useKV[TraceG]{Xmax};ymin=\useKV[TraceG]{Ymin};ymax=\useKV[TraceG]{Ymax};pasx=\useKV[TraceG]{Xstep};pasy=\useKV[TraceG]{Ystep};xu=1cm/\useKV[TraceG]{Xstep};yu=1cm/\useKV[TraceG]{Ystep};grillex=\useKV[TraceG]{PasGrilleX};grilley=\useKV[TraceG]{PasGrilleY};pos=\useKV[TraceG]{LabelC};Epaisseur=\useKV[TraceG]{Epaisseur}; color colortrace;colortrace=\useKV[TraceG]{CouleurTrace};boolean Grille;Grille=\useKV[TraceG]{Grille};boolean Graduations;Graduations=\useKV[TraceG]{Graduations};
     pair Origine;
     Origine=(xmin,ymin)+\useKV[TraceG]{Origine};}]
 
@@ -19821,7 +20814,7 @@ Barre=false,Longueur=10cm,Hauteur=5mm,Bicolore=false,EcartBarre=0%Grille est dis
     drawarrow (u*(0,ymin)--u*(0,ymax)) shifted (u*(xpart(Origine),0));
     drawarrow (u*(xmin,0)--u*(xmax,0)) shifted (u*(0,ypart(Origine)));
     drawoptions();
-    draw courbe1(borneinf,bornesup,100)(#2) withcolor colortrace;
+    draw courbe1(borneinf,bornesup,100)(#2) withpen (pencircle scaled Epaisseur) withcolor colortrace;
 %    % labelisation
     numeric t;
     t=pos*length Cb1;
@@ -22714,7 +23707,7 @@ u:=\useKV[ClesFormule]{Echelle};
     if p_<>"":
     drawarrow (unitp*(valeur[n],-1))--(unitp*(valeur[n],-0.3));
     label.bot(btex \hbox to2em{\dotfill} etex,(unitp*(valeur[n],-1)));
-    pointe(unitp*(valeur[n]-ValeurOrigine,0));
+    pointe(unitp*(valeur[n],0));
     fi;
     elseif AffichageCoord=2:
     if p_<>"":
@@ -22856,7 +23849,7 @@ u:=\useKV[ClesFormule]{Echelle};
     if p_<>"":
     drawarrow (unitp*(valeur[n],-1))--(unitp*(valeur[n],-0.3));
     label.bot(btex \noexpand\hbox to2em{\noexpand\dotfill} etex,(unitp*(valeur[n],-1)));
-    pointe(unitp*(valeur[n]-ValeurOrigine,0));
+    pointe(unitp*(valeur[n],0));
     fi;
     elseif AffichageCoord=2:
     if p_<>"":
@@ -25540,7 +26533,7 @@ label.lft(LATEX("\noexpand\footnotesize\noexpand\SI{\noexpand\fpeval{"&decimal(V
   \setlength{\PfCLongInter}{-40pt+\fpeval{\useKV[Tableur]{LargeurUn}}pt+\fpeval{(\useKV[Tableur]{Colonnes}-2)*\useKV[Tableur]{Largeur}}pt+\fpeval{2*\useKV[Tableur]{Colonnes}-6}\tabcolsep+\fpeval{\useKV[Tableur]{Colonnes}+2}\arrayrulewidth}%  
   \ifboolKV[Tableur]{Bandeau}{%
     \begin{NiceTabular}{p{\PfCTableurLargeur}p{10pt}p{50pt}p{\PfCLongInter}}
-      \Block[draw]{}{\useKV[Tableur]{Cellule}}&\Block[draw]{}{\scriptsize$\blacktriangledown$}&\Block{}{$f_x$\hfill$\sum$~\scriptsize$\blacktriangledown$\hfill$=$}&\Block[draw]{}{\useKV[Tableur]{Formule}\hfill\scriptsize$\blacktriangledown$}\\
+      \Block[draw,l]{}{\useKV[Tableur]{Cellule}}&\Block[draw]{}{\scriptsize$\blacktriangledown$}&\Block{}{$f_x$\hfill$\sum$~\scriptsize$\blacktriangledown$\hfill$=$}&\Block[draw]{}{\useKV[Tableur]{Formule}\hfill\scriptsize$\blacktriangledown$}\\
     \end{NiceTabular}%
     \nopagebreak%
     \\%
diff --git a/macros/latex/contrib/profcollege/metapost/PfCObjets.mp b/macros/latex/contrib/profcollege/metapost/PfCObjets.mp
index 96daf3d3bc..964cfedd8a 100644
--- a/macros/latex/contrib/profcollege/metapost/PfCObjets.mp
+++ b/macros/latex/contrib/profcollege/metapost/PfCObjets.mp
@@ -637,6 +637,37 @@ vardef Objetsphere[](expr Rn)=
   apj.@:=apj-1;
 enddef;
 
+vardef ObjetSphereNew[](expr Rn)=
+  Outcolor.@:=outcolor;
+  Incolor.@:=incolor;
+  if creux:Ferme.@:=false else: Ferme.@:=true fi;
+  scantokens("numeric "&substring(0,1) of Rn&"; "&Rn&";");
+  vardef Famille(expr u,v)=(R*(cos(u)*cos(v),cos(u)*sin(v),sin(u))) enddef;
+  umin:=-pi/2; upas:=pi/nb; umax:=pi/2;
+  vmin:=-pi; vpas:=2*pi/subh; vmax:=pi;
+  apj:=0;
+  %On cr�e les facettes et on calcule la profondeur en Z.
+  for k=0 upto (nb-1):
+    for l=0 upto (subh-1):
+      tcpt.@[apj]:=apj;
+      OTFc.@[apj].nb:=4;
+      OTFc.@[apj][1]:=Image(Famille(umin+(k+1)*upas,vmin+l*vpas));
+      OTFc.@[apj][2]:=Image(Famille(umin+k*upas,vmin+l*vpas));
+      OTFc.@[apj][3]:=Image(Famille(umin+k*upas,vmin+(l+1)*vpas));
+      OTFc.@[apj][4]:=Image(Famille(umin+(k+1)*upas,vmin+(l+1)*vpas));
+      OTFc.@[apj].iso:=(OTFc.@[apj][1]+OTFc.@[apj][2]+OTFc.@[apj][3]+OTFc.@[apj][4])/4;
+      ALT.@[apj]:=-Zpart(GCoord(OTFc.@[apj].iso));
+      if ProduitScalaire(Oeil-OTFc.@[apj].iso,Normal(OTFc.@[apj].iso,OTFc.@[apj][1],OTFc.@[apj][2]))>=0:
+	Vue.@[apj]:=true;coul.@[apj]:=outcolor;
+      else:
+	Vue.@[apj]:=false;coul.@[apj]:=incolor;
+      fi;
+      apj:=apj+1;
+    endfor;
+  endfor;
+  apj.@:=apj-1;
+enddef;
+
 vardef Objetcalotte[](expr Rn,Phib,Phih)=
   Outcolor.@:=outcolor;
   Incolor.@:=incolor;
diff --git a/macros/luatex/generic/lutabulartools/lutabulartools.lua b/macros/luatex/generic/lutabulartools/lutabulartools.lua
index 24c8d5598e..23ef965482 100644
--- a/macros/luatex/generic/lutabulartools/lutabulartools.lua
+++ b/macros/luatex/generic/lutabulartools/lutabulartools.lua
@@ -1,5 +1,5 @@
 --% Kale Ewasiuk (kalekje@gmail.com)
---% 2022-10-22
+--% 2022-11-27
 --% Copyright (C) 2021-2022 Kale Ewasiuk
 --%
 --% Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -28,11 +28,61 @@ if (__PL_EXTRAS__ == nil) or  (__PENLIGHT__ == nil) then
     tex.sprint('\\PackageError{yamlvars}{penlight package with extras (or extrasglobals) option must be loaded before this package}{}')
     tex.print('\\stop')
 end
+local T = pl.tablex
 
 local ltt = {}
 
+ltt.tablelevel = 0
 
 ltt.debug = false
+
+ltt.auto_topbot = false
+
+ltt.auto_crules = {} -- {{span,trim}, } appearance is like this, 'range|trim', -- auto_rules created by MC
+ltt.auto_midrules = {}
+
+ltt.col_spec1 = {} -- column spec if one column wide (since makcell nests a tabular, preserve col_spec below)
+ltt.col_spec = {} -- tab column spec if above 1
+ltt.col = '' -- current column spec, single char, only applies to tabular with more than 1 column
+ltt.col_num = 1 -- current column number
+ltt.row_num = 0 -- current row number
+
+
+ltt.col_ver_repl = {
+m = 'm',
+M = 'm',
+b = 'b',
+}
+
+ltt.col_hor_repl = { -- horizontal cell alignment that multicolumn should use if () or [hori] not passed to func
+    l = 'l',
+    c = 'c',
+    r = 'r',
+    p = 'l',
+    P = 'c',
+    X = 'l',
+    Y = 'c',
+    Z = 'l',
+    N = 'c',
+    L = 'l',
+    R = 'r',
+    C = 'c',
+}
+
+-- allow user to place their own replacements in for a table, say if they define a column that expands to multiple
+ltt.col_replaces = {
+--x = 'lll'
+}
+
+ltt.SI_cols = {'S', 'N', 'Q', 'L', 'R'}
+
+
+
+-----
+-----       utility funcs
+-----
+
+
 function ltt.debugtalk(s, ss)
     ss = ss or ''
     if ltt.debug then
@@ -40,12 +90,32 @@ function ltt.debugtalk(s, ss)
     end
 end
 
-ltt.col_spec1 = {} -- column spec if one column wide (since makcell nests a tabular, preserve col_spec below)
-ltt.col_spec = {} -- tab column spec if above 1
-ltt.col = '' -- current column spec, single char, only applies to tabular with more than 1 column
-ltt.col_num = 1 -- current column number
+
+function ltt.set_tabular(sett)
+    sett = luakeys.parse(sett)
+    local trim = ''
+    for k, v in pairs(sett) do
+        if k == 'tbrule' then
+            ltt.auto_topbot = v
+        elseif k == 'nopad' then
+            if pl.hasval(v) then trim = '@{}' end -- set to trim
+            tex.print('\\newcolumntype{\\lttltrim}{'..trim..'}')
+            tex.print('\\newcolumntype{\\lttrtrim}{'..trim..'}')
+        end
+    end
+end
 
 
+-----
+-----       tabular utility funcs
+-----
+
+function ltt.reset_rows()
+    if ltt.tablelevel == 1 then
+        ltt.row_num = 0
+    end
+end
+
 function ltt.set_col_num()
     -- register current column info (column number and specification)
     local nest
@@ -96,7 +166,12 @@ end
 -- this case should be considered in this code.
 -- for example: \multirow{2}{=}
 
-function ltt.MagicCell(s0,spec,mcspec,pre,content)
+
+-----
+-----       magic cell and helpers
+-----
+
+function ltt.MagicCell(s0,spec,mcspec,pre,content,trim)
     --
     ltt.set_col_num() -- register current column number and column spec
 
@@ -144,9 +219,14 @@ function ltt.MagicCell(s0,spec,mcspec,pre,content)
     --help_wrt(STR..' <<< magic cell string')
     ltt.debugtalk(STR,'MagicCell')
     tex.sprint(STR)--tex print the STR
+
+    local en
+    if c == '' then en = ltt.col_num else en = ltt.col_num + c -1 end
+    ltt.add_auto_crule(ltt.col_num, en, trim)
 end
 
 
+
 function ltt.parse_MagicCell_spec(spec)
     local mrowsym = '*' -- *  = natural width, = will match p{2cm} for example
     local skipmakecell = false
@@ -199,45 +279,76 @@ function ltt.get_HColSpec(h, mcspec, c) -- take horizontal alignment
 end
 
 
+-----
+-----       autorules (with \MC() or auto top bot
+-----
 
-ltt.col_ver_repl = {
-m = 'm',
-M = 'm',
-b = 'b',
-}
+function ltt.add_auto_midrules(rows)
+    ltt.auto_midrules = rows:split(',')
+end
+
+function ltt.add_auto_crule(st,en,trim)
+    if trim ~= 'x' then
+        ltt.auto_crules[#ltt.auto_crules + 1] = {math.floor(st)..'-'..math.floor(en), trim} -- append here
+        -- {{span 1-2, trim}, ..}
+    end
+end
+
+
+function ltt.process_auto_rules()
+    if ltt.tablelevel == 1 then
+        ltt.row_num = ltt.row_num + 1
+    end
+    if ltt.auto_crules ~= {} then
+        if ltt.tablelevel == 1 then
+            for _, v in ipairs(ltt.auto_crules) do
+                --pl.help_wrt(ltt.auto_crules, 'fuck')
+                ltt.make1cmidrule('', v[2], v[1], 'cmidrule')
+            end
+            for i, v in ipairs(ltt.auto_midrules) do
+                --pl.help_wrt(ltt.auto_midrules, 'fuck')
+                --pl.help_wrt(v, 'fuck')
+                pl.help_wrt(ltt.row_num, 'fuck')
+                if tonumber(v) == ltt.row_num then
+                    _ = table.remove(ltt.auto_midrules,i)
+                    --pl.help_wrt(v, 'removed!')
+                    tex.print('\\midrule ')
+                end
+            end
+        end
+    end
+    ltt.auto_crules = {}
+end
 
-ltt.col_hor_repl = { -- horizontal cell alignment that multicolumn should use if () or [hori] not passed to func
-    l = 'l',
-    c = 'c',
-    r = 'r',
-    p = 'l',
-    P = 'c',
-    X = 'l',
-    Y = 'c',
-    Z = 'l',
-    N = 'c',
-    L = 'l',
-    R = 'r',
-    C = 'c',
-}
 
--- allow user to place their own replacements in for a table, say if they define a column that expands to multiple
-ltt.col_replaces = {
---x = 'lll'
-}
 
-ltt.SI_cols = {'S', 'N', 'Q', 'L', 'R'}
---ltt.SI_cols = {'S'}
---ltt.SI_cols = {'N'}
+
+function ltt.process_auto_topbot_rule(rule)
+    if ltt.tablelevel == 1 then
+        if ltt.auto_topbot then
+            tex.print('\\'..rule..'rule ')
+        end
+    end
+end
+
 
 
 
 
 
 -----
---- midrule stuff
+-----       midrule and midruleX stuff
 -----
 
+
+ltt.mrX = {}
+ltt.mrX.defaults = {step=5, rule='midrule', reset=false, resetnum=0, cntr=0}
+ltt.mrX.settings = T.copy(ltt.mrX.defaults)
+ltt.mrX.cntr = 0
+ltt.mrX.pgcntr = 0
+
+
+
 function ltt.get_midrule_col(s)
     if string.find(s, '+')  then
         s = s:gsub('+', '')
@@ -282,15 +393,6 @@ function ltt.makecmidrules(s, r, c, cmd)
 end
 
 
-local T = pl.tablex
-
-ltt.mrX = {}
-ltt.mrX.defaults = {step=5, rule='midrule', reset=false, resetnum=0, cntr=0}
-ltt.mrX.settings = T.copy(ltt.mrX.defaults)
-ltt.mrX.cntr = 0
-ltt.mrX.pgcntr = 0
-
-
 
 function ltt.mrX.set_midruleX(new_sett, def)
     def = def or ''
diff --git a/macros/luatex/generic/lutabulartools/lutabulartools.pdf b/macros/luatex/generic/lutabulartools/lutabulartools.pdf
index 5d6e7f62d0..c915ba6291 100644
--- a/macros/luatex/generic/lutabulartools/lutabulartools.pdf
+++ b/macros/luatex/generic/lutabulartools/lutabulartools.pdf
diff --git a/macros/luatex/generic/lutabulartools/lutabulartools.sty b/macros/luatex/generic/lutabulartools/lutabulartools.sty
index f1dea60c5a..1d2522b099 100644
--- a/macros/luatex/generic/lutabulartools/lutabulartools.sty
+++ b/macros/luatex/generic/lutabulartools/lutabulartools.sty
@@ -1,5 +1,5 @@
 % Kale Ewasiuk (kalekje@gmail.com)
-% 2022-10-22
+% 2022-11-27
 % Copyright (C) 2021-2022 Kale Ewasiuk
 %
 % Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -23,7 +23,7 @@
 % OR OTHER DEALINGS IN THE SOFTWARE.
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{lutabulartools}[2022-10-22]
+\ProvidesPackage{lutabulartools}[2022-11-27]
 
 \RequirePackage{booktabs}
 \RequirePackage{multirow}
@@ -40,13 +40,8 @@
 \newcommand{\lttdebugON}{\luadirect{lutabt.debug = true}}
 \newcommand{\lttdebugOFF}{\luadirect{lutabt.debug = true}}
 
-\newcolumntype{\ltt@ltrim}{@{}}
-\newcolumntype{\ltt@rtrim}{@{}}
-\DeclareOption{notrim}{
-  \newcolumntype{\ltt@ltrim}{}
-  \newcolumntype{\ltt@rtrim}{}
-}
-
+\newcolumntype{\lttltrim}{}
+\newcolumntype{\lttrtrim}{}
 
 
 %%% midrule every X rows
@@ -143,40 +138,67 @@
 
 
 
+\NewDocumentCommand{\midrulesat}{m}{\luadirect{lutabt.add_auto_midrules(\luastring{#1})}}
+
+
+
+
+\NewDocumentCommand{\settabular}{s m}{\luadirect{lutabt.set_tabular(\luastring{#2})}} % make kv interface for auto
+
+\def\ltt@resetrownum{\luadirect{lutabt.reset_rows()}}
+\def\ltt@autotoprule{\luadirect{lutabt.process_auto_topbot_rule('top')}}
+\def\ltt@autobotrule{\luadirect{lutabt.process_auto_topbot_rule('bottom')}}
+
 \let\oldtabular\tabular
+\let\oldendtabular\endtabular
 \RenewExpandableDocumentCommand{\tabular}{ O{l} m }{%
   \luadirect{lutabt.set_col_spec(\luastringN{#2})}%
-  \oldtabular[#1]{\ltt@ltrim#2\ltt@rtrim}%
+  \oldtabular[#1]{\lttltrim#2\lttrtrim}\ltt@inctablelevel\ltt@resetrownum\ltt@autotoprule%
 }
+\def\endtabular{\ltt@autobotrule\ltt@dectablelevel\oldendtabular}
+
+
+
 
 \expandafter\let\expandafter\oldtabulars\csname tabular*\endcsname
 \expandafter\let\expandafter\endoldtabulars\csname endtabular*\endcsname
 \RenewDocumentEnvironment{tabular*}{ m O{l} m }{%
   \luadirect{lutabt.set_col_spec(\luastringN{#3})}%
-  \begin{oldtabulars}{#1}[#2]{\ltt@ltrim#3\ltt@rtrim}%
+  \begin{oldtabulars}{#1}[#2]{\lttltrim#3\lttrtrim}\ltt@inctablelevel\ltt@resetrownum\ltt@autotoprule%
 }{%
-  \end{oldtabulars}%
+  \ltt@autobotrule\ltt@dectablelevel\end{oldtabulars}%
 }
 %%% NOTE tabularx uses tabular*, NO NEED TO CHANGE TABULARX!
 
 \let\oldlongtable\longtable
 \RenewExpandableDocumentCommand{\longtable}{ O{l} m }{%
+  \luadirect{lutabt.auto_topbot_old = lutabt.auto_topbot
+  lutabt.auto_topbot = false}%
   \luadirect{lutabt.set_col_spec(\luastringN{#2})}%
-  \oldlongtable[#1]{\ltt@ltrim#2\ltt@rtrim}%
+  \oldlongtable[#1]{\lttltrim#2\lttrtrim}\ltt@inctablelevel\ltt@resetrownum%
 }
+\let\oldendlongtable\endlongtable
+\def\endlongtable{\luadirect{lutabt.auto_topbot = lutabt.auto_topbot_old}
+  \ltt@dectablelevel\oldendlongtable}% restore status of auto topbot rule
+
+\apptocmd{\@arraycr}{\luadirect{lutabt.process_auto_rules()}}{}{}
+
 
+\def\ltt@inctablelevel{\luadirect{lutabt.tablelevel = lutabt.tablelevel + 1}}
+\def\ltt@dectablelevel{\luadirect{lutabt.tablelevel = lutabt.tablelevel - 1}}
 
 %s0,spec,mcspec,pre,content
 % Magic Cell
-\NewExpandableDocumentCommand{\MC}{ s O{} D(){} D<>{} m }{%
+\NewExpandableDocumentCommand{\MC}{ s O{} O{} D<>{} D(){x} m }{%
 % Magic cell *wraps with {} but automatically checks for SI column,
-                    % [column spec] (mult-column spec override)  <pre-cell stuff>  {cell content}
+                    % [column spec] [mult-column spec override]  <pre-cell stuff> (add rule)  {cell content}
 \luadirect{lutabt.MagicCell(
     \luastring{#1},
     \luastring{#2},
     \luastringN{#3},
     \luastringN{#4},
-    \luastringN{#5}
+    \luastringN{#6},
+    \luastring{#5}
 )}}
 
 
@@ -219,12 +241,12 @@
 %  \setcounter{RowNumCnt}{1}%
 %  \luadirect{lutabt.NumTabColsMX = 0}% fall back if calc doesnt work for some reason
 %\DeclareOption{notrimx}{
-%  \global\newcolumntype{\ltt@ltrim}{!{\stepcounter{RowNumCnt}}}
-%%  \global\newcolumntype{\ltt@rtrim}{!{\luadirect{lutabt.get_TabColNum()}}}
+%  \global\newcolumntype{\lttltrim}{!{\stepcounter{RowNumCnt}}}
+%%  \global\newcolumntype{\lttrtrim}{!{\luadirect{lutabt.get_TabColNum()}}}
 %}
 %\DeclareOption{trimx}{
-%  \newcolumntype{\ltt@ltrim}{@{\stepcounter{RowNumCnt}}}
-%%  \newcolumntype{\ltt@rtrim}{@{\luadirect{lutabt.get_TabColNum()}}}
+%  \newcolumntype{\lttltrim}{@{\stepcounter{RowNumCnt}}}
+%%  \newcolumntype{\lttrtrim}{@{\luadirect{lutabt.get_TabColNum()}}}
 %}
 
 
diff --git a/macros/luatex/generic/lutabulartools/lutabulartools.tex b/macros/luatex/generic/lutabulartools/lutabulartools.tex
index 97802fce07..7af9cbc4a6 100644
--- a/macros/luatex/generic/lutabulartools/lutabulartools.tex
+++ b/macros/luatex/generic/lutabulartools/lutabulartools.tex
@@ -1,5 +1,5 @@
 % Kale Ewasiuk (kalekje@gmail.com)
-% 2022-10-22
+% 2022-11-27
 % Copyright (C) 2021-2022 Kale Ewasiuk
 %
 % Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -101,22 +101,21 @@ The following packages are loaded if not already, so if you have specific settin
 {xcolor},
 {colortbl},
 {luacode},
-{penlight},
-}
+{penlight}
+}.
 
-\section{Options}
-The author likes tables with left and right-most columns flush to the end.
-Since the \cmd{tabular} env is redefined in this, the author took the liberty to
-automatically pad the \cmd{tabular} cell spec with \cmd{@{}} on each end.
-If you don't want this, you can pass \cmd{notrim} to the package. Or,
-you can manually fix it in a \cmd{tabular} with \cmd{!{}} like so:
+\section{settabular}
 
+A key-val interface in the \cmd{\settabular{}} command is used to set some tabular settings.
+\cmd{nopad} automatically adds \cmd{@{}} on each end of the column spec.\\
+\cmd{tbrule} automatically adds \cmd{\toprule} as the first thing in the environment, and \cmd{\bottomrule} as the last.
+Note that automatic rule adding is disabled in \cmd{longtable}.
 \begin{LTXexample}
-\begin{tabular}{!{}c!{}}\toprule
-Xyz\\\bottomrule    \end{tabular}
+\settabular{nopad,tbrule} % or
+\settabular{nopad=false,tbrule=false}
 \end{LTXexample}
 
-\subsection{Debugging}
+\section{Debugging}
 You can toggle log output debugging with \cmd{\lttdebugON} and \cmd{\lttdebugOFF}.
 The messages will be printed in a format like so:
 \begin{verbatim}
@@ -132,7 +131,7 @@ With the help of LuaLaTeX, it takes an easy-to-use cell specification and employ
 \cmd{\MC} will not work properly if your table is only 1 column wide (you probably don't need \cmd{MC} in that case anyway...).
 Here is the usage:
 
-\texttt{\textbackslash MC * [cell spec] <cell format> (override multicolumn col) \{contents\} }
+\texttt{\textbackslash MC * [cell spec] [override multicol] <cell format> (add cmidrule)  \{contents\} }
 
 \llcmd{*}This will wrap the entire command in \{\}. This is necessary for \texttt{siunitx} single-column width columns.
 However, the \cmd{\MC} command attempts to detect this automatically.
@@ -166,16 +165,20 @@ In any of these examples, you can place the alignment letters anywhere.
 So, \cmd{\MC[l1,2b]} and \cmd{\MC[1,2 lb]} are both left-bottom aligned (spaces are ignored).
 
 
-\llcmd{(override}%
+\llcmd{[override mc]}%
 You may want to adjust the column specification of a multicolumn  cell,\\
-\llcmd{multicolumn)}for example, using
-\texttt{(@\{\}c@\{\})} to remove padding between the cell.
+\texttt{[@\{\}c@\{\}]} for example to remove padding between the cell.
 
+\llcmd{(cmidrule)} will add a cmidrule at end of row. \cmd{()} to add without trim or \cmd{(lr)} to trim.
 
 \llcmd{<cell format>}%
 You can place formatting like \cmd{\bfseries} here.
 
 
+\subsection{midrulesat}
+If you'd rather specify the location of midrules outside the table, use \cmd{\midrulesat{1,2,3}}: a midrule will be
+placed on rows 1, 2, and 3, for the next table only.
+
 \subsection{Defaults}\label{s.def}
 The \cmd{tabular[*]} environment is re-defined to use Lua pattern matching
 to parse the column specification of the table. This is done to determine how many columns there are,
@@ -195,24 +198,50 @@ S is included by default.
 \let\nl\\
 
 
+Change the settings for the rest of the doc.
+
+
+\begin{LTXexample}
+\settabular{nopad,tbrule}
+\end{LTXexample}
+
+\settabular{nopad,tbrule}
+
+
 \subsubsection{A good use for headers}
+
 \begin{LTXexample}
-\begin{tabular}{ l l l }\toprule
+\begin{tabular}{ l l l }
 \MC[+m]<\itshape>{A Decent
                 Example}\\\midrule
-    & \MC[2m]{Heading} \\\cmidrule{2-}
-\MC[b,-2]{Multi\\Line}  & A & B   \\\midrule
+    & \MC[2m](r){Heading} \\
+\MC[b,-2]{Multi\\Line}  & A & B \\\midrule
+   end & & \\
 \end{tabular}
 \end{LTXexample}
 
+
+
 \subsubsection{A small example}
+\begin{LTXexample}
+\midrulesat{1,2,3}
+\begin{tabular}{ l l l }
+a \\
+b \\
+c \\
+d \\
+\end{tabular}
+\end{LTXexample}
+
 
+\subsubsection{A small example}
 
 \begin{LTXexample}
 \begin{tabular}{ l l l }\midrule
- A & \MC[mc2,2]{Lttrs}    \\
- B &                       \\
- 1 & A & B   \\
+ \MC(){A} & \MC[mc2,2]{Lttrs}    \\
+ \MC(r){B} &        \\ \cmidrule{2-3}
+ \MC(r){1} & \MC(r){A} & \MC(r){B}   \\ % todo must fix
+  \\
 \end{tabular}
 \end{LTXexample}
 
@@ -221,7 +250,7 @@ S is included by default.
 Notice that the top-aligned p-column
 doesn't play particularly well with the middle aligned \cmd{\MC}
 \begin{LTXexample}
-\begin{tabular}{ p{1cm} l }\toprule
+\begin{tabular}{ p{1cm} l }
    hello\newline world
         & \MC[mr]{11\\2} \\
 \end{tabular}
@@ -232,9 +261,9 @@ doesn't play particularly well with the middle aligned \cmd{\MC}
 \begin{LTXexample}
 \begin{tabular}{|c|c|c|} \hline
 1 & 2 & 3\\\hline
-4 & \MC[2,2cm](@{}c@{}|)%
+4 & \MC[2,2cm][@{}c@{}|]%
     <\ttfamily>{5}\\\cline{1-1}
-  & \MC[2](r|){} \\\hline%hacky fix
+  & \MC[2][r|]{} \\\hline%hacky fix
 6 & 7 & 8\\\hline
 \end{tabular}
 \end{LTXexample}
@@ -258,7 +287,7 @@ doesn't play particularly well with the middle aligned \cmd{\MC}
 \begin{tabular}{| c | c | c | c | c | c |}\toprule
  \MC[2,2cm]<\ttfamily>{2,2cm}   & \MC[2r]<\ttfamily>{2r} & 5 & \MC[,2b]<\ttfamily>{,2b}\\
    &   & 3 & 4 & 5 & \\\midrule
- 1 & 2 & \MC[2l](@{}l)<\ttfamily>{2l (\@\{\}l)} & 5 & 6666\\\cmidrule{3-4}
+ 1 & 2 & \MC[2l][@{}l]<\ttfamily>{2l (\@\{\}l)} & 5 & 6666\\\cmidrule{3-4}
  1 & \MC[+r]<\ttfamily>{+r}  \\
   \\
  1 & 2 & 3 & 4 & 5 & \MC[,-2]<\ttfamily>{,\\-2}\\
@@ -369,8 +398,7 @@ Note that \cmd{\resetmidruleX} resets the row counter to 0, and is in effect, a
 \begin{LTXexample}
 \setmidruleX{step=3,rule=gmidrule}
 \begin{tabular}{rclc@{\midruleX}}
-                % ^^^ inject midrule
-\toprule
+                % ^^^ inject midruleX
 Num  & . & . & .  \\
 \midrule\resetmidruleX
 % reset so header dont count
@@ -388,7 +416,6 @@ Num  & . & . & .  \\
 \resetmidruleX % resest
    % so no bottom gray rule
 12   & & &  \\
-\bottomrule
 \end{tabular}
 \end{LTXexample}
 
diff --git a/macros/xetex/latex/xduts/README.md b/macros/xetex/latex/xduts/README.md
index 3597bc118c..64f28ff260 100644
--- a/macros/xetex/latex/xduts/README.md
+++ b/macros/xetex/latex/xduts/README.md
@@ -15,6 +15,15 @@ In the future, we plan to add the following document classes, including
 - `xduugtp.cls`, Xidian University Undergraduate Thesis Proposal document class
 - `xdupgtp.cls`, Xidian University Postgraduate Thesis Proposal document class
 
+## Preparation
+
+If using TeX Live/MacTeX, TeX Live/MacTeX 2022+ is recommended, and update all packages to the latest version by running command below. If on Windows, it may be necessary to start a Command Prompt as an Administrator. If on macOS or GNU/Linux, it may be necessary to run the command with `sudo`.
+
+```shell
+tlmgr option repository https://mirrors.cloud.tencent.com/CTAN/systems/texlive/tlnet/
+tlmgr update --all --self
+```
+
 ## Installation
 
 You can install XDUTS from either CTAN or GitHub by following the instructions below. 
@@ -23,13 +32,7 @@ You can install XDUTS from either CTAN or GitHub by following the instructions b
 
 #### TeX Live/MacTeX
 
-Make sure the latest version of TeX Live/MacTeX is installed. Then, you can install XDUTS by running command below. If on Windows, it may be necessary to start a Command Prompt as an Administrator. If on macOS or GNU/Linux, please run the command with `sudo`.
-
-```shell
-tlmgr update --self xduts
-```
-
-Run command below to open the documentation in TeX Live/MacTeX.
+After completing the preparation, XDUTS is already contained in TeX Live/MacTeX. Run command below to open the documentation.
 
 ```shell
 texdoc xduts
@@ -52,7 +55,7 @@ texdoc xduts
 
 ### GitHub
 
-Generally speaking, CTAN updates XDUTS slowly. If you want to use the latest version of XDUTS, download this repository and run the following command to get the document class/package files.
+Generally speaking, CTAN updates XDUTS slowly. If you want to use the latest version of XDUTS, [download this repository](https://github.com/note286/xduts/archive/refs/heads/main.zip) and run the following command to get the document class/package files.
 
 ```shell
 xetex xduts.ins
diff --git a/macros/xetex/latex/xduts/xduts.dtx b/macros/xetex/latex/xduts/xduts.dtx
index fb4520bbc8..85fb4ca102 100644
--- a/macros/xetex/latex/xduts/xduts.dtx
+++ b/macros/xetex/latex/xduts/xduts.dtx
@@ -1,14 +1,14 @@
 % \iffalse
 %<*driver>
 \ProvidesFile{xduts.dtx}
-[2022/11/23 v2.14.1.3 Xidian University TeX Suite]
+[2022/11/27 v2.16.1.3 Xidian University TeX Suite]
 %</driver>
 %<class|sty>\NeedsTeXFormat{LaTeX2e}
 %<class|sty>\RequirePackage{expl3}
 %<xdufont>\ProvidesExplPackage{xdufont}
 %<xdupgthesis>\ProvidesExplClass{xdupgthesis}
 %<xduugthesis>\ProvidesExplClass{xduugthesis}
-%<class|sty>  {2022/11/23}{2.14.1.3}
+%<class|sty>  {2022/11/27}{2.16.1.3}
 %<xdufont>  {Xidian University Font package}
 %<xdupgthesis>  {Xidian University Postgraduate Thesis document class}
 %<xduugthesis>  {Xidian University Undergraduate Thesis document class}
@@ -46,14 +46,19 @@
 \usepackage{multirow}
 \usepackage{pifont}
 \newcommand{\cmark}{\ding{51}}
+\usepackage{subcaption}
+\captionsetup{font=bf}
 \usepackage{tabularray}
+\changes{v2.16.1.3}{2022/11/27}{修改文档中caption字体样式}
 \SetTblrStyle{caption-tag}{font=\bfseries}
+\SetTblrStyle{caption-text}{font=\bfseries}
 \DefTblrTemplate{caption-sep}{default}{\quad}
-\DefTblrTemplate{conthead-text}{default}{(续表)}
-\DefTblrTemplate{contfoot-text}{default}{接下页}
+\DefTblrTemplate{conthead-text}{default}{\textbf{(续表)}}
+\DefTblrTemplate{contfoot-text}{default}{\textbf{接下页}}
 % 交叉引用
 \newcommand{\secrefx}[1]{第\xspace\ref{#1}\xspace 节}
 \newcommand{\tabrefx}[1]{\tablename\xspace\ref{#1}\xspace}
+\newcommand{\figrefx}[1]{\figurename\xspace\ref{#1}\xspace}
 % 文档类选项
 \newcommand{\optx}[1]{\xspace{\ttfamily\seqsplit{#1}}\xspace}
 % \name LaTeX3控制序列
@@ -134,6 +139,8 @@ literate        = {\$}{{\textcolor{purple3}{\$}}}{1}
 \lst@AddToHook{SelectCharTable}
 {\ifx\lst@literate\@empty\else\expandafter\lst@Literate\lst@literate{}\relax\z@\fi}
 \makeatother
+\RenewDocumentCommand{\floatpagefraction}{}{.8}
+\usepackage[nolinks]{qrcode}
 \begin{document}
 \DocInput{\jobname.dtx}
 \IndexLayout
@@ -404,31 +411,35 @@ literate        = {\$}{{\textcolor{purple3}{\$}}}{1}
 % 设置中文字体，具体配置见\tabrefx{tab:cjk-font}。
 % \end{function}
 % \begin{optdesc}
+%   \item[adobe] \filex{adobesongstd-light.otf}、\filex{adobekaitistd-regular.otf}、\filex{adobeheitistd-regular.otf}和\filex{Adobe-Fangsong-Std-R-Font.otf}。
+%   \item[founder] \filex{FZShuSong-Z01.ttf}、\filex{FZKai-Z03.ttf}、\filex{FZHei-B01.ttf}和\filex{FZFSK.TTF}。
+%   \item[sinotype] \filex{STSONG.TTF}、\filex{STKAITI.TTF}、\filex{STXIHEI.TTF}、\filex{STHeiti.ttf}和\filex{STFANGSO.TTF}。
+%   \item[win] \filex{simsun.ttc}、\filex{simkai.ttf}、\filex{simhei.ttf}和\filex{simfang.ttf}。
 %   \item[none] 关闭内置中文字体配置，需自行配置中文字体。
 % \end{optdesc}
+% \changes{v2.16.1.1}{2022/11/27}{修改中文字体配置表文档样式}
 % \begin{table}
-% \begin{threeparttable}
 % \caption{中文字体配置}
 % \label{tab:cjk-font}
-% \centering
-% \begin{tabularx}{\linewidth}{cccc}
-% \toprule
-% \strong{选项名称}   & \strong{罗马字体族}           & \strong{无衬线字体族} & \strong{打字机字体族} \\
-% \midrule
-% |adobe|\tnote{1}    & Adobe 宋体 Std/Adobe 楷体 Std & Adobe 黑体 Std        & Adobe 仿宋 Std        \\
-% |fandol|            & FandolSong/FandolKai          & FandolHei             & FandolFang            \\
-% |founder|\tnote{2}  & 方正书宋_GBK/方正楷体_GBK     & 方正黑体_GBK          & 方正仿宋_GBK          \\
-% |sinotype|\tnote{3} & 华文宋体/华文楷体             & 华文细黑/华文黑体     & 华文仿宋              \\
-% |win|\tnote{4}      & 中易宋体/中易楷体             & 中易黑体              & 中易仿宋              \\
-% \bottomrule
-% \end{tabularx}
-% \begin{tablenotes}
-% \item [1] \filex{adobesongstd-light.otf}、\filex{adobekaitistd-regular.otf}、\filex{adobeheitistd-regular.otf}和\filex{Adobe-Fangsong-Std-R-Font.otf}。
-% \item [2] \filex{FZShuSong-Z01.ttf}、\filex{FZKai-Z03.ttf}、\filex{FZHei-B01.ttf}和\filex{FZFSK.TTF}。
-% \item [3] \filex{STSONG.TTF}、\filex{STKAITI.TTF}、\filex{STXIHEI.TTF}、\filex{STHeiti.ttf}和\filex{STFANGSO.TTF}。
-% \item [4] \filex{simsun.ttc}、\filex{simkai.ttf}、\filex{simhei.ttf}和\filex{simfang.ttf}。
-% \end{tablenotes}
-% \end{threeparttable}
+% \begin{tblr}
+% {
+% width          = \linewidth,
+% colspec        = {cX[c]X[c]X[1.2,c]X[c]},
+% hline{1,3,Z}   = {.08em},
+% hline{2}       = {2-3}{.08em,leftpos=-1,rightpos=-1,endpos},
+% row{odd[3-Z]}  = {gray9!40},
+% cell{1}{2}     = {c=2}{},
+% cell{1}{1,4,5} = {r=2}{},
+% row{1-2}         = {cmd=\strong}
+% }
+% 选项名称   & 罗马族         &                & 无衬线族          & 打字机族       \\
+%            & 直立/倾斜形状  & 意大利形状     &                   &                \\
+% |adobe|    & Adobe 宋体 Std & Adobe 楷体 Std & Adobe 黑体 Std    & Adobe 仿宋 Std \\
+% |fandol|   & FandolSong     & FandolKai      & FandolHei         & FandolFang     \\
+% |founder|  & 方正书宋\_GBK  & 方正楷体\_GBK  & 方正黑体\_GBK     & 方正仿宋\_GBK  \\
+% |sinotype| & 华文宋体       & 华文楷体       & 华文细黑/华文黑体 & 华文仿宋       \\
+% |win|      & 中易宋体       & 中易楷体       & 中易黑体          & 中易仿宋       \\
+% \end{tblr}
 % \end{table}
 % \begin{function}[added=2022-04-01]{style/cjk-fake-bold}
 %   \begin{syntax}
@@ -449,29 +460,29 @@ literate        = {\$}{{\textcolor{purple3}{\$}}}{1}
 % 设置英文字体，具体配置见\tabrefx{tab:latin-font}。
 % \end{function}
 % \begin{optdesc}
+%   \item[tac] \filex{times.ttf}、\filex{timesbd.ttf}、\filex{timesi.ttf}、\filex{timesbi.ttf}、\filex{arial.ttf}、\filex{arialbd.ttf}、\filex{ariali.ttf}、\filex{arialbi.ttf}、\filex{consola.ttf}、\filex{consolab.ttf}、\filex{consolai.ttf}和\filex{consolaz.ttf}。
+%   \item[tacn] \filex{times.ttf}、\filex{timesbd.ttf}、\filex{timesi.ttf}、\filex{timesbi.ttf}、\filex{arial.ttf}、\filex{arialbd.ttf}、\filex{ariali.ttf}、\filex{arialbi.ttf}、\filex{cour.ttf}、\filex{courbd.ttf}、\filex{couri.ttf}和\filex{courbi.ttf}。
+%   \item[thcs] \filex{times.ttf}、\filex{timesbd.ttf}、\filex{timesi.ttf}、\filex{timesbi.ttf}、\filex{Helvetica.ttf}、\filex{Helvetica~Bold.ttf}、\filex{Helvetica~Oblique.ttf}、\filex{Helvetica~Bold~Oblique.ttf}、\filex{CourierStd.otf}、\filex{CourierStd-Bold.otf}、\filex{CourierStd-Oblique.otf}和\filex{CourierStd-BoldOblique.otf}。
 %   \item[none] 关闭内置英文字体配置，需自行配置英文字体。
 % \end{optdesc}
+% \changes{v2.16.1.1}{2022/11/27}{修改英文字体配置表文档样式}
 % \begin{table}
-% \begin{threeparttable}
 % \caption{英文字体配置}
 % \label{tab:latin-font}
-% \centering
-% \begin{tabularx}{\linewidth}{cYYY}
-% \toprule
-% \strong{选项名称} & \strong{罗马字体族} & \strong{无衬线字体族} & \strong{打字机字体族} \\
-% \midrule
-% |tac|\tnote{1}    & Times New Roman     & Arial                 & Consolas              \\
-% |tacn|\tnote{2}   & Times New Roman     & Arial                 & Courier New           \\
-% |thcs|\tnote{3}   & Times New Roman     & Helvetica             & Courier Std           \\
-% |gyre|            & TeX Gyre Termes     & TeX Gyre Heros        & TeX Gyre Cursor       \\
-% \bottomrule
-% \end{tabularx}
-% \begin{tablenotes}
-% \item [1] \filex{times.ttf}、\filex{timesbd.ttf}、\filex{timesi.ttf}、\filex{timesbi.ttf}、\filex{arial.ttf}、\filex{arialbd.ttf}、\filex{ariali.ttf}、\filex{arialbi.ttf}、\filex{consola.ttf}、\filex{consolab.ttf}、\filex{consolai.ttf}和\filex{consolaz.ttf}。
-% \item [2] \filex{times.ttf}、\filex{timesbd.ttf}、\filex{timesi.ttf}、\filex{timesbi.ttf}、\filex{arial.ttf}、\filex{arialbd.ttf}、\filex{ariali.ttf}、\filex{arialbi.ttf}、\filex{cour.ttf}、\filex{courbd.ttf}、\filex{couri.ttf}和\filex{courbi.ttf}。
-% \item [3] \filex{times.ttf}、\filex{timesbd.ttf}、\filex{timesi.ttf}、\filex{timesbi.ttf}、\filex{Helvetica.ttf}、\filex{Helvetica~Bold.ttf}、\filex{Helvetica~Oblique.ttf}、\filex{Helvetica~Bold~Oblique.ttf}、\filex{CourierStd.otf}、\filex{CourierStd-Bold.otf}、\filex{CourierStd-Oblique.otf}和\filex{CourierStd-BoldOblique.otf}。
-% \end{tablenotes}
-% \end{threeparttable}
+% \begin{tblr}
+% {
+% width          = \linewidth,
+% colspec        = {cX[c]X[c]X[c]},
+% hline{1,2,Z}   = {.08em},
+% row{even[2-Z]} = {gray9!40},
+% row{1}         = {cmd=\strong}
+% }
+% 选项名称 & 罗马族          & 无衬线族       & 打字机族        \\
+% |tac|    & Times New Roman & Arial          & Consolas        \\
+% |tacn|   & Times New Roman & Arial          & Courier New     \\
+% |thcs|   & Times New Roman & Helvetica      & Courier Std     \\
+% |gyre|   & TeX Gyre Termes & TeX Gyre Heros & TeX Gyre Cursor \\
+% \end{tblr}
 % \end{table}
 % \begin{function}[added=2022-03-06,updated=2022-03-09]{style/math-font}
 %   \begin{syntax}
@@ -479,51 +490,50 @@ literate        = {\$}{{\textcolor{purple3}{\$}}}{1}
 %   \end{syntax}
 % 设置数学字体，具体配置见\tabrefx{tab:math-font}。除Computer Modern字体外，均使用\pkgx{unicode-math}宏包调用字体。
 % \end{function}
+% \changes{v2.16.1.1}{2022/11/27}{修改数学字体配置表文档样式}
 % \changes{v0.1.4.1}{2022/04/04}{数学字体风格介绍}
 % \begin{optdesc}
-%   \item[cambria] 微软Office预装的数学字体。
-%   \item[fira] 无衬线数学字体。
-%   \item[garamond] Garamond风格。
-%   \item[lm] 基于Computer Modern风格。
-%   \item[libertinus] Linux Libertine风格。
-%   \item[stix] Times风格。
-%   \item[dejavu] DejaVu风格。
-%   \item[pagella] Palatino风格。
-%   \item[termes] Times风格。
-%   \item[xits] 基于STIX，Times风格，有粗体XITS Math Bold可用。
+%   \item[cambria] \filex{cambria.ttc}。
 %   \item[none] 关闭内置数学字体配置，需自行配置数学字体。
 % \end{optdesc}
-% \begin{table}
-% \begin{threeparttable}
-% \caption{数学字体配置}
-% \label{tab:math-font}
-% \centering
-% \begin{tabularx}{\linewidth}{cY}
-% \toprule
-% \strong{选项名称}  & \strong{字体名称}     \\
-% \midrule
-% |asana|            & Asana Math            \\
-% |cambria|\tnote{1} & Cambria Math          \\
-% |cm|               & Computer Modern       \\
-% |fira|             & Fira Math             \\
-% |garamond|         & Garamond Math         \\
-% |lm|               & Latin Modern Math     \\
-% |erewhon|          & Erewhon Math          \\
-% |libertinus|       & Libertinus Math       \\
-% |stix|             & STIX Math             \\
-% |bonum|            & TeX Gyre Bonum Math   \\
-% |dejavu|           & TeX Gyre DejaVu Math  \\
-% |pagella|          & TeX Gyre Pagella Math \\
-% |schola|           & TeX Gyre Schola Math  \\
-% |termes|           & TeX Gyre Termes Math  \\
-% |xits|             & XITS Math             \\
-% \bottomrule
-% \end{tabularx}
-% \begin{tablenotes}
-% \item [1] \filex{cambria.ttc}。
-% \end{tablenotes}
-% \end{threeparttable}
-% \end{table}
+% \begin{tblr}
+% [
+% long,
+% caption = {数学字体配置},
+% label   = {tab:math-font}
+% ]
+% {
+% width          = \linewidth,
+% colspec        = {X[2,c]X[3,c]},
+% hline{1,2,Z}   = {.08em},
+% row{even[2-Z]} = {gray9!40},
+% row{1}         = {cmd=\strong},
+% rowhead        = 1
+% }
+% 选项名称           & 字体名称                 \\
+% |asana|            & Asana Math               \\
+% |cambria|\tnote{1} & Cambria Math             \\
+% |cm|               & Computer Modern          \\
+% |concrete|         & Concrete Math            \\
+% |erewhon|          & Erewhon Math             \\
+% |euler|            & Euler Math               \\
+% |fira|             & Fira Math                \\
+% |garamond|         & Garamond Math            \\
+% |gfsneohellenic|   & GFS Neohellenic Math     \\
+% |kp|               & KpMath                   \\
+% |libertinus|       & Libertinus Math          \\
+% |lm|               & Latin Modern Math        \\
+% |newcm|            & New Computer Modern Math \\
+% |stix2|            & STIX Two Math            \\
+% |stix|             & STIX Math                \\
+% |xcharter|         & XCharter Math            \\
+% |xits|             & XITS Math                \\
+% |bonum|            & TeX Gyre Bonum Math      \\
+% |dejavu|           & TeX Gyre DejaVu Math     \\
+% |pagella|          & TeX Gyre Pagella Math    \\
+% |schola|           & TeX Gyre Schola Math     \\
+% |termes|           & TeX Gyre Termes Math     \\
+% \end{tblr}
 % \begin{function}[added=2022-03-14]{style/unicode-math}
 %   \begin{syntax}
 %     \optx{style/unicode-math}=\argx{unicode-math宏包选项}
@@ -895,6 +905,7 @@ literate        = {\$}{{\textcolor{purple3}{\$}}}{1}
 % \end{function}
 % \subsection{信息录入}
 % \label{信息录入}
+% \changes{v2.16.1.1}{2022/11/27}{修改信息录入选项分类表文档样式}
 % \changes{v1.9.0.0}{2022/05/03}{增加信息录入选项分类表}
 % \changes{v1.10.3.1}{2022/05/04}{移除专业博士校外导师信息录入}
 % 用户根据\tabrefx{tblr:info}选择相应的选项并使用\secrefx{参数设置}中的方式进行信息录入。
@@ -902,23 +913,21 @@ literate        = {\$}{{\textcolor{purple3}{\$}}}{1}
 % [
 % long,
 % caption = {信息录入选项分类},
-% label = {tblr:info}
+% label   = {tblr:info}
 % ]
 % {
-% width      = \linewidth,
-% colspec    = lX[c]X[c]X[c]X[c]X[c]X[c],
-% cell{1}{1} = {r = 2}{},
-% cell{1}{2} = {c = 2}{},
-% cell{1}{4} = {c = 2}{},
-% cell{1}{6} = {c = 2}{},
-% hline{1,Z} = {.08em},
-% hline{2} = {2-3}{.08em, leftpos = -1, rightpos = -1, endpos},
-% hline{2} = {4-5}{.08em, leftpos = -1, rightpos = -1, endpos},
-% hline{2} = {6-7}{.08em, leftpos = -1, rightpos = -1, endpos},
-% hline{3} = {.08em},
-% cell{odd[3-Z]}{1-Z} = {gray9},
-% cell{3-Z}{1} = {cmd = \texttt},
-% rowhead = 2
+% width          = \linewidth,
+% colspec        = lX[c]X[c]X[c]X[c]X[c]X[c],
+% cell{1}{1}     = {r=2}{},
+% cell{1}{2,4,6} = {c=2}{},
+% hline{1,Z}     = {.08em},
+% hline{2}       = {2-3}{.08em,leftpos=-1,rightpos=-1,endpos},
+% hline{2}       = {4-5}{.08em,leftpos=-1,rightpos=-1,endpos},
+% hline{2}       = {6-7}{.08em,leftpos=-1,rightpos=-1,endpos},
+% hline{3}       = {.08em},
+% row{odd[3-Z]}  = {gray9!40},
+% cell{3-Z}{1}   = {cmd=\texttt},
+% rowhead        = 2
 % }
 %                              & 本科   &        & 硕士   &        & 博士   &        \\
 %                              & 校内   & 校外   & 学术   & 专业   & 学术   & 专业   \\
@@ -1556,6 +1565,17 @@ literate        = {\$}{{\textcolor{purple3}{\$}}}{1}
 % 和《Good things come in little packages: An introduction to writing .ins and .dtx files》\footurl{https://www.tug.org/TUGboat/tb29-2/tb92pakin.pdf}
 % 提供了很大帮助。
 % 在文档的编写过程中，参考了\filex{ctex.dtx}、\filex{fduthesis.dtx}、\filex{njuthesis.dtx}和\filex{thuthesis.dtx}。
+% \changes{v2.16.1.2}{2022/11/27}{修正文档中图片引用间距}
+% \changes{v2.15.0.1}{2022/11/26}{增加赞助二维码}
+% \section{赞助}
+% 如果觉得\xduts{}对您有所帮助，可以扫描\figrefx{fig:zanzhu}中的二维码来赞助\xduts{}，赞助主要用于给作者补充营养。
+% \begin{figure}[h]
+% \centering
+% \subcaptionbox{支付宝}{\textcolor[RGB]{22,120,255}{\qrcode[height=4cm]{https://qr.alipay.com/fkx159591dqeuttcwbaurb5}}}\qquad\qquad
+% \subcaptionbox{微信支付}{\textcolor[RGB]{7,193,96}{\qrcode[height=4cm]{wxp://f2f0Pkqu8eK5cgsln6RSPWFQi4SGT\_bM8hMuuIp2vk7Y0Zc}}}
+% \caption{赞助二维码}
+% \label{fig:zanzhu}
+% \end{figure}
 % \clearpage
 % \end{documentation}
 % \begin{implementation}
@@ -1706,8 +1726,9 @@ literate        = {\$}{{\textcolor{purple3}{\$}}}{1}
 %    \begin{macrocode}
     math-font .choices:nn =
       {
-        asana, cambria, cm, fira, garamond, lm, libertinus, stix,
-        bonum, dejavu, pagella, schola, termes, xits, erewhon, none
+        asana, bonum, cambria, cm, concrete, dejavu, erewhon, euler,
+        fira, garamond, gfsneohellenic, kp, libertinus, lm, newcm,
+        pagella, schola, stix, stix2, termes, xcharter, xits, none
       }
       { \tl_set_eq:NN \l_@@_math_font_tl \l_keys_choice_tl },
     unicode-math .tl_set:N = \l_@@_unicode_math_tl,
@@ -1740,30 +1761,8 @@ literate        = {\$}{{\textcolor{purple3}{\$}}}{1}
   }
 %    \end{macrocode}
 % \end{macro}
-% \begin{macro}{\@@_if_platform_macos:FT}
 % \changes{v0.5.1.0}{2022/04/06}{判断操作系统是否是macOS}
-% 判断操作系统是否是macOS。
-% \begin{arguments}
-%   \item 非macOS。
-%   \item macOS。
-% \end{arguments}
-%    \begin{macrocode}
-\cs_new:Npn \@@_if_platform_macos:FT #1#2
-  { \file_if_exist:nTF { /System/Library/Fonts/Menlo.ttc } { #2 } { #1 } }
-%    \end{macrocode}
-% \end{macro}
-% \begin{macro}{\@@_texmf_font:nn}
 % \changes{v0.5.1.0}{2022/04/06}{加载字体时自动判断是否为macOS平台}
-% 调用TEXMF中的字体时根据操作系统是否是macOS自动选择调用字体名或文件名。
-% \begin{arguments}
-%   \item 字体名。
-%   \item 文件名。
-% \end{arguments}
-%    \begin{macrocode}
-\cs_new:Npn \@@_texmf_font:nn #1#2
-  { \@@_if_platform_macos:FT { #1 } { #2 } }
-%    \end{macrocode}
-% \end{macro}
 % \begin{macro}{\@@_select_font:nn}
 % 自动选择字体文件名称或字体名称。
 % \begin{arguments}
@@ -2360,6 +2359,9 @@ literate        = {\$}{{\textcolor{purple3}{\$}}}{1}
 % \end{macro}
 % \begin{macro}{\@@_define_math_font:nn}
 % 批量定义数学字体配置。
+% \changes{v2.16.1.0}{2022/11/27}{修改XITS Math数学字体调用方式}
+% \changes{v2.16.0.0}{2022/11/27}{增加若干数学字体}
+% \changes{v2.15.0.0}{2022/11/26}{增加New Computer Modern Math数学字体}
 % \changes{v2.13.0.0}{2022/11/21}{增加Erewhon Math数学字体}
 % \changes{v0.2.0.0}{2022/04/04}{增加Garamond Math数学字体}
 % \changes{v0.5.1.0}{2022/04/06}{适配macOS平台MacTeX内置数学字体}
@@ -2378,40 +2380,32 @@ literate        = {\$}{{\textcolor{purple3}{\$}}}{1}
   }
 \clist_map_inline:nn
   {
-    { asana      } { Asana-Math.otf             },
-    { fira       } { FiraMath-Regular.otf       },
-    { garamond   } { Garamond-Math.otf          },
-    { lm         } { latinmodern-math.otf       },
-    { erewhon    } { Erewhon-Math.otf           },
-    { libertinus } { LibertinusMath-Regular.otf },
-    { stix       } { STIXMath-Regular.otf       },
-    { bonum      } { texgyrebonum-math.otf      },
-    { dejavu     } { texgyredejavu-math.otf     },
-    { pagella    } { texgyrepagella-math.otf    },
-    { schola     } { texgyreschola-math.otf     },
-    { termes     } { texgyretermes-math.otf     }
+    { asana          } { Asana-Math.otf             },
+    { concrete       } { Concrete-Math.otf          },
+    { erewhon        } { Erewhon-Math.otf           },
+    { euler          } { Euler-Math.otf             },
+    { fira           } { FiraMath-Regular.otf       },
+    { garamond       } { Garamond-Math.otf          },
+    { gfsneohellenic } { GFSNeohellenicMath.otf     },
+    { kp             } { KpMath-Regular.otf         },
+    { libertinus     } { LibertinusMath-Regular.otf },
+    { lm             } { latinmodern-math.otf       },
+    { newcm          } { NewCMMath-Regular.otf      },
+    { stix           } { STIXMath-Regular.otf       },
+    { stix2          } { STIXTwoMath-Regular.otf    },
+    { xcharter       } { XCharter-Math.otf          },
+    { xits           } { XITSMath-Regular.otf       },
+    { bonum          } { texgyrebonum-math.otf      },
+    { dejavu         } { texgyredejavu-math.otf     },
+    { pagella        } { texgyrepagella-math.otf    },
+    { schola         } { texgyreschola-math.otf     },
+    { termes         } { texgyretermes-math.otf     }
   }
   { \@@_define_math_font:nn #1 }
 %    \end{macrocode}
 % \end{macro}
-% \begin{macro}{\@@_load_math_font_xits:}
 % \changes{v0.5.1.0}{2022/04/06}{适配macOS平台MacTeX内置XITSMath数学字体}
 % \changes{v2.12.1.0}{2022/07/03}{移除XITSMath数学字体冗余语句}
-% 数学字体配置\valuex{xits}。
-%    \begin{macrocode}
-\cs_new:Npn \@@_load_math_font_xits:
-  {
-    \@@_load_unicode_math_pkg:
-    \@@_if_platform_macos:FT
-      { \setmathfont { XITS~Math } }
-      {
-        \setmathfont { XITSMath-Regular.otf }
-        \setmathfont { XITSMath-Bold.otf    }
-          [ range= { bfup -> up, bfit -> it } ]
-      }
-  }
-%    \end{macrocode}
-% \end{macro}
 % \begin{macro}{\@@_load_math_font_cm:}
 % 数学字体配置\valuex{cm}。
 %    \begin{macrocode}
diff --git a/macros/xetex/latex/xduts/xduts.pdf b/macros/xetex/latex/xduts/xduts.pdf
index f4beb5fd67..842d760503 100644
--- a/macros/xetex/latex/xduts/xduts.pdf
+++ b/macros/xetex/latex/xduts/xduts.pdf
diff --git a/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl b/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
index de285f4331..3b294ec196 100644
--- a/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
+++ b/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
@@ -51,9 +51,6 @@ $mirrors = {
       'https://lab.uklee.pe.kr/tex-archive/' => 1,
       'https://mirror.navercorp.com/CTAN/' => 1,
     },
-    'Philippines' => {
-      'http://mirror.rise.ph/ctan/' => 1,
-    },
     'Singapore' => {
       'https://download.nus.edu.sg/mirror/ctan/' => 1,
     },
@@ -118,6 +115,9 @@ $mirrors = {
       'http://ftp.ntua.gr/mirror/ctan/' => 1,
       'https://ftp.cc.uoc.gr/mirrors/CTAN/' => 1,
     },
+    'Hungary' => {
+      'https://mirror.szerverem.hu/ctan/' => 1,
+    },
     'Italy' => {
       'https://ctan.mirror.garr.it/mirrors/ctan/' => 1,
     },
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb b/systems/texlive/tlnet/tlpkg/texlive.tlpdb
index 8eb6c1b8db..318f2f88bc 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb
@@ -26,7 +26,7 @@ depend container_split_src_files/1
 depend frozen/0
 depend minrelease/2016
 depend release/2022
-depend revision/65106
+depend revision/65110
 
 name 00texlive.image
 category TLCore
@@ -4671,7 +4671,7 @@ depend setting_available_architectures:aarch64-linux amd64-freebsd amd64-netbsd
 
 name 00texlive.installer
 category TLCore
-revision 65101
+revision 65108
 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
@@ -192336,7 +192336,7 @@ catalogue-version 2.0.2
 
 name lt3rawobjects
 category Package
-revision 64038
+revision 65109
 shortdesc Objects and proxies in LaTeX3
 relocated 1
 longdesc This package introduces a new mechanism to create objects like
@@ -192344,15 +192344,15 @@ longdesc the well known C structures. The functions exported by this
 longdesc package are quite low level, and many important mechanisms like
 longdesc member protection and name resolution aren't already defined
 longdesc and should be introduced by intermediate packages.
-containersize 3508
-containerchecksum 5e945ef5eeacc1205b77e60cbb1611421c447163daca4f8334a063cd92af93f63f61b600f4b80a2dd19c579258521277be36ada37b51a9b65081ff5874926cb9
-doccontainersize 532092
-doccontainerchecksum fc03580015c0c1752587edaf0c568932724b241b1ee7cec79e905f9f950da8235384f586ae10ca98cf0e18cdfe25784079efc6cfbb00a717d93b1be8e156bab3
-docfiles size=132
+containersize 3532
+containerchecksum 5a66042662b3d7051f8cbbcfb65ad3d0f7848f284958648f2cd9d424218d75db78f22995b21ccbdec2e89dbc154f124fd2201f3fff4e9746d38ba672bbd3c6d5
+doccontainersize 536008
+doccontainerchecksum 3daf8bfa8d5f6ad47387bdfcfc14e6edcdf3f9ebfc7f3a01ebf0b458834e43e0f167f0fc8d87eb15ccc931a2880d96f87b2a3bd7bc8bdf329d49c29f68f9df0e
+docfiles size=133
  RELOC/doc/latex/lt3rawobjects/README.md details="Readme"
  RELOC/doc/latex/lt3rawobjects/lt3rawobjects.pdf details="Package documentation"
-srccontainersize 9848
-srccontainerchecksum b6a742d0ba9aacba5e3093193187aac10968a5111b8c087c81830dd2b13fe3bbb172512d1ca12e383d933c1759628cbf39db72692d19508500c47df496a19a82
+srccontainersize 10044
+srccontainerchecksum e52c76c2a785fc36088679280c3cc867b99d3703fc25a2be488f7ca12993faaeb6a8dffa765a8a7e36f8bf642f5c439f12154f0cf7b6fc4a8e83bb18fd3acceb
 srcfiles size=14
  RELOC/source/latex/lt3rawobjects/lt3rawobjects.dtx
  RELOC/source/latex/lt3rawobjects/lt3rawobjects.ins
@@ -192367,7 +192367,7 @@ catalogue-contact-support https://github.com/Loara/lt3rawobjects/discussions
 catalogue-ctan /macros/latex/contrib/lt3rawobjects
 catalogue-license gpl3+
 catalogue-topics macro-supp expl3
-catalogue-version 2.0
+catalogue-version 2.1
 
 name ltablex
 category Package
@@ -310752,7 +310752,7 @@ docfiles size=376
 
 name texlive-scripts
 category TLCore
-revision 65101
+revision 65108
 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.
@@ -310760,10 +310760,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 113696
-containerchecksum f685d66b2f40fcfa993f136a083aa72d743e32ba47bff8058a8c0c46a5d91f7c6cfb56516bb3ac47e0b332dde8c136e2c2d3d3f000ffa52235ee2eec7a2a0bbc
+containersize 113704
+containerchecksum 03fd5f7d9391ce4a2ce5b2ff5797707b996919af1269bfa6d40ece24525769bd61c25dcfd9c44fd3852e9fe09e90261cd11aed2d1c80ec23faf114ba63b53732
 doccontainersize 423348
-doccontainerchecksum 4e40f0eca8aa9952fb4e05dc6a87ff334371cee04605d01d2cec7c2960ad915c98d2ba59b980f884c0b2564e35a1f81c8ca3044d0174ca0804ed887ad26255cf
+doccontainerchecksum 7106fcc4f77614579bee732a20ffe312374558c67af1bf607700e432c4b5d5217bfd132b2ebc58266fa0af09e73d575522a2d49d4afe2113d38b828381bf4268
 docfiles size=532
  doc.html
  texmf-dist/doc/man/man1/fmtutil-sys.1
@@ -334187,29 +334187,31 @@ catalogue-version 1.00
 
 name unimath-plain-xetex
 category Package
-revision 65085
+revision 65110
 shortdesc OpenType math support in (plain) XeTeX
 relocated 1
 longdesc This package provides OpenType math font support in plain TeX
 longdesc format. It only works with the XeTeX engine.
-containersize 6264
-containerchecksum a06a28af3bc6d12a01da4147af78f9a4d2f00aaf836d9a3480a9dba062646ec8fb857d9531c3e01891456a78be69bd74b73b1ebbf8dea642adc83aeb14c55a9e
-doccontainersize 45772
-doccontainerchecksum 110933d5168530d5dba122ecb30fdb78f1db605a20fba30b5eb57e7402193b97adb16d8d28def6fd71c127c3a4f974517c61a273d1f59256b637826ad7e58203
-docfiles size=15
+containersize 6788
+containerchecksum f932b63c2c98bb73a799cfef06e3ff3db23c18b9896565dfade62ab98964221f820fafc30a42354e838d86fdb53dc19e4898edce137791d0b851a53d21608662
+doccontainersize 49976
+doccontainerchecksum f2d9582b7a392a1ae2357c6b31057df4e90a3605a40d110ac2c60cf06c2ac3166d3e70edf6e007d78036a478c633f18a8a7f36ac04d783910376a62483b2329e
+docfiles size=16
  RELOC/doc/xetex/unimath-plain-xetex/README.md details="Readme"
  RELOC/doc/xetex/unimath-plain-xetex/unimath-plain-xetex-doc.pdf details="Package documentation"
  RELOC/doc/xetex/unimath-plain-xetex/unimath-plain-xetex-doc.tex
-runfiles size=16
+runfiles size=15
  RELOC/tex/xetex/unimath-plain-xetex/unimath-plain-alphafams.tex
  RELOC/tex/xetex/unimath-plain-xetex/unimath-plain-xetex.tex
 catalogue-contact-bugs https://github.com/AlphaZTX/unimath-plain-xetex/issues
 catalogue-contact-development https://github.com/AlphaZTX
+catalogue-contact-home https://github.com/AlphaZTX/unimath-plain-xetex
 catalogue-contact-repository https://github.com/AlphaZTX/unimath-plain-xetex
+catalogue-contact-support https://github.com/AlphaZTX/unimath-plain-xetex/issues
 catalogue-ctan /macros/xetex/plain/unimath-plain-xetex
 catalogue-license lppl1.3c
 catalogue-topics maths font-supp-maths plain-ext unicode xetex
-catalogue-version 0.0g
+catalogue-version 0.1
 
 name uninormalize
 category Package
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
index 52125b4513..59a0319b43 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
@@ -1 +1 @@
-b16915c772eb785776f1459612ddc773  texlive.tlpdb
+ac455a69fb23ddaaff204718c2658403  texlive.tlpdb
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
index a1d49b4d85..e943b29cd4 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
@@ -1 +1 @@
-ed824bb8a0e57cef61f0d94b8a6bf7a9865417e1ac32355fbeee359e450b8812e627a403720d8cc0191f59f74a631f4ad7f97667cd4643d77d8187727762e83a  texlive.tlpdb
+21a6d165a91229c7e346e7c38bbb05841d9962b8b8a10d7bfbb141733aefe733baa2f0f85e2555e8760c7a0a965c11cce10b6134501dd37f58cdbf31cdc7a1dd  texlive.tlpdb
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
index 6f5af45390..440a700971 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
@@ -1,10 +1,10 @@
 -----BEGIN PGP SIGNATURE-----
 
-iQEcBAEBCgAGBQJjgWQAAAoJEEzhh34ZQ4xwQqwIALV+HW/ZfpuMIVxCXWDZbkan
-Tw5fYAZ0qX+Q/l45KyDslmL+ycTtSLJ8A2w3OE6n/FIGCQ3MZRS9sSWv3j/Q4M+o
-a/S7I6JZb9ierTZ0P0Kske9ghx9/hTREshH03WiubiKTrSJqy5o2eysKJiZdnDyx
-66tddZMkVS4+xNZt/slukIhC8FtiZNhPEWDJbRmqetxxKcarBRJ+k80qa/Mgsg5a
-EDX2ynfuDPYftnhgpLFAcLFfDnbKSPWkysAVonyPiUh11LbneoyPtrZK2CmLTBtz
-KU8pbPBdoEs5U2yUNYM/ZFTi9gGJlE9PS//MZhCGZ9jGBOjfF5HIs/jfiU2DI4Y=
-=87zz
+iQEcBAEBCgAGBQJjgrUpAAoJEEzhh34ZQ4xwEN0H/RDQUeTtesBRCl/G5IK2u725
+fNtkXnBP+i4JomeKfPKxc0XXGkOsQvR0seMIU7qQcyAObNCzYjATawPE4N0eXUIH
+AFbqlJJl8G66tgJko58C1YDdQcNUvKIJnJ9gmPfwv0Qys99lPA0fPYvqeCpI5Enx
+NWazzPLPuRr8YHUNVwYVaWeBsm20Tu+DmabLL/O/jwSmTmsrerhEteehYdziXNlv
+/4xU+yRyltaGmAqrl0//DZMSwMunJD64g9CupF+5Mxuk5xUAS4QXKt4UZbnkA7HM
+4h3JPJCnPtUakcJWxe1pws+uNkXwC06wowu/YJXvndE9YZdySYb2dkLLFHkuDrg=
+=CHYt
 -----END PGP SIGNATURE-----
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
index b7988fdb89..cc782baaf2 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
diff --git a/systems/win32/miktex/tm/packages/files.csv.lzma b/systems/win32/miktex/tm/packages/files.csv.lzma
index 54c423bf1c..ff0b561124 100644
--- a/systems/win32/miktex/tm/packages/files.csv.lzma
+++ b/systems/win32/miktex/tm/packages/files.csv.lzma
diff --git a/systems/win32/miktex/tm/packages/next/pr.ini b/systems/win32/miktex/tm/packages/next/pr.ini
index 228e08b369..6c8d691fb9 100644
--- a/systems/win32/miktex/tm/packages/next/pr.ini
+++ b/systems/win32/miktex/tm/packages/next/pr.ini
@@ -1,13 +1,13 @@
 
 [repository]
-date=1669497464
+date=1669582160
 lastupd=miktex-zzip-bin-x64-2.9 miktex-zlib-bin-x64-2.9 miktex-yap-bin-x64-2.9 miktex-xml2pmx-bin-x64 miktex-xetex-bin-x64-2.9 miktex-web-bin-x64-2.9 miktex-uriparser-bin-x64-2.9 miktex-upmendex-bin-x64 miktex-ttf2pk2-bin-x64-2.9 miktex-texworks-bin-x64-2.9 miktex-texware-bin-x64-2.9 miktex-texify-bin-x64-2.9 miktex-tex4ht-bin-x64-2.9 miktex-tex2xindy-bin-x64-2.9 miktex-tex-bin-x64-2.9 miktex-teckit-bin-x64-2.9 miktex-tdsutil-bin-x64 miktex-synctex-bin-x64-2.9 miktex-runtime-bin-x64-2.9 miktex-ptex-bin-x64
-lstdigest=fed0d77bcb634d458ebe8d9915f82223
+lstdigest=1ade259afe5ae413d0c38cfbeedaa619
 numpkg=6214
 relstate=next
-version=8365
+version=8366
 
 ;;;;This configuration file is signed by a MiKTeX maintainer. The signature follows.
 ;;;;-----BEGIN MIKTEX SIGNATURE-----
-;;;; signature/miktex: SBnFqIkJKCmS4TAs3C599LibOR5v0Fb5Z2Cnj2s1XYPC28csuyXcKNbilIZVYbYqcJodwK4UN0xeya/aLlkqX8x2bJVljrGoACkYNSnmz1PLHb3x/XnGh73V/YR8jdQwm+QG8RyD3bf72o4ReMH09McdRCF9AJ4RxV9chx4H+I+RUyFcuW/GsyXVRkiOnqzDiOv7yHhrOHhf0BRMFg8mxhPZ97BFndK+egsn8LOVRLVtSundWH5CyellCBgFRivwBWWVlLsjnPOXEVL6OtL7oSa3Wl2NjH3+uDxeL0XgLivD8oaEFW+1iDhwjNX/6rBsA6bw+4mwdsRhInOZt5SY/w==
+;;;; signature/miktex: SOdvSEh2ri2B2Bj/AY99Cg4k5RdXngbbqGInZjixxRbnz/PRLIqWclaA3vzv6BjYWwNggO/smluM+DiTKfWA7kwwEb6FXXaIgs2k5xbEOIBYACBNOk+pezcsK96GEB7HRcfWoQhi9V9/R8o6V1mRswy4fdxI3yJZflxTAj+tts6t1d4gsy3156gS9yAWeD91jGfVFLaCM0BPx4R36x+QEwEO/if/2n7VaLT6Y1B14psYBetWzRWymowLuVYfJTMR7emmRv7TID980mH1wsyRWt9BcPZNojklGKN1N38BipHZiuYVS55uzJ2EcLJkHZuDtmZ8Fs18LeA2uMlN0bxGEg==
 ;;;;-----END MIKTEX SIGNATURE-----
diff --git a/systems/win32/miktex/tm/packages/pr.ini b/systems/win32/miktex/tm/packages/pr.ini
index 82f9bf628d..aed173782e 100644
--- a/systems/win32/miktex/tm/packages/pr.ini
+++ b/systems/win32/miktex/tm/packages/pr.ini
@@ -1,13 +1,13 @@
 
 [repository]
-date=1669497423
-lastupd=simpleicons__source simpleicons__doc simpleicons bib2gls__source bib2gls__doc bib2gls achemso__source achemso__doc achemso miktex-zzip-bin-x64-2.9 miktex-zlib-bin-x64-2.9 miktex-yap-bin-x64-2.9 miktex-xml2pmx-bin-x64 miktex-xetex-bin-x64-2.9 miktex-web-bin-x64-2.9 miktex-uriparser-bin-x64-2.9 miktex-upmendex-bin-x64 miktex-ttf2pk2-bin-x64-2.9 miktex-texworks-bin-x64-2.9 miktex-texware-bin-x64-2.9
-lstdigest=19aa29f591499501b756f2405175167c
+date=1669582116
+lastupd=miktex-runtime-bin-x64-2.9 miktex-luatex-bin-x64-2.9 unimath-plain-xetex__source unimath-plain-xetex__doc unimath-plain-xetex lt3rawobjects__source lt3rawobjects__doc lt3rawobjects simpleicons__source simpleicons__doc simpleicons bib2gls__source bib2gls__doc bib2gls achemso__source achemso__doc achemso miktex-zzip-bin-x64-2.9 miktex-zlib-bin-x64-2.9 miktex-yap-bin-x64-2.9
+lstdigest=03c0398c75f7d5e5771e380542001753
 numpkg=6214
 relstate=stable
-version=8365
+version=8366
 
 ;;;;This configuration file is signed by a MiKTeX maintainer. The signature follows.
 ;;;;-----BEGIN MIKTEX SIGNATURE-----
-;;;; signature/miktex: Xb/lgPWXAdeZG4sFAqQ8GG+u0YNfi8e1A/zj/UGqmxKBKSQeH+IiH5PXUVa6zyjqKTZecfx4Sv+Un3vAP5y9Q6uvbsdMX6dviAy1Z3r7G23f5kInEpR8BE//FbTjRLrOhcGZemOpn3WXPouePUJFEbieo1F651R2xTCegvMNOFrVUv7qwLARvLQLL7GB8El9U0mwfBqA7I9YjtBogZyiGr1F06M4pdp4vq+vLqjCAwEO/Sn5tJm/APC98ZlI9x4ULx12/SuNpwXcxeB6mDdz3MviMfznCFDUEQiRBj/ljEXATQvz9k08Dk1BmbW9dcKmoEvdxjKCVPLU5SuLQ/3zHQ==
+;;;; signature/miktex: Egp4rcSa9i6bUWGiQmEOfncHuBGgopIlKy6wnTtPxcSu+Qm6ieS68cYe4H9su90oftrN7ssgMd1rJ0H7ObAvb4VGRZlWpkzBT8mE/PHfwlt0SkjfCMtE/MsQ1hxfv2CjHame+JylX7gdGnywKYYLVBAMsrXaFgDCLwB1hr1t0QD4AZzMUn/NRcAFRcasZw3INMLrXQbqd6ZeqnqFYsHJVfbIFRO/FlaQYLPTvg1lsTfvJ6nVicgVqZMvoG9UYEe9Xxr6KSPYZuC8eVzzeJsqBXQlB6YYz4vTVSFDVNbiC58OFWEwJUxSrOrjjuyqVaN8hNH5YuFwmwXmAPnKk2+YGA==
 ;;;;-----END MIKTEX SIGNATURE-----
diff --git a/timestamp b/timestamp
index 9057226aa3..cc51ba92b2 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:
-2022-11-27-02-02
+2022-11-28-02-02