CTAN sync 202208030300

36 files changed, 2051 insertions, 1268 deletions

diff --git a/FILES.byname b/FILES.byname
index f2d9ad7727..096f6618ce 100644
--- a/FILES.byname
+++ b/FILES.byname
@@ -5267,7 +5267,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/08/01 |     102680 | FILES.last07days
+2022/08/02 |      95189 | 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
@@ -196668,7 +196668,7 @@
 2013/04/01 |      14776 | macros/context/contrib/context-visualcounter/tex/context/third/visualcounter/t-visualcounter.mkvi
 2018/03/05 |         11 | macros/context/contrib/context-visualcounter/VERSION
 2018/03/22 |     276789 | macros/context/contrib/context-visualcounter.zip
-2022/07/27 |  113762760 | macros/context/latest/cont-tmf.zip
+2022/08/01 |  113866249 | macros/context/latest/cont-tmf.zip
 2016/04/21 |      32846 | macros/cstex/base/cmexb.tar.gz
 2016/06/26 |    1728262 | macros/cstex/base/csfonts-t1.tar.gz
 2007/03/01 |     187106 | macros/cstex/base/csfonts.tar.gz
@@ -209181,27 +209181,26 @@
 2018/05/24 |      15495 | macros/latex/contrib/biblatex-contrib/biblatex-socialscienceshuberlin/socialscienceshuberlin.tex
 2018/05/25 |     117753 | macros/latex/contrib/biblatex-contrib/biblatex-socialscienceshuberlin.zip
 2022/03/03 |       4530 | macros/latex/contrib/biblatex-contrib/biblatex-software/biblio.bib
-2022/03/03 |       2060 | macros/latex/contrib/biblatex-contrib/biblatex-software/Changes
-2020/10/22 |        787 | macros/latex/contrib/biblatex-contrib/biblatex-software/english-software.lbx
-2020/04/25 |        758 | macros/latex/contrib/biblatex-contrib/biblatex-software/french-software.lbx
-2022/03/03 |       2060 | macros/latex/contrib/biblatex-contrib/biblatex-software/history.tex
+2022/08/02 |       2188 | macros/latex/contrib/biblatex-contrib/biblatex-software/Changes
+2022/08/01 |        787 | macros/latex/contrib/biblatex-contrib/biblatex-software/english-software.lbx
+2022/08/01 |        758 | macros/latex/contrib/biblatex-contrib/biblatex-software/french-software.lbx
 2020/04/25 |        931 | macros/latex/contrib/biblatex-contrib/biblatex-software/LICENSE
-2021/01/06 |       1935 | macros/latex/contrib/biblatex-contrib/biblatex-software/Makefile
+2022/08/02 |       3318 | macros/latex/contrib/biblatex-contrib/biblatex-software/Makefile
 2020/06/27 |       5963 | macros/latex/contrib/biblatex-contrib/biblatex-software/manual.bib
 2020/04/25 |        654 | macros/latex/contrib/biblatex-contrib/biblatex-software/mkbiblatexstubs.sh
 2020/10/22 |       2792 | macros/latex/contrib/biblatex-contrib/biblatex-software/README.md
 2022/03/03 |       2497 | macros/latex/contrib/biblatex-contrib/biblatex-software/sample-content.tex
 2021/01/06 |        726 | macros/latex/contrib/biblatex-contrib/biblatex-software/sample.tex
-2022/03/03 |     129373 | macros/latex/contrib/biblatex-contrib/biblatex-software/sample-use-sty.pdf
+2022/08/02 |     128987 | macros/latex/contrib/biblatex-contrib/biblatex-software/sample-use-sty.pdf
 2022/02/14 |        653 | macros/latex/contrib/biblatex-contrib/biblatex-software/sample-use-sty.tex
-2022/03/03 |       9878 | macros/latex/contrib/biblatex-contrib/biblatex-software/software.bbx
-2022/03/03 |     172786 | macros/latex/contrib/biblatex-contrib/biblatex-software/software-biblatex.pdf
+2022/08/01 |      10007 | macros/latex/contrib/biblatex-contrib/biblatex-software/software.bbx
+2022/08/02 |     172433 | macros/latex/contrib/biblatex-contrib/biblatex-software/software-biblatex.pdf
 2020/04/25 |        639 | macros/latex/contrib/biblatex-contrib/biblatex-software/software-biblatex.sty
-2022/03/03 |      11245 | macros/latex/contrib/biblatex-contrib/biblatex-software/software-biblatex.tex
-2022/03/03 |       3162 | macros/latex/contrib/biblatex-contrib/biblatex-software/software.dbx
+2022/08/01 |      11245 | macros/latex/contrib/biblatex-contrib/biblatex-software/software-biblatex.tex
+2022/08/01 |       3162 | macros/latex/contrib/biblatex-contrib/biblatex-software/software.dbx
 2020/04/25 |        359 | macros/latex/contrib/biblatex-contrib/biblatex-software/stublist
 2022/03/03 |      14095 | macros/latex/contrib/biblatex-contrib/biblatex-software/swentries.tex
-2022/03/03 |     324114 | macros/latex/contrib/biblatex-contrib/biblatex-software.zip
+2022/08/02 |     323785 | macros/latex/contrib/biblatex-contrib/biblatex-software.zip
 2017/09/21 |        742 | macros/latex/contrib/biblatex-contrib/biblatex-source-division/biblatex-source-division.bib
 2017/09/21 |      62688 | macros/latex/contrib/biblatex-contrib/biblatex-source-division/biblatex-source-division.pdf
 2017/09/21 |       3431 | macros/latex/contrib/biblatex-contrib/biblatex-source-division/biblatex-source-division.sty
@@ -225928,16 +225927,16 @@
 1999/08/14 |       2754 | macros/latex/contrib/postcards/postcards.cls
 1999/08/14 |        559 | macros/latex/contrib/postcards/README
 2005/04/30 |       2990 | macros/latex/contrib/postcards.zip
-2022/07/07 |       1067 | macros/latex/contrib/postnotes/CHANGELOG.md
-2022/07/07 |         14 | macros/latex/contrib/postnotes/DEPENDS.txt
-2022/07/07 |     812284 | macros/latex/contrib/postnotes/postnotes-code.pdf
-2022/07/07 |       1434 | macros/latex/contrib/postnotes/postnotes-code.tex
-2022/07/07 |      95911 | macros/latex/contrib/postnotes/postnotes.dtx
-2022/07/07 |       2574 | macros/latex/contrib/postnotes/postnotes.ins
-2022/07/07 |     176560 | macros/latex/contrib/postnotes/postnotes.pdf
-2022/07/07 |      39514 | macros/latex/contrib/postnotes/postnotes.tex
-2022/07/07 |        881 | macros/latex/contrib/postnotes/README.md
-2022/07/08 |     992252 | macros/latex/contrib/postnotes.zip
+2022/08/01 |       1294 | macros/latex/contrib/postnotes/CHANGELOG.md
+2022/08/01 |         14 | macros/latex/contrib/postnotes/DEPENDS.txt
+2022/08/01 |     814509 | macros/latex/contrib/postnotes/postnotes-code.pdf
+2022/08/01 |       1434 | macros/latex/contrib/postnotes/postnotes-code.tex
+2022/08/01 |      96341 | macros/latex/contrib/postnotes/postnotes.dtx
+2022/08/01 |       2574 | macros/latex/contrib/postnotes/postnotes.ins
+2022/08/01 |     176261 | macros/latex/contrib/postnotes/postnotes.pdf
+2022/08/01 |      39408 | macros/latex/contrib/postnotes/postnotes.tex
+2022/08/01 |        881 | macros/latex/contrib/postnotes/README.md
+2022/08/02 |     994420 | macros/latex/contrib/postnotes.zip
 2005/12/04 |       6045 | macros/latex/contrib/powerdot/doc/lyx/powerdot-example.lyx
 2005/12/04 |       3604 | macros/latex/contrib/powerdot/doc/lyx/powerdot-example.tex
 2005/09/17 |       8540 | macros/latex/contrib/powerdot/doc/lyx/powerdot.layout
@@ -226127,15 +226126,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/07/13 |    8600450 | macros/latex/contrib/profcollege/doc/ProfCollege-doc.pdf
-2022/07/13 |    2209146 | macros/latex/contrib/profcollege/doc/ProfCollege-doc.zip
+2022/08/02 |    8684452 | macros/latex/contrib/profcollege/doc/ProfCollege-doc.pdf
+2022/08/02 |    2214355 | 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/07/13 |     816627 | macros/latex/contrib/profcollege/latex/ProfCollege.sty
+2022/08/02 |     845006 | 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
@@ -226343,17 +226342,17 @@
 2022/05/26 |      13296 | macros/latex/contrib/profcollege/metapost/PfCCalculatrice.mp
 2022/05/26 |      12999 | macros/latex/contrib/profcollege/metapost/PfC-Calculatriceold.mp
 2022/05/26 |        431 | macros/latex/contrib/profcollege/metapost/PfCConstantes.mp
-2022/07/06 |      40881 | macros/latex/contrib/profcollege/metapost/PfCGeometrie.mp
+2022/08/02 |      40881 | macros/latex/contrib/profcollege/metapost/PfCGeometrie.mp
 2022/05/26 |       5386 | macros/latex/contrib/profcollege/metapost/PfCLabyNombre.mp
 2022/05/26 |        660 | 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/07/13 |      62924 | macros/latex/contrib/profcollege/metapost/PfCPseudo.mp
-2022/07/13 |     102812 | macros/latex/contrib/profcollege/metapost/PfCScratch.mp
-2022/07/13 |     104857 | macros/latex/contrib/profcollege/metapost/PfCScratchpdf.mp
+2022/08/02 |      63304 | macros/latex/contrib/profcollege/metapost/PfCPseudo.mp
+2022/08/02 |     103108 | macros/latex/contrib/profcollege/metapost/PfCScratch.mp
+2022/08/02 |     105153 | macros/latex/contrib/profcollege/metapost/PfCScratchpdf.mp
 2022/05/26 |       6652 | macros/latex/contrib/profcollege/metapost/PfCSvgnames.mp
 2021/01/18 |        435 | macros/latex/contrib/profcollege/README
-2022/07/13 |   12941594 | macros/latex/contrib/profcollege.zip
+2022/08/02 |   13023673 | 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
@@ -228936,14 +228935,14 @@
 2012/07/02 |       1474 | macros/latex/contrib/silence/silence.ins
 2012/07/02 |      17540 | macros/latex/contrib/silence/silence.sty
 2012/07/04 |     487529 | macros/latex/contrib/silence.zip
-2022/02/02 |       1565 | macros/latex/contrib/sillypage/README.md
-2022/02/02 |      10704 | macros/latex/contrib/sillypage/sillypage.dtx
-2022/02/02 |     103728 | macros/latex/contrib/sillypage/sillypage-example.pdf
-2022/02/02 |        141 | macros/latex/contrib/sillypage/sillypage-example.tex
-2022/02/02 |       2780 | macros/latex/contrib/sillypage/sillypage.ins
-2022/02/02 |     219530 | macros/latex/contrib/sillypage/sillypage.pdf
-2022/02/02 |      18636 | macros/latex/contrib/sillypage/sillywalk-map.pdf
-2022/02/02 |     317326 | macros/latex/contrib/sillypage.zip
+2022/08/02 |       1417 | macros/latex/contrib/sillypage/README.md
+2022/08/02 |      10848 | macros/latex/contrib/sillypage/sillypage.dtx
+2022/08/02 |     103728 | macros/latex/contrib/sillypage/sillypage-example.pdf
+2022/08/02 |        141 | macros/latex/contrib/sillypage/sillypage-example.tex
+2022/08/02 |       2780 | macros/latex/contrib/sillypage/sillypage.ins
+2022/08/02 |     219736 | macros/latex/contrib/sillypage/sillypage.pdf
+2022/08/02 |      18636 | macros/latex/contrib/sillypage/sillywalk-map.pdf
+2022/08/02 |     317481 | macros/latex/contrib/sillypage.zip
 2022/05/08 |       1100 | macros/latex/contrib/simplebnf/LICENSE
 2022/05/08 |        510 | macros/latex/contrib/simplebnf/README.md
 2022/05/08 |     152698 | macros/latex/contrib/simplebnf/simplebnf-doc.pdf
@@ -281702,9 +281701,9 @@
 2021/05/18 |      23164 | systems/texlive/tlnet/archive/bnumexpr.source.r59244.tar.xz
 2022/01/24 |     343180 | systems/texlive/tlnet/archive/bodegraph.doc.r61719.tar.xz
 2022/01/24 |      16008 | systems/texlive/tlnet/archive/bodegraph.r61719.tar.xz
-2022/07/21 |     737444 | systems/texlive/tlnet/archive/bodeplot.doc.r63946.tar.xz
-2022/07/21 |       4944 | systems/texlive/tlnet/archive/bodeplot.r63946.tar.xz
-2022/07/21 |      15648 | systems/texlive/tlnet/archive/bodeplot.source.r63946.tar.xz
+2022/08/02 |     729796 | systems/texlive/tlnet/archive/bodeplot.doc.r64022.tar.xz
+2022/08/02 |       5528 | systems/texlive/tlnet/archive/bodeplot.r64022.tar.xz
+2022/08/02 |      16696 | systems/texlive/tlnet/archive/bodeplot.source.r64022.tar.xz
 2022/04/08 |     424416 | systems/texlive/tlnet/archive/bohr.doc.r62977.tar.xz
 2022/04/08 |       3652 | systems/texlive/tlnet/archive/bohr.r62977.tar.xz
 2019/02/28 |     939068 | systems/texlive/tlnet/archive/boisik.doc.r15878.tar.xz
@@ -282514,7 +282513,7 @@
 2020/03/04 |        560 | systems/texlive/tlnet/archive/collection-fontsrecommended.r54074.tar.xz
 2021/12/03 |        536 | systems/texlive/tlnet/archive/collection-fontutils.r61207.tar.xz
 2022/02/27 |        584 | systems/texlive/tlnet/archive/collection-formatsextra.r62226.tar.xz
-2022/05/05 |        552 | systems/texlive/tlnet/archive/collection-games.r63224.tar.xz
+2022/08/02 |        556 | systems/texlive/tlnet/archive/collection-games.r64021.tar.xz
 2020/10/07 |        588 | systems/texlive/tlnet/archive/collection-humanities.r56575.tar.xz
 2021/06/15 |        456 | systems/texlive/tlnet/archive/collection-langarabic.r59594.tar.xz
 2022/07/29 |        552 | systems/texlive/tlnet/archive/collection-langchinese.r63995.tar.xz
@@ -283080,6 +283079,9 @@
 2019/02/28 |     667864 | systems/texlive/tlnet/archive/custom-bib.doc.r24729.tar.xz
 2019/02/28 |      84528 | systems/texlive/tlnet/archive/custom-bib.r24729.tar.xz
 2019/02/28 |      17224 | systems/texlive/tlnet/archive/custom-bib.source.r24729.tar.xz
+2022/08/02 |     358264 | systems/texlive/tlnet/archive/customdice.doc.r64021.tar.xz
+2022/08/02 |       2512 | systems/texlive/tlnet/archive/customdice.r64021.tar.xz
+2022/08/02 |       6980 | systems/texlive/tlnet/archive/customdice.source.r64021.tar.xz
 2021/10/31 |     334216 | systems/texlive/tlnet/archive/cutwin.doc.r60901.tar.xz
 2021/10/31 |       2836 | systems/texlive/tlnet/archive/cutwin.r60901.tar.xz
 2021/10/31 |       9416 | systems/texlive/tlnet/archive/cutwin.source.r60901.tar.xz
@@ -285628,8 +285630,8 @@
 2019/02/28 |     123256 | systems/texlive/tlnet/archive/hf-tikz.doc.r34733.tar.xz
 2019/02/28 |       3276 | systems/texlive/tlnet/archive/hf-tikz.r34733.tar.xz
 2019/02/28 |       9924 | systems/texlive/tlnet/archive/hf-tikz.source.r34733.tar.xz
-2022/07/31 |     799628 | systems/texlive/tlnet/archive/hfutthesis.doc.r64009.tar.xz
-2022/07/31 |      25504 | systems/texlive/tlnet/archive/hfutthesis.r64009.tar.xz
+2022/08/02 |     799628 | systems/texlive/tlnet/archive/hfutthesis.doc.r64025.tar.xz
+2022/08/02 |      25440 | systems/texlive/tlnet/archive/hfutthesis.r64025.tar.xz
 2020/03/04 |     362248 | systems/texlive/tlnet/archive/hhtensor.doc.r54080.tar.xz
 2020/03/04 |       1204 | systems/texlive/tlnet/archive/hhtensor.r54080.tar.xz
 2020/03/04 |       3160 | systems/texlive/tlnet/archive/hhtensor.source.r54080.tar.xz
@@ -286020,8 +286022,8 @@
 2019/02/28 |        348 | systems/texlive/tlnet/archive/installfont.x86_64-linuxmusl.r46840.tar.xz
 2019/02/28 |        344 | systems/texlive/tlnet/archive/installfont.x86_64-linux.r19743.tar.xz
 2019/02/28 |        344 | systems/texlive/tlnet/archive/installfont.x86_64-solaris.r19743.tar.xz
-2022/07/02 |     801916 | systems/texlive/tlnet/archive/install-latex-guide-zh-cn.doc.r63775.tar.xz
-2022/07/02 |        568 | systems/texlive/tlnet/archive/install-latex-guide-zh-cn.r63775.tar.xz
+2022/08/02 |     804676 | systems/texlive/tlnet/archive/install-latex-guide-zh-cn.doc.r64023.tar.xz
+2022/08/02 |        568 | systems/texlive/tlnet/archive/install-latex-guide-zh-cn.r64023.tar.xz
 2019/12/18 |     423196 | systems/texlive/tlnet/archive/intcalc.doc.r53168.tar.xz
 2019/12/18 |       5436 | systems/texlive/tlnet/archive/intcalc.r53168.tar.xz
 2019/12/18 |      12576 | systems/texlive/tlnet/archive/intcalc.source.r53168.tar.xz
@@ -288063,9 +288065,9 @@
 2022/01/24 |      41912 | systems/texlive/tlnet/archive/minitoc.r61719.tar.xz
 2019/02/28 |     166396 | systems/texlive/tlnet/archive/minorrevision.doc.r32165.tar.xz
 2019/02/28 |       1584 | systems/texlive/tlnet/archive/minorrevision.r32165.tar.xz
-2022/08/01 |     824148 | systems/texlive/tlnet/archive/minted.doc.r64017.tar.xz
-2022/08/01 |       9668 | systems/texlive/tlnet/archive/minted.r64017.tar.xz
-2022/08/01 |      45492 | systems/texlive/tlnet/archive/minted.source.r64017.tar.xz
+2022/08/02 |     824148 | systems/texlive/tlnet/archive/minted.doc.r64026.tar.xz
+2022/08/02 |       9668 | systems/texlive/tlnet/archive/minted.r64026.tar.xz
+2022/08/02 |      45492 | systems/texlive/tlnet/archive/minted.source.r64026.tar.xz
 2019/02/28 |     308404 | systems/texlive/tlnet/archive/mintspirit.doc.r32069.tar.xz
 2019/02/28 |    1105488 | systems/texlive/tlnet/archive/mintspirit.r32069.tar.xz
 2019/02/28 |     393404 | systems/texlive/tlnet/archive/minutes.doc.r42186.tar.xz
@@ -289746,8 +289748,8 @@
 2022/07/15 |    1209900 | systems/texlive/tlnet/archive/profcollege.r63895.tar.xz
 2022/04/27 |     134096 | systems/texlive/tlnet/archive/proflabo.doc.r63147.tar.xz
 2022/04/27 |       2748 | systems/texlive/tlnet/archive/proflabo.r63147.tar.xz
-2022/07/01 |     732612 | systems/texlive/tlnet/archive/proflycee.doc.r63768.tar.xz
-2022/07/01 |      12104 | systems/texlive/tlnet/archive/proflycee.r63768.tar.xz
+2022/08/02 |     744396 | systems/texlive/tlnet/archive/proflycee.doc.r64024.tar.xz
+2022/08/02 |      12208 | systems/texlive/tlnet/archive/proflycee.r64024.tar.xz
 2019/02/28 |      49880 | systems/texlive/tlnet/archive/program.doc.r44214.tar.xz
 2019/02/28 |      11780 | systems/texlive/tlnet/archive/program.r44214.tar.xz
 2019/02/28 |      86236 | systems/texlive/tlnet/archive/progressbar.doc.r33822.tar.xz
@@ -291855,7 +291857,7 @@
 2020/05/17 |        592 | systems/texlive/tlnet/archive/texlive-scripts.amd64-freebsd.r55172.tar.xz
 2020/05/17 |        588 | systems/texlive/tlnet/archive/texlive-scripts.amd64-netbsd.r55172.tar.xz
 2020/05/17 |        592 | systems/texlive/tlnet/archive/texlive-scripts.armhf-linux.r55172.tar.xz
-2022/08/01 |     419140 | systems/texlive/tlnet/archive/texlive-scripts.doc.r64013.tar.xz
+2022/08/02 |     419144 | systems/texlive/tlnet/archive/texlive-scripts.doc.r64020.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
@@ -291879,7 +291881,7 @@
 2020/05/17 |        588 | systems/texlive/tlnet/archive/texlive-scripts.i386-linux.r55172.tar.xz
 2020/05/17 |        592 | systems/texlive/tlnet/archive/texlive-scripts.i386-netbsd.r55172.tar.xz
 2020/05/17 |        588 | systems/texlive/tlnet/archive/texlive-scripts.i386-solaris.r55172.tar.xz
-2022/08/01 |     113500 | systems/texlive/tlnet/archive/texlive-scripts.r64013.tar.xz
+2022/08/02 |     113520 | systems/texlive/tlnet/archive/texlive-scripts.r64020.tar.xz
 2021/02/25 |        572 | systems/texlive/tlnet/archive/texlive-scripts.universal-darwin.r57908.tar.xz
 2022/04/19 |      36296 | systems/texlive/tlnet/archive/texlive-scripts.win32.r63068.tar.xz
 2020/05/17 |        588 | systems/texlive/tlnet/archive/texlive-scripts.x86_64-cygwin.r55172.tar.xz
@@ -293701,16 +293703,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/08/01 |    5808548 | systems/texlive/tlnet/install-tl-unx.tar.gz
-2022/08/01 |        152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
-2022/08/01 |        455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
+2022/08/02 |    5808882 | systems/texlive/tlnet/install-tl-unx.tar.gz
+2022/08/02 |        152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
+2022/08/02 |        455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
 2021/04/11 |       4945 | systems/texlive/tlnet/install-tl-windows.bat
-2022/08/01 |   20466260 | systems/texlive/tlnet/install-tl-windows.exe
-2022/08/01 |        153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
-2022/08/01 |        455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
-2022/08/01 |   25493364 | systems/texlive/tlnet/install-tl.zip
-2022/08/01 |        145 | systems/texlive/tlnet/install-tl.zip.sha512
-2022/08/01 |        455 | systems/texlive/tlnet/install-tl.zip.sha512.asc
+2022/08/02 |   20462530 | systems/texlive/tlnet/install-tl-windows.exe
+2022/08/02 |        153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
+2022/08/02 |        455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
+2022/08/02 |   25493393 | systems/texlive/tlnet/install-tl.zip
+2022/08/02 |        145 | systems/texlive/tlnet/install-tl.zip.sha512
+2022/08/02 |        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
@@ -293720,7 +293722,7 @@
 2022/02/28 |       1280 | systems/texlive/tlnet/tlpkg/gpg/trustdb.gpg
 2022/05/27 |      49794 | systems/texlive/tlnet/tlpkg/installer/config.guess
 2010/11/11 |      11651 | systems/texlive/tlnet/tlpkg/installer/COPYING.MinGW-runtime.txt
-2022/07/31 |       7249 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
+2022/08/01 |       7324 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
 2022/07/21 |     222477 | 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
@@ -293762,12 +293764,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/08/01 |   17574463 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
-2022/08/01 |         48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
+2022/08/02 |   17575915 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
+2022/08/02 |         48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
 2022/04/18 |      86658 | systems/texlive/tlnet/tlpkg/TeXLive/TLPDB.pm
-2022/08/01 |        144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
-2022/08/01 |        455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
-2022/08/01 |    2396632 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
+2022/08/02 |        144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
+2022/08/02 |        455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
+2022/08/02 |    2396648 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
 2021/12/21 |      58848 | systems/texlive/tlnet/tlpkg/TeXLive/TLPOBJ.pm
 2022/08/01 |      42206 | systems/texlive/tlnet/tlpkg/TeXLive/TLPSRC.pm
 2021/12/21 |      16130 | systems/texlive/tlnet/tlpkg/TeXLive/TLTREE.pm
@@ -299030,7 +299032,7 @@
 2020/10/03 |     318630 | systems/win32/miktex/tm/packages/filehook.tar.lzma
 2012/12/04 |     924573 | systems/win32/miktex/tm/packages/fileinfo.tar.lzma
 2011/09/21 |     281409 | systems/win32/miktex/tm/packages/filemod.tar.lzma
-2022/08/01 |     658010 | systems/win32/miktex/tm/packages/files.csv.lzma
+2022/08/02 |     658010 | 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
@@ -300707,9 +300709,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/07/30 |      43515 | systems/win32/miktex/tm/packages/miktex-zlib-bin-x64-2.9.tar.lzma
-2022/08/01 |     288507 | systems/win32/miktex/tm/packages/miktex-zzdb1-2.9.tar.lzma
-2022/08/01 |    1480217 | systems/win32/miktex/tm/packages/miktex-zzdb2-2.9.tar.lzma
-2022/08/01 |    1362511 | systems/win32/miktex/tm/packages/miktex-zzdb3-2.9.tar.lzma
+2022/08/02 |     288489 | systems/win32/miktex/tm/packages/miktex-zzdb1-2.9.tar.lzma
+2022/08/02 |    1479978 | systems/win32/miktex/tm/packages/miktex-zzdb2-2.9.tar.lzma
+2022/08/02 |    1362797 | 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/07/30 |      14474 | 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
@@ -300950,102 +300952,102 @@
 2018/04/09 |     400132 | systems/win32/miktex/tm/packages/newunicodechar.tar.lzma
 2011/09/19 |     101312 | systems/win32/miktex/tm/packages/newvbtm.tar.lzma
 2021/03/17 |     232249 | systems/win32/miktex/tm/packages/newverbs.tar.lzma
-2022/08/01 |     658474 | systems/win32/miktex/tm/packages/next/files.csv.lzma
-2022/08/01 |      57317 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-x64-2.9.tar.lzma
-2022/08/01 |    1161749 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-x64-2.9.tar.lzma
-2022/08/01 |      31586 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-x64-2.9.tar.lzma
-2022/08/01 |      35264 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-x64-2.9.tar.lzma
-2022/08/01 |      65130 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-x64-2.9.tar.lzma
-2022/08/01 |      95469 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-x64-2.9.tar.lzma
-2022/08/01 |      77210 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-x64-2.9.tar.lzma
-2022/08/01 |      31563 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-x64-2.9.tar.lzma
-2022/08/01 |     394143 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-x64-2.9.tar.lzma
-2022/08/01 |      37050 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-x64-2.9.tar.lzma
-2022/08/01 |      57503 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-x64-2.9.tar.lzma
-2022/08/01 |     270467 | systems/win32/miktex/tm/packages/next/miktex-console-bin-x64-2.9.tar.lzma
-2022/08/01 |     196212 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-x64-2.9.tar.lzma
-2022/08/01 |     103246 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-x64-2.9.tar.lzma
-2022/08/01 |      24211 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-x64-2.9.tar.lzma
-2022/08/01 |     481894 | systems/win32/miktex/tm/packages/next/miktex-doc.tar.lzma
-2022/08/01 |      52037 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-x64-2.9.tar.lzma
-2022/08/01 |     325980 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-x64-2.9.tar.lzma
-2022/08/01 |      45795 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-x64-2.9.tar.lzma
-2022/08/01 |     135464 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-x64-2.9.tar.lzma
-2022/08/01 |    1458151 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-x64-2.9.tar.lzma
-2022/08/01 |     112979 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-x64-2.9.tar.lzma
-2022/08/01 |      48852 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-x64-2.9.tar.lzma
-2022/08/01 |      28510 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-x64-2.9.tar.lzma
-2022/08/01 |      63239 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-x64-2.9.tar.lzma
-2022/08/01 |     155430 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-x64-2.9.tar.lzma
-2022/08/01 |      79063 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-x64-2.9.tar.lzma
-2022/08/01 |      81446 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-x64-2.9.tar.lzma
-2022/08/01 |     295944 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-x64-2.9.tar.lzma
-2022/08/01 |      25118 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-x64-2.9.tar.lzma
-2022/08/01 |     112879 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-x64-2.9.tar.lzma
-2022/08/01 |      73263 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-x64-2.9.tar.lzma
-2022/08/01 |     115579 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-x64-2.9.tar.lzma
-2022/08/01 |      43889 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-x64-2.9.tar.lzma
-2022/08/01 |     565081 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-x64-2.9.tar.lzma
-2022/08/01 |     247208 | systems/win32/miktex/tm/packages/next/miktex-hitex-bin-x64.tar.lzma
-2022/08/01 |     169677 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-x64-2.9.tar.lzma
-2022/08/01 |     109650 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-x64-2.9.tar.lzma
-2022/08/01 |      18381 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-x64-2.9.tar.lzma
-2022/08/01 |      30570 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-x64-2.9.tar.lzma
-2022/08/01 |     682214 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-x64-2.9.tar.lzma
-2022/08/01 |     599107 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-x64-2.9.tar.lzma
-2022/08/01 |     527570 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-x64-2.9.tar.lzma
-2022/08/01 |     103598 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-x64-2.9.tar.lzma
-2022/08/01 |    2023131 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-x64-2.9.tar.lzma
-2022/08/01 |      74099 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-x64-2.9.tar.lzma
-2022/08/01 |      32074 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-x64-2.9.tar.lzma
-2022/08/01 |       8825 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-x64-2.9.tar.lzma
-2022/08/01 |     209138 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-x64-2.9.tar.lzma
-2022/08/01 |     286685 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-x64-2.9.tar.lzma
-2022/08/01 |     104921 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-x64-2.9.tar.lzma
-2022/08/01 |     140012 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-x64-2.9.tar.lzma
-2022/08/01 |     325483 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-x64-2.9.tar.lzma
-2022/08/01 |     181725 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-x64-2.9.tar.lzma
-2022/08/01 |      55319 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-x64-2.9.tar.lzma
-2022/08/01 |      35228 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-x64-2.9.tar.lzma
-2022/08/01 |      43616 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-x64-2.9.tar.lzma
-2022/08/01 |      48037 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-x64-2.9.tar.lzma
-2022/08/01 |      52369 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-x64-2.9.tar.lzma
-2022/08/01 |     213846 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-x64-2.9.tar.lzma
-2022/08/01 |      41179 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin-x64.tar.lzma
-2022/08/01 |     824995 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-x64-2.9.tar.lzma
-2022/08/01 |     203420 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-x64-2.9.tar.lzma
-2022/08/01 |     245151 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-x64-2.9.tar.lzma
-2022/08/01 |      88484 | systems/win32/miktex/tm/packages/next/miktex-png-bin-x64-2.9.tar.lzma
-2022/08/01 |    1323742 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-x64-2.9.tar.lzma
-2022/08/01 |      23949 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-x64-2.9.tar.lzma
-2022/08/01 |      37505 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-x64-2.9.tar.lzma
-2022/08/01 |      72978 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-x64-2.9.tar.lzma
-2022/08/01 |      58633 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-x64-2.9.tar.lzma
-2022/08/01 |     769652 | systems/win32/miktex/tm/packages/next/miktex-ptex-bin-x64.tar.lzma
-2022/08/01 |    1503054 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-x64-2.9.tar.lzma
-2022/08/01 |      52628 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-x64-2.9.tar.lzma
-2022/08/01 |      63802 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-x64.tar.lzma
-2022/08/01 |      27463 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-x64-2.9.tar.lzma
-2022/08/01 |      18510 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-x64-2.9.tar.lzma
-2022/08/01 |      70938 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-x64-2.9.tar.lzma
-2022/08/01 |     173177 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-x64-2.9.tar.lzma
-2022/08/01 |      68146 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-x64-2.9.tar.lzma
-2022/08/01 |     107436 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-x64-2.9.tar.lzma
-2022/08/01 |    2821672 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-x64-2.9.tar.lzma
-2022/08/01 |      62359 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-x64-2.9.tar.lzma
-2022/08/01 |      41190 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin-x64.tar.lzma
-2022/08/01 |      33862 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-x64-2.9.tar.lzma
-2022/08/01 |      73685 | systems/win32/miktex/tm/packages/next/miktex-web-bin-x64-2.9.tar.lzma
-2022/08/01 |     352465 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-x64-2.9.tar.lzma
-2022/08/01 |      57501 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin-x64.tar.lzma
-2022/08/01 |     630434 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-x64-2.9.tar.lzma
-2022/08/01 |      43527 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-x64-2.9.tar.lzma
-2022/08/01 |     288508 | systems/win32/miktex/tm/packages/next/miktex-zzdb1-2.9.tar.lzma
-2022/08/01 |    1478686 | systems/win32/miktex/tm/packages/next/miktex-zzdb2-2.9.tar.lzma
-2022/08/01 |    1362634 | systems/win32/miktex/tm/packages/next/miktex-zzdb3-2.9.tar.lzma
-2022/08/01 |      14434 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-x64-2.9.tar.lzma
+2022/08/02 |     658474 | systems/win32/miktex/tm/packages/next/files.csv.lzma
+2022/08/02 |      57317 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-x64-2.9.tar.lzma
+2022/08/02 |    1161749 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-x64-2.9.tar.lzma
+2022/08/02 |      31587 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-x64-2.9.tar.lzma
+2022/08/02 |      35264 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-x64-2.9.tar.lzma
+2022/08/02 |      65130 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-x64-2.9.tar.lzma
+2022/08/02 |      95469 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-x64-2.9.tar.lzma
+2022/08/02 |      77211 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-x64-2.9.tar.lzma
+2022/08/02 |      31562 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-x64-2.9.tar.lzma
+2022/08/02 |     394144 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-x64-2.9.tar.lzma
+2022/08/02 |      37050 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-x64-2.9.tar.lzma
+2022/08/02 |      57504 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-x64-2.9.tar.lzma
+2022/08/02 |     270466 | systems/win32/miktex/tm/packages/next/miktex-console-bin-x64-2.9.tar.lzma
+2022/08/02 |     196213 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-x64-2.9.tar.lzma
+2022/08/02 |     103246 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-x64-2.9.tar.lzma
+2022/08/02 |      24211 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-x64-2.9.tar.lzma
+2022/08/02 |     481893 | systems/win32/miktex/tm/packages/next/miktex-doc.tar.lzma
+2022/08/02 |      52036 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-x64-2.9.tar.lzma
+2022/08/02 |     325980 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-x64-2.9.tar.lzma
+2022/08/02 |      45795 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-x64-2.9.tar.lzma
+2022/08/02 |     135463 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-x64-2.9.tar.lzma
+2022/08/02 |    1458151 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-x64-2.9.tar.lzma
+2022/08/02 |     112979 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-x64-2.9.tar.lzma
+2022/08/02 |      48852 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-x64-2.9.tar.lzma
+2022/08/02 |      28510 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-x64-2.9.tar.lzma
+2022/08/02 |      63241 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-x64-2.9.tar.lzma
+2022/08/02 |     155428 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-x64-2.9.tar.lzma
+2022/08/02 |      79064 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-x64-2.9.tar.lzma
+2022/08/02 |      81448 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-x64-2.9.tar.lzma
+2022/08/02 |     295945 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-x64-2.9.tar.lzma
+2022/08/02 |      25119 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-x64-2.9.tar.lzma
+2022/08/02 |     112879 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-x64-2.9.tar.lzma
+2022/08/02 |      73263 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-x64-2.9.tar.lzma
+2022/08/02 |     115579 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-x64-2.9.tar.lzma
+2022/08/02 |      43889 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-x64-2.9.tar.lzma
+2022/08/02 |     565081 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-x64-2.9.tar.lzma
+2022/08/02 |     247208 | systems/win32/miktex/tm/packages/next/miktex-hitex-bin-x64.tar.lzma
+2022/08/02 |     169678 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-x64-2.9.tar.lzma
+2022/08/02 |     109651 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-x64-2.9.tar.lzma
+2022/08/02 |      18381 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-x64-2.9.tar.lzma
+2022/08/02 |      30570 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-x64-2.9.tar.lzma
+2022/08/02 |     682213 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-x64-2.9.tar.lzma
+2022/08/02 |     599104 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-x64-2.9.tar.lzma
+2022/08/02 |     527570 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-x64-2.9.tar.lzma
+2022/08/02 |     103598 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-x64-2.9.tar.lzma
+2022/08/02 |    2023132 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-x64-2.9.tar.lzma
+2022/08/02 |      74099 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-x64-2.9.tar.lzma
+2022/08/02 |      32075 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-x64-2.9.tar.lzma
+2022/08/02 |       8825 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-x64-2.9.tar.lzma
+2022/08/02 |     209139 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-x64-2.9.tar.lzma
+2022/08/02 |     286685 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-x64-2.9.tar.lzma
+2022/08/02 |     104921 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-x64-2.9.tar.lzma
+2022/08/02 |     140013 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-x64-2.9.tar.lzma
+2022/08/02 |     325483 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-x64-2.9.tar.lzma
+2022/08/02 |     181724 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-x64-2.9.tar.lzma
+2022/08/02 |      55319 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-x64-2.9.tar.lzma
+2022/08/02 |      35227 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-x64-2.9.tar.lzma
+2022/08/02 |      43617 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-x64-2.9.tar.lzma
+2022/08/02 |      48037 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-x64-2.9.tar.lzma
+2022/08/02 |      52370 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-x64-2.9.tar.lzma
+2022/08/02 |     213847 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-x64-2.9.tar.lzma
+2022/08/02 |      41179 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin-x64.tar.lzma
+2022/08/02 |     824995 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-x64-2.9.tar.lzma
+2022/08/02 |     203419 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-x64-2.9.tar.lzma
+2022/08/02 |     245151 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-x64-2.9.tar.lzma
+2022/08/02 |      88483 | systems/win32/miktex/tm/packages/next/miktex-png-bin-x64-2.9.tar.lzma
+2022/08/02 |    1323743 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-x64-2.9.tar.lzma
+2022/08/02 |      23950 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-x64-2.9.tar.lzma
+2022/08/02 |      37506 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-x64-2.9.tar.lzma
+2022/08/02 |      72978 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-x64-2.9.tar.lzma
+2022/08/02 |      58633 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-x64-2.9.tar.lzma
+2022/08/02 |     769653 | systems/win32/miktex/tm/packages/next/miktex-ptex-bin-x64.tar.lzma
+2022/08/02 |    1503053 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-x64-2.9.tar.lzma
+2022/08/02 |      52627 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-x64-2.9.tar.lzma
+2022/08/02 |      63802 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-x64.tar.lzma
+2022/08/02 |      27465 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-x64-2.9.tar.lzma
+2022/08/02 |      18510 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-x64-2.9.tar.lzma
+2022/08/02 |      70939 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-x64-2.9.tar.lzma
+2022/08/02 |     173177 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-x64-2.9.tar.lzma
+2022/08/02 |      68147 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-x64-2.9.tar.lzma
+2022/08/02 |     107438 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-x64-2.9.tar.lzma
+2022/08/02 |    2821671 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-x64-2.9.tar.lzma
+2022/08/02 |      62359 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-x64-2.9.tar.lzma
+2022/08/02 |      41189 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin-x64.tar.lzma
+2022/08/02 |      33862 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-x64-2.9.tar.lzma
+2022/08/02 |      73685 | systems/win32/miktex/tm/packages/next/miktex-web-bin-x64-2.9.tar.lzma
+2022/08/02 |     352463 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-x64-2.9.tar.lzma
+2022/08/02 |      57501 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin-x64.tar.lzma
+2022/08/02 |     630434 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-x64-2.9.tar.lzma
+2022/08/02 |      43527 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-x64-2.9.tar.lzma
+2022/08/02 |     288469 | systems/win32/miktex/tm/packages/next/miktex-zzdb1-2.9.tar.lzma
+2022/08/02 |    1478940 | systems/win32/miktex/tm/packages/next/miktex-zzdb2-2.9.tar.lzma
+2022/08/02 |    1361363 | systems/win32/miktex/tm/packages/next/miktex-zzdb3-2.9.tar.lzma
+2022/08/02 |      14433 | 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/08/01 |       1172 | systems/win32/miktex/tm/packages/next/pr.ini
+2022/08/02 |       1172 | 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
@@ -301532,7 +301534,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/08/01 |        957 | systems/win32/miktex/tm/packages/pr.ini
+2022/08/02 |        957 | 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
@@ -303464,7 +303466,7 @@
 2004/06/04 |        404 | tds/tds.sed
 2004/06/23 |      65418 | tds/tds.tex
 2019/05/29 |     304264 | tds.zip
-2022/08/02 |        186 | timestamp
+2022/08/03 |        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 759498e460..0d71c5d229 100644
--- a/FILES.byname.gz
+++ b/FILES.byname.gz
diff --git a/FILES.last07days b/FILES.last07days
index 3b5e749c1b..d893fb7f47 100644
--- a/FILES.last07days
+++ b/FILES.last07days
@@ -1,151 +1,200 @@
+2022/08/02 |     994420 | macros/latex/contrib/postnotes.zip
+2022/08/02 |       9668 | systems/texlive/tlnet/archive/minted.r64026.tar.xz
+2022/08/02 |        957 | systems/win32/miktex/tm/packages/pr.ini
+2022/08/02 |      95469 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-x64-2.9.tar.lzma
+2022/08/02 |      88483 | systems/win32/miktex/tm/packages/next/miktex-png-bin-x64-2.9.tar.lzma
+2022/08/02 |       8825 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-x64-2.9.tar.lzma
+2022/08/02 |    8684452 | macros/latex/contrib/profcollege/doc/ProfCollege-doc.pdf
+2022/08/02 |     845006 | macros/latex/contrib/profcollege/latex/ProfCollege.sty
+2022/08/02 |     824995 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-x64-2.9.tar.lzma
+2022/08/02 |     824148 | systems/texlive/tlnet/archive/minted.doc.r64026.tar.xz
+2022/08/02 |      81448 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-x64-2.9.tar.lzma
+2022/08/02 |     804676 | systems/texlive/tlnet/archive/install-latex-guide-zh-cn.doc.r64023.tar.xz
+2022/08/02 |     799628 | systems/texlive/tlnet/archive/hfutthesis.doc.r64025.tar.xz
+2022/08/02 |      79064 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-x64-2.9.tar.lzma
+2022/08/02 |      77211 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-x64-2.9.tar.lzma
+2022/08/02 |     769653 | systems/win32/miktex/tm/packages/next/miktex-ptex-bin-x64.tar.lzma
+2022/08/02 |     744396 | systems/texlive/tlnet/archive/proflycee.doc.r64024.tar.xz
+2022/08/02 |      74099 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-x64-2.9.tar.lzma
+2022/08/02 |      73685 | systems/win32/miktex/tm/packages/next/miktex-web-bin-x64-2.9.tar.lzma
+2022/08/02 |      73263 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-x64-2.9.tar.lzma
+2022/08/02 |     729796 | systems/texlive/tlnet/archive/bodeplot.doc.r64022.tar.xz
+2022/08/02 |      72978 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-x64-2.9.tar.lzma
+2022/08/02 |      70939 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-x64-2.9.tar.lzma
+2022/08/02 |       6980 | systems/texlive/tlnet/archive/customdice.source.r64021.tar.xz
+2022/08/02 |     682213 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-x64-2.9.tar.lzma
+2022/08/02 |      68147 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-x64-2.9.tar.lzma
+2022/08/02 |     658474 | systems/win32/miktex/tm/packages/next/files.csv.lzma
+2022/08/02 |     658010 | systems/win32/miktex/tm/packages/files.csv.lzma
+2022/08/02 |      65130 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-x64-2.9.tar.lzma
+2022/08/02 |      63802 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-x64.tar.lzma
+2022/08/02 |      63304 | macros/latex/contrib/profcollege/metapost/PfCPseudo.mp
+2022/08/02 |      63241 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-x64-2.9.tar.lzma
+2022/08/02 |     630434 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-x64-2.9.tar.lzma
+2022/08/02 |      62359 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-x64-2.9.tar.lzma
+2022/08/02 |     599104 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-x64-2.9.tar.lzma
+2022/08/02 |      58633 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-x64-2.9.tar.lzma
+2022/08/02 |    5808882 | systems/texlive/tlnet/install-tl-unx.tar.gz
+2022/08/02 |      57504 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-x64-2.9.tar.lzma
+2022/08/02 |      57501 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin-x64.tar.lzma
+2022/08/02 |      57317 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-x64-2.9.tar.lzma
+2022/08/02 |        568 | systems/texlive/tlnet/archive/install-latex-guide-zh-cn.r64023.tar.xz
+2022/08/02 |     565081 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-x64-2.9.tar.lzma
+2022/08/02 |        556 | systems/texlive/tlnet/archive/collection-games.r64021.tar.xz
+2022/08/02 |      55319 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-x64-2.9.tar.lzma
+2022/08/02 |       5528 | systems/texlive/tlnet/archive/bodeplot.r64022.tar.xz
+2022/08/02 |     527570 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-x64-2.9.tar.lzma
+2022/08/02 |      52627 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-x64-2.9.tar.lzma
+2022/08/02 |      52370 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-x64-2.9.tar.lzma
+2022/08/02 |      52036 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-x64-2.9.tar.lzma
+2022/08/02 |         48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
+2022/08/02 |      48852 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-x64-2.9.tar.lzma
+2022/08/02 |     481893 | systems/win32/miktex/tm/packages/next/miktex-doc.tar.lzma
+2022/08/02 |      48037 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-x64-2.9.tar.lzma
+2022/08/02 |      45795 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-x64-2.9.tar.lzma
+2022/08/02 |        455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
+2022/08/02 |        455 | systems/texlive/tlnet/install-tl.zip.sha512.asc
+2022/08/02 |        455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
+2022/08/02 |        455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
+2022/08/02 |      45492 | systems/texlive/tlnet/archive/minted.source.r64026.tar.xz
+2022/08/02 |      43889 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-x64-2.9.tar.lzma
+2022/08/02 |      43617 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-x64-2.9.tar.lzma
+2022/08/02 |      43527 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-x64-2.9.tar.lzma
+2022/08/02 |     419144 | systems/texlive/tlnet/archive/texlive-scripts.doc.r64020.tar.xz
+2022/08/02 |      41189 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin-x64.tar.lzma
+2022/08/02 |      41179 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin-x64.tar.lzma
+2022/08/02 |      40881 | macros/latex/contrib/profcollege/metapost/PfCGeometrie.mp
+2022/08/02 |     394144 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-x64-2.9.tar.lzma
+2022/08/02 |      37506 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-x64-2.9.tar.lzma
+2022/08/02 |      37050 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-x64-2.9.tar.lzma
+2022/08/02 |     358264 | systems/texlive/tlnet/archive/customdice.doc.r64021.tar.xz
+2022/08/02 |      35264 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-x64-2.9.tar.lzma
+2022/08/02 |     352463 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-x64-2.9.tar.lzma
+2022/08/02 |      35227 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-x64-2.9.tar.lzma
+2022/08/02 |      33862 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-x64-2.9.tar.lzma
+2022/08/02 |       3318 | macros/latex/contrib/biblatex-contrib/biblatex-software/Makefile
+2022/08/02 |     325980 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-x64-2.9.tar.lzma
+2022/08/02 |     325483 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-x64-2.9.tar.lzma
+2022/08/02 |     323785 | macros/latex/contrib/biblatex-contrib/biblatex-software.zip
+2022/08/02 |      32075 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-x64-2.9.tar.lzma
+2022/08/02 |     317481 | macros/latex/contrib/sillypage.zip
+2022/08/02 |      31587 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-x64-2.9.tar.lzma
+2022/08/02 |      31562 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-x64-2.9.tar.lzma
+2022/08/02 |      30570 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-x64-2.9.tar.lzma
+2022/08/02 |     295945 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-x64-2.9.tar.lzma
+2022/08/02 |     288489 | systems/win32/miktex/tm/packages/miktex-zzdb1-2.9.tar.lzma
+2022/08/02 |     288469 | systems/win32/miktex/tm/packages/next/miktex-zzdb1-2.9.tar.lzma
+2022/08/02 |     286685 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-x64-2.9.tar.lzma
+2022/08/02 |      28510 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-x64-2.9.tar.lzma
+2022/08/02 |    2821671 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-x64-2.9.tar.lzma
+2022/08/02 |       2780 | macros/latex/contrib/sillypage/sillypage.ins
+2022/08/02 |      27465 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-x64-2.9.tar.lzma
+2022/08/02 |     270466 | systems/win32/miktex/tm/packages/next/miktex-console-bin-x64-2.9.tar.lzma
+2022/08/02 |   25493393 | systems/texlive/tlnet/install-tl.zip
+2022/08/02 |      25440 | systems/texlive/tlnet/archive/hfutthesis.r64025.tar.xz
+2022/08/02 |       2512 | systems/texlive/tlnet/archive/customdice.r64021.tar.xz
+2022/08/02 |      25119 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-x64-2.9.tar.lzma
+2022/08/02 |     247208 | systems/win32/miktex/tm/packages/next/miktex-hitex-bin-x64.tar.lzma
+2022/08/02 |     245151 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-x64-2.9.tar.lzma
+2022/08/02 |      24211 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-x64-2.9.tar.lzma
+2022/08/02 |    2396648 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
+2022/08/02 |      23950 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-x64-2.9.tar.lzma
+2022/08/02 |    2214355 | macros/latex/contrib/profcollege/doc/ProfCollege-doc.zip
+2022/08/02 |     219736 | macros/latex/contrib/sillypage/sillypage.pdf
+2022/08/02 |       2188 | macros/latex/contrib/biblatex-contrib/biblatex-software/Changes
+2022/08/02 |     213847 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-x64-2.9.tar.lzma
+2022/08/02 |     209139 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-x64-2.9.tar.lzma
+2022/08/02 |   20462530 | systems/texlive/tlnet/install-tl-windows.exe
+2022/08/02 |     203419 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-x64-2.9.tar.lzma
+2022/08/02 |    2023132 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-x64-2.9.tar.lzma
+2022/08/02 |     196213 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-x64-2.9.tar.lzma
+2022/08/02 |      18636 | macros/latex/contrib/sillypage/sillywalk-map.pdf
+2022/08/02 |      18510 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-x64-2.9.tar.lzma
+2022/08/02 |      18381 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-x64-2.9.tar.lzma
+2022/08/02 |     181724 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-x64-2.9.tar.lzma
+2022/08/02 |   17575915 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
+2022/08/02 |     173177 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-x64-2.9.tar.lzma
+2022/08/02 |     172433 | macros/latex/contrib/biblatex-contrib/biblatex-software/software-biblatex.pdf
+2022/08/02 |     169678 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-x64-2.9.tar.lzma
+2022/08/02 |      16696 | systems/texlive/tlnet/archive/bodeplot.source.r64022.tar.xz
+2022/08/02 |     155428 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-x64-2.9.tar.lzma
+2022/08/02 |        153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
+2022/08/02 |        152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
+2022/08/02 |    1503053 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-x64-2.9.tar.lzma
+2022/08/02 |    1479978 | systems/win32/miktex/tm/packages/miktex-zzdb2-2.9.tar.lzma
+2022/08/02 |    1478940 | systems/win32/miktex/tm/packages/next/miktex-zzdb2-2.9.tar.lzma
+2022/08/02 |        145 | systems/texlive/tlnet/install-tl.zip.sha512
+2022/08/02 |    1458151 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-x64-2.9.tar.lzma
+2022/08/02 |        144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
+2022/08/02 |      14433 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-x64-2.9.tar.lzma
+2022/08/02 |        141 | macros/latex/contrib/sillypage/sillypage-example.tex
+2022/08/02 |       1417 | macros/latex/contrib/sillypage/README.md
+2022/08/02 |     140013 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-x64-2.9.tar.lzma
+2022/08/02 |    1362797 | systems/win32/miktex/tm/packages/miktex-zzdb3-2.9.tar.lzma
+2022/08/02 |    1361363 | systems/win32/miktex/tm/packages/next/miktex-zzdb3-2.9.tar.lzma
+2022/08/02 |     135463 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-x64-2.9.tar.lzma
+2022/08/02 |    1323743 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-x64-2.9.tar.lzma
+2022/08/02 |   13023673 | macros/latex/contrib/profcollege.zip
+2022/08/02 |     128987 | macros/latex/contrib/biblatex-contrib/biblatex-software/sample-use-sty.pdf
+2022/08/02 |      12208 | systems/texlive/tlnet/archive/proflycee.r64024.tar.xz
+2022/08/02 |       1172 | systems/win32/miktex/tm/packages/next/pr.ini
+2022/08/02 |    1161749 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-x64-2.9.tar.lzma
+2022/08/02 |     115579 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-x64-2.9.tar.lzma
+2022/08/02 |     113520 | systems/texlive/tlnet/archive/texlive-scripts.r64020.tar.xz
+2022/08/02 |     112979 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-x64-2.9.tar.lzma
+2022/08/02 |     112879 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-x64-2.9.tar.lzma
+2022/08/02 |     109651 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-x64-2.9.tar.lzma
+2022/08/02 |      10848 | macros/latex/contrib/sillypage/sillypage.dtx
+2022/08/02 |     107438 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-x64-2.9.tar.lzma
+2022/08/02 |     105153 | macros/latex/contrib/profcollege/metapost/PfCScratchpdf.mp
+2022/08/02 |     104921 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-x64-2.9.tar.lzma
+2022/08/02 |     103728 | macros/latex/contrib/sillypage/sillypage-example.pdf
+2022/08/02 |     103598 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-x64-2.9.tar.lzma
+2022/08/02 |     103246 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-x64-2.9.tar.lzma
+2022/08/02 |     103108 | macros/latex/contrib/profcollege/metapost/PfCScratch.mp
 2022/08/01 |       9808 | systems/texlive/tlnet/archive/create-theorem.r64016.tar.xz
-2022/08/01 |       9668 | systems/texlive/tlnet/archive/minted.r64017.tar.xz
-2022/08/01 |        957 | systems/win32/miktex/tm/packages/pr.ini
-2022/08/01 |      95469 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-x64-2.9.tar.lzma
-2022/08/01 |      88484 | systems/win32/miktex/tm/packages/next/miktex-png-bin-x64-2.9.tar.lzma
-2022/08/01 |       8825 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-x64-2.9.tar.lzma
+2022/08/01 |      96341 | macros/latex/contrib/postnotes/postnotes.dtx
+2022/08/01 |        881 | macros/latex/contrib/postnotes/README.md
 2022/08/01 |     880387 | macros/xetex/latex/hfutthesis.zip
-2022/08/01 |     824995 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-x64-2.9.tar.lzma
-2022/08/01 |     824148 | systems/texlive/tlnet/archive/minted.doc.r64017.tar.xz
 2022/08/01 |     819023 | info/install-latex-guide-zh-cn.zip
-2022/08/01 |      81446 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-x64-2.9.tar.lzma
-2022/08/01 |      79063 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-x64-2.9.tar.lzma
+2022/08/01 |     814509 | macros/latex/contrib/postnotes/postnotes-code.pdf
+2022/08/01 |        787 | macros/latex/contrib/biblatex-contrib/biblatex-software/english-software.lbx
 2022/08/01 |      78152 | systems/texlive/tlnet/archive/create-theorem.doc.r64016.tar.xz
 2022/08/01 |     777318 | info/install-latex-guide-zh-cn/install-latex-guide-zh-cn.pdf
 2022/08/01 |     775056 | graphics/pgf/contrib/bodeplot.zip
-2022/08/01 |      77210 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-x64-2.9.tar.lzma
-2022/08/01 |     769652 | systems/win32/miktex/tm/packages/next/miktex-ptex-bin-x64.tar.lzma
+2022/08/01 |        758 | macros/latex/contrib/biblatex-contrib/biblatex-software/french-software.lbx
 2022/08/01 |     757998 | macros/latex/contrib/proflycee.zip
-2022/08/01 |      74099 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-x64-2.9.tar.lzma
-2022/08/01 |      73685 | systems/win32/miktex/tm/packages/next/miktex-web-bin-x64-2.9.tar.lzma
-2022/08/01 |      73263 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-x64-2.9.tar.lzma
-2022/08/01 |      72978 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-x64-2.9.tar.lzma
-2022/08/01 |      70938 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-x64-2.9.tar.lzma
+2022/08/01 |       7324 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
 2022/08/01 |      68828 | macros/latex/contrib/kfupm-math-exam.zip
-2022/08/01 |     682214 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-x64-2.9.tar.lzma
-2022/08/01 |      68146 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-x64-2.9.tar.lzma
 2022/08/01 |     678803 | macros/latex/contrib/proflycee/doc/ProfLycee-doc.pdf
-2022/08/01 |     658474 | systems/win32/miktex/tm/packages/next/files.csv.lzma
-2022/08/01 |     658010 | systems/win32/miktex/tm/packages/files.csv.lzma
-2022/08/01 |      65130 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-x64-2.9.tar.lzma
-2022/08/01 |      63802 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-x64.tar.lzma
-2022/08/01 |      63239 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-x64-2.9.tar.lzma
-2022/08/01 |     630434 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-x64-2.9.tar.lzma
 2022/08/01 |     627828 | systems/texlive/tlnet/archive/colortbl.doc.r64015.tar.xz
-2022/08/01 |      62359 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-x64-2.9.tar.lzma
-2022/08/01 |     599107 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-x64-2.9.tar.lzma
-2022/08/01 |      58633 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-x64-2.9.tar.lzma
-2022/08/01 |    5808548 | systems/texlive/tlnet/install-tl-unx.tar.gz
-2022/08/01 |      57503 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-x64-2.9.tar.lzma
-2022/08/01 |      57501 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin-x64.tar.lzma
-2022/08/01 |      57317 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-x64-2.9.tar.lzma
-2022/08/01 |     565081 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-x64-2.9.tar.lzma
-2022/08/01 |      55319 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-x64-2.9.tar.lzma
 2022/08/01 |       5439 | macros/latex/contrib/projlib/README.md
-2022/08/01 |     527570 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-x64-2.9.tar.lzma
-2022/08/01 |      52628 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-x64-2.9.tar.lzma
-2022/08/01 |      52369 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-x64-2.9.tar.lzma
-2022/08/01 |      52037 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-x64-2.9.tar.lzma
 2022/08/01 |      50200 | macros/latex/contrib/proflycee/tex/ProfLycee.sty
-2022/08/01 |         48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
-2022/08/01 |      48852 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-x64-2.9.tar.lzma
-2022/08/01 |     481894 | systems/win32/miktex/tm/packages/next/miktex-doc.tar.lzma
-2022/08/01 |      48037 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-x64-2.9.tar.lzma
-2022/08/01 |      45795 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-x64-2.9.tar.lzma
-2022/08/01 |        455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
-2022/08/01 |        455 | systems/texlive/tlnet/install-tl.zip.sha512.asc
-2022/08/01 |        455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
-2022/08/01 |        455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
-2022/08/01 |      45492 | systems/texlive/tlnet/archive/minted.source.r64017.tar.xz
-2022/08/01 |      43889 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-x64-2.9.tar.lzma
-2022/08/01 |      43616 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-x64-2.9.tar.lzma
-2022/08/01 |      43527 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-x64-2.9.tar.lzma
 2022/08/01 |      42206 | systems/texlive/tlnet/tlpkg/TeXLive/TLPSRC.pm
-2022/08/01 |     419140 | systems/texlive/tlnet/archive/texlive-scripts.doc.r64013.tar.xz
-2022/08/01 |      41190 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin-x64.tar.lzma
-2022/08/01 |      41179 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin-x64.tar.lzma
 2022/08/01 |      40023 | macros/latex/contrib/projlib.zip
 2022/08/01 |       3948 | systems/texlive/tlnet/archive/yb-book.r64017.tar.xz
-2022/08/01 |     394143 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-x64-2.9.tar.lzma
-2022/08/01 |      37505 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-x64-2.9.tar.lzma
-2022/08/01 |      37050 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-x64-2.9.tar.lzma
+2022/08/01 |      39408 | macros/latex/contrib/postnotes/postnotes.tex
 2022/08/01 |       3676 | systems/texlive/tlnet/archive/colortbl.r64015.tar.xz
 2022/08/01 |     363456 | graphics/pgf/contrib/customdice.zip
-2022/08/01 |      35264 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-x64-2.9.tar.lzma
-2022/08/01 |     352465 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-x64-2.9.tar.lzma
-2022/08/01 |      35228 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-x64-2.9.tar.lzma
-2022/08/01 |      33862 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-x64-2.9.tar.lzma
 2022/08/01 |       3379 | macros/latex/contrib/projlib/ProjLib.ins
-2022/08/01 |     325980 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-x64-2.9.tar.lzma
-2022/08/01 |     325483 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-x64-2.9.tar.lzma
-2022/08/01 |      32074 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-x64-2.9.tar.lzma
-2022/08/01 |      31586 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-x64-2.9.tar.lzma
-2022/08/01 |      31563 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-x64-2.9.tar.lzma
-2022/08/01 |      30570 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-x64-2.9.tar.lzma
-2022/08/01 |     295944 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-x64-2.9.tar.lzma
-2022/08/01 |     288508 | systems/win32/miktex/tm/packages/next/miktex-zzdb1-2.9.tar.lzma
-2022/08/01 |     288507 | systems/win32/miktex/tm/packages/miktex-zzdb1-2.9.tar.lzma
-2022/08/01 |     286685 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-x64-2.9.tar.lzma
-2022/08/01 |      28510 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-x64-2.9.tar.lzma
-2022/08/01 |    2821672 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-x64-2.9.tar.lzma
-2022/08/01 |      27463 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-x64-2.9.tar.lzma
-2022/08/01 |     270467 | systems/win32/miktex/tm/packages/next/miktex-console-bin-x64-2.9.tar.lzma
-2022/08/01 |   25493364 | systems/texlive/tlnet/install-tl.zip
-2022/08/01 |      25118 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-x64-2.9.tar.lzma
-2022/08/01 |     247208 | systems/win32/miktex/tm/packages/next/miktex-hitex-bin-x64.tar.lzma
-2022/08/01 |     245151 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-x64-2.9.tar.lzma
+2022/08/01 |       3162 | macros/latex/contrib/biblatex-contrib/biblatex-software/software.dbx
+2022/08/01 |       2574 | macros/latex/contrib/postnotes/postnotes.ins
 2022/08/01 |     243276 | systems/texlive/tlnet/archive/yb-book.doc.r64017.tar.xz
-2022/08/01 |      24211 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-x64-2.9.tar.lzma
-2022/08/01 |    2396632 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
-2022/08/01 |      23949 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-x64-2.9.tar.lzma
-2022/08/01 |     213846 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-x64-2.9.tar.lzma
-2022/08/01 |     209138 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-x64-2.9.tar.lzma
 2022/08/01 |     206508 | macros/latex/contrib/projlib/ProjLib.dtx
-2022/08/01 |   20466260 | systems/texlive/tlnet/install-tl-windows.exe
-2022/08/01 |     203420 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-x64-2.9.tar.lzma
-2022/08/01 |    2023131 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-x64-2.9.tar.lzma
-2022/08/01 |     196212 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-x64-2.9.tar.lzma
 2022/08/01 |      19106 | macros/latex/contrib/projlib/LICENSE
-2022/08/01 |      18510 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-x64-2.9.tar.lzma
-2022/08/01 |      18381 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-x64-2.9.tar.lzma
-2022/08/01 |     181725 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-x64-2.9.tar.lzma
-2022/08/01 |   17574463 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
-2022/08/01 |     173177 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-x64-2.9.tar.lzma
-2022/08/01 |     169677 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-x64-2.9.tar.lzma
-2022/08/01 |     155430 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-x64-2.9.tar.lzma
-2022/08/01 |        153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
-2022/08/01 |        152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
-2022/08/01 |    1503054 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-x64-2.9.tar.lzma
-2022/08/01 |    1480217 | systems/win32/miktex/tm/packages/miktex-zzdb2-2.9.tar.lzma
-2022/08/01 |    1478686 | systems/win32/miktex/tm/packages/next/miktex-zzdb2-2.9.tar.lzma
-2022/08/01 |        145 | systems/texlive/tlnet/install-tl.zip.sha512
-2022/08/01 |    1458151 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-x64-2.9.tar.lzma
-2022/08/01 |        144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
-2022/08/01 |      14434 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-x64-2.9.tar.lzma
-2022/08/01 |     140012 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-x64-2.9.tar.lzma
-2022/08/01 |    1362634 | systems/win32/miktex/tm/packages/next/miktex-zzdb3-2.9.tar.lzma
-2022/08/01 |    1362511 | systems/win32/miktex/tm/packages/miktex-zzdb3-2.9.tar.lzma
-2022/08/01 |     135464 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-x64-2.9.tar.lzma
-2022/08/01 |    1323742 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-x64-2.9.tar.lzma
+2022/08/01 |     176261 | macros/latex/contrib/postnotes/postnotes.pdf
+2022/08/01 |         14 | macros/latex/contrib/postnotes/DEPENDS.txt
+2022/08/01 |       1434 | macros/latex/contrib/postnotes/postnotes-code.tex
+2022/08/01 |       1294 | macros/latex/contrib/postnotes/CHANGELOG.md
 2022/08/01 |      12780 | systems/texlive/tlnet/archive/colortbl.source.r64015.tar.xz
-2022/08/01 |       1172 | systems/win32/miktex/tm/packages/next/pr.ini
-2022/08/01 |    1161749 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-x64-2.9.tar.lzma
-2022/08/01 |     115579 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-x64-2.9.tar.lzma
-2022/08/01 |     113500 | systems/texlive/tlnet/archive/texlive-scripts.r64013.tar.xz
-2022/08/01 |     112979 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-x64-2.9.tar.lzma
-2022/08/01 |     112879 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-x64-2.9.tar.lzma
+2022/08/01 |  113866249 | macros/context/latest/cont-tmf.zip
+2022/08/01 |      11245 | macros/latex/contrib/biblatex-contrib/biblatex-software/software-biblatex.tex
 2022/08/01 |     111667 | macros/xetex/latex/hfutthesis/hfutthesis.cls
-2022/08/01 |     109650 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-x64-2.9.tar.lzma
-2022/08/01 |     107436 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-x64-2.9.tar.lzma
-2022/08/01 |     104921 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-x64-2.9.tar.lzma
 2022/08/01 |     104452 | macros/latex/contrib/proflycee/doc/ProfLycee-doc.tex
-2022/08/01 |     103598 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-x64-2.9.tar.lzma
-2022/08/01 |     103246 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-x64-2.9.tar.lzma
+2022/08/01 |      10007 | macros/latex/contrib/biblatex-contrib/biblatex-software/software.bbx
 2022/07/31 |      97095 | graphics/pgf/contrib/bodeplot/bodeplot.dtx
 2022/07/31 |      96780 | macros/latex/contrib/create-theorem/create-theorem.sty
 2022/07/31 |      90331 | macros/latex/contrib/create-theorem.zip
-2022/07/31 |     799628 | systems/texlive/tlnet/archive/hfutthesis.doc.r64009.tar.xz
-2022/07/31 |       7249 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
 2022/07/31 |      67899 | macros/latex/contrib/create-theorem/create-theorem-doc.pdf
 2022/07/31 |        676 | macros/latex/contrib/create-theorem/README.md
 2022/07/31 |     640665 | macros/latex/contrib/colortbl.zip
@@ -160,7 +209,6 @@
 2022/07/31 |     369482 | customdice/customdice.pdf
 2022/07/31 |       3623 | graphics/pgf/contrib/bodeplot/README.md
 2022/07/31 |      26046 | macros/latex/contrib/create-theorem/create-theorem-doc.tex
-2022/07/31 |      25504 | systems/texlive/tlnet/archive/hfutthesis.r64009.tar.xz
 2022/07/31 |      19106 | macros/latex/contrib/create-theorem/LICENSE
 2022/07/31 |       1632 | systems/texlive/tlnet/archive/collection-publishers.r64009.tar.xz
 2022/07/31 |    1441108 | systems/texlive/tlnet/archive/unbtex.doc.r64008.tar.xz
@@ -1062,7 +1110,6 @@
 2022/07/27 |       1149 | graphics/circuit_macros/doc/ResistorsMan.m4
 2022/07/27 |       1145 | graphics/circuit_macros/examples/Resistors.m4
 2022/07/27 |      11440 | graphics/circuit_macros/examples/ics.m4
-2022/07/27 |  113762760 | macros/context/latest/cont-tmf.zip
 2022/07/27 |       1132 | graphics/circuit_macros/examples/Headers.m4
 2022/07/27 |       1132 | graphics/circuit_macros/doc/HeadersMan.m4
 2022/07/27 |       1128 | graphics/circuit_macros/examples/NPDT.m4
@@ -1099,116 +1146,3 @@
 2022/07/27 |       1017 | graphics/circuit_macros/doc/arrowex.m4
 2022/07/27 |      10164 | graphics/circuit_macros/doc/Audio.tex
 2022/07/27 |       1003 | graphics/circuit_macros/examples/ex15.m4
-2022/07/26 |      99463 | systems/win32/miktex/tm/packages/miktex-mfware-bin-2.9.tar.lzma
-2022/07/26 |      99307 | systems/win32/miktex/tm/packages/miktex-epstopdf-bin-2.9.tar.lzma
-2022/07/26 |      97375 | systems/win32/miktex/tm/packages/miktex-gd-bin-2.9.tar.lzma
-2022/07/26 |      96681 | systems/win32/miktex/tm/packages/miktex-gregorio-bin-2.9.tar.lzma
-2022/07/26 |      96231 | macros/latex/contrib/wrapstuff/wrapstuff.dtx
-2022/07/26 |      95516 | systems/win32/miktex/tm/packages/miktex-jpeg-bin-2.9.tar.lzma
-2022/07/26 |      94055 | systems/win32/miktex/tm/packages/miktex-lua53-bin-2.9.tar.lzma
-2022/07/26 |      93078 | systems/win32/miktex/tm/packages/miktex-cweb-bin-2.9.tar.lzma
-2022/07/26 |      83765 | systems/win32/miktex/tm/packages/miktex-bibtex8bit-bin-2.9.tar.lzma
-2022/07/26 |      81011 | macros/latex/contrib/rec-thy/rec-thy.sty
-2022/07/26 |      79370 | systems/win32/miktex/tm/packages/miktex-png-bin-2.9.tar.lzma
-2022/07/26 |       7735 | systems/win32/miktex/tm/packages/miktex-md5-bin-2.9.tar.lzma
-2022/07/26 |     754258 | systems/win32/miktex/tm/packages/miktex-pdftex-bin-2.9.tar.lzma
-2022/07/26 |     745272 | systems/texlive/tlnet/archive/apa7.doc.r63974.tar.xz
-2022/07/26 |      74078 | systems/win32/miktex/tm/packages/miktex-fonts-bin-2.9.tar.lzma
-2022/07/26 |      71907 | systems/win32/miktex/tm/packages/miktex-freeglut-bin-2.9.tar.lzma
-2022/07/26 |     699984 | systems/win32/miktex/tm/packages/miktex-ptex-bin.tar.lzma
-2022/07/26 |      69127 | systems/win32/miktex/tm/packages/miktex-bibtex-bin-2.9.tar.lzma
-2022/07/26 |      67924 | systems/win32/miktex/tm/packages/miktex-web-bin-2.9.tar.lzma
-2022/07/26 |      67910 | systems/win32/miktex/tm/packages/miktex-lzma-bin-2.9.tar.lzma
-2022/07/26 |      64801 | systems/win32/miktex/tm/packages/miktex-ps2pk-bin-2.9.tar.lzma
-2022/07/26 |      64580 | systems/win32/miktex/tm/packages/miktex-graphite2-bin-2.9.tar.lzma
-2022/07/26 |       6450 | macros/latex/contrib/rec-thy/README
-2022/07/26 |      64457 | systems/win32/miktex/tm/packages/miktex-tex4ht-bin-2.9.tar.lzma
-2022/07/26 |      63204 | systems/texlive/tlnet/archive/kfupm-math-exam.doc.r63977.tar.xz
-2022/07/26 |     631347 | systems/win32/miktex/tm/packages/miktex-lcdf-typetools-bin-2.9.tar.lzma
-2022/07/26 |      61384 | systems/texlive/tlnet/archive/crefthe.doc.r63976.tar.xz
-2022/07/26 |      61330 | macros/latex/contrib/rec-thy/rec-thy.tex
-2022/07/26 |     591407 | systems/win32/miktex/tm/packages/miktex-yap-bin-2.9.tar.lzma
-2022/07/26 |      58378 | systems/win32/miktex/tm/packages/miktex-texify-bin-2.9.tar.lzma
-2022/07/26 |      57357 | systems/win32/miktex/tm/packages/miktex-tdsutil-bin.tar.lzma
-2022/07/26 |      56918 | systems/win32/miktex/tm/packages/miktex-fmt-bin-2.9.tar.lzma
-2022/07/26 |      56698 | systems/win32/miktex/tm/packages/miktex-bibarts-bin-2.9.tar.lzma
-2022/07/26 |      55762 | systems/win32/miktex/tm/packages/miktex-xml2pmx-bin.tar.lzma
-2022/07/26 |      55433 | systems/win32/miktex/tm/packages/miktex-ttf2pk2-bin-2.9.tar.lzma
-2022/07/26 |     532312 | systems/win32/miktex/tm/packages/miktex-libressl-bin-2.9.tar.lzma
-2022/07/26 |      51788 | systems/win32/miktex/tm/packages/miktex-arctrl-bin-2.9.tar.lzma
-2022/07/26 |      51394 | systems/win32/miktex/tm/packages/miktex-cjkutils-bin-2.9.tar.lzma
-2022/07/26 |      50923 | systems/win32/miktex/tm/packages/miktex-psutils-bin-2.9.tar.lzma
-2022/07/26 |      49743 | systems/win32/miktex/tm/packages/miktex-mpmcli-bin-2.9.tar.lzma
-2022/07/26 |       4852 | systems/texlive/tlnet/archive/kfupm-math-exam.source.r63977.tar.xz
-2022/07/26 |     484112 | systems/win32/miktex/tm/packages/miktex-harfbuzz-bin-2.9.tar.lzma
-2022/07/26 |     477940 | systems/win32/miktex/tm/packages/miktex-log4cxx-bin-2.9.tar.lzma
-2022/07/26 |      46387 | systems/win32/miktex/tm/packages/miktex-dvicopy-bin-2.9.tar.lzma
-2022/07/26 |      45780 | systems/win32/miktex/tm/packages/miktex-m-tx-bin-2.9.tar.lzma
-2022/07/26 |     452136 | macros/latex/contrib/wrapstuff.zip
-2022/07/26 |     449185 | macros/latex/contrib/wrapstuff/wrapstuff.pdf
-2022/07/26 |      43659 | systems/win32/miktex/tm/packages/miktex-expat-bin-2.9.tar.lzma
-2022/07/26 |      43447 | systems/win32/miktex/tm/packages/miktex-mtprint-bin-2.9.tar.lzma
-2022/07/26 |      42689 | systems/win32/miktex/tm/packages/miktex-synctex-bin-2.9.tar.lzma
-2022/07/26 |      41442 | systems/win32/miktex/tm/packages/miktex-dvipng-bin-2.9.tar.lzma
-2022/07/26 |       4120 | systems/texlive/tlnet/archive/kfupm-math-exam.r63977.tar.xz
-2022/07/26 |      39695 | systems/win32/miktex/tm/packages/miktex-zlib-bin-2.9.tar.lzma
-2022/07/26 |      38665 | systems/win32/miktex/tm/packages/miktex-gsf2pk-bin-2.9.tar.lzma
-2022/07/26 |      38309 | systems/win32/miktex/tm/packages/miktex-mthelp-bin-2.9.tar.lzma
-2022/07/26 |     380651 | macros/latex/contrib/intopdf.zip
-2022/07/26 |      37062 | systems/win32/miktex/tm/packages/miktex-upmendex-bin.tar.lzma
-2022/07/26 |      36415 | systems/win32/miktex/tm/packages/miktex-patgen-bin.tar.lzma
-2022/07/26 |     332598 | systems/win32/miktex/tm/packages/miktex-cairo-bin-2.9.tar.lzma
-2022/07/26 |      32888 | systems/texlive/tlnet/archive/apa7.source.r63974.tar.xz
-2022/07/26 |      32659 | systems/win32/miktex/tm/packages/miktex-chktex-bin-2.9.tar.lzma
-2022/07/26 |     316671 | systems/win32/miktex/tm/packages/miktex-xetex-bin-2.9.tar.lzma
-2022/07/26 |      31551 | systems/win32/miktex/tm/packages/miktex-posix-bin-2.9.tar.lzma
-2022/07/26 |       3144 | systems/texlive/tlnet/archive/crefthe.r63976.tar.xz
-2022/07/26 |      31439 | systems/win32/miktex/tm/packages/miktex-mspack-bin-2.9.tar.lzma
-2022/07/26 |      30075 | systems/win32/miktex/tm/packages/miktex-axohelp-bin-2.9.tar.lzma
-2022/07/26 |      28812 | systems/win32/miktex/tm/packages/miktex-autosp-bin-2.9.tar.lzma
-2022/07/26 |     287501 | systems/win32/miktex/tm/packages/miktex-mo-bin-2.9.tar.lzma
-2022/07/26 |      28691 | systems/win32/miktex/tm/packages/miktex-uriparser-bin-2.9.tar.lzma
-2022/07/26 |     285874 | systems/win32/miktex/tm/packages/miktex-dvipdfmx-bin-2.9.tar.lzma
-2022/07/26 |      28492 | systems/win32/miktex/tm/packages/miktex-lacheck-bin-2.9.tar.lzma
-2022/07/26 |      27717 | systems/win32/miktex/tm/packages/miktex-makeindex-bin-2.9.tar.lzma
-2022/07/26 |      27365 | systems/win32/miktex/tm/packages/miktex-bzip2-bin-2.9.tar.lzma
-2022/07/26 |    2697009 | systems/win32/miktex/tm/packages/miktex-texworks-bin-2.9.tar.lzma
-2022/07/26 |     259267 | systems/win32/miktex/tm/packages/miktex-freetype2-bin-2.9.tar.lzma
-2022/07/26 |      25544 | systems/win32/miktex/tm/packages/miktex-teckit-bin-2.9.tar.lzma
-2022/07/26 |      25280 | systems/win32/miktex/tm/packages/miktex-findtexmf-bin-2.9.tar.lzma
-2022/07/26 |     251086 | systems/win32/miktex/tm/packages/miktex-metapost-bin-2.9.tar.lzma
-2022/07/26 |     244550 | systems/win32/miktex/tm/packages/miktex-console-bin-2.9.tar.lzma
-2022/07/26 |      23066 | macros/xetex/latex/exam-zh/examples/example-multiple.tex
-2022/07/26 |      22141 | systems/win32/miktex/tm/packages/miktex-fribidixetex-bin-2.9.tar.lzma
-2022/07/26 |      21304 | systems/win32/miktex/tm/packages/miktex-devnag-bin-2.9.tar.lzma
-2022/07/26 |     210552 | systems/win32/miktex/tm/packages/miktex-pmx-bin-2.9.tar.lzma
-2022/07/26 |     204264 | systems/win32/miktex/tm/packages/miktex-hitex-bin.tar.lzma
-2022/07/26 |      20173 | systems/win32/miktex/tm/packages/miktex-popt-bin-2.9.tar.lzma
-2022/07/26 |     200463 | systems/win32/miktex/tm/packages/miktex-pixman-bin-2.9.tar.lzma
-2022/07/26 |     199806 | systems/win32/miktex/tm/packages/miktex-mpfr-bin-2.9.tar.lzma
-2022/07/26 |     199252 | support/TeX4ht/source/ChangeLog
-2022/07/26 |     197278 | systems/win32/miktex/tm/packages/miktex-omegaware-bin-2.9.tar.lzma
-2022/07/26 |     190604 | systems/win32/miktex/tm/packages/miktex-metafont-bin-2.9.tar.lzma
-2022/07/26 |     179664 | systems/win32/miktex/tm/packages/miktex-curl-bin-2.9.tar.lzma
-2022/07/26 |    1733266 | systems/win32/miktex/tm/packages/miktex-luatex-bin-2.9.tar.lzma
-2022/07/26 |       1703 | macros/latex/contrib/wrapstuff/README.md
-2022/07/26 |     167892 | macros/xetex/latex/exam-zh/examples/example-multiple.pdf
-2022/07/26 |      16512 | systems/win32/miktex/tm/packages/miktex-tex2xindy-bin-2.9.tar.lzma
-2022/07/26 |      16454 | systems/win32/miktex/tm/packages/miktex-kpathsea-bin-2.9.tar.lzma
-2022/07/26 |     157170 | systems/win32/miktex/tm/packages/miktex-tex-bin-2.9.tar.lzma
-2022/07/26 |     152533 | systems/win32/miktex/tm/packages/miktex-hunspell-bin-2.9.tar.lzma
-2022/07/26 |     148036 | macros/xetex/latex/exam-zh/examples/example-single.pdf
-2022/07/26 |     144590 | support/TeX4ht/source/tex4ht-mathml.tex
-2022/07/26 |     143461 | macros/latex/contrib/rec-thy.zip
-2022/07/26 |      14252 | systems/texlive/tlnet/archive/apa7.r63974.tar.xz
-2022/07/26 |     136111 | systems/win32/miktex/tm/packages/miktex-fontconfig-bin-2.9.tar.lzma
-2022/07/26 |    1355602 | systems/win32/miktex/tm/packages/miktex-runtime-bin-2.9.tar.lzma
-2022/07/26 |      13519 | systems/win32/miktex/tm/packages/miktex-zzip-bin-2.9.tar.lzma
-2022/07/26 |    1311595 | systems/win32/miktex/tm/packages/miktex-dvisvgm-bin-2.9.tar.lzma
-2022/07/26 |     128602 | macros/latex/contrib/rec-thy/rec-thy.pdf
-2022/07/26 |     126901 | systems/win32/miktex/tm/packages/miktex-mktex-bin-2.9.tar.lzma
-2022/07/26 |     120742 | systems/win32/miktex/tm/packages/miktex-dvips-bin-2.9.tar.lzma
-2022/07/26 |    1180255 | systems/win32/miktex/tm/packages/miktex-poppler-bin-2.9.tar.lzma
-2022/07/26 |      11371 | macros/xetex/latex/exam-zh/examples/example-single.tex
-2022/07/26 |    1023495 | systems/win32/miktex/tm/packages/miktex-asymptote-bin-2.9.tar.lzma
-2022/07/26 |     100549 | systems/win32/miktex/tm/packages/miktex-texware-bin-2.9.tar.lzma
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-software/Changes b/macros/latex/contrib/biblatex-contrib/biblatex-software/Changes
index 76f1661405..ab3b8a524d 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-software/Changes
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-software/Changes
@@ -1,3 +1,4 @@
+\begin{release}{bltx-v1.2-5}{2022-08-02} \item Fix mishandling of SWHID short toggle when hyperref is not loaded. \end{release}
 \begin{release}{bltx-v1.2-4}{2022-03-03} \item Add support for displaying short SWHID \end{release}
 \begin{release}{bltx-v1.2-3}{2021-08-20} \item Support backrefs. \end{release}
 \begin{release}{bltx-v1.2-2}{2020-06-27} \item Fix handling of related field; use date instead of year/month in examples; add swMATH definition \end{release}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-software/Makefile b/macros/latex/contrib/biblatex-contrib/biblatex-software/Makefile
index 1b75b6374d..5d80961ef2 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-software/Makefile
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-software/Makefile
@@ -17,18 +17,24 @@ swentries.tex: ../swentry.org
 	../bin/extract-entries.pl < ../swentry.tex > $@
 
 software-biblatex.pdf: software-biblatex.tex swentries.tex history.tex biblio.bib manual.bib
-	pdflatex software-biblatex.tex
+	pdflatex software-biblatex.tex > /dev/null
 	bibtex software-biblatex
-	pdflatex software-biblatex.tex
-	pdflatex software-biblatex.tex
+	pdflatex software-biblatex.tex > /dev/null
+	pdflatex software-biblatex.tex > /dev/null
 
-sample-use-sty.pdf: biblio.bib sample-content.tex
+sample-use-sty.pdf: biblio.bib sample-content.tex sample-use-sty.tex
 
-sample-use-sty.backref.pdf: biblio.bib biblio.bib sample-content.tex
+sample-use-sty.nohyperref.tex: sample-use-sty.tex
+	grep -v hyperref $< > $@
+
+sample-use-sty.nohyperref.pdf: biblio.bib sample-content.tex sample-use-sty.nohyperref.tex
+
+sample-use-sty.backref.pdf: biblio.bib sample-content.tex
 	# test that backrefs work
-	pdflatex "\PassOptionsToPackage{backref=true}{biblatex} \input{sample-use-sty.backref.tex}"
-	biber sample-use-sty.backref
-	pdflatex "\PassOptionsToPackage{backref=true}{biblatex} \input{sample-use-sty.backref.tex}"
+	pdflatex -jobname sample-use-sty.backref "\PassOptionsToPackage{backref=true}{biblatex} \input{sample-use-sty.tex}" > /dev/null
+	biber sample-use-sty.backref > /dev/null
+	pdflatex -jobname sample-use-sty.backref "\PassOptionsToPackage{backref=true}{biblatex} \input{sample-use-sty.tex}" > /dev/null
+	pdflatex -jobname sample-use-sty.backref "\PassOptionsToPackage{backref=true}{biblatex} \input{sample-use-sty.tex}" > /dev/null
 
 history.tex:
 	git for-each-ref --format="\begin{release}{%(refname:short)}{%(taggerdate:short)} \item %(subject) \end{release}" refs/tags | grep bltx | tac > history.tex
@@ -38,25 +44,48 @@ sample.tex : biblio.bib biblatex-styles
 %.pdf: %.tex
 ifeq (, $(shell PATH=$(PATH) which rubber))
 	echo "No rubber in $(PATH), falling back to basic pdflatex calls"
-	pdflatex $<
-	biber $*
-	pdflatex $<
+	pdflatex $< > /dev/null
+	biber $* > /dev/null
+	pdflatex $< > /dev/null
+	pdflatex $< > /dev/null
 else
 	rubber -m pdftex $<
 endif
 
+%.txt: %.pdf
+	pdftotext $<
+
+test:	sample-use-sty.txt sample-use-sty.nohyperref.txt sample-use-sty.backref.txt
+	# check that we get the same results with and without hyperref
+	echo -n "Testing hyperref vs nohyperref: "
+	(diff sample-use-sty.txt sample-use-sty.nohyperref.txt > /dev/null; if [ $$? -ne 0 ]; then echo "FAIL"; else echo "SUCCESS"; fi)
+	# check that backrefs work
+	echo -n "Testing presence of backrefs: "
+	(grep "cited on page" sample-use-sty.backref.txt > /dev/null; if [ $$? -ne 0 ]; then echo "FAIL"; else echo "SUCCESS"; fi)
 
 distrib:
 	# remind maintainer to update version number in the documentation
-	echo -n "Did you update the version number in software-biblatex.tex? [y/N]"
-	read ans; if [ ".$$ans" != ".y" ]; then echo "Please update it and run make distrib again"; exit 1; fi
+	echo -n "Updated version number in software-biblatex.tex, date strings in software.* ? [y/N]"
+	read ans; if [ ".$$ans" != ".y" ]; then echo "Please update this information and run make distrib again"; exit 1; fi
 	# update history
 	rm history.tex
 	make software-biblatex.pdf
 	tar --transform 's,^\(.\),biblatex-software/\1,' -czhvf biblatex-software.tar.gz `git ls-files`
 
-clean: $(patsubst %,%/clean,$(TEXS))
-	rm -f *+sw.bbx *+sw.dbx *+sw.cbx *+sw.lbx *~
+.PHONY: preserve restore clean distclean
+
+clean:
+	# preserve PDF files under version control
+	mkdir -p .save
+	mv `git ls-files | grep pdf` .save
+	# clean up the rest
+	make cleaninner
+	# restore PDF files under version control
+	mv .save/*.pdf .
+	rmdir .save
+
+cleaninner: $(patsubst %,%/clean,$(TEXS))
+	rm -f *+sw.bbx *+sw.dbx *+sw.cbx *+sw.lbx *~ *.txt sample-use-sty.backref.* sample-use-sty.nohyperref.*
 
 %/clean:
 	if [ -f $* ]; then rubber -m pdftex --clean $* ; fi
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-software/english-software.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-software/english-software.lbx
index d18b35ed59..a256d3ef64 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-software/english-software.lbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-software/english-software.lbx
@@ -1,4 +1,4 @@
-  \ProvidesFile{english-software.lbx}[2020/04/02 english with additions for software]
+  \ProvidesFile{english-software.lbx}[2022/08/01 english with additions for software]
   \InheritBibliographyExtras{english}
   \InheritBibliographyStrings{english}
   \NewBibliographyString{software,edited,swmodule,swpartof,swversion,swexcerpt,swexc,refart,manual}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-software/french-software.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-software/french-software.lbx
index 5a77fd3dee..9a70c7c656 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-software/french-software.lbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-software/french-software.lbx
@@ -1,4 +1,4 @@
-  \ProvidesFile{french-software.lbx}[2020/04/02 french with additions for software]
+  \ProvidesFile{french-software.lbx}[2022/08/01 french with additions for software]
   \InheritBibliographyExtras{french}
   \InheritBibliographyStrings{french}
   \NewBibliographyString{software,edited,swmodule,swpartof,swversion,swexcerpt,swexc,refart,manual}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-software/history.tex b/macros/latex/contrib/biblatex-contrib/biblatex-software/history.tex
index 76f1661405..c38de3d1dc 100644..120000
--- a/macros/latex/contrib/biblatex-contrib/biblatex-software/history.tex
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-software/history.tex
@@ -1,16 +1 @@
-\begin{release}{bltx-v1.2-4}{2022-03-03} \item Add support for displaying short SWHID \end{release}
-\begin{release}{bltx-v1.2-3}{2021-08-20} \item Support backrefs. \end{release}
-\begin{release}{bltx-v1.2-2}{2020-06-27} \item Fix handling of related field; use date instead of year/month in examples; add swMATH definition \end{release}
-\begin{release}{bltx-v1.2-1}{2020-06-01} \item Fix mishandling of SWHIDs and HALids when hyperref is not loaded. Fix wrong origins in some SWHIDs in the examples. Improve ASCL example. \end{release}
-\begin{release}{bltx-v1.2}{2020-05-29} \item Bump version to 1.2 with clean support of multiline SWHIDs \end{release}
-\begin{release}{bltx-v1.1}{2020-04-29} \item Add support for the institution, organization, eprint, eprinttype and eprintclass fields Force urls output when they are the only reference available Updates to the documentation \end{release}
-\begin{release}{bltx-v1.0}{2020-04-25} \item First public release \end{release}
-\begin{release}{bltx-v0.9}{2020-04-25} \item Preparing for public release: Licence, Readme, update documentation, handle suggestions from the Working Group \end{release}
-\begin{release}{bltx-v0.8}{2020-04-09} \item Make the style usable as an extension, and keep possibility of generating extended styles \end{release}
-\begin{release}{bltx-v0.7}{2020-04-09} \item Move to diff model approach to be more portable \end{release}
-\begin{release}{bltx-v0.6}{2020-04-08} \item Standardise file names, make softwarebib.tex self contained, separate out sample.tex, update Makefile, use printdate macro \end{release}
-\begin{release}{bltx-v0.5}{2020-04-08} \item Added standard list format for licenses \end{release}
-\begin{release}{bltx-v0.4}{2020-04-07} \item Added repository and licence field \end{release}
-\begin{release}{bltx-v0.3}{2020-04-05} \item Biblatex style with first complete example \end{release}
-\begin{release}{bltx-v0.2}{2020-04-02} \item Biblatex style sent for review \end{release}
-\begin{release}{bltx-v0.1}{2020-04-02} \item First version of the biblatex style \end{release}
+Changes
\ No newline at end of file
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-software/sample-use-sty.pdf b/macros/latex/contrib/biblatex-contrib/biblatex-software/sample-use-sty.pdf
index b4edeebf1b..7f46d76a9c 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-software/sample-use-sty.pdf
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-software/sample-use-sty.pdf
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-software/software-biblatex.pdf b/macros/latex/contrib/biblatex-contrib/biblatex-software/software-biblatex.pdf
index e032a40d8c..1cb63e3216 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-software/software-biblatex.pdf
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-software/software-biblatex.pdf
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-software/software-biblatex.tex b/macros/latex/contrib/biblatex-contrib/biblatex-software/software-biblatex.tex
index bead6d683a..5b76ac11ed 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-software/software-biblatex.tex
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-software/software-biblatex.tex
@@ -14,7 +14,7 @@
   url={https://www.ctan.org/tex-archive/macros/latex/contrib/biblatex-contrib/biblatex-software},
   author={Roberto Di Cosmo},
   email={roberto@dicosmo.org},
-  revision={1.2-4},
+  revision={1.2-5},
   date={\today}}
 
 \hypersetup{%
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-software/software.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-software/software.bbx
index f7d27f471b..ad9edc6053 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-software/software.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-software/software.bbx
@@ -1,8 +1,8 @@
-\ProvidesFile{software.bbx}[2020/04/02 bibliography driver extension for software entries, Roberto Di Cosmo]
+\ProvidesFile{software.bbx}[2022/08/01 bibliography driver extension for software entries, Roberto Di Cosmo]
 %
 % Reference implementation of a BibLaTeX style for the software family of bibliographic entries
 %
-% 2020/04/02 Roberto Di Cosmo <roberto@dicosmo.org>
+% 2020 - 2022 Roberto Di Cosmo <roberto@dicosmo.org>
 %
 \RequireBiber[3]
 \RequirePackage{xurl}
@@ -96,6 +96,10 @@
            }%
            {}%
 }
+
+%
+% Notice the use of \edef to force expansion of the macro parameters before calling \nolinkurl
+%
 \DeclareFieldFormat[software,softwareversion,softwaremodule,codefragment]{swhid}{%
   \iftoggle{bbx:swhid}%
            {\mkbibacro{SWHID}\addcolon\addspace%
@@ -103,9 +107,9 @@
                  {\href{http://archive.softwareheritage.org/#1}{\(\langle\)\nolinkurl{%
   		    \iftoggle{bbx:shortswhid}{\thefield{swhidcore}}{#1}%
 		    }\(\rangle\)}}%
-                 {\(\langle\)\nolinkurl{%
+                 {\(\langle\){\edef\temp{\noexpand\nolinkurl{%
   		    \iftoggle{bbx:shortswhid}{\thefield{swhidcore}}{#1}%
-		    }\(\rangle\)}%
+		    }}\temp}\(\rangle\)}%
            }%
            {}%
 }
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-software/software.dbx b/macros/latex/contrib/biblatex-contrib/biblatex-software/software.dbx
index f3861cfedf..477122a513 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-software/software.dbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-software/software.dbx
@@ -1,4 +1,4 @@
-\ProvidesFile{software.dbx}[2020/04/02 datamodel extension for software entries, Roberto Di Cosmo]
+\ProvidesFile{software.dbx}[2022/08/01 datamodel extension for software entries, Roberto Di Cosmo]
 \RequireBiber[3]
 %
 % the software entry type family, with their fields
diff --git a/macros/latex/contrib/postnotes/CHANGELOG.md b/macros/latex/contrib/postnotes/CHANGELOG.md
index c3cb3d525a..6df07b54a7 100644
--- a/macros/latex/contrib/postnotes/CHANGELOG.md
+++ b/macros/latex/contrib/postnotes/CHANGELOG.md
@@ -1,6 +1,12 @@
 # Changelog
 
-## [Unreleased](https://github.com/gusbrs/postnotes/compare/v0.1.5...HEAD)
+## [Unreleased](https://github.com/gusbrs/postnotes/compare/v0.1.6...HEAD)
+
+## [v0.1.6](https://github.com/gusbrs/postnotes/compare/v0.1.5...v0.1.6) (2022-08-01)
+
+### Removed
+- Withdraw experimental attempt to support `biblatex`'s `refsegment`s and
+  `refcontext`s until upstream support is available.
 
 ## [v0.1.5](https://github.com/gusbrs/postnotes/compare/v0.1.4...v0.1.5) (2022-07-07)
 
diff --git a/macros/latex/contrib/postnotes/postnotes-code.pdf b/macros/latex/contrib/postnotes/postnotes-code.pdf
index e2b82b38c8..a47aefa002 100644
--- a/macros/latex/contrib/postnotes/postnotes-code.pdf
+++ b/macros/latex/contrib/postnotes/postnotes-code.pdf
diff --git a/macros/latex/contrib/postnotes/postnotes.dtx b/macros/latex/contrib/postnotes/postnotes.dtx
index f4cbdfe7a2..aa53abda40 100644
--- a/macros/latex/contrib/postnotes/postnotes.dtx
+++ b/macros/latex/contrib/postnotes/postnotes.dtx
@@ -147,7 +147,7 @@
 %
 %
 %    \begin{macrocode}
-\ProvidesExplPackage {postnotes} {2022-07-07} {0.1.5}
+\ProvidesExplPackage {postnotes} {2022-08-01} {0.1.6}
   {Endnotes for LaTeX}
 %    \end{macrocode}
 %
@@ -2014,18 +2014,55 @@
 % Thanks \contributor{Moritz Wemheuer}:
 % \url{https://tex.stackexchange.com/q/597359#comment1594585_597389}.
 %
-% We can make \pkg{biblatex}'s \texttt{refsegment}s and \texttt{refcontext}s
-% work, but \texttt{refsection}s are more complicated.  Currently,
-% \texttt{refsection}s are only supported if \cs{printpostnotes} is called
-% within each \texttt{refsection}, one cannot ``accumulate'' the notes from
-% all \texttt{refsection}s and print them at the end.  Well, one can, but they
-% will be considered part of the current \texttt{refsection} of wherever
-% \cs{printpostnotes} is placed (unless they were also cited in the original
-% \texttt{refsection} out of a \cs{postnote} which, of course, is not
-% something to rely on).
 %
-% Note that support for these features of \pkg{biblatex} is
-% \emph{experimental}.
+%    \begin{macrocode}
+\AddToHook { package/biblatex/after }
+  {
+%    \end{macrocode}
+% Let \pkg{biblatex} know we are in a ``notes'' context.  See
+% \url{https://tex.stackexchange.com/a/304464}, including comments.
+%    \begin{macrocode}
+    \AddToHook { postnotes/print/begin } [ postnotes ]
+      { \toggletrue { blx@footnote } }
+%    \end{macrocode}
+% Make \pkg{biblatex}'s \cs{mkbibendnote} use \cs{postnote}.  This is very
+% likely desired in most cases, but may occasionally not be, so we add it to
+% an individually labeled hook, which can be disabled with
+% \texttt{\textbackslash{}RemoveFromHook\{begindocument/before\}[postnotes/mkbibendnote]}
+% in the preamble.
+%    \begin{macrocode}
+    \AddToHook { begindocument/before } [ postnotes/mkbibendnote ]
+      {
+        \cs_set:Npn \blx@theendnote { \postnote }
+        \cs_set:Npn \blx@theendnotetext
+          { \blx@err@endnote \footnotetext }
+      }
+  }
+%    \end{macrocode}
+%
+%
+%    \begin{macrocode}
+%<*gobble>
+%    \end{macrocode}
+%
+% I had made an initial experimental attempt to support \pkg{biblatex}'s
+% \texttt{refsegment}s, \texttt{refcontext}s and \texttt{refsection}s.
+% However, this attempt was rash.  Even if I could get many example files to
+% work for \texttt{refsegment}s and \texttt{refcontext}s, I could not do so
+% for \texttt{refsection}s.  More importantly, with this partial
+% implementation, I could also generate documents which confused
+% \pkg{biblatex} more than it helped.  Things I couldn't understand well, or
+% fix.  All in all, I don't think this partial implementation is tenable, and
+% I could not take it further.  Hence, \pkg{postnotes} support for this
+% feature set of \pkg{biblatex} will depend, as it should, on proper upstream
+% support for ``saving'' and ``restoring'' citation ``context'' information.
+%
+% I have made a feature request at \pkg{biblatex} for this
+% (\url{https://github.com/plk/biblatex/issues/1226}), which was
+% (understandably) classified as ``long term, no promises''.
+%
+%
+% The attempt was the following (currently ``gobbled'' from the package):
 %
 %    \begin{macrocode}
 \AddToHook { package/biblatex/after }
@@ -2052,11 +2089,6 @@
       {
         \@@_biblatex_endrefcontext_local:
         \@@_biblatex_citereset_local:
-%    \end{macrocode}
-% Let \pkg{biblatex} know we are in a ``notes'' context.  See
-% \url{https://tex.stackexchange.com/a/304464}, including comments.
-%    \begin{macrocode}
-        \toggletrue { blx@footnote }
       }
 %    \end{macrocode}
 % Restore \pkg{biblatex} variables for each note.
@@ -2077,19 +2109,6 @@
         \blx@edef@refcontext { \l_@@_restore_tmp_tl }
       }
 %    \end{macrocode}
-% Make \pkg{biblatex}'s \cs{mkbibendnote} use \cs{postnote}.  This is very
-% likely desired in most cases, but may occasionally not be, so we add it to
-% an individually labeled hook, which can be disabled with
-% \texttt{\textbackslash{}RemoveFromHook\{begindocument/before\}[postnotes/mkbibendnote]}
-% in the preamble.
-%    \begin{macrocode}
-    \AddToHook { begindocument/before } [ postnotes/mkbibendnote ]
-      {
-        \cs_set_nopar:Npn \blx@theendnote { \postnote }
-        \cs_set_nopar:Npn \blx@theendnotetext
-          { \blx@err@endnote \footnotetext }
-      }
-%    \end{macrocode}
 % Auxiliary functions.
 %
 % \begin{macro}{\@@_biblatex_endrefcontext_local:}
@@ -2176,9 +2195,7 @@
 % corresponding citation data written to the \file{.bcf} file.  And the way
 % \cs{refsection} is implemented presumes each section is only ever begun once
 % (fair\dots{}), thus making it difficult to ``reopen'' it, or append new
-% citations to it later on, when the notes are printed.  Given the complexity
-% of this machinery, it would be madness not to use \pkg{biblatex}'s
-% infrastructure directly, and try to ``emulate'' it.  The start of a
+% citations to it later on, when the notes are printed.  The start of a
 % \texttt{refsection} must be registered on the \file{.bcf} file, and this is
 % done by \cs{refsection} (and its auxiliary functions).  However, a number of
 % its characteristics make things particularly difficult for the purpose at
@@ -2187,14 +2204,13 @@
 % environment (which receives the \meta{resources}) is used to set a local
 % assignment to \cs{blx@bibfiles}, based on which the relevant information is
 % written to the \file{.bcf} file, and when the group closes the information
-% is gone.  My best attempt is below (excluded from the package) but it is not
-% good.  It feels a wrong approach to ``go around'' the intended use of
-% \cs{refsection} so much, and it can't handle at all its optional argument,
-% for the reasons above.  It's also incomplete, since it does not handle
-% restoring \cs{l_@@_biblatex_orig_refsection_tl}.
+% is gone.  My best attempt is below but it is not good.  It feels a wrong
+% approach to ``go around'' the intended use of \cs{refsection} so much, and
+% it can't handle at all its optional argument, for the reasons above.  It's
+% also incomplete, since it does not handle restoring
+% \cs{l_@@_biblatex_orig_refsection_tl}.
 %
 %    \begin{macrocode}
-%<*gobble>
 \AddToHook { package/biblatex/after }
   {
     \tl_new:N \l_@@_biblatex_orig_refsection_tl
@@ -2227,6 +2243,9 @@
           }
       }
   }
+%    \end{macrocode}
+%
+%    \begin{macrocode}
 %</gobble>
 %    \end{macrocode}
 %
diff --git a/macros/latex/contrib/postnotes/postnotes.pdf b/macros/latex/contrib/postnotes/postnotes.pdf
index 4d11b82c55..758ad81528 100644
--- a/macros/latex/contrib/postnotes/postnotes.pdf
+++ b/macros/latex/contrib/postnotes/postnotes.pdf
diff --git a/macros/latex/contrib/postnotes/postnotes.tex b/macros/latex/contrib/postnotes/postnotes.tex
index e9fa40b215..1ab3172592 100644
--- a/macros/latex/contrib/postnotes/postnotes.tex
+++ b/macros/latex/contrib/postnotes/postnotes.tex
@@ -66,10 +66,10 @@
 \usepackage{zref-clever}
 \zcsetup{
   cap,
-  check,
-  titleref,
   countertype = { pnexample = example } ,
 }
+\usepackage{zref-titleref}
+\usepackage{zref-check}
 
 \usepackage{listings}
 \lstdefinestyle{code}{
@@ -156,17 +156,13 @@
 \makeatother
 \ExplSyntaxOff
 
+\setlength{\marginparsep}{2\labelsep}
+
 \NewDocumentCommand\opt{m}{\texttt{#1}}
 % Temporary workaround for 'l3doc' bug.
 % https://github.com/latex3/latex3/issues/1111
 % FIXME Remove when fixed upstream.
-\NewDocElement[
-  macrolike = false ,
-  printtype = \textit{opt.} ,
-]{Option}{optiondesc}
-\NewDocElement[
-  macrolike = true ,
-]{UserMacro}{usermacro}
+\NewDocElement[macrolike=false]{Option}{option}
 
 \begin{document}
 
@@ -331,7 +327,7 @@ receives options and values in \texttt{key=value} fashion.
 \bigskip{}
 
 \DescribeOption{heading} %
-\DescribeUserMacro{\pnheading} %
+\DescribeMacro{\pnheading} %
 The \opt{heading} option sets the heading for the printed notes or, more
 generally put, that which is printed at the beginning of \cs{printpostnotes}.
 Its default value depends on the document class in use.  If \cs{chapter} is
@@ -374,7 +370,7 @@ different than the defaults.
 
 \DescribeOption{makemark} %
 \DescribeOption{maketextmark} %
-\DescribeUserMacro{\pnthepage} %
+\DescribeMacro{\pnthepage} %
 The \opt{makemark} and \opt{maketextmark} options control how the mark is to
 be typeset, at the point \cs{postnote} is called and at the point the note's
 text is printed at \cs{printpostnotes}, respectively.  They both can receive
@@ -530,10 +526,10 @@ case, but be able to override it manually for an occasional unnumbered one.
 For this reason, a more semantic name was chosen for it, instead of the
 generic ``add to''.
 
-\DescribeUserMacro{\pnthechapter} %
-\DescribeUserMacro{\pnthesection} %
-\DescribeUserMacro{\pnthechapternextnote} %
-\DescribeUserMacro{\pnthesectionnextnote} %
+\DescribeMacro{\pnthechapter} %
+\DescribeMacro{\pnthesection} %
+\DescribeMacro{\pnthechapternextnote} %
+\DescribeMacro{\pnthesectionnextnote} %
 Just like with \cs{postnote}, the contents of \cs{postnotesection} are not
 expanded in place, but rather stored with ``no manipulation'' to be typeset
 later at \cs{printpostnotes}.  For this reason, some contextual information is
@@ -689,14 +685,14 @@ part of the definition:
 \ExplSyntaxOff
 \end{pnsnippet}
 
-\DescribeUserMacro{\pnhdpagefirst} %
-\DescribeUserMacro{\pnhdpagelast} %
-\DescribeUserMacro{\pnhdchapfirst} %
-\DescribeUserMacro{\pnhdchaplast} %
-\DescribeUserMacro{\pnhdsectfirst} %
-\DescribeUserMacro{\pnhdsectlast} %
-\DescribeUserMacro{\pnhdnamefirst} %
-\DescribeUserMacro{\pnhdnamelast} %
+\DescribeMacro{\pnhdpagefirst} %
+\DescribeMacro{\pnhdpagelast} %
+\DescribeMacro{\pnhdchapfirst} %
+\DescribeMacro{\pnhdchaplast} %
+\DescribeMacro{\pnhdsectfirst} %
+\DescribeMacro{\pnhdsectlast} %
+\DescribeMacro{\pnhdnamefirst} %
+\DescribeMacro{\pnhdnamelast} %
 \cs{pnhdpagefirst} and \cs{pnhdpagelast} store the value of \cs{thepage} for
 the first and the last notes (where these notes were originally placed) of the
 current page (at the point they are being printed).  These variables are
@@ -820,10 +816,10 @@ places, etc.
 \section{Localization}
 \zlabel{sec:localization}
 
-\DescribeUserMacro{\pntitle} %
-\DescribeUserMacro{\pnhdnotes} %
-\DescribeUserMacro{\pnhdtopage} %
-\DescribeUserMacro{\pnhdtopages} %
+\DescribeMacro{\pntitle} %
+\DescribeMacro{\pnhdnotes} %
+\DescribeMacro{\pnhdtopage} %
+\DescribeMacro{\pnhdtopages} %
 \pkg{postnotes} uses a few localized strings, stored in the variables
 \cs{pntitle}, \cs{pnhdnotes}, \cs{pnhdtopage}, and \cs{pnhdtopages}.  The
 first one is used in the default value of the \opt{heading} option and
diff --git a/macros/latex/contrib/profcollege/doc/ProfCollege-doc.pdf b/macros/latex/contrib/profcollege/doc/ProfCollege-doc.pdf
index 1ca04525cd..c78ed2b3b4 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 65eb19125d..f027170b16 100644
--- a/macros/latex/contrib/profcollege/latex/ProfCollege.sty
+++ b/macros/latex/contrib/profcollege/latex/ProfCollege.sty
@@ -1,8 +1,12 @@
 % Author     : Christophe Poulain
 % licence    : Released under the LaTeX Project Public License v1.3c
 % or later, see http://www.latex-project.org/lppl.txtf
-\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{ProfCollege}[2022/07/15 v0.99-s Aide pour utiliser LaTeX au college]
+\NeedsTeXFormat{LaTeX2e}%
+\def\filedate{2022/08/01}%
+\let\PfCfiledate\filedate%
+\def\fileversion{0.99-t}%
+\let\PfCfileversion\fileversion%
+\ProvidesPackage{ProfCollege}[\filedate\space v\fileversion\space Aide pour utiliser LaTeX au college]
 
 \RequirePackage{verbatim}
 
@@ -75,13 +79,12 @@
 \fi
 
 \RequirePackage{xintexpr}
-\RequirePackage{listofitems}%pour définir simplement la liste des données.
+\RequirePackage{listofitems}
 \RequirePackage{datatool}
 \RequirePackage{multido}
 
-\RequirePackage{xlop}%Pour effectuer les calculs nécessaires.
-
-\RequirePackage{xfp}%Pour les calculs trigonométriques
+\RequirePackage{xlop}
+\RequirePackage{xfp}
 
 \RequirePackage[most]{tcolorbox}
 
@@ -94,14 +97,14 @@
 
 \RequirePackage{multicol}
 
-\RequirePackage{hhline}% Pour la cohabitation de cline avec les couleurs
+\RequirePackage{hhline}
 
 \RequirePackage{stackengine}
 \RequirePackage[thicklines]{cancel}
 
 \RequirePackage{fontawesome5}%Pour l'environnement Twitter
 \RequirePackage{pifont}%Pour la commande \Autonomie
-\RequirePackage{nicematrix}%pour le tableur
+\RequirePackage{nicematrix}%
 
 \let\myoldmulticolumn\multicolumn
 \AtBeginEnvironment{tabular}{\let\multicolumn\myoldmulticolumn}
@@ -147,7 +150,7 @@
 \catcode`\@=12
 
 %%%
-%% Commandes "utiles"
+% Commandes "utiles"
 %%%
 %encadrer avec des "sommets arrondis"
 \newsavebox{\logobox}
@@ -174,21 +177,20 @@
 }%
 
 \makeatletter%
-\def\Dotfill{%
+\NewDocumentCommand\Dotfill{}{%
 \leavevmode%
-\cleaders \hb@xt@ .44em{\hss\xleaders\hrule width0.33em\hss}\hfill%
+\cleaders\hb@xt@.44em{\hss\xleaders\hrule width0.33em\hss}\hfill%
 \kern\z@}%
+
+\NewDocumentCommand\PfCdotover{}{\leavevmode\cleaders\hb@xt@ .22em{\hss $\cdot$\hss}\hfill\kern\z@}
+
 \makeatother%
 
-\newcommand\pointilles[1][]{%
-  \ifx\bla#1\bla%
-  \Dotfill%
-  \else%
-  \hbox to#1{\Dotfill}%
-  \fi%
+\NewDocumentCommand\pointilles{o}{%
+  \IfNoValueTF{#1}{\Dotfill}{\makebox[#1]{\Dotfill}}%
 }%
 
-\newcommand\Lignespointilles[1]{%
+\NewDocumentCommand\Lignespointilles{m}{%
   \xintifboolexpr{#1>1}{%
     \xintFor* ##1 in {\xintSeq {1}{#1}}\do{%
       \pointilles\par%
@@ -196,6 +198,12 @@
   }{}%
 }%
 
+%https://tex.stackexchange.com/questions/128991/frac-or-inference-rule-with-dotted-line
+\newcommand\PfCfrac[2]{%
+\ooalign{$\genfrac{}{}{0pt}{0}{#1}{#2}$\cr\PfCdotover\cr}
+}%
+\makeatother
+
 \newcommand\MultiCol[2]{%
   \setsepchar[*]{/}%
   \readlist*\ListeNombreCol{#1}%
@@ -338,6 +346,425 @@
 }
 
 %%%
+% Puissances 4
+%%%
+\setKVdefault[ClesPQuatre]{Couleur=Gray,Largeur=2cm,Multiplication,Entier,Nombre,Exposant=false}%
+\defKV[ClesPQuatre]{Addition=\setKV[ClesPQuatre]{Multiplication=false}}%
+\defKV[ClesPQuatre]{Relatif=\setKV[ClesPQuatre]{Entier=false}}%
+\defKV[ClesPQuatre]{Puissance=\setKV[ClesPQuatre]{Exposant}}%
+\defKV[ClesPQuatre]{Autre=\setKV[ClesPQuatre]{Nombre=false}}%
+
+\newtoks\toklistePQuatreh%
+\newtoks\toklistePQuatrev%
+\def\UpdatetoksPQuatreh#1\nil{\addtotok\toklistePQuatreh{"#1",}}%
+\def\UpdatetoksPQuatrev#1\nil{\addtotok\toklistePQuatrev{"#1",}}%
+
+\NewDocumentCommand\PQuatre{o +m}{%
+  \useKVdefault[ClesPQuatre]%
+  \toklistePQuatreh{}%
+  \toklistePQuatrev{}%
+  \setKV[ClesPQuatre]{#1}%
+  \ifboolKV[ClesPQuatre]{Nombre}{%
+    \ifboolKV[ClesPQuatre]{Exposant}{%
+      \def\PQuatreListe{$10^{-10}$,$10^{-9}$,$10^{-8}$,$10^{-7}$,$10^{-6}$,$10^{-5}$,$10^{-4}$,$10^{-3}$,$10^{-2}$,$10^{2}$,$10^{3}$,$10^{4}$,$10^{5}$,$10^{6}$,$10^{7}$,$10^{8}$,$10^{9}$,$10^{10}$}%
+      \MelangeListe{\PQuatreListe}{7}%
+      \readlist*\PQuatreListeH{\faa}%
+      \MelangeListe{\PQuatreListe}{7}%
+      \readlist*\PQuatreListeV{\faa}%
+      \foreachitem\compteur\in\PQuatreListeH{\expandafter\UpdatetoksPQuatreh\compteur\nil}%
+      \foreachitem\compteur\in\PQuatreListeV{\expandafter\UpdatetoksPQuatrev\compteur\nil}%
+    }{%
+      \ifboolKV[ClesPQuatre]{Entier}{%
+        % On choisit aléatoirement les listes de nombres de 2 à 10 en faisant deux listes : horizontale et verticale
+        \def\PQuatreListe{2,3,4,5,6,7,8,9,10}%
+        \MelangeListe{\PQuatreListe}{7}%
+        \readlist*\PQuatreListeH{\faa}%
+        \MelangeListe{\PQuatreListe}{7}%
+        \readlist*\PQuatreListeV{\faa}%
+        \foreachitem\compteur\in\PQuatreListeH{\expandafter\UpdatetoksPQuatreh\compteur\nil}%
+        \foreachitem\compteur\in\PQuatreListeV{\expandafter\UpdatetoksPQuatrev\compteur\nil}%
+      }{%
+        % On choisit aléatoirement les listes de nombres de -10 à -2 union 2 à 10 en faisant deux listes : horizontale et verticale
+        \def\PQuatreListe{$-10$,$-9$,$-8$,$-7$,$-6$,$-5$,$-4$,$-3$,$-2$,2,3,4,5,6,7,8,9,10}%
+        \MelangeListe{\PQuatreListe}{7}%
+        \readlist*\PQuatreListeH{\faa}%
+        \MelangeListe{\PQuatreListe}{7}%
+        \readlist*\PQuatreListeV{\faa}%
+        \foreachitem\compteur\in\PQuatreListeH{\expandafter\UpdatetoksPQuatreh\compteur\nil}%
+        \foreachitem\compteur\in\PQuatreListeV{\expandafter\UpdatetoksPQuatrev\compteur\nil}%
+      }%
+    }%
+  }{%
+    % on lit la liste des données fournies par l'utilisateur
+    \setsepchar[*]{,*/}%
+    \readlist\PQuatreListes{#2}%
+    \setsepchar{,}%
+    \foreachitem\compteur\in\PQuatreListes[1]{\expandafter\UpdatetoksPQuatrev\compteur\nil}%
+    \foreachitem\compteur\in\PQuatreListes[2]{\expandafter\UpdatetoksPQuatreh\compteur\nil}%
+  }%
+  % Une fois les listes construites, on dessine et on place les listes.
+  \PQuatreGrille{\the\toklistePQuatrev}{\the\toklistePQuatreh}%
+}%
+
+\NewDocumentCommand\PQuatreGrille{m m}{%
+  \ifluatex%
+  \mplibforcehmode%
+  \begin{mplibcode}
+    Largeur=\useKV[ClesPQuatre]{Largeur};
+    color fond;
+    fond=\useKV[ClesPQuatre]{Couleur};
+    boolean Multiplication,Addition;
+    Multiplication=\useKV[ClesPQuatre]{Multiplication};
+    pair A,B,C,D,H[],V[],M[][];
+    A=(0,0);
+    B-A=Largeur*(7,0);
+    C=rotation(A,B,-90);
+    D-C=A-B;
+    fill polygone(A,B,C,D) withcolor fond;
+    trace polygone(A,B,C,D);
+    for k=0 upto 6:
+    for l=0 upto 6:
+    M[k][l]=A+0.5*(Largeur,Largeur)+k*(Largeur,0)+l*(0,Largeur);
+    fill cercles(M[k][l],0.4*Largeur) withcolor blanc;
+    trace cercles(M[k][l],0.4*Largeur);
+    endfor;
+    endfor;
+    labeloffset:=labeloffset*2;
+    if Multiplication:
+    label.llft(btex $\times$ etex scaled 2,A);
+    else:
+    label.llft(btex $+$ etex scaled 2,A);
+    fi;
+    labeloffset:=labeloffset/2;
+    vardef Vertical(text t)=
+    n:=0;
+    for p_=t:
+%    if n<7:
+    label.lft(TEX(p_) scaled 2,A+(0,n*Largeur+Largeur/2));
+    n:=n+1;
+%    fi;
+    endfor;
+    enddef;
+    vardef Horizontal(text t)=
+    n:=0;
+    for p_=t:
+%    if n<7:
+    label.bot(TEX(p_) scaled 2,A+(n*Largeur+Largeur/2,0));
+    n:=n+1;
+%    fi;
+    endfor;
+    enddef;
+    labeloffset:=labeloffset*4;
+    Vertical(#1);
+    Horizontal(#2);
+  \end{mplibcode}
+  \else%
+  \begin{mpost}[mpsettings={Largeur=\useKV[ClesPQuatre]{Largeur};color fond;fond=\useKV[ClesPQuatre]{Couleur};boolean Multiplication;Multiplication=\useKV[ClesPQuatre]{Multiplication};}]
+    pair A,B,C,D,H[],V[],M[][];
+    A=(0,0);
+    B-A=Largeur*(7,0);
+    C=rotation(A,B,-90);
+    D-C=A-B;
+    fill polygone(A,B,C,D) withcolor fond;
+    for k=0 upto 7:
+    for l=0 upto 7:
+    M[k][l]=A+0.5*(Largeur,Largeur)+k*(Largeur,0)+l*(0,Largeur);
+    fill cercles(M[k][l],0.4*Largeur) withcolor blanc;
+    endfor;
+    endfor;
+    labeloffset:=labeloffset*2;
+    if Multiplication:
+    label.llft(btex $\times$ etex scaled 2,A);
+    else:
+    label.llft(btex $+$ etex scaled 2,A);
+    fi;
+    labeloffset:=labeloffset/2;
+    vardef Vertical(text t)=
+    n:=0;
+    for p_=t:
+    if n<7:
+    label.lft(LATEX(p_) scaled 2,A+(0,n*Largeur+Largeur/2));
+    n:=n+1;
+    fi;
+    endfor;
+    enddef;
+    vardef Horizontal(text t)=
+    n:=0;
+    for p_=t:
+    if n<7:
+    label.bot(LATEX(p_) scaled 2,A+(n*Largeur+Largeur/2,0));
+    n:=n+1;
+    fi;
+    endfor;
+    enddef;
+    labeloffset:=labeloffset*4;
+    Vertical(#1);
+    Horizontal(#2);
+  \end{mpost}
+  \fi%
+}%
+
+%%%
+% Billiard
+%%%
+\setKVdefault[ClesBilliard]{Longueur=8cm,Largeur=5cm,Solution=false,Angle=70,Depart=0.5,Vrai=false}
+
+\NewDocumentCommand\Billiard{o m}{%
+  \useKVdefault[ClesBilliard]%
+  \setKV[ClesBilliard]{#1}%
+  \ifboolKV[ClesBilliard]{Solution}{%
+    \MPBilliardSolution{#2}{\useKV[ClesBilliard]{Depart}}{\useKV[ClesBilliard]{Angle}}%
+    }{%
+      \MPBilliard{#2}{\useKV[ClesBilliard]{Depart}}{\useKV[ClesBilliard]{Angle}}%
+    }%
+}%
+
+\def\MPBilliard#1#2#3{%
+  \mplibcodeinherit{disable}%
+  \begin{Geometrie}[CoinHD={(\useKV[ClesBilliard]{Longueur}+2cm,\useKV[ClesBilliard]{Largeur}+3cm)}]
+    boolean Vrai;
+    Vrai:=\useKV[ClesBilliard]{Vrai};
+    % On définit la liste des 25 lettres alphabétiques dans laquelle on choisit autant de lettres que la longueur du mot
+    % On a retiré la lettre Q pour des questions d'alignements esthétiques.
+    vardef ChoixLettre=
+    save Lettre,choixalea;
+    string Lettre;
+    choixalea=floor(uniformdeviate(26)+1);
+    if choixalea=1:
+    Lettre="A";
+    elseif choixalea=2:
+    Lettre="B";
+    elseif choixalea=3:
+    Lettre="C";
+    elseif choixalea=4:
+    Lettre="D";
+    elseif choixalea=5:
+    Lettre="E";
+    elseif choixalea=6:
+    Lettre="F";
+    elseif choixalea=7:
+    Lettre="G";
+    elseif choixalea=8:
+    Lettre="H";
+    elseif choixalea=9:
+    Lettre="I";
+    elseif choixalea=10:
+    Lettre="J";
+    elseif choixalea=11:
+    Lettre="K";
+    elseif choixalea=12:
+    Lettre="L";
+    elseif choixalea=13:
+    Lettre="M";
+    elseif choixalea=14:
+    Lettre="N";
+    elseif choixalea=15:
+    Lettre="O";
+    elseif choixalea=16:
+    Lettre="P";
+    elseif choixalea=17:
+    Lettre="O";
+    elseif choixalea=18:
+    Lettre="R";
+    elseif choixalea=19:
+    Lettre="S";
+    elseif choixalea=20:
+    Lettre="T";
+    elseif choixalea=21:
+    Lettre="U";
+    elseif choixalea=22:
+    Lettre="V";
+    elseif choixalea=23:
+    Lettre="W";
+    elseif choixalea=24:
+    Lettre="X";
+    elseif choixalea=25:
+    Lettre="Y";
+    elseif choixalea=26:
+    Lettre="Z";
+    fi;
+    Lettre
+    enddef;
+    % On crée un Quick Sort
+    def QS(expr ndeb,nfin)=
+    begingroup
+    save v,m,x;
+    if ndeb<nfin:
+      v:=l[cpt[ndeb]];
+      m:=ndeb;
+      for i=(ndeb+1) upto nfin:
+	if l[cpt[i]]<v:
+	  m:=m+1;
+	  x:=cpt[m];cpt[m]:=cpt[i];cpt[i]:=x;
+	fi
+      endfor;
+      x:=cpt[m];cpt[m]:=cpt[ndeb];cpt[ndeb]:=x;
+      QS(ndeb,m-1);
+      QS(m+1,nfin);
+    fi
+    endgroup
+    enddef;
+    % On définit le rectangle
+    pair M[],Co,Intermed;
+    M1=u*(1,2);
+    M2-M1=(\useKV[ClesBilliard]{Longueur},0);
+    M3-M2=(0,\useKV[ClesBilliard]{Largeur});
+    M4-M3=M1-M2;
+    Co=iso(M1,M3);
+    path rec,cote[];
+    rec=polygone(M1,M2,M3,M4);
+    cote1=segment(M1,M2);
+    cote2=segment(M2,M3);
+    cote3=segment(M3,M4);
+    cote4=segment(M4,M1);
+    trace rec;
+    pair Pt[],FauxPt[];
+    nbfaux=0;
+    l1=#2;
+    Pt[1]=point(l1) of rec;
+    angleref=#3;
+    if l1>3:
+    angledepart=90+angleref;
+    Pt[2]=demidroite(Pt[1],rotation(M1,Pt1,angledepart)) intersectionpoint (subpath(0,3) of rec);
+    dotlabel.lft(TEX(substring(0,1) of #1),Pt[1]);
+    elseif l1>2:
+    angledepart=180+angleref;
+    Pt[2]=demidroite(Pt[1],rotation(M4,Pt1,angledepart)) intersectionpoint ((subpath(3,4) of rec)--(subpath(0,2) of rec));
+    dotlabel.top(TEX(substring(0,1) of #1),Pt[1]);
+    elseif l1>1:
+    angledepart=angleref-90;
+    Pt[2]=demidroite(Pt[1],rotation(M3,Pt1,angledepart)) intersectionpoint ((subpath(2,4) of rec)--(subpath(0,1) of rec));
+    dotlabel.rt(TEX(substring(0,1) of #1),Pt[1]);
+    else:
+    angledepart=angleref;
+    Pt[2]=demidroite(Pt[1],rotation(M2,Pt1,angledepart)) intersectionpoint (subpath(1,4) of rec);
+    dotlabel.bot(TEX(substring(0,1) of #1),Pt[1]);
+    fi;
+    tourne=90;
+    numeric Blong;
+    BLong:=length #1;
+    % Détermination des points.
+    if Vrai:
+    for k=3 upto BLong:
+    Intermed:=symetrie(Pt[k-2],Pt[k-1],Pt[k-1]+M2-M3);
+    if (demidroite(1/1000[Pt[k-1],Intermed],Intermed) intersectiontimes rec)<>(-1,-1):
+    Pt[k]:=demidroite(1/1000[Pt[k-1],Intermed],Intermed) intersectionpoint rec;
+    else:
+    Intermed:=symetrie(Pt[k-2],Pt[k-1],Pt[k-1]+M1-M2);
+    Pt[k]:=demidroite(1/1000[Pt[k-1],Intermed],Intermed) intersectionpoint rec;
+    fi;
+    endfor;
+    else:
+    for k=3 upto BLong:
+    Intermed:=rotation(Pt[k-2],Pt[k-1],tourne);
+    if (demidroite(1/1000[Pt[k-1],Intermed],Intermed) intersectiontimes rec)<>(-1,-1):
+    Pt[k]:=demidroite(1/1000[Pt[k-1],Intermed],Intermed) intersectionpoint rec;
+    else:
+    Intermed:=rotation(Pt[k-2],Pt[k-1],-tourne);
+    Pt[k]:=demidroite(1/1000[Pt[k-1],Intermed],Intermed) intersectionpoint rec;
+    fi;
+    endfor;
+    fi;
+    % Ajout des faux points
+    path SPath[];
+    cpt[1]:=1;
+    cpt[BLong+1]:=BLong+1;
+    l[BLong+1]:=4;
+    for k=2 upto BLong:
+    SPath[k]=rec cutafter demidroite(Co,Pt[k]);
+    l[k]=arclength SPath[k];
+    l[k]:=arctime l[k] of rec;
+    cpt[k]:=k;
+    endfor;
+    QS(1,BLong+1);
+    for k=2 upto BLong+1:
+    if l[cpt[k]]-l[cpt[k-1]]>0.3:
+    nbfaux:=nbfaux+1;
+    FauxPt[nbfaux]=point(l[cpt[k-1]]+0.1) of rec;
+    nbfaux:=nbfaux+1;
+    FauxPt[nbfaux]=point(l[cpt[k]]-0.1) of rec;
+    fi;
+    endfor;
+    drawoptions();
+    % Tracés
+    drawarrow Pt[1]--(Pt[1]+1.5cm*unitvector(Pt[2]-Pt[1])) withpen pencircle scaled 1.25;
+    % Labelisation
+    for k=2 upto BLong:
+    if (demidroite(1/1000[Pt[k-1],Pt[k]],Pt[k]) intersectiontimes cote[1])<>(-1,-1):
+    dotlabel.bot(TEX(substring(k-1,k) of #1),Pt[k]);
+    elseif (demidroite(1/1000[Pt[k-1],Pt[k]],Pt[k]) intersectiontimes cote[2])<>(-1,-1):
+    dotlabel.rt(TEX(substring(k-1,k) of #1),Pt[k]);
+    elseif (demidroite(1/1000[Pt[k-1],Pt[k]],Pt[k]) intersectiontimes cote[3])<>(-1,-1):
+    dotlabel.top(TEX(substring(k-1,k) of #1),Pt[k]);
+    elseif (demidroite(1/1000[Pt[k-1],Pt[k]],Pt[k]) intersectiontimes cote[4])<>(-1,-1):
+    dotlabel.lft(TEX(substring(k-1,k) of #1),Pt[k]);
+    fi;
+    endfor;
+    for k=1 upto nbfaux:
+    if (demidroite(Co,FauxPt[k]) intersectiontimes cote[1])<>(-1,-1):
+    dotlabel.bot(TEX(ChoixLettre),FauxPt[k]);
+    elseif (demidroite(Co,FauxPt[k]) intersectiontimes cote[2])<>(-1,-1):
+    dotlabel.rt(TEX(ChoixLettre),FauxPt[k]);
+    elseif (demidroite(Co,FauxPt[k]) intersectiontimes cote[3])<>(-1,-1):
+    dotlabel.top(TEX(ChoixLettre),FauxPt[k]);
+    elseif (demidroite(Co,FauxPt[k]) intersectiontimes cote[4])<>(-1,-1):
+    dotlabel.lft(TEX(ChoixLettre),FauxPt[k]);
+    fi;
+    endfor;
+    picture Reponse;
+    Reponse=image(
+    trace segment((0,0),(7*BLong*mm-2mm,0)) dashed dashpattern(on5mm off2mm);
+    );
+    trace Reponse shifted((xpart(Co),5mm)-center Reponse);    
+  \end{Geometrie}%
+}%
+
+\def\MPBilliardSolution#1#2#3{%
+  \mplibcodeinherit{enable}%
+  \begin{mplibcode}%
+    Figure(0,0,\useKV[ClesBilliard]{Longueur}+2cm,\useKV[ClesBilliard]{Largeur}+3cm);
+    trace rec;
+    % Tracés
+    drawarrow Pt[1]--(Pt[1]+1.5cm*unitvector(Pt[2]-Pt[1])) withpen pencircle scaled 1.25;
+    for k=1 upto BLong-1:
+    trace segment(Pt[k],Pt[k+1]);
+    endfor;
+    if Vrai=false:
+    for k=2 upto BLong-1:
+    trace codeperp(Pt[k-1],Pt[k],Pt[k+1],5);
+    endfor;
+    fi;
+    % Labelisation
+    if l1>3:
+    dotlabel.lft(TEX(substring(0,1) of #1),Pt[1]);
+    elseif l1>2:
+    dotlabel.top(TEX(substring(0,1) of #1),Pt[1]);
+    elseif l1>1:
+    dotlabel.rt(TEX(substring(0,1) of #1),Pt[1]);
+    else:
+    dotlabel.bot(TEX(substring(0,1) of #1),Pt[1]);
+    fi;
+    for k=2 upto BLong:
+    if (demidroite(1/1000[Pt[k-1],Pt[k]],Pt[k]) intersectiontimes cote[1])<>(-1,-1):
+    dotlabel.bot(TEX(substring(k-1,k) of #1),Pt[k]);
+    elseif (demidroite(1/1000[Pt[k-1],Pt[k]],Pt[k]) intersectiontimes cote[2])<>(-1,-1):
+    dotlabel.rt(TEX(substring(k-1,k) of #1),Pt[k]);
+    elseif (demidroite(1/1000[Pt[k-1],Pt[k]],Pt[k]) intersectiontimes cote[3])<>(-1,-1):
+    dotlabel.top(TEX(substring(k-1,k) of #1),Pt[k]);
+    elseif (demidroite(1/1000[Pt[k-1],Pt[k]],Pt[k]) intersectiontimes cote[4])<>(-1,-1):
+    dotlabel.lft(TEX(substring(k-1,k) of #1),Pt[k]);
+    fi;
+    endfor;
+    trace Reponse shifted((xpart(Co),5mm)-center Reponse);
+    % On affiche les lettres de la réponse.
+    for k=1 upto BLong:
+    label.top(TEX(substring(k-1,k) of #1),((xpart(Co),5mm)-center Reponse)+(k-1)*(7mm,0)+(2.5mm,0));
+    endfor;
+  \end{mplibcode}%
+  \mplibcodeinherit{disable}%
+}%
+
+%%%
 % Représenter un entier
 %%%
 \setKVdefault[ClesREntier]{Echelle=1,Unite=false,Compact=false,Impression=false,ListeCouleurs={Tomato,LightSteelBlue,LightGreen,Cornsilk}}%
@@ -420,9 +847,6 @@
       for k=0 upto 10:
       trace chemin((k/10)[A,F],(k/10)[B,G],(k/10)[C,H]);
       endfor;
-      %if Compact:
-      %trace chemin(B,B+(0,0,-0.2)) dashed evenly withpen pencircle scaled 1.25;
-      %fi;
       );
       color A,B,C,D,E,F,G,H;
       TypePave1=image(
@@ -436,9 +860,6 @@
       for k=0 upto 10:
       trace chemin((k/10)[A,F],(k/10)[B,G],(k/10)[C,H]);
       endfor;
-      %if Compact:
-      %trace chemin(B,B+(0,0,-0.2)) dashed evenly withpen pencircle scaled 1.25;
-      %fi;
       );
       color A,B,C,D,E,F,G,H;
       TypePave2=image(
@@ -451,9 +872,6 @@
       for k=0 upto 10:
       trace chemin((k/10)[A,F],(k/10)[B,G],(k/10)[C,H]);
       endfor;
-      %if Compact:
-      %trace chemin(B,B+(0,0,-0.2)) dashed evenly withpen pencircle scaled 1.25;
-      %fi;
       );
       color A,B,C,D,E,F,G,H;
       TypePave3=image(
@@ -553,13 +971,17 @@
   RAZ=false,%Pour remettre à zéro le compteur des questions
   Ordre=false,%Pour mettre toutes les questions dans l'ordre des numéros
   Exercice=false,%Pour utiliser l'aléatoire des questions mais sans habillage particulier, autre que des \item
-  Perso=false,%Pour que utiliser un choix personnel des questions
+  Perso=false,%Pour utiliser un choix personnel des questions
   Lecture=false,%Pour différencier avec une lecture automatisée sur les numéros de fichiers
   Maitre=false,%Pour indiquer qu'on prend en compte ou pas les sous-dossiers
   Nom=false,%Pour afficher le nom des fichiers utilisés.
-  Theme=false,%Pour afficher le theme travaillé dans les fichiers utilisés.
+  Theme=false,%Pour afficher le theme travaillé dans les fichiers utilisés (à retravailler).
   AMC=false,%
-  Multi=false%
+  Multi=false,%
+  CAN=false,%Pour compléter la case réponse.
+  CoefQ=0.4,%Coefficient multiplication de \linewidth pour la colonne question
+  CoefR=0.35,%Coefficient multiplication de \linewidth pour la colonne réponse
+  CoefJ=0.15,%Coefficient multiplication de \linewidth pour la colonne jury
 }%
 \defKV[ClesCN]{Liste=\setKV[ClesCN]{Perso=true}\setKV[ClesCN]{Lecture}}%
 \defKV[ClesCN]{Dossier=\setKV[ClesCN]{Lecture}}%
@@ -568,11 +990,11 @@
 \readlist*\ListeMotsCAN{La moitié de /2,Le double de /1,Le triple de /1, Le tiers de /3,Le nombre dix fois plus grand que /1,Le nombre cent fois plus grand que /1,Le nombre mille fois plus grand que /1,Le nombre dix fois plus petit que /10,Le nombre cent fois plus petit que /100,Le nombre mille fois plus petit que /1000}%
 \readlist*\ListeMulAstucieuxCAN{50/2,25/4,20/5}%
 \readlist*\ListeLieuxObjetsCAN{boulangerie/pains au chocolat/un pain au chocolat,boulangerie/cookies/un cookie,boulangerie/brioches/une brioche,piscine/entrées/une entrée,boucherie/saucisses/une saucisse,boucherie/cuisses de poulet/une cuisse de poulet}%
-\readlist*\ListeNomsCAN{Aude/Elle,Bernard/Il,Céline/Elle,Daniel/Il,Elise/Elle,Fabien/Il,Gérard/Il,Hélène/Elle,Ilies/Il,Jasmine/Elle,Kylian/Il,Laurent/Il,Mathilde/Elle,Nina/Elle,Octave/Il,Philippe/Il,Joachim/Il,Thérèse/Elle,Nawel/Elle,Alexandre/Il,Maxence/Il,Sophie/Elle,Christophe/Il,Myriam/Elle}%
+\readlist*\ListeNomsCAN{Aude/Elle/d'Aude,Bernard/Il/de Bernard,Céline/Elle/de Céline,Daniel/Il/de Daniel,\'Elise/Elle/d'\'Elise,Fabien/Il/de Fabien,Gérard/Il/de Gérard,Hélène/Elle/d'Hélène,Ilies/Il/d'Ilies,Jasmine/Elle/de Jasmine,Kylian/Il/de Kylian,Laurent/Il/de Laurent,Mathilde/Elle/de Mathilde,Nina/Elle/de Nina,Octave/Il/d'Octave,Philippe/Il/de Philippe,Joachim/Il/de Joachim,Thérèse/Elle/de Thérèse,Nawel/Elle/de Nawel,Alexandre/Il/d'Alexandre,Maxence/Il/de Maxence,Sophie/Elle/de Sophie,Christophe/Il/de Christophe,Myriam/Elle/de Myriam,Nathalie/Elle/de Nathalie}%
 \readlist*\ListeComposantStatCAN{voitures/un garage/Cross-over/Utilitaires/Berlines,fruits/une corbeille/Pommes/Oranges/Bananes,vêtements/une armoire/Pulls/T-shirts/Chemises,couverts/un tiroir/Fourchettes/Couteaux/Cuillères}%
 \readlist*\ListeObjetsSymbolesCAN{fleurs/96,ciseaux/36,crayons/47,enveloppes/41}%uniquement avec pifont
 \setsepchar{,}%
-\readlist*\ListeObjetsCAN{bonbons,billes,jouets,fruits,biscuits,gâteaux,pommes,poires}
+\readlist*\ListeObjetsCAN{bonbons,billes,jouets,fruits,biscuits,gâteaux,pommes,poires,pains au chocolat,cookies,croissants,muffins,brioches,saucisses,cuisses de poulet}%
 \readlist*\ListePetitsObjetsCAN{bonbons,billes,biscuits,gommes,clous,vis}
 \readlist*\ListeFruitsCAN{pommes,poires,abricots,cerises,fraises,framboises,noix,pêches,nectarines,myrtilles}
 \readlist*\ListeSommetsCAN{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}
@@ -586,6 +1008,15 @@
   \readlist*\PetitsObjetsMelanges{\faa}%
 }%
 
+\newcommand\ExtraitObjets[1]{%
+  \xdef\CANSGFoo{}%
+  \foreachitem\compteur\in\ListeObjetsCAN{%
+    \xdef\CANSGFoo{\CANSGFoo \ListeObjetsCAN[\compteurcnt],}%
+  }%
+  \MelangeListe{\CANSGFoo}{#1}%
+  \readlist*\ObjetsMelanges{\faa}%
+}%
+
 \newcommand\ExtraitSymboles[1]{%
   \xdef\CANSGFoo{}%
   \foreachitem\compteur\in\ListeObjetsSymbolesCAN{%
@@ -726,9 +1157,13 @@
 \makeatother
 
 \newcommand\CNTheme[1]{}%
+\newcommand\CNReponse{}%
+
+\newlength{\PfCLargeurQuestion}%
+\newlength{\PfCLargeurReponse}%
+\newlength{\PfCLargeurJury}%
 
 \NewDocumentCommand\CourseNombre{o m}{%
-  \setKV[ClesMathAlea]{NbQ=1}%
   \useKVdefault[ClesCN]%
   \setKV[ClesCN]{#1}%
   \ifboolKV[ClesCN]{Theme}{\renewcommand\CNTheme[1]{{\ttfamily Thème : ##1}\par}}{}%
@@ -768,6 +1203,9 @@
       \xdef\CNfooListe{\CNfooListe ##1,}%
     }%
     %    % \par OK -> normalement, on a la liste du nombre de questions : \CNfooListe
+    % On règle maintenant les dimensions nécessaires.
+    % \ifboolKV[ClesCN]{CAN}{
+    \setlength{\PfCLargeurQuestion}{\useKV[ClesCN]{CoefQ}\linewidth}\setlength{\PfCLargeurReponse}{\useKV[ClesCN]{CoefR}\linewidth}\setlength{\PfCLargeurJury}{\useKV[ClesCN]{CoefJ}\linewidth}%
     %    % On affiche les questions :
     \ifboolKV[ClesCN]{Ordre}{%
       %        % soit dans un exercice
@@ -778,13 +1216,13 @@
         }%
       }{% Soit toutes les questions au format course
         \renewcommand{\arraystretch}{\useKV[ClesCN]{Stretch}}%
-        \begin{longtable}{|c|p{0.7\linewidth}|p{0.1\linewidth}|p{0.05\linewidth}|}%
+        \begin{longtable}{|c|p{\PfCLargeurQuestion}|>{\centering\arraybackslash}p{\PfCLargeurReponse}|p{\PfCLargeurJury}|}%
           \hhline{~---}%
           \multicolumn{1}{c|}{}&\cellcolor{gray!15}\centering\'Enoncé&\cellcolor{gray!15}\centering Réponse&\cellcolor{gray!15}\centering\arraybackslash Jury\\%
           \hline%
           \endhead%
           \xintFor* ##1 in {\xintSeq{1}{\ListeFichierslen}}\do{%
-            \ttfamily{\theCNNumQ}\stepcounter{CNNumQ}&\input{\ListeFichiers[##1]}\ifboolKV[ClesCN]{Nom}{\par\hfill\footnotesize\ttfamily\ListeFichiers[##1]}{}&&\\%
+            \ttfamily{\theCNNumQ}\stepcounter{CNNumQ}&\xdef\CNReponse{}\input{\ListeFichiers[##1]}\ifboolKV[ClesCN]{Nom}{\par\hfill\footnotesize\ttfamily\ListeFichiers[##1]}{}&\ifboolKV[ClesCN]{CAN}{\CNReponse}{}&\\%
             \hline%
           }%
         \end{longtable}%
@@ -793,7 +1231,7 @@
     }{%
       % On prévient l'utilisateur si le nb de questions est inférieur à NbQ
       \xintifboolexpr{\ListeFichierslen<\useKV[ClesCN]{NbQ}}{%
-        \faExclamationCircle~Le nombre maximal de questions est inférieur au nombre de questions à afficher. Modifier la clé {\ttfamily NbQ} ou ajouter des questions dans le(s) répertoire(s).%
+        \faExclamationCircle~Le nombre maximal de questions disponibles est inférieur au nombre de questions à afficher. Modifier la clé {\ttfamily NbQ} ou ajouter des questions dans le(s) répertoire(s).%
       }{%%On choisit NbQ questions parmi la liste de fichiers
         \MelangeListe{\CNfooListe}{\useKV[ClesCN]{NbQ}}%
         \setsepchar{,}\ignoreemptyitems%
@@ -804,13 +1242,13 @@
           }%
         }{% On les affiche
           \renewcommand{\arraystretch}{\useKV[ClesCN]{Stretch}}%
-          \begin{longtable}{|c|p{0.7\linewidth}|p{0.1\linewidth}|p{0.05\linewidth}|}%
+          \begin{longtable}{|c|p{\PfCLargeurQuestion}|>{\centering\arraybackslash}p{\PfCLargeurReponse}|p{\PfCLargeurJury}|}%
             \hhline{~---}%
             \multicolumn{1}{c|}{}&\cellcolor{gray!15}\centering\'Enoncé&\cellcolor{gray!15}\centering Réponse&\cellcolor{gray!15}\centering\arraybackslash Jury\\%
             \hline%
             \endhead%
             \xintFor* ##1 in {\xintSeq{1}{\useKV[ClesCN]{NbQ}}}\do{%
-              \ttfamily{\theCNNumQ}\stepcounter{CNNumQ}&\xdef\Numerodelaquestionaposer{\ListeCNQuestions[##1]}\input{\ListeFichiers[\Numerodelaquestionaposer]}\ifboolKV[ClesCN]{Nom}{\par\hfill\footnotesize\ttfamily\ListeFichiers[##1]}{}&&\\
+              \ttfamily{\theCNNumQ}\stepcounter{CNNumQ}&\xdef\CNReponse{}\xdef\Numerodelaquestionaposer{\ListeCNQuestions[##1]}\input{\ListeFichiers[\Numerodelaquestionaposer]}\ifboolKV[ClesCN]{Nom}{\par\hfill\footnotesize\ttfamily\ListeFichiers[##1]}{}&\ifboolKV[ClesCN]{CAN}{\CNReponse}{}&\\
               \hline
             }%
           \end{longtable}%
@@ -1122,8 +1560,7 @@
 
 %%%
 % Smiley
-%%%
-%%https://tex.stackexchange.com/questions/3695/smileys-in-latex/227226
+%%% https://tex.stackexchange.com/questions/3695/smileys-in-latex/227226
 \tikzset{face/.style={shape=circle,minimum size=4ex,shading=radial,outer sep=0pt, inner color=white!50!yellow,outer color= yellow!70!orange}}
 
 \newcommand\emoticon[2][]{%
@@ -2380,7 +2817,7 @@ transform canvas={xshift=0em,yshift=0em}},rectangle,rounded corners,ultra thick,
   \end{center}
 }
 
-\newcommand\BonSortie[5][]{%
+\NewDocumentCommand\BonSortie{o m m m m}{%
   \clearpage%
   \useKVdefault[ClesSortie]%
   \setKV[ClesSortie]{#1}%
@@ -2545,22 +2982,138 @@ transform canvas={xshift=0em,yshift=0em}},rectangle,rounded corners,ultra thick,
 %%%
 % Pyramide de calculs
 %%%
+\newcommand\DessinePyramideNombreMul[1]{%
+  \ifluatex
+  \mplibforcehmode
+  \begin{mplibcode}
+    pair A[],B[],O;
+    cote:=\useKV[ClesPyramide]{Cote};
+    boolean Aide,Produit,Solution,Vide;
+    Aide:=\useKV[ClesPyramide]{Aide};
+    Vide:=\useKV[ClesPyramide]{Vide};
+    Produit:=\useKV[ClesPyramide]{Produit};
+    Solution:=\useKV[ClesPyramide]{Solution};
+    A1=u*(1,1);
+    A2-A1=cote*(1,0);
+    A3=rotation(A2,A1,60);
+    A4=A1;
+    B1=iso(A1,A2);
+    B2=iso(A2,A3);
+    B3=iso(A3,A1);
+    O=iso(A1,A2,A3);
+    path BoiteRec;
+    BoiteRec=((-0.4,-0.5)--(0.4,-0.5){dir0}..{dir90}(0.5,-0.4)--(0.5,0.4){dir90}..{dir180}(0.4,0.5)--(-0.4,0.5){dir180}..{dir-90}(-0.5,0.4)--(-0.5,-0.4){dir-90}..cycle) scaled 1u;
+    % On trace et on affiche...éventuellement :)
+    trace polygone(A1,A2,A3);
+    for k=1 upto 3:
+    trace segment(O,B[k]) dashed withdots scaled 0.25;
+    draw BoiteRec shifted (1.75[O,B[k]]-center BoiteRec) dashed evenly scaled 0.5;
+    endfor;
+    if Vide:
+    else:
+    % On récupère les valeurs pour déterminer les produits
+    k=0;
+    for p_=#1:
+    k:=k+1;
+    Facteur[k]=p_;
+    endfor;
+    Produit[1]=Facteur[1] * Facteur[2];
+    Produit[2]=Facteur[2] * Facteur[3];
+    Produit[3]=Facteur[3] * Facteur[1];
+    for k=1 upto 3:
+    if Produit or Solution:
+    label(TEX("\num{"&decimal(Produit[k])&"}"),(1.75[O,B[k]]-center BoiteRec));
+    fi;
+    if Produit:
+    else:
+    label(TEX("\num{"&decimal(Facteur[k])&"}"),(0.5[O,A[k]]-center BoiteRec));
+    fi;
+    endfor;
+    fi;
+    if Aide:
+    for k=1 upto 3:
+    drawarrow (0.5[O,A[k]]--1.75[O,B[k]]) cutbefore segment(A[k],A[k+1]) cutafter BoiteRec shifted (1.75[O,B[k]]-center BoiteRec) dashed evenly scaled 0.5;
+    drawarrow (0.5[O,A[k+1]]--1.75[O,B[k]]) cutbefore segment(A[k],A[k+1]) cutafter BoiteRec shifted (1.75[O,B[k]]-center BoiteRec) dashed evenly scaled 0.5;
+    endfor;
+    fi;
+  \end{mplibcode}
+  \else
+  \begin{mpost}[mpsettings={cote:=\useKV[ClesPyramide]{Cote};
+      boolean Aide,Produit,Solution,Vide;
+      Aide:=\useKV[ClesPyramide]{Aide};
+      Vide:=\useKV[ClesPyramide]{Vide};
+      Produit:=\useKV[ClesPyramide]{Produit};
+      Solution:=\useKV[ClesPyramide]{Solution};}]
+    pair A[],B[],O;
+    A1=u*(1,1);
+    A2-A1=cote*(1,0);
+    A3=rotation(A2,A1,60);
+    A4=A1;
+    B1=iso(A1,A2);
+    B2=iso(A2,A3);
+    B3=iso(A3,A1);
+    O=iso(A1,A2,A3);
+    path BoiteRec;
+    BoiteRec=((-0.4,-0.5)--(0.4,-0.5){dir0}..{dir90}(0.5,-0.4)--(0.5,0.4){dir90}..{dir180}(0.4,0.5)--(-0.4,0.5){dir180}..{dir-90}(-0.5,0.4)--(-0.5,-0.4){dir-90}..cycle) scaled 1u;
+    % On trace et on affiche...éventuellement :)
+    trace polygone(A1,A2,A3);
+    for k=1 upto 3:
+    trace segment(O,B[k]) dashed withdots scaled 0.25;
+    draw BoiteRec shifted (1.75[O,B[k]]-center BoiteRec) dashed evenly scaled 0.5;
+    endfor;
+    if Vide:
+    else:
+    % On récupère les valeurs pour déterminer les produits
+    k=0;
+    for p_=#1:
+    k:=k+1;
+    Facteur[k]=p_;
+    endfor;
+    Produit[1]=Facteur[1] * Facteur[2];
+    Produit[2]=Facteur[2] * Facteur[3];
+    Produit[3]=Facteur[3] * Facteur[1];
+    for k=1 upto 3:
+    if Produit or Solution:
+    label(TEX("\num{"&decimal(Produit[k])&"}"),(1.75[O,B[k]]-center BoiteRec));
+    fi;
+    if Produit:
+    else:
+    label(TEX("\num{"&decimal(Facteur[k])&"}"),(0.5[O,A[k]]-center BoiteRec));
+    fi;
+    endfor;
+    fi;
+    if Aide:
+    for k=1 upto 3:
+    drawarrow (0.5[O,A[k]]--1.75[O,B[k]]) cutbefore segment(A[k],A[k+1]) cutafter BoiteRec shifted (1.75[O,B[k]]-center BoiteRec) dashed evenly scaled 0.5;
+    drawarrow (0.5[O,A[k+1]]--1.75[O,B[k]]) cutbefore segment(A[k],A[k+1]) cutafter BoiteRec shifted (1.75[O,B[k]]-center BoiteRec) dashed evenly scaled 0.5;
+    endfor;
+    fi;
+  \end{mpost}
+  \fi
+}
+
 \newcommand\DessinePyramideNombre[1]{%
   \ifluatex
   \mplibforcehmode
   \begin{mplibcode}
     pair A[][],B[];
+    path Case[];
+    color CaseCouleur;
     nbetages:=\useKV[ClesPyramide]{Etages};
     largeur:=\useKV[ClesPyramide]{Largeur};
     hauteur:=\useKV[ClesPyramide]{Hauteur};
+    CaseCouleur:=\useKV[ClesPyramide]{Couleur};
+    boolean Double;
+    Double=\useKV[ClesPyramide]{Double};
     Nbeb:=0;%Pour associer les textes avec les points. Plus facile :)
-    if \useKV[ClesPyramide]{Double}:
+    if Double:
     for k=nbetages downto 1:
     for l=0 upto (k-1):
     Nbeb:=Nbeb+1;
     A[k][l]=(0,0)+(nbetages-k)*(largeur/2,0)+(l*largeur,(nbetages-k)*hauteur);
     B[Nbeb]=A[k][l];
-    trace ((unitsquare xscaled largeur) yscaled hauteur) shifted (A[k][l]-0.5*(largeur,hauteur));
+    Case[Nbeb]=((unitsquare xscaled largeur) yscaled hauteur) shifted (A[k][l]-0.5*(largeur,hauteur));
+    trace Case[Nbeb];
     endfor;
     endfor;
     for k=nbetages-1 downto 1:
@@ -2568,7 +3121,8 @@ transform canvas={xshift=0em,yshift=0em}},rectangle,rounded corners,ultra thick,
     Nbeb:=Nbeb+1;
     A[-k][l]=(0,0)+(nbetages-k)*(largeur/2,0)+(l*largeur,-(nbetages-k)*hauteur);
     B[Nbeb]=A[-k][l];
-    trace ((unitsquare xscaled largeur) yscaled hauteur) shifted (A[-k][l]-0.5*(largeur,hauteur));
+    Case[Nbeb]=((unitsquare xscaled largeur) yscaled hauteur) shifted (A[-k][l]-0.5*(largeur,hauteur));
+    trace Case[Nbeb];
     endfor;
     endfor;
     else:
@@ -2582,7 +3136,8 @@ transform canvas={xshift=0em,yshift=0em}},rectangle,rounded corners,ultra thick,
     Nbeb:=Nbeb+1;
     A[k][l]=(0,0)+(nbetages-k)*(largeur/2,0)+(l*largeur,change*(nbetages-k)*hauteur);
     B[Nbeb]=A[k][l];
-    trace ((unitsquare xscaled largeur) yscaled hauteur) shifted (A[k][l]-0.5*(largeur,hauteur));
+    Case[Nbeb]=((unitsquare xscaled largeur) yscaled hauteur) shifted (A[k][l]-0.5*(largeur,hauteur));
+    trace Case[Nbeb];
     endfor;
     endfor;
     fi;
@@ -2591,15 +3146,41 @@ transform canvas={xshift=0em,yshift=0em}},rectangle,rounded corners,ultra thick,
     Nbeb:=0;
     for p_=#1:
     Nbeb:=Nbeb+1;
-    label(TEX(""&p_&""),B[Nbeb]);
-    endfor;
+    if (substring(0,1) of p_)="*":
+    fill Case[Nbeb] withcolor CaseCouleur;
+    trace Case[Nbeb];
+    label(TEX(substring(1,length p_) of p_),B[Nbeb]);
+    else:
+    label(TEX(p_),B[Nbeb]);
     fi;
+    endfor;
   \end{mplibcode}
   \else
-  \begin{mpost}[mpsettings={nbetages:=\useKV[ClesPyramide]{Etages};largeur:=\useKV[ClesPyramide]{Largeur};hauteur:=\useKV[ClesPyramide]{Hauteur};boolean Vide;Vide=\useKV[ClesPyramide]{Vide};boolean Inverse;Inverse=\useKV[ClesPyramide]{Inverse};}]
+  \begin{mpost}[mpsettings={nbetages:=\useKV[ClesPyramide]{Etages};largeur:=\useKV[ClesPyramide]{Largeur};hauteur:=\useKV[ClesPyramide]{Hauteur};boolean Vide;Vide=\useKV[ClesPyramide]{Vide};boolean Inverse;Inverse=\useKV[ClesPyramide]{Inverse};color CaseCouleur; CaseCouleur:=\useKV[ClesPyramide]{Couleur};boolean Double;Double=\useKV[ClesPyramide]{Double};}]
     pair A[][],B[];
+    path Case[];
     Nbeb:=0;
-    if Inverse:
+    if Double:
+    for k=nbetages downto 1:
+    for l=0 upto (k-1):
+    Nbeb:=Nbeb+1;
+    A[k][l]=(0,0)+(nbetages-k)*(largeur/2,0)+(l*largeur,(nbetages-k)*hauteur);
+    B[Nbeb]=A[k][l];
+    Case[Nbeb]=((unitsquare xscaled largeur) yscaled hauteur) shifted (A[k][l]-0.5*(largeur,hauteur));
+    trace Case[Nbeb];
+    endfor;
+    endfor;
+    for k=nbetages-1 downto 1:
+    for l=0 upto (k-1):
+    Nbeb:=Nbeb+1;
+    A[-k][l]=(0,0)+(nbetages-k)*(largeur/2,0)+(l*largeur,-(nbetages-k)*hauteur);
+    B[Nbeb]=A[-k][l];
+    Case[Nbeb]=((unitsquare xscaled largeur) yscaled hauteur) shifted (A[-k][l]-0.5*(largeur,hauteur));
+    trace Case[Nbeb];
+    endfor;
+    endfor;
+    else:
+    if \useKV[ClesPyramide]{Inverse}:
     change:=-1;
     else:
     change=1;
@@ -2609,46 +3190,65 @@ transform canvas={xshift=0em,yshift=0em}},rectangle,rounded corners,ultra thick,
     Nbeb:=Nbeb+1;
     A[k][l]=(0,0)+(nbetages-k)*(largeur/2,0)+(l*largeur,change*(nbetages-k)*hauteur);
     B[Nbeb]=A[k][l];
-    trace ((unitsquare xscaled largeur) yscaled hauteur) shifted (A[k][l]-0.5(largeur,hauteur));
+    Case[Nbeb]=((unitsquare xscaled largeur) yscaled hauteur) shifted (A[k][l]-0.5*(largeur,hauteur));
+    trace Case[Nbeb];
     endfor;
     endfor;
-    Nbeb:=0;
-    if Vide:
+    fi;
+    if \useKV[ClesPyramide]{Vide}:
     else:
+    Nbeb:=0;
     for p_=#1:
     Nbeb:=Nbeb+1;
-    label(LATEX(""&p_&""),B[Nbeb]);
-    endfor;
+    if (substring(0,1) of p_)="*":
+    fill Case[Nbeb] withcolor CaseCouleur;
+    trace Case[Nbeb];
+    label(LATEX(substring(1,length p_) of p_),B[Nbeb]);
+    else:
+    label(LATEX(p_),B[Nbeb]);
     fi;
+    endfor;
   \end{mpost}
   \fi
 }
 
-\setKVdefault[ClesPyramide]{Etages=5,Largeur=2cm,Hauteur=1cm,Vide=false,Inverse=false,Double=false}%
+\setKVdefault[ClesPyramide]{Etages=5,Largeur=2cm,Hauteur=1cm,Vide=false,Inverse=false,Double=false,Couleur=Crimson,Multiplication=false,Produit=false,Solution=false,Aide=false,Cote=4cm}%
 
 \newtoks\toklistecaseP%
 \def\UpdatetoksPyramide#1\nil{\addtotok\toklistecaseP{"#1",}}%
+\def\UpdatetoksPyramideMul#1\nil{\addtotok\toklistecaseP{#1,}}%
 
-\newcommand\PyramideNombre[2][]{%
+\DeclareDocumentCommand\PyramideNombre{o m}{%
   \useKVdefault[ClesPyramide]%
   \setKV[ClesPyramide]{#1}%
-  \ifx\bla#2\bla%
-  \setKV[ClesPyramide]{Vide=true}%
-  \DessinePyramideNombre{\the\toklistecaseP}%
-  \else%
-  \setsepchar{,}%
-  \readlist*\ListePyramide{#2}%
-  \ifboolKV[ClesPyramide]{Double}{%
-    \def\CalculNombreComposants{\fpeval{\useKV[ClesPyramide]{Etages}*\useKV[ClesPyramide]{Etages}}}%
+  \ifboolKV[ClesPyramide]{Multiplication}{%
+    \ifx\bla#2\bla%
+    \setKV[ClesPyramide]{Vide=true}%
+    \DessinePyramideNombreMul{\the\toklistecaseP}%
+    \else
+    \setsepchar{,}%
+    \readlist*\ListePyramide{#2}%
+    \DessinePyramideNombreMul{\ListePyramide[1],\ListePyramide[2],\ListePyramide[3]}%
+    \fi
   }{%
-    \def\CalculNombreComposants{\fpeval{\useKV[ClesPyramide]{Etages}*(\useKV[ClesPyramide]{Etages}+1)/2}}%
-  }%
-  \xintifboolexpr{\ListePyramidelen==\CalculNombreComposants}{%
-    \toklistecaseP{}%
-    \foreachitem\compteur\in\ListePyramide{\expandafter\UpdatetoksPyramide\compteur\nil}%
+    \ifx\bla#2\bla%
+    \setKV[ClesPyramide]{Vide=true}%
     \DessinePyramideNombre{\the\toklistecaseP}%
-  }{Le nombre d'éléments dans la liste des propositions n'est pas compatible avec le nombre d'étages choisi.}%
-  \fi%
+    \else%
+    \setsepchar{,}%
+    \readlist*\ListePyramide{#2}%
+    \ifboolKV[ClesPyramide]{Double}{%
+      \def\CalculNombreComposants{\fpeval{\useKV[ClesPyramide]{Etages}*\useKV[ClesPyramide]{Etages}}}%
+    }{%
+      \def\CalculNombreComposants{\fpeval{\useKV[ClesPyramide]{Etages}*(\useKV[ClesPyramide]{Etages}+1)/2}}%
+    }%
+    \xintifboolexpr{\ListePyramidelen==\CalculNombreComposants}{%
+      \toklistecaseP{}%
+      \foreachitem\compteur\in\ListePyramide{\expandafter\UpdatetoksPyramide\compteur\nil}%
+      \DessinePyramideNombre{\the\toklistecaseP}%
+    }{Le nombre d'éléments dans la liste des propositions n'est pas compatible avec le nombre d'étages choisi.}%
+    \fi%
+  }%
 }%
 
 %%%
@@ -3475,7 +4075,6 @@ transform canvas={xshift=0em,yshift=0em}},rectangle,rounded corners,ultra thick,
 
 \newcommand\TraceLabyNombre[6]{%
   \mplibforcehmode%
-  \mplibcodeinherit{enable}%\xintifboolexpr{#6==false}{\mplibcodeinherit{enable}}{}
   \begin{mplibcode}
     input PfCLabyNombre;
 
@@ -3558,6 +4157,7 @@ transform canvas={xshift=0em,yshift=0em}},rectangle,rounded corners,ultra thick,
 
 \newcommand\TraceSolution[6]{%
   \mplibforcehmode%
+  \mplibcodeinherit{enable}%\xintifboolexpr{#6==false}{\mplibcodeinherit{enable}}{}
   \begin{mplibcode}
     picture CorpsSolution;
     CorpsSolution=image(
@@ -6430,7 +7030,7 @@ couleur indiquée, le nombre de cases donné par le résultat du calcul.
         \MPFractionTriangleH{\useKV[ClesFraction]{Longueur}}{\useKV[ClesFraction]{Parts}}{\ListeFraction[1]}{\ListeFraction[2]}{\useKV[ClesFraction]{Couleur}}{\useKV[ClesFraction]{Epaisseur}}%
       }{%
         \MPFractionTriangle{\useKV[ClesFraction]{Longueur}}{\useKV[ClesFraction]{Parts}}{\ListeFraction[1]}{\ListeFraction[2]}{\useKV[ClesFraction]{Couleur}}%
-      }
+      }%
   }{%
     \ifboolKV[ClesFraction]{Regulier}{%
       \ifboolKV[ClesFraction]{Reponse}{}{\setKV[ClesFraction]{Couleur=white}}%
@@ -6438,7 +7038,7 @@ couleur indiquée, le nombre de cases donné par le résultat du calcul.
         \MPFractionRegulierH{\useKV[ClesFraction]{Rayon}}{\useKV[ClesFraction]{Cotes}}{\ListeFraction[1]}{\ListeFraction[2]}{\useKV[ClesFraction]{Couleur}}{\useKV[ClesFraction]{Epaisseur}}%
       }{%
         \MPFractionRegulier{\useKV[ClesFraction]{Rayon}}{\useKV[ClesFraction]{Cotes}}{\ListeFraction[1]}{\ListeFraction[2]}{\useKV[ClesFraction]{Couleur}}%
-      }
+      }%
     }{%
       \ifboolKV[ClesFraction]{Segment}{%
         \ifboolKV[ClesFraction]{Reponse}{}{\setKV[ClesFraction]{Couleur=white}}%
@@ -6446,15 +7046,15 @@ couleur indiquée, le nombre de cases donné par le résultat du calcul.
           \MPFractionSegmentH{\useKV[ClesFraction]{Longueur}}{\ListeFraction[1]}{\ListeFraction[2]}{\useKV[ClesFraction]{Couleur}}{\useKV[ClesFraction]{Epaisseur}}%
         }{%
           \MPFractionSegment{\useKV[ClesFraction]{Longueur}}{\ListeFraction[1]}{\ListeFraction[2]}{\useKV[ClesFraction]{Couleur}}%
-        }
-      }{
+        }%
+      }{%
         \ifboolKV[ClesFraction]{Rectangle}{%rectangle
           \ifboolKV[ClesFraction]{Reponse}{}{\setKV[ClesFraction]{Couleur=white}}%
           \ifboolKV[ClesFraction]{Hachures}{%
             \MPFractionRectangleH{\useKV[ClesFraction]{Longueur}}{\useKV[ClesFraction]{Largeur}}{\ListeFraction[1]}{\ListeFraction[2]}{\useKV[ClesFraction]{Couleur}}{\useKV[ClesFraction]{Multiple}}{\useKV[ClesFraction]{Epaisseur}}%
           }{%
             \MPFractionRectangle{\useKV[ClesFraction]{Longueur}}{\useKV[ClesFraction]{Largeur}}{\ListeFraction[1]}{\ListeFraction[2]}{\useKV[ClesFraction]{Couleur}}{\useKV[ClesFraction]{Multiple}}%
-          }
+          }%
         }{%disque
           \ifboolKV[ClesFraction]{Reponse}{}{\setKV[ClesFraction]{Couleur=white}}%
           \ifboolKV[ClesFraction]{Hachures}{%
@@ -6534,139 +7134,143 @@ couleur indiquée, le nombre de cases donné par le résultat du calcul.
 \newlength{\LargeurQCM}%
 \newcounter{QuestionQCM}%
 \newcounter{TitreQCM}%
-\newcommand\QCM[2][]{%
-  \useKVdefault[ClesQCM]%
-  \setKV[ClesQCM]{#1}%
-  \setcounter{QuestionQCM}{\fpeval{\useKV[ClesQCM]{Depart}-1}}%
-  \setcounter{TitreQCM}{0}
-  \setsepchar[*]{,*&}\ignoreemptyitems%
-  \readlist*\ListeQCM{#2}%
-  \ifboolKV[ClesQCM]{Multiple}{%
-    \renewcommand{\arraystretch}{\useKV[ClesQCM]{Stretch}}%
-    \setlength{\LargeurQCM}{\fpeval{(\linewidth-\useKV[ClesQCM]{Reponses}*(3*\tabcolsep+\useKV[ClesQCM]{Largeur}))}pt}%
-    \xdef\NBcases{\fpeval{\useKV[ClesQCM]{Reponses}+1}}%
-    \xdef\ListeNom{\useKV[ClesQCM]{Noms}}%
-    \setsepchar[*]{/}%
-    \readlist*\ListeNomsMul{\ListeNom}%
-    \begin{tabular}{|p{\LargeurQCM}|*{\useKV[ClesQCM]{Reponses}}{>{\centering\arraybackslash}p{\useKV[ClesQCM]{Largeur}}|}}%
-      \cline{2-\NBcases}%
-      \multicolumn{1}{c|}{}\xintFor* ##2 in {\xintSeq {1}{\useKV[ClesQCM]{Reponses}}}\do{%
-      &\ListeNomsMul[##2]}%
-      \\
-      \hline%
-      \xintFor* ##1 in {\xintSeq {1}{\ListeQCMlen}}\do{%
-      \stepcounter{QuestionQCM}\ifboolKV[ClesQCM]{Alterne}{\modulo{\theQuestionQCM}{2}\ifnum\remainder=0\cellcolor{gray!15}\fi}{}\ifboolKV[ClesQCM]{Alph}{\textbf{\Alph{QuestionQCM}}/}{\textbf{\theQuestionQCM/}}~\ListeQCM[##1,1]\xintFor* ##2 in {\xintSeq {1}{\useKV[ClesQCM]{Reponses}}}\do{%
-      &\ifboolKV[ClesQCM]{Alterne}{\modulo{\theQuestionQCM}{2}\ifnum\remainder=0\cellcolor{gray!15}\fi}{}\ifboolKV[ClesQCM]{Solution}{\xintifboolexpr{\ListeQCM[##1,\fpeval{##2+1}]==1}{$\boxtimes$}{$\square$}}{$\square$}%
-        }\\
-      }%
-      \hline%
-    \end{tabular}%
-  }{%
-    \ifboolKV[ClesQCM]{VF}{%
-      \setKV[ClesQCM]{Reponses=2}
+\ifdef{\QCM}{%
+    \PackageWarning{ProfCollege}{La commande \noexpand\QCM étant définie par la classe du document, ProfCollege modifie sa commande \noexpand\QCM en \noexpand\QCMPfC.}%
+  \newcommand\QCMPfC[2][]{%
+    \useKVdefault[ClesQCM]%
+    \setKV[ClesQCM]{#1}%
+    \setcounter{QuestionQCM}{\fpeval{\useKV[ClesQCM]{Depart}-1}}%
+    \setcounter{TitreQCM}{0}
+    \setsepchar[*]{§*&}\ignoreemptyitems%
+    \readlist*\ListeQCM{#2}%
+    \ifboolKV[ClesQCM]{Multiple}{%
       \renewcommand{\arraystretch}{\useKV[ClesQCM]{Stretch}}%
       \setlength{\LargeurQCM}{\fpeval{(\linewidth-\useKV[ClesQCM]{Reponses}*(3*\tabcolsep+\useKV[ClesQCM]{Largeur}))}pt}%
       \xdef\NBcases{\fpeval{\useKV[ClesQCM]{Reponses}+1}}%
+      \xdef\ListeNom{\useKV[ClesQCM]{Noms}}%
+      \setsepchar[*]{/}%
+      \readlist*\ListeNomsMul{\ListeNom}%
       \begin{tabular}{|p{\LargeurQCM}|*{\useKV[ClesQCM]{Reponses}}{>{\centering\arraybackslash}p{\useKV[ClesQCM]{Largeur}}|}}%
         \cline{2-\NBcases}%
-        \multicolumn{1}{c|}{}&\useKV[ClesQCM]{NomV}&\useKV[ClesQCM]{NomF}\\
-        \hline%
-        \xintFor* ##1 in {\xintSeq {1}{\ListeQCMlen}}\do{%
-        \stepcounter{QuestionQCM}\ifboolKV[ClesQCM]{Alterne}{\modulo{\theQuestionQCM}{2}\ifnum\remainder=0\cellcolor{gray!15}\fi}{}\ifboolKV[ClesQCM]{Alph}{\textbf{\Alph{QuestionQCM}}/}{\textbf{\theQuestionQCM/}}~\ListeQCM[##1,1]\xintFor* ##2 in {\xintSeq {1}{\useKV[ClesQCM]{Reponses}}}\do{%
-                             &\ifboolKV[ClesQCM]{Alterne}{\modulo{\theQuestionQCM}{2}\ifnum\remainder=0\cellcolor{gray!15}\fi}{}\ifboolKV[ClesQCM]{Solution}{\xintifboolexpr{##2==\ListeQCM[##1,2]}{$\boxtimes$}{$\square$}}{$\square$}%
-                               }\\
-        }%
-        \hline%
-      \end{tabular}
-    }{%
-      \renewcommand{\arraystretch}{\useKV[ClesQCM]{Stretch}}%
-      \setlength{\LargeurQCM}{\fpeval{(\linewidth-\useKV[ClesQCM]{Reponses}*(3*\tabcolsep+\useKV[ClesQCM]{Largeur}))}pt}%
-      \xdef\NBcases{\fpeval{\useKV[ClesQCM]{Reponses}+1}}%
-      \begin{tabular}{|p{\LargeurQCM}|*{\useKV[ClesQCM]{Reponses}}{>{\centering\arraybackslash}p{\useKV[ClesQCM]{Largeur}}|}}%
-        \ifboolKV[ClesQCM]{Titre}{\cline{2-\NBcases}%
         \multicolumn{1}{c|}{}\xintFor* ##2 in {\xintSeq {1}{\useKV[ClesQCM]{Reponses}}}\do{%
-        &\stepcounter{TitreQCM}\useKV[ClesQCM]{Nom} \ifboolKV[ClesQCM]{AlphT}{\Alph{TitreQCM}}{##2}}%
+        &\ListeNomsMul[##2]}%
         \\
-        }{}
         \hline%
         \xintFor* ##1 in {\xintSeq {1}{\ListeQCMlen}}\do{%
         \stepcounter{QuestionQCM}\ifboolKV[ClesQCM]{Alterne}{\modulo{\theQuestionQCM}{2}\ifnum\remainder=0\cellcolor{gray!15}\fi}{}\ifboolKV[ClesQCM]{Alph}{\textbf{\Alph{QuestionQCM}}/}{\textbf{\theQuestionQCM/}}~\ListeQCM[##1,1]\xintFor* ##2 in {\xintSeq {1}{\useKV[ClesQCM]{Reponses}}}\do{%
-        &\ifboolKV[ClesQCM]{Alterne}{\modulo{\theQuestionQCM}{2}\ifnum\remainder=0\cellcolor{gray!15}\fi}{}\ifboolKV[ClesQCM]{Solution}{\xdef\NumeroReponse{\fpeval{\useKV[ClesQCM]{Reponses}+2}}\xintifboolexpr{##2==\ListeQCM[##1,\NumeroReponse]}{\cellcolor{\useKV[ClesQCM]{Couleur}}}{}}{}\ListeQCM[##1,##2+1]%
+        &\ifboolKV[ClesQCM]{Alterne}{\modulo{\theQuestionQCM}{2}\ifnum\remainder=0\cellcolor{gray!15}\fi}{}\ifboolKV[ClesQCM]{Solution}{\xintifboolexpr{\ListeQCM[##1,\fpeval{##2+1}]==1}{$\boxtimes$}{$\square$}}{$\square$}%
           }\\
         }%
         \hline%
       \end{tabular}%
+    }{%
+      \ifboolKV[ClesQCM]{VF}{%
+        \setKV[ClesQCM]{Reponses=2}
+        \renewcommand{\arraystretch}{\useKV[ClesQCM]{Stretch}}%
+        \setlength{\LargeurQCM}{\fpeval{(\linewidth-\useKV[ClesQCM]{Reponses}*(3*\tabcolsep+\useKV[ClesQCM]{Largeur}))}pt}%
+        \xdef\NBcases{\fpeval{\useKV[ClesQCM]{Reponses}+1}}%
+        \begin{tabular}{|p{\LargeurQCM}|*{\useKV[ClesQCM]{Reponses}}{>{\centering\arraybackslash}p{\useKV[ClesQCM]{Largeur}}|}}%
+          \cline{2-\NBcases}%
+          \multicolumn{1}{c|}{}&\useKV[ClesQCM]{NomV}&\useKV[ClesQCM]{NomF}\\
+          \hline%
+          \xintFor* ##1 in {\xintSeq {1}{\ListeQCMlen}}\do{%
+          \stepcounter{QuestionQCM}\ifboolKV[ClesQCM]{Alterne}{\modulo{\theQuestionQCM}{2}\ifnum\remainder=0\cellcolor{gray!15}\fi}{}\ifboolKV[ClesQCM]{Alph}{\textbf{\Alph{QuestionQCM}}/}{\textbf{\theQuestionQCM/}}~\ListeQCM[##1,1]\xintFor* ##2 in {\xintSeq {1}{\useKV[ClesQCM]{Reponses}}}\do{%
+                               &\ifboolKV[ClesQCM]{Alterne}{\modulo{\theQuestionQCM}{2}\ifnum\remainder=0\cellcolor{gray!15}\fi}{}\ifboolKV[ClesQCM]{Solution}{\xintifboolexpr{##2==\ListeQCM[##1,2]}{$\boxtimes$}{$\square$}}{$\square$}%
+                                 }\\
+          }%
+          \hline%
+        \end{tabular}
+      }{%
+        \renewcommand{\arraystretch}{\useKV[ClesQCM]{Stretch}}%
+        \setlength{\LargeurQCM}{\fpeval{(\linewidth-\useKV[ClesQCM]{Reponses}*(3*\tabcolsep+\useKV[ClesQCM]{Largeur}))}pt}%
+        \xdef\NBcases{\fpeval{\useKV[ClesQCM]{Reponses}+1}}%
+        \begin{tabular}{|p{\LargeurQCM}|*{\useKV[ClesQCM]{Reponses}}{>{\centering\arraybackslash}p{\useKV[ClesQCM]{Largeur}}|}}%
+          \ifboolKV[ClesQCM]{Titre}{\cline{2-\NBcases}%
+          \multicolumn{1}{c|}{}\xintFor* ##2 in {\xintSeq {1}{\useKV[ClesQCM]{Reponses}}}\do{%
+          &\stepcounter{TitreQCM}\useKV[ClesQCM]{Nom} \ifboolKV[ClesQCM]{AlphT}{\Alph{TitreQCM}}{##2}}%
+          \\
+          }{}
+          \hline%
+          \xintFor* ##1 in {\xintSeq {1}{\ListeQCMlen}}\do{%
+          \stepcounter{QuestionQCM}\ifboolKV[ClesQCM]{Alterne}{\modulo{\theQuestionQCM}{2}\ifnum\remainder=0\cellcolor{gray!15}\fi}{}\ifboolKV[ClesQCM]{Alph}{\textbf{\Alph{QuestionQCM}}/}{\textbf{\theQuestionQCM/}}~\ListeQCM[##1,1]\xintFor* ##2 in {\xintSeq {1}{\useKV[ClesQCM]{Reponses}}}\do{%
+          &\ifboolKV[ClesQCM]{Alterne}{\modulo{\theQuestionQCM}{2}\ifnum\remainder=0\cellcolor{gray!15}\fi}{}\ifboolKV[ClesQCM]{Solution}{\xdef\NumeroReponse{\fpeval{\useKV[ClesQCM]{Reponses}+2}}\xintifboolexpr{##2==\ListeQCM[##1,\NumeroReponse]}{\cellcolor{\useKV[ClesQCM]{Couleur}}}{}}{}\ListeQCM[##1,##2+1]%
+            }\\
+          }%
+          \hline%
+        \end{tabular}%
+      }%
     }%
+    \renewcommand{\arraystretch}{1}%
   }%
-}
-
-\newcommand\QCMPfC[2][]{%
-  \useKVdefault[ClesQCM]%
-  \setKV[ClesQCM]{#1}%
-  \setcounter{QuestionQCM}{\fpeval{\useKV[ClesQCM]{Depart}-1}}%
-  \setcounter{TitreQCM}{0}
-  \setsepchar[*]{§*&}\ignoreemptyitems%
-  \readlist*\ListeQCM{#2}%
-  \ifboolKV[ClesQCM]{Multiple}{%
-    \renewcommand{\arraystretch}{\useKV[ClesQCM]{Stretch}}%
-    \setlength{\LargeurQCM}{\fpeval{(\linewidth-\useKV[ClesQCM]{Reponses}*(3*\tabcolsep+\useKV[ClesQCM]{Largeur}))}pt}%
-    \xdef\NBcases{\fpeval{\useKV[ClesQCM]{Reponses}+1}}%
-    \xdef\ListeNom{\useKV[ClesQCM]{Noms}}%
-    \setsepchar[*]{/}%
-    \readlist*\ListeNomsMul{\ListeNom}%
-    \begin{tabular}{|p{\LargeurQCM}|*{\useKV[ClesQCM]{Reponses}}{>{\centering\arraybackslash}p{\useKV[ClesQCM]{Largeur}}|}}%
-      \cline{2-\NBcases}%
-      \multicolumn{1}{c|}{}\xintFor* ##2 in {\xintSeq {1}{\useKV[ClesQCM]{Reponses}}}\do{%
-      &\ListeNomsMul[##2]}%
-      \\
-      \hline%
-      \xintFor* ##1 in {\xintSeq {1}{\ListeQCMlen}}\do{%
-      \stepcounter{QuestionQCM}\ifboolKV[ClesQCM]{Alterne}{\modulo{\theQuestionQCM}{2}\ifnum\remainder=0\cellcolor{gray!15}\fi}{}\ifboolKV[ClesQCM]{Alph}{\textbf{\Alph{QuestionQCM}}/}{\textbf{\theQuestionQCM/}}~\ListeQCM[##1,1]\xintFor* ##2 in {\xintSeq {1}{\useKV[ClesQCM]{Reponses}}}\do{%
-      &\ifboolKV[ClesQCM]{Alterne}{\modulo{\theQuestionQCM}{2}\ifnum\remainder=0\cellcolor{gray!15}\fi}{}\ifboolKV[ClesQCM]{Solution}{\xintifboolexpr{\ListeQCM[##1,\fpeval{##2+1}]==1}{$\boxtimes$}{$\square$}}{$\square$}%
-        }\\
-      }%
-      \hline%
-    \end{tabular}%
-  }{%
-    \ifboolKV[ClesQCM]{VF}{%
-      \setKV[ClesQCM]{Reponses=2}
+}{%
+  \newcommand\QCM[2][]{%
+    \useKVdefault[ClesQCM]%
+    \setKV[ClesQCM]{#1}%
+    \setcounter{QuestionQCM}{\fpeval{\useKV[ClesQCM]{Depart}-1}}%
+    \setcounter{TitreQCM}{0}
+    \setsepchar[*]{,*&}\ignoreemptyitems%
+    \readlist*\ListeQCM{#2}%
+    \ifboolKV[ClesQCM]{Multiple}{%
       \renewcommand{\arraystretch}{\useKV[ClesQCM]{Stretch}}%
       \setlength{\LargeurQCM}{\fpeval{(\linewidth-\useKV[ClesQCM]{Reponses}*(3*\tabcolsep+\useKV[ClesQCM]{Largeur}))}pt}%
       \xdef\NBcases{\fpeval{\useKV[ClesQCM]{Reponses}+1}}%
+      \xdef\ListeNom{\useKV[ClesQCM]{Noms}}%
+      \setsepchar[*]{/}%
+      \readlist*\ListeNomsMul{\ListeNom}%
       \begin{tabular}{|p{\LargeurQCM}|*{\useKV[ClesQCM]{Reponses}}{>{\centering\arraybackslash}p{\useKV[ClesQCM]{Largeur}}|}}%
         \cline{2-\NBcases}%
-        \multicolumn{1}{c|}{}&\useKV[ClesQCM]{NomV}&\useKV[ClesQCM]{NomF}\\
-        \hline%
-        \xintFor* ##1 in {\xintSeq {1}{\ListeQCMlen}}\do{%
-        \stepcounter{QuestionQCM}\ifboolKV[ClesQCM]{Alterne}{\modulo{\theQuestionQCM}{2}\ifnum\remainder=0\cellcolor{gray!15}\fi}{}\ifboolKV[ClesQCM]{Alph}{\textbf{\Alph{QuestionQCM}}/}{\textbf{\theQuestionQCM/}}~\ListeQCM[##1,1]\xintFor* ##2 in {\xintSeq {1}{\useKV[ClesQCM]{Reponses}}}\do{%
-                             &\ifboolKV[ClesQCM]{Alterne}{\modulo{\theQuestionQCM}{2}\ifnum\remainder=0\cellcolor{gray!15}\fi}{}\ifboolKV[ClesQCM]{Solution}{\xintifboolexpr{##2==\ListeQCM[##1,2]}{$\boxtimes$}{$\square$}}{$\square$}%
-                               }\\
-        }%
-        \hline%
-      \end{tabular}
-    }{%
-      \renewcommand{\arraystretch}{\useKV[ClesQCM]{Stretch}}%
-      \setlength{\LargeurQCM}{\fpeval{(\linewidth-\useKV[ClesQCM]{Reponses}*(3*\tabcolsep+\useKV[ClesQCM]{Largeur}))}pt}%
-      \xdef\NBcases{\fpeval{\useKV[ClesQCM]{Reponses}+1}}%
-      \begin{tabular}{|p{\LargeurQCM}|*{\useKV[ClesQCM]{Reponses}}{>{\centering\arraybackslash}p{\useKV[ClesQCM]{Largeur}}|}}%
-        \ifboolKV[ClesQCM]{Titre}{\cline{2-\NBcases}%
         \multicolumn{1}{c|}{}\xintFor* ##2 in {\xintSeq {1}{\useKV[ClesQCM]{Reponses}}}\do{%
-        &\stepcounter{TitreQCM}\useKV[ClesQCM]{Nom} \ifboolKV[ClesQCM]{AlphT}{\Alph{TitreQCM}}{##2}}%
+        &\ListeNomsMul[##2]}%
         \\
-        }{}
         \hline%
         \xintFor* ##1 in {\xintSeq {1}{\ListeQCMlen}}\do{%
         \stepcounter{QuestionQCM}\ifboolKV[ClesQCM]{Alterne}{\modulo{\theQuestionQCM}{2}\ifnum\remainder=0\cellcolor{gray!15}\fi}{}\ifboolKV[ClesQCM]{Alph}{\textbf{\Alph{QuestionQCM}}/}{\textbf{\theQuestionQCM/}}~\ListeQCM[##1,1]\xintFor* ##2 in {\xintSeq {1}{\useKV[ClesQCM]{Reponses}}}\do{%
-        &\ifboolKV[ClesQCM]{Alterne}{\modulo{\theQuestionQCM}{2}\ifnum\remainder=0\cellcolor{gray!15}\fi}{}\ifboolKV[ClesQCM]{Solution}{\xdef\NumeroReponse{\fpeval{\useKV[ClesQCM]{Reponses}+2}}\xintifboolexpr{##2==\ListeQCM[##1,\NumeroReponse]}{\cellcolor{\useKV[ClesQCM]{Couleur}}}{}}{}\ListeQCM[##1,##2+1]%
+        &\ifboolKV[ClesQCM]{Alterne}{\modulo{\theQuestionQCM}{2}\ifnum\remainder=0\cellcolor{gray!15}\fi}{}\ifboolKV[ClesQCM]{Solution}{\xintifboolexpr{\ListeQCM[##1,\fpeval{##2+1}]==1}{$\boxtimes$}{$\square$}}{$\square$}%
           }\\
         }%
         \hline%
       \end{tabular}%
+    }{%
+      \ifboolKV[ClesQCM]{VF}{%
+        \setKV[ClesQCM]{Reponses=2}
+        \renewcommand{\arraystretch}{\useKV[ClesQCM]{Stretch}}%
+        \setlength{\LargeurQCM}{\fpeval{(\linewidth-\useKV[ClesQCM]{Reponses}*(3*\tabcolsep+\useKV[ClesQCM]{Largeur}))}pt}%
+        \xdef\NBcases{\fpeval{\useKV[ClesQCM]{Reponses}+1}}%
+        \begin{tabular}{|p{\LargeurQCM}|*{\useKV[ClesQCM]{Reponses}}{>{\centering\arraybackslash}p{\useKV[ClesQCM]{Largeur}}|}}%
+          \cline{2-\NBcases}%
+          \multicolumn{1}{c|}{}&\useKV[ClesQCM]{NomV}&\useKV[ClesQCM]{NomF}\\
+          \hline%
+          \xintFor* ##1 in {\xintSeq {1}{\ListeQCMlen}}\do{%
+          \stepcounter{QuestionQCM}\ifboolKV[ClesQCM]{Alterne}{\modulo{\theQuestionQCM}{2}\ifnum\remainder=0\cellcolor{gray!15}\fi}{}\ifboolKV[ClesQCM]{Alph}{\textbf{\Alph{QuestionQCM}}/}{\textbf{\theQuestionQCM/}}~\ListeQCM[##1,1]\xintFor* ##2 in {\xintSeq {1}{\useKV[ClesQCM]{Reponses}}}\do{%
+                               &\ifboolKV[ClesQCM]{Alterne}{\modulo{\theQuestionQCM}{2}\ifnum\remainder=0\cellcolor{gray!15}\fi}{}\ifboolKV[ClesQCM]{Solution}{\xintifboolexpr{##2==\ListeQCM[##1,2]}{$\boxtimes$}{$\square$}}{$\square$}%
+                                 }\\
+          }%
+          \hline%
+        \end{tabular}
+      }{%
+        \renewcommand{\arraystretch}{\useKV[ClesQCM]{Stretch}}%
+        \setlength{\LargeurQCM}{\fpeval{(\linewidth-\useKV[ClesQCM]{Reponses}*(3*\tabcolsep+\useKV[ClesQCM]{Largeur}))}pt}%
+        \xdef\NBcases{\fpeval{\useKV[ClesQCM]{Reponses}+1}}%
+        \begin{tabular}{|p{\LargeurQCM}|*{\useKV[ClesQCM]{Reponses}}{>{\centering\arraybackslash}p{\useKV[ClesQCM]{Largeur}}|}}%
+          \ifboolKV[ClesQCM]{Titre}{\cline{2-\NBcases}%
+          \multicolumn{1}{c|}{}\xintFor* ##2 in {\xintSeq {1}{\useKV[ClesQCM]{Reponses}}}\do{%
+          &\stepcounter{TitreQCM}\useKV[ClesQCM]{Nom} \ifboolKV[ClesQCM]{AlphT}{\Alph{TitreQCM}}{##2}}%
+          \\
+          }{}
+          \hline%
+          \xintFor* ##1 in {\xintSeq {1}{\ListeQCMlen}}\do{%
+          \stepcounter{QuestionQCM}\ifboolKV[ClesQCM]{Alterne}{\modulo{\theQuestionQCM}{2}\ifnum\remainder=0\cellcolor{gray!15}\fi}{}\ifboolKV[ClesQCM]{Alph}{\textbf{\Alph{QuestionQCM}}/}{\textbf{\theQuestionQCM/}}~\ListeQCM[##1,1]\xintFor* ##2 in {\xintSeq {1}{\useKV[ClesQCM]{Reponses}}}\do{%
+          &\ifboolKV[ClesQCM]{Alterne}{\modulo{\theQuestionQCM}{2}\ifnum\remainder=0\cellcolor{gray!15}\fi}{}\ifboolKV[ClesQCM]{Solution}{\xdef\NumeroReponse{\fpeval{\useKV[ClesQCM]{Reponses}+2}}\xintifboolexpr{##2==\ListeQCM[##1,\NumeroReponse]}{\cellcolor{\useKV[ClesQCM]{Couleur}}}{}}{}\ListeQCM[##1,##2+1]%
+            }\\
+          }%
+          \hline%
+        \end{tabular}%
+      }%
     }%
   }%
-  \renewcommand{\arraystretch}{1}%
 }
 
+
 %%%
 % Somme des angles
 %%%
@@ -11317,7 +11921,7 @@ Tableau=false,Stretch=1,Frequence=false,EffectifTotal=false,%
 Etendue=false,Moyenne=false,SET=false,ValeurExacte=false,Mediane=false,QuartileUn=false,QuartileTrois=false,Total=false,Concret=false,%
 Unite={},Largeur=1cm,Precision=2,PrecisionF=0,Donnee=Valeurs,Effectif=Effectif,Grille=false,Origine=0,Angle=false,SemiAngle=false,Qualitatif=false,TableauVide=false,ECC=false,Coupure=10,CouleurTab=gray!15,Graphique=false,Batons=true,%
 % Pour les diags batons
-EpaisseurBatons=1,ListeCouleursB={black},Lecture=false,LectureFine=false,AideLecture=false,Reponses=false,DonneesSup=false,AbscisseRotation=false,Tiret=false,AngleRotationAbscisse=0,Pasx=1,Pasy=1,Unitex=0.5,Unitey=0.5,%
+EpaisseurBatons=1,ListeCouleursB={black},Lecture=false,LectureFine=false,AideLecture=false,Reponses=false,DonneesSup=false,AbscisseRotation=false,Tiret=false,AngleRotationAbscisse=0,Pasx=1,Pasy=1,Unitex=0.5,Unitey=0.5,Depart=0,%
 % Pour les diags circulaires
 Rayon=3cm,AffichageAngle=false,AffichageDonnee=false,ListeCouleurs={white},Hachures=false,LectureInverse=false,EcartHachures=0.25,EpaisseurHachures=1,Legende,LegendeVide=false,%
 %Pour les représentations
@@ -11772,7 +12376,7 @@ Barre=false,Longueur=10cm,Hauteur=5mm,Bicolore=false,EcartBarre=0%Grille est dis
   \fi%
 }%
 
-% la construction du graphique en bâtons pour quantitatif
+% Construction du graphique en bâtons
 \newcommand\MPStatNew[2]{%
   \ifluatex
   \mplibforcehmode
@@ -11800,6 +12404,8 @@ Barre=false,Longueur=10cm,Hauteur=5mm,Bicolore=false,EcartBarre=0%Grille est dis
     Qualitatif=\useKV[ClesStat]{Qualitatif};
     boolean Tiret;
     Tiret=\useKV[ClesStat]{Tiret};
+    %% ajout
+    Depart=\useKV[ClesStat]{Depart};
     % on r\'ecup\`ere les couleurs
     color Col[];
     n:=0;
@@ -11830,6 +12436,23 @@ Barre=false,Longueur=10cm,Hauteur=5mm,Bicolore=false,EcartBarre=0%Grille est dis
     fi;
     endfor;
     enddef;
+    vardef tutu(text t)=%points qualitatif
+    n:=0;
+    for p_=t:
+    if numeric p_:
+    P[n]=((n)*unitex,unitey*(p_-Depart));
+    B[n]=(0,unitey*(p_-Depart));
+    if p_>maxy:
+    maxy:=p_;
+    fi;
+    else:
+    n:=n+1;
+    A[n]=unitex*(n,0);
+    fi;
+    endfor;
+    maxy:=maxy-Depart;
+    maxx:=n;
+    enddef;
     vardef tata(text t)=%affichage quantitatif
     l=0;
     for p_=t:
@@ -11854,22 +12477,6 @@ Barre=false,Longueur=10cm,Hauteur=5mm,Bicolore=false,EcartBarre=0%Grille est dis
     fi;
     endfor;
     enddef;
-    vardef tutu(text t)=%points qualitatif
-    n:=0;
-    for p_=t:
-    if numeric p_:
-    P[n]=((n)*unitex,unitey*p_);
-    B[n]=(0,unitey*p_);
-    if p_>maxy:
-    maxy:=p_;
-    fi;
-    else:
-    n:=n+1;
-    A[n]=unitex*(n,0);
-    fi;
-    endfor;
-    maxx:=n;
-    enddef;
     vardef titi(text t)=%affichage qualitatif
     l:=0;
     for p_=t:
@@ -11908,7 +12515,7 @@ Barre=false,Longueur=10cm,Hauteur=5mm,Bicolore=false,EcartBarre=0%Grille est dis
     boolean Grille;
     Grille:=\useKV[ClesStat]{Grille};
     Pasx:=\useKV[ClesStat]{Pasx};
-    Pasy:=\useKV[ClesStat]{Pasy};    
+    Pasy:=\useKV[ClesStat]{Pasy};
     if Grille:
     drawoptions(withcolor 0.75white);
     for k=0 step Pasx until ((maxx+1)):
@@ -11929,9 +12536,9 @@ Barre=false,Longueur=10cm,Hauteur=5mm,Bicolore=false,EcartBarre=0%Grille est dis
     for k=0 step Pasy until ((maxy+1*Pasy)):
     if Tiret:
     trace (1pt,k*unitey)--(-1pt,k*unitey);
-    label.lft(TEX("\num{"&decimal(k)&"}"),(0,k*unitey));
+    label.lft(TEX("\num{"&decimal(k+Depart)&"}"),(0,k*unitey));
     else:
-    dotlabel.lft(TEX("\num{"&decimal(k)&"}"),(0,k*unitey));
+    dotlabel.lft(TEX("\num{"&decimal(k+Depart)&"}"),(0,k*unitey));
     fi;
     endfor;
     fi;
@@ -12519,7 +13126,7 @@ Barre=false,Longueur=10cm,Hauteur=5mm,Bicolore=false,EcartBarre=0%Grille est dis
 
 \DTLgnewdb{mtdbEE}%
 \DTLgnewdb{mtdbEEqual}%
-% 
+%
 \newcommand\Stat[2][]{%
   \useKVdefault[ClesStat]%
   \setKV[ClesStat]{#1}%
@@ -12543,437 +13150,456 @@ Barre=false,Longueur=10cm,Hauteur=5mm,Bicolore=false,EcartBarre=0%Grille est dis
       \setKV[ClesStat]{Qualitatif}%
     }{%
       \ifboolKV[ClesStat]{Sondage}{%
-      \setsepchar{,}\ignoreemptyitems%
-      \readlist*\Liste{#2}%
-      % "liste vide"
-      \newtoks\tabtoksEEa%
-      \tabtoksEEa{}%
-      % 
-      % "liste vide"
-      \newtoks\tabtoksEEb%
-      \tabtoksEEb{}%
-      % 
-      \readlist*\ListeSansDoublonsEE{999}%   %% Pour ne pas avoir une liste vide
-      % 
-      \newcount\cmptEE%
-      \newcount\PasNumEE%    %% Permettra de savoir si ce sondage est qualitatif ou quantitatif
-      \PasNumEE=0\relax%
-      \DTLcleardb{mtdbEE}%
-      % on range les resultats du sondage par ordre croissant.
-      \foreachitem\x\in\Liste{%
-        \DTLnewrow{mtdbEE}%
-        \DTLnewdbentry{mtdbEE}{Numeric}{\x}%
-      }%
-      \dtlsort{Numeric}{mtdbEE}{\dtlicompare}%
-      \DTLforeach{mtdbEE}{\nba=Numeric}{%
-        \IfDecimal{\nba}{}{\PasNumEE=\numexpr\PasNumEE+1\relax}%
-        \cmptEE=0\relax%
-        \foreachitem\nbb\in\ListeSansDoublonsEE{%
-          \ifthenelse{\equal{\nba}{\nbb}}{\cmptEE=\numexpr\cmptEE+1\relax}{}%
+        \setsepchar{,}\ignoreemptyitems%
+        \readlist*\Liste{#2}%
+        % "liste vide"
+        \newtoks\tabtoksEEa%
+        \tabtoksEEa{}%
+        % 
+        % "liste vide"
+        \newtoks\tabtoksEEb%
+        \tabtoksEEb{}%
+        % 
+        \readlist*\ListeSansDoublonsEE{999}%   %% Pour ne pas avoir une liste vide
+        % 
+        \newcount\cmptEE%
+        \newcount\PasNumEE%    %% Permettra de savoir si ce sondage est qualitatif ou quantitatif
+        \PasNumEE=0\relax%
+        \DTLcleardb{mtdbEE}%
+        % on range les resultats du sondage par ordre croissant.
+        \foreachitem\x\in\Liste{%
+          \DTLnewrow{mtdbEE}%
+          \DTLnewdbentry{mtdbEE}{Numeric}{\x}%
         }%
-        \ifthenelse{\equal{\the\cmptEE}{0}}{%
-          \expandafter\AjoutListEEb\nba\nil%
-          \xdef\listEEa{\the\tabtoksEEb}%
-          \ignoreemptyitems%
-          \setsepchar{,}%
-          \readlist*\ListeSansDoublonsEE\listEEa%    	%%% Enl\`eve tous les \'elements
+        \dtlsort{Numeric}{mtdbEE}{\dtlicompare}%
+        \DTLforeach{mtdbEE}{\nba=Numeric}{%
+          \IfDecimal{\nba}{}{\PasNumEE=\numexpr\PasNumEE+1\relax}%
+          \cmptEE=0\relax%
+          \foreachitem\nbb\in\ListeSansDoublonsEE{%
+            \ifthenelse{\equal{\nba}{\nbb}}{\cmptEE=\numexpr\cmptEE+1\relax}{}%
+          }%
+          \ifthenelse{\equal{\the\cmptEE}{0}}{%
+            \expandafter\AjoutListEEb\nba\nil%
+            \xdef\listEEa{\the\tabtoksEEb}%
+            \ignoreemptyitems%
+            \setsepchar{,}%
+            \readlist*\ListeSansDoublonsEE\listEEa%    	%%% Enl\`eve tous les \'elements
+            %%% identiques de Liste
+          }{}%  
+        }%	
+        \foreachitem\nba\in\ListeSansDoublonsEE{%
+          \cmptEE=0\relax%
+          \DTLforeach{mtdbEE}{\nbb=Numeric}{%
+            \ifthenelse{\equal{\nba}{\nbb}}{\cmptEE=\numexpr\cmptEE+1\relax}{}%
+          }%
+          \expandafter\AjoutListEEab\nba\nil%
+          \expandafter\AjoutListEEaa\the\cmptEE\nil% 	%%% Compte tous les \'elements
           %%% identiques de Liste
-        }{}%  
-      }%	
-      \foreachitem\nba\in\ListeSansDoublonsEE{%
-        \cmptEE=0\relax%
-        \DTLforeach{mtdbEE}{\nbb=Numeric}{%
-          \ifthenelse{\equal{\nba}{\nbb}}{\cmptEE=\numexpr\cmptEE+1\relax}{}%
         }%
-        \expandafter\AjoutListEEab\nba\nil%
-        \expandafter\AjoutListEEaa\the\cmptEE\nil% 	%%% Compte tous les \'elements
-        %%% identiques de Liste
+        \xdef\listEEb{\the\tabtoksEEa}
+        \ignoreemptyitems%
+        \setsepchar[*]{,*/}%
+        \readlist*\ListeComplete\listEEb%
+        % 
+        \ifthenelse{\equal{\the\PasNumEE}{0}}{\setKV[ClesStat]{Quantitatif}}{\setKV[ClesStat]{Qualitatif}}%
+      }{%
+        \ifboolKV[ClesStat]{Qualitatif}{%
+          %  % on lit la liste \'ecrite sous la forme valeur/effectif
+          \setsepchar[*]{,*/}\ignoreemptyitems%
+          \readlist*\ListeInitiale{#2}%
+          % "liste vide"
+          \newtoks\tabtoksEE%
+          \tabtoksEE{}%
+          \DTLcleardb{mtdbEEqual}%
+          \foreachitem\x\in\ListeInitiale{%
+            \DTLnewrow{mtdbEEqual}%
+            \itemtomacro\ListeInitiale[\xcnt,1]\x%
+            \DTLnewdbentry{mtdbEEqual}{Val}{\x}%
+            \itemtomacro\ListeInitiale[\xcnt,2]\y%
+            \DTLnewdbentry{mtdbEEqual}{Eff}{\y}%
+          }%
+          \DTLforeach{mtdbEEqual}{\Val=Val,\Eff=Eff}{%  
+            \expandafter\AjoutListEEy\Val\nil%
+            \expandafter\AjoutListEEx\Eff\nil%
+          }%
+          \xdef\listEE{\the\tabtoksEE}
+          \ignoreemptyitems%
+          \setsepchar[*]{,*/}%
+          \readlist*\ListeComplete\listEE%
+        }{% Dans le qualitatif, on trie d'abord les valeurs.
+          \setsepchar[*]{,*/}\ignoreemptyitems%
+          \readlist*\ListeInitiale{#2}%
+          % "liste vide"
+          \newtoks\tabtoksEE%
+          \tabtoksEE{}%
+          \DTLcleardb{mtdbEEqual}%
+          \foreachitem\x\in\ListeInitiale{%
+            \DTLnewrow{mtdbEEqual}%
+            \itemtomacro\ListeInitiale[\xcnt,1]\x%
+            \DTLnewdbentry{mtdbEEqual}{Val}{\x}%
+            \itemtomacro\ListeInitiale[\xcnt,2]\y%
+            \DTLnewdbentry{mtdbEEqual}{Eff}{\y}%
+          }%
+          \dtlsort{Val}{mtdbEEqual}{\dtlicompare}%
+          \DTLforeach{mtdbEEqual}{\Val=Val,\Eff=Eff}{%  
+            \expandafter\AjoutListEEy\Val\nil%
+            \expandafter\AjoutListEEx\Eff\nil%
+          }%
+          \xdef\listEE{\the\tabtoksEE}
+          \ignoreemptyitems%
+          \setsepchar[*]{,*/}%
+          \readlist*\ListeComplete\listEE%
+        }}}%
+    % on cr\'ee la base de donn\'ees des valeurs dans le cas qualitatif
+    \DTLcleardb{mtdb}%
+    % on les trie pour la m\'ediane dans le cas qualitatif % Touhami / Texnique.fr
+    \foreachitem\x\in\ListeComplete{%
+      \DTLnewrow{mtdb}%
+      \itemtomacro\ListeComplete[\xcnt,2]\y%
+      \DTLnewdbentry{mtdb}{Numeric}{\y}%
+    }%
+    \dtlsort{Numeric}{mtdb}{\dtlicompare}%
+    %  % on r\'einitialise les valeurs des crit\`eres de position et de
+    % dispersion
+    \renewcommand\NbDonnees{}%
+    \renewcommand\SommeDonnees{}%
+    \renewcommand\EffectifTotal{}%
+    \renewcommand\Moyenne{}%
+    \renewcommand\Etendue{}%
+    \renewcommand\Mediane{}%
+    \renewcommand\DonneeMax{0}%
+    \renewcommand\EffectifMax{0}%
+    \renewcommand\DonneeMin{999999999}%
+    \ifboolKV[ClesStat]{Qualitatif}{%D\'ebut qualitatif
+      % Calculs
+      %  %% celui de la somme des donn\'ees
+      \foreachitem\don\in\ListeComplete{\xdef\SommeDonnees{\fpeval{\SommeDonnees+\ListeComplete[\doncnt,2]}}}%
+      %  %% celui de l'effectif total
+      \ifboolKV[ClesStat]{EffectifTotal}{%
+        \ifboolKV[ClesStat]{Liste}{L'effectif total de la s\'erie est
+          \num{\ListeCompletelen}.\par}{%
+          \foreachitem\don\in\ListeComplete{\xdef\EffectifTotal{\fpeval{\EffectifTotal+\ListeComplete[\doncnt,2]}}}%
+          L'effectif total de la s\'erie est : \[\ListeComplete[1,2]\xintFor* ##1 in
+            {\xintSeq {2}{\ListeCompletelen}}\do{%
+              +\ListeComplete[##1,2]}=\num{\EffectifTotal}\]}
+      }{}%
+      \ifboolKV[ClesStat]{Liste}{\xdef\EffectifTotal{\ListeCompletelen}}{\xdef\EffectifTotal{\SommeDonnees}}%
+      %  %% celui de la moyenne
+      \xdef\Moyenne{\fpeval{\SommeDonnees/\ListeCompletelen}}%	
+      \ifboolKV[ClesStat]{Moyenne}{%
+        \ifboolKV[ClesStat]{Liste}{%
+          La somme des donn\'ees de la s\'erie est :%
+          \xintifboolexpr{\ListeCompletelen<\useKV[ClesStat]{Coupure}}{%
+            \[
+              \num{\ListeComplete[1,2]}\ifboolKV[ClesStat]{Concret}{~\text{\useKV[ClesStat]{Unite}}}{}\xintFor* ##1 in {\xintSeq {2}{\ListeCompletelen}}\do{%
+                +\num{\ListeComplete[##1,2]}\ifboolKV[ClesStat]{Concret}{~\text{\useKV[ClesStat]{Unite}}}{}
+              }=\num{\SommeDonnees}\ifboolKV[ClesStat]{Concret}{~\text{\useKV[ClesStat]{Unite}}}{}%
+            \]}{%
+            \[
+              \num{\ListeComplete[1,2]}\ifboolKV[ClesStat]{Concret}{~\text{\useKV[ClesStat]{Unite}}}{}\xintFor* ##1 in {\xintSeq {2}{3}}\do{%
+                +\num{\ListeComplete[##1,2]}\ifboolKV[ClesStat]{Concret}{~\text{\useKV[ClesStat]{Unite}}}{}}+\dots\xintFor* ##1 in {\xintSeq {\ListeCompletelen-1}{\ListeCompletelen}}\do{%
+                +\num{\ListeComplete[##1,2]}\ifboolKV[ClesStat]{Concret}{~\text{\useKV[ClesStat]{Unite}}}{}
+              }=\num{\SommeDonnees}\ifboolKV[ClesStat]{Concret}{~\text{\useKV[ClesStat]{Unite}}}{}%
+            \]%
+          }%
+          \ifboolKV[ClesStat]{SET}{}{Le nombre de donn\'ees de la s\'erie est \num{\ListeCompletelen}.\\}%
+          Donc la moyenne de la s\'erie est \'egale \`a :%
+          \[\frac{\num{\SommeDonnees}\ifboolKV[ClesStat]{Concret}{~\text{\useKV[ClesStat]{Unite}}}{}}{\num{\ListeCompletelen}}%\IfInteger{\fpeval{round(\fpeval{\SommeDonnees/\ListeCompletelen},\useKV[ClesStat]{Precision})}}{=}{\approx}
+            \ifboolKV[ClesStat]{ValeurExacte}{}{%
+              \opdiv*{\SommeDonnees}{\ListeCompletelen}{resultatmoy}{restemoy}%
+              \opround{resultatmoy}{\useKV[ClesStat]{Precision}}{resultatmoy1}%
+              \opcmp{resultatmoy}{resultatmoy1}\ifopeq=\else\approx\fi%
+              \num{\fpeval{round(\SommeDonnees/\ListeCompletelen,\useKV[ClesStat]{Precision})}}\ifboolKV[ClesStat]{Concret}{~\text{\useKV[ClesStat]{Unite}}}{}%
+            }%
+          \]%
+        }{Pas de moyenne possible pour une s\'erie de donn\'ees \`a caract\`ere qualitatif.}}{}%
+      %    %  %% celui de l'\'etendue
+      \xintFor* ##1 in {\xintSeq {1}{\ListeCompletelen}}\do{%
+        \xintifboolexpr{\ListeComplete[##1,2]>\DonneeMax}{%
+          \xdef\DonneeMax{\ListeComplete[##1,2]}%
+        }{}%
+        \xintifboolexpr{\ListeComplete[##1,2]<\DonneeMin}{%
+          \xdef\DonneeMin{\ListeComplete[##1,2]}%
+        }{}%
       }%
-      \xdef\listEEb{\the\tabtoksEEa}
-      \ignoreemptyitems%
-      \setsepchar[*]{,*/}%
-      \readlist*\ListeComplete\listEEb%
-      % 
-      \ifthenelse{\equal{\the\PasNumEE}{0}}{\setKV[ClesStat]{Quantitatif}}{\setKV[ClesStat]{Qualitatif}}%
-    }{%
-      \ifboolKV[ClesStat]{Qualitatif}{%
-        %  % on lit la liste \'ecrite sous la forme valeur/effectif
-        \setsepchar[*]{,*/}\ignoreemptyitems%
-        \readlist*\ListeComplete{#2}%
-      }{% Dans le qualitatif, on trie d'abord les valeurs.
-        \setsepchar[*]{,*/}\ignoreemptyitems%
-        \readlist*\ListeInitiale{#2}%
-        % "liste vide"
-	\newtoks\tabtoksEE%
-	\tabtoksEE{}%
-	\DTLcleardb{mtdbEEqual}%
-  	\foreachitem\x\in\ListeInitiale{%
-          \DTLnewrow{mtdbEEqual}%
-          \itemtomacro\ListeInitiale[\xcnt,1]\x%
-          \DTLnewdbentry{mtdbEEqual}{Val}{\x}%
-          \itemtomacro\ListeInitiale[\xcnt,2]\y%
-          \DTLnewdbentry{mtdbEEqual}{Eff}{\y}%
-  	}%
-  	\dtlsort{Val}{mtdbEEqual}{\dtlicompare}%
-	\DTLforeach{mtdbEEqual}{\Val=Val,\Eff=Eff}{%  
-          \expandafter\AjoutListEEy\Val\nil%
-          \expandafter\AjoutListEEx\Eff\nil%
-	}%
-	\xdef\listEE{\the\tabtoksEE}
-	\ignoreemptyitems%
-	\setsepchar[*]{,*/}%
-	\readlist*\ListeComplete\listEE%
-      }}}%
-  % on cr\'ee la base de donn\'ees des valeurs dans le cas qualitatif
-  \DTLcleardb{mtdb}%
-  % on les trie pour la m\'ediane dans le cas qualitatif % Touhami / Texnique.fr
-  \foreachitem\x\in\ListeComplete{%
-    \DTLnewrow{mtdb}%
-    \itemtomacro\ListeComplete[\xcnt,2]\y%
-    \DTLnewdbentry{mtdb}{Numeric}{\y}%
-  }%
-  \dtlsort{Numeric}{mtdb}{\dtlicompare}%
-  %  % on r\'einitialise les valeurs des crit\`eres de position et de
-  % dispersion
-  \renewcommand\NbDonnees{}%
-  \renewcommand\SommeDonnees{}%
-  \renewcommand\EffectifTotal{}%
-  \renewcommand\Moyenne{}%
-  \renewcommand\Etendue{}%
-  \renewcommand\Mediane{}%
-  \renewcommand\DonneeMax{0}%
-  \renewcommand\EffectifMax{0}%
-  \renewcommand\DonneeMin{999999999}%
-  \ifboolKV[ClesStat]{Qualitatif}{%D\'ebut qualitatif
-    % Calculs
-    %  %% celui de la somme des donn\'ees
-    \foreachitem\don\in\ListeComplete{\xdef\SommeDonnees{\fpeval{\SommeDonnees+\ListeComplete[\doncnt,2]}}}%
-    %  %% celui de l'effectif total
-    \ifboolKV[ClesStat]{EffectifTotal}{%
-      \ifboolKV[ClesStat]{Liste}{L'effectif total de la s\'erie est
-        \num{\ListeCompletelen}.\par}{%
-        \foreachitem\don\in\ListeComplete{\xdef\EffectifTotal{\fpeval{\EffectifTotal+\ListeComplete[\doncnt,2]}}}%
+      \xdef\EffectifMax{\DonneeMax}%
+      \xdef\Etendue{\fpeval{\DonneeMax-\DonneeMin}}%
+      \ifboolKV[ClesStat]{Etendue}{%
+        \ifboolKV[ClesStat]{Liste}{%
+          L'\'etendue de la s\'erie est \'egale \`a $\num{\DonneeMax}\ifboolKV[ClesStat]{Concret}{~\text{\useKV[ClesStat]{Unite}}}{}-\num{\DonneeMin}\ifboolKV[ClesStat]{Concret}{~\text{\useKV[ClesStat]{Unite}}}{}=\num{\Etendue}$\ifboolKV[ClesStat]{Concret}{~\useKV[ClesStat]{Unite}.}{.}%
+        }{Pas d'\'etendue possible pour une s\'erie de donn\'ees \`a caract\`ere qualitatif.}}{}%
+      % celui de la mediane
+      %%% Recuperation de la mediane %%%%%%%%%%%%%%%%%%%%% 
+      \newcount\Recapmed%
+      \newcount\Recapmeda%
+      \ifodd\number\ListeCompletelen%odd impair
+      \Recapmed=\fpeval{(\ListeCompletelen+1)/2}\relax%
+      \else%
+      \Recapmed=\fpeval{\ListeCompletelen/2}\relax%
+      \Recapmeda=\numexpr\Recapmed+1\relax%
+      \fi%
+      \newcount\Recapk%
+      \Recapk=0%
+      \DTLforeach{mtdb}{\numeroDonnee=Numeric}{\Recapk=\numexpr\Recapk+1\relax%
+        \ifnum\Recapk=\Recapmed%
+        \ifodd\number\ListeCompletelen%
+        \xdef\Mediane{\numeroDonnee}%
+        \else%
+        \xdef\Mediane{\numeroDonnee}%
+        \fi%
+        \fi%
+        \ifnum\Recapk=\Recapmeda%
+        \xdef\Mediane{\fpeval{(\Mediane+\numeroDonnee)/2}}%
+        \fi%
+      }%
+      %%% 
+      \ifboolKV[ClesStat]{Mediane}{%
+        \ifboolKV[ClesStat]{Liste}{%    
+          On range les donn\'ees par ordre croissant :%
+          \nbdonnees=0%
+          \xintifboolexpr{\ListeCompletelen<\useKV[ClesStat]{Coupure}}{%
+            \[\DTLforeach{mtdb}{\numeroDonnee=Numeric}{\num{\numeroDonnee}\ifboolKV[ClesStat]{Concret}{~\text{\useKV[ClesStat]{Unite}}}{}\DTLiflastrow{.}{;}}\]%
+          }{%
+            \medskip%
+            \begin{center}
+              \begin{minipage}{0.9\linewidth}
+                \DTLforeach*{mtdb}{\numeroDonnee=Numeric}{\num{\numeroDonnee}\ifboolKV[ClesStat]{Concret}{~\text{\useKV[ClesStat]{Unite}}}{}\DTLiflastrow{.}{;
+                  }\nbdonnees=\fpeval{\nbdonnees+1}\modulo{\nbdonnees}{\useKV[ClesStat]{Coupure}}\xintifboolexpr{\remainder==0}{\\}{}}
+              \end{minipage}
+            \end{center}%
+            \medskip%
+          }%
+          \newcount\med%
+          \newcount\meda%
+          \ifodd\number\ListeCompletelen%odd impair
+          \med=\fpeval{(\ListeCompletelen+1)/2}\relax%
+          L'effectif total de la s\'erie est \num{\ListeCompletelen}. Or, $\num{\ListeCompletelen}=\num{\fpeval{\med-1}}+1+\num{\fpeval{\med-1}}$.\\
+          \else% pair
+          \med=\fpeval{\ListeCompletelen/2}\relax%
+          \meda=\numexpr\med+1\relax%
+          L'effectif total de la s\'erie est \num{\ListeCompletelen}. Or, $\num{\ListeCompletelen}=\num{\the\med}+\num{\the\med}$.\\
+          \fi%
+          \newcount\k%
+          \k=0%
+          \DTLforeach{mtdb}{\numeroDonnee=Numeric}{\k=\numexpr\k+1\relax%
+            \ifnum\k=\med %La m\'ediane vaut \numeroDonnee\fi
+            \ifodd\number\ListeCompletelen%
+            La m\'ediane de la s\'erie est la \the\med\ieme{} donn\'ee.\\Donc la m\'ediane de la s\'erie est \num{\numeroDonnee}\ifboolKV[ClesStat]{Concret}{~\useKV[ClesStat]{Unite}.}{.}%
+            \xdef\Mediane{\numeroDonnee}%
+            \else%
+            La \the\med\ieme{} donn\'ee est \num{\numeroDonnee}\ifboolKV[ClesStat]{Concret}{~\useKV[ClesStat]{Unite}. }{. }\xdef\Mediane{\numeroDonnee}%
+            \fi%
+            \fi%
+            \ifnum\k=\meda
+            La \the\meda\ieme{} donn\'ee est \num{\numeroDonnee}\ifboolKV[ClesStat]{Concret}{~\useKV[ClesStat]{Unite}.}{.} Donc la m\'ediane de la s\'erie est \xdef\Mediane{\fpeval{(\Mediane+\numeroDonnee)/2}}\num{\Mediane}\ifboolKV[ClesStat]{Concret}{~\useKV[ClesStat]{Unite}.}{.}%
+            \fi%
+          }%
+          %%%%%%% 
+        }{Pas de m\'ediane possible pour une s\'erie de donn\'ees \`a caract\`ere qualitatif.}}{}
+      %%% Quartile un
+      \newcount\PfCQuartileUn%
+      \modulo{\ListeCompletelen}{4}\relax%
+      \ifnum\remainder=0%
+      \PfCQuartileUn=\fpeval{\ListeCompletelen/4}%
+      \else%
+      \PfCQuartileUn=\fpeval{ceil(\ListeCompletelen/4)+1}%
+      \fi%
+      \newcount\PfCQunk%
+      \PfCQunk=0%
+      \DTLforeach{mtdb}{\numeroDonnee=Numeric}{\PfCQunk=\numexpr\PfCQunk+1\relax%
+        \ifnum\PfCQunk=\PfCQuartileUn%
+        \xdef\QuartileUn{\numeroDonnee}%
+        \fi%
+      }%
+      %%% Quartile trois
+      \newcount\PfCQuartileTrois%
+      \modulo{\ListeCompletelen}{4}\relax%
+      \ifnum\remainder=0%
+      \PfCQuartileTrois=\fpeval{3*\ListeCompletelen/4}%
+      \else%
+      \PfCQuartileTrois=\fpeval{ceil(3*\ListeCompletelen/4)+1}%
+      \fi%
+      \newcount\PfCQtroisk%
+      \PfCQtroisk=0%
+      \DTLforeach{mtdb}{\numeroDonnee=Numeric}{\PfCQtroisk=\numexpr\PfCQtroisk+1\relax%
+        \ifnum\PfCQtroisk=\PfCQuartileTrois%La m\'ediane vaut \numeroDonnee\fi
+        \xdef\QuartileTrois{\numeroDonnee}%
+        \fi%
+      }%
+      % Construction du tableau
+      \ifboolKV[ClesStat]{Tableau}{%
+        \ifboolKV[ClesStat]{Liste}{Pas de tableau possible avec la cl\'e Liste.\\Utilisez plut\^ot la cl\'e Sondage si vous voulez un tableau avec cette liste.}{\BuildtabStat}}{}%
+      % Construction du graphique
+      \ifboolKV[ClesStat]{Graphique}{%
+        \ifboolKV[ClesStat]{Liste}{Pas de graphique possible avec la cl\'e Liste.\\Utilisez plut\^ot la cl\'e Sondage si vous voulez un graphique avec cette liste.}{%
+          \ifboolKV[ClesStat]{Barre}{%
+            \buildgraphbarhor%
+          }{\ifboolKV[ClesStat]{Angle}{\buildgraphcq{360}}{\ifboolKV[ClesStat]{SemiAngle}{\buildgraphcq{180}}{\buildgraphq[#1]}}}%
+        }}{}%
+    }{%%%%%%%%%%%%%%%%%%%%%D\'ebut quantitatif
+      %  % on effectue les calculs
+      %  %% celui de la somme des donn\'ees
+      \foreachitem\don\in\ListeComplete{\xdef\SommeDonnees{\fpeval{\SommeDonnees+\ListeComplete[\doncnt,1]*\ListeComplete[\doncnt,2]}}}%
+      %  %% celui de l'effectif total
+      \foreachitem\don\in\ListeComplete{\xdef\EffectifTotal{\fpeval{\EffectifTotal+\ListeComplete[\doncnt,2]}}}%
+      %  %% celui de l'\'etendue
+      \xintFor* ##1 in {\xintSeq {1}{\ListeCompletelen}}\do{%
+        \xintifboolexpr{\ListeComplete[##1,1]>\DonneeMax}{%
+          \xdef\DonneeMax{\ListeComplete[##1,1]}%
+        }{}%
+        \xintifboolexpr{\ListeComplete[##1,1]<\DonneeMin}{%
+          \xdef\DonneeMin{\ListeComplete[##1,1]}%
+        }{}%
+      }%
+      % \xdef\EffectifMax{\DonneeMax}%
+      \xdef\Etendue{\fpeval{\DonneeMax-\DonneeMin}}%%
+      %  %% celui de la moyenne
+      \xdef\Moyenne{\fpeval{\SommeDonnees/\EffectifTotal}}%
+      \ifboolKV[ClesStat]{EffectifTotal}{%
         L'effectif total de la s\'erie est : \[\ListeComplete[1,2]\xintFor* ##1 in
           {\xintSeq {2}{\ListeCompletelen}}\do{%
-            +\ListeComplete[##1,2]}=\num{\EffectifTotal}\]}
-    }{}%
-    \ifboolKV[ClesStat]{Liste}{\xdef\EffectifTotal{\ListeCompletelen}}{\xdef\EffectifTotal{\SommeDonnees}}%
-    %  %% celui de la moyenne
-    \xdef\Moyenne{\fpeval{\SommeDonnees/\ListeCompletelen}}%	
-    \ifboolKV[ClesStat]{Moyenne}{%
-      \ifboolKV[ClesStat]{Liste}{%
+            +\ListeComplete[##1,2]}=\num{\EffectifTotal}\]
+      }{}%
+      \ifboolKV[ClesStat]{Moyenne}{%
         La somme des donn\'ees de la s\'erie est :%
         \xintifboolexpr{\ListeCompletelen<\useKV[ClesStat]{Coupure}}{%
           \[
-            \num{\ListeComplete[1,2]}\ifboolKV[ClesStat]{Concret}{~\text{\useKV[ClesStat]{Unite}}}{}\xintFor* ##1 in {\xintSeq {2}{\ListeCompletelen}}\do{%
-              +\num{\ListeComplete[##1,2]}\ifboolKV[ClesStat]{Concret}{~\text{\useKV[ClesStat]{Unite}}}{}
-            }=\num{\SommeDonnees}\ifboolKV[ClesStat]{Concret}{~\text{\useKV[ClesStat]{Unite}}}{}%
-          \]}{%
+            \ifnum\ListeComplete[1,2]=1\else\num{\ListeComplete[1,2]}\times\fi\num{\ListeComplete[1,1]}\ifboolKV[ClesStat]{Concret}{~\text{\useKV[ClesStat]{Unite}}}{}\xintFor* ##1 in {\xintSeq {2}{\ListeCompletelen}}\do{%
+              +\ifnum\ListeComplete[##1,2]=1\else\num{\ListeComplete[##1,2]}\times\fi\num{\ListeComplete[##1,1]}\ifboolKV[ClesStat]{Concret}{~\text{\useKV[ClesStat]{Unite}}}{}
+            }=\num{\SommeDonnees}\ifboolKV[ClesStat]{Concret}{~\text{\useKV[ClesStat]{Unite}}}{}
+          \]
+        }{%
           \[
-            \num{\ListeComplete[1,2]}\ifboolKV[ClesStat]{Concret}{~\text{\useKV[ClesStat]{Unite}}}{}\xintFor* ##1 in {\xintSeq {2}{3}}\do{%
-              +\num{\ListeComplete[##1,2]}\ifboolKV[ClesStat]{Concret}{~\text{\useKV[ClesStat]{Unite}}}{}}+\dots\xintFor* ##1 in {\xintSeq {\ListeCompletelen-1}{\ListeCompletelen}}\do{%
-              +\num{\ListeComplete[##1,2]}\ifboolKV[ClesStat]{Concret}{~\text{\useKV[ClesStat]{Unite}}}{}
-            }=\num{\SommeDonnees}\ifboolKV[ClesStat]{Concret}{~\text{\useKV[ClesStat]{Unite}}}{}%
-          \]%
+            \ifnum\ListeComplete[1,2]=1\else\num{\ListeComplete[1,2]}\times\fi\num{\ListeComplete[1,1]}\ifboolKV[ClesStat]{Concret}{~\text{\useKV[ClesStat]{Unite}}}{}\xintFor* ##1 in {\xintSeq {2}{2}}\do{%
+              +\ifnum\ListeComplete[##1,2]=1\else\num{\ListeComplete[##1,2]}\times\fi\num{\ListeComplete[##1,1]}\ifboolKV[ClesStat]{Concret}{~\text{\useKV[ClesStat]{Unite}}}{}
+            }+\dots\xintFor* ##1 in {\xintSeq {\ListeCompletelen-1}{\ListeCompletelen}}\do{%
+              +\ifnum\ListeComplete[##1,2]=1\else\num{\ListeComplete[##1,2]}\times\fi\num{\ListeComplete[##1,1]}\ifboolKV[ClesStat]{Concret}{~\text{\useKV[ClesStat]{Unite}}}{}
+            }=\num{\SommeDonnees}\ifboolKV[ClesStat]{Concret}{~\text{\useKV[ClesStat]{Unite}}}{}
+          \]
+        }%
+        \ifboolKV[ClesStat]{SET}{}{L'effectif total de la s\'erie est :%
+          \ifboolKV[ClesStat]{Liste}{ \num{\EffectifTotal}\\}{%
+            \[\num{\ListeComplete[1,2]}\xintFor* ##1 in {\xintSeq {2}{\ListeCompletelen}}\do{%
+                +\num{\ListeComplete[##1,2]}
+              }=\num{\EffectifTotal}
+            \]%
+          }%
         }%
-        \ifboolKV[ClesStat]{SET}{}{Le nombre de donn\'ees de la s\'erie est \num{\ListeCompletelen}.\\}%
         Donc la moyenne de la s\'erie est \'egale \`a :%
-        \[\frac{\num{\SommeDonnees}\ifboolKV[ClesStat]{Concret}{~\text{\useKV[ClesStat]{Unite}}}{}}{\num{\ListeCompletelen}}%\IfInteger{\fpeval{round(\fpeval{\SommeDonnees/\ListeCompletelen},\useKV[ClesStat]{Precision})}}{=}{\approx}
+        \[\frac{\num{\SommeDonnees}\ifboolKV[ClesStat]{Concret}{~\text{\useKV[ClesStat]{Unite}}}{}}{\num{\EffectifTotal}}%
           \ifboolKV[ClesStat]{ValeurExacte}{}{%
-            \opdiv*{\SommeDonnees}{\ListeCompletelen}{resultatmoy}{restemoy}%
+            \opdiv*{\SommeDonnees}{\EffectifTotal}{resultatmoy}{restemoy}%
             \opround{resultatmoy}{\useKV[ClesStat]{Precision}}{resultatmoy1}%
             \opcmp{resultatmoy}{resultatmoy1}\ifopeq=\else\approx\fi%
-            \num{\fpeval{round(\SommeDonnees/\ListeCompletelen,\useKV[ClesStat]{Precision})}}\ifboolKV[ClesStat]{Concret}{~\text{\useKV[ClesStat]{Unite}}}{}%
+            \num{\fpeval{round(\SommeDonnees/\EffectifTotal,\useKV[ClesStat]{Precision})}}\ifboolKV[ClesStat]{Concret}{~\text{\useKV[ClesStat]{Unite}}}{}%
           }%
         \]%
-      }{Pas de moyenne possible pour une s\'erie de donn\'ees \`a caract\`ere qualitatif.}}{}%
-    %    %  %% celui de l'\'etendue
-    \xintFor* ##1 in {\xintSeq {1}{\ListeCompletelen}}\do{%
-      \xintifboolexpr{\ListeComplete[##1,2]>\DonneeMax}{%
-        \xdef\DonneeMax{\ListeComplete[##1,2]}%
       }{}%
-      \xintifboolexpr{\ListeComplete[##1,2]<\DonneeMin}{%
-        \xdef\DonneeMin{\ListeComplete[##1,2]}%
-      }{}%
-    }%
-    \xdef\EffectifMax{\DonneeMax}%
-    \xdef\Etendue{\fpeval{\DonneeMax-\DonneeMin}}%
-    \ifboolKV[ClesStat]{Etendue}{%
-      \ifboolKV[ClesStat]{Liste}{%
-        L'\'etendue de la s\'erie est \'egale \`a $\num{\DonneeMax}\ifboolKV[ClesStat]{Concret}{~\text{\useKV[ClesStat]{Unite}}}{}-\num{\DonneeMin}\ifboolKV[ClesStat]{Concret}{~\text{\useKV[ClesStat]{Unite}}}{}=\num{\Etendue}$\ifboolKV[ClesStat]{Concret}{~\useKV[ClesStat]{Unite}.}{.}%
-      }{Pas d'\'etendue possible pour une s\'erie de donn\'ees \`a caract\`ere qualitatif.}}{}%
-    % celui de la mediane
-    %%% Recuperation de la mediane %%%%%%%%%%%%%%%%%%%%% 
-    \newcount\Recapmed%
-    \newcount\Recapmeda%
-    \ifodd\number\ListeCompletelen%odd impair
-    \Recapmed=\fpeval{(\ListeCompletelen+1)/2}\relax%
-    \else%
-    \Recapmed=\fpeval{\ListeCompletelen/2}\relax%
-    \Recapmeda=\numexpr\Recapmed+1\relax%
-    \fi%
-    \newcount\Recapk%
-    \Recapk=0%
-    \DTLforeach{mtdb}{\numeroDonnee=Numeric}{\Recapk=\numexpr\Recapk+1\relax%
-      \ifnum\Recapk=\Recapmed%
-      \ifodd\number\ListeCompletelen%
-      \xdef\Mediane{\numeroDonnee}%
-      \else%
-      \xdef\Mediane{\numeroDonnee}%
-      \fi%
+      %  % Affichage des r\'eponses.
+      %  %% pour l'\'etendue
+      \ifboolKV[ClesStat]{Etendue}{L'\'etendue de la s\'erie est \'egale \`a $\num{\ListeComplete[\ListeCompletelen,1]}\ifboolKV[ClesStat]{Concret}{~\text{\useKV[ClesStat]{Unite}}}{}-\num{\ListeComplete[1,1]}\ifboolKV[ClesStat]{Concret}{~\text{\useKV[ClesStat]{Unite}}}{}=\num{\Etendue}$\ifboolKV[ClesStat]{Concret}{~\useKV[ClesStat]{Unite}.}{.}}{}%
+      % pour la m\'ediane
+      %%% Recuperation Mediane
+      \newcount\Recupmed%
+      \newcount\Recupmeda%
+      \ifodd\number\EffectifTotal%odd impair
+      \Recupmed=\fpeval{(\EffectifTotal+1)/2}\relax%
+      \else% pair
+      \Recupmed=\fpeval{\EffectifTotal/2}\relax%
+      \Recupmeda=\numexpr\Recupmed+1\relax%
       \fi%
-      \ifnum\Recapk=\Recapmeda%
-      \xdef\Mediane{\fpeval{(\Mediane+\numeroDonnee)/2}}%
-      \fi%
-    }%
-    %%%
-    \ifboolKV[ClesStat]{Mediane}{%
-      \ifboolKV[ClesStat]{Liste}{%    
-        On range les donn\'ees par ordre croissant :%
-        \nbdonnees=0%
-        \xintifboolexpr{\ListeCompletelen<\useKV[ClesStat]{Coupure}}{%
-          \[\DTLforeach{mtdb}{\numeroDonnee=Numeric}{\num{\numeroDonnee}\ifboolKV[ClesStat]{Concret}{~\text{\useKV[ClesStat]{Unite}}}{}\DTLiflastrow{.}{;}}\]%
-        }{%
-          \medskip%
-          \begin{center}
-            \begin{minipage}{0.9\linewidth}
-              \DTLforeach*{mtdb}{\numeroDonnee=Numeric}{\num{\numeroDonnee}\ifboolKV[ClesStat]{Concret}{~\text{\useKV[ClesStat]{Unite}}}{}\DTLiflastrow{.}{;
-                }\nbdonnees=\fpeval{\nbdonnees+1}\modulo{\nbdonnees}{\useKV[ClesStat]{Coupure}}\xintifboolexpr{\remainder==0}{\\}{}}
-            \end{minipage}
-          \end{center}%
-          \medskip%
+      \newcount\Recupk%
+      \Recupk=0%
+      \xintFor* ##1 in {\xintSeq {1}{\ListeCompletelen}}\do{%
+        \xintFor* ##2 in {\xintSeq {1}{\ListeComplete[##1,2]}}\do{%
+          \Recupk=\numexpr\Recupk+1\relax%
+          \ifnum\Recupk=\Recupmed%
+          \ifodd\number\EffectifTotal%
+          \xdef\Mediane{\ListeComplete[##1,1]}%
+          \else%
+          \xdef\Mediane{\ListeComplete[##1,1]}%
+          \fi%
+          \fi%
+          \ifnum\Recupk=\Recupmeda%
+          \xdef\Mediane{\fpeval{(\Mediane+\ListeComplete[##1,1])/2}}%
+          \fi%
         }%
+      }%
+      %%% 
+      \ifboolKV[ClesStat]{Mediane}{%
+        
         \newcount\med%
         \newcount\meda%
-        \ifodd\number\ListeCompletelen%odd impair
-        \med=\fpeval{(\ListeCompletelen+1)/2}\relax%
-        L'effectif total de la s\'erie est \num{\ListeCompletelen}. Or, $\num{\ListeCompletelen}=\num{\fpeval{\med-1}}+1+\num{\fpeval{\med-1}}$.\\
+        \ifodd\number\EffectifTotal%odd impair
+        \med=\fpeval{(\EffectifTotal+1)/2}\relax%
+        L'effectif total de la s\'erie est \num{\EffectifTotal}. Or, $\num{\EffectifTotal}=\num{\fpeval{\med-1}}+1+\num{\fpeval{\med-1}}$. %
         \else% pair
-        \med=\fpeval{\ListeCompletelen/2}\relax%
+        \med=\fpeval{\EffectifTotal/2}\relax%
         \meda=\numexpr\med+1\relax%
-        L'effectif total de la s\'erie est \num{\ListeCompletelen}. Or, $\num{\ListeCompletelen}=\num{\the\med}+\num{\the\med}$.\\
+        L'effectif total de la s\'erie est \num{\EffectifTotal}. Or, $\num{\EffectifTotal}=\num{\fpeval{\med}}+\num{\fpeval{\med}}$. %
         \fi%
         \newcount\k%
         \k=0%
-        \DTLforeach{mtdb}{\numeroDonnee=Numeric}{\k=\numexpr\k+1\relax%
-          \ifnum\k=\med %La m\'ediane vaut \numeroDonnee\fi
-          \ifodd\number\ListeCompletelen%
-          La m\'ediane de la s\'erie est la \the\med\ieme{} donn\'ee.\\Donc la m\'ediane de la s\'erie est \num{\numeroDonnee}\ifboolKV[ClesStat]{Concret}{~\useKV[ClesStat]{Unite}.}{.}%
-          \xdef\Mediane{\numeroDonnee}%
-          \else%
-          La \the\med\ieme{} donn\'ee est \num{\numeroDonnee}\ifboolKV[ClesStat]{Concret}{~\useKV[ClesStat]{Unite}. }{. }\xdef\Mediane{\numeroDonnee}%
-          \fi%
-          \fi%
-          \ifnum\k=\meda
-          La \the\meda\ieme{} donn\'ee est \num{\numeroDonnee}\ifboolKV[ClesStat]{Concret}{~\useKV[ClesStat]{Unite}.}{.} Donc la m\'ediane de la s\'erie est \xdef\Mediane{\fpeval{(\Mediane+\numeroDonnee)/2}}\num{\Mediane}\ifboolKV[ClesStat]{Concret}{~\useKV[ClesStat]{Unite}.}{.}%
-          \fi%
+        \xintFor* ##1 in {\xintSeq {1}{\ListeCompletelen}}\do{%
+          \xintFor* ##2 in {\xintSeq {1}{\ListeComplete[##1,2]}}\do{%
+            \k=\numexpr\k+1\relax%
+            \ifnum\k=\med%
+            \ifodd\number\EffectifTotal%
+            La m\'ediane de la s\'erie est la \the\med\ieme{} donn\'ee. Donc la m\'ediane de la s\'erie est \num{\ListeComplete[##1,1]}\ifboolKV[ClesStat]{Concret}{~\useKV[ClesStat]{Unite}.}{.}%
+            \else%
+            La \the\med\ieme{} donn\'ee est \num{\ListeComplete[##1,1]}\ifboolKV[ClesStat]{Concret}{~\useKV[ClesStat]{Unite}. }{. }\xdef\Mediane{\ListeComplete[##1,1]}%
+            \fi%
+            \fi%
+            \ifnum\k=\meda%
+            La \the\meda\ieme{} donn\'ee est \num{\ListeComplete[##1,1]}\ifboolKV[ClesStat]{Concret}{~\useKV[ClesStat]{Unite}.}{.}\\Donc la m\'ediane de la s\'erie est \xdef\Mediane{\fpeval{(\Mediane+\ListeComplete[##1,1])/2}}\num{\Mediane}\ifboolKV[ClesStat]{Concret}{~\useKV[ClesStat]{Unite}.}{.}%
+            \fi%
+          }%
         }%
-        %%%%%%%
-      }{Pas de m\'ediane possible pour une s\'erie de donn\'ees \`a caract\`ere qualitatif.}}{}
-    %%% Quartile un
-    \newcount\PfCQuartileUn%
-    \modulo{\ListeCompletelen}{4}\relax%
-    \ifnum\remainder=0%
-    \PfCQuartileUn=\fpeval{\ListeCompletelen/4}%
-    \else%
-    \PfCQuartileUn=\fpeval{ceil(\ListeCompletelen/4)+1}%
-    \fi%
-    \newcount\PfCQunk%
-    \PfCQunk=0%
-    \DTLforeach{mtdb}{\numeroDonnee=Numeric}{\PfCQunk=\numexpr\PfCQunk+1\relax%
-      \ifnum\PfCQunk=\PfCQuartileUn%
-      \xdef\QuartileUn{\numeroDonnee}%
-      \fi%
-    }%
-    %%% Quartile trois
-    \newcount\PfCQuartileTrois%
-    \modulo{\ListeCompletelen}{4}\relax%
-    \ifnum\remainder=0%
-    \PfCQuartileTrois=\fpeval{3*\ListeCompletelen/4}%
-    \else%
-    \PfCQuartileTrois=\fpeval{ceil(3*\ListeCompletelen/4)+1}%
-    \fi%
-    \newcount\PfCQtroisk%
-    \PfCQtroisk=0%
-    \DTLforeach{mtdb}{\numeroDonnee=Numeric}{\PfCQtroisk=\numexpr\PfCQtroisk+1\relax%
-      \ifnum\PfCQtroisk=\PfCQuartileTrois%La m\'ediane vaut \numeroDonnee\fi
-      \xdef\QuartileTrois{\numeroDonnee}%
+      }{}%
+      %%% Quartile un
+      \newcount\PfCQuartileUn%
+      \modulo{\EffectifTotal}{4}\relax%
+      \ifnum\remainder=0%
+      \PfCQuartileUn=\fpeval{\EffectifTotal/4}%
+      \else%
+      \PfCQuartileUn=\fpeval{ceil(\EffectifTotal/4)+1}%
       \fi%
-    }%
-    % Construction du tableau
-    \ifboolKV[ClesStat]{Tableau}{%
-    \ifboolKV[ClesStat]{Liste}{Pas de tableau possible avec la cl\'e Liste.\\Utilisez plut\^ot la cl\'e Sondage si vous voulez un tableau avec cette liste.}{\BuildtabStat}}{}%
-  % Construction du graphique
-  \ifboolKV[ClesStat]{Graphique}{%
-    \ifboolKV[ClesStat]{Liste}{Pas de graphique possible avec la cl\'e Liste.\\Utilisez plut\^ot la cl\'e Sondage si vous voulez un graphique avec cette liste.}{%
-      \ifboolKV[ClesStat]{Barre}{%
-        \buildgraphbarhor%
-      }{\ifboolKV[ClesStat]{Angle}{\buildgraphcq{360}}{\ifboolKV[ClesStat]{SemiAngle}{\buildgraphcq{180}}{\buildgraphq[#1]}}}%
-    }}{}%
-}{%%%%%%%%%%%%%%%%%%%%%D\'ebut quantitatif
-  %  % on effectue les calculs
-  %  %% celui de la somme des donn\'ees
-  \foreachitem\don\in\ListeComplete{\xdef\SommeDonnees{\fpeval{\SommeDonnees+\ListeComplete[\doncnt,1]*\ListeComplete[\doncnt,2]}}}%
-  %  %% celui de l'effectif total
-  \foreachitem\don\in\ListeComplete{\xdef\EffectifTotal{\fpeval{\EffectifTotal+\ListeComplete[\doncnt,2]}}}%
-  %  %% celui de l'\'etendue
-  \xintFor* ##1 in {\xintSeq {1}{\ListeCompletelen}}\do{%
-    \xintifboolexpr{\ListeComplete[##1,1]>\DonneeMax}{%
-      \xdef\DonneeMax{\ListeComplete[##1,1]}%
-    }{}%
-    \xintifboolexpr{\ListeComplete[##1,1]<\DonneeMin}{%
-      \xdef\DonneeMin{\ListeComplete[##1,1]}%
-    }{}%
-  }%
-  % \xdef\EffectifMax{\DonneeMax}%
-  \xdef\Etendue{\fpeval{\DonneeMax-\DonneeMin}}%%
-  %  %% celui de la moyenne
-  \xdef\Moyenne{\fpeval{\SommeDonnees/\EffectifTotal}}%
-  \ifboolKV[ClesStat]{EffectifTotal}{%
-    L'effectif total de la s\'erie est : \[\ListeComplete[1,2]\xintFor* ##1 in
-      {\xintSeq {2}{\ListeCompletelen}}\do{%
-        +\ListeComplete[##1,2]}=\num{\EffectifTotal}\]
-  }{}%
-  \ifboolKV[ClesStat]{Moyenne}{%
-    La somme des donn\'ees de la s\'erie est :%
-    \xintifboolexpr{\ListeCompletelen<\useKV[ClesStat]{Coupure}}{%
-      \[
-        \ifnum\ListeComplete[1,2]=1\else\num{\ListeComplete[1,2]}\times\fi\num{\ListeComplete[1,1]}\ifboolKV[ClesStat]{Concret}{~\text{\useKV[ClesStat]{Unite}}}{}\xintFor* ##1 in {\xintSeq {2}{\ListeCompletelen}}\do{%
-          +\ifnum\ListeComplete[##1,2]=1\else\num{\ListeComplete[##1,2]}\times\fi\num{\ListeComplete[##1,1]}\ifboolKV[ClesStat]{Concret}{~\text{\useKV[ClesStat]{Unite}}}{}
-        }=\num{\SommeDonnees}\ifboolKV[ClesStat]{Concret}{~\text{\useKV[ClesStat]{Unite}}}{}
-      \]
-    }{%
-      \[
-        \ifnum\ListeComplete[1,2]=1\else\num{\ListeComplete[1,2]}\times\fi\num{\ListeComplete[1,1]}\ifboolKV[ClesStat]{Concret}{~\text{\useKV[ClesStat]{Unite}}}{}\xintFor* ##1 in {\xintSeq {2}{2}}\do{%
-          +\ifnum\ListeComplete[##1,2]=1\else\num{\ListeComplete[##1,2]}\times\fi\num{\ListeComplete[##1,1]}\ifboolKV[ClesStat]{Concret}{~\text{\useKV[ClesStat]{Unite}}}{}
-        }+\dots\xintFor* ##1 in {\xintSeq {\ListeCompletelen-1}{\ListeCompletelen}}\do{%
-          +\ifnum\ListeComplete[##1,2]=1\else\num{\ListeComplete[##1,2]}\times\fi\num{\ListeComplete[##1,1]}\ifboolKV[ClesStat]{Concret}{~\text{\useKV[ClesStat]{Unite}}}{}
-        }=\num{\SommeDonnees}\ifboolKV[ClesStat]{Concret}{~\text{\useKV[ClesStat]{Unite}}}{}
-      \]
-    }%
-    \ifboolKV[ClesStat]{SET}{}{L'effectif total de la s\'erie est :%
-      \ifboolKV[ClesStat]{Liste}{ \num{\EffectifTotal}\\}{%
-        \[\num{\ListeComplete[1,2]}\xintFor* ##1 in {\xintSeq {2}{\ListeCompletelen}}\do{%
-            +\num{\ListeComplete[##1,2]}
-          }=\num{\EffectifTotal}
-        \]%
-      }%
-    }%
-    Donc la moyenne de la s\'erie est \'egale \`a :%
-    \[\frac{\num{\SommeDonnees}\ifboolKV[ClesStat]{Concret}{~\text{\useKV[ClesStat]{Unite}}}{}}{\num{\EffectifTotal}}%
-      \ifboolKV[ClesStat]{ValeurExacte}{}{%
-        \opdiv*{\SommeDonnees}{\EffectifTotal}{resultatmoy}{restemoy}%
-        \opround{resultatmoy}{\useKV[ClesStat]{Precision}}{resultatmoy1}%
-        \opcmp{resultatmoy}{resultatmoy1}\ifopeq=\else\approx\fi%
-        \num{\fpeval{round(\SommeDonnees/\EffectifTotal,\useKV[ClesStat]{Precision})}}\ifboolKV[ClesStat]{Concret}{~\text{\useKV[ClesStat]{Unite}}}{}%
-      }%
-    \]%
-  }{}%
-  %  % Affichage des r\'eponses.
-  %  %% pour l'\'etendue
-  \ifboolKV[ClesStat]{Etendue}{L'\'etendue de la s\'erie est \'egale \`a $\num{\ListeComplete[\ListeCompletelen,1]}\ifboolKV[ClesStat]{Concret}{~\text{\useKV[ClesStat]{Unite}}}{}-\num{\ListeComplete[1,1]}\ifboolKV[ClesStat]{Concret}{~\text{\useKV[ClesStat]{Unite}}}{}=\num{\Etendue}$\ifboolKV[ClesStat]{Concret}{~\useKV[ClesStat]{Unite}.}{.}}{}%
-  % pour la m\'ediane
-  %%% Recuperation Mediane
-  \newcount\Recupmed%
-  \newcount\Recupmeda%
-  \ifodd\number\EffectifTotal%odd impair
-  \Recupmed=\fpeval{(\EffectifTotal+1)/2}\relax%
-  \else% pair
-  \Recupmed=\fpeval{\EffectifTotal/2}\relax%
-  \Recupmeda=\numexpr\Recupmed+1\relax%
-  \fi%
-  \newcount\Recupk%
-  \Recupk=0%
-  \xintFor* ##1 in {\xintSeq {1}{\ListeCompletelen}}\do{%
-    \xintFor* ##2 in {\xintSeq {1}{\ListeComplete[##1,2]}}\do{%
-        \Recupk=\numexpr\Recupk+1\relax%
-        \ifnum\Recupk=\Recupmed%
-        \ifodd\number\EffectifTotal%
-        \xdef\Mediane{\ListeComplete[##1,1]}%
-        \else%
-        \xdef\Mediane{\ListeComplete[##1,1]}%
-        \fi%
-        \fi%
-        \ifnum\Recupk=\Recupmeda%
-        \xdef\Mediane{\fpeval{(\Mediane+\ListeComplete[##1,1])/2}}%
-        \fi%
-      }%
-    }%
-  %%%
-  \ifboolKV[ClesStat]{Mediane}{%
-    
-    \newcount\med%
-    \newcount\meda%
-    \ifodd\number\EffectifTotal%odd impair
-    \med=\fpeval{(\EffectifTotal+1)/2}\relax%
-    L'effectif total de la s\'erie est \num{\EffectifTotal}. Or, $\num{\EffectifTotal}=\num{\fpeval{\med-1}}+1+\num{\fpeval{\med-1}}$. %
-    \else% pair
-    \med=\fpeval{\EffectifTotal/2}\relax%
-    \meda=\numexpr\med+1\relax%
-    L'effectif total de la s\'erie est \num{\EffectifTotal}. Or, $\num{\EffectifTotal}=\num{\fpeval{\med}}+\num{\fpeval{\med}}$. %
-    \fi%
-    \newcount\k%
-    \k=0%
-    \xintFor* ##1 in {\xintSeq {1}{\ListeCompletelen}}\do{%
-      \xintFor* ##2 in {\xintSeq {1}{\ListeComplete[##1,2]}}\do{%
-        \k=\numexpr\k+1\relax%
-        \ifnum\k=\med%
-        \ifodd\number\EffectifTotal%
-        La m\'ediane de la s\'erie est la \the\med\ieme{} donn\'ee. Donc la m\'ediane de la s\'erie est \num{\ListeComplete[##1,1]}\ifboolKV[ClesStat]{Concret}{~\useKV[ClesStat]{Unite}.}{.}%
-        \else%
-        La \the\med\ieme{} donn\'ee est \num{\ListeComplete[##1,1]}\ifboolKV[ClesStat]{Concret}{~\useKV[ClesStat]{Unite}. }{. }\xdef\Mediane{\ListeComplete[##1,1]}%
-        \fi%
-        \fi%
-        \ifnum\k=\meda%
-        La \the\meda\ieme{} donn\'ee est \num{\ListeComplete[##1,1]}\ifboolKV[ClesStat]{Concret}{~\useKV[ClesStat]{Unite}.}{.}\\Donc la m\'ediane de la s\'erie est \xdef\Mediane{\fpeval{(\Mediane+\ListeComplete[##1,1])/2}}\num{\Mediane}\ifboolKV[ClesStat]{Concret}{~\useKV[ClesStat]{Unite}.}{.}%
-        \fi%
+      \newcount\PfCQunk%
+      \PfCQunk=0%
+      \xintFor* ##1 in {\xintSeq {1}{\ListeCompletelen}}\do{%
+        \xintFor* ##2 in {\xintSeq {1}{\ListeComplete[##1,2]}}\do{%
+          \PfCQunk=\numexpr\PfCQunk+1\relax%
+          \ifnum\PfCQunk=\PfCQuartileUn%
+          \xdef\QuartileUn{\ListeComplete[##1,1]}%
+          \fi%
+        }%
       }%
-    }%
-  }{}%
-  %%% Quartile un
-  \newcount\PfCQuartileUn%
-  \modulo{\EffectifTotal}{4}\relax%
-  \ifnum\remainder=0%
-  \PfCQuartileUn=\fpeval{\EffectifTotal/4}%
-  \else%
-  \PfCQuartileUn=\fpeval{ceil(\EffectifTotal/4)+1}%
-  \fi%
-  \newcount\PfCQunk%
-  \PfCQunk=0%
-  \xintFor* ##1 in {\xintSeq {1}{\ListeCompletelen}}\do{%
-    \xintFor* ##2 in {\xintSeq {1}{\ListeComplete[##1,2]}}\do{%
-      \PfCQunk=\numexpr\PfCQunk+1\relax%
-      \ifnum\PfCQunk=\PfCQuartileUn%
-      \xdef\QuartileUn{\ListeComplete[##1,1]}%
-      \fi%
-    }%
-  }%
-  %%% Quartile trois
-  \newcount\PfCQuartileTrois%
-  \modulo{\EffectifTotal}{4}\relax%
-  \ifnum\remainder=0%
-  \PfCQuartileTrois=\fpeval{3*\EffectifTotal/4}%
-  \else%
-  \PfCQuartileTrois=\fpeval{ceil(3*\EffectifTotal/4)+1}%
-  \fi%
-  \newcount\PfCQtroisk%
-  \PfCQtroisk=0%
-  \xintFor* ##1 in {\xintSeq {1}{\ListeCompletelen}}\do{%
-    \xintFor* ##2 in {\xintSeq {1}{\ListeComplete[##1,2]}}\do{%
-      \PfCQtroisk=\numexpr\PfCQtroisk+1\relax%
-      \ifnum\PfCQtroisk=\PfCQuartileTrois%
-      \xdef\QuartileTrois{\ListeComplete[##1,1]}%
+      %%% Quartile trois
+      \newcount\PfCQuartileTrois%
+      \modulo{\EffectifTotal}{4}\relax%
+      \ifnum\remainder=0%
+      \PfCQuartileTrois=\fpeval{3*\EffectifTotal/4}%
+      \else%
+      \PfCQuartileTrois=\fpeval{ceil(3*\EffectifTotal/4)+1}%
       \fi%
+      \newcount\PfCQtroisk%
+      \PfCQtroisk=0%
+      \xintFor* ##1 in {\xintSeq {1}{\ListeCompletelen}}\do{%
+        \xintFor* ##2 in {\xintSeq {1}{\ListeComplete[##1,2]}}\do{%
+          \PfCQtroisk=\numexpr\PfCQtroisk+1\relax%
+          \ifnum\PfCQtroisk=\PfCQuartileTrois%
+          \xdef\QuartileTrois{\ListeComplete[##1,1]}%
+          \fi%
+        }%
+      }%
+      % Construction de tableau
+      \ifboolKV[ClesStat]{Tableau}{\BuildtabStat}{}%
+      % Construction du graphique ??
+      \ifboolKV[ClesStat]{Graphique}{%
+        \ifboolKV[ClesStat]{Angle}{\buildgraphcq{360}}{\ifboolKV[ClesStat]{SemiAngle}{\buildgraphcq{180}}{\buildgraph[#1]}}
+      }{}%
     }%
   }%
-  % Construction de tableau
-  \ifboolKV[ClesStat]{Tableau}{\BuildtabStat}{}%
-  % Construction du graphique ??
-  \ifboolKV[ClesStat]{Graphique}{%
-    \ifboolKV[ClesStat]{Angle}{\buildgraphcq{360}}{\ifboolKV[ClesStat]{SemiAngle}{\buildgraphcq{180}}{\buildgraph[#1]}}
-  }{}%
-}%
-}%
 }%
 
 %%%
@@ -12991,7 +13617,7 @@ Barre=false,Longueur=10cm,Hauteur=5mm,Bicolore=false,EcartBarre=0%Grille est dis
 
 \newcommand\MPRadar[6]{%
   \ifluatex
-   \mplibforcehmode
+  \mplibforcehmode
   \begin{mplibcode}
     pair O;
     O=(0,0);
@@ -13120,18 +13746,18 @@ Barre=false,Longueur=10cm,Hauteur=5mm,Bicolore=false,EcartBarre=0%Grille est dis
   \useKVdefault[ClesRadar]%
   \setKV[ClesRadar]{#1}%
   \ignoreemptyitems%
-  \setsepchar[*]{,}%  
+  \setsepchar[*]{,}%
   \readlist*\ListeRadar{#2}%
   \toklisteradara{}%
   \foreachitem\compteur\in\ListeRadar{\expandafter\UpdateRadara\compteur\nil}%
   \ifboolKV[ClesRadar]{Disciplines}{}{%
     \toklisteradarb{}%
     \foreachitem\compteur\in\ListeRadar{\expandafter\UpdateRadarb\compteur\nil}%
-  }
+  }%
   \ifboolKV[ClesRadar]{MoyenneClasse}{}{%
     \toklisteradarc{}%
     \foreachitem\compteur\in\ListeRadar{\expandafter\UpdateRadarc\compteur\nil}%
-  }
+  }%
   \MPRadar{\useKV[ClesRadar]{Rayon}}{\the\toklisteradarb}{\useKV[ClesRadar]{Pas}}{\useKV[ClesRadar]{Reference}}{\the\toklisteradara}{\the\toklisteradarc}%
 }
 
@@ -13147,8 +13773,8 @@ Barre=false,Longueur=10cm,Hauteur=5mm,Bicolore=false,EcartBarre=0%Grille est dis
   \useKVdefault[ClesBarre]%
   \setKV[ClesBarre]{#1}%
   \xdef\NomComp{\useKV[ClesBarre]{Nom}}%
-  \xdef\TexteOrigine{\useKV[ClesBarre]{Origine}}
-  \xdef\TexteReference{\useKV[ClesBarre]{Reference}}
+  \xdef\TexteOrigine{\useKV[ClesBarre]{Origine}}%
+  \xdef\TexteReference{\useKV[ClesBarre]{Reference}}%
   \xdef\CouleurFond{\useKV[ClesBarre]{CouleurFond}}%
   \xdef\CouleurGrad{\useKV[ClesBarre]{CouleurGraduation}}%
   \xdef\CouleurBarre{\useKV[ClesBarre]{CouleurBarre}}%
@@ -13166,15 +13792,15 @@ Barre=false,Longueur=10cm,Hauteur=5mm,Bicolore=false,EcartBarre=0%Grille est dis
         }{\xintifboolexpr{#2<\useKV[ClesBarre]{LimiteS}}{%
             \fill [\CouleurS] (0,0) rectangle (#2/100*\barrewidth, 0.15);
           }{\fill [\CouleurM] (0,0) rectangle (#2/100*\barrewidth, 0.15);}
-        }
-      }
+        }%
+      }%
       \node[anchor=south west] at (0,0.5em) {\NomComp};%
       \node[anchor=north] at (0,-0.25em) {\TexteOrigine};
       \node[anchor=north] at (\barrewidth,-0.25em) {\TexteReference};
       \ifboolKV[ClesBarre]{Graduation}{%
         \foreach \s in {1,...,\fpeval{\useKV[ClesBarre]{Pas}-1}}%
         {
-          \draw[\CouleurGrad] (\s/\useKV[ClesBarre]{Pas}*\barrewidth,0)--(\s/\useKV[ClesBarre]{Pas}*\barrewidth,0.15); 
+          \draw[\CouleurGrad] (\s/\useKV[ClesBarre]{Pas}*\barrewidth,0)--(\s/\useKV[ClesBarre]{Pas}*\barrewidth,0.15);
         }
       }{}
       \foreach \s in {\useKV[ClesBarre]{LimiteI},\useKV[ClesBarre]{LimiteF},\useKV[ClesBarre]{LimiteS}}%
@@ -13192,7 +13818,7 @@ Barre=false,Longueur=10cm,Hauteur=5mm,Bicolore=false,EcartBarre=0%Grille est dis
       \ifboolKV[ClesBarre]{Graduation}{%
       \foreach \s in {1,...,\fpeval{\useKV[ClesBarre]{Pas}-1}}%
       {
-        \draw[\CouleurGrad] (\s/\useKV[ClesBarre]{Pas}*\barrewidth,0)--(\s/\useKV[ClesBarre]{Pas}*\barrewidth,0.15); 
+        \draw[\CouleurGrad] (\s/\useKV[ClesBarre]{Pas}*\barrewidth,0)--(\s/\useKV[ClesBarre]{Pas}*\barrewidth,0.15);
       }}{}%
     \end{tikzpicture}%
   }
@@ -13203,46 +13829,46 @@ Barre=false,Longueur=10cm,Hauteur=5mm,Bicolore=false,EcartBarre=0%Grille est dis
 %%%
 \setKVdefault[ClesEquation]{Ecart=0.5,Fleches=false,FlecheDiv=false,Laurent=false,Decomposition=false,Terme=false,Composition=false,Symbole=false,Decimal=false,Entier=false,Lettre=x,Solution=false,LettreSol=true,Bloc=false,Simplification=false,CouleurTerme=black,CouleurCompo=black,CouleurSous=red,CouleurSymbole=orange,Verification=false,Nombre=0,Egalite=false,Produit=false,Facteurs=false,Carre=false,Exact=false,Pose=false,Equivalence=false}
 
-\newcommand\rightcomment[4]%
-  {\begin{tikzpicture}[remember picture,overlay]
-   \draw[Cfleches,-stealth]
-     ($({pic cs:#3}|-{pic cs:#1})+(\useKV[ClesEquation]{Ecart},0)$)
-     .. controls +(0.2,-0.05) and +(0.2,0.1) ..
-     node[right,align=left]{#4}
-     ($({pic cs:#3}|-{pic cs:#2})+(\useKV[ClesEquation]{Ecart},0.1)$);
-   \end{tikzpicture}%
- }
+\newcommand\rightcomment[4]{%
+  \begin{tikzpicture}[remember picture,overlay]
+    \draw[Cfleches,-stealth]
+    ($({pic cs:#3}|-{pic cs:#1})+(\useKV[ClesEquation]{Ecart},0)$)
+    .. controls +(0.2,-0.05) and +(0.2,0.1) ..
+    node[right,align=left]{#4}
+    ($({pic cs:#3}|-{pic cs:#2})+(\useKV[ClesEquation]{Ecart},0.1)$);
+  \end{tikzpicture}%
+}%
 
- \newcommand\leftcomment[4]%
-  {\begin{tikzpicture}[remember picture,overlay]
-   \draw[Cfleches,-stealth]
-     ($({pic cs:#3}|-{pic cs:#1})-(\useKV[ClesEquation]{Ecart},0)$)
-     .. controls +(-0.2,-0.05) and +(-0.2,0.1) ..
-     node[left,align=right]{#4}
-     ($({pic cs:#3}|-{pic cs:#2})-(\useKV[ClesEquation]{Ecart},-0.1)$);
-   \end{tikzpicture}%
- }
+\newcommand\leftcomment[4]{%
+  \begin{tikzpicture}[remember picture,overlay]
+    \draw[Cfleches,-stealth]
+    ($({pic cs:#3}|-{pic cs:#1})-(\useKV[ClesEquation]{Ecart},0)$)
+    .. controls +(-0.2,-0.05) and +(-0.2,0.1) ..
+    node[left,align=right]{#4}
+    ($({pic cs:#3}|-{pic cs:#2})-(\useKV[ClesEquation]{Ecart},-0.1)$);
+  \end{tikzpicture}%
+}%
 
- \newcommand\Rightcomment[4]%
-  {\begin{tikzpicture}[remember picture,overlay]
-   \draw[Cfleches,-stealth]
-     ($({pic cs:#3}|-{pic cs:#1})+(\useKV[ClesEquation]{Ecart},0)$)
-     .. controls +(0.2,-0.05) and +(0.2,0.1) ..
-     node[right,align=left]{#4}
-     ($({pic cs:#3}|-{pic cs:#2})+(\useKV[ClesEquation]{Ecart},0.1)$);
-   \end{tikzpicture}%
- }
- \newcommand\Leftcomment[4]%
-  {\begin{tikzpicture}[remember picture,overlay]
-   \draw[Cfleches,-stealth]
-     ($({pic cs:#3}|-{pic cs:#1})-(\useKV[ClesEquation]{Ecart},0)$)
-     .. controls +(-0.2,-0.05) and +(-0.2,0.1) ..
-     node[left,align=right]{#4}
-     ($({pic cs:#3}|-{pic cs:#2})-(\useKV[ClesEquation]{Ecart},-0.1)$);
-   \end{tikzpicture}%
- }
+\newcommand\Rightcomment[4]{%
+  \begin{tikzpicture}[remember picture,overlay]
+    \draw[Cfleches,-stealth]
+    ($({pic cs:#3}|-{pic cs:#1})+(\useKV[ClesEquation]{Ecart},0)$)
+    .. controls +(0.2,-0.05) and +(0.2,0.1) ..
+    node[right,align=left]{#4}
+    ($({pic cs:#3}|-{pic cs:#2})+(\useKV[ClesEquation]{Ecart},0.1)$);
+  \end{tikzpicture}%
+}%
+\newcommand\Leftcomment[4]{%
+  \begin{tikzpicture}[remember picture,overlay]
+    \draw[Cfleches,-stealth]
+    ($({pic cs:#3}|-{pic cs:#1})-(\useKV[ClesEquation]{Ecart},0)$)
+    .. controls +(-0.2,-0.05) and +(-0.2,0.1) ..
+    node[left,align=right]{#4}
+    ($({pic cs:#3}|-{pic cs:#2})-(\useKV[ClesEquation]{Ecart},-0.1)$);
+  \end{tikzpicture}%
+}%
 
- % Pour "oublier" les tikzmarks. En cas de plusieurs utilisations de la macro \ResolEquation
+% Pour "oublier" les tikzmarks. En cas de plusieurs utilisations de la macro \ResolEquation
 \newcounter{Nbequa}
 \setcounter{Nbequa}{0}
 
@@ -16991,7 +17617,7 @@ Barre=false,Longueur=10cm,Hauteur=5mm,Bicolore=false,EcartBarre=0%Grille est dis
 %%%
 % Reperage
 %%%
-\setKVdefault[ClesReperage]{Unitex=1,Pasx=1,Unitey=1,Pasy=1,Unitez=1,Pasz=1,DemiDroite=false,Droite=false,Plan=false,Trace=false,ListeSegment={},Espace=false,Sphere=false,AnglePhi=30,CouleurLa=white,CouleurLon=Tomato,AffichageNom=false,AffichageGrad=false,AffichageAbs=0,AffichageCoord=false,LectureCoord=false,ValeurUnitex=1,ValeurUnitey=1,ValeurOrigine=0,NomOrigine=O,EchelleEspace=50,CouleurCoord=black,Thermometre=false,Mercure=false}
+\setKVdefault[ClesReperage]{Unitex=1,Pasx=1,Unitey=1,Pasy=1,Unitez=1,Pasz=1,DemiDroite=false,Droite=false,Plan=false,Trace=false,ListeSegment={},Espace=false,Sphere=false,AnglePhi=30,CouleurLa=white,CouleurLon=Tomato,AffichageNom=false,AffichageGrad=false,AffichageAbs=0,AffichageCoord=false,LectureCoord=false,ValeurUnitex=1,ValeurUnitey=1,ValeurOrigine=0,NomOrigine=O,EchelleEspace=50,CouleurCoord=black,Thermometre=false,Mercure=false,ValeurMin=-4000,ValeurMax=4000,Etages=4}
 % ValeurOrigine permet de faire des morceaux de demi-droite gradu\'ee en passant par droite :)
 
 \def\Updatetoksdroite#1/#2\nil{\addtotok\toklistepointdroite{#1,"#2",}}
@@ -18458,6 +19084,12 @@ Barre=false,Longueur=10cm,Hauteur=5mm,Bicolore=false,EcartBarre=0%Grille est dis
     if minx>(-pasx-1):
     minx:=-2*pasx-1;
     fi;
+    if minx<\useKV[ClesReperage]{ValeurMin}:
+    minx:=\useKV[ClesReperage]{ValeurMin};
+    fi;
+    if maxx>\useKV[ClesReperage]{ValeurMax}:
+    maxx:=\useKV[ClesReperage]{ValeurMax};
+    fi;
     % -----
     pair A,B,C;
     A=(0,0);
@@ -18977,6 +19609,130 @@ Barre=false,Longueur=10cm,Hauteur=5mm,Bicolore=false,EcartBarre=0%Grille est dis
   \fi
 }
 
+\def\MPNewDROITEGradueeMulti#1#2{%
+  % #1 : liste des points \`a placer en pas. pour g\'erer le cas des rep\'erages fractionnaires
+  % #2 : liste des noms des points
+  \ifluatex
+  \mplibforcehmode
+  \begin{mplibcode}
+    maxx:=0;
+    minx:=4000;
+    unitex:=\useKV[ClesReperage]{Unitex}*cm;
+    pasx:=\useKV[ClesReperage]{Pasx};
+    unitp:=unitex/pasx;%unit\'e de d\'eplacement
+    ValeurUnitex:=\useKV[ClesReperage]{ValeurUnitex};
+    ValeurOrigine:=\useKV[ClesReperage]{ValeurOrigine};
+    AffichageGrad:=\AffichageGrad;
+    AffichageCoord:=\useKV[ClesReperage]{AffichageAbs};
+    AffichageNom:=\AffichageNom;
+    numeric valeur[];
+    vardef titi(text t)=
+    n:=0;
+    for p_=t:
+    n:=n+1;
+    valeur[n]=p_;
+    endfor;
+    enddef;
+    titi(#1);
+    % Détermination des abscisses maximale et minimale
+    for k=1 upto n:
+    if valeur[k]>maxx:
+    maxx:=valeur[k];
+    fi;
+    if valeur[k]<minx:
+    minx:=valeur[k];
+    fi;
+    endfor;
+    maxx:=maxx+(pasx div 2);
+    minx:=minx-(pasx div 2);
+    if maxx<(pasx+1):
+    maxx:=2*pasx-1;
+    fi;
+    if minx>(-pasx-1):
+    minx:=-2*pasx-1;
+    fi;
+    if minx<\useKV[ClesReperage]{ValeurMin}:
+    minx:=\useKV[ClesReperage]{ValeurMin};
+    fi;
+    if maxx>\useKV[ClesReperage]{ValeurMax}:
+    maxx:=\useKV[ClesReperage]{ValeurMax};
+    fi;
+%    % -----
+    pair A[],B[],C[];
+    for l=0 upto (\useKV[ClesReperage]{Etages}-1):
+    A[l]=(0,-l*cm);
+    B[l]=unitp*(maxx,0)+(0,-l*cm);
+    C[l]=unitp*(minx,0)+(0,-l*cm);
+    % On trace la demi-droite
+    drawarrow (C[l]+unitp*(-0.75,0))--(B[l]+unitp*(0.75,0));
+    % marquage secondaire
+    marque_s:=marque_s/3;
+    if ((maxx-minx) mod 2)=0:
+      for k=(minx+1) step 2 until (maxx-1):
+      draw marquedemidroite(C[l],B[l]);
+      draw marquesegment((k/maxx)[A[l],B[l]],((k+1)/maxx)[A[l],B[l]]);
+      endfor;
+      else:
+      for k=(minx) step 2 until (maxx-1):
+        draw marquesegment((k/maxx)[A[l],B[l]],((k+1)/maxx)[A[l],B[l]]);
+     endfor;
+     fi;
+    % marquage primaire
+    marque_s:=marque_s*3;
+    for k=0 step pasx until (maxx-pasx):
+    draw marquesegment((k/maxx)[A[l],B[l]],((k+pasx)/maxx)[A[l],B[l]]);
+    endfor;
+    for k=0 step -pasx until (minx+pasx):
+    draw marquesegment((k/maxx)[A[l],B[l]],((k-pasx)/maxx)[A[l],B[l]]);
+    endfor;
+    endfor;
+    % On trace les zoom
+    for k=0 upto (\useKV[ClesReperage]{Etages}-2):
+    lp:=floor(1+uniformdeviate(8));
+    draw (lp/10)[A[k],B[k]]--A[k+1] dashed evenly scaled 0.5 withcolor 0.5white;
+    draw ((lp+1)/10)[A[k],B[k]]--B[k+1] dashed evenly scaled 0.5 withcolor 0.5white;
+    endfor;
+    % Labelisation
+    m_c:=m_c*3;
+    marque_p:="croix";
+    labeloffset:=labeloffset*2;
+    label.top(TEX("\footnotesize\num{"&decimal(ValeurUnitex)&"}"),unitex*(1,0));
+    label.top(TEX("\footnotesize\num{"&decimal(ValeurOrigine)&"}"),A[0]);
+    if AffichageGrad>0:
+    for k=((minx+(minx mod pasx)) div pasx) upto (maxx div pasx):
+    if (k<0) or (k>1):
+    label.bot(TEX("\footnotesize\num{\fpeval{"&decimal(ValeurOrigine)&"+"&decimal(ValeurUnitex-ValeurOrigine)&"*"&decimal(k)&"}}"),unitex*(k,0));%%%
+    fi;
+    endfor;
+    fi;
+    labeloffset:=labeloffset/2;
+    vardef tata(text t)=%on place les points
+    if AffichageNom>0:
+    n:=0;
+    for p_=t:
+    n:=n+1;
+    label.top(TEX(p_),unitp*(valeur[n],0)+(0,(-\useKV[ClesReperage]{Etages}+1)*cm));
+    pointe(unitp*(valeur[n],0));
+    endfor;
+    fi;
+    if AffichageCoord=3:
+    n:=0;
+    for p_=t:
+    n:=n+1;
+    if p_<>"":
+    drawarrow (unitp*(valeur[n],-1)+(0,(-\useKV[ClesReperage]{Etages}+1)*cm))--(unitp*(valeur[n],-0.3)+(0,(-\useKV[ClesReperage]{Etages}+1)*cm));
+    label.bot(btex \hbox to4em{\dotfill} etex,(unitp*(valeur[n],-1))+(0,(-\useKV[ClesReperage]{Etages}+0.5)*cm));
+    %pointe(unitp*(valeur[n],0));
+    fi;
+    endfor;
+    fi;
+    enddef;
+    %%%
+    tata(#2);
+  \end{mplibcode}
+  \fi
+}
+
 % Pour construire les droite/demi-droite gradu\'ee
 \def\builddemidroitenew{%
   \toklistepointdroite{}%
@@ -19007,7 +19763,7 @@ Barre=false,Longueur=10cm,Hauteur=5mm,Bicolore=false,EcartBarre=0%Grille est dis
   }%
 }%
 
-\newcommand\Reperage[2][]{%
+\NewDocumentCommand\Reperage{o m}{%
   \useKVdefault[ClesReperage]%
   \setKV[ClesReperage]{#1}%
   \ifboolKV[ClesReperage]{Espace}{%
@@ -19029,6 +19785,23 @@ Barre=false,Longueur=10cm,Hauteur=5mm,Bicolore=false,EcartBarre=0%Grille est dis
   }%
 }%
 
+\NewDocumentCommand\ReperageMulti{o m}{%
+  \useKVdefault[ClesReperage]%
+  \setKV[ClesReperage]{#1}%
+  \setsepchar[*]{,*/}\ignoreemptyitems%
+  \readlist*\ListePointDroite{#2}%
+  \toklistepointdroite{}%
+  \toklistenompointdemidroite{}%
+  \xdef\AffichageNom{0}\ifboolKV[ClesReperage]{AffichageNom}{\xdef\AffichageNom{1}}{}
+  \xdef\AffichageCoord{\useKV[ClesReperage]{AffichageAbs}}
+  \xdef\AffichageGrad{0}\ifboolKV[ClesReperage]{AffichageGrad}{\xdef\AffichageGrad{1}}{}
+  \foreachitem\compteur\in\ListePointDroite{\expandafter\Updatetoksdemidroite\compteur\nil}%
+  \xdef\Listedesvaleursaplacersurlademidroite{}%
+  \foreachitem\compteur\in\ListePointDroite{\xdef\Listedesvaleursaplacersurlademidroite{\Listedesvaleursaplacersurlademidroite,\ListePointDroite[\compteurcnt,1]}}%
+  \MPNewDROITEGradueeMulti{\Listedesvaleursaplacersurlademidroite}{\the\toklistenompointdemidroite}%
+  \setsepchar{,}%
+}%
+
 %%%
 % Puissances
 %%%
@@ -19143,7 +19916,7 @@ Barre=false,Longueur=10cm,Hauteur=5mm,Bicolore=false,EcartBarre=0%Grille est dis
   }%
 }%
 
-\newcommand\Lg[2][]{%
+\NewDocumentCommand\Lg{o m}{%
   \useKVdefault[Unites]%
   \setKV[Unites]{#1}%
   \ifboolKV[Unites]{nm}{%
@@ -19173,7 +19946,7 @@ Barre=false,Longueur=10cm,Hauteur=5mm,Bicolore=false,EcartBarre=0%Grille est dis
   }%
 }%
 
-\newcommand\Masse[2][]{%
+\NewDocumentCommand\Masse{o m}{%
   \useKVdefault[Unites]%
   \setKV[Unites]{#1}%
   \ifboolKV[Unites]{ng}{%
@@ -19323,7 +20096,7 @@ Barre=false,Longueur=10cm,Hauteur=5mm,Bicolore=false,EcartBarre=0%Grille est dis
 %%%
 % Tableaux d'unit\'es
 %%%
-\setKVdefault[ClesTableaux]{Virgule=true,Incline=false,Entiers=false,Decimaux=false,Milliards=false,Millions=false,Micro=false,Nano=false,Partie=false,CouleurG=gray!15,CouleurM=gray!15,Couleurm=gray!15,Couleuru=gray!15,Couleurd=gray!15,Classes=false,Nombres=false,Puissances=false,NbLignes=2,Metre=false,Are=false,Capacite=false,Carre=false,Cube=false,Litre=false,Gramme=false,Fleches=false,FlechesB=false,FlechesH=false,Colonnes=false,Prefixes=false,Escalier=false}
+\setKVdefault[ClesTableaux]{Virgule=true,Incline=false,Entiers=false,Decimaux=false,Milliards=false,Millions=false,Micro=false,Nano=false,Partie=false,CouleurG=gray!15,CouleurM=gray!15,Couleurm=gray!15,Couleuru=gray!15,Couleurd=gray!15,Classes=false,Nombres=false,Puissances=false,NbLignes=2,Metre=false,Are=false,Capacite=false,Carre=false,Cube=false,Litre=false,Gramme=false,Fleches=false,FlechesB=false,FlechesH=false,Colonnes=false,Prefixes=false,Escalier=false,Taille=5,Largeur=4.75em}
 
 \newcommand\PfCTBstrut{\rule[-1.2ex]{0pt}{3.8ex}} % Top and Bottom strut
 \newcommand\PfCTstrut{\rule{0pt}{3.8ex}} % Top strut
@@ -19592,6 +20365,7 @@ Barre=false,Longueur=10cm,Hauteur=5mm,Bicolore=false,EcartBarre=0%Grille est dis
   %
   \ifboolKV[ClesTableaux]{Entiers}{%
     \xdef\DecalageLigne{0}%
+    \xdef\TailleFonte{\useKV[ClesTableaux]{Taille}}%
     \setlength{\tabcolsep}{0.01\tabcolsep}%
     \begin{center}%
       %
@@ -19602,7 +20376,7 @@ Barre=false,Longueur=10cm,Hauteur=5mm,Bicolore=false,EcartBarre=0%Grille est dis
       \ifboolKV[ClesTableaux]{Milliards}{12}{%
       \ifboolKV[ClesTableaux]{Millions}{9}{6}%
       }%
-      }{m{4.75em}}}%
+      }{m{\useKV[ClesTableaux]{Largeur}}}}%
     \ifboolKV[ClesTableaux]{Classes}{%
         \hline
         \xdef\DecalageLigne{\fpeval{\DecalageLigne+1}}\ifboolKV[ClesTableaux]{Milliards}{\Block[draw,fill={\useKV[ClesTableaux]{CouleurG}}]{1-3}{Classe des milliards}&&&\Block[draw,fill={\useKV[ClesTableaux]{CouleurM}}]{1-3}{Classe des millions}&&&}{}
@@ -19623,7 +20397,7 @@ Barre=false,Longueur=10cm,Hauteur=5mm,Bicolore=false,EcartBarre=0%Grille est dis
       }%
         \hline
         \ifboolKV[ClesTableaux]{Milliards}{%
-        \Block[draw]{}{\fontsize{5}{5}\selectfont centaines de milliards}%
+        \Block[draw]{}{\fontsize{\TailleFonte}{\TailleFonte}\selectfont centaines de milliards}%
         &\Block[draw]{}{\fontsize{5}{5}\selectfont dizaines de milliards}%
         &\Block[draw]{}{\fontsize{5}{5}\selectfont unit\'es de milliards}%
         &\Block[draw]{}{\fontsize{5}{5}\selectfont centaines de millions}%
@@ -19926,12 +20700,12 @@ Barre=false,Longueur=10cm,Hauteur=5mm,Bicolore=false,EcartBarre=0%Grille est dis
           \ifboolKV[ClesTableaux]{Millions}{%
             &&&}{}%
           &&&&&&,&&&\\}%
-        \CodeAfter%%
+        \CodeAfter%
         % on trace les lignes verticales
         \xintFor* ##1 in {\xintSeq{1}{\fpeval{\PfCDerniereColonne+1}}}\do{%
           \tikz\draw (\fpeval{\DecalageLigne+2}-|##1)--(\fpeval{\DecalageLigne+2+\useKV[ClesTableaux]{NbLignes}}-|##1);%
         }%
-        %% On place le nombre éventuel
+        % On place le nombre éventuel
         \ifx\bla#2\bla%
         \else%
         \ifboolKV[ClesTableaux]{Milliards}{\xdef\PfCDerniereColonneEntiere{13}}{\ifboolKV[ClesTableaux]{Millions}{\xdef\PfCDerniereColonneEntiere{10}}{\xdef\PfCDerniereColonneEntiere{7}}}%
@@ -19962,14 +20736,14 @@ Barre=false,Longueur=10cm,Hauteur=5mm,Bicolore=false,EcartBarre=0%Grille est dis
     \xdef\DecalageLigne{0}%
     \setlength{\tabcolsep}{0.01\tabcolsep}%
     \begin{center}%
-      % 
+      %
       %%% Definition du tableau
-      % 
+      %
       \ifboolKV[ClesTableaux]{Milliards}{\xdef\PfCDerniereColonne{17}}{\ifboolKV[ClesTableaux]{Millions}{\xdef\PfCDerniereColonne{14}}{\xdef\PfCDerniereColonne{11}}}%
       \begin{NiceTabular}{*{\ifboolKV[ClesTableaux]{Milliards}{12}{%
               \ifboolKV[ClesTableaux]{Millions}{9}{6}%
             }}{m{1cm}}*{5}{m{1cm}}}%
-        % 
+        %
         \CodeBefore%
         \ifboolKV[ClesTableaux]{Milliards}{%
           \tikz\draw[draw=black,fill={\useKV[ClesTableaux]{CouleurG}}] (1|-5)--(2|-1)--(3|-1)--(2|-5)--cycle;
@@ -21029,13 +21803,13 @@ Barre=false,Longueur=10cm,Hauteur=5mm,Bicolore=false,EcartBarre=0%Grille est dis
     % \setsepchar[*]{,* }%
     \ignoreemptyitems%
     \readlist*\ListeTotale{#2}%
-    \xdef\foo{\ListeTotale[1]}%
-    \xdef\faa{\ListeTotale[2]}%
+    \xdef\PfCPCfoo{\ListeTotale[1]}%
+    \xdef\PfCPCfaa{\ListeTotale[2]}%
     %% 
     \setsepchar{,}%    \ignoreemptyitems%
-    \readlist*\ListeEtapes{\foo}%
+    \readlist*\ListeEtapes{\PfCPCfoo}%
     \setsepchar[*]{,* }\ignoreemptyitems%
-    \readlist*\ListeProg{\faa}%
+    \readlist*\ListeProg{\PfCPCfaa}%
       \begin{tcolorbox}[%
         ProgCalcul,%
         ]
@@ -21047,15 +21821,15 @@ Barre=false,Longueur=10cm,Hauteur=5mm,Bicolore=false,EcartBarre=0%Grille est dis
         }%
         \ifboolKV[ClesProg]{SansCalcul}{%
           \begin{enumerate}
-          \item Choisir un nombre~\pointilles[]~$\ListeProg[1]$%
+          \item Choisir un nombre~\pointilles~$\ListeProg[1]$%
             \foreachitem\etape\in\ListeEtapes{%
-            \item \etape~\pointilles[]~$\ListeProg[3,\etapecnt]$
+            \item \etape~\pointilles~$\ListeProg[3,\etapecnt]$
             }%
           \end{enumerate}
         }{\begin{enumerate}
-          \item Choisir un nombre~\pointilles[]~\xdef\NbDepart{\ListeProg[1]}\num{\NbDepart}
+          \item Choisir un nombre~\pointilles~\xdef\NbDepart{\ListeProg[1]}\num{\NbDepart}
             \foreachitem\etape\in\ListeEtapes{%
-            \item \etape~\pointilles[]~\edef\Test{\ListeProg[2,\etapecnt]}%
+            \item \etape~\pointilles~\edef\Test{\ListeProg[2,\etapecnt]}%
               \expandarg%
               \StrSubstitute{\Test}{^}{\empty\dots{}^}[\tempa]%
               \StrSubstitute{\tempa}{**}{^}[\tempab]%
diff --git a/macros/latex/contrib/profcollege/metapost/PfCPseudo.mp b/macros/latex/contrib/profcollege/metapost/PfCPseudo.mp
index e53e8f87f0..7b98805397 100644
--- a/macros/latex/contrib/profcollege/metapost/PfCPseudo.mp
+++ b/macros/latex/contrib/profcollege/metapost/PfCPseudo.mp
@@ -1455,6 +1455,11 @@ enddef;
 
 vardef FinBlocRepeterI=FinBlocRepeter enddef;
 
+vardef BlocUserFinRepeter(expr col)=
+  colControle:=col;
+  FinBlocRepeter
+enddef;
+
 vardef Si(expr xa)=
   LONG:=0;
   save $;
@@ -1951,8 +1956,9 @@ vardef BlocGrisMulti(text argris)=
 $
 enddef;
 
-boolean BlocE;
+boolean BlocE,BlocR;
 BlocE:=false;
+BlocR:=false;
 
 vardef BlocUser(expr colblocuser)(text textbloc)=
   LONG:=0;
@@ -1964,7 +1970,17 @@ vardef BlocUser(expr colblocuser)(text textbloc)=
   texto=image(
       draw BUTB;
     );
-  $=Affichage(texto);
+  ColBloc:=colblocuser;
+  if BlocE:
+    $=AffichageED(texto);
+  elseif BlocR:
+    LONG:=0;
+    numblocrep:=numblocrep+1;
+    LongRep[numblocrep]:=abs(llcorner texto-lrcorner texto);%afin de conserver la longueur du"répéter..."
+    $=AffichageControle(texto);
+  else:
+    $=Affichage(texto);
+  fi;
   $
 enddef;
 
diff --git a/macros/latex/contrib/profcollege/metapost/PfCScratch.mp b/macros/latex/contrib/profcollege/metapost/PfCScratch.mp
index 2f1b2ffa49..2f2db0ee74 100644
--- a/macros/latex/contrib/profcollege/metapost/PfCScratch.mp
+++ b/macros/latex/contrib/profcollege/metapost/PfCScratch.mp
@@ -1712,6 +1712,11 @@ enddef;
 
 vardef FinBlocRepeterI=FinBlocRepeter enddef;
 
+vardef BlocUserFinRepeter(expr col)=
+  colControle:=col;
+  FinBlocRepeter
+enddef;
+
 vardef Si(expr xa)=
   LONG:=0;
   save $;
@@ -2510,8 +2515,9 @@ vardef BlocGrisMulti(text argris)=
 $
 enddef;
 
-boolean BlocE;
+boolean BlocE,BlocR;
 BlocE:=false;
+BlocR:=false;
 
 vardef BlocUser(expr colblocuser)(text textbloc)=
   LONG:=0;
@@ -2524,10 +2530,15 @@ vardef BlocUser(expr colblocuser)(text textbloc)=
       draw BUTB;
     );
   ColBloc:=colblocuser;
-  if BlocE=false:
-    $=Affichage(texto);
-  else:
+  if BlocE:
     $=AffichageED(texto);
+  elseif BlocR:
+    LONG:=0;
+    numblocrep:=numblocrep+1;
+    LongRep[numblocrep]:=abs(llcorner texto-lrcorner texto);%afin de conserver la longueur du"répéter..."
+    $=AffichageControle(texto);
+  else:
+    $=Affichage(texto);
   fi;
   $
 enddef;
diff --git a/macros/latex/contrib/profcollege/metapost/PfCScratchpdf.mp b/macros/latex/contrib/profcollege/metapost/PfCScratchpdf.mp
index 87a59ce750..f96556d032 100644
--- a/macros/latex/contrib/profcollege/metapost/PfCScratchpdf.mp
+++ b/macros/latex/contrib/profcollege/metapost/PfCScratchpdf.mp
@@ -1744,6 +1744,11 @@ enddef;
 
 vardef FinBlocRepeterI=FinBlocRepeter enddef;
 
+vardef BlocUserFinRepeter(expr col)=
+  colControle:=col;
+  FinBlocRepeter
+enddef;
+
 vardef Si(expr xa)=
   LONG:=0;
   save $;
@@ -2542,8 +2547,9 @@ vardef BlocGrisMulti(text argris)=
 $
 enddef;
 
-boolean BlocE;
+boolean BlocE,BlocR;
 BlocE:=false;
+BlocR:=false;
 
 vardef BlocUser(expr colblocuser)(text textbloc)=
   LONG:=0;
@@ -2556,10 +2562,15 @@ vardef BlocUser(expr colblocuser)(text textbloc)=
       draw BUTB;
     );
   ColBloc:=colblocuser;
-  if BlocE=false:
-    $=Affichage(texto);
-  else:
+  if BlocE:
     $=AffichageED(texto);
+  elseif BlocR:
+    LONG:=0;
+    numblocrep:=numblocrep+1;
+    LongRep[numblocrep]:=abs(llcorner texto-lrcorner texto);%afin de conserver la longueur du"répéter..."
+    $=AffichageControle(texto);
+  else:
+    $=Affichage(texto);
   fi;
   $
 enddef;
diff --git a/macros/latex/contrib/sillypage/README.md b/macros/latex/contrib/sillypage/README.md
index 4c00f7756b..e5cfbf3b0a 100644
--- a/macros/latex/contrib/sillypage/README.md
+++ b/macros/latex/contrib/sillypage/README.md
@@ -7,13 +7,13 @@ routine as page numbering style.
 
 Simply add `\usepackage{sillypage}` to your document. Then:
 
-- Write `\pagenumbering{silly}` in you document to use the page numbering
+- Write `\pagenumbering{silly}` in your document to use the page numbering
   style defined by this package.
 - Use the macro `\silly` on a LaTeX counter to typeset the corresponding
   image for the value of that counter.
 - Use the macro `\sillystep` to print the step number `n` from the
   sequence of steps.
-- Write `\pagenumbering{sillynumeral}` in you document to use a silly
+- Write `\pagenumbering{sillynumeral}` in your document to use a silly
   numeral system.
 - Use the macro `\sillynumeral` to get the silly numeral system
   representation from the provided `n` value.
@@ -57,7 +57,3 @@ Blame these individuals:
 The `sillypage` package may be distributed and/or modified under the
 conditions of the LaTeX Project Public License, either version 1.3c of
 this license or (at your option) any later version.
-
-Images used in this package are created from scratch and released under
-the [CC BY-SA 4.0](https://creativecommons.org/licenses/by-sa/4.0/)
-license.
diff --git a/macros/latex/contrib/sillypage/sillypage-example.pdf b/macros/latex/contrib/sillypage/sillypage-example.pdf
index bc4284ede8..faee1580b7 100644
--- a/macros/latex/contrib/sillypage/sillypage-example.pdf
+++ b/macros/latex/contrib/sillypage/sillypage-example.pdf
diff --git a/macros/latex/contrib/sillypage/sillypage.dtx b/macros/latex/contrib/sillypage/sillypage.dtx
index 18e31a3589..6a3b7dbcd3 100644
--- a/macros/latex/contrib/sillypage/sillypage.dtx
+++ b/macros/latex/contrib/sillypage/sillypage.dtx
@@ -19,8 +19,8 @@
 % by Phelype Oleinik, Paulo Cereda, samcarter and Ulrike Fischer.
 % 
 %<*package>
-\def\sillypageDate{2022-02-02}
-\def\sillypageVersion{1.4}
+\def\sillypageDate{2022-08-02}
+\def\sillypageVersion{1.5}
 %</package>
 %<*driver>
 \documentclass[a4paper,full]{l3doc}
@@ -116,7 +116,7 @@
 %   \begin{syntax}
 %     \cs{pagenumbering}\{silly\}
 %   \end{syntax}
-%   Write \cs{pagenumbering}|{silly}| in you document to use the page
+%   Write \cs{pagenumbering}|{silly}| in your document to use the page
 %   numbering style defined by this package. According to Wikipedia,
 %   the typical silly walk gait consists of twelve specific steps to
 %   be performed, so page numbering will cycle through these steps,
@@ -147,7 +147,7 @@
 %   \begin{syntax}
 %     \cs{pagenumbering}\{sillynumeral\}
 %   \end{syntax}
-%   Write \cs{pagenumbering}|{sillynumeral}| in you document to use a
+%   Write \cs{pagenumbering}|{sillynumeral}| in your document to use a
 %   silly numeral system, in which each page will be converted to a unique
 %   composition of silly steps. Note that this macro differs from its
 %   \cs{silly} counterpart, as the former is a proper base 12 numeral
@@ -191,11 +191,13 @@
 % \section{The silly walk routine}
 %
 % This is the complete silly walk routine as described by Jazeen Hollings in the
-% \href{https://bit.ly/3fc9x46}{corresponding Wikipedia article}. Please note that the
-% images used in this package are created by samcarter and released under
-% the \href{https://creativecommons.org/licenses/by-sa/4.0/}{CC BY-SA 4.0} license.
+% \href{https://bit.ly/3fc9x46}{corresponding Wikipedia article}.
+% Please note that the 
+% images used in this package are created by samcarter and released under 
+% the \href{https://creativecommons.org/licenses/by-sa/4.0/}{CC BY-SA 4.0} license and the
+% \href{http://www.latex-project.org/lppl.txt}{LaTeX Project Public License} 1.3c or later.
 % Image sources (vector format) are available in the
-% \href{https://github.com/cereda/sillypage}{package repository}
+% \href{https://github.com/cereda/sillypage}{package repository}.
 %
 % \bigskip
 %
@@ -209,7 +211,7 @@
 %
 % \bigskip
 %
-% We also recommend Pilates.
+% We also recommend Pilates, or any other physical fitness system.
 %
 % \end{documentation}
 %
diff --git a/macros/latex/contrib/sillypage/sillypage.pdf b/macros/latex/contrib/sillypage/sillypage.pdf
index 6f3533869b..3b1dcfa8fe 100644
--- a/macros/latex/contrib/sillypage/sillypage.pdf
+++ b/macros/latex/contrib/sillypage/sillypage.pdf
diff --git a/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl b/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
index c291074f1a..adb1eeed22 100644
--- a/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
+++ b/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
@@ -48,6 +48,7 @@ $mirrors = {
     'Korea' => {
       'http://ftp.ktug.org/tex-archive/' => 1,
       'https://cran.asia/tex/' => 1,
+      'https://ftp.harukasan.org/CTAN/' => 1,
       'https://ftp.kaist.ac.kr/pub/tex-archive/' => 1,
       'https://lab.uklee.pe.kr/tex-archive/' => 1,
       'https://mirror.navercorp.com/CTAN/' => 1,
@@ -55,9 +56,6 @@ $mirrors = {
     'Philippines' => {
       'http://mirror.rise.ph/ctan/' => 1,
     },
-    'Singapore' => {
-      'https://download.nus.edu.sg/mirror/ctan/' => 1,
-    },
     'Thailand' => {
       'https://mirror.kku.ac.th/CTAN/' => 1,
     },
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb b/systems/texlive/tlnet/tlpkg/texlive.tlpdb
index 572fdc34cd..a4c14da2c8 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/64027
+depend revision/64034
 
 name 00texlive.image
 category TLCore
@@ -4609,7 +4609,7 @@ depend setting_available_architectures:aarch64-linux amd64-freebsd amd64-netbsd
 
 name 00texlive.installer
 category TLCore
-revision 64020
+revision 64029
 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
@@ -39423,22 +39423,21 @@ catalogue-version 0.0.1
 
 name biblatex-software
 category Package
-revision 62371
+revision 64030
 shortdesc BibLaTeX stylefiles for software products
 relocated 1
 longdesc This package implements software entry types for BibLaTeX in
 longdesc the form of a bibliography style extension. It requires the
 longdesc Biber backend.
-containersize 3544
-containerchecksum 6271c9d686ef9e19a61bea30d99048beef1e206920a95da83e2d7abc9739374798dd962b5fe50f06eec202521ab03a7e23b3efaa325b6b3f96b4a11d0cb50c28
-doccontainersize 314588
-doccontainerchecksum 3cc99f01cb0eda9ba8202f2f4584900e006b9b0b23cc6a591d5262c4d37331aa9e297e211c5fab1f7268dcff061a54584932f9ca5b3fc1b7124aee7091ae7fad
-docfiles size=95
+containersize 3560
+containerchecksum a95344eb338410804347bc0273eacda0c69804a5dd6886932d11d72879f4c59798cc9bf902667957cc26b56adc0c2f7f747e8967f85fe5602dc1e786bd3a717e
+doccontainersize 313808
+doccontainerchecksum cfe81f1a29f49a756df7595b18ebd492df77fb7ca208418b8627f49180a0a8bcd28b779dea58a88de16b6aa6553243b2755df3e16bca696ecb8a17fc3773135e
+docfiles size=94
  RELOC/doc/latex/biblatex-software/Changes
  RELOC/doc/latex/biblatex-software/LICENSE
  RELOC/doc/latex/biblatex-software/README.md details="Readme"
  RELOC/doc/latex/biblatex-software/biblio.bib
- RELOC/doc/latex/biblatex-software/history.tex
  RELOC/doc/latex/biblatex-software/manual.bib
  RELOC/doc/latex/biblatex-software/mkbiblatexstubs.sh
  RELOC/doc/latex/biblatex-software/sample-content.tex
@@ -39449,8 +39448,8 @@ docfiles size=95
  RELOC/doc/latex/biblatex-software/software-biblatex.tex
  RELOC/doc/latex/biblatex-software/stublist
  RELOC/doc/latex/biblatex-software/swentries.tex
-srccontainersize 1164
-srccontainerchecksum 228f7f2651dd91be6626fc31a2ce54faaf35e14d5f72984e8a1eb58700954793875346980baddcfdd93fd940cc758a1f5d82d8ba17b60fbd1f111393029dc829
+srccontainersize 1500
+srccontainerchecksum 6ee3d3df8bbce5dfd06f64b4e959742e8cb273db8f0606baeef97750dabb0391fcf409dce603772c525a0ad10d543e476d9ec217eced690b0c84e7a547a48f32
 srcfiles size=1
  RELOC/source/latex/biblatex-software/Makefile
 runfiles size=7
@@ -39464,7 +39463,7 @@ catalogue-contact-repository https://gitlab.inria.fr/gt-sw-citation/bibtex-sw-en
 catalogue-ctan /macros/latex/contrib/biblatex-contrib/biblatex-software
 catalogue-license lppl1.3
 catalogue-topics biblatex
-catalogue-version 1.2-4
+catalogue-version 1.2-5
 
 name biblatex-source-division
 category Package
@@ -250659,7 +250658,7 @@ catalogue-version 1.1
 
 name postnotes
 category Package
-revision 63840
+revision 64031
 shortdesc Endnotes for LaTeX
 relocated 1
 longdesc This is an endnotes package for LaTeX. Its user interface
@@ -250672,10 +250671,10 @@ longdesc up contextual running headers for printed notes. The default is
 longdesc a simple but useful one, in the form "Notes to pages N-M", but
 longdesc more elaborate ones can be built. When hyperref is loaded,
 longdesc postnotes provides hyperlinked notes, including back links.
-containersize 7496
-containerchecksum 27cff4e6d4c38aaf146d4368cfab7bd3fd85b80c47f08891377e94aa76ddf4f4267e2a7d5797375fce75684a56ce6e1f1d5e51d2725bc64fddfc88248d34042a
-doccontainersize 968696
-doccontainerchecksum 89b47f055882383837176a8d97d285cc1fed5cb883ff1a26092bce5c711058785328ff348f17aa63c63a3aace239e5d603485845f1b254e11c9ce82f3683c367
+containersize 7092
+containerchecksum e6a473a99598508ee0b2c973005ec53a4732df082c851385fa5591ab8330b88bde418a62cb7e470c24a10e7df56609ecf68013d1cf1c2722351f3b0132bae506
+doccontainersize 971052
+doccontainerchecksum 60474f99e88e889f2fd999b612cc59d47e0a270b4eec6624853366b75c52aab096d1783e1996fc7bc4cfe1a5753a03b64406c719a3c6df4479414a9dd9f58ebc
 docfiles size=257
  RELOC/doc/latex/postnotes/CHANGELOG.md
  RELOC/doc/latex/postnotes/DEPENDS.txt
@@ -250684,18 +250683,18 @@ docfiles size=257
  RELOC/doc/latex/postnotes/postnotes-code.tex
  RELOC/doc/latex/postnotes/postnotes.pdf details="User manual"
  RELOC/doc/latex/postnotes/postnotes.tex
-srccontainersize 20944
-srccontainerchecksum 592a145647590a35638a6eb9762ee3de32e3901b8bcee4045f98737acc87b1b076f1e27a05325cd5280d96df2995ef3fbedcb1cb728372d8e48aa7990115a734
+srccontainersize 21052
+srccontainerchecksum 4b005b827573429f3fb103a3fc588955b18255702cb35d36fc9e9bbf15c1de647f8bfe4194ecedaa15a80af466181b348b4b7bec14977df980eda2921e5147d6
 srcfiles size=25
  RELOC/source/latex/postnotes/postnotes.dtx
  RELOC/source/latex/postnotes/postnotes.ins
-runfiles size=12
+runfiles size=11
  RELOC/tex/latex/postnotes/postnotes.sty
 catalogue-contact-repository https://github.com/gusbrs/postnotes
 catalogue-ctan /macros/latex/contrib/postnotes
 catalogue-license lppl1.3c
 catalogue-topics endnote expl3
-catalogue-version 0.1.5
+catalogue-version 0.1.6
 
 name powerdot
 category Package
@@ -251521,7 +251520,7 @@ catalogue-version 1.1
 
 name profcollege
 category Package
-revision 63895
+revision 64032
 shortdesc A LaTeX package for French maths teachers in college
 relocated 1
 longdesc This package provides some commands to help French mathematics
@@ -251531,15 +251530,15 @@ longdesc \Pythagore{ABC}{5}{7} to write the entire calculation of AC
 longdesc with the Pythagorean theorem, \Trigo[Cosinus]{ABC}{3}{}{60} to
 longdesc write the entire calculation of AC with cosine, ... and some
 longdesc others.
-containersize 1209900
-containerchecksum 325193dcef0fb180ffa5acc8b334549a1a4aaf8f03978ef0228334c29fa6bb906023ab51fcf35a7cf15d4dc64b2ea24a3df1dc73ac7345db1eced7481b2e6a58
-doccontainersize 9940256
-doccontainerchecksum 3fd7c87db00814c925606afe86bd6d831fb911f8f5f0554b5889bf1816af17ead7bc66dd51e4366f4d4cd82fbf20f597161594cb5a3caa5d92020f2f178430dd
-docfiles size=2641
+containersize 1210836
+containerchecksum f1c9ab82cb02223644ac906f343afca204be902e8b0ccc58e804aae136f5098b032336dcd883457c0e5580c5a56cc13fadbbcad69cce77c0ff08f8f047763fb8
+doccontainersize 10015344
+doccontainerchecksum 9cc12b4118c4cbc8b33dc08b964f3cfe4c56fc5ebbafc18da0b3835b80aaeeb5f14b791f125e9c85d71834afb6129cb58fa0d576690e7936e62054cb5d49f511
+docfiles size=2663
  RELOC/doc/latex/profcollege/ProfCollege-doc.pdf details="Package documentation" language="fr"
  RELOC/doc/latex/profcollege/ProfCollege-doc.zip
  RELOC/doc/latex/profcollege/README details="Readme"
-runfiles size=2622
+runfiles size=2629
  RELOC/metapost/profcollege/PfC-Calculatriceold.mp
  RELOC/metapost/profcollege/PfCAfficheur.mp
  RELOC/metapost/profcollege/PfCArithmetique.mp
@@ -251767,7 +251766,7 @@ catalogue-also proflycee
 catalogue-ctan /macros/latex/contrib/profcollege
 catalogue-license lppl1.3c
 catalogue-topics maths french teaching
-catalogue-version 0.99-s
+catalogue-version 0.99-t
 
 name proflabo
 category Package
@@ -251908,7 +251907,7 @@ catalogue-version 1.0b~4
 
 name projlib
 category Package
-revision 63970
+revision 64033
 shortdesc A series of tools to simplify your workflow
 relocated 1
 longdesc ProjLib is a collection of tools to help you write LaTeX
@@ -251916,15 +251915,15 @@ longdesc documents. With the main package ProjLib loaded, you no longer
 longdesc need to set up the theorem-like environments, nor to manually
 longdesc configure the appropriate multilingual settings. In addition, a
 longdesc series of auxiliary functionalities are introduced.
-containersize 25248
-containerchecksum aa592f1ba69af1bb76c9f83a7d3f2d0a92531a1c9c1e1abf777061feb1f76d0dff175175a8d244b024c5c55c9e231a77e59c27011a73ae3b59fc446b6cb45668
+containersize 25256
+containerchecksum c5e7f6f44ccf6d6595ecb37cf4c45b7a3bf7cbbdde5a8a3f9c82383d636badbf155b574973e3c9d53478788fb9575edb4d849c632f9d12ea5e595a22bea81202
 doccontainersize 8536
-doccontainerchecksum 0193b62a2ba0e8a8c12275caef9565032ad1a5d6eb1d19d660a004c0066c9a539842d0a107f10862a9a1ca7c52cf76f1ef98d74ece325cadbed510357765c8da
+doccontainerchecksum e35c4eff41b613b9664c4cf774495c44fb0da009c97604dba891ca3345fae6ee3e05be5535c0c6308c34620fb50a03243a6adaebc0b27d028cbe898ca80fff6e
 docfiles size=7
  RELOC/doc/latex/projlib/LICENSE
  RELOC/doc/latex/projlib/README.md details="Readme"
-srccontainersize 25392
-srccontainerchecksum 3c70e01f190e01996e903ca408706575de1bf6bfc534b8ef117e73d365f55a8d4df2d73b300fad8acf9c8f969b471413aac703de88f6698fffc4120e94bcd057
+srccontainersize 25384
+srccontainerchecksum 9e759cf7ef9207a679a568fc919318a7ab92f53d0cd69b367b919b1dd9172c002f7233c47eb88ec9c14b99c5187689074ee9ff0ad9e6e4fc73ad55e8a40db460
 srcfiles size=52
  RELOC/source/latex/projlib/ProjLib.dtx
  RELOC/source/latex/projlib/ProjLib.ins
@@ -278163,23 +278162,23 @@ catalogue-version 1.5b
 
 name sillypage
 category Package
-revision 61857
+revision 64034
 shortdesc John Cleese's Silly Walk as page numbering style
 relocated 1
 longdesc This simple LaTeX package provides John Cleese's iconic silly
 longdesc walk routine as a page numbering style. Other counters, as well
 longdesc as integers, can be typeset in this "silly" style, too.
 containersize 13468
-containerchecksum b61813d02861afa70cecf154e14de2ced48f087d363732e05a477727e4992bd460b8475a20d1eb94cfb276f01625516d0b3da8859b1a7e21c2919187cc644e3b
-doccontainersize 291008
-doccontainerchecksum eff5ae4f1785432cebc6a1b9fc370df8808d9c9a1a6fcf449ed4151ede386ac2a33fbc8102f78809a744fb5c399aa21c48b2e030916c56f673a044fd262a827b
+containerchecksum 51c7bc990b31950470b3072044f5458844df5083fd42d5f1701147b1246e144837875b7c59b69480a0ca8f16d6c1585d862c5b779d4bd669c369cbc4e9bf5834
+doccontainersize 291164
+doccontainerchecksum 1ce76821f6f9ac961c8e53b6be3480c1458248aa8df3ae9635b2fba4160fd26ad59506e421bec061fa97d514ce5f4028821044d4052aec6b78a3d79f40b8c8cf
 docfiles size=82
  RELOC/doc/latex/sillypage/README.md details="Readme"
  RELOC/doc/latex/sillypage/sillypage-example.pdf details="Example of use"
  RELOC/doc/latex/sillypage/sillypage-example.tex
  RELOC/doc/latex/sillypage/sillypage.pdf details="Package documentation"
-srccontainersize 4592
-srccontainerchecksum e6d1e9ad52142d9f1b028c38eff926396e277916a91899630bcdce6cf56cdc8bc2e542c7765d857e2fd2985bed03669cbfc24db03c1724bd7b8709bee99d9bbe
+srccontainersize 4632
+srccontainerchecksum 72d4ca266835dc3cb902af1de9e3336c1d79b9f421df05c00eb1f5857e9fbae8f106f45f6ba0916151af30a70a2bc44a2879324ebe7c7edc95a3ba323be88603
 srcfiles size=4
  RELOC/source/latex/sillypage/sillypage.dtx
  RELOC/source/latex/sillypage/sillypage.ins
@@ -278191,7 +278190,7 @@ catalogue-contact-repository https://github.com/cereda/sillypage
 catalogue-ctan /macros/latex/contrib/sillypage
 catalogue-license cc-by-sa-4 lppl1.3c
 catalogue-topics amusements page-nos numbers
-catalogue-version 1.4
+catalogue-version 1.5
 
 name simple-resume-cv
 category Package
@@ -306175,7 +306174,7 @@ docfiles size=376
 
 name texlive-scripts
 category TLCore
-revision 64020
+revision 64029
 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.
@@ -306183,10 +306182,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 113520
-containerchecksum 2ddb90cb1a80bcc274f9091b458805bf8156701b5c31b5fd0caef0a4454773f9f92408c6fa570fd9e02ec41c8cae1d698f6394d2dcb06008faaa302292a75a9b
-doccontainersize 419144
-doccontainerchecksum 091fef3537765e29fb6f3d8af5fd46e9386388a975ca40fd189e932997c19952c0f4a18bf73e3274b1a4876ac811ca263fa83e12a5cdfc348b7b33b757531411
+containersize 113512
+containerchecksum 43b1fd1190ba329a11719646627f59cc5f3399d557cd3dd55453863a7403b2528f1833d6f712373e186397cd4fe5a632d45309911ecb9b661acbce29ebb0a178
+doccontainersize 419224
+doccontainerchecksum 822e79c756c5fb425eef15ee4300879d38baa6dfbeacc1ddc7f06cf92481be959cf573106bcc153ff8bdcb44e84dadf3ee672dd1668ca51bac6f69747539e12c
 docfiles size=516
  doc.html
  texmf-dist/doc/man/man1/fmtutil-sys.1
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
index 1e102eb7e8..1063d87dd7 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
@@ -1 +1 @@
-eb74ab8eb536fd1f3b09f21696e290ac  texlive.tlpdb
+2dfc5a9528c014e738c0134cb91ac7a5  texlive.tlpdb
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
index ce71f32e2f..2f268b1274 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
@@ -1 +1 @@
-c2495936b93e9d976b45432f5b422dd027ee65a094bfb152afbc15f0948807b683f120d26fe17cf1abb37189ca4bd86da9ee48876a462cb57bf90d06016dc706  texlive.tlpdb
+664d375860003e6dcbd8fdec11a3706867af1031af2642a5ffac1a46eab59100798d4c4b2d2a9e49ef7cdfb21edf4068c98bbbef4c690399e34ccc0c2809170e  texlive.tlpdb
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
index 10ae67b166..0df064aefd 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-----
 
-iQEcBAEBCgAGBQJi6Ge5AAoJEEzhh34ZQ4xwhzgH/2v1id9MM3mfc28CUME1UDAd
-P7k4CAAYI+SNFiF75U7uwixeJWUEtckzL7BL6tmW2WIb80OIPEWAmlqzAiwRYf+6
-tlC8L3A2G7aYBrvJAufnOnAMzqTf+aKje3+5nyjPyVUHT+brvF1wUaD0W5IHxIuj
-1KNVEE7V9571zf+a38lN9SsqoC4UtIxxe94O8vXJLH239lvolxG7JKRAfsUtJxR0
-jnHdbktNXHr8hLeMHvahPpSOoRGpiKypw/LmKrmXiUZ5U7D42fI1XCJYoCuAlnBb
-cghQgzTmdHD2kTNVx0ybL1++MgIsTMDu9iMIogINbmLLb44DHRuFvtkUfoDxMXg=
-=pvAp
+iQEcBAEBCgAGBQJi6bkVAAoJEEzhh34ZQ4xwe1EH/AnW+YmU//WD75cmjuWOs4Vq
+bUKJASsjSZyEzX+UwIwlttDzj/L3WvnTzgytkQkcmkvx+eZrpeqIjAyGy9Hjsie7
+1ioftAIhRpZg8h76JCoexqdm0AkDa4AKqMJ0nfTlu9rVPfpubfumiF5QeRr7acQ4
+D93j2gqyktZmnviSvetsuTAdRYwyl2tMB783xULB3KaRQAAi1y/6q+JmtPXcQYrv
+pbNcBUwRpTWfK97xVykXf4JEPXcN16945Zd9B35fym+uCHpGR8dW/gssWI0ysPeU
+XwHKDgi2X/VeYJAyUUk5HHy/KWjJfoC1YxELmSFpE+GuhFTbyajiEjohU0CKgPU=
+=5GWC
 -----END PGP SIGNATURE-----
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
index e652944208..73752343ca 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
diff --git a/systems/win32/miktex/tm/packages/next/pr.ini b/systems/win32/miktex/tm/packages/next/pr.ini
index 2e57b89a2b..2e6a61f3fd 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=1659385102

+date=1659471481

 lastupd=miktex-arctrl-bin-x64-2.9 miktex-asymptote-bin-x64-2.9 miktex-autosp-bin-x64-2.9 miktex-axohelp-bin-x64-2.9 miktex-bibarts-bin-x64-2.9 miktex-bibtex-bin-x64-2.9 miktex-bibtex8bit-bin-x64-2.9 miktex-bzip2-bin-x64-2.9 miktex-cairo-bin-x64-2.9 miktex-chktex-bin-x64-2.9 miktex-cjkutils-bin-x64-2.9 miktex-console-bin-x64-2.9 miktex-curl-bin-x64-2.9 miktex-cweb-bin-x64-2.9 miktex-devnag-bin-x64-2.9 miktex-doc miktex-dvicopy-bin-x64-2.9 miktex-dvipdfmx-bin-x64-2.9 miktex-dvipng-bin-x64-2.9 miktex-dvips-bin-x64-2.9

-lstdigest=1d68245eae2b0f7d7ef7ecd28b4fb455

+lstdigest=f8e8f86f491f31f72f6616dc6e31b6b2

 numpkg=5847

 relstate=next

-version=8248

+version=8249

 

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

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

-;;;; signature/miktex: ZmNj/ILwBKRVC0DYbSNtzgW/zeJUMJjAqXYA2/gQ8dxgRpT9I1wIUQa5mFSLZtDYewQ1uLFscRwy9Q2hdSdLHbdLZeOS/nB1RjH2EC+pZJ1wfWu9YC3Bk7g1j3ivVJaclm3rOWMPSTZPqn7ERiNfQuhl3zch/XQ0eZB3REj0OZIVd0M6eus0mHNocKeuXB4vriiN2jhPPKNNhQ0XQHZQJQpeGeJuAvTFsV7JRzRPoixaId0Ozh3eVt/mB3S7PInfl+WwIPqZK4uDWe7+2/lUsIhLugNdzOWPT4Q1Vs/JKTdTQOarIwSGnWgP9nSbfCMtJ1tG/nuFvEhzGmUWXbxVdA==

+;;;; signature/miktex: T/iEMXUy2a0kUBpmRSax/0s0mh1lIcHAAV6nozpBZIKEtySpBODqaUILvZ822Up4L8wn/OGRsqfBxlOGlF5M9XKlG8Xop2UV53lrN4PX+WRwQ4N8oUGuT5ipDIsVbDUWiGrkZFTDhV4x13941AAdP9UDz5tOiWpBvjDguzbxtUwcsfe8ShE/4fe53ySjeEPgdnm+9FklRH+6OJjOnGZ4FdRhAUPVhySZQdnjsK0eKJox7IIbOUNatf+EkVZPMd65cp4Vj3F6Ryn5GDgr0iuBoYxwPShATfcWTz6xWAghvyqHNsjc/mvs0WqF79QaDV2QNgAQyWBAz6CBfJRooIeKpA==

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

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

 [repository]

-date=1659384702

+date=1659471094

 lastupd=miktex-dvips-bin-x64-2.9 miktex-runtime-bin-x64-2.9 miktex-ucrt-bin miktex-vc140-bin apa7 apa7__doc apa7__source buctthesis buctthesis__doc buctthesis__source csassignments csassignments__doc csassignments__source exam-zh exam-zh__doc exam-zh__source fixdif fixdif__doc fixdif__source hfutthesis

-lstdigest=23a1190e764a71c865899899f0a893ca

+lstdigest=5d9e801d2afc62b8571597b6cdfb2d3b

 numpkg=5847

 relstate=stable

-version=8248

+version=8249

 

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

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

-;;;; signature/miktex: iKi6z/vG9GM0sSn4DbJlkJ9PjyhEEkIyrX2Gqiz174VqPZNfpH1uN+85+sQdpbVKyePzDUOUAf7Cv/ws7FHarYWt3R3itorX9hXF63CPdJyZ8Q1gQ9v3tXYgmVfC32z7oneSIrke/V2/7v8xAf+dbivmsH585JTMXcC3JqyKBlhDVZJGiUD/zbh3/IkctU+3O4J3pmwML+ladymktVR6PwQFuGH7uwjhTfN+hnmux/TVOvVsLXPLGnB4V5Uo+SwtMBHXjRhtbMw7wSXLvx0DVbkoCo5HNt844kcKhL5X445KBXz2gsQewB1bViJ2ij0Cy9RC8GL3PwxraT2XQ1oX7w==

+;;;; signature/miktex: oVT160kzaRNALlvvUL/PJQH1EGGsApb1N7uISuhzPK5ItcyxsW8Tz2I9Gj/NOu0p4xfX+p7zDLGabPJJ3cTcpIdqJb2l27tq55Bwva3KFdmwvpO3DhLtM+K7LxztxlSylmKjfdDEVvahmYaHiXZi9GKt2x7IAmMnCVPTMCVMXGVuRWc4sXtJNTvm42q+ljcLXQe3J8B7ZKBpyIUWRqA8zKQKMily28kq62VvOAlqPS9dWryCfEmxaYM9UTG5ZzOSBK9nPfXVo4WxO9JUnScl1+pTBeZcg/27Jy73eniXKELVxaqN6IBfxLp31xgcrxAOPzwxBuKZbxyE1Er1+MGnlw==

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

diff --git a/timestamp b/timestamp
index 26075f3fd2..76e8a3f7cf 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-08-02-02-02
+2022-08-03-02-02