summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2023-08-01 03:01:19 +0000
committerNorbert Preining <norbert@preining.info>2023-08-01 03:01:19 +0000
commit84777905249300f2ab97a23141e31f952bceb865 (patch)
tree5621415ee6ecbcbe62e4c500977af3c41aeebd9c
parent17d547a1effe2cafcdfbf704bdf8cb0484790ef2 (diff)
CTAN sync 202308010301
-rw-r--r--FILES.byname494
-rw-r--r--FILES.byname.gzbin2539105 -> 2539451 bytes
-rw-r--r--FILES.last07days402
-rw-r--r--biblio/ctan-bibdata/ctan.bib31
-rw-r--r--biblio/ctan-bibdata/ctan.pdfbin3690210 -> 3690212 bytes
-rw-r--r--fonts/newtx/README5
-rw-r--r--fonts/newtx/tex/newtx.sty14
-rw-r--r--fonts/newtx/tex/newtxmath.sty26
-rw-r--r--fonts/newtx/tex/newtxtext.sty7
-rw-r--r--graphics/pgf/contrib/quiver/README.md15
-rw-r--r--graphics/pgf/contrib/quiver/quiver-doc.pdfbin0 -> 189078 bytes
-rw-r--r--graphics/pgf/contrib/quiver/quiver-doc.tex149
-rw-r--r--graphics/pgf/contrib/quiver/quiver.sty40
-rw-r--r--macros/latex/contrib/caption/README2
-rw-r--r--macros/latex/contrib/caption/caption.dtx11
-rw-r--r--macros/latex/contrib/caption/caption3.dtx55
-rw-r--r--macros/latex/contrib/caption/captiondoc.cls121
-rw-r--r--macros/latex/contrib/profcollege/doc/ProfCollege-doc.pdfbin9328578 -> 9132731 bytes
-rw-r--r--macros/latex/contrib/profcollege/latex/LogoNumberHive.pngbin0 -> 54466 bytes
-rw-r--r--macros/latex/contrib/profcollege/latex/PfCCalculatrice.tex17
-rw-r--r--macros/latex/contrib/profcollege/latex/PfCCalculsFractions.tex8
-rw-r--r--macros/latex/contrib/profcollege/latex/PfCCartesJeux.tex41
-rw-r--r--macros/latex/contrib/profcollege/latex/PfCCible.tex225
-rw-r--r--macros/latex/contrib/profcollege/latex/PfCCompteBon.tex10
-rw-r--r--macros/latex/contrib/profcollege/latex/PfCDecomposerNombrePremier.tex12
-rw-r--r--macros/latex/contrib/profcollege/latex/PfCDistributivite.tex10
-rw-r--r--macros/latex/contrib/profcollege/latex/PfCEcritureLettres.tex3
-rw-r--r--macros/latex/contrib/profcollege/latex/PfCGrimuku.tex222
-rw-r--r--macros/latex/contrib/profcollege/latex/PfCHorloge.tex215
-rw-r--r--macros/latex/contrib/profcollege/latex/PfCLabyrintheNombre.tex203
-rw-r--r--macros/latex/contrib/profcollege/latex/PfCMulPiecesPuzzle.tex151
-rw-r--r--macros/latex/contrib/profcollege/latex/PfCNonogramme.tex12
-rw-r--r--macros/latex/contrib/profcollege/latex/PfCNotionFonction.tex308
-rw-r--r--macros/latex/contrib/profcollege/latex/PfCOperationsTrou.tex11
-rw-r--r--macros/latex/contrib/profcollege/latex/PfCPourcentage.tex4
-rw-r--r--macros/latex/contrib/profcollege/latex/PfCPyraVoca.tex28
-rw-r--r--macros/latex/contrib/profcollege/latex/PfCReperage.tex171
-rw-r--r--macros/latex/contrib/profcollege/latex/PfCRepresenterTableur.tex10
-rw-r--r--macros/latex/contrib/profcollege/latex/PfCRondeInfernale.tex18
-rw-r--r--macros/latex/contrib/profcollege/latex/PfCRose.tex284
-rw-r--r--macros/latex/contrib/profcollege/latex/PfCSolides.tex12
-rw-r--r--macros/latex/contrib/profcollege/latex/PfCStatistiques.tex20
-rw-r--r--macros/latex/contrib/profcollege/latex/PfCTableauxUnites.tex86
-rw-r--r--macros/latex/contrib/profcollege/latex/PfCVueCubes.tex6
-rw-r--r--macros/latex/contrib/profcollege/latex/ProfCollege.sty17
-rw-r--r--macros/latex/contrib/profcollege/latex/dobblePfC.lua2
-rw-r--r--macros/latex/contrib/profcollege/metapost/PfCCalculatrice.mp10
-rw-r--r--macros/latex/contrib/profcollege/metapost/PfCLabyNombre.mp42
-rw-r--r--macros/latex/contrib/profcollege/metapost/PfCObjets.mp2
-rw-r--r--macros/latex/contrib/profcollege/metapost/PfCSolid.mp11
-rw-r--r--macros/latex/contrib/siunitx/CHANGELOG.md46
-rw-r--r--macros/latex/contrib/siunitx/siunitx-abbreviation.dtx12
-rw-r--r--macros/latex/contrib/siunitx/siunitx-angle.dtx35
-rw-r--r--macros/latex/contrib/siunitx/siunitx-code.pdfbin643547 -> 649679 bytes
-rw-r--r--macros/latex/contrib/siunitx/siunitx-compound.dtx418
-rw-r--r--macros/latex/contrib/siunitx/siunitx-locale.dtx8
-rw-r--r--macros/latex/contrib/siunitx/siunitx-number.dtx326
-rw-r--r--macros/latex/contrib/siunitx/siunitx-table.dtx66
-rw-r--r--macros/latex/contrib/siunitx/siunitx.dtx61
-rw-r--r--macros/latex/contrib/siunitx/siunitx.ins2
-rw-r--r--macros/latex/contrib/siunitx/siunitx.pdfbin691117 -> 705584 bytes
-rw-r--r--macros/latex/contrib/siunitx/siunitx.tex316
-rw-r--r--systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl1
-rw-r--r--systems/texlive/tlnet/tlpkg/texlive.tlpdb95
-rw-r--r--systems/texlive/tlnet/tlpkg/texlive.tlpdb.md52
-rw-r--r--systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha5122
-rw-r--r--systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc16
-rw-r--r--systems/texlive/tlnet/tlpkg/texlive.tlpdb.xzbin2459844 -> 2460812 bytes
-rw-r--r--timestamp2
-rw-r--r--usergrps/dante/dtk/README.md2
-rw-r--r--usergrps/dante/dtk/doc/beispiel.pdfbin75603 -> 75603 bytes
-rw-r--r--usergrps/dante/dtk/dtk-ruecken.tex2
-rw-r--r--usergrps/dante/dtk/dtk-url.sty8
73 files changed, 3967 insertions, 996 deletions
diff --git a/FILES.byname b/FILES.byname
index 4815dfbd8f..f7a3147551 100644
--- a/FILES.byname
+++ b/FILES.byname
@@ -2056,12 +2056,12 @@
2023/07/04 | 1675 | biblio/citation-style-language/README.md
2023/07/04 | 12878 | biblio/citation-style-language/vancouver.csl
2023/07/04 | 4522435 | biblio/citation-style-language.zip
-2023/07/30 | 1678 | biblio/ctan-bibdata/biblatex-ctan/ctan.bbx
+2023/07/31 | 1678 | biblio/ctan-bibdata/biblatex-ctan/ctan.bbx
2022/10/08 | 127 | biblio/ctan-bibdata/biblatex-ctan/ctan.cbx
-2023/07/30 | 2797515 | biblio/ctan-bibdata/ctan.bib
-2023/07/30 | 3690030 | biblio/ctan-bibdata/ctan.pdf
+2023/07/31 | 2797515 | biblio/ctan-bibdata/ctan.bib
+2023/07/31 | 3690210 | biblio/ctan-bibdata/ctan.pdf
2023/01/16 | 1489 | biblio/ctan-bibdata/README
-2023/07/30 | 4090302 | biblio/ctan-bibdata.zip
+2023/07/31 | 4090233 | biblio/ctan-bibdata.zip
2023/02/23 | 3126 | biblio/pbibtex/pbibtex-base/cpp.awk
2023/02/23 | 1009 | biblio/pbibtex/pbibtex-base/generate.sh
2023/02/23 | 22362 | biblio/pbibtex/pbibtex-base/jabbrv.bst
@@ -5421,7 +5421,7 @@
1990/10/02 | 5440 | dviware/vutex/vaxvms.hlp
1990/10/02 | 812 | dviware/vutex/vaxvms.ins
1990/10/02 | 127576 | dviware/vutex/vutex.web
-2023/07/30 | 53341 | FILES.last07days
+2023/07/31 | 114111 | 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
@@ -84635,7 +84635,7 @@
2022/03/11 | 201616 | fonts/newtx/opentype/TeXGyreTermesX-Italic.otf
2022/05/19 | 209256 | fonts/newtx/opentype/TeXGyreTermesX-Regular.otf
2022/05/19 | 211560 | fonts/newtx/opentype/TeXGyreTermesX-Slanted.otf
-2023/07/28 | 44367 | fonts/newtx/README
+2023/07/31 | 44507 | fonts/newtx/README
2023/05/07 | 245268 | fonts/newtxsf/doc/newtxsf-doc.pdf
2023/05/07 | 6715 | fonts/newtxsf/doc/newtxsf-doc.tex
2014/09/30 | 43780 | fonts/newtxsf/doc/OFL-FAQ.txt
@@ -84683,10 +84683,10 @@
2012/05/01 | 1516 | fonts/newtx/tex/ly1ntxtt.fd
2019/10/01 | 164 | fonts/newtx/tex/newtx-ebgaramond-subs.tex
2019/10/01 | 149 | fonts/newtx/tex/newtx-libertine-subs.tex
-2023/07/28 | 140287 | fonts/newtx/tex/newtxmath.sty
-2023/07/26 | 27860 | fonts/newtx/tex/newtx.sty
+2023/07/31 | 140351 | fonts/newtx/tex/newtxmath.sty
+2023/07/31 | 27747 | fonts/newtx/tex/newtx.sty
2020/12/19 | 144 | fonts/newtx/tex/newtx-subs.tex
-2023/07/21 | 20268 | fonts/newtx/tex/newtxtext.sty
+2023/07/31 | 20315 | fonts/newtx/tex/newtxtext.sty
2019/10/23 | 818 | fonts/newtx/tex/omlntxebgmi.fd
2016/10/07 | 1919 | fonts/newtx/tex/omlntxmi.fd
2018/04/27 | 781 | fonts/newtx/tex/omlntxstx2mi.fd
@@ -85699,7 +85699,7 @@
2019/11/02 | 2656 | fonts/newtx/vf/zutbmi.vf
2021/03/22 | 2176 | fonts/newtx/vf/zutmia.vf
2019/11/02 | 2552 | fonts/newtx/vf/zutmi.vf
-2023/07/28 | 10228924 | fonts/newtx.zip
+2023/07/31 | 10229041 | fonts/newtx.zip
2005/10/24 | 6224 | fonts/niceframe/afm/bbding10.afm
2005/10/24 | 2299 | fonts/niceframe/afm/dingbat.afm
2005/10/24 | 9099 | fonts/niceframe/afm/karta15.afm
@@ -160408,6 +160408,11 @@
2023/04/17 | 16845 | graphics/pgf/contrib/quickreaction/quickreaction.tex
2023/04/17 | 492 | graphics/pgf/contrib/quickreaction/README.txt
2023/04/17 | 252054 | graphics/pgf/contrib/quickreaction.zip
+2023/07/31 | 189078 | graphics/pgf/contrib/quiver/quiver-doc.pdf
+2023/07/31 | 5296 | graphics/pgf/contrib/quiver/quiver-doc.tex
+2023/07/30 | 1606 | graphics/pgf/contrib/quiver/quiver.sty
+2023/07/31 | 619 | graphics/pgf/contrib/quiver/README.md
+2023/07/31 | 186489 | graphics/pgf/contrib/quiver.zip
2018/08/29 | 18891 | graphics/pgf/contrib/rank-2-roots/rank-2-roots.bib
2018/08/30 | 396098 | graphics/pgf/contrib/rank-2-roots/rank-2-roots.pdf
2018/08/30 | 19918 | graphics/pgf/contrib/rank-2-roots/rank-2-roots.sty
@@ -194462,7 +194467,7 @@
2021/10/28 | 1257862 | install/macros/latex/contrib/breqn.tds.zip
2021/08/18 | 801818 | install/macros/latex/contrib/bytefield.tds.zip
2009/10/01 | 166291 | install/macros/latex/contrib/cachepic.tds.zip
-2023/07/28 | 1692031 | install/macros/latex/contrib/caption.tds.zip
+2023/07/31 | 1694248 | install/macros/latex/contrib/caption.tds.zip
2019/12/10 | 304516 | install/macros/latex/contrib/catchfile.tds.zip
2011/08/07 | 511024 | install/macros/latex/contrib/ccaption.tds.zip
2009/10/20 | 291969 | install/macros/latex/contrib/changepage.tds.zip
@@ -194656,7 +194661,7 @@
2021/11/10 | 657160 | install/macros/latex/contrib/sdaps.tds.zip
2023/07/04 | 2531068 | install/macros/latex/contrib/se2thesis.tds.zip
2019/12/10 | 544332 | install/macros/latex/contrib/selinput.tds.zip
-2023/07/26 | 1567968 | install/macros/latex/contrib/siunitx.tds.zip
+2023/07/31 | 1594085 | install/macros/latex/contrib/siunitx.tds.zip
2019/10/15 | 315856 | install/macros/latex/contrib/skmath.tds.zip
2019/10/16 | 345652 | install/macros/latex/contrib/skrapport.tds.zip
2016/02/18 | 469004 | install/macros/latex/contrib/splitindex.tds.zip
@@ -216623,46 +216628,47 @@
2010/03/06 | 3264 | macros/latex/contrib/captdef/captdef.tex
2010/03/06 | 3423 | macros/latex/contrib/captdef/miscdoc.sty
2010/03/06 | 216809 | macros/latex/contrib/captdef.zip
-2023/07/28 | 66826 | macros/latex/contrib/caption/bicaption.dtx
-2023/07/28 | 153251 | macros/latex/contrib/caption/bicaption.pdf
-2023/07/28 | 50067 | macros/latex/contrib/caption/caption2.dtx
-2023/07/28 | 78170 | macros/latex/contrib/caption/caption2.pdf
-2023/07/28 | 194594 | macros/latex/contrib/caption/caption3.dtx
-2023/07/28 | 8089 | macros/latex/contrib/caption/caption-ams-smf.dtx
-2023/07/28 | 13911 | macros/latex/contrib/caption/caption-beamer.dtx
-2023/07/28 | 338911 | macros/latex/contrib/caption/caption.dtx
-2023/07/28 | 6579 | macros/latex/contrib/caption/caption-elsarticle.dtx
-2023/07/28 | 3922 | macros/latex/contrib/caption/caption.ins
-2023/07/28 | 16792 | macros/latex/contrib/caption/caption-koma.dtx
-2023/07/28 | 11726 | macros/latex/contrib/caption/caption-light.dtx
-2023/07/28 | 67305 | macros/latex/contrib/caption/caption-light.pdf
-2023/07/28 | 11429 | macros/latex/contrib/caption/caption-memoir.dtx
-2023/07/28 | 6655 | macros/latex/contrib/caption/caption-ntg.dtx
-2023/07/28 | 428715 | macros/latex/contrib/caption/caption.pdf
-2023/07/28 | 6856 | macros/latex/contrib/caption/caption-thesis.dtx
-2023/07/28 | 15737 | macros/latex/contrib/caption/cat.eps
-2023/07/28 | 9298 | macros/latex/contrib/caption/CHANGELOG
-2023/07/28 | 21191 | macros/latex/contrib/caption/elephant.eps
-2023/07/28 | 19008 | macros/latex/contrib/caption/fallback/v1/caption.dtx
-2023/07/28 | 21420 | macros/latex/contrib/caption/fallback/v2.0/caption2.dtx
-2023/07/28 | 46949 | macros/latex/contrib/caption/fallback/v2.1/caption2.dtx
-2023/07/28 | 182408 | macros/latex/contrib/caption/fallback/v3.0/caption.dtx
-2023/07/28 | 291332 | macros/latex/contrib/caption/fallback/v3.1/caption.dtx
-2023/07/28 | 135024 | macros/latex/contrib/caption/fallback/v3.2/caption3.dtx
-2023/07/28 | 165257 | macros/latex/contrib/caption/fallback/v3.2/caption.dtx
-2023/07/28 | 153437 | macros/latex/contrib/caption/fallback/v3.3/caption3.dtx
-2023/07/28 | 181372 | macros/latex/contrib/caption/fallback/v3.3/caption.dtx
-2023/07/28 | 157502 | macros/latex/contrib/caption/fallback/v3.4/caption3.dtx
-2023/07/28 | 169367 | macros/latex/contrib/caption/fallback/v3.4/caption.dtx
-2023/07/28 | 179084 | macros/latex/contrib/caption/fallback/v3.5/caption3.dtx
-2023/07/28 | 162941 | macros/latex/contrib/caption/fallback/v3.5/caption.dtx
-2023/07/28 | 29158 | macros/latex/contrib/caption/ltcaption.dtx
-2023/07/28 | 99130 | macros/latex/contrib/caption/ltcaption.pdf
-2023/07/28 | 2950 | macros/latex/contrib/caption/README
-2023/07/28 | 97411 | macros/latex/contrib/caption/subcaption.dtx
-2023/07/28 | 229241 | macros/latex/contrib/caption/subcaption.pdf
-2023/07/28 | 112 | macros/latex/contrib/caption/SUMMARY
-2023/07/28 | 1488461 | macros/latex/contrib/caption.zip
+2023/07/31 | 66826 | macros/latex/contrib/caption/bicaption.dtx
+2023/07/31 | 153251 | macros/latex/contrib/caption/bicaption.pdf
+2023/07/31 | 50067 | macros/latex/contrib/caption/caption2.dtx
+2023/07/31 | 78170 | macros/latex/contrib/caption/caption2.pdf
+2023/07/31 | 195173 | macros/latex/contrib/caption/caption3.dtx
+2023/07/31 | 8089 | macros/latex/contrib/caption/caption-ams-smf.dtx
+2023/07/31 | 13911 | macros/latex/contrib/caption/caption-beamer.dtx
+2023/07/31 | 4455 | macros/latex/contrib/caption/captiondoc.cls
+2023/07/31 | 339100 | macros/latex/contrib/caption/caption.dtx
+2023/07/31 | 6579 | macros/latex/contrib/caption/caption-elsarticle.dtx
+2023/07/31 | 3922 | macros/latex/contrib/caption/caption.ins
+2023/07/31 | 16792 | macros/latex/contrib/caption/caption-koma.dtx
+2023/07/31 | 11726 | macros/latex/contrib/caption/caption-light.dtx
+2023/07/31 | 67305 | macros/latex/contrib/caption/caption-light.pdf
+2023/07/31 | 11429 | macros/latex/contrib/caption/caption-memoir.dtx
+2023/07/31 | 6655 | macros/latex/contrib/caption/caption-ntg.dtx
+2023/07/31 | 428715 | macros/latex/contrib/caption/caption.pdf
+2023/07/31 | 6856 | macros/latex/contrib/caption/caption-thesis.dtx
+2023/07/31 | 15737 | macros/latex/contrib/caption/cat.eps
+2023/07/31 | 9298 | macros/latex/contrib/caption/CHANGELOG
+2023/07/31 | 21191 | macros/latex/contrib/caption/elephant.eps
+2023/07/31 | 19008 | macros/latex/contrib/caption/fallback/v1/caption.dtx
+2023/07/31 | 21420 | macros/latex/contrib/caption/fallback/v2.0/caption2.dtx
+2023/07/31 | 46949 | macros/latex/contrib/caption/fallback/v2.1/caption2.dtx
+2023/07/31 | 182408 | macros/latex/contrib/caption/fallback/v3.0/caption.dtx
+2023/07/31 | 291332 | macros/latex/contrib/caption/fallback/v3.1/caption.dtx
+2023/07/31 | 135024 | macros/latex/contrib/caption/fallback/v3.2/caption3.dtx
+2023/07/31 | 165257 | macros/latex/contrib/caption/fallback/v3.2/caption.dtx
+2023/07/31 | 153437 | macros/latex/contrib/caption/fallback/v3.3/caption3.dtx
+2023/07/31 | 181372 | macros/latex/contrib/caption/fallback/v3.3/caption.dtx
+2023/07/31 | 157502 | macros/latex/contrib/caption/fallback/v3.4/caption3.dtx
+2023/07/31 | 169367 | macros/latex/contrib/caption/fallback/v3.4/caption.dtx
+2023/07/31 | 179084 | macros/latex/contrib/caption/fallback/v3.5/caption3.dtx
+2023/07/31 | 162941 | macros/latex/contrib/caption/fallback/v3.5/caption.dtx
+2023/07/31 | 29158 | macros/latex/contrib/caption/ltcaption.dtx
+2023/07/31 | 99130 | macros/latex/contrib/caption/ltcaption.pdf
+2023/07/31 | 2950 | macros/latex/contrib/caption/README
+2023/07/31 | 97411 | macros/latex/contrib/caption/subcaption.dtx
+2023/07/31 | 229241 | macros/latex/contrib/caption/subcaption.pdf
+2023/07/31 | 112 | macros/latex/contrib/caption/SUMMARY
+2023/07/31 | 1490552 | macros/latex/contrib/caption.zip
2010/01/22 | 5956 | macros/latex/contrib/capt-of/capt-of.dtx
2010/01/22 | 1434 | macros/latex/contrib/capt-of/capt-of.ins
2010/01/22 | 85950 | macros/latex/contrib/capt-of/capt-of.pdf
@@ -233732,126 +233738,132 @@
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
-2023/07/04 | 9328578 | macros/latex/contrib/profcollege/doc/ProfCollege-doc.pdf
-2023/07/04 | 2360197 | macros/latex/contrib/profcollege/doc/ProfCollege-doc.zip
-2023/06/23 | 2728 | macros/latex/contrib/profcollege/latex/dobblePfC.lua
-2023/07/04 | 11046 | macros/latex/contrib/profcollege/latex/PfCAutomatismes.tex
-2023/07/04 | 10951 | macros/latex/contrib/profcollege/latex/PfCAutonomie.tex
-2023/07/04 | 2939 | macros/latex/contrib/profcollege/latex/PfCBarreNiveaux.tex
-2023/07/04 | 3431 | macros/latex/contrib/profcollege/latex/PfCBarresCalculs.tex
-2023/07/04 | 8271 | macros/latex/contrib/profcollege/latex/PfCBillard.tex
-2023/07/04 | 2072 | macros/latex/contrib/profcollege/latex/PfCBonSortie.tex
-2023/07/04 | 4034 | macros/latex/contrib/profcollege/latex/PfCCalculatrice.tex
-2023/07/04 | 14927 | macros/latex/contrib/profcollege/latex/PfCCalculsCroises.tex
-2023/07/04 | 6148 | macros/latex/contrib/profcollege/latex/PfCCalculsFractions.tex
-2023/07/04 | 7230 | macros/latex/contrib/profcollege/latex/PfCCalisson.tex
-2023/07/04 | 14262 | macros/latex/contrib/profcollege/latex/PfCCAN.tex
-2023/07/04 | 24945 | macros/latex/contrib/profcollege/latex/PfCCartesJeux.tex
-2023/07/04 | 1528 | macros/latex/contrib/profcollege/latex/PfCCartesMentales.tex
-2023/07/04 | 9724 | macros/latex/contrib/profcollege/latex/PfCCartographie.tex
-2023/07/04 | 7088 | macros/latex/contrib/profcollege/latex/PfCColorilude.tex
-2023/07/04 | 11250 | macros/latex/contrib/profcollege/latex/PfCCompteBon.tex
-2023/07/04 | 9898 | macros/latex/contrib/profcollege/latex/PfCDecDeci.tex
-2023/07/04 | 3618 | macros/latex/contrib/profcollege/latex/PfCDecompFracDeci.tex
-2023/07/04 | 22985 | macros/latex/contrib/profcollege/latex/PfCDecomposerNombrePremier.tex
-2023/07/04 | 10479 | macros/latex/contrib/profcollege/latex/PfCDefiTables.tex
-2023/07/04 | 14131 | macros/latex/contrib/profcollege/latex/PfCDessinerRatio.tex
-2023/07/04 | 7962 | macros/latex/contrib/profcollege/latex/PfCDessinGradue.tex
-2023/07/04 | 4664 | macros/latex/contrib/profcollege/latex/PfCDiagrammeRadar.tex
-2023/07/04 | 58462 | macros/latex/contrib/profcollege/latex/PfCDistributivite.tex
-2023/07/04 | 831 | macros/latex/contrib/profcollege/latex/PfCDobble.tex
-2023/07/04 | 4117 | macros/latex/contrib/profcollege/latex/PfCDomino.tex
+2023/07/30 | 9132731 | macros/latex/contrib/profcollege/doc/ProfCollege-doc.pdf
+2023/07/30 | 2370187 | macros/latex/contrib/profcollege/doc/ProfCollege-doc.zip
+2023/07/30 | 2734 | macros/latex/contrib/profcollege/latex/dobblePfC.lua
+2023/07/30 | 54466 | macros/latex/contrib/profcollege/latex/LogoNumberHive.png
+2023/07/30 | 11046 | macros/latex/contrib/profcollege/latex/PfCAutomatismes.tex
+2023/07/30 | 10951 | macros/latex/contrib/profcollege/latex/PfCAutonomie.tex
+2023/07/30 | 2939 | macros/latex/contrib/profcollege/latex/PfCBarreNiveaux.tex
+2023/07/30 | 3431 | macros/latex/contrib/profcollege/latex/PfCBarresCalculs.tex
+2023/07/30 | 8271 | macros/latex/contrib/profcollege/latex/PfCBillard.tex
+2023/07/30 | 2072 | macros/latex/contrib/profcollege/latex/PfCBonSortie.tex
+2023/07/30 | 4387 | macros/latex/contrib/profcollege/latex/PfCCalculatrice.tex
+2023/07/30 | 14927 | macros/latex/contrib/profcollege/latex/PfCCalculsCroises.tex
+2023/07/30 | 6465 | macros/latex/contrib/profcollege/latex/PfCCalculsFractions.tex
+2023/07/30 | 7230 | macros/latex/contrib/profcollege/latex/PfCCalisson.tex
+2023/07/30 | 14262 | macros/latex/contrib/profcollege/latex/PfCCAN.tex
+2023/07/30 | 25670 | macros/latex/contrib/profcollege/latex/PfCCartesJeux.tex
+2023/07/30 | 1528 | macros/latex/contrib/profcollege/latex/PfCCartesMentales.tex
+2023/07/30 | 9724 | macros/latex/contrib/profcollege/latex/PfCCartographie.tex
+2023/07/30 | 7497 | macros/latex/contrib/profcollege/latex/PfCCible.tex
+2023/07/30 | 7088 | macros/latex/contrib/profcollege/latex/PfCColorilude.tex
+2023/07/30 | 11255 | macros/latex/contrib/profcollege/latex/PfCCompteBon.tex
+2023/07/30 | 9898 | macros/latex/contrib/profcollege/latex/PfCDecDeci.tex
+2023/07/30 | 3618 | macros/latex/contrib/profcollege/latex/PfCDecompFracDeci.tex
+2023/07/30 | 23117 | macros/latex/contrib/profcollege/latex/PfCDecomposerNombrePremier.tex
+2023/07/30 | 10479 | macros/latex/contrib/profcollege/latex/PfCDefiTables.tex
+2023/07/30 | 14131 | macros/latex/contrib/profcollege/latex/PfCDessinerRatio.tex
+2023/07/30 | 7962 | macros/latex/contrib/profcollege/latex/PfCDessinGradue.tex
+2023/07/30 | 4664 | macros/latex/contrib/profcollege/latex/PfCDiagrammeRadar.tex
+2023/07/30 | 58615 | macros/latex/contrib/profcollege/latex/PfCDistributivite.tex
+2023/07/30 | 831 | macros/latex/contrib/profcollege/latex/PfCDobble.tex
+2023/07/30 | 4117 | macros/latex/contrib/profcollege/latex/PfCDomino.tex
2023/07/04 | 9420 | macros/latex/contrib/profcollege/latex/PfCEcrireQCMold.tex
-2023/07/04 | 9326 | macros/latex/contrib/profcollege/latex/PfCEcrireunQCM.tex
-2023/07/04 | 2473 | macros/latex/contrib/profcollege/latex/PfCEcritureLettres.tex
-2023/07/04 | 13189 | macros/latex/contrib/profcollege/latex/PfCEcritureUnites.tex
-2023/07/04 | 2019 | macros/latex/contrib/profcollege/latex/PfCEngrenagesBase.tex
-2023/07/04 | 10633 | macros/latex/contrib/profcollege/latex/PfCEnigmeAire.tex
-2023/07/04 | 3765 | macros/latex/contrib/profcollege/latex/PfCEnquete.tex
+2023/07/30 | 9326 | macros/latex/contrib/profcollege/latex/PfCEcrireunQCM.tex
+2023/07/30 | 2470 | macros/latex/contrib/profcollege/latex/PfCEcritureLettres.tex
+2023/07/30 | 13189 | macros/latex/contrib/profcollege/latex/PfCEcritureUnites.tex
+2023/07/30 | 2019 | macros/latex/contrib/profcollege/latex/PfCEngrenagesBase.tex
+2023/07/30 | 10633 | macros/latex/contrib/profcollege/latex/PfCEnigmeAire.tex
+2023/07/30 | 3765 | macros/latex/contrib/profcollege/latex/PfCEnquete.tex
2023/06/23 | 23478 | macros/latex/contrib/profcollege/latex/PfCEquationComposition2.tex
2023/06/23 | 19350 | macros/latex/contrib/profcollege/latex/PfCEquationLaurent1.tex
2023/06/23 | 20438 | macros/latex/contrib/profcollege/latex/PfCEquationPose1.tex
2023/06/23 | 27165 | macros/latex/contrib/profcollege/latex/PfCEquationSoustraction2.tex
2023/06/23 | 15309 | macros/latex/contrib/profcollege/latex/PfCEquationSymbole1.tex
2023/06/23 | 22791 | macros/latex/contrib/profcollege/latex/PfCEquationTerme1.tex
-2023/07/04 | 3800 | macros/latex/contrib/profcollege/latex/PfCErathostene.tex
-2023/07/04 | 15072 | macros/latex/contrib/profcollege/latex/PfCFactorisation.tex
-2023/07/04 | 3280 | macros/latex/contrib/profcollege/latex/PfCFicheMemo.tex
-2023/07/04 | 15861 | macros/latex/contrib/profcollege/latex/PfCFonctionAffine.tex
-2023/07/04 | 7244 | macros/latex/contrib/profcollege/latex/PfCFrise.tex
-2023/07/04 | 4692 | macros/latex/contrib/profcollege/latex/PfCFutoshiki.tex
-2023/07/04 | 2155 | macros/latex/contrib/profcollege/latex/PfCGaram.tex
-2023/07/04 | 1596 | macros/latex/contrib/profcollege/latex/PfCGeometrie.tex
-2023/07/04 | 2285 | macros/latex/contrib/profcollege/latex/PfCGrades.tex
-2023/07/04 | 2211 | macros/latex/contrib/profcollege/latex/PfCHiddenMessage.tex
-2023/07/04 | 3806 | macros/latex/contrib/profcollege/latex/PfCJeuRangement.tex
-2023/07/04 | 2605 | macros/latex/contrib/profcollege/latex/PfCKakurasu.tex
-2023/07/04 | 2276 | macros/latex/contrib/profcollege/latex/PfCKakuro.tex
-2023/07/04 | 3835 | macros/latex/contrib/profcollege/latex/PfCKenKen.tex
-2023/07/04 | 9427 | macros/latex/contrib/profcollege/latex/PfCLabyrintheJeu.tex
-2023/07/04 | 23088 | macros/latex/contrib/profcollege/latex/PfCLabyrintheNombre.tex
-2023/07/04 | 2942 | macros/latex/contrib/profcollege/latex/PfCMentalo.tex
-2023/07/04 | 5365 | macros/latex/contrib/profcollege/latex/PfCMidpoint.tex
-2023/07/04 | 10548 | macros/latex/contrib/profcollege/latex/PfCModeleBarre.tex
-2023/07/04 | 4548 | macros/latex/contrib/profcollege/latex/PfCMosaique.tex
-2023/07/04 | 2815 | macros/latex/contrib/profcollege/latex/PfCMotsCodes.tex
-2023/07/04 | 2222 | macros/latex/contrib/profcollege/latex/PfCMotsCroises.tex
-2023/07/04 | 1862 | macros/latex/contrib/profcollege/latex/PfCMotsEmpiles.tex
-2023/07/04 | 7051 | macros/latex/contrib/profcollege/latex/PfCNombreAstral.tex
-2023/07/04 | 14017 | macros/latex/contrib/profcollege/latex/PfCNonogramme.tex
-2023/07/04 | 33737 | macros/latex/contrib/profcollege/latex/PfCNotionFonction.tex
-2023/07/04 | 12062 | macros/latex/contrib/profcollege/latex/PfCNumberHive.tex
-2023/07/04 | 4730 | macros/latex/contrib/profcollege/latex/PfCOperationsTrou.tex
-2023/07/04 | 10168 | macros/latex/contrib/profcollege/latex/PfCPapiers.tex
-2023/07/04 | 5824 | macros/latex/contrib/profcollege/latex/PfCPatronPaves.tex
-2023/07/04 | 25681 | macros/latex/contrib/profcollege/latex/PfCPavageAvecMotifImage.tex
-2023/07/04 | 35829 | macros/latex/contrib/profcollege/latex/PfCPavage.tex
-2023/07/04 | 4138 | macros/latex/contrib/profcollege/latex/PfCPixelArt.tex
-2023/07/04 | 8113 | macros/latex/contrib/profcollege/latex/PfCPourcentage.tex
-2023/07/04 | 7733 | macros/latex/contrib/profcollege/latex/PfCProbabilites.tex
-2023/07/04 | 6260 | macros/latex/contrib/profcollege/latex/PfCProgrammeCalcul.tex
-2023/07/04 | 15405 | macros/latex/contrib/profcollege/latex/PfCPropor.tex
-2023/07/04 | 11026 | macros/latex/contrib/profcollege/latex/PfCProprietesDroites.tex
-2023/07/04 | 7072 | macros/latex/contrib/profcollege/latex/PfCPuissanceQuatre.tex
-2023/07/04 | 7102 | macros/latex/contrib/profcollege/latex/PfCPuzzleSommePyramide.tex
-2023/07/04 | 9400 | macros/latex/contrib/profcollege/latex/PfCPyramideCalculs.tex
-2023/07/04 | 26408 | macros/latex/contrib/profcollege/latex/PfCPythagore.tex
-2023/07/04 | 25302 | macros/latex/contrib/profcollege/latex/PfCQuestionsFlash.tex
-2023/07/04 | 2305 | macros/latex/contrib/profcollege/latex/PfCQuestionsRelier.tex
-2023/07/04 | 2617 | macros/latex/contrib/profcollege/latex/PfCQuiSuisJe.tex
-2023/07/04 | 7314 | macros/latex/contrib/profcollege/latex/PfCRangementNombres.tex
-2023/07/04 | 1777 | macros/latex/contrib/profcollege/latex/PfCRapido.tex
-2023/07/04 | 28129 | macros/latex/contrib/profcollege/latex/PfCRappelsFormules.tex
-2023/07/04 | 71403 | macros/latex/contrib/profcollege/latex/PfCReperage.tex
-2023/07/04 | 15326 | macros/latex/contrib/profcollege/latex/PfCRepresentationGraphique.tex
-2023/07/04 | 5561 | macros/latex/contrib/profcollege/latex/PfCRepresenterEntier.tex
-2023/07/04 | 16038 | macros/latex/contrib/profcollege/latex/PfCRepresenterFraction.tex
-2023/07/04 | 5248 | macros/latex/contrib/profcollege/latex/PfCRepresenterTableur.tex
-2023/07/04 | 7797 | macros/latex/contrib/profcollege/latex/PfCReseauxSociaux.tex
-2023/07/04 | 16190 | macros/latex/contrib/profcollege/latex/PfCResoudreEquation.tex
-2023/07/04 | 3049 | macros/latex/contrib/profcollege/latex/PfCRLE.tex
-2023/07/04 | 16349 | macros/latex/contrib/profcollege/latex/PfCRondeInfernale.tex
-2023/07/04 | 10074 | macros/latex/contrib/profcollege/latex/PfCRose.tex
-2023/07/04 | 1488 | macros/latex/contrib/profcollege/latex/PfCScratch.tex
-2023/07/04 | 8711 | macros/latex/contrib/profcollege/latex/PfCShikaku.tex
-2023/07/04 | 7808 | macros/latex/contrib/profcollege/latex/PfCSimplifierFraction.tex
-2023/07/04 | 28413 | macros/latex/contrib/profcollege/latex/PfCSolides.tex
-2023/07/04 | 11740 | macros/latex/contrib/profcollege/latex/PfCSommeAngles.tex
-2023/07/04 | 2499 | macros/latex/contrib/profcollege/latex/PfCSquaro.tex
+2023/07/30 | 3800 | macros/latex/contrib/profcollege/latex/PfCErathostene.tex
+2023/07/30 | 15072 | macros/latex/contrib/profcollege/latex/PfCFactorisation.tex
+2023/07/30 | 3280 | macros/latex/contrib/profcollege/latex/PfCFicheMemo.tex
+2023/07/30 | 15861 | macros/latex/contrib/profcollege/latex/PfCFonctionAffine.tex
+2023/07/30 | 7244 | macros/latex/contrib/profcollege/latex/PfCFrise.tex
+2023/07/30 | 4692 | macros/latex/contrib/profcollege/latex/PfCFutoshiki.tex
+2023/07/30 | 2155 | macros/latex/contrib/profcollege/latex/PfCGaram.tex
+2023/07/30 | 1596 | macros/latex/contrib/profcollege/latex/PfCGeometrie.tex
+2023/07/30 | 2285 | macros/latex/contrib/profcollege/latex/PfCGrades.tex
+2023/07/30 | 6941 | macros/latex/contrib/profcollege/latex/PfCGrimuku.tex
+2023/07/30 | 2211 | macros/latex/contrib/profcollege/latex/PfCHiddenMessage.tex
+2023/07/30 | 7105 | macros/latex/contrib/profcollege/latex/PfCHorloge.tex
+2023/07/30 | 3806 | macros/latex/contrib/profcollege/latex/PfCJeuRangement.tex
+2023/07/30 | 2605 | macros/latex/contrib/profcollege/latex/PfCKakurasu.tex
+2023/07/30 | 2276 | macros/latex/contrib/profcollege/latex/PfCKakuro.tex
+2023/07/30 | 3835 | macros/latex/contrib/profcollege/latex/PfCKenKen.tex
+2023/07/30 | 9427 | macros/latex/contrib/profcollege/latex/PfCLabyrintheJeu.tex
+2023/07/30 | 29330 | macros/latex/contrib/profcollege/latex/PfCLabyrintheNombre.tex
+2023/07/30 | 2942 | macros/latex/contrib/profcollege/latex/PfCMentalo.tex
+2023/07/30 | 5365 | macros/latex/contrib/profcollege/latex/PfCMidpoint.tex
+2023/07/30 | 10548 | macros/latex/contrib/profcollege/latex/PfCModeleBarre.tex
+2023/07/30 | 4548 | macros/latex/contrib/profcollege/latex/PfCMosaique.tex
+2023/07/30 | 2815 | macros/latex/contrib/profcollege/latex/PfCMotsCodes.tex
+2023/07/30 | 2222 | macros/latex/contrib/profcollege/latex/PfCMotsCroises.tex
+2023/07/30 | 1862 | macros/latex/contrib/profcollege/latex/PfCMotsEmpiles.tex
+2023/07/30 | 4125 | macros/latex/contrib/profcollege/latex/PfCMulPiecesPuzzle.tex
+2023/07/30 | 7051 | macros/latex/contrib/profcollege/latex/PfCNombreAstral.tex
+2023/07/30 | 14120 | macros/latex/contrib/profcollege/latex/PfCNonogramme.tex
+2023/07/30 | 38866 | macros/latex/contrib/profcollege/latex/PfCNotionFonction.tex
+2023/07/30 | 12062 | macros/latex/contrib/profcollege/latex/PfCNumberHive.tex
+2023/07/30 | 5591 | macros/latex/contrib/profcollege/latex/PfCOperationsTrou.tex
+2023/07/30 | 10168 | macros/latex/contrib/profcollege/latex/PfCPapiers.tex
+2023/07/30 | 5824 | macros/latex/contrib/profcollege/latex/PfCPatronPaves.tex
+2023/07/30 | 25681 | macros/latex/contrib/profcollege/latex/PfCPavageAvecMotifImage.tex
+2023/07/30 | 35829 | macros/latex/contrib/profcollege/latex/PfCPavage.tex
+2023/07/30 | 4138 | macros/latex/contrib/profcollege/latex/PfCPixelArt.tex
+2023/07/30 | 8166 | macros/latex/contrib/profcollege/latex/PfCPourcentage.tex
+2023/07/30 | 7733 | macros/latex/contrib/profcollege/latex/PfCProbabilites.tex
+2023/07/30 | 6260 | macros/latex/contrib/profcollege/latex/PfCProgrammeCalcul.tex
+2023/07/30 | 15405 | macros/latex/contrib/profcollege/latex/PfCPropor.tex
+2023/07/30 | 11026 | macros/latex/contrib/profcollege/latex/PfCProprietesDroites.tex
+2023/07/30 | 7072 | macros/latex/contrib/profcollege/latex/PfCPuissanceQuatre.tex
+2023/07/30 | 7102 | macros/latex/contrib/profcollege/latex/PfCPuzzleSommePyramide.tex
+2023/07/30 | 9400 | macros/latex/contrib/profcollege/latex/PfCPyramideCalculs.tex
+2023/07/30 | 1287 | macros/latex/contrib/profcollege/latex/PfCPyraVoca.tex
+2023/07/30 | 26408 | macros/latex/contrib/profcollege/latex/PfCPythagore.tex
+2023/07/30 | 25302 | macros/latex/contrib/profcollege/latex/PfCQuestionsFlash.tex
+2023/07/30 | 2305 | macros/latex/contrib/profcollege/latex/PfCQuestionsRelier.tex
+2023/07/30 | 2617 | macros/latex/contrib/profcollege/latex/PfCQuiSuisJe.tex
+2023/07/30 | 7314 | macros/latex/contrib/profcollege/latex/PfCRangementNombres.tex
+2023/07/30 | 1777 | macros/latex/contrib/profcollege/latex/PfCRapido.tex
+2023/07/30 | 28129 | macros/latex/contrib/profcollege/latex/PfCRappelsFormules.tex
+2023/07/30 | 76929 | macros/latex/contrib/profcollege/latex/PfCReperage.tex
+2023/07/30 | 15326 | macros/latex/contrib/profcollege/latex/PfCRepresentationGraphique.tex
+2023/07/30 | 5561 | macros/latex/contrib/profcollege/latex/PfCRepresenterEntier.tex
+2023/07/30 | 16038 | macros/latex/contrib/profcollege/latex/PfCRepresenterFraction.tex
+2023/07/30 | 5223 | macros/latex/contrib/profcollege/latex/PfCRepresenterTableur.tex
+2023/07/30 | 7797 | macros/latex/contrib/profcollege/latex/PfCReseauxSociaux.tex
+2023/07/30 | 16190 | macros/latex/contrib/profcollege/latex/PfCResoudreEquation.tex
+2023/07/30 | 3049 | macros/latex/contrib/profcollege/latex/PfCRLE.tex
+2023/07/30 | 16486 | macros/latex/contrib/profcollege/latex/PfCRondeInfernale.tex
+2023/07/30 | 18239 | macros/latex/contrib/profcollege/latex/PfCRose.tex
+2023/07/30 | 1488 | macros/latex/contrib/profcollege/latex/PfCScratch.tex
+2023/07/30 | 8711 | macros/latex/contrib/profcollege/latex/PfCShikaku.tex
+2023/07/30 | 7808 | macros/latex/contrib/profcollege/latex/PfCSimplifierFraction.tex
+2023/07/30 | 28719 | macros/latex/contrib/profcollege/latex/PfCSolides.tex
+2023/07/30 | 11740 | macros/latex/contrib/profcollege/latex/PfCSommeAngles.tex
+2023/07/30 | 2499 | macros/latex/contrib/profcollege/latex/PfCSquaro.tex
2023/07/04 | 80994 | macros/latex/contrib/profcollege/latex/PfCStatistiquesoldold.tex
2023/07/04 | 80418 | macros/latex/contrib/profcollege/latex/PfCStatistiquesold.tex
-2023/07/04 | 82239 | macros/latex/contrib/profcollege/latex/PfCStatistiques.tex
-2023/07/04 | 82517 | macros/latex/contrib/profcollege/latex/PfCTableauxUnites.tex
-2023/07/04 | 3466 | macros/latex/contrib/profcollege/latex/PfCTablesOperations.tex
-2023/07/04 | 6030 | macros/latex/contrib/profcollege/latex/PfCTectonic.tex
-2023/07/04 | 56986 | macros/latex/contrib/profcollege/latex/PfCThales.tex
-2023/07/04 | 8307 | macros/latex/contrib/profcollege/latex/PfCTortueBase.tex
-2023/07/04 | 24666 | macros/latex/contrib/profcollege/latex/PfCTrigonometrie.tex
-2023/07/04 | 9951 | macros/latex/contrib/profcollege/latex/PfCTriominos.tex
-2023/07/04 | 19900 | macros/latex/contrib/profcollege/latex/PfCTrio.tex
-2023/07/04 | 9685 | macros/latex/contrib/profcollege/latex/PfCVueCubes.tex
-2023/07/04 | 8676 | macros/latex/contrib/profcollege/latex/PfCYohaku.tex
-2023/07/04 | 18328 | macros/latex/contrib/profcollege/latex/ProfCollege.sty
+2023/07/30 | 82730 | macros/latex/contrib/profcollege/latex/PfCStatistiques.tex
+2023/07/30 | 82575 | macros/latex/contrib/profcollege/latex/PfCTableauxUnites.tex
+2023/07/30 | 3466 | macros/latex/contrib/profcollege/latex/PfCTablesOperations.tex
+2023/07/30 | 6030 | macros/latex/contrib/profcollege/latex/PfCTectonic.tex
+2023/07/30 | 56986 | macros/latex/contrib/profcollege/latex/PfCThales.tex
+2023/07/30 | 8307 | macros/latex/contrib/profcollege/latex/PfCTortueBase.tex
+2023/07/30 | 24666 | macros/latex/contrib/profcollege/latex/PfCTrigonometrie.tex
+2023/07/30 | 9951 | macros/latex/contrib/profcollege/latex/PfCTriominos.tex
+2023/07/30 | 19900 | macros/latex/contrib/profcollege/latex/PfCTrio.tex
+2023/07/30 | 9734 | macros/latex/contrib/profcollege/latex/PfCVueCubes.tex
+2023/07/30 | 8676 | macros/latex/contrib/profcollege/latex/PfCYohaku.tex
+2023/07/30 | 18516 | macros/latex/contrib/profcollege/latex/ProfCollege.sty
2023/06/23 | 8247 | macros/latex/contrib/profcollege/metapost/datastest/PfCafganistan.dat
2023/06/23 | 10915 | macros/latex/contrib/profcollege/metapost/datastest/PfCafriquesud1.dat
2023/06/23 | 218 | macros/latex/contrib/profcollege/metapost/datastest/PfCafriquesud2.dat
@@ -234054,26 +234066,26 @@
2023/06/23 | 16443 | macros/latex/contrib/profcollege/metapost/datastest/PfCzaire.dat
2023/06/23 | 10433 | macros/latex/contrib/profcollege/metapost/datastest/PfCzambie.dat
2023/06/23 | 5644 | macros/latex/contrib/profcollege/metapost/datastest/PfCzimbabwe.dat
-2023/07/04 | 5056 | macros/latex/contrib/profcollege/metapost/PfCAfficheur.mp
-2023/07/04 | 5196 | macros/latex/contrib/profcollege/metapost/PfCArithmetique.mp
-2023/07/04 | 5200 | macros/latex/contrib/profcollege/metapost/PfCArithmetiquePDF.mp
-2023/07/04 | 13345 | macros/latex/contrib/profcollege/metapost/PfCCalculatrice.mp
-2023/07/04 | 969 | macros/latex/contrib/profcollege/metapost/PfCConstantes.mp
-2023/07/04 | 2335 | macros/latex/contrib/profcollege/metapost/PfCEngrenages.mp
-2023/07/04 | 53608 | macros/latex/contrib/profcollege/metapost/PfCGeometrie.mp
-2023/07/04 | 6547 | macros/latex/contrib/profcollege/metapost/PfCLabyNombre.mp
-2023/07/04 | 1682 | macros/latex/contrib/profcollege/metapost/PfCLaTeX.mp
-2023/07/04 | 42630 | macros/latex/contrib/profcollege/metapost/PfCMonde.mp
-2023/07/04 | 9412 | macros/latex/contrib/profcollege/metapost/PfCMosaique.mp
-2023/07/04 | 78067 | macros/latex/contrib/profcollege/metapost/PfCObjets.mp
-2023/07/04 | 63245 | macros/latex/contrib/profcollege/metapost/PfCPseudo.mp
-2023/07/04 | 106783 | macros/latex/contrib/profcollege/metapost/PfCScratch.mp
-2023/07/04 | 108388 | macros/latex/contrib/profcollege/metapost/PfCScratchpdf.mp
-2023/07/04 | 27969 | macros/latex/contrib/profcollege/metapost/PfCSolid.mp
-2023/07/04 | 6652 | macros/latex/contrib/profcollege/metapost/PfCSvgnames.mp
-2023/07/04 | 1683 | macros/latex/contrib/profcollege/metapost/PfCTurtleTestRemplis.mp
+2023/07/30 | 5056 | macros/latex/contrib/profcollege/metapost/PfCAfficheur.mp
+2023/07/30 | 5196 | macros/latex/contrib/profcollege/metapost/PfCArithmetique.mp
+2023/07/30 | 5200 | macros/latex/contrib/profcollege/metapost/PfCArithmetiquePDF.mp
+2023/07/30 | 13485 | macros/latex/contrib/profcollege/metapost/PfCCalculatrice.mp
+2023/07/30 | 969 | macros/latex/contrib/profcollege/metapost/PfCConstantes.mp
+2023/07/30 | 2335 | macros/latex/contrib/profcollege/metapost/PfCEngrenages.mp
+2023/07/30 | 53608 | macros/latex/contrib/profcollege/metapost/PfCGeometrie.mp
+2023/07/30 | 7465 | macros/latex/contrib/profcollege/metapost/PfCLabyNombre.mp
+2023/07/30 | 1682 | macros/latex/contrib/profcollege/metapost/PfCLaTeX.mp
+2023/07/30 | 42630 | macros/latex/contrib/profcollege/metapost/PfCMonde.mp
+2023/07/30 | 9412 | macros/latex/contrib/profcollege/metapost/PfCMosaique.mp
+2023/07/30 | 78068 | macros/latex/contrib/profcollege/metapost/PfCObjets.mp
+2023/07/30 | 63245 | macros/latex/contrib/profcollege/metapost/PfCPseudo.mp
+2023/07/30 | 106783 | macros/latex/contrib/profcollege/metapost/PfCScratch.mp
+2023/07/30 | 108388 | macros/latex/contrib/profcollege/metapost/PfCScratchpdf.mp
+2023/07/30 | 28024 | macros/latex/contrib/profcollege/metapost/PfCSolid.mp
+2023/07/30 | 6652 | macros/latex/contrib/profcollege/metapost/PfCSvgnames.mp
+2023/07/30 | 1683 | macros/latex/contrib/profcollege/metapost/PfCTurtleTestRemplis.mp
2023/06/23 | 435 | macros/latex/contrib/profcollege/README
-2023/07/04 | 14040419 | macros/latex/contrib/profcollege.zip
+2023/07/31 | 13922901 | 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
@@ -236860,33 +236872,33 @@
2007/12/02 | 2971 | macros/latex/contrib/SIunits/SIunits.ins
2007/12/02 | 328621 | macros/latex/contrib/SIunits/SIunits.pdf
2007/12/02 | 296391 | macros/latex/contrib/SIunits.zip
-2023/07/26 | 73724 | macros/latex/contrib/siunitx/CHANGELOG.md
-2023/07/26 | 996 | macros/latex/contrib/siunitx/README.md
-2023/07/26 | 10931 | macros/latex/contrib/siunitx/siunitx-abbreviation.dtx
-2023/07/26 | 4748 | macros/latex/contrib/siunitx/siunitx-abbreviations.cfg
-2023/07/26 | 17885 | macros/latex/contrib/siunitx/siunitx-angle.dtx
-2023/07/26 | 1729 | macros/latex/contrib/siunitx/siunitx-binary.cfg
-2023/07/26 | 2951 | macros/latex/contrib/siunitx/siunitx-binary.dtx
-2023/07/26 | 643547 | macros/latex/contrib/siunitx/siunitx-code.pdf
-2023/07/26 | 2636 | macros/latex/contrib/siunitx/siunitx-code.tex
-2023/07/26 | 8866 | macros/latex/contrib/siunitx/siunitx-command.dtx
-2023/07/26 | 38831 | macros/latex/contrib/siunitx/siunitx-complex.dtx
-2023/07/26 | 34004 | macros/latex/contrib/siunitx/siunitx-compound.dtx
-2023/07/26 | 21746 | macros/latex/contrib/siunitx/siunitx.dtx
-2023/07/26 | 31776 | macros/latex/contrib/siunitx/siunitx-emulation.dtx
-2023/07/26 | 3687 | macros/latex/contrib/siunitx/siunitx.ins
-2023/07/26 | 5544 | macros/latex/contrib/siunitx/siunitx-locale.dtx
-2023/07/26 | 152930 | macros/latex/contrib/siunitx/siunitx-number.dtx
-2023/07/26 | 691117 | macros/latex/contrib/siunitx/siunitx.pdf
-2023/07/26 | 36555 | macros/latex/contrib/siunitx/siunitx-print.dtx
-2023/07/26 | 15153 | macros/latex/contrib/siunitx/siunitx-quantity.dtx
-2023/07/26 | 9198 | macros/latex/contrib/siunitx/siunitx-symbol.dtx
-2023/07/26 | 53992 | macros/latex/contrib/siunitx/siunitx-table.dtx
-2023/07/26 | 160366 | macros/latex/contrib/siunitx/siunitx.tex
-2023/07/26 | 103395 | macros/latex/contrib/siunitx/siunitx-unit.dtx
-2023/07/26 | 273398 | macros/latex/contrib/siunitx/siunitx-v2.sty
-2023/07/26 | 31738 | macros/latex/contrib/siunitx/siunitx-version-1.cfg
-2023/07/26 | 1522455 | macros/latex/contrib/siunitx.zip
+2023/07/31 | 75542 | macros/latex/contrib/siunitx/CHANGELOG.md
+2023/07/31 | 996 | macros/latex/contrib/siunitx/README.md
+2023/07/31 | 11266 | macros/latex/contrib/siunitx/siunitx-abbreviation.dtx
+2023/07/31 | 4748 | macros/latex/contrib/siunitx/siunitx-abbreviations.cfg
+2023/07/31 | 18298 | macros/latex/contrib/siunitx/siunitx-angle.dtx
+2023/07/31 | 1729 | macros/latex/contrib/siunitx/siunitx-binary.cfg
+2023/07/31 | 2951 | macros/latex/contrib/siunitx/siunitx-binary.dtx
+2023/07/31 | 649679 | macros/latex/contrib/siunitx/siunitx-code.pdf
+2023/07/31 | 2636 | macros/latex/contrib/siunitx/siunitx-code.tex
+2023/07/31 | 8866 | macros/latex/contrib/siunitx/siunitx-command.dtx
+2023/07/31 | 38831 | macros/latex/contrib/siunitx/siunitx-complex.dtx
+2023/07/31 | 43624 | macros/latex/contrib/siunitx/siunitx-compound.dtx
+2023/07/31 | 22242 | macros/latex/contrib/siunitx/siunitx.dtx
+2023/07/31 | 31776 | macros/latex/contrib/siunitx/siunitx-emulation.dtx
+2023/07/31 | 3687 | macros/latex/contrib/siunitx/siunitx.ins
+2023/07/31 | 5831 | macros/latex/contrib/siunitx/siunitx-locale.dtx
+2023/07/31 | 159181 | macros/latex/contrib/siunitx/siunitx-number.dtx
+2023/07/31 | 705584 | macros/latex/contrib/siunitx/siunitx.pdf
+2023/07/31 | 36555 | macros/latex/contrib/siunitx/siunitx-print.dtx
+2023/07/31 | 15153 | macros/latex/contrib/siunitx/siunitx-quantity.dtx
+2023/07/31 | 9198 | macros/latex/contrib/siunitx/siunitx-symbol.dtx
+2023/07/31 | 55313 | macros/latex/contrib/siunitx/siunitx-table.dtx
+2023/07/31 | 168660 | macros/latex/contrib/siunitx/siunitx.tex
+2023/07/31 | 103395 | macros/latex/contrib/siunitx/siunitx-unit.dtx
+2023/07/31 | 273398 | macros/latex/contrib/siunitx/siunitx-v2.sty
+2023/07/31 | 31738 | macros/latex/contrib/siunitx/siunitx-version-1.cfg
+2023/07/31 | 1547163 | macros/latex/contrib/siunitx.zip
2011/06/03 | 662398 | macros/latex/contrib/skb/doc/skb.pdf
2011/03/15 | 1485 | macros/latex/contrib/skb/doc/user-guide/database/acronyms.tex
2011/03/15 | 722 | macros/latex/contrib/skb/doc/user-guide/database/bibliography.tex
@@ -294612,9 +294624,9 @@
2019/02/28 | 2328 | systems/texlive/tlnet/archive/galois.r15878.tar.xz
2019/02/28 | 6452 | systems/texlive/tlnet/archive/galois.source.r15878.tar.xz
2019/02/28 | 219896 | systems/texlive/tlnet/archive/gamebook.doc.r24714.tar.xz
-2022/05/29 | 391300 | systems/texlive/tlnet/archive/gamebooklib.doc.r63424.tar.xz
-2022/05/29 | 3616 | systems/texlive/tlnet/archive/gamebooklib.r63424.tar.xz
-2022/05/29 | 15104 | systems/texlive/tlnet/archive/gamebooklib.source.r63424.tar.xz
+2023/07/31 | 402440 | systems/texlive/tlnet/archive/gamebooklib.doc.r67772.tar.xz
+2023/07/31 | 3816 | systems/texlive/tlnet/archive/gamebooklib.r67772.tar.xz
+2023/07/31 | 15456 | systems/texlive/tlnet/archive/gamebooklib.source.r67772.tar.xz
2019/02/28 | 1696 | systems/texlive/tlnet/archive/gamebook.r24714.tar.xz
2019/02/28 | 4640 | systems/texlive/tlnet/archive/gamebook.source.r24714.tar.xz
2020/09/23 | 3276 | systems/texlive/tlnet/archive/gammas.doc.r56403.tar.xz
@@ -298756,12 +298768,12 @@
2019/11/19 | 340 | systems/texlive/tlnet/archive/pdfjam.amd64-freebsd.r52858.tar.xz
2019/11/19 | 340 | systems/texlive/tlnet/archive/pdfjam.amd64-netbsd.r52858.tar.xz
2019/11/19 | 340 | systems/texlive/tlnet/archive/pdfjam.armhf-linux.r52858.tar.xz
-2023/07/07 | 160216 | systems/texlive/tlnet/archive/pdfjam.doc.r67566.tar.xz
+2023/07/31 | 159612 | systems/texlive/tlnet/archive/pdfjam.doc.r67773.tar.xz
2019/11/19 | 340 | systems/texlive/tlnet/archive/pdfjam.i386-freebsd.r52858.tar.xz
2019/11/19 | 336 | systems/texlive/tlnet/archive/pdfjam.i386-linux.r52858.tar.xz
2019/11/19 | 340 | systems/texlive/tlnet/archive/pdfjam.i386-netbsd.r52858.tar.xz
2019/11/19 | 340 | systems/texlive/tlnet/archive/pdfjam.i386-solaris.r52858.tar.xz
-2023/07/07 | 12780 | systems/texlive/tlnet/archive/pdfjam.r67566.tar.xz
+2023/07/31 | 12752 | systems/texlive/tlnet/archive/pdfjam.r67773.tar.xz
2021/02/25 | 336 | systems/texlive/tlnet/archive/pdfjam.universal-darwin.r57908.tar.xz
2019/11/19 | 340 | systems/texlive/tlnet/archive/pdfjam.x86_64-cygwin.r52858.tar.xz
2019/11/19 | 348 | systems/texlive/tlnet/archive/pdfjam.x86_64-darwinlegacy.r52858.tar.xz
@@ -301555,7 +301567,7 @@
2022/09/13 | 600 | systems/texlive/tlnet/archive/texlive-scripts.amd64-freebsd.r64356.tar.xz
2022/09/13 | 596 | systems/texlive/tlnet/archive/texlive-scripts.amd64-netbsd.r64356.tar.xz
2022/09/13 | 596 | systems/texlive/tlnet/archive/texlive-scripts.armhf-linux.r64356.tar.xz
-2023/07/30 | 428048 | systems/texlive/tlnet/archive/texlive-scripts.doc.r67759.tar.xz
+2023/07/31 | 428160 | systems/texlive/tlnet/archive/texlive-scripts.doc.r67768.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
@@ -301577,7 +301589,7 @@
2022/09/13 | 592 | systems/texlive/tlnet/archive/texlive-scripts.i386-linux.r64356.tar.xz
2022/09/13 | 596 | systems/texlive/tlnet/archive/texlive-scripts.i386-netbsd.r64356.tar.xz
2022/09/13 | 596 | systems/texlive/tlnet/archive/texlive-scripts.i386-solaris.r64356.tar.xz
-2023/07/30 | 114056 | systems/texlive/tlnet/archive/texlive-scripts.r67759.tar.xz
+2023/07/31 | 114060 | systems/texlive/tlnet/archive/texlive-scripts.r67768.tar.xz
2022/09/13 | 580 | systems/texlive/tlnet/archive/texlive-scripts.universal-darwin.r64356.tar.xz
2023/05/14 | 60312 | systems/texlive/tlnet/archive/texlive-scripts.windows.r67095.tar.xz
2022/09/13 | 596 | systems/texlive/tlnet/archive/texlive-scripts.x86_64-cygwin.r64356.tar.xz
@@ -301900,8 +301912,8 @@
2023/02/18 | 35416 | systems/texlive/tlnet/archive/tie.x86_64-solaris.r65877.tar.xz
2023/05/29 | 579240 | systems/texlive/tlnet/archive/tikz2d-fr.doc.r67239.tar.xz
2023/05/29 | 2760 | systems/texlive/tlnet/archive/tikz2d-fr.r67239.tar.xz
-2023/07/24 | 594236 | systems/texlive/tlnet/archive/tikz3d-fr.doc.r67718.tar.xz
-2023/07/24 | 3336 | systems/texlive/tlnet/archive/tikz3d-fr.r67718.tar.xz
+2023/07/31 | 595564 | systems/texlive/tlnet/archive/tikz3d-fr.doc.r67774.tar.xz
+2023/07/31 | 3400 | systems/texlive/tlnet/archive/tikz3d-fr.r67774.tar.xz
2019/02/28 | 391432 | systems/texlive/tlnet/archive/tikz-3dplot.doc.r25087.tar.xz
2019/02/28 | 7812 | systems/texlive/tlnet/archive/tikz-3dplot.r25087.tar.xz
2021/10/29 | 5137144 | systems/texlive/tlnet/archive/tikz-among-us.doc.r60880.tar.xz
@@ -303149,12 +303161,12 @@
2019/02/28 | 344 | systems/texlive/tlnet/archive/xindex.amd64-freebsd.r49312.tar.xz
2019/02/28 | 344 | systems/texlive/tlnet/archive/xindex.amd64-netbsd.r49312.tar.xz
2019/02/28 | 344 | systems/texlive/tlnet/archive/xindex.armhf-linux.r49312.tar.xz
-2023/07/29 | 606076 | systems/texlive/tlnet/archive/xindex.doc.r67751.tar.xz
+2023/07/31 | 608088 | systems/texlive/tlnet/archive/xindex.doc.r67771.tar.xz
2019/02/28 | 344 | systems/texlive/tlnet/archive/xindex.i386-freebsd.r49312.tar.xz
2019/02/28 | 340 | systems/texlive/tlnet/archive/xindex.i386-linux.r49312.tar.xz
2019/02/28 | 340 | systems/texlive/tlnet/archive/xindex.i386-netbsd.r49312.tar.xz
2019/02/28 | 340 | systems/texlive/tlnet/archive/xindex.i386-solaris.r49312.tar.xz
-2023/07/29 | 36380 | systems/texlive/tlnet/archive/xindex.r67751.tar.xz
+2023/07/31 | 36356 | systems/texlive/tlnet/archive/xindex.r67771.tar.xz
2021/02/25 | 340 | systems/texlive/tlnet/archive/xindex.universal-darwin.r57908.tar.xz
2023/02/20 | 2304 | systems/texlive/tlnet/archive/xindex.windows.r65891.tar.xz
2019/02/28 | 340 | systems/texlive/tlnet/archive/xindex.x86_64-cygwin.r49312.tar.xz
@@ -303446,16 +303458,16 @@
2020/07/18 | 47816 | systems/texlive/tlnet/archive/zztex.doc.r55862.tar.xz
2020/07/18 | 101724 | systems/texlive/tlnet/archive/zztex.r55862.tar.xz
2023/03/12 | 125532 | systems/texlive/tlnet/install-tl
-2023/07/30 | 5734095 | systems/texlive/tlnet/install-tl-unx.tar.gz
-2023/07/30 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
-2023/07/30 | 488 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
+2023/07/31 | 5732783 | systems/texlive/tlnet/install-tl-unx.tar.gz
+2023/07/31 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
+2023/07/31 | 488 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
2023/05/13 | 5083 | systems/texlive/tlnet/install-tl-windows.bat
-2023/07/30 | 21037345 | systems/texlive/tlnet/install-tl-windows.exe
-2023/07/30 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
-2023/07/30 | 488 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
-2023/07/30 | 26025425 | systems/texlive/tlnet/install-tl.zip
-2023/07/30 | 145 | systems/texlive/tlnet/install-tl.zip.sha512
-2023/07/30 | 488 | systems/texlive/tlnet/install-tl.zip.sha512.asc
+2023/07/31 | 21037473 | systems/texlive/tlnet/install-tl-windows.exe
+2023/07/31 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
+2023/07/31 | 488 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
+2023/07/31 | 26025421 | systems/texlive/tlnet/install-tl.zip
+2023/07/31 | 145 | systems/texlive/tlnet/install-tl.zip.sha512
+2023/07/31 | 488 | systems/texlive/tlnet/install-tl.zip.sha512.asc
2023/03/19 | 1229 | systems/texlive/tlnet/README.md
2023/03/19 | 0 | systems/texlive/tlnet/TEXLIVE_2023
2023/01/17 | 8401 | systems/texlive/tlnet/tlpkg/gpg/pubring.gpg
@@ -303465,7 +303477,7 @@
2023/01/17 | 1280 | systems/texlive/tlnet/tlpkg/gpg/trustdb.gpg
2023/06/25 | 49936 | systems/texlive/tlnet/tlpkg/installer/config.guess
2010/11/11 | 11651 | systems/texlive/tlnet/tlpkg/installer/COPYING.MinGW-runtime.txt
-2023/07/29 | 7439 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
+2023/07/30 | 7452 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
2023/05/31 | 215902 | systems/texlive/tlnet/tlpkg/installer/curl/curl-ca-bundle.crt
2020/04/15 | 2606592 | systems/texlive/tlnet/tlpkg/installer/curl/curl.exe
2017/04/16 | 2629 | systems/texlive/tlnet/tlpkg/installer/installer-options.txt
@@ -303507,12 +303519,12 @@
2023/02/21 | 20371 | systems/texlive/tlnet/tlpkg/TeXLive/TLCrypto.pm
2021/12/21 | 5429 | systems/texlive/tlnet/tlpkg/TeXLive/TLDownload.pm
2023/04/08 | 28167 | systems/texlive/tlnet/tlpkg/TeXLive/TLPaper.pm
-2023/07/30 | 18170214 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
-2023/07/30 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
+2023/07/31 | 18170215 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
+2023/07/31 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
2023/02/20 | 86803 | systems/texlive/tlnet/tlpkg/TeXLive/TLPDB.pm
-2023/07/30 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
-2023/07/30 | 488 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
-2023/07/30 | 2459276 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
+2023/07/31 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
+2023/07/31 | 488 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
+2023/07/31 | 2459844 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
2023/02/20 | 58928 | systems/texlive/tlnet/tlpkg/TeXLive/TLPOBJ.pm
2023/06/11 | 42749 | systems/texlive/tlnet/tlpkg/TeXLive/TLPSRC.pm
2023/02/21 | 16138 | systems/texlive/tlnet/tlpkg/TeXLive/TLTREE.pm
@@ -314136,11 +314148,11 @@
2014/07/05 | 611 | systems/win32/yandy/README
2014/07/05 | 1004628 | systems/win32/yandy/yandy-src.tar.xz
2014/07/05 | 1012416 | systems/win32/yandy.zip
-2023/07/31 | 186 | timestamp
+2023/08/01 | 186 | timestamp
2002/08/26 | 61898 | usergrps/dante/antrag.pdf
2002/08/26 | 118217 | usergrps/dante/antrag.ps
2021/11/11 | 917 | usergrps/dante/dtk/doc/beispiel.bib
-2023/07/29 | 75603 | usergrps/dante/dtk/doc/beispiel.pdf
+2023/07/31 | 75603 | usergrps/dante/dtk/doc/beispiel.pdf
2023/07/29 | 3073 | usergrps/dante/dtk/doc/beispiel.tex
2022/05/08 | 5258 | usergrps/dante/dtk/doc/dtk-extern-test.tex
2018/12/23 | 253 | usergrps/dante/dtk/dtk0.tex
@@ -314152,11 +314164,11 @@
2023/07/25 | 2115 | usergrps/dante/dtk/dtk-fonts.clo
2023/07/25 | 18092 | usergrps/dante/dtk/dtk-full.clo
2018/12/23 | 534 | usergrps/dante/dtk/dtk.nolig
-2019/10/25 | 394 | usergrps/dante/dtk/dtk-ruecken.tex
-2020/10/05 | 4579 | usergrps/dante/dtk/dtk-url.sty
+2023/07/31 | 395 | usergrps/dante/dtk/dtk-ruecken.tex
+2023/07/31 | 4599 | usergrps/dante/dtk/dtk-url.sty
2018/12/23 | 1903 | usergrps/dante/dtk/dtk.xdy
-2021/11/11 | 159 | usergrps/dante/dtk/README.md
-2023/07/29 | 98597 | usergrps/dante/dtk.zip
+2023/07/29 | 84 | usergrps/dante/dtk/README.md
+2023/07/31 | 98557 | usergrps/dante/dtk.zip
2000/10/23 | 348511 | usergrps/dante/flyer-dante-print.pdf
2000/10/23 | 945544 | usergrps/dante/flyer-dante-print.ps
2000/10/23 | 348042 | usergrps/dante/flyer-dante-single.pdf
diff --git a/FILES.byname.gz b/FILES.byname.gz
index 1e755e0718..8cfa0af52c 100644
--- a/FILES.byname.gz
+++ b/FILES.byname.gz
Binary files differ
diff --git a/FILES.last07days b/FILES.last07days
index d8260338cd..3aa2be7bf9 100644
--- a/FILES.last07days
+++ b/FILES.last07days
@@ -1,20 +1,143 @@
+2023/07/31 | 996 | macros/latex/contrib/siunitx/README.md
+2023/07/31 | 99130 | macros/latex/contrib/caption/ltcaption.pdf
+2023/07/31 | 98557 | usergrps/dante/dtk.zip
+2023/07/31 | 97411 | macros/latex/contrib/caption/subcaption.dtx
+2023/07/31 | 9298 | macros/latex/contrib/caption/CHANGELOG
+2023/07/31 | 9198 | macros/latex/contrib/siunitx/siunitx-symbol.dtx
+2023/07/31 | 8866 | macros/latex/contrib/siunitx/siunitx-command.dtx
+2023/07/31 | 8089 | macros/latex/contrib/caption/caption-ams-smf.dtx
+2023/07/31 | 78170 | macros/latex/contrib/caption/caption2.pdf
+2023/07/31 | 75603 | usergrps/dante/dtk/doc/beispiel.pdf
+2023/07/31 | 75542 | macros/latex/contrib/siunitx/CHANGELOG.md
+2023/07/31 | 705584 | macros/latex/contrib/siunitx/siunitx.pdf
+2023/07/31 | 6856 | macros/latex/contrib/caption/caption-thesis.dtx
+2023/07/31 | 67305 | macros/latex/contrib/caption/caption-light.pdf
+2023/07/31 | 66826 | macros/latex/contrib/caption/bicaption.dtx
+2023/07/31 | 6655 | macros/latex/contrib/caption/caption-ntg.dtx
+2023/07/31 | 6579 | macros/latex/contrib/caption/caption-elsarticle.dtx
+2023/07/31 | 649679 | macros/latex/contrib/siunitx/siunitx-code.pdf
+2023/07/31 | 619 | graphics/pgf/contrib/quiver/README.md
+2023/07/31 | 608088 | systems/texlive/tlnet/archive/xindex.doc.r67771.tar.xz
+2023/07/31 | 595564 | systems/texlive/tlnet/archive/tikz3d-fr.doc.r67774.tar.xz
+2023/07/31 | 5831 | macros/latex/contrib/siunitx/siunitx-locale.dtx
+2023/07/31 | 5732783 | systems/texlive/tlnet/install-tl-unx.tar.gz
+2023/07/31 | 55313 | macros/latex/contrib/siunitx/siunitx-table.dtx
+2023/07/31 | 5296 | graphics/pgf/contrib/quiver/quiver-doc.tex
+2023/07/31 | 50067 | macros/latex/contrib/caption/caption2.dtx
+2023/07/31 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
+2023/07/31 | 488 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
+2023/07/31 | 488 | systems/texlive/tlnet/install-tl.zip.sha512.asc
+2023/07/31 | 488 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
+2023/07/31 | 488 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
+2023/07/31 | 4748 | macros/latex/contrib/siunitx/siunitx-abbreviations.cfg
+2023/07/31 | 46949 | macros/latex/contrib/caption/fallback/v2.1/caption2.dtx
+2023/07/31 | 4599 | usergrps/dante/dtk/dtk-url.sty
+2023/07/31 | 4455 | macros/latex/contrib/caption/captiondoc.cls
+2023/07/31 | 44507 | fonts/newtx/README
+2023/07/31 | 43624 | macros/latex/contrib/siunitx/siunitx-compound.dtx
+2023/07/31 | 428715 | macros/latex/contrib/caption/caption.pdf
+2023/07/31 | 428160 | systems/texlive/tlnet/archive/texlive-scripts.doc.r67768.tar.xz
+2023/07/31 | 4090233 | biblio/ctan-bibdata.zip
+2023/07/31 | 402440 | systems/texlive/tlnet/archive/gamebooklib.doc.r67772.tar.xz
+2023/07/31 | 395 | usergrps/dante/dtk/dtk-ruecken.tex
+2023/07/31 | 3922 | macros/latex/contrib/caption/caption.ins
+2023/07/31 | 38831 | macros/latex/contrib/siunitx/siunitx-complex.dtx
+2023/07/31 | 3816 | systems/texlive/tlnet/archive/gamebooklib.r67772.tar.xz
+2023/07/31 | 3690210 | biblio/ctan-bibdata/ctan.pdf
+2023/07/31 | 3687 | macros/latex/contrib/siunitx/siunitx.ins
+2023/07/31 | 36555 | macros/latex/contrib/siunitx/siunitx-print.dtx
+2023/07/31 | 36356 | systems/texlive/tlnet/archive/xindex.r67771.tar.xz
+2023/07/31 | 3400 | systems/texlive/tlnet/archive/tikz3d-fr.r67774.tar.xz
+2023/07/31 | 339100 | macros/latex/contrib/caption/caption.dtx
+2023/07/31 | 31776 | macros/latex/contrib/siunitx/siunitx-emulation.dtx
+2023/07/31 | 31738 | macros/latex/contrib/siunitx/siunitx-version-1.cfg
+2023/07/31 | 2951 | macros/latex/contrib/siunitx/siunitx-binary.dtx
+2023/07/31 | 2950 | macros/latex/contrib/caption/README
+2023/07/31 | 29158 | macros/latex/contrib/caption/ltcaption.dtx
+2023/07/31 | 291332 | macros/latex/contrib/caption/fallback/v3.1/caption.dtx
+2023/07/31 | 2797515 | biblio/ctan-bibdata/ctan.bib
+2023/07/31 | 27747 | fonts/newtx/tex/newtx.sty
+2023/07/31 | 273398 | macros/latex/contrib/siunitx/siunitx-v2.sty
+2023/07/31 | 2636 | macros/latex/contrib/siunitx/siunitx-code.tex
+2023/07/31 | 26025421 | systems/texlive/tlnet/install-tl.zip
+2023/07/31 | 2459844 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
+2023/07/31 | 229241 | macros/latex/contrib/caption/subcaption.pdf
+2023/07/31 | 22242 | macros/latex/contrib/siunitx/siunitx.dtx
+2023/07/31 | 21420 | macros/latex/contrib/caption/fallback/v2.0/caption2.dtx
+2023/07/31 | 21191 | macros/latex/contrib/caption/elephant.eps
+2023/07/31 | 21037473 | systems/texlive/tlnet/install-tl-windows.exe
+2023/07/31 | 20315 | fonts/newtx/tex/newtxtext.sty
+2023/07/31 | 195173 | macros/latex/contrib/caption/caption3.dtx
+2023/07/31 | 19008 | macros/latex/contrib/caption/fallback/v1/caption.dtx
+2023/07/31 | 189078 | graphics/pgf/contrib/quiver/quiver-doc.pdf
+2023/07/31 | 186489 | graphics/pgf/contrib/quiver.zip
+2023/07/31 | 18298 | macros/latex/contrib/siunitx/siunitx-angle.dtx
+2023/07/31 | 182408 | macros/latex/contrib/caption/fallback/v3.0/caption.dtx
+2023/07/31 | 18170215 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
+2023/07/31 | 181372 | macros/latex/contrib/caption/fallback/v3.3/caption.dtx
+2023/07/31 | 179084 | macros/latex/contrib/caption/fallback/v3.5/caption3.dtx
+2023/07/31 | 1729 | macros/latex/contrib/siunitx/siunitx-binary.cfg
+2023/07/31 | 1694248 | install/macros/latex/contrib/caption.tds.zip
+2023/07/31 | 169367 | macros/latex/contrib/caption/fallback/v3.4/caption.dtx
+2023/07/31 | 168660 | macros/latex/contrib/siunitx/siunitx.tex
+2023/07/31 | 16792 | macros/latex/contrib/caption/caption-koma.dtx
+2023/07/31 | 1678 | biblio/ctan-bibdata/biblatex-ctan/ctan.bbx
+2023/07/31 | 165257 | macros/latex/contrib/caption/fallback/v3.2/caption.dtx
+2023/07/31 | 162941 | macros/latex/contrib/caption/fallback/v3.5/caption.dtx
+2023/07/31 | 159612 | systems/texlive/tlnet/archive/pdfjam.doc.r67773.tar.xz
+2023/07/31 | 1594085 | install/macros/latex/contrib/siunitx.tds.zip
+2023/07/31 | 159181 | macros/latex/contrib/siunitx/siunitx-number.dtx
+2023/07/31 | 157502 | macros/latex/contrib/caption/fallback/v3.4/caption3.dtx
+2023/07/31 | 15737 | macros/latex/contrib/caption/cat.eps
+2023/07/31 | 1547163 | macros/latex/contrib/siunitx.zip
+2023/07/31 | 15456 | systems/texlive/tlnet/archive/gamebooklib.source.r67772.tar.xz
+2023/07/31 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
+2023/07/31 | 153437 | macros/latex/contrib/caption/fallback/v3.3/caption3.dtx
+2023/07/31 | 153251 | macros/latex/contrib/caption/bicaption.pdf
+2023/07/31 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
+2023/07/31 | 15153 | macros/latex/contrib/siunitx/siunitx-quantity.dtx
+2023/07/31 | 1490552 | macros/latex/contrib/caption.zip
+2023/07/31 | 145 | systems/texlive/tlnet/install-tl.zip.sha512
+2023/07/31 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
+2023/07/31 | 140351 | fonts/newtx/tex/newtxmath.sty
+2023/07/31 | 13922901 | macros/latex/contrib/profcollege.zip
+2023/07/31 | 13911 | macros/latex/contrib/caption/caption-beamer.dtx
+2023/07/31 | 135024 | macros/latex/contrib/caption/fallback/v3.2/caption3.dtx
+2023/07/31 | 12752 | systems/texlive/tlnet/archive/pdfjam.r67773.tar.xz
+2023/07/31 | 11726 | macros/latex/contrib/caption/caption-light.dtx
+2023/07/31 | 11429 | macros/latex/contrib/caption/caption-memoir.dtx
+2023/07/31 | 114060 | systems/texlive/tlnet/archive/texlive-scripts.r67768.tar.xz
+2023/07/31 | 112 | macros/latex/contrib/caption/SUMMARY
+2023/07/31 | 11266 | macros/latex/contrib/siunitx/siunitx-abbreviation.dtx
+2023/07/31 | 103395 | macros/latex/contrib/siunitx/siunitx-unit.dtx
+2023/07/31 | 10229041 | fonts/newtx.zip
2023/07/30 | 9 | support/texlab/crates/parser/src/test_data/latex/label/label_reference_simple.txt
2023/07/30 | 9 | support/texlab/crates/parser/src/test_data/latex/glossary/glossary_entry_reference_simple.txt
2023/07/30 | 9 | support/texlab/crates/parser/src/test_data/latex/citation/citation_missing_brace.txt
2023/07/30 | 998 | support/texlab/crates/parser/src/snapshots/parser__latex__tests__parse@theorem_definition__theorem_definition_thmtools.txt.snap
2023/07/30 | 9956 | support/texlab/crates/base-db/src/workspace.rs
+2023/07/30 | 9951 | macros/latex/contrib/profcollege/latex/PfCTriominos.tex
2023/07/30 | 993 | support/texlab/crates/parser/src/test_data/bibtex/samples/knuth_1984.txt
+2023/07/30 | 9898 | macros/latex/contrib/profcollege/latex/PfCDecDeci.tex
2023/07/30 | 988 | support/texlab/crates/texlab/src/features/reference.rs
2023/07/30 | 987 | support/texlab/crates/commands/src/change_env.rs
2023/07/30 | 980 | support/texlab/crates/parser/src/snapshots/parser__latex__tests__parse@color__color_set_definition_simple.txt.snap
2023/07/30 | 97924 | systems/texlive/tlnet/archive/texinfo.r67759.tar.xz
2023/07/30 | 975 | support/texlab/crates/parser/src/snapshots/parser__build_log__tests__parse@004.txt.snap
+2023/07/30 | 9734 | macros/latex/contrib/profcollege/latex/PfCVueCubes.tex
+2023/07/30 | 9724 | macros/latex/contrib/profcollege/latex/PfCCartographie.tex
+2023/07/30 | 969 | macros/latex/contrib/profcollege/metapost/PfCConstantes.mp
2023/07/30 | 965 | support/texlab/crates/parser/src/snapshots/parser__latex__tests__parse@glossary__glossary_entry_definition_simple.txt.snap
2023/07/30 | 953 | support/texlab/crates/parser/src/snapshots/parser__build_log__tests__parse@005.txt.snap
2023/07/30 | 9479 | support/texlab/crates/parser/src/snapshots/parser__bibtex__tests__parse@samples__knuth_1984.txt.snap
2023/07/30 | 946 | support/texlab/crates/texlab/tests/lsp/text_document/snapshots/lsp__text_document__formatting__bibtex_internal_multiple_entries.snap
+2023/07/30 | 9427 | macros/latex/contrib/profcollege/latex/PfCLabyrintheJeu.tex
+2023/07/30 | 9412 | macros/latex/contrib/profcollege/metapost/PfCMosaique.mp
+2023/07/30 | 9400 | macros/latex/contrib/profcollege/latex/PfCPyramideCalculs.tex
2023/07/30 | 933 | support/texlab/crates/symbols/src/document/snapshots/symbols__document__tests__section.snap
2023/07/30 | 932 | support/texlab/crates/texlab/src/features/link.rs
+2023/07/30 | 9326 | macros/latex/contrib/profcollege/latex/PfCEcrireunQCM.tex
+2023/07/30 | 9132731 | macros/latex/contrib/profcollege/doc/ProfCollege-doc.pdf
2023/07/30 | 911 | support/texlab/crates/references/src/label.rs
2023/07/30 | 911 | support/texlab/crates/parser/src/snapshots/parser__latex__tests__parse@glossary__glossary_entry_reference_options.txt.snap
2023/07/30 | 911 | support/texlab/crates/parser/src/snapshots/parser__latex__tests__parse@environment__environment_definition_optional_arg.txt.snap
@@ -26,6 +149,8 @@
2023/07/30 | 8955 | support/texlab/crates/citeproc/src/field/text.rs
2023/07/30 | 890 | support/texlab/crates/citeproc/src/lib.rs
2023/07/30 | 8868 | support/texlab/crates/parser/src/snapshots/parser__bibtex__tests__parse@samples__kastenholz_2006.txt.snap
+2023/07/30 | 8711 | macros/latex/contrib/profcollege/latex/PfCShikaku.tex
+2023/07/30 | 8676 | macros/latex/contrib/profcollege/latex/PfCYohaku.tex
2023/07/30 | 864 | support/texlab/crates/syntax/src/lib.rs
2023/07/30 | 861 | support/texlab/crates/parser/src/snapshots/parser__latex__tests__parse@include__biblatex_include_options.txt.snap
2023/07/30 | 860 | support/texlab/crates/parser/src/test_data/bibtex/samples/blom_2021.txt
@@ -37,15 +162,21 @@
2023/07/30 | 841 | support/texlab/crates/texlab/tests/lsp/text_document/snapshots/lsp__text_document__folding_range__latex.snap
2023/07/30 | 841 | support/texlab/crates/symbols/src/document/snapshots/symbols__document__tests__equation.snap
2023/07/30 | 838 | support/texlab/crates/texlab/src/features/completion/acronym_ref.rs
+2023/07/30 | 831 | macros/latex/contrib/profcollege/latex/PfCDobble.tex
+2023/07/30 | 8307 | macros/latex/contrib/profcollege/latex/PfCTortueBase.tex
2023/07/30 | 82 | support/texlab/crates/parser/src/test_data/bibtex/comment.txt
+2023/07/30 | 82730 | macros/latex/contrib/profcollege/latex/PfCStatistiques.tex
2023/07/30 | 8271 | support/texlab/crates/texlab/src/util/diagnostics.rs
+2023/07/30 | 8271 | macros/latex/contrib/profcollege/latex/PfCBillard.tex
2023/07/30 | 825 | support/texlab/crates/parser/src/snapshots/parser__latex__tests__parse@label__label_reference_incomplete.txt.snap
+2023/07/30 | 82575 | macros/latex/contrib/profcollege/latex/PfCTableauxUnites.tex
2023/07/30 | 824 | support/texlab/crates/texlab/src/features/completion/field.rs
2023/07/30 | 823 | support/texlab/crates/symbols/src/workspace/snapshots/symbols__workspace__tests__filter_bibtex.snap
2023/07/30 | 821 | support/texlab/crates/parser/src/snapshots/parser__latex__tests__parse@group__equation_missing_end.txt.snap
2023/07/30 | 821 | support/texlab/crates/base-db/src/semantics.rs
2023/07/30 | 820 | support/texlab/crates/distro/src/texlive.rs
2023/07/30 | 819 | support/texlab/crates/hover/src/label.rs
+2023/07/30 | 8166 | macros/latex/contrib/profcollege/latex/PfCPourcentage.tex
2023/07/30 | 815 | support/texlab/crates/parser/src/snapshots/parser__latex__tests__parse@glossary__acronym_reference_options.txt.snap
2023/07/30 | 814 | support/texlab/crates/parser/src/snapshots/parser__latex__tests__parse@equation_missing_begin.txt.snap
2023/07/30 | 80 | support/texlab/crates/parser/src/test_data/latex/command_definition/command_definition_with_begin.txt
@@ -54,16 +185,22 @@
2023/07/30 | 7 | support/texlab/crates/parser/src/test_data/latex/citation/citation_empty.txt
2023/07/30 | 79 | support/texlab/crates/diagnostics/src/grammar.rs
2023/07/30 | 797 | support/texlab/crates/symbols/src/document/snapshots/symbols__document__tests__allowed_patterns.snap
+2023/07/30 | 7962 | macros/latex/contrib/profcollege/latex/PfCDessinGradue.tex
2023/07/30 | 7953 | support/texlab/crates/syntax/src/bibtex.rs
2023/07/30 | 79124 | systems/texlive/tlnet/archive/dtk.doc.r67766.tar.xz
2023/07/30 | 7884 | systems/texlive/tlnet/archive/fontsetup.r67765.tar.xz
2023/07/30 | 7820 | indexing/xindex/lualatex/xindex-yannis.lua
+2023/07/30 | 7808 | macros/latex/contrib/profcollege/latex/PfCSimplifierFraction.tex
+2023/07/30 | 78068 | macros/latex/contrib/profcollege/metapost/PfCObjets.mp
+2023/07/30 | 7797 | macros/latex/contrib/profcollege/latex/PfCReseauxSociaux.tex
2023/07/30 | 778 | support/texlab/crates/parser/src/snapshots/parser__latex__tests__parse@theorem_definition__theorem_definition_full.txt.snap
2023/07/30 | 7762 | support/texlab/crates/parser/src/test_data/build_log/007.txt
+2023/07/30 | 7733 | macros/latex/contrib/profcollege/latex/PfCProbabilites.tex
2023/07/30 | 772 | support/texlab/crates/parser/src/snapshots/parser__latex__tests__parse@caption__caption_figure.txt.snap
2023/07/30 | 7729475 | support/texlab.zip
2023/07/30 | 770 | support/texlab/crates/diagnostics/src/types.rs
2023/07/30 | 76 | support/texlab/crates/parser/src/test_data/latex/glossary/acronym_definition_options.txt
+2023/07/30 | 76929 | macros/latex/contrib/profcollege/latex/PfCReperage.tex
2023/07/30 | 762 | support/texlab/crates/parser/src/snapshots/parser__latex__tests__parse@include__graphics_include_complicated_options.txt.snap
2023/07/30 | 761 | support/texlab/crates/parser/src/snapshots/parser__bibtex__tests__parse@issue_809.txt.snap
2023/07/30 | 760 | support/texlab/crates/parser/src/snapshots/parser__latex__tests__parse@glossary__acronym_package.txt.snap
@@ -72,13 +209,19 @@
2023/07/30 | 7531 | support/texlab/crates/parser/src/snapshots/parser__bibtex__tests__parse@samples__aksin_2006.txt.snap
2023/07/30 | 7528 | support/texlab/crates/parser/src/snapshots/parser__bibtex__tests__parse@samples__jain_1999.txt.snap
2023/07/30 | 750 | support/texlab/crates/diagnostics/src/util.rs
+2023/07/30 | 7497 | macros/latex/contrib/profcollege/latex/PfCCible.tex
2023/07/30 | 746 | support/texlab/crates/parser/src/snapshots/parser__latex__tests__parse@block_comments.txt.snap
+2023/07/30 | 7465 | macros/latex/contrib/profcollege/metapost/PfCLabyNombre.mp
2023/07/30 | 745 | support/texlab/crates/parser/src/snapshots/parser__latex__tests__parse@issue_874.txt.snap
+2023/07/30 | 7452 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
2023/07/30 | 742 | support/texlab/crates/parser/src/snapshots/parser__latex__tests__parse@environment__environment_simple.txt.snap
2023/07/30 | 734 | support/texlab/crates/parser/src/snapshots/parser__latex__tests__parse@color__color_definition_simple.txt.snap
2023/07/30 | 7322 | support/texlab/crates/parser/src/snapshots/parser__bibtex__tests__parse@samples__almendro_1998.txt.snap
+2023/07/30 | 7314 | macros/latex/contrib/profcollege/latex/PfCRangementNombres.tex
2023/07/30 | 728 | support/texlab/crates/parser/src/snapshots/parser__latex__tests__parse@issue_568.txt.snap
2023/07/30 | 726401 | indexing/xindex.zip
+2023/07/30 | 7244 | macros/latex/contrib/profcollege/latex/PfCFrise.tex
+2023/07/30 | 7230 | macros/latex/contrib/profcollege/latex/PfCCalisson.tex
2023/07/30 | 7214 | support/texlab/crates/hover/src/tests.rs
2023/07/30 | 720 | support/texlab/crates/hover/src/package.rs
2023/07/30 | 7202 | support/texlab/crates/texlab/src/features/formatting/bibtex_internal.rs
@@ -88,13 +231,19 @@
2023/07/30 | 71345 | indexing/xindex/doc/xindex-doc.tex
2023/07/30 | 711 | support/texlab/crates/texlab/tests/lsp/text_document/snapshots/lsp__text_document__completion__project_resolution_texlabroot.snap
2023/07/30 | 710 | support/texlab/crates/distro/src/kpsewhich.rs
+2023/07/30 | 7105 | macros/latex/contrib/profcollege/latex/PfCHorloge.tex
+2023/07/30 | 7102 | macros/latex/contrib/profcollege/latex/PfCPuzzleSommePyramide.tex
+2023/07/30 | 7088 | macros/latex/contrib/profcollege/latex/PfCColorilude.tex
+2023/07/30 | 7072 | macros/latex/contrib/profcollege/latex/PfCPuissanceQuatre.tex
2023/07/30 | 706 | support/texlab/crates/parser/src/test_data/bibtex/samples/almendro_1998.txt
2023/07/30 | 706 | support/texlab/crates/parser/src/snapshots/parser__latex__tests__parse@structure__structure_siblings.txt.snap
+2023/07/30 | 7051 | macros/latex/contrib/profcollege/latex/PfCNombreAstral.tex
2023/07/30 | 703 | support/texlab/crates/parser/src/snapshots/parser__latex__tests__parse@include__inkscape_include_options.txt.snap
2023/07/30 | 702 | support/texlab/crates/parser/src/snapshots/parser__latex__tests__parse@include__svg_include_options.txt.snap
2023/07/30 | 6 | support/texlab/crates/parser/src/test_data/latex/group/escaped_brackets.txt
2023/07/30 | 699 | support/texlab/crates/texlab/tests/lsp/text_document/snapshots/lsp__text_document__completion__project_resolution_import.snap
2023/07/30 | 6970534 | support/texlab/crates/completion-data/data/completion.json.gz
+2023/07/30 | 6941 | macros/latex/contrib/profcollege/latex/PfCGrimuku.tex
2023/07/30 | 689 | support/texlab/crates/syntax/src/latex.rs
2023/07/30 | 6836 | support/texlab/crates/parser/src/snapshots/parser__bibtex__tests__parse@samples__erwin_2007.txt.snap
2023/07/30 | 681 | support/texlab/crates/texlab/src/features/completion/entry_type.rs
@@ -103,6 +252,7 @@
2023/07/30 | 674 | support/texlab/crates/parser/src/test_data/bibtex/samples/jain_1999.txt
2023/07/30 | 674 | support/texlab/crates/parser/src/test_data/bibtex/samples/combi_2004.txt
2023/07/30 | 673 | support/texlab/crates/parser/src/snapshots/parser__build_log__tests__parse@003.txt.snap
+2023/07/30 | 6652 | macros/latex/contrib/profcollege/metapost/PfCSvgnames.mp
2023/07/30 | 6644 | support/texlab/crates/parser/src/snapshots/parser__bibtex__tests__parse@samples__blom_2021.txt.snap
2023/07/30 | 650 | support/texlab/crates/texlab/tests/lsp/text_document/snapshots/lsp__text_document__folding_range__bibtex.snap
2023/07/30 | 64 | support/texlab/crates/parser/src/test_data/latex/glossary/acronym_declaration.txt
@@ -111,11 +261,14 @@
2023/07/30 | 647 | support/texlab/crates/parser/src/snapshots/parser__latex__tests__parse@caption__caption_default.txt.snap
2023/07/30 | 6477 | support/texlab/crates/base-db/src/util/line_index.rs
2023/07/30 | 6472 | support/texlab/crates/parser/src/snapshots/parser__bibtex__tests__parse@samples__rivest_1978.txt.snap
+2023/07/30 | 6465 | macros/latex/contrib/profcollege/latex/PfCCalculsFractions.tex
2023/07/30 | 645 | support/texlab/crates/parser/src/snapshots/parser__latex__tests__parse@command_definition__command_definition_simple.txt.snap
2023/07/30 | 642 | support/texlab/crates/texlab/src/features/completion/user_command.rs
2023/07/30 | 637 | support/texlab/crates/texlab/src/features/completion/user_environment.rs
+2023/07/30 | 63245 | macros/latex/contrib/profcollege/metapost/PfCPseudo.mp
2023/07/30 | 631 | support/texlab/crates/parser/src/snapshots/parser__latex__tests__parse@inline.txt.snap
2023/07/30 | 626 | support/texlab/crates/parser/src/snapshots/parser__latex__tests__parse@caption__caption_default_error.txt.snap
+2023/07/30 | 6260 | macros/latex/contrib/profcollege/latex/PfCProgrammeCalcul.tex
2023/07/30 | 624 | support/texlab/crates/parser/src/snapshots/parser__latex__tests__parse@graphics_path_command.txt.snap
2023/07/30 | 615 | support/texlab/crates/parser/src/test_data/bibtex/samples/erwin_2007.txt
2023/07/30 | 614 | support/texlab/texlab.1
@@ -125,25 +278,30 @@
2023/07/30 | 60 | support/texlab/crates/citeproc/src/field.rs
2023/07/30 | 6098 | indexing/xindex/lualatex/xindex-norsk.lua
2023/07/30 | 608 | support/texlab/crates/parser/src/snapshots/parser__latex__tests__parse@citation__citation_prenote_postnote.txt.snap
+2023/07/30 | 6030 | macros/latex/contrib/profcollege/latex/PfCTectonic.tex
2023/07/30 | 6018 | support/texlab/crates/texlab/src/util/capabilities.rs
2023/07/30 | 594 | support/texlab/crates/texlab/tests/lsp/text_document/snapshots/lsp__text_document__completion__component_command_bibtex.snap
2023/07/30 | 5900 | support/texlab/crates/base-db/src/util/label.rs
2023/07/30 | 588 | support/texlab/crates/parser/src/snapshots/parser__latex__tests__parse@color__color_set_definition_error2.txt.snap
2023/07/30 | 588580 | indexing/xindex/doc/xindex-doc.pdf
2023/07/30 | 5864 | support/texlab/crates/parser/src/snapshots/parser__bibtex__tests__parse@samples__betram_1996.txt.snap
+2023/07/30 | 58615 | macros/latex/contrib/profcollege/latex/PfCDistributivite.tex
2023/07/30 | 583 | support/texlab/crates/texlab/tests/lsp/text_document/snapshots/lsp__text_document__completion__component_command_simple_package.snap
2023/07/30 | 583 | support/texlab/crates/texlab/tests/lsp/text_document/snapshots/lsp__text_document__completion__citation.snap
2023/07/30 | 58325 | support/texlab/crates/base-db/src/data.rs
-2023/07/30 | 5734095 | systems/texlive/tlnet/install-tl-unx.tar.gz
+2023/07/30 | 5824 | macros/latex/contrib/profcollege/latex/PfCPatronPaves.tex
+2023/07/30 | 56986 | macros/latex/contrib/profcollege/latex/PfCThales.tex
2023/07/30 | 5684 | support/texlab/crates/parser/src/build_log.rs
2023/07/30 | 566 | support/texlab/crates/symbols/src/workspace/snapshots/symbols__workspace__tests__filter_type_figure.snap
2023/07/30 | 565 | support/texlab/crates/parser/src/snapshots/parser__latex__tests__parse@structure__structure_invalid_nesting.txt.snap
2023/07/30 | 5645 | support/texlab/crates/symbols/src/workspace/sort.rs
2023/07/30 | 563 | support/texlab/crates/parser/src/snapshots/parser__latex__tests__parse@label__label_number.txt.snap
2023/07/30 | 55 | support/texlab/crates/parser/src/test_data/latex/issue_857.txt
+2023/07/30 | 5591 | macros/latex/contrib/profcollege/latex/PfCOperationsTrou.tex
2023/07/30 | 558 | support/texlab/crates/commands/Cargo.toml
2023/07/30 | 557 | support/texlab/crates/parser/src/test_data/bibtex/samples/rivest_1978.txt
2023/07/30 | 556 | support/texlab/crates/parser/src/test_data/bibtex/samples/betram_1996.txt
+2023/07/30 | 5561 | macros/latex/contrib/profcollege/latex/PfCRepresenterEntier.tex
2023/07/30 | 555 | support/texlab/crates/texlab/src/features/link/include.rs
2023/07/30 | 5557 | support/texlab/crates/base-db/src/util/queries.rs
2023/07/30 | 5556 | support/texlab/crates/symbols/src/document/tests.rs
@@ -154,25 +312,32 @@
2023/07/30 | 5454 | support/texlab/crates/base-db/src/graph.rs
2023/07/30 | 544 | support/texlab/crates/texlab/tests/lsp/text_document/snapshots/lsp__text_document__completion__component_environment_simple_end.snap
2023/07/30 | 544 | support/texlab/crates/citeproc/Cargo.toml
+2023/07/30 | 54466 | macros/latex/contrib/profcollege/latex/LogoNumberHive.png
2023/07/30 | 541 | support/texlab/crates/hover/src/entry_type.rs
2023/07/30 | 540008 | systems/texlive/tlnet/archive/msu-thesis.doc.r67764.tar.xz
2023/07/30 | 5386 | support/texlab/crates/parser/src/latex/lexer/commands.rs
2023/07/30 | 5378 | support/texlab/crates/base-db/src/document.rs
+2023/07/30 | 5365 | macros/latex/contrib/profcollege/latex/PfCMidpoint.tex
+2023/07/30 | 53608 | macros/latex/contrib/profcollege/metapost/PfCGeometrie.mp
2023/07/30 | 533 | support/texlab/crates/parser/src/snapshots/parser__latex__tests__parse@theorem_definition__theorem_definition_name_with_description.txt.snap
2023/07/30 | 533 | support/texlab/crates/parser/src/snapshots/parser__latex__tests__parse@theorem_definition__theorem_definition_name_with_counter.txt.snap
2023/07/30 | 52 | support/texlab/crates/parser/src/test_data/latex/include/graphics_include_command.txt
2023/07/30 | 52 | support/texlab/crates/parser/src/test_data/latex/environment/environment_nested_missing_braces.txt
2023/07/30 | 526 | support/texlab/crates/parser/src/snapshots/parser__latex__tests__parse@issue_828.txt.snap
+2023/07/30 | 5223 | macros/latex/contrib/profcollege/latex/PfCRepresenterTableur.tex
2023/07/30 | 520 | support/texlab/crates/texlab/tests/lsp/text_document/snapshots/lsp__text_document__formatting__bibtex_internal_wrap_long_lines.snap
2023/07/30 | 520 | support/texlab/crates/parser/src/snapshots/parser__latex__tests__parse@caption__caption_minimal.txt.snap
+2023/07/30 | 5200 | macros/latex/contrib/profcollege/metapost/PfCArithmetiquePDF.mp
2023/07/30 | 51 | support/texlab/crates/parser/src/test_data/latex/issue_828.txt
2023/07/30 | 51 | support/texlab/crates/parser/src/test_data/latex/issue_568.txt
+2023/07/30 | 5196 | macros/latex/contrib/profcollege/metapost/PfCArithmetique.mp
2023/07/30 | 517 | support/texlab/crates/parser/src/test_data/bibtex/samples/matuz_1990.txt
2023/07/30 | 512 | support/texlab/crates/texlab/tests/lsp/text_document/snapshots/lsp__text_document__completion__issue_857_1.snap
2023/07/30 | 50 | support/texlab/crates/parser/src/test_data/latex/environment/environment_asymptote.txt
2023/07/30 | 50 | support/texlab/crates/parser/src/test_data/bibtex/issue_809.txt
2023/07/30 | 507 | support/texlab/crates/parser/src/snapshots/parser__latex__tests__parse@label__label_reference_range_simple.txt.snap
2023/07/30 | 5060 | support/texlab/crates/parser/src/snapshots/parser__bibtex__tests__parse@samples__matuz_1990.txt.snap
+2023/07/30 | 5056 | macros/latex/contrib/profcollege/metapost/PfCAfficheur.mp
2023/07/30 | 504 | support/texlab/crates/parser/src/snapshots/parser__latex__tests__parse@command_definition__command_definition_no_argc.txt.snap
2023/07/30 | 502 | support/texlab/crates/parser/src/snapshots/parser__latex__tests__parse@command_definition__math_operator_simple.txt.snap
2023/07/30 | 50039 | support/texlab/Cargo.lock
@@ -181,12 +346,7 @@
2023/07/30 | 499 | support/texlab/crates/parser/src/snapshots/parser__latex__tests__parse@caption__caption_minimal_error.txt.snap
2023/07/30 | 494 | support/texlab/crates/texlab/tests/lsp/text_document/snapshots/lsp__text_document__completion__component_command_simple.snap
2023/07/30 | 491 | support/texlab/crates/base-db/Cargo.toml
-2023/07/30 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
2023/07/30 | 48 | support/texlab/crates/parser/src/test_data/latex/block_comments.txt
-2023/07/30 | 488 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
-2023/07/30 | 488 | systems/texlive/tlnet/install-tl.zip.sha512.asc
-2023/07/30 | 488 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
-2023/07/30 | 488 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
2023/07/30 | 486 | support/texlab/crates/texlab/tests/lsp/text_document/snapshots/lsp__text_document__completion__field_entry_two_fields_name_closed.snap
2023/07/30 | 48639 | macros/latex/contrib/gamebooklib/gamebooklib.dtx
2023/07/30 | 485 | support/texlab/crates/texlab/tests/lsp/text_document/snapshots/lsp__text_document__completion__field_entry_two_fields_name_open.snap
@@ -200,6 +360,8 @@
2023/07/30 | 472 | support/texlab/crates/parser/src/snapshots/parser__latex__tests__parse@citation__citation_prenote.txt.snap
2023/07/30 | 4724 | support/texlab/crates/citeproc/src/entry.rs
2023/07/30 | 470 | support/texlab/crates/parser/src/snapshots/parser__latex__tests__parse@include__import_simple.txt.snap
+2023/07/30 | 4692 | macros/latex/contrib/profcollege/latex/PfCFutoshiki.tex
+2023/07/30 | 4664 | macros/latex/contrib/profcollege/latex/PfCDiagrammeRadar.tex
2023/07/30 | 464 | support/texlab/crates/texlab/tests/lsp/text_document/snapshots/lsp__text_document__completion__import_class_open_brace.snap
2023/07/30 | 464 | support/texlab/crates/parser/src/snapshots/parser__build_log__tests__parse@007.txt.snap
2023/07/30 | 460 | support/texlab/crates/parser/src/snapshots/parser__latex__tests__parse@generic_command_args.txt.snap
@@ -208,6 +370,7 @@
2023/07/30 | 4577 | indexing/xindex/lualatex/xindex-baselib.lua
2023/07/30 | 456 | support/texlab/crates/parser/src/snapshots/parser__latex__tests__parse@label__label_reference_multiple.txt.snap
2023/07/30 | 454 | support/texlab/crates/symbols/Cargo.toml
+2023/07/30 | 4548 | macros/latex/contrib/profcollege/latex/PfCMosaique.tex
2023/07/30 | 453 | support/texlab/crates/parser/src/snapshots/parser__latex__tests__parse@citation__citation_multiple_keys.txt.snap
2023/07/30 | 452 | support/texlab/crates/texlab/tests/lsp/text_document/snapshots/lsp__text_document__completion__tikz_library_closed_brace.snap
2023/07/30 | 452 | support/texlab/crates/parser/src/snapshots/parser__latex__tests__parse@label__label_definition_line_break.txt.snap
@@ -226,10 +389,11 @@
2023/07/30 | 44039 | support/pdfjam/bin/pdfjam
2023/07/30 | 43 | support/texlab/crates/parser/src/test_data/latex/environment/environment_nested.txt
2023/07/30 | 439 | support/texlab/crates/hover/Cargo.toml
+2023/07/30 | 4387 | macros/latex/contrib/profcollege/latex/PfCCalculatrice.tex
2023/07/30 | 4300 | support/texlab/crates/parser/src/snapshots/parser__latex__tests__parse@issue_745.txt.snap
2023/07/30 | 42 | support/texlab/crates/parser/src/test_data/latex/include/biblatex_include_options.txt
2023/07/30 | 429 | support/texlab/crates/parser/src/snapshots/parser__latex__tests__parse@include__latex_include_equality_sign.txt.snap
-2023/07/30 | 428048 | systems/texlive/tlnet/archive/texlive-scripts.doc.r67759.tar.xz
+2023/07/30 | 42630 | macros/latex/contrib/profcollege/metapost/PfCMonde.mp
2023/07/30 | 42553 | support/texlab/crates/texlab/src/server.rs
2023/07/30 | 421 | support/texlab/crates/texlab/tests/lsp/text_document/snapshots/lsp__text_document__completion__field_empty_entry_closed.snap
2023/07/30 | 420 | support/texlab/crates/texlab/tests/lsp/text_document/snapshots/lsp__text_document__completion__field_empty_entry_open.snap
@@ -238,9 +402,11 @@
2023/07/30 | 41 | support/texlab/crates/parser/src/test_data/latex/include/package_include_options.txt
2023/07/30 | 414 | support/texlab/crates/texlab/tests/lsp/text_document/snapshots/lsp__text_document__completion__color_word.snap
2023/07/30 | 4144 | support/texlab/crates/diagnostics/src/grammar/tex.rs
+2023/07/30 | 4138 | macros/latex/contrib/profcollege/latex/PfCPixelArt.tex
2023/07/30 | 4130 | support/texlab/crates/parser/src/test_data/build_log/006.txt
2023/07/30 | 4126 | support/texlab/crates/texlab/src/features/symbols.rs
-2023/07/30 | 4090302 | biblio/ctan-bibdata.zip
+2023/07/30 | 4125 | macros/latex/contrib/profcollege/latex/PfCMulPiecesPuzzle.tex
+2023/07/30 | 4117 | macros/latex/contrib/profcollege/latex/PfCDomino.tex
2023/07/30 | 408 | support/texlab/crates/texlab/tests/lsp/text_document/snapshots/lsp__text_document__completion__color_model_definition_simple.snap
2023/07/30 | 407 | support/texlab/crates/texlab/tests/lsp/text_document/snapshots/lsp__text_document__completion__color_model_definition_open_brace.snap
2023/07/30 | 407 | support/texlab/crates/parser/Cargo.toml
@@ -264,6 +430,7 @@
2023/07/30 | 394 | support/texlab/crates/diagnostics/Cargo.toml
2023/07/30 | 389 | support/texlab/crates/commands/src/lib.rs
2023/07/30 | 3894 | support/texlab/crates/base-db/src/config.rs
+2023/07/30 | 38866 | macros/latex/contrib/profcollege/latex/PfCNotionFonction.tex
2023/07/30 | 387 | support/texlab/crates/parser/src/snapshots/parser__latex__tests__parse@include__graphics_include_simple.txt.snap
2023/07/30 | 386 | support/texlab/crates/symbols/src/document/snapshots/symbols__document__tests__ignored_patterns.snap
2023/07/30 | 386 | support/texlab/crates/parser/src/snapshots/parser__latex__tests__parse@include__biblatex_include_simple.txt.snap
@@ -273,9 +440,12 @@
2023/07/30 | 384 | support/texlab/crates/parser/src/snapshots/parser__latex__tests__parse@include__tikz_library_import_simple.txt.snap
2023/07/30 | 384 | support/texlab/crates/parser/src/snapshots/parser__latex__tests__parse@group__escaped_brackets.txt.snap
2023/07/30 | 3838 | support/texlab/crates/commands/src/build.rs
+2023/07/30 | 3835 | macros/latex/contrib/profcollege/latex/PfCKenKen.tex
2023/07/30 | 382 | support/texlab/crates/parser/src/snapshots/parser__latex__tests__parse@include__pgf_library_import_simple.txt.snap
2023/07/30 | 380 | support/texlab/crates/parser/src/snapshots/parser__latex__tests__parse@label__label_reference_range_incomplete.txt.snap
+2023/07/30 | 3806 | macros/latex/contrib/profcollege/latex/PfCJeuRangement.tex
2023/07/30 | 380190 | support/texlab/images/demo.gif
+2023/07/30 | 3800 | macros/latex/contrib/profcollege/latex/PfCErathostene.tex
2023/07/30 | 37 | support/texlab/crates/parser/src/test_data/latex/issue_874.txt
2023/07/30 | 379 | support/texlab/crates/parser/src/snapshots/parser__latex__tests__parse@equation.txt.snap
2023/07/30 | 377 | support/texlab/crates/parser/src/snapshots/parser__latex__tests__parse@command_definition__command_definition_no_impl.txt.snap
@@ -283,22 +453,24 @@
2023/07/30 | 376 | support/texlab/crates/parser/src/snapshots/parser__latex__tests__parse@include__bibtex_include_simple.txt.snap
2023/07/30 | 376 | support/texlab/crates/parser/src/snapshots/parser__latex__tests__parse@command_definition__math_operator_no_impl.txt.snap
2023/07/30 | 3767 | support/texlab/README.md
+2023/07/30 | 3765 | macros/latex/contrib/profcollege/latex/PfCEnquete.tex
2023/07/30 | 375 | support/texlab/crates/parser/src/snapshots/parser__latex__tests__parse@include__class_include_simple.txt.snap
2023/07/30 | 373 | support/texlab/crates/parser/src/snapshots/parser__latex__tests__parse@include__inkscape_include_simple.txt.snap
2023/07/30 | 373 | support/texlab/crates/parser/src/snapshots/parser__bibtex__tests__parse@preamble.txt.snap
2023/07/30 | 372 | support/texlab/crates/parser/src/snapshots/parser__latex__tests__parse@include__svg_include_simple.txt.snap
2023/07/30 | 372 | support/texlab/crates/parser/src/snapshots/parser__latex__tests__parse@glossary__acronym_reference_simple.txt.snap
2023/07/30 | 3729 | support/texlab/crates/texlab/src/util/chktex.rs
-2023/07/30 | 3690030 | biblio/ctan-bibdata/ctan.pdf
2023/07/30 | 368 | support/texlab/crates/texlab/tests/lsp/text_document/snapshots/lsp__text_document__document_link__document_import.snap
2023/07/30 | 36762 | indexing/xindex/lualatex/xindex-lib.lua
2023/07/30 | 3667 | support/texlab/crates/parser/src/snapshots/parser__bibtex__tests__parse@samples__aho_2006.txt.snap
2023/07/30 | 365 | support/texlab/crates/parser/src/snapshots/parser__latex__tests__parse@glossary__glossary_entry_reference_simple.txt.snap
2023/07/30 | 363 | support/texlab/crates/parser/src/snapshots/parser__latex__tests__parse@include__latex_include_simple.txt.snap
2023/07/30 | 361 | support/texlab/crates/parser/src/snapshots/parser__latex__tests__parse@label__label_reference_equation.txt.snap
+2023/07/30 | 3618 | macros/latex/contrib/profcollege/latex/PfCDecompFracDeci.tex
2023/07/30 | 35 | support/texlab/crates/parser/src/test_data/latex/structure/structure_siblings.txt
2023/07/30 | 35 | support/texlab/crates/parser/src/test_data/latex/glossary/acronym_package.txt
2023/07/30 | 358 | support/texlab/crates/texlab/src/features/highlight.rs
+2023/07/30 | 35829 | macros/latex/contrib/profcollege/latex/PfCPavage.tex
2023/07/30 | 357 | support/texlab/crates/definition/Cargo.toml
2023/07/30 | 356 | support/texlab/crates/parser/src/snapshots/parser__latex__tests__parse@label__label_definition_simple.txt.snap
2023/07/30 | 356 | support/texlab/crates/parser/src/snapshots/parser__latex__tests__parse@command_definition__command_definition_no_impl_error.txt.snap
@@ -312,7 +484,9 @@
2023/07/30 | 349 | support/texlab/crates/parser/src/snapshots/parser__latex__tests__parse@label__label_reference_simple.txt.snap
2023/07/30 | 3491 | support/texlab/crates/references/src/tests.rs
2023/07/30 | 347 | support/texlab/crates/parser/src/snapshots/parser__latex__tests__parse@issue_789.txt.snap
+2023/07/30 | 3466 | macros/latex/contrib/profcollege/latex/PfCTablesOperations.tex
2023/07/30 | 344 | support/texlab/crates/parser/src/snapshots/parser__latex__tests__parse@citation__citation_simple.txt.snap
+2023/07/30 | 3431 | macros/latex/contrib/profcollege/latex/PfCBarresCalculs.tex
2023/07/30 | 342 | support/texlab/crates/parser/src/snapshots/parser__latex__tests__parse@citation__citation_star.txt.snap
2023/07/30 | 33 | support/texlab/crates/parser/src/test_data/latex/graphics_path_options.txt
2023/07/30 | 33 | support/texlab/crates/parser/src/test_data/latex/environment/environment_simple.txt
@@ -324,6 +498,7 @@
2023/07/30 | 32 | support/texlab/crates/parser/src/test_data/latex/graphics_path_command.txt
2023/07/30 | 32 | support/texlab/crates/parser/src/test_data/latex/glossary/acronym_reference_options.txt
2023/07/30 | 3286 | support/texlab/crates/diagnostics/src/tests.rs
+2023/07/30 | 3280 | macros/latex/contrib/profcollege/latex/PfCFicheMemo.tex
2023/07/30 | 3274 | support/texlab/crates/completion-data/src/lib.rs
2023/07/30 | 3250 | support/texlab/crates/definition/src/tests.rs
2023/07/30 | 324 | support/texlab/crates/parser/src/snapshots/parser__latex__tests__parse@include__package_include_empty.txt.snap
@@ -346,6 +521,7 @@
2023/07/30 | 3093 | support/texlab/crates/commands/src/find_envs.rs
2023/07/30 | 3061 | support/texlab/crates/texlab/src/features/completion/tikz_library.rs
2023/07/30 | 3057 | support/texlab/crates/parser/src/test_data/build_log/004.txt
+2023/07/30 | 3049 | macros/latex/contrib/profcollege/latex/PfCRLE.tex
2023/07/30 | 30283 | support/texlab/CHANGELOG.md
2023/07/30 | 3021 | support/texlab/crates/diagnostics/src/labels.rs
2023/07/30 | 3009 | support/texlab/crates/texlab/tests/lsp/text_document/formatting.rs
@@ -359,7 +535,10 @@
2023/07/30 | 2973 | indexing/xindex/lualatex/xindex-RU.lua
2023/07/30 | 2972 | support/texlab/crates/test-utils/src/fixture.rs
2023/07/30 | 295 | support/texlab/crates/parser/src/snapshots/parser__latex__tests__parse@citation__citation_empty.txt.snap
+2023/07/30 | 2942 | macros/latex/contrib/profcollege/latex/PfCMentalo.tex
+2023/07/30 | 2939 | macros/latex/contrib/profcollege/latex/PfCBarreNiveaux.tex
2023/07/30 | 2938 | support/texlab/crates/diagnostics/src/citations.rs
+2023/07/30 | 29330 | macros/latex/contrib/profcollege/latex/PfCLabyrintheNombre.tex
2023/07/30 | 291 | support/texlab/crates/texlab/tests/lsp/text_document/snapshots/lsp__text_document__completion__citation_open_brace_multiple.snap
2023/07/30 | 291 | support/texlab/crates/test-utils/Cargo.toml
2023/07/30 | 290881 | macros/latex/contrib/gamebooklib/gamebooklib.pdf
@@ -368,18 +547,22 @@
2023/07/30 | 28 | support/texlab/crates/parser/src/test_data/latex/group/equation_missing_end.txt
2023/07/30 | 28 | support/texlab/crates/parser/src/test_data/latex/graphics_path.txt
2023/07/30 | 28 | support/texlab/crates/parser/src/test_data/latex/equation_missing_begin.txt
+2023/07/30 | 28719 | macros/latex/contrib/profcollege/latex/PfCSolides.tex
2023/07/30 | 283 | support/texlab/crates/texlab/src/features/completion/begin_snippet.rs
2023/07/30 | 2832 | support/texlab/crates/texlab/src/features/completion/label.rs
+2023/07/30 | 2815 | macros/latex/contrib/profcollege/latex/PfCMotsCodes.tex
+2023/07/30 | 28129 | macros/latex/contrib/profcollege/latex/PfCRappelsFormules.tex
+2023/07/30 | 28024 | macros/latex/contrib/profcollege/metapost/PfCSolid.mp
2023/07/30 | 27 | support/texlab/crates/parser/src/test_data/latex/structure/structure_invalid_nesting.txt
2023/07/30 | 27 | support/texlab/crates/parser/src/test_data/latex/include/verbatim_include_simple.txt
2023/07/30 | 27 | support/texlab/crates/parser/src/test_data/latex/caption/caption_default.txt
2023/07/30 | 279 | support/texlab/crates/texlab/tests/lsp/text_document/snapshots/lsp__text_document__completion__component_environment_command_definition.snap
2023/07/30 | 279 | support/texlab/crates/texlab/tests/lsp/text_document/snapshots/lsp__text_document__completion__acronym_ref_simple.snap
-2023/07/30 | 2797515 | biblio/ctan-bibdata/ctan.bib
2023/07/30 | 278 | support/texlab/crates/texlab/tests/lsp/text_document/snapshots/lsp__text_document__completion__acronym_ref_open_brace.snap
2023/07/30 | 2766 | indexing/xindex/lualatex/xindex-DIN2.lua
2023/07/30 | 2749 | support/texlab/crates/parser/src/latex/lexer/types.rs
2023/07/30 | 273 | support/texlab/crates/texlab/tests/lsp/text_document/snapshots/lsp__text_document__completion__user_command.snap
+2023/07/30 | 2734 | macros/latex/contrib/profcollege/latex/dobblePfC.lua
2023/07/30 | 2733 | indexing/xindex/lualatex/xindex-AU.lua
2023/07/30 | 271 | support/texlab/crates/parser/src/test_data/latex/issue_745.txt
2023/07/30 | 2716 | indexing/xindex/lualatex/xindex-danteedition.lua
@@ -392,25 +575,32 @@
2023/07/30 | 265 | support/texlab/crates/texlab/tests/lsp/text_document/snapshots/lsp__text_document__completion__acronym_ref_empty.snap
2023/07/30 | 264 | support/texlab/crates/texlab/tests/lsp/text_document/snapshots/lsp__text_document__completion__glossary_ref_simple.snap
2023/07/30 | 26416 | support/texlab/texlab.pdf
+2023/07/30 | 26408 | macros/latex/contrib/profcollege/latex/PfCPythagore.tex
2023/07/30 | 263 | support/texlab/crates/texlab/tests/lsp/text_document/snapshots/lsp__text_document__completion__glossary_ref_open_brace.snap
+2023/07/30 | 2617 | macros/latex/contrib/profcollege/latex/PfCQuiSuisJe.tex
2023/07/30 | 2610 | support/texlab/crates/symbols/src/types.rs
2023/07/30 | 2609 | support/texlab/crates/texlab/src/server/extensions.rs
-2023/07/30 | 26025425 | systems/texlive/tlnet/install-tl.zip
+2023/07/30 | 2605 | macros/latex/contrib/profcollege/latex/PfCKakurasu.tex
2023/07/30 | 25 | support/texlab/crates/parser/src/test_data/latex/glossary/glossary_entry_reference_options.txt
2023/07/30 | 25 | support/texlab/crates/parser/src/test_data/latex/color/color_set_definition_error3.txt
2023/07/30 | 25 | support/texlab/crates/parser/src/test_data/bibtex/preamble.txt
2023/07/30 | 2586 | support/texlab/texlab.tex
2023/07/30 | 2586 | support/texlab/crates/texlab/tests/lsp/text_document/snapshots/lsp__text_document__document_symbol__smoke.snap
2023/07/30 | 257 | support/texlab/crates/texlab/tests/lsp/text_document/snapshots/lsp__text_document__completion__component_environment_class.snap
+2023/07/30 | 25681 | macros/latex/contrib/profcollege/latex/PfCPavageAvecMotifImage.tex
+2023/07/30 | 25670 | macros/latex/contrib/profcollege/latex/PfCCartesJeux.tex
2023/07/30 | 255 | support/texlab/crates/texlab/tests/lsp/text_document/snapshots/lsp__text_document__completion__theorem_end.snap
+2023/07/30 | 25302 | macros/latex/contrib/profcollege/latex/PfCQuestionsFlash.tex
2023/07/30 | 25258 | support/texlab/crates/texlab/src/features/completion/builder.rs
2023/07/30 | 2515 | support/texlab/crates/parser/src/test_data/build_log/003.txt
2023/07/30 | 250 | support/texlab/crates/texlab/tests/lsp/text_document/snapshots/lsp__text_document__completion__theorem_begin.snap
2023/07/30 | 24 | support/texlab/crates/parser/src/test_data/latex/include/svg_include_simple.txt
+2023/07/30 | 2499 | macros/latex/contrib/profcollege/latex/PfCSquaro.tex
2023/07/30 | 248 | support/texlab/crates/parser/src/snapshots/parser__latex__tests__parse@color__color_set_definition_error4.txt.snap
2023/07/30 | 247 | support/texlab/crates/texlab/tests/lsp/text_document/snapshots/lsp__text_document__completion__issue_883.snap
+2023/07/30 | 2470 | macros/latex/contrib/profcollege/latex/PfCEcritureLettres.tex
2023/07/30 | 2467 | support/texlab/crates/distro/src/miktex.rs
-2023/07/30 | 2459276 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
+2023/07/30 | 24666 | macros/latex/contrib/profcollege/latex/PfCTrigonometrie.tex
2023/07/30 | 2455 | support/texlab/crates/parser/src/test_data/build_log/002.txt
2023/07/30 | 244 | support/texlab/crates/parser/src/snapshots/parser__latex__tests__parse@group__unmatched_brackets.txt.snap
2023/07/30 | 244 | support/texlab/crates/base-db/src/util.rs
@@ -421,17 +611,25 @@
2023/07/30 | 23 | support/texlab/crates/parser/src/test_data/latex/command_definition/command_definition_simple.txt
2023/07/30 | 2387 | support/texlab/crates/diagnostics/src/lib.rs
2023/07/30 | 2385 | indexing/xindex/lualatex/xindex-cfg-uca.lua
+2023/07/30 | 2370187 | macros/latex/contrib/profcollege/doc/ProfCollege-doc.zip
2023/07/30 | 2360 | support/texlab/crates/symbols/src/workspace/tests.rs
2023/07/30 | 234 | support/texlab/crates/parser/src/snapshots/parser__bibtex__tests__parse@comment.txt.snap
+2023/07/30 | 2335 | macros/latex/contrib/profcollege/metapost/PfCEngrenages.mp
+2023/07/30 | 23117 | macros/latex/contrib/profcollege/latex/PfCDecomposerNombrePremier.tex
+2023/07/30 | 2305 | macros/latex/contrib/profcollege/latex/PfCQuestionsRelier.tex
2023/07/30 | 22 | support/texlab/crates/parser/src/test_data/latex/include/bibtex_include_simple.txt
2023/07/30 | 22 | support/texlab/crates/parser/src/test_data/latex/command_definition/command_definition_no_argc.txt
2023/07/30 | 22 | support/texlab/crates/parser/src/test_data/latex/caption/caption_minimal.txt
+2023/07/30 | 2285 | macros/latex/contrib/profcollege/latex/PfCGrades.tex
2023/07/30 | 227 | support/texlab/crates/syntax/Cargo.toml
2023/07/30 | 227 | support/texlab/crates/distro/Cargo.toml
+2023/07/30 | 2276 | macros/latex/contrib/profcollege/latex/PfCKakuro.tex
2023/07/30 | 226 | support/texlab/crates/texlab/tests/lsp/text_document/snapshots/lsp__text_document__completion__acronym_package_ref.snap
2023/07/30 | 2259 | indexing/xindex/latex/xindex.sty
2023/07/30 | 223 | support/texlab/crates/texlab/tests/lsp/text_document/snapshots/lsp__text_document__completion__component_environment_simple.snap
+2023/07/30 | 2222 | macros/latex/contrib/profcollege/latex/PfCMotsCroises.tex
2023/07/30 | 22210 | support/texlab/crates/citeproc/src/driver.rs
+2023/07/30 | 2211 | macros/latex/contrib/profcollege/latex/PfCHiddenMessage.tex
2023/07/30 | 21 | support/texlab/crates/parser/src/test_data/latex/theorem_definition/theorem_definition_name_with_description.txt
2023/07/30 | 21 | support/texlab/crates/parser/src/test_data/latex/theorem_definition/theorem_definition_name_with_counter.txt
2023/07/30 | 21 | support/texlab/crates/parser/src/test_data/latex/label/label_number.txt
@@ -439,9 +637,9 @@
2023/07/30 | 21 | support/texlab/crates/parser/src/test_data/latex/caption/caption_minimal_error.txt
2023/07/30 | 216 | support/texlab/crates/parser/src/snapshots/parser__latex__tests__parse@generic_command_empty.txt.snap
2023/07/30 | 215 | support/texlab/crates/parser/src/snapshots/parser__latex__tests__parse@generic_command_escape.txt.snap
+2023/07/30 | 2155 | macros/latex/contrib/profcollege/latex/PfCGaram.tex
2023/07/30 | 2143 | support/texlab/crates/texlab/src/features/folding.rs
2023/07/30 | 211 | support/texlab/crates/texlab/tests/lsp/text_document/snapshots/lsp__text_document__completion__argument_word.snap
-2023/07/30 | 21037345 | systems/texlive/tlnet/install-tl-windows.exe
2023/07/30 | 20 | support/texlab/crates/parser/src/test_data/latex/label/label_reference_range_simple.txt
2023/07/30 | 20 | support/texlab/crates/parser/src/test_data/latex/include/tikz_library_import_simple.txt
2023/07/30 | 20 | support/texlab/crates/parser/src/test_data/latex/include/package_include_simple.txt
@@ -449,9 +647,11 @@
2023/07/30 | 20 | support/texlab/crates/parser/src/test_data/latex/include/inkscape_include_simple.txt
2023/07/30 | 20 | support/texlab/crates/parser/src/test_data/latex/citation/citation_prenote_postnote.txt
2023/07/30 | 2074 | support/texlab/crates/citeproc/src/field/author.rs
+2023/07/30 | 2072 | macros/latex/contrib/profcollege/latex/PfCBonSortie.tex
2023/07/30 | 2068 | support/texlab/crates/texlab/src/features/formatting/latexindent.rs
2023/07/30 | 205 | support/texlab/crates/texlab/tests/lsp/text_document/snapshots/lsp__text_document__completion__entry_type_complete_entry.snap
2023/07/30 | 2040 | support/texlab/crates/parser/src/latex/lexer.rs
+2023/07/30 | 2019 | macros/latex/contrib/profcollege/latex/PfCEngrenagesBase.tex
2023/07/30 | 1 | support/texlab/crates/parser/src/test_data/latex/parameter_error.txt
2023/07/30 | 19 | support/texlab/crates/parser/src/test_data/latex/label/label_reference_range_error.txt
2023/07/30 | 19 | support/texlab/crates/parser/src/test_data/latex/label/label_definition_line_break.txt
@@ -461,6 +661,7 @@
2023/07/30 | 19 | support/texlab/crates/parser/src/test_data/latex/glossary/acronym_reference_simple.txt
2023/07/30 | 19 | support/pdfjam/VERSION
2023/07/30 | 1997 | support/texlab/crates/distro/src/lib.rs
+2023/07/30 | 19900 | macros/latex/contrib/profcollege/latex/PfCTrio.tex
2023/07/30 | 1980 | support/texlab/crates/symbols/src/document/bib.rs
2023/07/30 | 197 | support/texlab/crates/texlab/src/features.rs
2023/07/30 | 194 | support/texlab/crates/texlab/tests/lsp/text_document/snapshots/lsp__text_document__completion__entry_type_after_preamble.snap
@@ -471,13 +672,15 @@
2023/07/30 | 187 | support/texlab/crates/parser/src/snapshots/parser__latex__tests__parse@parameter_error.txt.snap
2023/07/30 | 1871 | support/texlab/crates/symbols/src/workspace/snapshots/symbols__workspace__tests__filter_type_section.snap
2023/07/30 | 186 | support/texlab/crates/texlab/tests/lsp/text_document/snapshots/lsp__text_document__completion__entry_type_after_string.snap
+2023/07/30 | 1862 | macros/latex/contrib/profcollege/latex/PfCMotsEmpiles.tex
2023/07/30 | 185 | support/texlab/crates/texlab/tests/lsp/text_document/snapshots/lsp__text_document__completion__entry_type_before_preamble.snap
+2023/07/30 | 18516 | macros/latex/contrib/profcollege/latex/ProfCollege.sty
2023/07/30 | 182 | support/texlab/crates/texlab/tests/lsp/text_document/snapshots/lsp__text_document__completion__entry_type_before_article.snap
2023/07/30 | 182 | support/texlab/crates/parser/src/snapshots/parser__latex__tests__parse@parameter.txt.snap
2023/07/30 | 1829 | support/texlab/crates/texlab/src/features/completion/color.rs
+2023/07/30 | 18239 | macros/latex/contrib/profcollege/latex/PfCRose.tex
2023/07/30 | 181 | support/texlab/crates/texlab/tests/lsp/text_document/snapshots/lsp__text_document__formatting__bibtex_internal_join_strings.snap
2023/07/30 | 181 | support/texlab/CONTRIBUTING.md
-2023/07/30 | 18170214 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
2023/07/30 | 1814 | support/texlab/crates/texlab/tests/lsp/text_document/snapshots/lsp__text_document__completion__label.snap
2023/07/30 | 1812 | support/texlab/crates/distro/src/file_name_db.rs
2023/07/30 | 18098 | support/texlab/crates/syntax/src/latex/cst.rs
@@ -490,6 +693,7 @@
2023/07/30 | 17992 | support/pdfjam/COPYING
2023/07/30 | 1791 | support/texlab/crates/parser/src/snapshots/parser__latex__tests__parse@issue_853.txt.snap
2023/07/30 | 178644 | support/pdfjam.zip
+2023/07/30 | 1777 | macros/latex/contrib/profcollege/latex/PfCRapido.tex
2023/07/30 | 17768 | support/pdfjam/README.md
2023/07/30 | 1760 | support/texlab/crates/citeproc/src/output.rs
2023/07/30 | 175 | support/texlab/crates/symbols/src/lib.rs
@@ -504,50 +708,62 @@
2023/07/30 | 16 | support/texlab/crates/parser/src/test_data/latex/theorem_definition/theorem_definition_only_name.txt
2023/07/30 | 16 | support/texlab/crates/parser/src/test_data/latex/include/class_include_empty.txt
2023/07/30 | 16 | support/texlab/crates/parser/src/test_data/latex/command_definition/command_definition_no_impl_error.txt
+2023/07/30 | 1683 | macros/latex/contrib/profcollege/metapost/PfCTurtleTestRemplis.mp
+2023/07/30 | 1682 | macros/latex/contrib/profcollege/metapost/PfCLaTeX.mp
2023/07/30 | 167 | support/texlab/crates/texlab/tests/lsp/text_document/snapshots/lsp__text_document__formatting__bibtex_internal_command.snap
2023/07/30 | 1679 | support/texlab/crates/symbols/src/document/snapshots/symbols__document__tests__enumerate.snap
-2023/07/30 | 1678 | biblio/ctan-bibdata/biblatex-ctan/ctan.bbx
2023/07/30 | 1672 | support/texlab/crates/parser/src/snapshots/parser__build_log__tests__parse@006.txt.snap
2023/07/30 | 1660 | support/texlab/crates/texlab/src/features/hover.rs
2023/07/30 | 1654 | support/texlab/crates/texlab/src/features/completion/citation.rs
2023/07/30 | 1648 | support/texlab/crates/texlab/src/features/completion/argument.rs
+2023/07/30 | 16486 | macros/latex/contrib/profcollege/latex/PfCRondeInfernale.tex
2023/07/30 | 1647 | support/texlab/crates/texlab/src/util.rs
2023/07/30 | 1631 | support/texlab/crates/commands/src/clean.rs
2023/07/30 | 1626 | support/texlab/crates/citeproc/src/field/number.rs
+2023/07/30 | 16190 | macros/latex/contrib/profcollege/latex/PfCResoudreEquation.tex
2023/07/30 | 1611 | support/texlab/crates/texlab/src/util/line_index_ext.rs
2023/07/30 | 160 | support/texlab/crates/texlab/tests/lsp/text_document/snapshots/lsp__text_document__formatting__bibtex_internal_preamble.snap
2023/07/30 | 1608 | support/texlab/crates/texlab/tests/lsp/text_document/snapshots/lsp__text_document__inlay_hint__label_definition.snap
+2023/07/30 | 1606 | graphics/pgf/contrib/quiver/quiver.sty
+2023/07/30 | 16038 | macros/latex/contrib/profcollege/latex/PfCRepresenterFraction.tex
2023/07/30 | 15 | support/texlab/crates/parser/src/test_data/latex/label/label_reference_range_incomplete.txt
2023/07/30 | 15 | support/texlab/crates/parser/src/test_data/latex/color/color_set_definition_error4.txt
2023/07/30 | 15 | support/texlab/crates/parser/src/test_data/latex/citation/citation_prenote.txt
2023/07/30 | 15 | support/texlab/crates/parser/src/test_data/latex/citation/citation_multiple_keys.txt
+2023/07/30 | 1596 | macros/latex/contrib/profcollege/latex/PfCGeometrie.tex
2023/07/30 | 1590 | support/texlab/crates/commands/src/dep_graph.rs
2023/07/30 | 158 | support/texlab/crates/base-db/src/lib.rs
+2023/07/30 | 15861 | macros/latex/contrib/profcollege/latex/PfCFonctionAffine.tex
2023/07/30 | 1583 | support/texlab/crates/commands/src/placeholders.rs
2023/07/30 | 157 | support/texlab/crates/texlab/tests/lsp/text_document/snapshots/lsp__text_document__formatting__bibtex_internal_trailing_comma.snap
2023/07/30 | 157 | support/texlab/crates/texlab/tests/lsp/text_document/snapshots/lsp__text_document__formatting__bibtex_internal_insert_braces.snap
2023/07/30 | 1573 | support/texlab/crates/base-db/src/semantics/bib.rs
2023/07/30 | 15622 | support/texlab/crates/citeproc/src/tests.rs
-2023/07/30 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
-2023/07/30 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
+2023/07/30 | 15405 | macros/latex/contrib/profcollege/latex/PfCPropor.tex
+2023/07/30 | 15326 | macros/latex/contrib/profcollege/latex/PfCRepresentationGraphique.tex
+2023/07/30 | 1528 | macros/latex/contrib/profcollege/latex/PfCCartesMentales.tex
2023/07/30 | 1509 | support/texlab/crates/symbols/src/document.rs
+2023/07/30 | 15072 | macros/latex/contrib/profcollege/latex/PfCFactorisation.tex
2023/07/30 | 1506 | support/texlab/crates/texlab/src/features/completion/import.rs
2023/07/30 | 1505 | support/texlab/crates/texlab/tests/lsp/text_document/document_symbol.rs
2023/07/30 | 14 | support/texlab/crates/parser/src/test_data/latex/label/label_reference_multiple.txt
2023/07/30 | 14 | support/texlab/crates/parser/src/test_data/latex/generic_command_args.txt
+2023/07/30 | 14927 | macros/latex/contrib/profcollege/latex/PfCCalculsCroises.tex
2023/07/30 | 148 | support/texlab/crates/parser/src/lib.rs
+2023/07/30 | 1488 | macros/latex/contrib/profcollege/latex/PfCScratch.tex
2023/07/30 | 148380 | support/pdfjam/tests.zip
2023/07/30 | 1464 | support/texlab/crates/parser/src/snapshots/parser__latex__tests__parse@glossary__acronym_declaration.txt.snap
2023/07/30 | 14632 | systems/texlive/tlnet/archive/dtk.r67766.tar.xz
-2023/07/30 | 145 | systems/texlive/tlnet/install-tl.zip.sha512
-2023/07/30 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
2023/07/30 | 1443 | support/texlab/crates/symbols/src/workspace/snapshots/symbols__workspace__tests__filter_type_item.snap
2023/07/30 | 143 | support/texlab/crates/texlab/tests/lsp/text_document/snapshots/lsp__text_document__formatting__bibtex_internal_string.snap
2023/07/30 | 143 | support/texlab/crates/texlab/tests/lsp/text_document.rs
2023/07/30 | 1438 | support/texlab/crates/hover/src/lib.rs
2023/07/30 | 14296 | support/texlab/crates/texlab/tests/lsp/text_document/completion.rs
+2023/07/30 | 14262 | macros/latex/contrib/profcollege/latex/PfCCAN.tex
2023/07/30 | 1419 | support/texlab/crates/references/src/entry.rs
+2023/07/30 | 14131 | macros/latex/contrib/profcollege/latex/PfCDessinerRatio.tex
2023/07/30 | 1412 | support/texlab/crates/texlab/src/server/progress.rs
+2023/07/30 | 14120 | macros/latex/contrib/profcollege/latex/PfCNonogramme.tex
2023/07/30 | 13 | support/texlab/crates/parser/src/test_data/latex/include/package_include_empty.txt
2023/07/30 | 13 | support/texlab/crates/parser/src/test_data/latex/group/curly_group_simple.txt
2023/07/30 | 13 | support/texlab/crates/parser/src/test_data/latex/equation.txt
@@ -556,12 +772,14 @@
2023/07/30 | 1359 | support/texlab/crates/parser/src/snapshots/parser__latex__tests__parse@glossary__acronym_definition_options.txt.snap
2023/07/30 | 1358 | support/texlab/crates/definition/src/command.rs
2023/07/30 | 134 | support/texlab/crates/parser/src/test_data/latex/structure/paragraphs.txt
+2023/07/30 | 13485 | macros/latex/contrib/profcollege/metapost/PfCCalculatrice.mp
2023/07/30 | 13353 | support/texlab/crates/parser/src/test_data/build_log/005.txt
2023/07/30 | 1330 | support/texlab/crates/texlab/src/features/inlay_hint/label.rs
2023/07/30 | 132 | support/texlab/crates/texlab/tests/lsp/text_document/snapshots/lsp__text_document__formatting__bibtex_internal_parens.snap
2023/07/30 | 13252 | systems/texlive/tlnet/archive/msu-thesis.r67764.tar.xz
2023/07/30 | 1322 | support/texlab/crates/texlab/tests/lsp/text_document/document_highlight.rs
2023/07/30 | 1321 | support/texlab/crates/symbols/src/workspace.rs
+2023/07/30 | 13189 | macros/latex/contrib/profcollege/latex/PfCEcritureUnites.tex
2023/07/30 | 1305 | support/texlab/crates/texlab/src/features/rename/command.rs
2023/07/30 | 1304 | support/texlab/crates/texlab/src/features/definition.rs
2023/07/30 | 12 | support/texlab/crates/texlab/tests/lsp/workspace.rs
@@ -569,6 +787,7 @@
2023/07/30 | 12 | support/texlab/crates/parser/src/test_data/latex/group/curly_group_missing_end.txt
2023/07/30 | 12 | support/texlab/crates/parser/src/test_data/latex/citation/citation_redundant_comma.txt
2023/07/30 | 1298 | support/texlab/crates/texlab/src/features/inlay_hint.rs
+2023/07/30 | 1287 | macros/latex/contrib/profcollege/latex/PfCPyraVoca.tex
2023/07/30 | 1276 | support/texlab/crates/references/src/string_def.rs
2023/07/30 | 1274 | support/texlab/crates/texlab/benches/bench_main.rs
2023/07/30 | 1260 | support/texlab/crates/parser/src/snapshots/parser__latex__tests__parse@structure__structure_enum_item.txt.snap
@@ -577,6 +796,7 @@
2023/07/30 | 12235 | indexing/xindex/lualatex/xindex-base.lua
2023/07/30 | 1210 | support/texlab/crates/definition/src/lib.rs
2023/07/30 | 1208 | support/texlab/crates/texlab/tests/lsp/text_document/folding_range.rs
+2023/07/30 | 12062 | macros/latex/contrib/profcollege/latex/PfCNumberHive.tex
2023/07/30 | 120354 | macros/latex/contrib/gamebooklib/gamebooklib_test.pdf
2023/07/30 | 11 | support/texlab/crates/parser/src/test_data/latex/label/label_reference_equation.txt
2023/07/30 | 11 | support/texlab/crates/parser/src/test_data/latex/label/label_definition_simple.txt
@@ -584,11 +804,12 @@
2023/07/30 | 1191 | support/texlab/crates/texlab/src/features/completion/glossary_ref.rs
2023/07/30 | 1191 | support/texlab/crates/parser/src/snapshots/parser__latex__tests__parse@environment__environment_nested_missing_braces.txt.snap
2023/07/30 | 1177 | support/texlab/crates/parser/src/snapshots/parser__latex__tests__parse@command_definition__command_definition_with_begin.txt.snap
+2023/07/30 | 11740 | macros/latex/contrib/profcollege/latex/PfCSommeAngles.tex
2023/07/30 | 1170 | support/texlab/crates/base-db/src/semantics/auxiliary.rs
2023/07/30 | 1157 | support/texlab/crates/texlab/tests/lsp/text_document/document_link.rs
2023/07/30 | 1154 | support/texlab/crates/definition/src/label.rs
2023/07/30 | 11420 | support/texlab/crates/parser/src/bibtex.rs
-2023/07/30 | 114056 | systems/texlive/tlnet/archive/texlive-scripts.r67759.tar.xz
+2023/07/30 | 11255 | macros/latex/contrib/profcollege/latex/PfCCompteBon.tex
2023/07/30 | 1124 | support/texlab/crates/distro/src/language.rs
2023/07/30 | 1121 | support/texlab/crates/symbols/src/document/snapshots/symbols__document__tests__theorem_thmtools.snap
2023/07/30 | 1121 | support/texlab/crates/parser/src/snapshots/parser__latex__tests__parse@environment__environment_nested.txt.snap
@@ -596,42 +817,47 @@
2023/07/30 | 1112 | support/texlab/crates/parser/src/test_data/bibtex/samples/nietzsche_1998.txt
2023/07/30 | 11093 | support/texlab/crates/base-db/src/semantics/tex.rs
2023/07/30 | 11083 | indexing/xindex/lualatex/xindex-HAdW-eKO.lua
+2023/07/30 | 11046 | macros/latex/contrib/profcollege/latex/PfCAutomatismes.tex
2023/07/30 | 1103 | support/texlab/crates/parser/src/snapshots/parser__latex__tests__parse@environment__environment_definition.txt.snap
+2023/07/30 | 11026 | macros/latex/contrib/profcollege/latex/PfCProprietesDroites.tex
2023/07/30 | 11015 | support/texlab/crates/parser/src/snapshots/parser__bibtex__tests__parse@samples__nietzsche_1998.txt.snap
2023/07/30 | 10 | support/texlab/crates/parser/src/test_data/latex/citation/citation_star.txt
2023/07/30 | 10 | support/texlab/crates/parser/src/test_data/latex/citation/citation_simple.txt
+2023/07/30 | 10951 | macros/latex/contrib/profcollege/latex/PfCAutonomie.tex
2023/07/30 | 108 | support/texlab/crates/texlab/src/lib.rs
2023/07/30 | 1083 | support/texlab/crates/texlab/src/features/formatting.rs
+2023/07/30 | 108388 | macros/latex/contrib/profcollege/metapost/PfCScratchpdf.mp
2023/07/30 | 1076 | support/texlab/crates/texlab/tests/lsp/text_document/snapshots/lsp__text_document__completion__issue_885.snap
2023/07/30 | 1074 | support/texlab/crates/parser/src/snapshots/parser__latex__tests__parse@environment__environment_asymptote.txt.snap
2023/07/30 | 1070 | support/texlab/crates/references/src/lib.rs
2023/07/30 | 1067 | support/texlab/crates/parser/src/snapshots/parser__latex__tests__parse@include__package_include_options.txt.snap
+2023/07/30 | 106783 | macros/latex/contrib/profcollege/metapost/PfCScratch.mp
2023/07/30 | 1066 | support/texlab/crates/texlab/src/features/rename/label.rs
2023/07/30 | 1066 | support/texlab/crates/parser/src/snapshots/parser__latex__tests__parse@include__class_include_options.txt.snap
2023/07/30 | 1066 | support/texlab/crates/definition/src/include.rs
+2023/07/30 | 10633 | macros/latex/contrib/profcollege/latex/PfCEnigmeAire.tex
2023/07/30 | 1056 | support/texlab/crates/definition/src/string_ref.rs
2023/07/30 | 1055 | support/texlab/crates/hover/src/string_ref.rs
+2023/07/30 | 10548 | macros/latex/contrib/profcollege/latex/PfCModeleBarre.tex
2023/07/30 | 1053036 | systems/texlive/tlnet/archive/newtx.doc.r67763.tar.xz
2023/07/30 | 1051 | support/texlab/crates/texlab/tests/lsp/workspace/symbol.rs
2023/07/30 | 1049 | support/texlab/crates/texlab/src/features/highlight/label.rs
+2023/07/30 | 10479 | macros/latex/contrib/profcollege/latex/PfCDefiTables.tex
2023/07/30 | 10380 | support/texlab/crates/parser/src/snapshots/parser__bibtex__tests__parse@samples__averroes_1998.txt.snap
2023/07/30 | 1028 | support/texlab/crates/texlab/src/features/completion/matcher.rs
2023/07/30 | 10257 | support/texlab/crates/texlab/src/util/cursor.rs
+2023/07/30 | 10168 | macros/latex/contrib/profcollege/latex/PfCPapiers.tex
2023/07/30 | 10141 | indexing/xindex/scripts/xindex.lua
2023/07/30 | 10136 | indexing/xindex/lualatex/xindex-lapp.lua
2023/07/30 | 1009 | support/texlab/crates/symbols/src/workspace/snapshots/symbols__workspace__tests__filter_type_math.snap
2023/07/30 | 1008 | support/texlab/crates/parser/src/test_data/bibtex/samples/averroes_1998.txt
-2023/07/29 | 98597 | usergrps/dante/dtk.zip
-2023/07/29 | 75603 | usergrps/dante/dtk/doc/beispiel.pdf
+2023/07/29 | 84 | usergrps/dante/dtk/README.md
2023/07/29 | 746492 | systems/texlive/tlnet/archive/caption.doc.r67752.tar.xz
-2023/07/29 | 7439 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
2023/07/29 | 6924 | systems/texlive/tlnet/archive/collection-latexextra.r67756.tar.xz
2023/07/29 | 61140 | systems/texlive/tlnet/archive/caption.r67752.tar.xz
-2023/07/29 | 606076 | systems/texlive/tlnet/archive/xindex.doc.r67751.tar.xz
2023/07/29 | 5452 | systems/texlive/tlnet/archive/textcase.source.r67755.tar.xz
2023/07/29 | 516 | systems/texlive/tlnet/archive/defoldfonts.r67756.tar.xz
2023/07/29 | 3660 | systems/texlive/tlnet/archive/defoldfonts.source.r67756.tar.xz
-2023/07/29 | 36380 | systems/texlive/tlnet/archive/xindex.r67751.tar.xz
2023/07/29 | 3073 | usergrps/dante/dtk/doc/beispiel.tex
2023/07/29 | 2890420 | systems/texlive/tlnet/archive/simpleicons.r67750.tar.xz
2023/07/29 | 225528 | systems/texlive/tlnet/archive/textcase.doc.r67755.tar.xz
@@ -650,12 +876,9 @@
2023/07/28 | 9981 | macros/latex/contrib/msu-thesis/samples/MSU-thesis-testfile.tex
2023/07/28 | 996 | indexing/xindex/doc/tests/demo2.ind
2023/07/28 | 9964 | macros/latex/contrib/defoldfonts/defoldfonts.dtx
-2023/07/28 | 99130 | macros/latex/contrib/caption/ltcaption.pdf
-2023/07/28 | 97411 | macros/latex/contrib/caption/subcaption.dtx
2023/07/28 | 941 | systems/win32/miktex/tm/packages/pr.ini
2023/07/28 | 9346 | systems/win32/miktex/tm/packages/tensor__source.tar.lzma
2023/07/28 | 93407 | systems/win32/miktex/tm/packages/qrbill__doc.tar.lzma
-2023/07/28 | 9298 | macros/latex/contrib/caption/CHANGELOG
2023/07/28 | 92928 | systems/win32/miktex/tm/packages/create-theorem__doc.tar.lzma
2023/07/28 | 9216 | indexing/xindex/doc/tests/demo3.pdf
2023/07/28 | 90101 | systems/win32/miktex/tm/packages/rouequestions__source.tar.lzma
@@ -668,12 +891,10 @@
2023/07/28 | 82028 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-x64-2.9.tar.lzma
2023/07/28 | 81473 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-x64-2.9.tar.lzma
2023/07/28 | 81409 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-x64-2.9.tar.lzma
-2023/07/28 | 8089 | macros/latex/contrib/caption/caption-ams-smf.dtx
2023/07/28 | 80738 | systems/win32/miktex/tm/packages/ibrackets__doc.tar.lzma
2023/07/28 | 8035 | systems/win32/miktex/tm/packages/tikz-nfold.tar.lzma
2023/07/28 | 8002 | systems/win32/miktex/tm/packages/abntexto.tar.lzma
2023/07/28 | 78652 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-x64-2.9.tar.lzma
-2023/07/28 | 78170 | macros/latex/contrib/caption/caption2.pdf
2023/07/28 | 7784 | systems/texlive/tlnet/archive/abntexto.r67743.tar.xz
2023/07/28 | 7779 | systems/win32/miktex/tm/packages/lutabulartools.tar.lzma
2023/07/28 | 776 | macros/latex/contrib/spacingtricks/README.md
@@ -694,16 +915,11 @@
2023/07/28 | 705667 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-x64-2.9.tar.lzma
2023/07/28 | 697358 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-x64-2.9.tar.lzma
2023/07/28 | 69696 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-x64-2.9.tar.lzma
-2023/07/28 | 6856 | macros/latex/contrib/caption/caption-thesis.dtx
2023/07/28 | 6771 | macros/latex/contrib/msu-thesis/samples/MSU-thesis-template.tex
-2023/07/28 | 67305 | macros/latex/contrib/caption/caption-light.pdf
2023/07/28 | 67243 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-x64-2.9.tar.lzma
2023/07/28 | 6712 | systems/win32/miktex/tm/packages/crefthe__source.tar.lzma
-2023/07/28 | 66826 | macros/latex/contrib/caption/bicaption.dtx
2023/07/28 | 665 | fonts/simpleicons/README.md
-2023/07/28 | 6655 | macros/latex/contrib/caption/caption-ntg.dtx
2023/07/28 | 66308 | systems/win32/miktex/tm/packages/siunitx.tar.lzma
-2023/07/28 | 6579 | macros/latex/contrib/caption/caption-elsarticle.dtx
2023/07/28 | 6532316 | systems/win32/miktex/tm/packages/newtx.tar.lzma
2023/07/28 | 6530 | systems/win32/miktex/tm/packages/recorder-fingering__source.tar.lzma
2023/07/28 | 6499 | systems/win32/miktex/tm/packages/lutabulartools__source.tar.lzma
@@ -742,19 +958,16 @@
2023/07/28 | 5185 | indexing/xindex/doc/tests/demo.ind
2023/07/28 | 5102 | indexing/xindex/doc/tests/demo.idx
2023/07/28 | 501262 | systems/win32/miktex/tm/packages/next/miktex-ptex-bin-x64.tar.lzma
-2023/07/28 | 50067 | macros/latex/contrib/caption/caption2.dtx
2023/07/28 | 49703 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-x64-2.9.tar.lzma
2023/07/28 | 48893 | systems/win32/miktex/tm/packages/penlightplus__doc.tar.lzma
2023/07/28 | 4872 | systems/win32/miktex/tm/packages/luaplot__source.tar.lzma
2023/07/28 | 47954 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-x64-2.9.tar.lzma
2023/07/28 | 473111 | systems/win32/miktex/tm/packages/next/miktex-doc.tar.lzma
2023/07/28 | 47016 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-x64-2.9.tar.lzma
-2023/07/28 | 46949 | macros/latex/contrib/caption/fallback/v2.1/caption2.dtx
2023/07/28 | 4633 | systems/win32/miktex/tm/packages/fcolumn.tar.lzma
2023/07/28 | 45884 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-x64-2.9.tar.lzma
2023/07/28 | 4519 | systems/win32/miktex/tm/packages/crefthe.tar.lzma
2023/07/28 | 4509 | systems/win32/miktex/tm/packages/lastpage.tar.lzma
-2023/07/28 | 44367 | fonts/newtx/README
2023/07/28 | 441 | macros/unicodetex/latex/fontsetup/fsperewhon.sty
2023/07/28 | 44172 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-x64-2.9.tar.lzma
2023/07/28 | 43824 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-x64-2.9.tar.lzma
@@ -766,7 +979,6 @@
2023/07/28 | 43088 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin-x64.tar.lzma
2023/07/28 | 43015 | macros/latex/contrib/msu-thesis/msu-thesis.cls
2023/07/28 | 429358 | systems/win32/miktex/tm/packages/msu-thesis__source.tar.lzma
-2023/07/28 | 428715 | macros/latex/contrib/caption/caption.pdf
2023/07/28 | 42147 | macros/latex/contrib/msu-thesis/docs/msu-thesis.tex
2023/07/28 | 409868 | systems/texlive/tlnet/archive/xcharter.doc.r67742.tar.xz
2023/07/28 | 4045 | systems/win32/miktex/tm/packages/circledsteps__source.tar.lzma
@@ -776,7 +988,6 @@
2023/07/28 | 3965 | systems/win32/miktex/tm/packages/mismath.tar.lzma
2023/07/28 | 395023 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-x64-2.9.tar.lzma
2023/07/28 | 393 | macros/latex/contrib/msu-thesis/samples/chap2bib.tex
-2023/07/28 | 3922 | macros/latex/contrib/caption/caption.ins
2023/07/28 | 39017 | indexing/xindex/doc/tests/buch.pdf
2023/07/28 | 38104 | systems/win32/miktex/tm/packages/newtx__source.tar.lzma
2023/07/28 | 37629 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-x64-2.9.tar.lzma
@@ -791,7 +1002,6 @@
2023/07/28 | 35263 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-x64-2.9.tar.lzma
2023/07/28 | 34972 | systems/win32/miktex/tm/packages/bxjscls.tar.lzma
2023/07/28 | 34598 | indexing/xindex/doc/tests/demo.pdf
-2023/07/28 | 338911 | macros/latex/contrib/caption/caption.dtx
2023/07/28 | 33815 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-x64-2.9.tar.lzma
2023/07/28 | 33659 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-x64-2.9.tar.lzma
2023/07/28 | 328688 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-x64-2.9.tar.lzma
@@ -809,11 +1019,8 @@
2023/07/28 | 30940 | systems/win32/miktex/tm/packages/mpchess__source.tar.lzma
2023/07/28 | 305487 | systems/win32/miktex/tm/packages/rit-fonts__doc.tar.lzma
2023/07/28 | 305300 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-x64-2.9.tar.lzma
-2023/07/28 | 2950 | macros/latex/contrib/caption/README
2023/07/28 | 2936 | macros/latex/contrib/msu-thesis/README.md
2023/07/28 | 2922 | macros/unicodetex/latex/fontsetup/doc/fspsample.tex
-2023/07/28 | 29158 | macros/latex/contrib/caption/ltcaption.dtx
-2023/07/28 | 291332 | macros/latex/contrib/caption/fallback/v3.1/caption.dtx
2023/07/28 | 290120 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-x64-2.9.tar.lzma
2023/07/28 | 28938 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-x64-2.9.tar.lzma
2023/07/28 | 288207 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-x64-2.9.tar.lzma
@@ -870,7 +1077,6 @@
2023/07/28 | 232311 | fonts/simpleicons/tex/simpleiconsglyphs-pdftex.tex
2023/07/28 | 231483 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-x64-2.9.tar.lzma
2023/07/28 | 2301 | fonts/simpleicons/enc/simpleiconsoneone.enc
-2023/07/28 | 229241 | macros/latex/contrib/caption/subcaption.pdf
2023/07/28 | 2281 | systems/win32/miktex/tm/packages/rouequestions.tar.lzma
2023/07/28 | 227574 | support/TeX4ht/source/ChangeLog
2023/07/28 | 227470 | fonts/simpleicons/tex/simpleiconsglyphs-xeluatex.tex
@@ -887,9 +1093,7 @@
2023/07/28 | 2162 | systems/win32/miktex/tm/packages/circledsteps.tar.lzma
2023/07/28 | 215119 | macros/latex/contrib/msu-thesis/samples/MSU-thesis-testfile.pdf
2023/07/28 | 2150 | systems/win32/miktex/tm/packages/penlightplus.tar.lzma
-2023/07/28 | 21420 | macros/latex/contrib/caption/fallback/v2.0/caption2.dtx
2023/07/28 | 21352 | systems/texlive/tlnet/archive/mismath.source.r67745.tar.xz
-2023/07/28 | 21191 | macros/latex/contrib/caption/elephant.eps
2023/07/28 | 211298 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-x64-2.9.tar.lzma
2023/07/28 | 2103473 | fonts/simpleicons/doc/simpleicons.pdf
2023/07/28 | 2073808 | systems/win32/miktex/tm/packages/simpleicons__doc.tar.lzma
@@ -906,12 +1110,10 @@
2023/07/28 | 19809 | macros/unicodetex/latex/fontsetup/doc/fontsetup-doc.tex
2023/07/28 | 19764 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-x64-2.9.tar.lzma
2023/07/28 | 19665 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-x64-2.9.tar.lzma
-2023/07/28 | 194594 | macros/latex/contrib/caption/caption3.dtx
2023/07/28 | 1933898 | systems/win32/miktex/tm/packages/concmath-otf__doc.tar.lzma
2023/07/28 | 1924 | systems/texlive/tlnet/archive/circledsteps.r67744.tar.xz
2023/07/28 | 1921368 | systems/win32/miktex/tm/packages/miktex-zzdb2-2.9.tar.lzma
2023/07/28 | 1920230 | systems/win32/miktex/tm/packages/next/miktex-zzdb2-2.9.tar.lzma
-2023/07/28 | 19008 | macros/latex/contrib/caption/fallback/v1/caption.dtx
2023/07/28 | 188981 | systems/win32/miktex/tm/packages/hyphenex.tar.lzma
2023/07/28 | 18886 | indexing/xindex/doc/tests/Umlaute2.pdf
2023/07/28 | 187562 | systems/win32/miktex/tm/packages/concmath-otf.tar.lzma
@@ -921,10 +1123,7 @@
2023/07/28 | 18342 | indexing/xindex/doc/tests/HADW.pdf
2023/07/28 | 182826 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-x64-2.9.tar.lzma
2023/07/28 | 1825 | systems/win32/miktex/tm/packages/typeoutfileinfo.tar.lzma
-2023/07/28 | 182408 | macros/latex/contrib/caption/fallback/v3.0/caption.dtx
2023/07/28 | 182079 | macros/latex/contrib/spacingtricks/spacingtricks.pdf
-2023/07/28 | 181372 | macros/latex/contrib/caption/fallback/v3.3/caption.dtx
-2023/07/28 | 179084 | macros/latex/contrib/caption/fallback/v3.5/caption3.dtx
2023/07/28 | 1785350 | systems/win32/miktex/tm/packages/rit-fonts.tar.lzma
2023/07/28 | 174414 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-x64-2.9.tar.lzma
2023/07/28 | 173392 | systems/win32/miktex/tm/packages/recorder-fingering__doc.tar.lzma
@@ -933,28 +1132,18 @@
2023/07/28 | 171528 | macros/latex/contrib/spacingtricks.zip
2023/07/28 | 17066 | usergrps/dante/dtk/dtk.cls
2023/07/28 | 170119 | systems/win32/miktex/tm/packages/polyglossia__source.tar.lzma
-2023/07/28 | 169367 | macros/latex/contrib/caption/fallback/v3.4/caption.dtx
-2023/07/28 | 1692031 | install/macros/latex/contrib/caption.tds.zip
-2023/07/28 | 16792 | macros/latex/contrib/caption/caption-koma.dtx
2023/07/28 | 1665777 | systems/win32/miktex/tm/packages/miktex-zzdb3-2.9.tar.lzma
2023/07/28 | 1665631 | systems/win32/miktex/tm/packages/next/miktex-zzdb3-2.9.tar.lzma
2023/07/28 | 1658600 | support/TeX4ht/source/tex4ht-fonts-noncjk.tex
-2023/07/28 | 165257 | macros/latex/contrib/caption/fallback/v3.2/caption.dtx
2023/07/28 | 16515 | systems/win32/miktex/tm/packages/qrbill__source.tar.lzma
2023/07/28 | 163956 | systems/win32/miktex/tm/packages/nicematrix__source.tar.lzma
-2023/07/28 | 162941 | macros/latex/contrib/caption/fallback/v3.5/caption.dtx
2023/07/28 | 1586435 | systems/win32/miktex/tm/packages/euler-math__doc.tar.lzma
2023/07/28 | 157533 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-x64-2.9.tar.lzma
-2023/07/28 | 157502 | macros/latex/contrib/caption/fallback/v3.4/caption3.dtx
-2023/07/28 | 15737 | macros/latex/contrib/caption/cat.eps
2023/07/28 | 156350 | systems/win32/miktex/tm/packages/rouequestions__doc.tar.lzma
2023/07/28 | 15378 | indexing/xindex/doc/tests/buch.ind
-2023/07/28 | 153437 | macros/latex/contrib/caption/fallback/v3.3/caption3.dtx
-2023/07/28 | 153251 | macros/latex/contrib/caption/bicaption.pdf
2023/07/28 | 1530270 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-x64-2.9.tar.lzma
2023/07/28 | 1519 | fonts/simpleicons/tex/simpleicons.sty
2023/07/28 | 15196 | indexing/xindex/doc/tests/Umlaute.pdf
-2023/07/28 | 1488461 | macros/latex/contrib/caption.zip
2023/07/28 | 146230 | systems/win32/miktex/tm/packages/inter__doc.tar.lzma
2023/07/28 | 1453 | systems/win32/miktex/tm/packages/typeoutfileinfo__source.tar.lzma
2023/07/28 | 1451241 | systems/win32/miktex/tm/packages/mpchess__doc.tar.lzma
@@ -963,15 +1152,12 @@
2023/07/28 | 1422956 | systems/win32/miktex/tm/packages/esami__doc.tar.lzma
2023/07/28 | 14134 | systems/win32/miktex/tm/packages/erewhon-math__source.tar.lzma
2023/07/28 | 140344 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-x64-2.9.tar.lzma
-2023/07/28 | 140287 | fonts/newtx/tex/newtxmath.sty
2023/07/28 | 139889 | macros/latex/contrib/msu-thesis/samples/MSU-thesis-chapterbib-testfile.pdf
-2023/07/28 | 13911 | macros/latex/contrib/caption/caption-beamer.dtx
2023/07/28 | 138 | indexing/xindex/doc/tests/demo3.ind
2023/07/28 | 137611 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-x64-2.9.tar.lzma
2023/07/28 | 137507 | fonts/simpleicons/doc/bindings.tex
2023/07/28 | 136880 | systems/texlive/tlnet/archive/luanumint.doc.r67746.tar.xz
2023/07/28 | 1363 | systems/win32/miktex/tm/packages/ibrackets.tar.lzma
-2023/07/28 | 135024 | macros/latex/contrib/caption/fallback/v3.2/caption3.dtx
2023/07/28 | 134901 | systems/win32/miktex/tm/packages/luanumint__doc.tar.lzma
2023/07/28 | 13389 | systems/win32/miktex/tm/packages/msu-thesis.tar.lzma
2023/07/28 | 1338747 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-x64-2.9.tar.lzma
@@ -999,7 +1185,6 @@
2023/07/28 | 11884 | indexing/xindex/doc/tests/demo4.pdf
2023/07/28 | 118509 | systems/win32/miktex/tm/packages/siunitx__source.tar.lzma
2023/07/28 | 1180355 | systems/win32/miktex/tm/packages/bxcjkjatype__doc.tar.lzma
-2023/07/28 | 11726 | macros/latex/contrib/caption/caption-light.dtx
2023/07/28 | 117093 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-x64-2.9.tar.lzma
2023/07/28 | 1168661 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-x64-2.9.tar.lzma
2023/07/28 | 1163447 | support/TeX4ht/source/tex4ht-4ht.tex
@@ -1007,9 +1192,7 @@
2023/07/28 | 1150 | systems/win32/miktex/tm/packages/next/pr.ini
2023/07/28 | 114 | indexing/xindex/doc/tests/demo3.idx
2023/07/28 | 11455 | systems/win32/miktex/tm/packages/create-theorem.tar.lzma
-2023/07/28 | 11429 | macros/latex/contrib/caption/caption-memoir.dtx
2023/07/28 | 113991 | macros/latex/contrib/msu-thesis/msu-thesis.pdf
-2023/07/28 | 112 | macros/latex/contrib/caption/SUMMARY
2023/07/28 | 112956 | systems/win32/miktex/tm/packages/msu-thesis__doc.tar.lzma
2023/07/28 | 11265 | systems/win32/miktex/tm/packages/penlightplus__source.tar.lzma
2023/07/28 | 112422 | systems/win32/miktex/tm/packages/bxjscls__source.tar.lzma
@@ -1028,7 +1211,6 @@
2023/07/28 | 10395 | systems/win32/miktex/tm/packages/tikz-nfold__source.tar.lzma
2023/07/28 | 103847 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-x64-2.9.tar.lzma
2023/07/28 | 102894 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-x64-2.9.tar.lzma
-2023/07/28 | 10228924 | fonts/newtx.zip
2023/07/28 | 1022180 | systems/win32/miktex/tm/packages/newtx__doc.tar.lzma
2023/07/28 | 10180 | systems/win32/miktex/tm/packages/nostarch.tar.lzma
2023/07/28 | 100099 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-x64-2.9.tar.lzma
@@ -1118,59 +1300,30 @@
2023/07/27 | 11344 | fonts/newtx/tfm/ntx-Italic-tosf-t1.tfm
2023/07/27 | 1124 | systems/texlive/tlnet/archive/ibrackets.r67736.tar.xz
2023/07/27 | 10300 | systems/texlive/tlnet/archive/derivative.r67735.tar.xz
-2023/07/26 | 996 | macros/latex/contrib/siunitx/README.md
2023/07/26 | 93437 | macros/latex/contrib/ibrackets/ibrackets.pdf
-2023/07/26 | 9198 | macros/latex/contrib/siunitx/siunitx-symbol.dtx
-2023/07/26 | 8866 | macros/latex/contrib/siunitx/siunitx-command.dtx
2023/07/26 | 84776 | macros/latex/contrib/ibrackets.zip
2023/07/26 | 829 | macros/latex/contrib/tidyres/README.md
2023/07/26 | 8071 | macros/latex/contrib/ibrackets/ibrackets.dtx
2023/07/26 | 765956 | fonts/newtx/doc/newtxdoc.pdf
2023/07/26 | 743 | macros/latex/contrib/abntexto/abntexto.bib
-2023/07/26 | 73724 | macros/latex/contrib/siunitx/CHANGELOG.md
2023/07/26 | 71048 | macros/latex/contrib/tidyres/tidyres-doc.pdf
-2023/07/26 | 691117 | macros/latex/contrib/siunitx/siunitx.pdf
-2023/07/26 | 643547 | macros/latex/contrib/siunitx/siunitx-code.pdf
2023/07/26 | 59072 | macros/latex/contrib/tidyres.zip
2023/07/26 | 5834 | macros/latex/contrib/tidyres/tidyres-doc.tex
2023/07/26 | 57738 | macros/latex/contrib/derivative/derivative.sty
-2023/07/26 | 5544 | macros/latex/contrib/siunitx/siunitx-locale.dtx
-2023/07/26 | 53992 | macros/latex/contrib/siunitx/siunitx-table.dtx
2023/07/26 | 517888 | systems/texlive/tlnet/archive/fcolumn.doc.r67729.tar.xz
-2023/07/26 | 4748 | macros/latex/contrib/siunitx/siunitx-abbreviations.cfg
2023/07/26 | 4392 | systems/texlive/tlnet/archive/fcolumn.r67729.tar.xz
2023/07/26 | 4024 | macros/latex/contrib/tidyres/tidyres.sty
-2023/07/26 | 38831 | macros/latex/contrib/siunitx/siunitx-complex.dtx
-2023/07/26 | 3687 | macros/latex/contrib/siunitx/siunitx.ins
-2023/07/26 | 36555 | macros/latex/contrib/siunitx/siunitx-print.dtx
-2023/07/26 | 34004 | macros/latex/contrib/siunitx/siunitx-compound.dtx
-2023/07/26 | 31776 | macros/latex/contrib/siunitx/siunitx-emulation.dtx
-2023/07/26 | 31738 | macros/latex/contrib/siunitx/siunitx-version-1.cfg
-2023/07/26 | 2951 | macros/latex/contrib/siunitx/siunitx-binary.dtx
2023/07/26 | 28859 | macros/latex/contrib/abntexto/abntexto.cls
-2023/07/26 | 27860 | fonts/newtx/tex/newtx.sty
-2023/07/26 | 273398 | macros/latex/contrib/siunitx/siunitx-v2.sty
-2023/07/26 | 2636 | macros/latex/contrib/siunitx/siunitx-code.tex
2023/07/26 | 234870 | macros/latex/contrib/derivative.zip
2023/07/26 | 23008 | systems/texlive/tlnet/archive/fcolumn.source.r67729.tar.xz
2023/07/26 | 218718 | macros/latex/contrib/abntexto/abntexto.pdf
-2023/07/26 | 21746 | macros/latex/contrib/siunitx/siunitx.dtx
2023/07/26 | 204460 | macros/latex/contrib/derivative/derivative.pdf
2023/07/26 | 1993 | macros/latex/contrib/ibrackets/ibrackets.ins
2023/07/26 | 18356 | CTAN.sites
-2023/07/26 | 17885 | macros/latex/contrib/siunitx/siunitx-angle.dtx
-2023/07/26 | 1729 | macros/latex/contrib/siunitx/siunitx-binary.cfg
-2023/07/26 | 160366 | macros/latex/contrib/siunitx/siunitx.tex
-2023/07/26 | 1567968 | install/macros/latex/contrib/siunitx.tds.zip
-2023/07/26 | 152930 | macros/latex/contrib/siunitx/siunitx-number.dtx
-2023/07/26 | 1522455 | macros/latex/contrib/siunitx.zip
2023/07/26 | 1516 | macros/latex/contrib/derivative/README.md
-2023/07/26 | 15153 | macros/latex/contrib/siunitx/siunitx-quantity.dtx
2023/07/26 | 13420 | macros/latex/contrib/abntexto/abntexto.tex
2023/07/26 | 124898 | fonts/newtx/doc/newtxdoc.tex
2023/07/26 | 122787 | macros/latex/contrib/derivative/derivative.tex
-2023/07/26 | 10931 | macros/latex/contrib/siunitx/siunitx-abbreviation.dtx
-2023/07/26 | 103395 | macros/latex/contrib/siunitx/siunitx-unit.dtx
2023/07/25 | 92884 | systems/texlive/tlnet/archive/qrbill.doc.r67724.tar.xz
2023/07/25 | 910 | macros/latex/contrib/mismath/README.md
2023/07/25 | 8586 | support/TeX4ht/source/mktex4ht-cnf.tex
@@ -1190,56 +1343,3 @@
2023/07/25 | 18092 | usergrps/dante/dtk/dtk-full.clo
2023/07/25 | 1688 | systems/texlive/tlnet/archive/collection-mathscience.r67725.tar.xz
2023/07/25 | 16068 | systems/texlive/tlnet/archive/qrbill.source.r67724.tar.xz
-2023/07/24 | 99940 | systems/texlive/tlnet/archive/create-theorem.doc.r67712.tar.xz
-2023/07/24 | 94656 | systems/texlive/tlnet/archive/lm-math.doc.r67718.tar.xz
-2023/07/24 | 92582 | macros/latex/contrib/lastpage/lastpage.dtx
-2023/07/24 | 92566 | macros/latex/contrib/qrbill/qrbill.pdf
-2023/07/24 | 88120 | systems/texlive/tlnet/archive/lutabulartools.doc.r67714.tar.xz
-2023/07/24 | 82393 | macros/latex/contrib/crefthe.zip
-2023/07/24 | 788 | systems/texlive/tlnet/archive/visualfaq-fr.r67718.tar.xz
-2023/07/24 | 7816 | systems/texlive/tlnet/archive/tikz-nfold.r67718.tar.xz
-2023/07/24 | 7748408 | systems/texlive/tlnet/archive/tex-gyre.r67718.tar.xz
-2023/07/24 | 77136 | systems/texlive/tlnet/archive/yamlvars.doc.r67715.tar.xz
-2023/07/24 | 7492 | systems/texlive/tlnet/archive/lutabulartools.r67714.tar.xz
-2023/07/24 | 6817740 | systems/texlive/tlnet/archive/poltawski.r67718.tar.xz
-2023/07/24 | 66435 | macros/latex/contrib/crefthe/crefthe-doc.pdf
-2023/07/24 | 595104 | install/macros/latex/contrib/lastpage.tds.zip
-2023/07/24 | 594236 | systems/texlive/tlnet/archive/tikz3d-fr.doc.r67718.tar.xz
-2023/07/24 | 577190 | macros/latex/contrib/lastpage.zip
-2023/07/24 | 57625 | macros/latex/contrib/qrbill/qrbill.dtx
-2023/07/24 | 56970 | macros/latex/contrib/qrbill/qrbill-qrencode.lua
-2023/07/24 | 5660 | systems/texlive/tlnet/archive/yamlvars.r67715.tar.xz
-2023/07/24 | 5200 | macros/latex/contrib/lastpage/README
-2023/07/24 | 492 | systems/texlive/tlnet/archive/tex-virtual-academy-pl.r67718.tar.xz
-2023/07/24 | 4695648 | systems/texlive/tlnet/archive/visualfaq-fr.doc.r67718.tar.xz
-2023/07/24 | 463 | macros/latex/contrib/qrbill/qrbill-latexluaqrcode.lua
-2023/07/24 | 451476 | systems/texlive/tlnet/archive/wordle.doc.r67718.tar.xz
-2023/07/24 | 4483 | macros/latex/contrib/crefthe/README.md
-2023/07/24 | 439739 | macros/latex/contrib/lastpage/lastpage.pdf
-2023/07/24 | 377796 | systems/texlive/tlnet/archive/lm-math.r67718.tar.xz
-2023/07/24 | 3336 | systems/texlive/tlnet/archive/tikz3d-fr.r67718.tar.xz
-2023/07/24 | 3280 | macros/latex/contrib/qrbill/README.md
-2023/07/24 | 274432 | systems/texlive/tlnet/archive/tikz-nfold.doc.r67718.tar.xz
-2023/07/24 | 2708 | systems/texlive/tlnet/archive/wordle.r67718.tar.xz
-2023/07/24 | 251380 | systems/texlive/tlnet/archive/msc.doc.r67718.tar.xz
-2023/07/24 | 2511620 | systems/texlive/tlnet/archive/lm.doc.r67718.tar.xz
-2023/07/24 | 23660 | systems/texlive/tlnet/archive/penlight.doc.r67716.tar.xz
-2023/07/24 | 21655 | macros/latex/contrib/crefthe/crefthe.sty
-2023/07/24 | 20168 | systems/texlive/tlnet/archive/msc.r67718.tar.xz
-2023/07/24 | 19106 | macros/latex/contrib/crefthe/LICENSE
-2023/07/24 | 18837 | macros/latex/contrib/crefthe/crefthe-doc.tex
-2023/07/24 | 1738 | macros/latex/contrib/qrbill/qrbill.ins
-2023/07/24 | 140567 | install/macros/latex/contrib/qrbill.tds.zip
-2023/07/24 | 1392140 | systems/texlive/tlnet/archive/poltawski.doc.r67718.tar.xz
-2023/07/24 | 129330 | macros/latex/contrib/lastpage/lastpage-example.pdf
-2023/07/24 | 127685 | macros/latex/contrib/qrbill.zip
-2023/07/24 | 119 | macros/latex/contrib/qrbill/DEPENDS.txt
-2023/07/24 | 11944816 | systems/texlive/tlnet/archive/lm.r67718.tar.xz
-2023/07/24 | 1153 | macros/latex/contrib/qrbill/qrbill_swiss-cross.pdf
-2023/07/24 | 11335 | macros/luatex/latex/luanumint/luanumint.tex
-2023/07/24 | 11304 | systems/texlive/tlnet/archive/create-theorem.r67712.tar.xz
-2023/07/24 | 11141776 | systems/texlive/tlnet/archive/tex-gyre.doc.r67718.tar.xz
-2023/07/24 | 1107 | macros/latex/contrib/qrbill/qrbill-vocab.csv
-2023/07/24 | 1080060 | systems/texlive/tlnet/archive/tex-virtual-academy-pl.doc.r67718.tar.xz
-2023/07/24 | 1016896 | systems/texlive/tlnet/archive/tex-gyre.source.r67718.tar.xz
-2023/07/24 | 101464 | systems/texlive/tlnet/archive/penlight.r67716.tar.xz
diff --git a/biblio/ctan-bibdata/ctan.bib b/biblio/ctan-bibdata/ctan.bib
index ff2fd88f3f..1a2502c388 100644
--- a/biblio/ctan-bibdata/ctan.bib
+++ b/biblio/ctan-bibdata/ctan.bib
@@ -1,7 +1,7 @@
%% bib file of all CTAN packages
%% (C) Herbert Voß
%%
-%% created at 31-07-2023, 02:00:14
+%% created at 01-08-2023, 02:01:15
%%
%% This file is provided under the terms of the LPPL v1.3 or
@@ -10694,7 +10694,7 @@
title = {The \texttt{caption} package},
subtitle = {Customising captions in floating environments},
author = {Axel Sommerfeldt},
- date = {2023-07-28},
+ date = {2023-07-31},
version = {},
license = {lppl1.3},
mirror = {https://mirror.ctan.org/macros/latex/contrib/caption},
@@ -19575,8 +19575,8 @@
title = {The \texttt{dtk} package},
subtitle = {Document class for the journal of DANTE},
author = {Herbert Voß and Rolf Niepraschk},
- date = {2023-07-29},
- version = {2.10a},
+ date = {2023-07-31},
+ version = {},
license = {lppl1.3c},
mirror = {https://mirror.ctan.org/usergrps/dante/dtk},
url = {https://ctan.org/pkg/dtk},
@@ -48072,8 +48072,8 @@
title = {The \texttt{newtx} package},
subtitle = {Alternative uses of the TX fonts, with improved metrics},
author = {Michael Sharpe},
- date = {2023-07-28},
- version = {1.722},
+ date = {2023-07-31},
+ version = {1.723},
license = {lppl1.3},
mirror = {https://mirror.ctan.org/fonts/newtx},
url = {https://ctan.org/pkg/newtx},
@@ -54548,8 +54548,8 @@
title = {The \texttt{ProfCollege} package},
subtitle = {A \LaTeX{} package for French maths teachers in college},
author = {Christophe Poulain},
- date = {2023-07-04},
- version = {0.99-z-o},
+ date = {2023-07-31},
+ version = {0.99-z-p},
license = {lppl1.3c},
mirror = {https://mirror.ctan.org/macros/latex/contrib/profcollege},
url = {https://ctan.org/pkg/profcollege},
@@ -57588,6 +57588,17 @@
url = {https://ctan.org/pkg/quicktype},
}
+@manual{ctan-quiver,
+ title = {The \texttt{quiver} package},
+ subtitle = {Draw commutative diagrams exported from https://q.uiver.app},
+ author = {{Unknown}},
+ date = {2023-07-31},
+ version = {1.3.0},
+ license = {mit},
+ mirror = {https://mirror.ctan.org/graphics/pgf/contrib/quiver},
+ url = {https://ctan.org/pkg/quiver},
+}
+
@manual{ctan-quiz2socrative,
title = {The \texttt{quiz2socrative} package},
subtitle = {Prepare questions for socrative quizzes},
@@ -62567,8 +62578,8 @@
title = {The \texttt{siunitx} package},
subtitle = {A comprehensive (SI) units package},
author = {Joseph Wright},
- date = {2023-07-26},
- version = {3.2.9},
+ date = {2023-07-31},
+ version = {3.3.0},
license = {lppl1.3c},
mirror = {https://mirror.ctan.org/macros/latex/contrib/siunitx},
url = {https://ctan.org/pkg/siunitx},
diff --git a/biblio/ctan-bibdata/ctan.pdf b/biblio/ctan-bibdata/ctan.pdf
index 71cf3ca9a6..da4a0cf21f 100644
--- a/biblio/ctan-bibdata/ctan.pdf
+++ b/biblio/ctan-bibdata/ctan.pdf
Binary files differ
diff --git a/fonts/newtx/README b/fonts/newtx/README
index b217cfb336..2367995520 100644
--- a/fonts/newtx/README
+++ b/fonts/newtx/README
@@ -1,10 +1,13 @@
This package, initially based on txfonts, provides many fixes and enhancements to the txfonts package, splitting it into two separate packages---newtxtext and newtxmath, which may be run independently of one another. It provides scaling, improved metrics, and other options. In particular, newtxmath offers a libertine option which substitutes Linux Libertine (provided with TeXLive and MikTeX) italic and Greek letters for the default Times letters, providing a good match for the Libertine text font, which is heavier than Computer Modern but lighter than Times, and in my experience, looks very sharp and clear on the screen.
-Current version: 1.722 2023-07-28
+Current version: 1.723 2023-07-30
This material is subject to the LaTeX Project Public License. See http://www.ctan.org/license/lppl1.3
for the details of that license.
+Changes in version 1.723
+Mainly changes to code in newtxmath.sty to make siunitx rendering of \ohm work as expected in all text variants.
+
Changes in version 1.722
Removed the automatic setting of amsthm---line 263 in nextxmath.sty. (Thanks Dominik Meidner.)
diff --git a/fonts/newtx/tex/newtx.sty b/fonts/newtx/tex/newtx.sty
index 9cbc246920..21a0d4565f 100644
--- a/fonts/newtx/tex/newtx.sty
+++ b/fonts/newtx/tex/newtx.sty
@@ -2,8 +2,8 @@
%Package to simplify loading of newtxmath with a text font family such as newtxtext for all latex engines, or for newtxtext and an otf math package.
-\def\fileversion{1.72}
-\def\filedate{2023/07/20}
+\def\fileversion{1.723}
+\def\filedate{2023/07/30}
\ProvidesPackage{newtx}[%
\filedate\space v\fileversion (Michael Sharpe) latex and unicode latex support for newtxmath and a supported text font family, or for newtxtext and an otf math package]
@@ -155,7 +155,6 @@
\@nameuse{if#1}\def\ntx@sc{LinuxLibertineT@scale}%
\def\ntx@TF{libertine}\def\ntx@MF{libertine}
\def\ntx@id{1}\def\ntx@minfam{MinLibertinus}\def\textlf##1{{\liningnums##1}}
-\def\infigures{}\def\textinf{}
\def\nustyle{\sufigures}\def\destyle{}\fi}
\DeclareOptionX{libertinus}[true]{%
\@nameuse{if#1}\def\ntx@sc{LibertinusSerif@scale}%
@@ -380,8 +379,7 @@
\@ifundefined{tx@sfrVS}{\def\tx@sfrVS{90}}{} % space above/below bar
\@ifundefined{tx@sfrTH}{\def\tx@sfrTH{46}}{} % bar thickness
\@ifundefined{tx@sfrSC}{\def\tx@sfrSC{.9}}{} % scale defigures by this
-\def\destyle{\infigures} \def\nustyle{\sufigures}
-\def\textlf#1{{\liningnums#1}}
+
%\iflibertine@otf%
%\providecommand{\textfrac}[3][]{{%
%{{%
@@ -628,9 +626,9 @@
\let\sustyle\sufigures
\let\nustyle\sufigures
\DeclareTextFontCommand{\textsup}{\sufigures}\def\destyle{\addfontfeature{RawFeature=+subs}}
- \def\infstyle\destyle
- \let\infigures\infstyle
- \DeclareTextFontCommand{\textinf}{\infigures}
+ \let\infstyle\destyle
+ \let\infigures\destyle
+ \DeclareTextFontCommand{\textinf}{\destyle}
\newcommand{\textfrac}[3][]{%
\mbox{%
\ifthenelse{\not\equal{#1}{}}%Test for integer portion [optional #1]
diff --git a/fonts/newtx/tex/newtxmath.sty b/fonts/newtx/tex/newtxmath.sty
index 46a604cba5..aca652f572 100644
--- a/fonts/newtx/tex/newtxmath.sty
+++ b/fonts/newtx/tex/newtxmath.sty
@@ -11,8 +11,8 @@
% of glyph collisions.
% These modifications are by Michael Sharpe, msharpe at ucsd dot edu
-\def\fileversion{1.722}
-\def\filedate{2023/07/28}
+\def\fileversion{1.723}
+\def\filedate{2023/07/30}
\ProvidesPackage{newtxmath}[\filedate\space v\fileversion ]
\@ifundefined{newtxmathLoaded}{}{\endinput}
@@ -212,7 +212,7 @@
\DeclareOption{nosymbolsc}{\tx@symbolsCfalse}
\DeclareOption{libertine}{\tx@libertinetrue\tx@ntxmathfalse}
\DeclareOption{libertinus}{\tx@libertinustrue\tx@ntxmathfalse}
-\DeclareOption{minion}{\tx@miniontrue\tx@ntxmathfalse\tx@otfalse}
+\DeclareOption{minion}{\tx@miniontrue\tx@ntxmathfalse}
\DeclareOption{cochineal}{\tx@cochtrue\tx@ntxmathfalse}
\DeclareOption{garamondx}{\tx@gmtrue\tx@ntxmathfalse\tx@otfalse}
\DeclareOption{ebgaramond}{\tx@ebgmtrue\tx@ntxmathfalse\tx@otfalse}
@@ -220,13 +220,13 @@
\DeclareOption{Baskerville}{\tx@batrue\tx@ntxmathfalse}
\DeclareOption{baskervillef}{\tx@batrue\tx@ntxmathfalse}
\DeclareOption{BaskervilleF}{\tx@batrue\tx@ntxmathfalse}
-\DeclareOption{baskervaldx}{\tx@bvtrue\tx@ntxmathfalse\tx@otfalse}
-\DeclareOption{Baskervaldx}{\tx@bvtrue\tx@ntxmathfalse\tx@otfalse}
-\DeclareOption{utopia}{\tx@uttrue\tx@ntxmathfalse\tx@otfalse}
-\DeclareOption{heuristica}{\tx@uttrue\tx@ntxmathfalse\tx@otfalse}
-\DeclareOption{Heuristica}{\tx@uttrue\tx@ntxmathfalse\tx@otfalse}
-\DeclareOption{Erewhon}{\tx@uttrue\tx@ntxmathfalse\tx@otfalse}
-\DeclareOption{erewhon}{\tx@uttrue\tx@ntxmathfalse\tx@otfalse}
+\DeclareOption{baskervaldx}{\tx@bvtrue\tx@ntxmathfalse}
+\DeclareOption{Baskervaldx}{\tx@bvtrue\tx@ntxmathfalse}
+\DeclareOption{utopia}{\tx@uttrue\tx@ntxmathfalse}
+\DeclareOption{heuristica}{\tx@uttrue\tx@ntxmathfalse}
+\DeclareOption{Heuristica}{\tx@uttrue\tx@ntxmathfalse}
+\DeclareOption{Erewhon}{\tx@uttrue\tx@ntxmathfalse}
+\DeclareOption{erewhon}{\tx@uttrue\tx@ntxmathfalse}
\DeclareOption{charter}{\tx@chtrue\tx@ntxmathfalse}
\DeclareOption{xcharter}{\tx@chtrue\tx@ntxmathfalse}
\DeclareOption{cmintegrals}{\tx@cminttrue}
@@ -3223,4 +3223,10 @@ $\hfil\displaystyle{#1}\hfil$\crcr%
\providecommand*\Eqqcolon{\Eqcolon}
\providecommand*\Coloneq{\Colondash}
\providecommand*\Eqcolon{\Dashcolon}}
+
+% Fix for garamondx with siunitx
+\iftx@gm%
+ \AtEndPreamble{%
+ \@ifpackageloaded{siunitx} {\DeclareSIUnit\ohm{\text{\ensuremath\upOmega}}}{}}
+\fi
\endinput
diff --git a/fonts/newtx/tex/newtxtext.sty b/fonts/newtx/tex/newtxtext.sty
index b1b3ba6fae..4d47dcdc25 100644
--- a/fonts/newtx/tex/newtxtext.sty
+++ b/fonts/newtx/tex/newtxtext.sty
@@ -8,8 +8,8 @@
% Text is now directed to an extension of TeXGyreTermes rather than tx.
% 1.7 is first version of newtxtext to support both [pdf]latex and unicode latex.
-\def\fileversion{1.72}
-\def\filedate{2023/07/20}
+\def\fileversion{1.723}
+\def\filedate{2023/07/30}
\ProvidesPackage{newtxtext}[%
\filedate\space v\fileversion (Michael Sharpe) latex and unicode latex support for TeXGyreTermesX]
@@ -566,13 +566,14 @@
%\show\textlf
\DeclareTextFontCommand{\textsu}{\sustyle}
\let\textsuperior\textsu
+ \let\textsup\textsu
\DeclareTextFontCommand{\textnum}{\nustyle}
\let\textnumerator\textnum
\DeclareTextFontCommand{\textde}{\destyle}
\let\textdenominator\textde
\DeclareTextFontCommand{\textinf}{\instyle}
\let\textinferior\textinf
-
+ \let\infigures\instyle
\AtEndPreamble{%
\ifntx@otftext
\ifntx@lining
diff --git a/graphics/pgf/contrib/quiver/README.md b/graphics/pgf/contrib/quiver/README.md
new file mode 100644
index 0000000000..5334dfda8b
--- /dev/null
+++ b/graphics/pgf/contrib/quiver/README.md
@@ -0,0 +1,15 @@
+# quiver: a modern commutative diagram editor
+
+[**quiver**](https://q.uiver.app) is a modern, graphical editor for commutative and pasting
+diagrams, capable of rendering high-quality diagrams for screen viewing, and exporting to LaTeX. The
+**quiver** package is intended to be used in conjunction with the editor, and provides the packages
+and styles that are used by diagrams exported from the editor.
+
+# Licence
+
+This package is subject to the MIT License.
+
+# Author
+
+This package is maintained by varkor (https://github.com/varkor). The repository and issue tracker
+can be found at https://github.com/varkor/quiver.
diff --git a/graphics/pgf/contrib/quiver/quiver-doc.pdf b/graphics/pgf/contrib/quiver/quiver-doc.pdf
new file mode 100644
index 0000000000..4a1ec780c6
--- /dev/null
+++ b/graphics/pgf/contrib/quiver/quiver-doc.pdf
Binary files differ
diff --git a/graphics/pgf/contrib/quiver/quiver-doc.tex b/graphics/pgf/contrib/quiver/quiver-doc.tex
new file mode 100644
index 0000000000..312b139eb7
--- /dev/null
+++ b/graphics/pgf/contrib/quiver/quiver-doc.tex
@@ -0,0 +1,149 @@
+\documentclass[12pt,a4paper]{article}
+
+\usepackage[margin=2.5cm]{geometry}
+\usepackage{microtype}
+
+% For the date.
+\usepackage[UKenglish]{isodate}
+
+% For URLs.
+\usepackage{hyperref}[pdfusetitle]
+\hypersetup{colorlinks,urlcolor=blue}
+\urlstyle{rm}
+
+% For tables.
+\usepackage{tabularray}
+
+% For side-by-side examples.
+\usepackage[skins,listings]{tcolorbox}
+\tcbuselibrary{minted}
+\newtcblisting{tikzexample}{
+ sidebyside,
+ center lower,
+ bicolor,
+ colbacklower=white,
+ sharp corners,
+ frame engine=empty
+}
+
+% The package in question.
+\usepackage{quiver}
+
+\newcommand{\quiver}{\textsf{quiver}}
+\newcommand{\tcd}{\textsf{tikz-cd}}
+\newcommand{\TikZ}{{\rm Ti{\it k}Z}}
+
+\title{\textsf{quiver} \\ \small A modern commutative diagram editor}
+\author{\normalsize \textsf{@varkor}}
+\date{\cleanlookdateon\today}
+
+\begin{document}
+
+\maketitle
+
+\begin{abstract}
+ The \textsf{quiver} package provides compatibility with the \textsf{quiver} commutative diagram editor.
+\end{abstract}
+
+\section{Usage}
+
+The \quiver{} package is intended to be used in conjunction with the \url{https://q.uiver.app/} commutative diagram editor. It functions as a wrapper around the \tcd{} package that provides some extra \TikZ{} styles, which are used in diagrams exported by the editor. However, these styles may be used in isolation of the editor.
+
+To use the \quiver{} package, add the following to the preamble of your document.
+
+\begin{verbatim}
+\usepackage{quiver}
+\end{verbatim}
+
+\section{\TikZ{} styles}
+
+The \quiver{} package provides several styles that are useful in the rendering of commutative diagrams.
+
+\subsection{The \texttt{curve} style}
+
+The typical method of curving arrows in \tcd{} commutative diagrams is to use the \TikZ{} \texttt{bend left} and \texttt{bend right} styles, together with the \texttt{in} and \texttt{out} parameters. These styles facilitate the bending of paths with respect to an angle. However, it is often more convenient to bend a path with respect to a distance (namely, the height of the apex of the curve). This may be achieved with the \texttt{curve} style\footnotemark{}.
+\footnotetext{The \texttt{curve} style is due to Andr\'eC (\url{https://tex.stackexchange.com/users/138900/andr\%C3\%A9c}).}
+
+\begin{tikzexample}
+\begin{tikzcd}
+ a \ar["f", rr, curve={height=-24pt}] && b
+\end{tikzcd}
+\end{tikzexample}
+
+The \texttt{curve} style takes two (optional) named parameters.
+
+\begin{itemize}
+ \item \texttt{height} specifies the height of the apex of the curve. It is a signed distance (default \texttt{0}).
+ \item \texttt{pos} specifies the position of the control point for the curve. It is a value between \texttt{0.0} and \texttt{1.0} (default \texttt{0.35}).
+\end{itemize}
+
+\begin{tikzexample}
+\begin{tikzcd}
+ a \ar["f", rr, curve={height=-24pt, pos=0.2}] && b
+\end{tikzcd}
+\end{tikzexample}
+
+\begin{tikzexample}
+\begin{tikzcd}
+ a \ar["f", rr, curve={height=-24pt, pos=0.5}] && b
+\end{tikzcd}
+\end{tikzexample}
+
+\begin{tikzexample}
+\begin{tikzcd}
+ a \ar["f", rr, curve={height=-24pt, pos=0.8}] && b
+\end{tikzcd}
+\end{tikzexample}
+
+\subsection{Arrowhead and tail styles}
+
+The \tcd{} package provides several arrowhead and tail styles. The \quiver{} package provides the following additional styles.
+
+\begin{center}
+ \begin{tblr}{cc}
+ {\bf Style} & {\bf Appearance} \\
+ \texttt{tail reversed} &
+ % https://q.uiver.app/?q=WzAsMixbMCwwXSxbMSwwXSxbMCwxLCIiLDAseyJzdHlsZSI6eyJ0YWlsIjp7Im5hbWUiOiJhcnJvd2hlYWQifX19XV0=
+ \begin{tikzcd}[ampersand replacement=\&]
+ {} \& {}
+ \arrow[tail reversed, from=1-1, to=1-2]
+ \end{tikzcd}
+ \\
+ \texttt{2tail} &
+ % https://q.uiver.app/?q=WzAsMixbMCwwXSxbMSwwXSxbMCwxLCIiLDAseyJsZXZlbCI6Miwic3R5bGUiOnsidGFpbCI6eyJuYW1lIjoibW9ubyJ9fX1dXQ==
+ \begin{tikzcd}[ampersand replacement=\&]
+ {} \& {}
+ \arrow[Rightarrow, 2tail, from=1-1, to=1-2]
+ \end{tikzcd}
+ \\
+ \texttt{2tail reversed} &
+ % https://q.uiver.app/?q=WzAsMixbMCwwXSxbMSwwXSxbMCwxLCIiLDAseyJsZXZlbCI6Miwic3R5bGUiOnsidGFpbCI6eyJuYW1lIjoiYXJyb3doZWFkIn19fV1d
+ \begin{tikzcd}[ampersand replacement=\&]
+ {} \& {}
+ \arrow[Rightarrow, 2tail reversed, from=1-1, to=1-2]
+ \end{tikzcd}
+ \\
+ \texttt{no body} &
+ % https://q.uiver.app/?q=WzAsMixbMCwwXSxbMSwwXSxbMCwxLCIiLDAseyJzdHlsZSI6eyJib2R5Ijp7Im5hbWUiOiJub25lIn19fV1d
+ \begin{tikzcd}[ampersand replacement=\&]
+ {} \& {}
+ \arrow[no body, from=1-1, to=1-2]
+ \end{tikzcd}
+ \end{tblr}
+\end{center}
+
+\section{Version history}
+
+The \quiver{} version number is tied to the editor version number. This is reflected in the history below: not every editor update corresponds to a package update.
+
+\begin{center}
+ \begin{tblr}{colspec={ccX[c]},row{even}=black!5}
+ {\bf Version} & {\bf Date} & {\bf Release notes} \\
+ 1.0.0 & 2020-11-10 & First public version. Imports necessary packages and defines the \texttt{curve} style. \\
+ 1.0.1 & 2020-11-27 & Added the \texttt{tail reversed}, \texttt{2tail}, and \texttt{2tail reversed} styles. \\
+ 1.1.0 & 2020-12-18 & Added a dependency. \\
+ 1.2.0 & 2021-01-11 & Added the \texttt{no body} style.
+ \end{tblr}
+\end{center}
+
+\end{document}
diff --git a/graphics/pgf/contrib/quiver/quiver.sty b/graphics/pgf/contrib/quiver/quiver.sty
new file mode 100644
index 0000000000..d1d7d07e84
--- /dev/null
+++ b/graphics/pgf/contrib/quiver/quiver.sty
@@ -0,0 +1,40 @@
+% *** quiver ***
+% A package for drawing commutative diagrams exported from https://q.uiver.app.
+%
+% This package is currently a wrapper around the `tikz-cd` package, importing necessary TikZ
+% libraries, and defining a new TikZ style for curves of a fixed height.
+%
+% Version: 1.3.0
+% Authors:
+% - varkor (https://github.com/varkor)
+% - AndréC (https://tex.stackexchange.com/users/138900/andr%C3%A9c)
+
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesPackage{quiver}[2021/01/11 quiver]
+
+% `tikz-cd` is necessary to draw commutative diagrams.
+\RequirePackage{tikz-cd}
+% `amssymb` is necessary for `\lrcorner` and `\ulcorner`.
+\RequirePackage{amssymb}
+% `calc` is necessary to draw curved arrows.
+\usetikzlibrary{calc}
+% `pathmorphing` is necessary to draw squiggly arrows.
+\usetikzlibrary{decorations.pathmorphing}
+
+% A TikZ style for curved arrows of a fixed height, due to AndréC.
+\tikzset{curve/.style={settings={#1},to path={(\tikztostart)
+ .. controls ($(\tikztostart)!\pv{pos}!(\tikztotarget)!\pv{height}!270:(\tikztotarget)$)
+ and ($(\tikztostart)!1-\pv{pos}!(\tikztotarget)!\pv{height}!270:(\tikztotarget)$)
+ .. (\tikztotarget)\tikztonodes}},
+ settings/.code={\tikzset{quiver/.cd,#1}
+ \def\pv##1{\pgfkeysvalueof{/tikz/quiver/##1}}},
+ quiver/.cd,pos/.initial=0.35,height/.initial=0}
+
+% TikZ arrowhead/tail styles.
+\tikzset{tail reversed/.code={\pgfsetarrowsstart{tikzcd to}}}
+\tikzset{2tail/.code={\pgfsetarrowsstart{Implies[reversed]}}}
+\tikzset{2tail reversed/.code={\pgfsetarrowsstart{Implies}}}
+% TikZ arrow styles.
+\tikzset{no body/.style={/tikz/dash pattern=on 0 off 1mm}}
+
+\endinput
diff --git a/macros/latex/contrib/caption/README b/macros/latex/contrib/caption/README
index 3381d5b9eb..508a9a4d24 100644
--- a/macros/latex/contrib/caption/README
+++ b/macros/latex/contrib/caption/README
@@ -1,7 +1,7 @@
==========================================================================
The `caption' package bundle
-Release 2023-07-28
+Release 2023-07-31
Copyright (C) 1994-2023 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm)
License: LPPL = LaTeX Project Public Licence
diff --git a/macros/latex/contrib/caption/caption.dtx b/macros/latex/contrib/caption/caption.dtx
index 7f48c88b5a..8315f780b3 100644
--- a/macros/latex/contrib/caption/caption.dtx
+++ b/macros/latex/contrib/caption/caption.dtx
@@ -31,7 +31,7 @@
%
% \fi
%
-% \CheckSum{2922}
+% \CheckSum{2923}
%
% \iffalse
%<*driver>
@@ -4521,14 +4521,14 @@
%
% Identify the current version of the package.
% \begin{macrocode}
-\ProvidesPackage{caption}[2023/07/28 v3.6m Customizing captions (AR)]
+\ProvidesPackage{caption}[2023/07/31 v3.6n Customizing captions (AR)]
% \end{macrocode}
%
% \subsection{Loading the kernel}
%
% Load a matching version of the \pkg{caption} kernel.
% \begin{macrocode}
-\RequirePackage{caption3}[2023/07/28] % needs v2.4c or newer
+\RequirePackage{caption3}[2023/07/31] % needs v2.4d or newer
% \end{macrocode}
%
% \subsection{Check against unknown document classes}
@@ -6082,6 +6082,7 @@
% \begin{macro}{\caption@dblarg}
% \changes{v3.1}{2007/02/05}{This macro added}
% \changes{v3.3}{2012/03/25}{Support of option \opt{list-entry} added}
+% \changes{v3.6n}{2023/07/31}{Only an empty list-entry will expand to \cs{relax}, otherwise it remains unchanged}
% A |\relax| was added compared to |\@dblarg| so |\caption{}| will be
% expanded to |\caption[\relax]{}| (and not to |\caption[]{}|).
% Furthermore support for option \opt{list-entry} was added.
@@ -6093,12 +6094,14 @@
% \end{macrocode}
% \begin{macrocode}
\newcommand\caption@xdblarg[2]{%
- #1[{#2\relax}]{#2}}
+ \caption@iftokens{#2}{#1[{#2}]{#2}}{#1[\relax]{}}}
% \end{macrocode}
% \begin{macrocode}
\long\def\caption@ydblarg#1[#2]#3{%
\caption@iflistheading{#1[{#3}]{#3}}{#1[{#2}]{#3}}}
% \end{macrocode}
+% \begin{macrocode}
+% \end{macrocode}
% \end{macro}
%
% \begin{macro}{\caption@begin}
diff --git a/macros/latex/contrib/caption/caption3.dtx b/macros/latex/contrib/caption/caption3.dtx
index 9f3e21b296..be2a46ec67 100644
--- a/macros/latex/contrib/caption/caption3.dtx
+++ b/macros/latex/contrib/caption/caption3.dtx
@@ -31,7 +31,7 @@
%
% \fi
%
-% \CheckSum{3865}
+% \CheckSum{3853}
%
% \iffalse
%<*driver>
@@ -232,7 +232,7 @@
%
% Identify the current version of the package.
% \begin{macrocode}
-\ProvidesPackage{caption3}[2023/07/28 v2.4c caption3 kernel (AR)]
+\ProvidesPackage{caption3}[2023/07/31 v2.4d caption3 kernel (AR)]
% \end{macrocode}
%
% \section{Generic helpers}
@@ -586,6 +586,20 @@
% \end{macrocode}
% \end{macro}
%
+% \begin{macro}{\caption@iftokens}
+% \changes{v2.4d}{2023/07/31}{This macro added}
+% |\caption@iftokens|\marg{arg}\marg{yes-code}\marg{no-code}\\
+% This helper command checks if the given argument contains one or more tokens, i.e. is not empty.
+% \begin{macrocode}
+\newcommand\caption@iftokens[1]{%
+ \if\relax\detokenize{#1}\relax
+ \expandafter\@secondoftwo
+ \else
+ \expandafter\@firstoftwo
+ \fi}
+% \end{macrocode}
+% \end{macro}
+%
% \begin{macro}{\caption@AtBeginDocument}
% \changes{v1.1}{2007/04/13}{This macro and its usage added}
% \changes{v1.2e}{2010/01/09}{Adapted to the combine document class}
@@ -1553,6 +1567,7 @@
% \changes{v1.3}{2010/11/07}{Support for option \opt{calcmargin} added}
% \changes{v2.3}{2021/01/17}{Renamed from \cs{setcaptionmargin} to \cs{caption@setmargin}; sets \cs{caption@width} or \cs{caption@leftmargin} and \cs{caption@rightmargin} now}
% \changes{v2.3}{2021/01/19}{Only the left or right margin can be set by leaving the other value blank}
+% \changes{v2.4d}{2023/07/31}{Check for \cs{@empty} argument replaced by \cs{caption@iftokens}}
% |\caption@setmargin*|\marg{amount}\\
% sets the caption margin to the given \meta{amount}.
% \begin{macrocode}
@@ -1571,20 +1586,14 @@
% \end{macrocode}
% \begin{macrocode}
\def\caption@@@@setmargin#1,#2,#3\@nil{%
- \def\caption@tempa{#1#2}%
- \ifx\caption@tempa\@empty
- \caption@Error{Missing number}%
- \else
- \caption@@@@@setmargin{left}{#1}%
- \caption@@@@@setmargin{right}{#2}%
- \fi}
+ \caption@iftokens{#1#2}%
+ {\caption@@@@@setmargin{left}{#1}%
+ \caption@@@@@setmargin{right}{#2}}%
+ {\caption@Error{Missing number}}}
% \end{macrocode}
% \begin{macrocode}
\newcommand*\caption@@@@@setmargin[2]{%
- \def\caption@tempa{#2}%
- \ifx\caption@tempa\@empty \else
- \caption@setlength{#1margin}{#2}%
- \fi}
+ \caption@iftokens{#2}{\caption@setlength{#1margin}{#2}}{}}
% \end{macrocode}
% \end{macro}
%
@@ -2307,17 +2316,13 @@
% \changes{v1.4}{2011/10/05}{Pre-defined text format `empty' added}
% \changes{v1.7}{2015/09/16}{The text format `empty' now takes care of the \cs{label}}
% \changes{v2.3}{2020/12/26}{Clearance of \cs{caption@thelabel} replaced by \cs{caption@clrlabel}}
+% \changes{v2.4d}{2023/07/31}{Check for \cs{@empty} argument replaced by \cs{caption@iftokens}}
% \begin{macrocode}
\DeclareCaptionTextFormat{empty}{%
\caption@get@label#1\caption@makeanchor{}\@nil
\caption@thelabel\caption@clrlabel}
\long\def\caption@get@label#1\caption@makeanchor#2#3\@nil{%
- \def\caption@tempa{#2}%
- \ifx\caption@tempa\@empty
- \caption@getlabel{#1}%
- \else
- \caption@getlabel{#2}%
- \fi}
+ \caption@iftokens{#2}{\caption@getlabel{#2}}{\caption@getlabel{#1}}}
% \end{macrocode}
% \begin{macrocode}
\DeclareCaptionTextFormat{simple}{#1}
@@ -4757,6 +4762,7 @@
% \changes{v1.13}{2020/07/29}{We don't re-use existing counters anymore (This was a bad idea anyway)}
% \changes{v1.13b}{2022/04/06}{We don't re-use existing counters anymore (Part 2)}
% \changes{v2.4}{2022/04/06}{If a counter is already defined the counter source will be included in the resulting error message}
+% \changes{v2.4d}{2023/07/31}{Check for \cs{@empty} argument replaced by \cs{caption@iftokens}}
% |\DeclareCaptionSubType*|\oarg{numbering scheme}\marg{type}\\
% The starred variant provides the numbering format
% \meta{type}|.|\meta{subtype} while the non-starred variant simply uses
@@ -4839,15 +4845,12 @@
% \end{macrocode}
% \begin{macrocode}
\long\def\caption@@@declaresublistentry#1\@dottedtocline#2\caption@nil#3{%
- \def\@tempa{#1}%
% Does \l@(sub)subsection start with \@dottedtocline?
- \ifx\@tempa\@empty
-% Yes
- \caption@@@@declaresublistentry{#3}#2\caption@nil
- \else
+ \caption@iftokens{#1}%
% No
- \caption@@@@declaresublistentry{#3}@{3.8em}{3.2em}\caption@nil
- \fi}
+ {\caption@@@@declaresublistentry{#3}@{3.8em}{3.2em}\caption@nil}%
+% Yes
+ {\caption@@@@declaresublistentry{#3}#2\caption@nil}}
\@onlypreamble\caption@@@declaresublistentry
% \end{macrocode}
% \begin{macrocode}
diff --git a/macros/latex/contrib/caption/captiondoc.cls b/macros/latex/contrib/caption/captiondoc.cls
new file mode 100644
index 0000000000..39340af5fd
--- /dev/null
+++ b/macros/latex/contrib/caption/captiondoc.cls
@@ -0,0 +1,121 @@
+%%
+%% This is file `captiondoc.cls',
+%% a common document class for all caption package bundle documentations.
+%%
+%% There is no need to distribute this file in tex/latex/caption since
+%% it's of no use for the end-user, it's only needed to compile the package
+%% documentations.
+%%
+%% Copyright (C) 2023 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm)
+%%
+%% https://gitlab.com/axelsommerfeldt/caption
+%%
+%% --------------------------------------------------------------------------
+%%
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%% http://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of LaTeX
+%% version 2003/12/01 or later.
+%%
+%% This work has the LPPL maintenance status "maintained".
+%%
+%% This Current Maintainer of this work is Axel Sommerfeldt.
+%%
+%% This work consists of the files
+%% caption.ins, caption.dtx, caption-light.dtx, caption2.dtx, caption3.dtx,
+%% caption-ams-smf.dtx, caption-beamer.dtx, caption-elsarticle.dtx,
+%% caption-koma.dtx, caption-memoir.dtx, caption-ntg.dtx,
+%% caption-thesis.dtx, bicaption.dtx, ltcaption.dtx, subcaption.dtx,
+%% the derived files
+%% caption.sty, caption-light.sty, caption2.sty, caption3.sty,
+%% caption-ams-smf.sto, caption-beamer.sto, caption-elsarticle.sto,
+%% caption-koma.sto, caption-memoir.sto, caption-ntg.sto,
+%% caption-thesis.sto, bicaption.sty, ltcaption.sty, subcaption.sty.
+
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesClass{captiondoc}[2022/12/27 Document class used by caption documentation]
+
+\hbadness=9999 \newcount\hbadness \hfuzz=100pt % Make TeX shut up.
+
+\PassOptionsToPackage{breaklinks=true}{hyperref}
+
+\LoadClassWithOptions{ltxdoc}
+\setlength\parindent{0pt}
+\setlength\parskip{\smallskipamount}
+\addtolength\marginparwidth{15pt}
+\setlength\leftmargini{2em}% default = 2.5em
+
+\renewcommand\partname{Part}
+
+\RequirePackage{ifpdf}
+\ifpdf
+ \RequirePackage{mathptmx,courier}
+ \RequirePackage[scaled=0.90]{helvet}
+\fi
+
+\RequirePackage{hypdoc}
+\ifpdf\RequirePackage{hypdestopt}\fi
+\hypersetup{pdfstartpage={},pdfstartview={}}
+\hypersetup{breaklinks=true}
+\let\subsectionautorefname\sectionautorefname
+\let\subsubsectionautorefname\sectionautorefname
+
+\DeclareRobustCommand*\eTeX{\leavevmode\hbox{$\varepsilon$}-\TeX}
+
+\DeclareRobustCommand*\AmS{\texorpdfstring
+ {{\protect\usefont{OMS}{cmsy}{m}{n}A\kern-.1667em\lower.5ex\hbox{M}\kern-.125emS}}%
+ {AMS}}
+\DeclareRobustCommand*\KOMAScript{\textsf{K\kern.05em O\kern.05em M\kern.05em A\kern.1em-\kern.1em Script}}
+\DeclareRobustCommand*\NTG{NTG}
+\DeclareRobustCommand*\SmF{SMF}
+
+\newcommand*\NEWfeature{\NEW{New feature}}
+\newcommand*\NEWdescription{\NEW{New description}}
+\newcommand*\NEW[1]{\@ifstar{\@NEW{#1}{\vskip2pt}}{\@NEW{#1}{}}}
+\newcommand*\@NEW[3]{\MARGINSYM{#2\footnotesize#1\\#3}}
+\newcommand*\MARGINSYM[1]{\hskip 1sp \marginpar{\raggedleft\textcolor{blue}{{#1}}}}
+
+\newcommand*\LineBreak{\linebreak[3]}
+\newcommand*\PageBreak{\pagebreak[3]}
+
+\newcommand*\longref{\@ifstar{\@longref\ref}{\@longref\autoref}}
+\newcommand*\Longref{\@ifstar{\@longref\Ref}{\@longref\Autoref}}
+\def\@longref#1#2{#1{#2}: \textit{\nameref{#2}}}
+
+\newcommand*\See[1]{\nopagebreak{\small (See #1)}}
+
+\newenvironment{Options}[1]%
+ {\list{}{\renewcommand\makelabel[1]{\texttt{##1}\hfil}%
+ \settowidth\labelwidth{\texttt{#1\space}}%
+ \setlength\leftmargin{10pt}%
+ \addtolength\leftmargin{\labelwidth}%
+ \addtolength\leftmargin{\labelsep}}}%
+ {\endlist}
+
+\newcommand*\purerm[1]{{\upshape\mdseries\rmfamily #1}}
+\newcommand*\puresf[1]{{\upshape\mdseries\sffamily #1}}
+\newcommand*\purett[1]{{\upshape\mdseries\ttfamily #1}}
+\let\cls\puresf \let\pkg\puresf
+\let\env\purett \let\opt\purett
+
+\newcommand*\csmarg[1]{\texttt{\char`\{#1\char`\}}}
+\newcommand*\csoarg[1]{\texttt{\char`\[#1\char`\]}}
+\newcommand*\issue[2][GitLab]{#1 issue~\##2}
+\newcommand*\version[2][]{v$#2$}
+\newcommand*\changenote[1]{}
+
+\RequirePackage{marvosym}
+\newcommand*\INFO{\@ifstar{\@INFO{}}{\@INFO{\vbox to \ht\strutbox}}}
+\newcommand*\@INFO[1]{\MARGINSYM{#1{\LARGE\Info}}}
+
+\RequirePackage[alpine]{ifsym}
+\newenvironment{background}{\par\bigskip\csname background*\endcsname}{\csname endbackground*\endcsname}
+\newenvironment{background*}{\small\MARGINSYM{\Mountain}\ignorespaces}{\par}
+
+\RequirePackage[bottom]{footmisc}
+
+\endinput
+
diff --git a/macros/latex/contrib/profcollege/doc/ProfCollege-doc.pdf b/macros/latex/contrib/profcollege/doc/ProfCollege-doc.pdf
index 08d43af5fa..b804c418cc 100644
--- a/macros/latex/contrib/profcollege/doc/ProfCollege-doc.pdf
+++ b/macros/latex/contrib/profcollege/doc/ProfCollege-doc.pdf
Binary files differ
diff --git a/macros/latex/contrib/profcollege/latex/LogoNumberHive.png b/macros/latex/contrib/profcollege/latex/LogoNumberHive.png
new file mode 100644
index 0000000000..0ea4267931
--- /dev/null
+++ b/macros/latex/contrib/profcollege/latex/LogoNumberHive.png
Binary files differ
diff --git a/macros/latex/contrib/profcollege/latex/PfCCalculatrice.tex b/macros/latex/contrib/profcollege/latex/PfCCalculatrice.tex
index b6d70fe28e..79ffe0f582 100644
--- a/macros/latex/contrib/profcollege/latex/PfCCalculatrice.tex
+++ b/macros/latex/contrib/profcollege/latex/PfCCalculatrice.tex
@@ -110,10 +110,13 @@
\def\MPCalculatrice#1#2#3{
% #1 Calcul %2 r\'eponse
\ifluatex
+ \mplibnumbersystem{double}
\mplibforcehmode%
\begin{mplibcode}%
input PfCCalculatrice;
LargeurEcran:=\useKV[ClesCalculatrice]{Largeur};
+ boolean Calcul;
+ Calcul=\useKV[ClesCalculatrice]{Calcul};
LCD(#1)(#2)(#3);
\end{mplibcode}
\else
@@ -123,15 +126,23 @@
\fi
}
-\setKVdefault[ClesCalculatrice]{Ecran=false,NbLignes=0,BL=0.775,Largeur=120}
+\setKVdefault[ClesCalculatrice]{Ecran=false,NbLignes=0,BL=0.775,Largeur=120,Calcul=false}
+
+\newtoks\toklistenombrecalculatrice
+\def\UpdatetoksCalculatrice#1\nil{\addtotok\toklistenombrecalculatrice{"\fpeval{#1}"}}
\newcommand\Calculatrice[2][]{%
\setstackgap{L}{\useKV[ClesCalculatrice]{BL}\baselineskip}%
\useKVdefault[ClesCalculatrice]%
\setKV[ClesCalculatrice]{#1}%
\ifboolKV[ClesCalculatrice]{Ecran}{%
- \setsepchar[*]{,*/}%
- \readlist\ListeCalc{#2}%
+ \ifboolKV[ClesCalculatrice]{Calcul}{%
+ \setsepchar[*]{,*§}%
+ \readlist\ListeCalc{#2}%
+ }{%
+ \setsepchar[*]{,*/}%
+ \readlist\ListeCalc{#2}%
+ }%
\MPCalculatrice{\ListeCalc[1,1]}{\ListeCalc[1,2]}{\useKV[ClesCalculatrice]{NbLignes}}%
}{%
\setsepchar[*]{,*/}%
diff --git a/macros/latex/contrib/profcollege/latex/PfCCalculsFractions.tex b/macros/latex/contrib/profcollege/latex/PfCCalculsFractions.tex
index 94e3a8d120..2e6ff56149 100644
--- a/macros/latex/contrib/profcollege/latex/PfCCalculsFractions.tex
+++ b/macros/latex/contrib/profcollege/latex/PfCCalculsFractions.tex
@@ -1,4 +1,5 @@
-\setKVdefault[CalculsFractions]{Couleur=Crimson}
+\setKVdefault[CalculsFractions]{Couleurs=false}
+\defKV[CalculsFractions]{Couleur=\setKV[CalculsFractions]{Couleurs}}
\NewDocumentCommand\tofrac{m}{%
\IfDecimal{#1}{#1}{%
@@ -11,6 +12,7 @@
\NewDocumentCommand\AddFraction{soommo}{%
\useKVdefault[CalculsFractions]%
\setKV[CalculsFractions]{#2}%
+ \ifboolKV[CalculsFractions]{Couleurs}{\colorlet{CouleurDenoCom}{\useKV[CalculsFractions]{Couleur}}}{\colorlet{CouleurDenoCom}{black}}%
\IfBooleanTF{#1}{%
\xdef\PfCFractionOp{-}%
}{%
@@ -55,13 +57,13 @@
\else%
\ifnum#3=1\relax%
\ifnum\PfCPremierMul>1\relax%
- \frac{\ListeFractions[1,1]_{\times\num{\PfCPremierMul}}}{\ListeFractions[1,2]_{\times\num{\PfCPremierMul}}}
+ \frac{\ListeFractions[1,1]_{\mathcolor{CouleurDenoCom}{\times\num{\PfCPremierMul}}}}{\ListeFractions[1,2]_{\mathcolor{CouleurDenoCom}{\times\num{\PfCPremierMul}}}}
\else%
\tofrac{#4}%
\fi%
\PfCFractionOp%
\ifnum\PfCDeuxiemeMul>1\relax%
- \frac{\ListeFractions[2,1]_{\times\num{\PfCDeuxiemeMul}}}{\ListeFractions[2,2]_{\times\num{\PfCDeuxiemeMul}}}%
+ \frac{\ListeFractions[2,1]_{\mathcolor{CouleurDenoCom}{\times\num{\PfCDeuxiemeMul}}}}{\ListeFractions[2,2]_{\mathcolor{CouleurDenoCom}{\times\num{\PfCDeuxiemeMul}}}}%
\else%
\tofrac{#5}%
\fi%
diff --git a/macros/latex/contrib/profcollege/latex/PfCCartesJeux.tex b/macros/latex/contrib/profcollege/latex/PfCCartesJeux.tex
index 16a60d4a46..2871666b40 100644
--- a/macros/latex/contrib/profcollege/latex/PfCCartesJeux.tex
+++ b/macros/latex/contrib/profcollege/latex/PfCCartesJeux.tex
@@ -4,10 +4,17 @@
\setKVdefault[Cards]{Largeur=59,Hauteur=89,HauteurTheme=15,Marge=4,Landscape=false,Couleur=Cornsilk,Theme=Th\'eor\`eme\\de
Pythagore,ThemeSol=Solution,AfficheTheme=false,Trame=false,Jointes=false,TrameVisible=false,RayonArc=5pt,Titre=false,NomTitre=Jeu 1,Loop,JaiQuia=false,Eleve=false,BackgroundAv=false,BackgroundAr=false,ImageAv=4813762.jpg,ImageAr=4813762.jpg,AffichageSolution=true,SolutionSeule=false,%
% Pour la boite
- NbCartes=16,TypeJeu=Boucle,Niveau=1,Numero=1,ThemeJeu=Nombres relatifs,CouleurTheme=black,CouleurNiveau=black,CouleurType=black,CouleurNb=black,
+ ANbCartes=false,ATypeJeu=false,ANiveau=false,ANumero=false,AThemeJeu=false,CouleurTheme=black,CouleurNiveau=black,CouleurType=black,CouleurNb=black,
% Pour le trivial
Trivial=false,Symboles={\faInfinity,\faSignal,\faProjectDiagram,\faHiking,\faRuler,\faLockOpen}
}%
+% Pour moduler l'affichage de textes sur la boite.
+\defKV[Cards]{NbCartes=\setKV[Cards]{ANbCartes}}%
+\defKV[Cards]{TypeJeu=\setKV[Cards]{ATypeJeu}}%
+\defKV[Cards]{Niveau=\setKV[Cards]{ANiveau}}%
+\defKV[Cards]{Numero=\setKV[Cards]{ANumero}}%
+\defKV[Cards]{ThemeJeu=\setKV[Cards]{AThemeJeu}}%
+%
\defKV[Cards]{ThemeJaiQuiA=\setKV[Cards]{AfficheTheme}}%
%
\newtcolorbox{Mybox}[3]{%
@@ -586,7 +593,7 @@
\def\BuildBoiteCartesCCCode{%
Longueur=10cm;
Largeur=7cm;
- Epaisseur=\useKV[Cards]{NbCartes}*1mm;
+ Epaisseur=if \useKV[Cards]{ANbCartes}:\useKV[Cards]{NbCartes}*1mm else: 16mm fi;
pair A[],B[],C[],D[];
A0=(0,0);
A1-A0=Epaisseur*(1,0);
@@ -644,6 +651,8 @@
\mplibforcehmode
\begin{mplibcode}
\BuildBoiteCartesCCCode;
+ boolean AThemeJeu;
+ AThemeJeu=\useKV[Cards]{AThemeJeu};
%
trace chemin(A11,A12,A13,A0);
trace chemin(D9,A11,A0,1/3[A1,A2]);
@@ -688,15 +697,31 @@
trace polygone(D18,D17,D20,D19);
trace chemin(1/3[D18,D17],D18,D19,D20,D17,2/3[D18,D17]);
% label
- drawoptions(withcolor \useKV[Cards]{CouleurTheme});
- label(btex \bfseries\Large\useKV[Cards]{ThemeJeu} etex,M2);
+ if AThemeJeu:
+% drawoptions(withcolor \useKV[Cards]{CouleurTheme});
+ label(TEX("\bfseries\Large\useKV[Cards]{ThemeJeu}"),M2);
+ drawoptions();
+ fi;
+ if \useKV[Cards]{ANiveau}:
+ drawoptions(withcolor \useKV[Cards]{CouleurNiveau});
+ label(TEX("\bfseries Niveau \useKV[Cards]{Niveau}"),M3);
+ drawoptions();
+ fi;
+ if \useKV[Cards]{ANumero}:
drawoptions(withcolor \useKV[Cards]{CouleurNiveau});
- label(btex \bfseries Niveau \useKV[Cards]{Niveau} etex,M3);
- label(btex \bfseries Jeu \useKV[Cards]{Numero} etex,M4);
+ label(TEX("\bfseries Jeu \useKV[Cards]{Numero}"),M4);
+ drawoptions();
+ fi;
+ if \useKV[Cards]{ANbCartes}:
drawoptions(withcolor \useKV[Cards]{CouleurNb});
- label(btex \bfseries\useKV[Cards]{NbCartes} cartes etex,M5);
+ label(TEX("\bfseries\useKV[Cards]{NbCartes} cartes"),M5);
+ drawoptions();
+ fi;
+ if \useKV[Cards]{ATypeJeu}:
drawoptions(withcolor \useKV[Cards]{CouleurType});
- label(btex \bfseries\Huge\useKV[Cards]{TypeJeu} etex,M1);
+ label(TEX("\bfseries\Huge\useKV[Cards]{TypeJeu}"),M1);
+ drawoptions();
+ fi;
\end{mplibcode}
\else
\begin{mpost}[mpsettings={\BuildBoiteCartesCCCode;}]
diff --git a/macros/latex/contrib/profcollege/latex/PfCCible.tex b/macros/latex/contrib/profcollege/latex/PfCCible.tex
new file mode 100644
index 0000000000..f59ec3d593
--- /dev/null
+++ b/macros/latex/contrib/profcollege/latex/PfCCible.tex
@@ -0,0 +1,225 @@
+%%%
+% Cibles
+%%%
+\newtoks\toklisteciblea%
+
+\def\UpdatetoksCibleA#1\nil{\addtotok\toklisteciblea{"#1",}}%
+
+\setKVdefault[Cible]{RayonBase=5mm,Ecart=5mm,Flechettes=false,RayonF=2.5cm,Impression=false}%
+
+\NewDocumentCommand\Cible{om}{%
+ \useKVdefault[Cible]%
+ \setKV[Cible]{#1}%
+ \toklisteciblea{}%
+ \xdef\PfCNombreZone{0}%
+ \ifboolKV[Cible]{Flechettes}{}{%
+ \setsepchar{,}%
+ \readlist*\PfCListeCible{#2}%
+ \foreachitem\compteur\in\PfCListeCible{\expandafter\UpdatetoksCibleA\compteur\nil}%
+ \xdef\PfCNombreZone{\PfCListeCiblelen}%
+ }%
+ \BuildCible{\the\toklisteciblea}%
+}%
+
+\NewDocumentCommand\BuildCible{m}{%
+ \ifluatex%
+ \mplibforcehmode%
+ \begin{mplibcode}
+ Rayon=\useKV[Cible]{RayonBase};
+ Ecart=\useKV[Cible]{Ecart};
+ boolean Flechettes,Impression;
+ Flechettes=\useKV[Cible]{Flechettes};
+ Impression=\useKV[Cible]{Impression};
+ NombreCercles=\PfCNombreZone;
+
+ vardef affichage(text t)=
+ pair O;
+ O=u*(5,5);
+ for k=NombreCercles downto 1:
+ if (k mod 2)=0:
+ fill cercles(O,Rayon+(k-1)*Ecart) withcolor 0.7white;
+ else:
+ fill cercles(O,Rayon+(k-1)*Ecart) withcolor white;
+ fi;
+ endfor;
+ for k=1 upto NombreCercles:
+ trace cercles(O,Rayon+(k-1)*Ecart);
+ endfor;
+ n:=0;
+ for p_=t:
+ n:=n+1;
+ if n=NombreCercles:
+ label(TEX(p_),O);
+ else:
+ label(TEX(p_),O+(NombreCercles+0.5-n)*(0,Ecart));
+ label(TEX(p_),O-(NombreCercles+0.5-n)*(0,Ecart));
+ fi;
+ endfor;
+ enddef;
+
+ vardef affichageflechettes=
+ pair O;
+ O=u*(5,5);
+ RayonBase=\useKV[Cible]{RayonF};
+ RayonA=(170/(0.5*451))*RayonBase;
+ RayonI=0.5*(RayonBase+RayonA);
+ RayonAa=(162/(0.5*451))*RayonBase;
+ RayonB=(107/(0.5*451))*RayonBase;
+ RayonBb=(99/(0.5*451))*RayonBase;
+ RayonC=(32/(0.5*451))*RayonBase;
+ RayonD=(12.7/(0.5*451))*RayonBase;
+ path cbase,ca,caa,cb,cbb,cc,cd;
+ cbase=cercles(O,RayonBase);
+ ca=cercles(O,RayonA);
+ caa=cercles(O,RayonAa);
+ cb=cercles(O,RayonB);
+ cbb=cercles(O,RayonBb);
+ cc=cercles(O,RayonC);
+ cd=cercles(O,RayonD);
+ fill cbase;
+ pair A[],Aa[],B[],Bb[],C[],D[],E[];
+ for k=1 upto 21:
+ A[k]=pointarc(ca,9+(k-1)*18);
+ Aa[k]=pointarc(caa,9+(k-1)*18);
+ B[k]=pointarc(cb,9+(k-1)*18);
+ Bb[k]=pointarc(cbb,9+(k-1)*18);
+ C[k]=pointarc(cc,9+(k-1)*18);
+ D[k]=pointarc(cd,9+(k-1)*18);
+ E[k]=pointarc(cercles(O,RayonI),(k-1)*18);
+ endfor;
+ for k=2 step 2 until 20:
+ fill O--A[k]--arccercle(A[k],A[k+1],O)--cycle withcolor white;
+ endfor;
+ for k=1 upto 20:
+ if (k mod 2)=1:
+ fill Aa[k]--A[k]--arccercle(A[k],A[k+1],O)--reverse(arccercle(Aa[k],Aa[k+1],O))--cycle withcolor if Impression:0.4white else: Crimson fi;
+ fill Bb[k]--B[k]--arccercle(B[k],B[k+1],O)--reverse(arccercle(Bb[k],Bb[k+1],O))--cycle withcolor if Impression:0.4white else: Crimson fi;
+ else:
+ fill Aa[k]--A[k]--arccercle(A[k],A[k+1],O)--reverse(arccercle(Aa[k],Aa[k+1],O))--cycle withcolor if Impression:0.8white else: LightGreen fi;
+ fill Bb[k]--B[k]--arccercle(B[k],B[k+1],O)--reverse(arccercle(Bb[k],Bb[k+1],O))--cycle withcolor if Impression:0.8white else: LightGreen fi;
+ fi;
+ endfor;
+ fill cc withcolor if Impression:0.8white else: LightGreen fi;
+ fill cd withcolor if Impression:0.4white else: Crimson fi;
+ trace ca withcolor white;
+ trace caa withcolor white;
+ trace cb withcolor white;
+ trace cbb withcolor white;
+ trace cc withcolor white;
+ trace cd withcolor white;
+ enddef;
+
+ vardef affichagetexteflechettes(text t)=
+ drawoptions(withcolor white);
+ n:=0;
+ for p_=t:
+ n:=n+1;
+ label(TEX("\bfseries "&p_),E[n]);
+ endfor;
+ enddef;
+
+ if Flechettes:
+ affichageflechettes;
+ affichagetexteflechettes("6","13","4","18","1","20","5","12","9","14","11","8","16","7","19","3","17","2","15","10");
+ else:
+ affichage(#1);
+ fi;
+ \end{mplibcode}
+ \else
+ \begin{mpost}[mpsettings={Rayon=\useKV[Cible]{RayonBase};Ecart=\useKV[Cible]{Ecart};boolean Flechettes,Impression;Flechettes=\useKV[Cible]{Flechettes};Impression=\useKV[Cible]{Impression};NombreCercles=\PfCNombreZone;}]
+
+ vardef affichage(text t)=
+ pair O;
+ O=u*(5,5);
+ for k=NombreCercles downto 1:
+ if (k mod 2)=0:
+ fill cercles(O,Rayon+(k-1)*Ecart) withcolor 0.7white;
+ else:
+ fill cercles(O,Rayon+(k-1)*Ecart) withcolor white;
+ fi;
+ endfor;
+ for k=1 upto NombreCercles:
+ trace cercles(O,Rayon+(k-1)*Ecart);
+ endfor;
+ n:=0;
+ for p_=t:
+ n:=n+1;
+ if n=NombreCercles:
+ label(LATEX(p_),O);
+ else:
+ label(LATEX(p_),O+(NombreCercles+0.5-n)*(0,Ecart));
+ label(LATEX(p_),O-(NombreCercles+0.5-n)*(0,Ecart));
+ fi;
+ endfor;
+ enddef;
+
+ vardef affichageflechettes=
+ pair O;
+ O=u*(5,5);
+ RayonBase=\useKV[Cible]{RayonF};
+ RayonA=(170/(0.5*451))*RayonBase;
+ RayonI=0.5*(RayonBase+RayonA);
+ RayonAa=(162/(0.5*451))*RayonBase;
+ RayonB=(107/(0.5*451))*RayonBase;
+ RayonBb=(99/(0.5*451))*RayonBase;
+ RayonC=(32/(0.5*451))*RayonBase;
+ RayonD=(12.7/(0.5*451))*RayonBase;
+ path cbase,ca,caa,cb,cbb,cc,cd;
+ cbase=cercles(O,RayonBase);
+ ca=cercles(O,RayonA);
+ caa=cercles(O,RayonAa);
+ cb=cercles(O,RayonB);
+ cbb=cercles(O,RayonBb);
+ cc=cercles(O,RayonC);
+ cd=cercles(O,RayonD);
+ fill cbase;
+ pair A[],Aa[],B[],Bb[],C[],D[],E[];
+ for k=1 upto 21:
+ A[k]=pointarc(ca,9+(k-1)*18);
+ Aa[k]=pointarc(caa,9+(k-1)*18);
+ B[k]=pointarc(cb,9+(k-1)*18);
+ Bb[k]=pointarc(cbb,9+(k-1)*18);
+ C[k]=pointarc(cc,9+(k-1)*18);
+ D[k]=pointarc(cd,9+(k-1)*18);
+ E[k]=pointarc(cercles(O,RayonI),(k-1)*18);
+ endfor;
+ for k=2 step 2 until 20:
+ fill O--A[k]--arccercle(A[k],A[k+1],O)--cycle withcolor white;
+ endfor;
+ for k=1 upto 20:
+ if (k mod 2)=1:
+ fill Aa[k]--A[k]--arccercle(A[k],A[k+1],O)--reverse(arccercle(Aa[k],Aa[k+1],O))--cycle withcolor if Impression:0.4white else: Crimson fi;
+ fill Bb[k]--B[k]--arccercle(B[k],B[k+1],O)--reverse(arccercle(Bb[k],Bb[k+1],O))--cycle withcolor if Impression:0.4white else: Crimson fi;
+ else:
+ fill Aa[k]--A[k]--arccercle(A[k],A[k+1],O)--reverse(arccercle(Aa[k],Aa[k+1],O))--cycle withcolor if Impression:0.8white else: LightGreen fi;
+ fill Bb[k]--B[k]--arccercle(B[k],B[k+1],O)--reverse(arccercle(Bb[k],Bb[k+1],O))--cycle withcolor if Impression:0.8white else: LightGreen fi;
+ fi;
+ endfor;
+ fill cc withcolor if Impression:0.8white else: LightGreen fi;
+ fill cd withcolor if Impression:0.4white else: Crimson fi;
+ trace ca withcolor white;
+ trace caa withcolor white;
+ trace cb withcolor white;
+ trace cbb withcolor white;
+ trace cc withcolor white;
+ trace cd withcolor white;
+ enddef;
+
+ vardef affichagetexteflechettes(text t)=
+ drawoptions(withcolor white);
+ n:=0;
+ for p_=t:
+ n:=n+1;
+ label(LATEX("\bfseries "&p_),E[n]);
+ endfor;
+ enddef;
+
+ if Flechettes:
+ affichageflechettes;
+ affichagetexteflechettes("6","13","4","18","1","20","5","12","9","14","11","8","16","7","19","3","17","2","15","10");
+ else:
+ affichage(#1);
+ fi;
+ \end{mpost}
+ \fi
+}% \ No newline at end of file
diff --git a/macros/latex/contrib/profcollege/latex/PfCCompteBon.tex b/macros/latex/contrib/profcollege/latex/PfCCompteBon.tex
index 1610cc9378..c61d8cf870 100644
--- a/macros/latex/contrib/profcollege/latex/PfCCompteBon.tex
+++ b/macros/latex/contrib/profcollege/latex/PfCCompteBon.tex
@@ -166,15 +166,15 @@
\fbox{\PfCCBListeTirage[1]} \xintFor* ##1 in{\xintSeq{2}{\useKV[CompteBon]{Plaques}}}\do{\qquad \fbox{\PfCCBListeTirage[##1]}}%
\end{center}
- \xdef\PfCCBListeRappels{\the\tokPfCCBRappels}
- \setsepchar[*]{,*=}\ignoreemptyitems
- \readlist*\PfCCBDecompositionEtapes{\PfCCBListeRappels}
- \reademptyitems
+ \xdef\PfCCBListeRappels{\the\tokPfCCBRappels}%
+ \setsepchar[*]{,*=}\ignoreemptyitems%
+ \readlist*\PfCCBDecompositionEtapes{\PfCCBListeRappels}%
+ \reademptyitems%
\ifboolKV[CompteBon]{Solution}{%
\begin{align*}
\xintFor* ##1 in{\xintSeq{1}{\fpeval{\useKV[CompteBon]{Plaques}-1}}}\do{
\StrSubstitute{\PfCCBDecompositionEtapes[##1,1]}{*}{\times}[\PfCCBAffiche]\PfCCBAffiche&=\PfCCBDecompositionEtapes[##1,2]\xintifForLast{\\}{}
- }
+ }%
\end{align*}
}{}%
}%
diff --git a/macros/latex/contrib/profcollege/latex/PfCDecomposerNombrePremier.tex b/macros/latex/contrib/profcollege/latex/PfCDecomposerNombrePremier.tex
index 6fab8783f9..a70b818b25 100644
--- a/macros/latex/contrib/profcollege/latex/PfCDecomposerNombrePremier.tex
+++ b/macros/latex/contrib/profcollege/latex/PfCDecomposerNombrePremier.tex
@@ -30,7 +30,8 @@
\def\MPArbre#1{%
\ifluatex
- \mplibforcehmode
+ \mplibforcehmode
+ \mplibnumbersystem{double}
\begin{mplibcode}
input PfCArithmetique;
numeric depart;
@@ -84,7 +85,8 @@
\def\MPArbreComplet#1{%
\ifluatex
- \mplibforcehmode
+ \mplibforcehmode
+ \mplibnumbersystem{double}
\begin{mplibcode}
input PfCArithmetique;
numeric depart;
@@ -120,7 +122,8 @@
\def\MPArbreVide#1{%
\ifluatex
- \mplibforcehmode
+ \mplibforcehmode
+ \mplibnumbersystem{double}
\begin{mplibcode}
input PfCArithmetique;
numeric depart;
@@ -153,7 +156,8 @@
\def\MPArbreDessine#1#2{%
\ifluatex%
- \mplibforcehmode%
+ \mplibforcehmode%
+ \mplibnumbersystem{double}
\begin{mplibcode}
input PfCArithmetique;
numeric depart;
diff --git a/macros/latex/contrib/profcollege/latex/PfCDistributivite.tex b/macros/latex/contrib/profcollege/latex/PfCDistributivite.tex
index a9c103ac85..b0d60d14e8 100644
--- a/macros/latex/contrib/profcollege/latex/PfCDistributivite.tex
+++ b/macros/latex/contrib/profcollege/latex/PfCDistributivite.tex
@@ -38,8 +38,8 @@
% y a dans un "seul calcul".
\setcounter{NbCalculDistri}{0}
-\setKVdefault[ClesDistributivite]{Cours=false,Etape=1,Lettre=x,Fleches=false,AideMul=false,Reduction=false,AideAdda=false,AideAddb=false,CouleurAide=red,CouleurReduction=black,CouleurFH=blue,CouleurFB=red,Somme=false,Difference=false,RAZ=false,Oppose=false,All=false,NomExpression=A,Fin=4,Numerique=false,Remarquable=false,Echange=0,Tuile=false,Vide=false,Reperes=false,Impression=false,Tableau=false}%,AideAdd=false:inutile ?
-
+\setKVdefault[ClesDistributivite]{Cours=false,Etape=1,Lettre=x,Fleches=false,AideMul=false,Reduction=false,AideAdda=false,AideAddb=false,CouleurAide=red,CouleurFH=blue,CouleurFB=red,Somme=false,Difference=false,RAZ=false,Oppose=false,All=false,NomExpression=A,Fin=4,Numerique=false,Remarquable=false,Echange=0,Tuile=false,Vide=false,Reperes=false,Impression=false,Tableau=false}%,AideAdd=false:inutile ?
+\defKV[ClesDistributivite]{CouleurReduction=\colorlet{DCReduction}{#1}\setKV[ClesDistributivite]{Reduction}}%
\newcommand\Tuile[4]{%
\ifluatex
\mplibforcehmode
@@ -452,13 +452,14 @@
\xdef\SommeC{0}%
\newcommand\Distri[5][]{%
+ \colorlet{DCReduction}{black}%
\useKVdefault[ClesDistributivite]%obligatoire car la macro n'est pas dans un groupe.
\setKV[ClesDistributivite]{#1}%On lit les arguments optionnels
\ifboolKV[ClesDistributivite]{RAZ}{\xdef\SommeA{0}\xdef\SommeB{0}\xdef\SommeC{0}%
\setcounter{NbCalculDistri}{0}%
}{}%
\colorlet{DCAide}{\useKV[ClesDistributivite]{CouleurAide}}%
- \colorlet{DCReduction}{\useKV[ClesDistributivite]{CouleurReduction}}%
+% \colorlet{DCReduction}{\useKV[ClesDistributivite]{CouleurReduction}}%
\colorlet{DCFlechesh}{\useKV[ClesDistributivite]{CouleurFH}}%
\colorlet{DCFlechesb}{\useKV[ClesDistributivite]{CouleurFB}}%
\ifboolKV[ClesDistributivite]{Cours}{%
@@ -778,6 +779,7 @@
}%
\newcommand\DistriEchange[5][]{%
+ \colorlet{DCReduction}{black}
\ensuremath{%
\useKVdefault[ClesDistributivite]%
\setKV[ClesDistributivite]{#1}%
@@ -785,7 +787,7 @@
\setcounter{NbCalculDistri}{0}%
}{}%
\colorlet{DCAide}{\useKV[ClesDistributivite]{CouleurAide}}%
- \colorlet{DCReduction}{\useKV[ClesDistributivite]{CouleurReduction}}%
+% \colorlet{DCReduction}{\useKV[ClesDistributivite]{CouleurReduction}}%
\colorlet{DCFlechesh}{\useKV[ClesDistributivite]{CouleurFH}}%
\colorlet{DCFlechesb}{\useKV[ClesDistributivite]{CouleurFB}}%
\ifboolKV[ClesDistributivite]{Remarquable}{%
diff --git a/macros/latex/contrib/profcollege/latex/PfCEcritureLettres.tex b/macros/latex/contrib/profcollege/latex/PfCEcritureLettres.tex
index 650847b21c..a2cd50db02 100644
--- a/macros/latex/contrib/profcollege/latex/PfCEcritureLettres.tex
+++ b/macros/latex/contrib/profcollege/latex/PfCEcritureLettres.tex
@@ -1,6 +1,3 @@
-
-
-
%%%
% Ecriture des nombres en lettres
%%%
diff --git a/macros/latex/contrib/profcollege/latex/PfCGrimuku.tex b/macros/latex/contrib/profcollege/latex/PfCGrimuku.tex
new file mode 100644
index 0000000000..81e667533a
--- /dev/null
+++ b/macros/latex/contrib/profcollege/latex/PfCGrimuku.tex
@@ -0,0 +1,222 @@
+%%%
+% Grimuku
+%%%
+\setKVdefault[Grimuku]{TLargeur=7,Solution=false,Largeur=30pt,CouleurCase=0.7white}%
+\defKV[Grimuku]{CouleurSolution=\setKV[Grimuku]{Solution}}%
+
+\newtoks\toklistegrimukupdt
+\newtoks\toklistegrimukunb
+
+\def\UpdatetoksGrimCases#1/#2/#3/#4\nil{\addtotok\toklistegrimukunb{"*",}\addtotok\toklistegrimukupdt{"#1",}\addtotok\toklistegrimukupdt{"#2",}\addtotok\toklistegrimukupdt{"#3",}\addtotok\toklistegrimukupdt{"#4",}}%
+\def\UpdatetoksGrimCasesNb#1\nil{\addtotok\toklistegrimukunb{"#1",}\addtotok\toklistegrimukupdt{"",}\addtotok\toklistegrimukupdt{"",}\addtotok\toklistegrimukupdt{"",}\addtotok\toklistegrimukupdt{"",}}%
+
+\NewDocumentCommand\Grimuku{om}{%
+ \toklistegrimukunb{}%
+ \toklistegrimukupdt{}%
+ \useKVdefault[Grimuku]%
+ \setKV[Grimuku]{#1}%
+ \setsepchar[*]{,*/}\reademptyitems%
+ \readlist*\ListeCasesGrim{#2}%
+ \xdef\PfCGrimLargeur{\useKV[Grimuku]{TLargeur}}%
+ \xdef\PfCGrimHauteur{\fpeval{\ListeCasesGrimlen/\PfCGrimLargeur}}%
+ \savecomparemode%
+ \comparestrict%
+ \foreachitem\compteur\in\ListeCasesGrim{%
+ \StrCount{\ListeCasesGrim[\compteurcnt]}{/}[\PfCTestLongueur]%
+ \xintifboolexpr{\PfCTestLongueur>0}{%
+ \expandafter\UpdatetoksGrimCases\compteur\nil%
+ }{%
+ \expandafter\UpdatetoksGrimCasesNb\compteur\nil%
+ }%
+ }%
+ \restorecomparemode%
+ \BuildGrimuku{\the\toklistegrimukupdt}{\the\toklistegrimukunb}%
+}%
+
+\NewDocumentCommand\BuildGrimuku{mm}{%
+ \ifluatex
+ \mplibforcehmode
+ \begin{mplibcode}
+ color CouleurSolution,CouleurCase;
+
+ boolean Solution;
+ Solution=\useKV[Grimuku]{Solution};
+ if Solution:
+ CouleurSolution=\useKV[Grimuku]{CouleurSolution};
+ fi;
+ Unite=\useKV[Grimuku]{Largeur};
+ Largeur=\useKV[Grimuku]{TLargeur};
+ Hauteur=\PfCGrimHauteur;
+
+ CouleurCase=\useKV[Grimuku]{CouleurCase};
+
+ path Base;
+ Base=(unitsquare scaled Unite) shifted ((0,0)-(Unite/2,Unite/2));
+
+
+ vardef TraceFleche(expr a,b,c)=
+ if a="g":
+ drawarrow (Unite*(b-0.4,c))--(Unite*(b-0.75,c));
+ elseif a="gh":
+ drawarrow (Unite*(b-0.4,c))--(Unite*(b-0.6,c))--(Unite*(b-0.6,c+0.5));
+ elseif a="gb":
+ drawarrow (Unite*(b-0.4,c))--(Unite*(b-0.6,c))--(Unite*(b-0.6,c-0.5));
+ elseif a="d":
+ drawarrow (Unite*(b+0.4,c))--(Unite*(b+0.75,c));
+ elseif a="dh":
+ drawarrow (Unite*(b+0.4,c))--(Unite*(b+0.6,c))--(Unite*(b+0.6,c+0.5));
+ elseif a="db":
+ drawarrow (Unite*(b+0.4,c))--(Unite*(b+0.6,c))--(Unite*(b+0.6,c-0.5));
+ elseif a="h":
+ drawarrow (Unite*(b,c+0.15))--(Unite*(b,c+0.5));
+ elseif a="hd":
+ drawarrow (Unite*(b,c+0.15))--(Unite*(b,c+0.35))--(Unite*(b+0.5,c+0.35));
+ elseif a="hg":
+ drawarrow (Unite*(b,c+0.15))--(Unite*(b,c+0.35))--(Unite*(b-0.5,c+0.35));
+ elseif a="b":
+ drawarrow (Unite*(b,c-0.15))--(Unite*(b,c-0.5));
+ elseif a="bd":
+ drawarrow (Unite*(b,c-0.15))--(Unite*(b,c-0.35))--(Unite*(b+0.5,c-0.35));
+ elseif a="bg":
+ drawarrow (Unite*(b,c-0.15))--(Unite*(b,c-0.35))--(Unite*(b-0.5,c-0.35));
+ fi;
+ enddef;
+
+ vardef EcritureProduits(text t)=
+ n:=0;
+ m:=-1;
+ for p_=t:
+ q:=n div Largeur;
+ r:=n mod Largeur;
+ m:=m+1;
+ if (m mod 4)=0:
+ label(TEX(p_),Unite*(r,-q+0.25));
+ elseif (m mod 4)=1:
+ TraceFleche(p_,r,-q+0.25);
+ elseif (m mod 4)=2:
+ label(TEX(p_),Unite*(r,-q-0.25));
+ elseif (m mod 4)=3:
+ TraceFleche(p_,r,-q-0.25);
+ n:=n+1;
+ fi;
+ endfor;
+ enddef;
+
+ vardef Ecriture(text t)=
+ n=0;
+ for p_=t:
+ q:=n div Largeur;
+ r:=n mod Largeur;
+ if p_="*":
+ fill (Base shifted (Unite*(r,-q))) withcolor CouleurCase;
+ draw (Unite*(r-0.5,-q))--(Unite*(r+0.5,-q));
+ else:
+ if Solution:
+ drawoptions(withcolor CouleurSolution);
+ label(TEX(p_),Unite*(r,-q));
+ drawoptions();
+ fi;
+ fi;
+ n:=n+1;
+ endfor;
+ enddef;
+
+ Ecriture(#2);
+ EcritureProduits(#1);
+ % On quadrille
+ for k=0 upto Largeur-1:
+ for l=0 upto Hauteur-1:
+ trace Base shifted(Unite*(k,-l));
+ endfor;
+ endfor;
+ \end{mplibcode}
+ \else
+ \begin{mpost}[mpsettings={color CouleurSolution,CouleurCase;boolean Solution;Solution=\useKV[Grimuku]{Solution}; if Solution:
+ CouleurSolution=\useKV[Grimuku]{CouleurSolution};
+ fi;
+ Unite=\useKV[Grimuku]{Largeur};
+ Largeur=\useKV[Grimuku]{TLargeur};
+ Hauteur=\PfCGrimHauteur;
+ CouleurCase=\useKV[Grimuku]{CouleurCase};
+ };]
+ path Base;
+ Base=(unitsquare scaled Unite) shifted ((0,0)-(Unite/2,Unite/2));
+ %
+ vardef TraceFleche(expr a,b,c)=
+ if a="g":
+ drawarrow (Unite*(b-0.4,c))--(Unite*(b-0.75,c));
+ elseif a="gh":
+ drawarrow (Unite*(b-0.4,c))--(Unite*(b-0.6,c))--(Unite*(b-0.6,c+0.5));
+ elseif a="gb":
+ drawarrow (Unite*(b-0.4,c))--(Unite*(b-0.6,c))--(Unite*(b-0.6,c-0.5));
+ elseif a="d":
+ drawarrow (Unite*(b+0.4,c))--(Unite*(b+0.75,c));
+ elseif a="dh":
+ drawarrow (Unite*(b+0.4,c))--(Unite*(b+0.6,c))--(Unite*(b+0.6,c+0.5));
+ elseif a="db":
+ drawarrow (Unite*(b+0.4,c))--(Unite*(b+0.6,c))--(Unite*(b+0.6,c-0.5));
+ elseif a="h":
+ drawarrow (Unite*(b,c+0.15))--(Unite*(b,c+0.5));
+ elseif a="hd":
+ drawarrow (Unite*(b,c+0.15))--(Unite*(b,c+0.35))--(Unite*(b+0.5,c+0.35));
+ elseif a="hg":
+ drawarrow (Unite*(b,c+0.15))--(Unite*(b,c+0.35))--(Unite*(b-0.5,c+0.35));
+ elseif a="b":
+ drawarrow (Unite*(b,c-0.15))--(Unite*(b,c-0.5));
+ elseif a="bd":
+ drawarrow (Unite*(b,c-0.15))--(Unite*(b,c-0.35))--(Unite*(b+0.5,c-0.35));
+ elseif a="bg":
+ drawarrow (Unite*(b,c-0.15))--(Unite*(b,c-0.35))--(Unite*(b-0.5,c-0.35));
+ fi;
+ enddef;
+ %
+ vardef EcritureProduits(text t)=
+ n:=0;
+ m:=-1;
+ for p_=t:
+ q:=n div Largeur;
+ r:=n mod Largeur;
+ m:=m+1;
+ if (m mod 4)=0:
+ label(LATEX(p_),Unite*(r,-q+0.25));
+ elseif (m mod 4)=1:
+ TraceFleche(p_,r,-q+0.25);
+ elseif (m mod 4)=2:
+ label(LATEX(p_),Unite*(r,-q-0.25));
+ elseif (m mod 4)=3:
+ TraceFleche(p_,r,-q-0.25);
+ n:=n+1;
+ fi;
+ endfor;
+ enddef;
+ %
+ vardef Ecriture(text t)=
+ n=0;
+ for p_=t:
+ q:=n div Largeur;
+ r:=n mod Largeur;
+ if p_="*":
+ fill (Base shifted (Unite*(r,-q))) withcolor CouleurCase;
+ draw (Unite*(r-0.5,-q))--(Unite*(r+0.5,-q));
+ else:
+ if Solution:
+ drawoptions(withcolor CouleurSolution);
+ label(LATEX(p_),Unite*(r,-q));
+ drawoptions();
+ fi;
+ fi;
+ n:=n+1;
+ endfor;
+ enddef;
+
+ Ecriture(#2);
+ EcritureProduits(#1);
+ % On quadrille
+ for k=0 upto Largeur-1:
+ for l=0 upto Hauteur-1:
+ trace Base shifted(Unite*(k,-l));
+ endfor;
+ endfor;
+ \end{mpost}
+ \fi
+} \ No newline at end of file
diff --git a/macros/latex/contrib/profcollege/latex/PfCHorloge.tex b/macros/latex/contrib/profcollege/latex/PfCHorloge.tex
new file mode 100644
index 0000000000..1133714ecd
--- /dev/null
+++ b/macros/latex/contrib/profcollege/latex/PfCHorloge.tex
@@ -0,0 +1,215 @@
+%%%
+% Horloges
+%%%
+\setKVdefault[ClesHorloge]{Aiguilles,Numerique=false,Secondes,Cadre,Rayon=1,Impression=false}
+
+\NewDocumentCommand\Horloge{ }{%On désactive les :
+ \begingroup
+ \catcode`\:12
+ \Horlogeaux
+}%
+
+\NewDocumentCommand\Horlogeaux{om}{%
+ \endgroup
+ \useKVdefault[ClesHorloge]
+ \setKV[ClesHorloge]{#1}
+ \ifx\bla#2\bla
+ \timenow
+ \ifboolKV[ClesHorloge]{Numerique}{%
+ \MPAfficheurNew{\PfCTimeHeure}{\PfCTimeMinute}{0}%
+ }{%
+ \MPHorlogeNew{\PfCTimeHeure}{\PfCTimeMinute}{0}%
+ }%
+ \else
+ \setsepchar{:}%
+ \readlist*\PfCTime{#2}%
+ \ifboolKV[ClesHorloge]{Numerique}{%
+ \ifnum\PfCTimelen=1\relax
+ \MPAfficheurNew{\PfCTime[1]}{0}{0}%
+ \else
+ \ifnum\PfCTimelen=2\relax
+ \MPAfficheurNew{\PfCTime[1]}{\PfCTime[2]}{0}%
+ \else
+ \MPAfficheurNew{\PfCTime[1]}{\PfCTime[2]}{\PfCTime[3]}%
+ \fi
+ \fi
+ }{%
+ \ifnum\PfCTimelen=1\relax
+ \MPHorlogeNew{\PfCTime[1]}{0}{0}%
+ \else
+ \ifnum\PfCTimelen=2\relax
+ \MPHorlogeNew{\PfCTime[1]}{\PfCTime[2]}{0}%
+ \else
+ \MPHorlogeNew{\PfCTime[1]}{\PfCTime[2]}{\PfCTime[3]}%
+ \fi
+ \fi
+ }%
+ \fi%
+}%
+
+\makeatletter
+\def\timenow{\@tempcnta\time\relax
+ \@tempcntb\@tempcnta\relax
+ \divide\@tempcntb60\relax
+ \edef\PfCTimeHeure{\fpeval{\@tempcntb}}%
+ \multiply\@tempcntb60\relax
+ \advance\@tempcnta-\@tempcntb\relax
+ \edef\PfCTimeMinute{\fpeval{\@tempcnta}}%
+}\relax
+\makeatother
+
+\def\MPAfficheurNew#1#2#3{%
+ \ifluatex
+ \mplibforcehmode
+ \begin{mplibcode}
+ boolean Secondes,Impression;
+ Secondes=\useKV[ClesHorloge]{Secondes};
+ Impression=\useKV[ClesHorloge]{Impression};
+ if Impression:
+ LightSteelBlue:=0.9*white;
+ Crimson:=0.5*white;
+ fi;
+ u:=0.5u;
+ draw Afficheur(#1 div10,0);
+ draw Afficheur(#1 mod10,0) shifted(u*(1,0));
+ draw Afficheur(10,0) shifted(u*(2,0));
+ draw Afficheur(#2 div10,0) shifted(u*(3,0));
+ draw Afficheur(#2 mod10,0) shifted(u*(4,0));
+ if Secondes:
+ draw Afficheur(10,0) shifted(u*(5,0));
+ draw Afficheur(#3 div10,0) shifted(u*(6,0));
+ draw Afficheur(#3 mod10,0) shifted(u*(7,0));
+ fi;
+ \end{mplibcode}
+ \else
+ \begin{mpost}[mpsettings={boolean Secondes;Secondes=\useKV[ClesHorloge]{Secondes};}]
+ u:=0.5u;
+ draw Afficheur(#1 div10,0);
+ draw Afficheur(#1 mod10,0) shifted(u*(1,0));
+ draw Afficheur(10,0) shifted(u*(2,0));
+ draw Afficheur(#2 div10,0) shifted(u*(3,0));
+ draw Afficheur(#2 mod10,0) shifted(u*(4,0));
+ if Secondes:
+ draw Afficheur(10,0) shifted(u*(5,0));
+ draw Afficheur(#3 div10,0) shifted(u*(6,0));
+ draw Afficheur(#3 mod10,0) shifted(u*(7,0));
+ fi;
+ \end{mpost}
+ \fi
+}
+
+\def\MPHorlogeNew#1#2#3{
+ \ifluatex
+ \mplibforcehmode
+ \begin{mplibcode}
+ boolean Secondes,Aiguilles,Cadre;
+ Secondes=\useKV[ClesHorloge]{Secondes};
+ Aiguilles=\useKV[ClesHorloge]{Aiguilles};
+ Cadre=\useKV[ClesHorloge]{Cadre};
+ marque_horloge=\useKV[ClesHorloge]{Rayon};
+ save Hor;
+ picture Hor;
+ path gdeaig,pteaig,trot;
+ pair centrehorloge;
+ centrehorloge=(0,0);
+ path tourhorloge,toura;
+ tourhorloge=cercles(centrehorloge,marque_horloge*cm);
+ toura=cercles(centrehorloge,(marque_horloge+0.25)*cm);
+ Hor=image(
+ %% dessin du cadre
+ if Cadre:
+ pair A[];
+ draw cercles(centrehorloge,(marque_horloge+0.5)*cm) withpen pencircle scaled 1.5;
+ for k=1 upto 12:
+ A[k]=pointarc(toura,90-30*k);
+ label(TEX(decimal(k)),A[k]);
+ endfor;
+ fi;
+ %% dessin de l'horloge
+ draw tourhorloge;
+ for i=0 upto 59:
+ if (i mod 5)=0:
+ if (i mod 15)=0:
+ draw pointarc(tourhorloge,6*i)--(pointarc(tourhorloge,6*i) shifted (7*unitvector(centrehorloge-pointarc(tourhorloge,6*i)))) withpen pencircle scaled 2bp;
+ else:
+ draw pointarc(tourhorloge,6*i)--(pointarc(tourhorloge,6*i) shifted (5*unitvector(centrehorloge-pointarc(tourhorloge,6*i)))) withpen pencircle scaled 1.5bp;
+ fi;
+ else:
+ draw pointarc(tourhorloge,6*i)--(pointarc(tourhorloge,6*i) shifted (3*unitvector(centrehorloge-pointarc(tourhorloge,6*i))));
+ fi;
+ endfor;
+ path graduhorloge;
+ graduhorloge=cercles(centrehorloge,marque_horloge*cm+5*abs(unitvector(centrehorloge-pointarc(tourhorloge,0))));
+ %
+ marque_p:="plein";
+ pointe(centrehorloge);
+ marque_p:="rien";
+ %% placement des aiguilles
+ if Aiguilles:
+ gdeaig=centrehorloge--(pointarc(tourhorloge,0) shifted (7*unitvector(centrehorloge-pointarc(tourhorloge,0))));
+ pteaig=centrehorloge--(pointarc(tourhorloge,0) shifted (18*unitvector(centrehorloge-pointarc(tourhorloge,0))));
+ if Secondes:
+ trot=centrehorloge--(pointarc(tourhorloge,0) shifted (10*unitvector(centrehorloge-pointarc(tourhorloge,0))));
+ draw rotation(trot,centrehorloge,90-6*#3) withpen pencircle scaled0.4;
+ fi;
+ draw rotation(gdeaig,centrehorloge,90-6*#2) withpen pencircle scaled1.25;
+ draw rotation(pteaig,centrehorloge,90-30*(#1+#2/60)) withpen pencircle scaled 2bp;
+ fi;
+ );
+ draw Hor;
+\end{mplibcode}
+\else
+ \begin{mpost}[mpsettings={boolean Secondes,Aiguilles,Cadre;Secondes=\useKV[ClesHorloge]{Secondes};Aiguilles=\useKV[ClesHorloge]{Aiguilles};Cadre=\useKV[ClesHorloge]{Cadre};marque_horloge=\useKV[ClesHorloge]{Rayon};}]
+ save Hor;
+ picture Hor;
+ path gdeaig,pteaig,trot;
+ pair centrehorloge;
+ centrehorloge=(0,0);
+ path tourhorloge,toura;
+ tourhorloge=cercles(centrehorloge,marque_horloge*cm);
+ toura=cercles(centrehorloge,(marque_horloge+0.25)*cm);
+ Hor=image(
+ %% dessin du cadre
+ if Cadre:
+ pair A[];
+ draw cercles(centrehorloge,(marque_horloge+0.5)*cm) withpen pencircle scaled 1.5;
+ for k=1 upto 12:
+ A[k]=pointarc(toura,90-30*k);
+ label(LATEX(decimal(k)),A[k]);
+ endfor;
+ fi;
+ %% dessin de l'horloge
+ draw tourhorloge;
+ for i=0 upto 59:
+ if (i mod 5)=0:
+ if (i mod 15)=0:
+ draw pointarc(tourhorloge,6*i)--(pointarc(tourhorloge,6*i) shifted (7*unitvector(centrehorloge-pointarc(tourhorloge,6*i)))) withpen pencircle scaled 2bp;
+ else:
+ draw pointarc(tourhorloge,6*i)--(pointarc(tourhorloge,6*i) shifted (5*unitvector(centrehorloge-pointarc(tourhorloge,6*i)))) withpen pencircle scaled 1.5bp;
+ fi;
+ else:
+ draw pointarc(tourhorloge,6*i)--(pointarc(tourhorloge,6*i) shifted (3*unitvector(centrehorloge-pointarc(tourhorloge,6*i))));
+ fi;
+ endfor;
+ path graduhorloge;
+ graduhorloge=cercles(centrehorloge,marque_horloge*cm+5*abs(unitvector(centrehorloge-pointarc(tourhorloge,0))));
+ %
+ marque_p:="plein";
+ pointe(centrehorloge);
+ marque_p:="rien";
+ %% placement des aiguilles
+ if Aiguilles:
+ gdeaig=centrehorloge--(pointarc(tourhorloge,0) shifted (7*unitvector(centrehorloge-pointarc(tourhorloge,0))));
+ pteaig=centrehorloge--(pointarc(tourhorloge,0) shifted (18*unitvector(centrehorloge-pointarc(tourhorloge,0))));
+ if Secondes:
+ trot=centrehorloge--(pointarc(tourhorloge,0) shifted (10*unitvector(centrehorloge-pointarc(tourhorloge,0))));
+ draw rotation(trot,centrehorloge,90-6*#3) withpen pencircle scaled0.4;
+ fi;
+ draw rotation(gdeaig,centrehorloge,90-6*#2) withpen pencircle scaled1.25;
+ draw rotation(pteaig,centrehorloge,90-30*(#1+#2/60)) withpen pencircle scaled 2bp;
+ fi;
+ );
+ draw Hor;
+ \end{mpost}
+\fi
+} \ No newline at end of file
diff --git a/macros/latex/contrib/profcollege/latex/PfCLabyrintheNombre.tex b/macros/latex/contrib/profcollege/latex/PfCLabyrintheNombre.tex
index a7463ec702..be5e05d673 100644
--- a/macros/latex/contrib/profcollege/latex/PfCLabyrintheNombre.tex
+++ b/macros/latex/contrib/profcollege/latex/PfCLabyrintheNombre.tex
@@ -1,18 +1,211 @@
%%%
% Labyrinthe Nombre
%%%
-\setKVdefault[ClesLabyNb]{Multiple=5,XDepart=0,YDepart=0,Longueur=7,Largeur=4,XArrivee=6,YArrivee=3,Solution=false,Echelle=1,Angle=0,Couleur=red,Murs=false,Nom=Ex1,CouleurChemin=LightSteelBlue,DoubleOperation=false,Chemin=false,EntreeSortie=false,Entree="Nord",Sortie="Sud",SortieUnique=true}
+\setKVdefault[ClesLabyNb]{Multiple=5,XDepart=0,YDepart=0,Longueur=7,Largeur=4,Solution=false,Echelle=1,Angle=0,Couleur=red,Murs=false,Nom=Ex1,CouleurChemin=LightSteelBlue,DoubleOperation=false,Multiplication=false,Chemin=false,EntreeSortie=false,Entree="Nord",Sortie="Sud",SortieUnique=true,Graines=false,XArrivees=false,YArrivees=false,ArriveeX=5,ArriveeY=5}
+\defKV[ClesLabyNb]{Graine=\setKV[ClesLabyNb]{Graines}}
+\defKV[ClesLabyNb]{XArrivee=\setKV[ClesLabyNb]{XArrivees}\setKV[ClesLabyNb]{ArriveeX=#1}}
+\defKV[ClesLabyNb]{YArrivee=\setKV[ClesLabyNb]{YArrivees}\setKV[ClesLabyNb]{ArriveeY=#1}}
\newcommand\LabyNombre[1][]{%
\useKVdefault[ClesLabyNb]%
\setKV[ClesLabyNb]{#1}%
- \ifboolKV[ClesLabyNb]{Solution}{%
- \TraceLabyFactoSolution{\useKV[ClesLabyNb]{Multiple}}{\useKV[ClesLabyNb]{Longueur}}{\useKV[ClesLabyNb]{Largeur}}{(\useKV[ClesLabyNb]{YDepart},\useKV[ClesLabyNb]{XDepart})}{(\useKV[ClesLabyNb]{YArrivee},\useKV[ClesLabyNb]{XArrivee})}{\useKV[ClesLabyNb]{Solution}}%
+ \ifboolKV[ClesLabyNb]{XArrivees}{}{\setKV[ClesLabyNb]{ArriveeX=\fpeval{\useKV[ClesLabyNb]{Longueur}-1}}}
+ \ifboolKV[ClesLabyNb]{YArrivees}{}{\setKV[ClesLabyNb]{ArriveeY=\fpeval{\useKV[ClesLabyNb]{Largeur}-1}}}
+ \ifboolKV[ClesLabyNb]{Multiplication}{%
+ \TraceLabyMul{\useKV[ClesLabyNb]{Multiple}}{\useKV[ClesLabyNb]{Longueur}}{\useKV[ClesLabyNb]{Largeur}}{(\useKV[ClesLabyNb]{YDepart},\useKV[ClesLabyNb]{XDepart})}{(\useKV[ClesLabyNb]{ArriveeY},\useKV[ClesLabyNb]{ArriveeX})}%
}{%
- \TraceLabyFacto{\useKV[ClesLabyNb]{Multiple}}{\useKV[ClesLabyNb]{Longueur}}{\useKV[ClesLabyNb]{Largeur}}{(\useKV[ClesLabyNb]{YDepart},\useKV[ClesLabyNb]{XDepart})}{(\useKV[ClesLabyNb]{YArrivee},\useKV[ClesLabyNb]{XArrivee})}{\useKV[ClesLabyNb]{Solution}}%
- }%
+ \ifboolKV[ClesLabyNb]{Solution}{%
+ \TraceLabyFactoSolution{\useKV[ClesLabyNb]{Multiple}}{\useKV[ClesLabyNb]{Longueur}}{\useKV[ClesLabyNb]{Largeur}}{(\useKV[ClesLabyNb]{YDepart},\useKV[ClesLabyNb]{XDepart})}{(\useKV[ClesLabyNb]{ArriveeY},\useKV[ClesLabyNb]{ArriveeX})}{\useKV[ClesLabyNb]{Solution}}%
+ }{%
+ \TraceLabyFacto{\useKV[ClesLabyNb]{Multiple}}{\useKV[ClesLabyNb]{Longueur}}{\useKV[ClesLabyNb]{Largeur}}{(\useKV[ClesLabyNb]{YDepart},\useKV[ClesLabyNb]{XDepart})}{(\useKV[ClesLabyNb]{ArriveeY},\useKV[ClesLabyNb]{ArriveeX})}{\useKV[ClesLabyNb]{Solution}}%
+ }%
+ }%
}%
+\newcommand\TraceLabyMul[5]{
+ \ifluatex
+ \mplibnumbersystem{double}
+ \mplibforcehmode
+ \begin{mplibcode}
+ input PfCLabyNombre;
+
+ boolean Murs,Solution,Graines;
+ Murs=\useKV[ClesLabyNb]{Murs};
+ Solution:=\useKV[ClesLabyNb]{Solution};
+ Graines:=\useKV[ClesLabyNb]{Graines};
+ if Graines:
+ randomseed:=\useKV[ClesLabyNb]{Graine}
+ fi;
+
+ path Fullcircle;
+ Fullcircle=fullcircle shifted((0.5,0.5));
+
+ numeric Multiple;
+ Multiple=#1;
+ % Initialisation du labyrinthe
+ InitialisationLabyrintheMul(#2,#3);
+ % On initialise les paramètres du parcours
+ numeric choixligneD,choixligneA,choixcolonneD,choixcolonneA;
+ choixligneD=xpart(#4);
+ choixcolonneD=ypart(#4);
+ choixligneA=xpart(#5);
+ choixcolonneA=ypart(#5);%
+ pair Depart;
+ Depart=N[choixligneD][choixcolonneD];
+ pair Arrivee;
+ Arrivee=N[choixligneA][choixcolonneA];
+ pair Mobile;
+ Mobile=Depart;
+ RAZPileChemin;
+ % Exploration du labyrinthe
+ PushChemin((choixligneD,choixcolonneD));
+ CaseExploree[choixligneD][choixcolonneD]:=true;
+ VoisinDispo(choixligneD,choixcolonneD);
+ forever: exitif Mobile=Arrivee;%nb=0;
+ nb:=ceiling(uniformdeviate(nbvoisin));
+ if nb>0:
+ for k=1 upto nbvoisin:
+ CaseExploree[xpart(PileVoisin[k])][ypart(PileVoisin[k])]:=true;
+ endfor;
+ PushChemin((xpart(PileVoisin[nb]),ypart(PileVoisin[nb])));
+ Mobile:=N[xpart(PileChemin[indiceChemin])][ypart(PileChemin[indiceChemin])];
+ VoisinDispo(xpart(PileChemin[indiceChemin]),ypart(PileChemin[indiceChemin]));
+ else:
+ PopChemin;
+ fi;
+ endfor;
+
+ vardef PremierInfCent=
+ Totalpremier:=25;
+
+ numeric p[]; boolean n_is_prime; p[1]=2; kis:=1;
+ for nis=3 step 2 until infinity:
+ n_is_prime := true;
+ for jis=2 upto kis:
+ if nis mod p[jis]=0: n_is_prime := false; fi
+ exitif nis/p[jis] < p[jis];
+ endfor
+ if n_is_prime: p[incr kis] := nis; exitif kis=Totalpremier; fi
+ endfor fi
+
+ numeric PR[],pretiens[];
+
+ for ki=1 upto Totalpremier-1:
+ pretiens[ki]:=p[ki+1];
+ endfor;
+
+ Kk:=0;
+
+ for ki=Totalpremier-1 downto 1:
+ alea:=1+floor(uniformdeviate(ki));
+ PR[incr Kk]:=pretiens[alea];
+ Kkl:=0;
+ for li=1 upto ki:
+ if li<>alea:
+ pretiens[incr Kkl]:=pretiens[li];
+ fi;
+ endfor;
+ endfor;
+ enddef;
+
+ vardef ListeDiviseurs(expr nbtest)=
+ numeric diviseurs[],nondiviseurs[],pas;
+ nbdiv:=0;
+ nbnondiv:=0;
+ pas=2;
+ forever:
+ if (nbtest mod pas)=0:
+ nbdiv:=nbdiv+1;
+ diviseurs[nbdiv]=pas;
+ else:
+ nbnondiv:=nbnondiv+1;
+ nondiviseurs[nbnondiv]=pas;
+ fi;
+ pas:=pas+1;
+ exitif pas>10;
+ endfor;
+ enddef;
+
+ % Affichagefinal
+ % on sauvegarde les nombres aléatoires
+ numeric NbAffiche[];
+ numeric NbSol[];
+ % on écrit des nombres premiers au hasard >10
+ PremierInfCent;
+ numeric nbaffiche;
+ nbaffiche=0;
+ for k=0 upto LargeurLaby-1:
+ for l=0 upto LongueurLaby-1:
+ nbaffiche:=nbaffiche+1;
+ if (nbaffiche mod 2)=0:
+ nbpremier:=3+ceiling(uniformdeviate(Totalpremier-4));
+ NbAffiche[nbaffiche]:=PR[nbpremier];
+ else:
+ NbAffiche[nbaffiche]:=2+floor(uniformdeviate(8));
+ fi;
+ endfor;
+ endfor;
+ % On crée des multiples du nombre choisi
+ NbSol[1]=Multiple;
+ for k=2 upto indiceChemin:
+ if (k mod 2)=0:
+ NbSol[k]=NbSol[k-1]*(2+ceiling(uniformdeviate(8)));
+ else:
+ % Diviseurs du précédent sauf 1 mais inférieur ou égal à 10
+ % choix aléatoire du diviseur
+ ListeDiviseurs(NbSol[k-1]);
+ choixdiv:=ceiling(uniformdeviate(nbdiv));
+ NbSol[k]=diviseurs[choixdiv];
+ fi;
+ endfor;
+ % On affiche
+ picture Corps;
+ Corps=image(
+ drawoptions(withcolor 0.7white);
+ for k=0 upto LargeurLaby-1:
+ trace (N[k][0]--N[k][LongueurLaby-1]) shifted((5mm,0.25*uv));
+ endfor;
+ for k=0 upto LongueurLaby-1:
+ trace (N[0][k]--N[LargeurLaby-1][k]) shifted((5mm,0.25*uv));
+ endfor;
+ drawoptions();
+ nbaffiche:=0;
+ for k=0 upto LargeurLaby-1:
+ for l=0 upto LongueurLaby-1:
+ nbaffiche:=nbaffiche+1;
+ remplis ((Fullcircle scaled 10mm) shifted N[k][l]) withcolor white;
+ label(TEX("\num{"&decimal(NbAffiche[nbaffiche])&"}"),M[k][l]);
+ endfor;
+ endfor;
+ if Solution:
+ trace ((center Fullcircle scaled 10mm) shifted N[choixligneD][choixcolonneD])
+ for k=2 upto indiceChemin-1:
+ -- ((center Fullcircle scaled 10mm) shifted N[xpart(PileChemin[k])][ypart(PileChemin[k])])
+ endfor
+ --((center Fullcircle scaled 10mm) shifted Arrivee) dashed evenly withpen pencircle scaled 1.5 withcolor Brown;
+ fi;
+ remplis ((Fullcircle scaled 10mm) shifted N[choixligneD][choixcolonneD]) withcolor \useKV[ClesLabyNb]{Couleur};
+ if (LargeurLaby mod 2)=0:
+ remplis ((unitsquare scaled 10mm) shifted Arrivee) withcolor \useKV[ClesLabyNb]{Couleur};
+ else:
+ remplis ((Fullcircle scaled 10mm) shifted Arrivee) withcolor \useKV[ClesLabyNb]{Couleur};
+ fi;
+ for k=2 upto indiceChemin-1:
+ remplis ((Fullcircle scaled 10mm) shifted N[xpart(PileChemin[k])][ypart(PileChemin[k])]) withcolor white;
+ label(TEX("\num{"&decimal(NbSol[k])&"}"),M[xpart(PileChemin[k])][ypart(PileChemin[k])]);
+ endfor;
+ k:=1;
+ label(TEX("\num{"&decimal(NbSol[k])&"}"),M[xpart(PileChemin[k])][ypart(PileChemin[k])]);
+ k:=indiceChemin;
+ label(TEX("\num{"&decimal(NbSol[k])&"}"),M[xpart(PileChemin[k])][ypart(PileChemin[k])]);
+ trace TraceLabyrintheMul;
+ );
+ Corps:=(Corps scaled \useKV[ClesLabyNb]{Echelle}) rotated \useKV[ClesLabyNb]{Angle};
+ trace Corps;
+\end{mplibcode}
+\fi
+}
+
\newcommand\TraceLabyFacto[6]{%
\mplibforcehmode%
\xdef\PfCNomLabyrinthe{\useKV[ClesLabyNb]{Nom}}%
diff --git a/macros/latex/contrib/profcollege/latex/PfCMulPiecesPuzzle.tex b/macros/latex/contrib/profcollege/latex/PfCMulPiecesPuzzle.tex
new file mode 100644
index 0000000000..56a7ad6943
--- /dev/null
+++ b/macros/latex/contrib/profcollege/latex/PfCMulPiecesPuzzle.tex
@@ -0,0 +1,151 @@
+%%%
+% Pièces de puzzle pour multiplication
+%%%
+%https://mirror.gutenberg-asso.fr/tex.loria.fr/prod-graph/metafun.pdf
+\newtoks\toklistepuzzlea%
+
+\def\UpdatetoksPuzzleA#1\nil{\addtotok\toklistepuzzlea{"#1",}}%
+
+\setKVdefault[ClesPuzzleMul]{Solution=false,Unite=1cm,Couleur=LightSteelBlue}
+
+\NewDocumentCommand\PuzzleMul{om}{%
+ \useKVdefault[ClesPuzzleMul]%
+ \setKV[ClesPuzzleMul]{#1}%
+ \setsepchar{,}%
+ \readlist*\PfCListePuzzle{#2}%
+ \StrLen{\PfCListePuzzle[1]}[\TaillePuzzle]%
+ \xdef\HauteurPuzzle{\PfCListePuzzlelen}%
+ \toklistepuzzlea{}%
+ \foreachitem\compteur\in\PfCListePuzzle{\expandafter\UpdatetoksPuzzleA\compteur\nil}%
+ \BuildPuzzle{\the\toklistepuzzlea}%
+}
+
+\def\BuildPuzzleCode{%
+ def PreDrawPuzzle ( expr ww, hh, uu ) =
+ %randomseed := random_seed;
+ def rand (expr x) =
+ (((x)+(uniformdeviate 10))/100)
+ enddef;
+ w := ww;
+ h := hh;
+ un := uu/100;
+ boolean swapone; swapone := false;
+ boolean swaptwo; swaptwo := false;
+ path p[], pw[], ph[];
+ def buildpath (expr len, num) =
+ for j=1 upto num:
+ clearxy;
+ swaptwo := not swaptwo;
+ if odd num:
+ swapone := not swaptwo;
+ else:
+ swapone := swaptwo;
+ fi;
+ for i=0 upto len+1:
+ x[i]c = ((i*100)*un);
+ y[i]c = ((j*100)*un);
+ x[i]m = (x[i]c+50*un);
+ if swapone:
+ y[i]m = (y[i]c-25*un)
+ else:
+ y[i]m = (y[i]c+25*un)
+ fi;
+ x[i]l = (rand(85)[x[i]c,x[i]m]);
+ x[i]r = (rand(15)[x[i]m,x[i+1]c]);
+ y[i]l = y[i]r=y[i]c;
+ x[i]ll = (rand(75)[x[i]c,x[i]m]);
+ x[i]rr = (rand(25)[x[i]m,x[i+1]c]);
+ y[i]ll = y[i]rr=.50[y[i]c,y[i]m];
+ endfor;
+ p[j] :=
+ for i=0 upto len:
+ z[i]c..z[i]l..z[i]ll..z[i]m..z[i]rr..z[i]r..
+ endfor
+ z[len+1]c ;
+ endfor;
+ enddef;
+ pw[1] := (100*un,100*un)--(100*un,(h+1)*100*un);
+ pw[w+1] := ((w+1)*100*un,100*un)--((w+1)*100*un,(h+1)*100*un);
+ ph[1] := (100*un,100*un)--((w+1)*100*un,100*un);
+ ph[h+1] := (100*un,(h+1)*100*un)--((w+1)*100*un,(h+1)*100*un);
+ buildpath (w+1,h);
+ for k=2 upto h:
+ ph[k] := p[k] cutbefore pw[1];
+ ph[k] := ph[k] cutafter pw[w+1];
+ endfor;
+ buildpath (h+1,w);
+ for k=2 upto w:
+ pw[k] := p[w-k+2] rotated 90 shifted ((w+2)*100*un,0);
+ pw[k] := pw[k] cutbefore ph[1];
+ pw[k] := pw[k] cutafter ph[h+1];
+ endfor;
+ path phw[][];
+ for kh=1 upto h:
+ for kw=1 upto w:
+ phw[kh][kw] := buildcycle (ph[kh], pw[kw], ph[kh+1], pw[kw+1]);
+ endfor;
+ endfor;
+enddef;
+def DrawWholePuzzle =
+ for k=1 upto h+1:
+ draw ph[k] withpen pencircle scaled (2.5*un) shifted (-100*un,-100*un);
+ endfor;
+ for k=1 upto w+1:
+ draw pw[k] withpen pencircle scaled (2.5*un) shifted (-100*un,-100*un);
+ endfor;
+enddef;
+def DrawPuzzlePiece (expr ww, hh) =
+draw phw[ww][hh] withpen pencircle scaled (2.5*un) shifted (-100*un,-100*un);
+enddef;
+def DrawPuzzleBorder =
+draw (pw[1]--ph[1]--pw[w+1]--ph[h+1]--cycle)
+withpen pencircle scaled (2.5*un) shifted (-100*un,-100*un);
+enddef;
+%
+vardef AffichagePiece(text t)=
+ligne:=Hauteur+1;
+for p_=t:
+ligne:=ligne-1;
+colonne:=0;
+for k=1 upto Taille:
+colonne:=colonne+1;
+if substring(k-1,k) of p_="X":
+DrawPuzzlePiece(ligne,colonne);
+else:
+if Solution:
+path titi;
+titi=phw[ligne][colonne];
+fill (titi shifted (-100*un,-100*un)) withcolor CoulSolution;
+draw titi withpen pencircle scaled (2.5*un) shifted (-100*un,-100*un);
+fi;
+fi;
+endfor;
+endfor;
+enddef;
+}%
+
+\NewDocumentCommand\BuildPuzzle{m}{%
+ \ifluatex
+ \mplibforcehmode
+ \begin{mplibcode}
+ \BuildPuzzleCode
+ Taille:=\TaillePuzzle;
+ Hauteur:=\HauteurPuzzle;
+ Unite:=\useKV[ClesPuzzleMul]{Unite};
+ boolean Solution;
+ Solution=\useKV[ClesPuzzleMul]{Solution};
+ color CoulSolution;
+ CoulSolution=\useKV[ClesPuzzleMul]{Couleur};
+
+ PreDrawPuzzle(Taille, Hauteur, Unite);
+
+ AffichagePiece(#1);
+ \end{mplibcode}
+ \else%
+ \begin{mpost}[mpsettings={\BuildPuzzleCode;Taille:=\TaillePuzzle;Hauteur:=\HauteurPuzzle;Unite:=\useKV[ClesPuzzleMul]{Unite};boolean Solution;Solution=\useKV[ClesPuzzleMul]{Solution};color CoulSolution;CoulSolution=\useKV[ClesPuzzleMul]{Couleur};}]
+ PreDrawPuzzle(Taille, Hauteur, Unite);
+
+ AffichagePiece(#1);
+ \end{mpost}
+ \fi%
+}% \ No newline at end of file
diff --git a/macros/latex/contrib/profcollege/latex/PfCNonogramme.tex b/macros/latex/contrib/profcollege/latex/PfCNonogramme.tex
index 1493a2fcd8..8adfbd5654 100644
--- a/macros/latex/contrib/profcollege/latex/PfCNonogramme.tex
+++ b/macros/latex/contrib/profcollege/latex/PfCNonogramme.tex
@@ -46,6 +46,14 @@
\begin{mplibcode}
Taille:=\useKV[Nono]{Taille};
u:=\useKV[Nono]{Unite};
+ Unite=\useKV[Nono]{Unite};
+ %
+ if u<7mm:
+ nu:=7mm;
+ else:
+ nu:=u;
+ fi;
+ %
boolean Solution,Enonce;
Solution:=\useKV[Nono]{Solution};
Enonce:=\useKV[Nono]{Enonce};
@@ -104,7 +112,7 @@
if unknown Sequence[cptnblignes][k]:
else:
nbpas:=nbpas+1;
- label.lft(TEX(Sequence[cptnblignes][k]),(0,0) shifted (-(nbpas-1)*0.5*u-0.25*u,u*(-cptnblignes+0.5)));
+ label.lft(TEX(Sequence[cptnblignes][k]),(0,0) shifted (-(nbpas-1)*0.5*nu-0.25*nu,u*(-cptnblignes+0.5)));
fi;
endfor;
endfor;
@@ -130,7 +138,7 @@
if unknown SequenceCol[cptnbcolonnes][k]:
else:
nbpas:=nbpas+1;
- label.top(TEX(SequenceCol[cptnbcolonnes][k]),(0,0) shifted (u*(cptnbcolonnes-0.5),(nbpas-1)*0.5*u+0.25*u));
+ label.top(TEX(SequenceCol[cptnbcolonnes][k]),(0,0) shifted (u*(cptnbcolonnes-0.5),(nbpas-1)*0.5*nu+0.25*nu));
fi;
endfor;
endfor;
diff --git a/macros/latex/contrib/profcollege/latex/PfCNotionFonction.tex b/macros/latex/contrib/profcollege/latex/PfCNotionFonction.tex
index bb21fbb6ae..9b6c46725a 100644
--- a/macros/latex/contrib/profcollege/latex/PfCNotionFonction.tex
+++ b/macros/latex/contrib/profcollege/latex/PfCNotionFonction.tex
@@ -86,70 +86,163 @@
}%
}%
-\NewDocumentCommand\Fonctionold{o m}{%
- \useKVdefault[ClesFonction]%
- \setKV[ClesFonction]{#1}%
- \ifboolKV[ClesFonction]{Trace}{%
- \useKVdefault[TraceG]%
- \setKV[TraceG]{#1}%
- \tokPfCListeDesFonctions{}%
- \tokPfCListeDesNomsFonctions{}%
- \xdef\PfCFooFn{\useKV[ClesFonction]{Calcul}}
- \xdef\PfCFooNomFn{\useKV[TraceG]{NomCourbe}}
- \ifx\bla\PfCFooFn\bla%
- \else
- \readlist*\ListeDesFonctions{\PfCFooFn}
- \foreachitem\compteur\in\ListeDesFonctions{\expandafter\UpdatePfCListeDesFonctions\compteur\nil}%
- \fi
- \ifx\bla\PfCFooNomFn\bla
+\setKVdefault[LecGra]{NbPoints=7,Image=false,Antecedent=false,Equation=false,UniteX=1,UniteY=1,Epaisseur=1,CouleurTrace=black,Points}
+\defKV[LecGra]{Graine=\PfCGraineAlea{#1}}
+
+\newread\myread
+
+\NewDocumentCommand\LectureGraphique{o}{%
+ \useKVdefault[LecGra]%
+ \setKV[LecGra]{#1}%
+ % Partie Trace
+ % On choisit les abscisses
+ \xdef\FooAbscisses{\fpeval{randint(-9,-5)}}%
+ \xdef\RappelA{\FooAbscisses}%
+ \xintFor*##1 in{\xintSeq{2}{\useKV[LecGra]{NbPoints}}}\do{%
+ \xdef\NewAbscisse{\fpeval{\RappelA+randint(2,3)}}%
+ \xdef\RappelA{\NewAbscisse}%
+ \xdef\FooAbscisses{\FooAbscisses,\NewAbscisse}%
+ }%
+ % on choisit les ordonnées.
+ \xdef\FooOrdonnees{\fpeval{randint(-3,3)}}%
+ \xdef\RappelO{\FooOrdonnees}%
+ \xdef\ListeDesEcartsO{1,2,3}%
+ \xdef\FooListeDesOperations{+,-}%
+ \MelangeListe{\FooListeDesOperations}{2}%
+ \setsepchar{,}\ignoreemptyitems%
+ \readlist*\PfCListeChoixOperations{\faa}%
+ \xintFor*##1 in{\xintSeq{2}{\useKV[LecGra]{NbPoints}}}\do{%
+ \MelangeListe{\ListeDesEcartsO}{1}%
+ \setsepchar{,}\ignoreemptyitems%
+ \readlist*\PfCListeEcartSeul{\faa}%
+ \reademptyitems%
+ \modulo{##1}{2}\relax%
+ \ifnum\remainder=0\relax%
+ \xdef\NewOrdonnee{\fpeval{\RappelO\PfCListeChoixOperations[1]\PfCListeEcartSeul[1]}}%
\else
- \readlist*\ListeDesNomsFonctions{\PfCFooNomFn}
- \foreachitem\compteur\in\ListeDesNomsFonctions{\expandafter\UpdatePfCListeDesNomsFonctions\compteur\nil}%
+ \xdef\NewOrdonnee{\fpeval{\RappelO\PfCListeChoixOperations[2]\PfCListeEcartSeul[1]}}%
\fi
- \TraceMultiGraphique{\the\tokPfCListeDesFonctions}{\the\tokPfCListeDesNomsFonctions}%
- }{%
- \ifboolKV[ClesFonction]{Points}{%
- \toklistePtsFn{}%
- \setsepchar[*]{§*/}%\ignoreemptyitems%
- \readlist*\ListePoints{#2}%
- \ifboolKV[ClesFonction]{Catmull}{%
- \xdef\PfCFooListePoints{(\ListePoints[1,2],\ListePoints[1,3]),}%
- \foreachitem\compteur\in\ListePoints{%
- \xdef\PfCFooListePoints{\PfCFooListePoints (\ListePoints[\compteurcnt,2],\ListePoints[\compteurcnt,3]),}%
- }%
- \xdef\PfCFooListePoints{\PfCFooListePoints (\ListePoints[\ListePointslen,2],\ListePoints[\ListePointslen,3]),}%
- \MPCatmull{\PfCFooListePoints}{\useKV[ClesFonction]{PasX}}{\useKV[ClesFonction]{PasY}}{\useKV[ClesFonction]{UniteX}}{\useKV[ClesFonction]{UniteY}}%
- }{%
- \xdef\PfCFooListePoints{}
- \ifboolKV[ClesFonction]{Tangentes}{%
- \foreachitem\compteur\in\ListePoints{%
- \xdef\PfCFooListePoints{\PfCFooListePoints \ListePoints[\compteurcnt,1],(\ListePoints[\compteurcnt,2],\ListePoints[\compteurcnt,3]),\ListePoints[\compteurcnt,4],}%
- }%
- }{%
- \foreachitem\compteur\in\ListePoints{%
- \xdef\PfCFooListePoints{\PfCFooListePoints (\ListePoints[\compteurcnt,2],\ListePoints[\compteurcnt,3]),}%
- }%
- }%
- \MPCourbeNew{\PfCFooListePoints}%
- }%
- }{%
- \setsepchar{,}\ignoreemptyitems%
- \roeadlist*\ListeFonction{#2}%
- \StrSubstitute{\useKV[ClesFonction]{Calcul}}{\useKV[ClesFonction]{Variable}}{\i}[\temp]%
- \StrSubstitute{\useKV[ClesFonction]{Calcul}}{**}{^}[\tempa]%
- \StrSubstitute{\tempa}{*}{}[\tempab]%
- \ifboolKV[ClesFonction]{Ecriture}{%
- \ensuremath{\useKV[ClesFonction]{Nom}(\useKV[ClesFonction]{Variable})=\tempab}%
- }{}%
- \ifboolKV[ClesFonction]{Definition}{%
- \ensuremath{\useKV[ClesFonction]{Nom}:\useKV[ClesFonction]{Variable}\mapsto\tempab}%
- }{}%
- \ifboolKV[ClesFonction]{Tableau}{%
- \buildtabfonction%
- }{}%
- \reademptyitems%
- }%
+ \xdef\RappelO{\NewOrdonnee}%
+ \xdef\FooOrdonnees{\FooOrdonnees,\NewOrdonnee}%
+ }%
+ \setsepchar{,}%
+ \readlist*\ListeAbscisses{\FooAbscisses}%
+ \readlist*\ListeOrdonnees{\FooOrdonnees}%
+ \xdef\FooPoints{0/\ListeAbscisses[1]/\ListeOrdonnees[1]/0}%
+ \xintFor*##1 in{\xintSeq{2}{\useKV[LecGra]{NbPoints}}}\do{%
+ \xdef\FooPoints{\FooPoints§0/\ListeAbscisses[##1]/\ListeOrdonnees[##1]/0}%
}%
+ \xdef\PfCOrdonneeMin{\fpeval{min(\FooOrdonnees)}}%
+ \xdef\PfCOrdonneeMax{\fpeval{max(\FooOrdonnees)}}%
+ \xdef\PfCAbscisseMin{\fpeval{min(\FooAbscisses)}}%
+ \xdef\PfCAbscisseMax{\fpeval{max(\FooAbscisses)}}%
+ \xdef\PfCChoixImage{\fpeval{randint(\PfCAbscisseMin,\PfCAbscisseMax)}}%
+ \xdef\PfCChoixAntecedent{\fpeval{randint(\PfCOrdonneeMin,\PfCOrdonneeMax)}}%
+ \ifboolKV[LecGra]{Image}{On effectue la lecture graphique à partir du point $(\num{\PfCChoixImage};0)$.}{}%
+ \ifboolKV[LecGra]{Antecedent}{On effectue la lecture graphique en cherchant tous les points de la courbe ayant pour ordonnée \num{\PfCChoixAntecedent}.}{}%
+ \begin{center}
+ \Fonction[
+ Points,
+ Splines,
+ PointsCourbe=\useKV[LecGra]{Points},
+ Epaisseur=\useKV[LecGra]{Epaisseur},
+ CouleurTrace=\useKV[LecGra]{CouleurTrace},
+ UniteX=\useKV[LecGra]{UniteX},
+ UniteY=\useKV[LecGra]{UniteY},
+ Traces={%
+ boolean PdtImage,PdtAntecedent,PdtEquation;
+ PdtImage:=\useKV[LecGra]{Image};
+ PdtAntecedent:=\useKV[LecGra]{Antecedent};
+ PdtEquation:=\useKV[LecGra]{Equation};
+ % Image
+ PfCepsilon:=0.001;
+ pair A,B,C,D,Ant[];
+ C=placepoint(\PfCChoixImage,0);
+ path droiteimage,AxeO,droiteantecedent;
+ droiteimage=placepoint(\PfCChoixImage,-100)--placepoint(\PfCChoixImage,100);
+ droiteantecedent=placepoint(-100,\PfCChoixAntecedent)--placepoint(100,\PfCChoixAntecedent);
+ AxeO=placepoint(0,-100)--placepoint(0,100);
+ intersectioncourbes(CourbeTotale,droiteimage);
+ A=pti[1];
+ write decimal(ypart(retrouvecoord(A))) to "PfCValeurImage.tex";%
+ write EOF to "PfCValeurImage.tex";
+ intersectioncourbes(CourbeTotale,AxeO);
+ if n>0:
+ B=pti[1];
+ else:
+ B=placepoint(0,\PfCOrdonneeMax);
+ fi;
+ D=(xpart(B),ypart(A));
+ if PdtImage:
+ drawoptions(dashed evenly);
+ drawarrow C--1/4[C,A];
+ drawarrow A--3/4[A,D];
+ trace (C--A--D) withpen pencircle scaled 1.25;
+ if ypart(A)>ypart(C):
+ label.bot(TEX("\num{\fpeval{\PfCChoixImage}}"),C);
+ else:
+ label.top(TEX("\num{\fpeval{\PfCChoixImage}}"),C);
+ fi;
+ drawoptions();
+ fi;
+ %antecedent
+ intersectioncourbes(CourbeTotale,droiteantecedent);
+ for k=1 upto n:
+ Ant[k]=pti[k];
+ endfor;
+ NbAntecedents:=1;
+ for k=2 upto n:
+ if abs(xpart(retrouvecoord(Ant[k]))-xpart(retrouvecoord(Ant[k-1])))>PfCepsilon:
+ NbAntecedents:=NbAntecedents+1;
+ Ant[NbAntecedents]:=pti[k];
+ fi;
+ endfor;
+ write decimal(NbAntecedents) to "PfCNombreAntecedents.tex";
+ write EOF to "PfCNombreAntecedents.tex";
+ if NbAntecedents>0:
+ for k=1 upto NbAntecedents:
+ if PdtAntecedent or PdtEquation:
+ draw ((fullcircle scaled 1mm) shifted Ant[k]) withcolor red;
+ draw ((fullcircle scaled 1mm) shifted (xpart(Ant[k]),ypart(C))) withcolor red;
+ draw Ant[k]--(xpart(Ant[k]),ypart(C)) withcolor red;
+ drawarrow Ant[k]--1/4[Ant[k],(xpart(Ant[k]),ypart(C))] withcolor red;
+ fi;
+ write decimal(xpart(retrouvecoord(Ant[k]))) to "PfCListeAntecedents.tex";
+ endfor;
+ fi;
+ write EOF to "PfCListeAntecedents.tex";
+ if PdtAntecedent or PdtEquation:
+ draw droiteantecedent withcolor red;
+ if ypart(placepoint(0,\PfCChoixAntecedent))<ypart(B):
+ dotlabel.lrt(TEX("\num{\fpeval{\PfCChoixAntecedent}}"),placepoint(0,\PfCChoixAntecedent));
+ else:
+ dotlabel.urt(TEX("\num{\fpeval{\PfCChoixAntecedent}}"),placepoint(0,\PfCChoixAntecedent));
+ fi;
+ fi;
+ clip currentpicture to cadreexterieur;
+ }]{%
+ \FooPoints
+ }
+ \end{center}
+ \ifboolKV[LecGra]{Image}{%
+ \openin\myread=PfCValeurImage.tex
+ \read\myread to \LectureImage
+ L'image de \num{\PfCChoixImage} par la fonction $f$ est \num{\fpeval{round(\LectureImage,1)}}.%
+ }{}%
+ \ifboolKV[LecGra]{Antecedent}{%
+ \openin\myread=PfCNombreAntecedents.tex
+ \read\myread to \NombreAntecedents
+ \ifnum\NombreAntecedents=0\relax
+ Le nombre \num{\PfCChoixAntecedent} n'a pas d'antécédent par la fonction $f$.%
+ \else
+ Le nombre \num{\PfCChoixAntecedent} a \numberstringnum{\fpeval{\NombreAntecedents}} antécédent\ifnum\NombreAntecedents>1\relax s\fi{} par la fonction $f$. % Titia vaut \Titia
+ \openin\myread=PfCListeAntecedents.tex
+ Par lecture graphique, \ifnum\NombreAntecedents>1\relax ce sont \xintFor* ##1 in{\xintSeq{1}{\NombreAntecedents}}\do{%
+ \read\myread to \ListeNombreAntecedents%
+ \xintifForLast{ et }{\xintifForFirst{}{;}}\num{\fpeval{round(\ListeNombreAntecedents,1)}}%
+ }\else c'est \read\myread to \ListeNombreAntecedents\num{\fpeval{round(\ListeNombreAntecedents,1)}}\fi
+ \fi.%
+ }{}%
}%
\def\MPSplineCode{%
@@ -173,6 +266,25 @@
(q,r)*cm enplace
enddef;
%
+ def replace=
+ xscaled (1/X.u) yscaled (1/Y.u)
+ enddef;
+%
+ def retrouvecoord(expr p)=%
+ (p/cm) replace
+ enddef;
+%
+ vardef intersectioncourbes(expr aa,bb)=
+ pair pti[];
+ n:=0;
+ for k=0 upto nbpoints-1:
+ if ((subpath(k/nbpoints*length aa,(k+1)/nbpoints*length aa) of aa) intersectiontimes bb)<>(-1,-1):
+ n:=n+1;
+ pti[n]:=(subpath(k/nbpoints*length aa,(k+1)/nbpoints*length aa) of aa) intersectionpoint bb;
+ fi;
+ endfor;
+ enddef;
+ %
nbspline=0;
%
nbpoints=50;
@@ -189,14 +301,12 @@
xx[k]=xzero+(k/nbpoints)*(xuno-xzero);
yy[k]=a[nbspline]*(xx[k]**3)+b[nbspline]*(xx[k]**2)+c[nbspline]*xx[k]+d[nbspline];
endfor;
- save $;
- picture $;
- $=image(
- draw placepoint(xzero,yzero) for k=1 upto nbpoints-1:
+ save Spline;
+ path Spline;
+ Spline=placepoint(xzero,yzero) for k=1 upto nbpoints-1:
--placepoint(xx[k],yy[k])
endfor --placepoint(xuno,yuno);
- );
- $
+ Spline
enddef;
}
@@ -284,9 +394,12 @@
%
path cadreexterieur;
cadreexterieur=(((MinX-1)*X.u*cm,(MinY-1)*Y.u*cm)--((MaxX+1)*X.u*cm,(MinY-1)*Y.u*cm)--((MaxX+1)*X.u*cm,(MaxY+1)*Y.u*cm)--((MinX-1)*X.u*cm,(MaxY+1)*Y.u*cm)--cycle);
+ path SplineRecap[],CourbeTotale;
for l=1 upto N-1:
- draw SplineCubique(xpart(Xn[l]),ypart(Xn[l]),xpart(Xn[l+1]),ypart(Xn[l+1]),ypart(Dn[l]),xpart(Dn[l+1])) withpen pencircle scaled Epaisseur withcolor CoulTrace;
+ SplineRecap[l]=SplineCubique(xpart(Xn[l]),ypart(Xn[l]),xpart(Xn[l+1]),ypart(Xn[l+1]),ypart(Dn[l]),xpart(Dn[l+1]));
endfor;
+ CourbeTotale=SplineRecap[1] for l=2 upto N-1:..SplineRecap[l] endfor;
+ draw CourbeTotale withpen pencircle scaled Epaisseur withcolor CoulTrace;
clip currentpicture to cadreexterieur;
picture RetiensCourbe;
RetiensCourbe=currentpicture;
@@ -489,8 +602,9 @@
%
RetiensCouleur(\useKV[TraceG]{CouleurTrace});
%
- pair Origine;
+ pair Origine,DecalageOrigine;
Origine=(xmin,ymin)+\useKV[TraceG]{Origine};
+ DecalageOrigine=\useKV[TraceG]{Origine};
%
boolean Grille,Vide,Graduations,Code,LegendeX,LegendeY;
Grille=\useKV[TraceG]{Grille};
@@ -547,14 +661,14 @@
enddef;
%
vardef NommeCourbes(text texto)=
- n:=0;
+ nc:=0;
for p_=texto:
- n:=n+1;
+ nc:=nc+1;
numeric tp;
- tp=pos[n]*length Cb[n];
+ tp=pos[nc]*length Cb[n];
pair PT,Tangente;
- PT:=point (tp) of Cb[n];
- Tangente:=unitvector(direction tp of Cb[n]);
+ PT:=point (tp) of Cb[nc];
+ Tangente:=unitvector(direction tp of Cb[nc]);
label(TEX(p_) rotated angle(Tangente),PT+2mm*(Tangente rotated 90));
endfor;
enddef;
@@ -595,46 +709,56 @@
\PfCTraceMGCode
if Grille:
drawoptions(withcolor 0.75white);
- for k=xpart(Origine) step grillex until xmax:
- trace u*(k,ymin)--u*(k,ymax);
+ for k=xpart(Origine) step grillex until (xmax+grillex):
+ trace u*(k,ymin-grilley)--u*(k,ymax+grilley);
endfor;
- for k=xpart(Origine) step -grillex until xmin:
- trace u*(k,ymin)--u*(k,ymax);
+ for k=xpart(Origine) step -grillex until (xmin-grillex):
+ trace u*(k,ymin-grilley)--u*(k,ymax+grilley);
endfor;
- for k=ypart(Origine) step grilley until ymax:
- trace u*(xmin,k)--u*(xmax,k);
+ for k=ypart(Origine) step grilley until (ymax+grilley):
+ trace u*(xmin-grillex,k)--u*(xmax+grillex,k);
endfor;
- for k=ypart(Origine) step -grilley until ymin:
- trace u*(xmin,k)--u*(xmax,k);
+ for k=ypart(Origine) step -grilley until (ymin-grilley):
+ trace u*(xmin-grillex,k)--u*(xmax+grillex,k);
endfor;
drawoptions();
fi;
if Graduations:
- for k=gradx step gradx until bornesupmax:%xmax*gradx/grillex:
- dotlabel.bot(TEX("\num{"&decimal(k)&"}"),(k*xu+xpart(Origine*cm),ypart(Origine*cm)));
+ for k=gradx step gradx until (((xmax-xmin)-xpart(DecalageOrigine))*pasx):
+ dotlabel.bot(TEX("\num{"&decimal(k)&"}"),Origine*cm+(k*xu,0));
endfor;
- for k=-gradx step -gradx until borneinfmin:%xmin*gradx/grillex:
- dotlabel.bot(TEX("\num{"&decimal(k)&"}"),(k*xu+xpart(Origine*cm),ypart(Origine*cm)));
+ for k=-gradx step -gradx until (xpart(-DecalageOrigine)*pasx):
+ dotlabel.bot(TEX("\num{"&decimal(k)&"}"),Origine*cm+(k*xu,0));
endfor;
- for k=grady step grady until ymax*grady/grilley:
- dotlabel.lft(TEX("\num{"&decimal(k)&"}"),(xpart(Origine*cm),k*yu+ypart(Origine*cm)));
+ for k=grady step grady until (((ymax-ymin)-ypart(DecalageOrigine))*pasy):
+ dotlabel.lft(TEX("\num{"&decimal(k)&"}"),Origine*cm+(0,k*yu));
endfor;
- for k=-grady step -grady until ymin*grady/grilley:
- dotlabel.lft(TEX("\num{"&decimal(k)&"}"),(xpart(Origine*cm),k*yu+ypart(Origine*cm)));
+ for k=-grady step -grady until (ypart(-DecalageOrigine)*pasy):
+ dotlabel.lft(TEX("\num{"&decimal(k)&"}"),Origine*cm+(0,k*yu));
endfor;
fi;
%
drawoptions(withpen pencircle scaled(1));
- drawarrow (u*(0,ymin)--u*(0,ymax)) shifted (u*(xpart(Origine),0));
- drawarrow (u*(xmin,0)--u*(xmax,0)) shifted (u*(0,ypart(Origine)));
+ drawarrow (u*(0,ymin-grilley)--u*(0,ymax+grilley)) shifted (u*(xpart(Origine),0));
+ drawarrow (u*(xmin-grillex,0)--u*(xmax+grillex,0)) shifted (u*(0,ypart(Origine)));
label.llft(btex 0 etex,u*Origine);
drawoptions();
if Vide:
+ if Grille:
+ clip currentpicture to polygone(u*(xmin-grillex,ymin-grilley),u*(xmax+grillex,ymin-grilley),u*(xmax+grillex,ymax+grilley),u*(xmin-grillex,ymax+grilley));
+ draw polygone(u*(xmin-grillex,ymin-grilley),u*(xmax+grillex,ymin-grilley),u*(xmax+grillex,ymax+grilley),u*(xmin-grillex,ymax+grilley)) withcolor 0.75white;
+ else:
clip currentpicture to polygone(u*(xmin,ymin),u*(xmax,ymin),u*(xmax,ymax),u*(xmin,ymax));
+ fi;
else:
DessineCourbes(#1);
NommeCourbes(#2);
+ if Grille:
+ clip currentpicture to polygone(u*(xmin-grillex,ymin-grilley),u*(xmax+grillex,ymin-grilley),u*(xmax+grillex,ymax+grilley),u*(xmin-grillex,ymax+grilley));
+ draw polygone(u*(xmin-grillex,ymin-grilley),u*(xmax+grillex,ymin-grilley),u*(xmax+grillex,ymax+grilley),u*(xmin-grillex,ymax+grilley)) withcolor 0.75white;
+ else:
clip currentpicture to polygone(u*(xmin,ymin),u*(xmax,ymin),u*(xmax,ymax),u*(xmin,ymax));
+ fi;
%
if Code:
EffectuerTraces;
diff --git a/macros/latex/contrib/profcollege/latex/PfCOperationsTrou.tex b/macros/latex/contrib/profcollege/latex/PfCOperationsTrou.tex
index e5c9c7a568..9567c563cd 100644
--- a/macros/latex/contrib/profcollege/latex/PfCOperationsTrou.tex
+++ b/macros/latex/contrib/profcollege/latex/PfCOperationsTrou.tex
@@ -68,4 +68,15 @@ transform canvas={xshift=0em,yshift=0em}},rectangle,rounded corners,ultra thick,
\foreach \i in {1,...,\thesubxlop}{%
\PfCentoure{A\i}{A\i}
}%
+}%
+
+\NewDocumentCommand\MultiAddition{om}{%
+ \useKVdefault[ClesOperations]%
+ \setKV[ClesOperations]{#1}%
+ \setcounter{addxlop}{0}%
+ \ifboolKV[ClesOperations]{Solution}{\opset{carryadd,carrystyle=\color{PfCSolOp}\scriptsize}\colorlet{PfCSolOp}{\useKV[ClesOperations]{CouleurSolution}}\colorlet{PfCCouleurVirgule}{PfCSolOp}}{\opset{carryadd=false}\colorlet{PfCSolOp}{\useKV[ClesOperations]{CouleurFond}}\colorlet{PfCCouleurVirgule}{\useKV[ClesOperations]{CouleurVirgule}}}%
+ \opmanyadd[decimalsepsymbol={,},lineheight=1.75em,columnwidth=1.5em,displayintermediary=all,vmanyoperator=bottom,intermediarystyle=\stepcounter{addxlop}\color{PfCSolOp}\PfCchiffre{A\theaddxlop},resultstyle=\stepcounter{addxlop}\color{PfCSolOp}\PfCchiffre{A\theaddxlop},resultstyle.d=\color{PfCCouleurVirgule}]#2
+ \foreach \i in {1,...,\theaddxlop}{%
+ \PfCentoure{A\i}{A\i}%
+ }%
}% \ No newline at end of file
diff --git a/macros/latex/contrib/profcollege/latex/PfCPourcentage.tex b/macros/latex/contrib/profcollege/latex/PfCPourcentage.tex
index ff0bdd753f..1f6f18b19b 100644
--- a/macros/latex/contrib/profcollege/latex/PfCPourcentage.tex
+++ b/macros/latex/contrib/profcollege/latex/PfCPourcentage.tex
@@ -1,8 +1,8 @@
%%%
% Application : pourcentage
%%%
-\setKVdefault[ClesPourcentage]{Appliquer,Calculer=false,Augmenter=false,Reduire=false,Fractionnaire=false,Decimal,Formule=false,Unite=g,Concret=false,GrandeurA=Grandeur A,GrandeurB=Total,Largeur=1cm,MotReduction=diminution,AideTableau=false,ColorFill=white,CouleurTab=gray!15}
-
+\setKVdefault[ClesPourcentage]{Appliquer,Calculer=false,Augmenter=false,Reduire=false,Fractionnaire=false,Decimal,Formule=false,Concret=false,GrandeurA=Grandeur A,GrandeurB=Total,Largeur=1cm,MotReduction=diminution,AideTableau=false,ColorFill=white,CouleurTab=gray!15}
+\defKV[ClesPourcentage]{Unite=\setKV[ClesPourcentage]{Concret}}
\newcommand\Pourcentage[3][]{%
\useKVdefault[ClesPourcentage]%
\setKV[ClesPourcentage]{#1}%
diff --git a/macros/latex/contrib/profcollege/latex/PfCPyraVoca.tex b/macros/latex/contrib/profcollege/latex/PfCPyraVoca.tex
new file mode 100644
index 0000000000..bfda696300
--- /dev/null
+++ b/macros/latex/contrib/profcollege/latex/PfCPyraVoca.tex
@@ -0,0 +1,28 @@
+%%%
+% PyraVoca
+%%%
+\newlength{\PfCPyraVocaHauteur}
+
+\setKVdefault[PyraVoca]{Solution=false,Largeur=15pt}
+
+\NewDocumentCommand\PyraVoca{o m}{%
+ \useKVdefault[PyraVoca]%
+ \setKV[PyraVoca]{#1}%
+ \setsepchar[*]{,*/}\ignoreemptyitems%
+ \readlist*\PfCListePyraVoca{#2}%
+ \reademptyitems%
+ \StrLen{\PfCListePyraVoca[1,2]}[\Toto]%
+ \xdef\PfCFooNombreCases{\Toto}%
+ \xintFor* ##1 in{\xintSeq{2}{\PfCListePyraVocalen}}\do{%
+ \StrLen{\PfCListePyraVoca[##1,2]}[\Toto]%
+ \xdef\PfCFooNombreCases{\PfCFooNombreCases,\Toto}%
+ }%
+ \xdef\PfCNombreMaxCases{\fpeval{max(\PfCFooNombreCases)}}%
+ \setlength{\PfCPyraVocaHauteur}{\useKV[PyraVoca]{Largeur}+\tabcolsep}%
+ \begin{NiceTabular}{l*{\PfCNombreMaxCases}{m{\useKV[PyraVoca]{Largeur}}}}%
+ \xintFor* ##1 in{\xintSeq{1}{\PfCListePyraVocalen}}\do{%
+ \StrLen{\PfCListePyraVoca[##1,2]}[\Toto]%
+ \rule{0pt}{\PfCPyraVocaHauteur}\Block[draw,v-center,fill=\xintifboolexpr{\listlen\PfCListePyraVoca[##1]==3}{\PfCListePyraVoca[##1,3]}{white}]{1-1}{\PfCListePyraVoca[##1,1]}\xintFor* ##2 in{\xintSeq{1}{\Toto}}\do{&\Block[draw,v-center,fill=\xintifboolexpr{\listlen\PfCListePyraVoca[##1]==3}{\PfCListePyraVoca[##1,3]}{white}]{}{\ifboolKV[PyraVoca]{Solution}{\StrChar{\PfCListePyraVoca[##1,2]}{##2}}{}}}\\
+ }%
+ \end{NiceTabular}%
+}% \ No newline at end of file
diff --git a/macros/latex/contrib/profcollege/latex/PfCReperage.tex b/macros/latex/contrib/profcollege/latex/PfCReperage.tex
index 96c2d6512d..0d4ba8b3d6 100644
--- a/macros/latex/contrib/profcollege/latex/PfCReperage.tex
+++ b/macros/latex/contrib/profcollege/latex/PfCReperage.tex
@@ -1,12 +1,13 @@
%%%
% 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,CouleurMercure=black,Celsius,Kelvin=false,Farenheit=false,ValeurMin=-4000,ValeurMax=4000,Etages=4,Code=false,Globe=false,Rho=1500,Phi=22,Theta=10,CouleurE=orange,CouleurG=green,Axes=false,TypeProj="persp"}
+\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,AffichageUnites=true,MarquePrimaire=true,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,CouleurMercure=black,Celsius,Kelvin=false,Farenheit=false,ValeurMin=-4000,ValeurMax=4000,Etages=4,Code=false,Globe=false,Rho=1500,Phi=22,Theta=10,CouleurE=orange,CouleurG=green,Axes=false,TypeProj="persp",Niveaux=false}
\defKV[ClesReperage]{Traces=\setKV[ClesReperage]{Code}}
+\defKV[ClesReperage]{Niveau=\setKV[ClesReperage]{Etages=#1}\setKV[ClesReperage]{Niveaux}}
% ValeurOrigine permet de faire des morceaux de demi-droite gradu\'ee en passant par droite :)
\def\Updatetoksdroite#1/#2\nil{\addtotok\toklistepointdroite{#1,"#2",}}
-\def\Updatetoksdroite#1/#2\nil{\addtotok\toklistepointdroite{#1,"#2",}}
+%\def\Updatetoksdroite#1/#2\nil{\addtotok\toklistepointdroite{#1,"#2",}}
\def\Updatetoksdemidroite#1/#2\nil{\addtotok\toklistenompointdemidroite{"#2",}}
\def\Updatetoksrepere#1/#2/#3\nil{\addtotok\toklistepointrepere{#1,#2,"#3",}}
\def\Updatetoksespace#1/#2/#3/#4\nil{\addtotok\toklistepointespace{#1,#2,#3,"#4",}}
@@ -48,6 +49,7 @@
\def\MPGlobe#1#2{%
\ifluatex
+ \mplibnumbersystem{double}
\mplibforcehmode
\begin{mplibcode}
input PfCSolid;
@@ -89,7 +91,6 @@
AffichagePfC2;
% AffichageObjet2;
if \useKV[ClesReperage]{Axes}:
- TraceAxes;
drawoptions(withpen pencircle scaled 1.05 withcolor CouleurE);
AffichageEquateur3;
drawoptions(withpen pencircle scaled 1 withcolor CouleurG);
@@ -1424,8 +1425,10 @@
AffichageGrad:=\AffichageGrad;
AffichageCoord:=\useKV[ClesReperage]{AffichageAbs};
AffichageNom:=\AffichageNom;
- boolean DemiDroite;
+ boolean DemiDroite,AffichageUnites,MarquePrimaire;
DemiDroite=\useKV[ClesReperage]{DemiDroite};
+ AffichageUnites=\useKV[ClesReperage]{AffichageUnites};
+ MarquePrimaire=\useKV[ClesReperage]{MarquePrimaire};
numeric valeur[];
vardef titi(text t)=
n:=0;
@@ -1452,15 +1455,15 @@
if minx>(-pasx-1):
minx:=-2*pasx-1;
fi;
+ if DemiDroite:
+ minx:=0;
+ fi;
if minx<\useKV[ClesReperage]{ValeurMin}:
minx:=\useKV[ClesReperage]{ValeurMin};
fi;
if maxx>\useKV[ClesReperage]{ValeurMax}:
maxx:=\useKV[ClesReperage]{ValeurMax};
fi;
- if DemiDroite:
- minx:=0;
- fi;
% -----
pair A,B,C;
A=(0,0);
@@ -1480,25 +1483,29 @@
draw marquedemidroite(C,B);
draw marquesegment((k/maxx)[A,B],((k+1)/maxx)[A,B]);
endfor;
- else:
+ else:
for k=(minx) step 2 until (maxx-1):
draw marquesegment((k/maxx)[A,B],((k+1)/maxx)[A,B]);
- endfor;
- fi;
+ endfor;
+ fi;
% marquage primaire
marque_s:=marque_s*3;
- for k=0 step pasx until (maxx-pasx):
+ if MarquePrimaire:
+ for k=0 step pasx until (maxx-pasx):
draw marquesegment((k/maxx)[A,B],((k+pasx)/maxx)[A,B]);
endfor;
for k=0 step -pasx until (minx+pasx):
draw marquesegment((k/maxx)[A,B],((k-pasx)/maxx)[A,B]);
endfor;
+ fi;
% marquage des points
m_c:=m_c*3;
marque_p:="croix";
labeloffset:=labeloffset*3;
+ if AffichageUnites:
label.bot(TEX("\footnotesize\num{"&decimal(ValeurUnitex)&"}"),unitex*(1,0));
label.bot(TEX("\footnotesize\num{"&decimal(ValeurOrigine)&"}"),A);
+ fi;
if AffichageGrad>0:
for k=((minx+(minx mod pasx)) div pasx) upto (maxx div pasx):
if (k<0) or (k>1):
@@ -1531,7 +1538,7 @@
if ACoord=3:
drawarrow ((unitp*valeur[n],-7mm))--((unitp*valeur[n],-3mm));
label.bot(btex \hbox to2em{\dotfill} etex,((unitp*valeur[n],-8mm)));
- pointe(unitp*(valeur[n]-ValeurOrigine,0));
+ pointe(unitp*(valeur[n],0));
elseif ACoord=2:
if ((ValeurUnitex*valeur[n]) mod pasx)<>0:
label.bot(TEX("\footnotesize$\frac{\num{\fpeval{"&decimal(ValeurOrigine*pasx)&"+"&decimal(ValeurUnitex-ValeurOrigine)&"*"&decimal(valeur[n])&"}}}{\num{"&decimal(pasx)&"}}$"),unitp*(valeur[n],0));
@@ -2280,4 +2287,144 @@ label.lft(LATEX("\noexpand\footnotesize\noexpand\SI{\noexpand\fpeval{"&decimal(V
\foreachitem\compteur\in\ListePointDroite{\xdef\Listedesvaleursaplacersurlademidroite{\Listedesvaleursaplacersurlademidroite,\ListePointDroite[\compteurcnt,1]}}%
\MPNewDROITEGradueeMulti{\Listedesvaleursaplacersurlademidroite}{\the\toklistenompointdemidroite}%
\setsepchar{,}%
+}%
+
+\def\MPMultiZoom#1#2#3{%
+ % #1 : liste des points \`a placer en pas. pour g\'erer le cas des rep\'erages fractionnaires
+ % #2 : liste des noms des points
+ % #3 : la décomposition du nombre à placer
+ \ifluatex
+ \mplibforcehmode
+ \begin{mplibcode}
+ unitex:=\useKV[ClesReperage]{Unitex}*cm;
+ pasx:=10;
+ unitp:=unitex/pasx;
+ ValeurUnitex:=\useKV[ClesReperage]{ValeurUnitex};
+ ValeurOrigine:=\useKV[ClesReperage]{ValeurOrigine};
+ AffichageGrad:=\AffichageGrad;
+ AffichageCoord:=\useKV[ClesReperage]{AffichageAbs};
+ AffichageNom:=\AffichageNom;
+ NbEtages:=\useKV[ClesReperage]{Etages};
+ EtagesMax=\LongueurPartieDecimale;
+ numeric valeur[];
+ vardef titi(text t)=
+ n:=0;
+ for p_=t:
+ n:=n+1;
+ valeur[n]=p_;
+ endfor;
+ enddef;
+ titi(#1);
+ vardef toto(text t)=
+ n:=0;
+ for p_=t:
+ n:=n+1;
+ decomp[n]=p_;
+ endfor;
+ enddef;
+ toto(#3);
+ % Détermination des abscisses maximale et minimale
+ minx=floor(0);
+ maxx=ceiling(10);
+% % -----
+ pair A[],B[],C[];
+ for l=0 upto (NbEtages-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
+ if floor(valeur[1]*(10**l))>0:
+ drawarrow (C[l]+unitp*(-0.75,0))--(B[l]+unitp*(0.75,0));
+ else:
+ drawarrow A[l]--(B[l]+unitp*(0.75,0));
+ fi;
+ % 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;
+ for k=0 upto (\useKV[ClesReperage]{Etages}-2):
+ lp:=decomp[k+2];
+ draw ((lp/10)[A[k],B[k]]--((lp+1)/10)[A[k],B[k]]) withpen pencircle scaled 1.5;
+ 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;
+ if lp>0:
+ label.bot(TEX("\footnotesize\num{\fpeval{floor("&decimal(valeur[1])&","&decimal(k+1)&")}}"),(lp/10)[A[k],B[k]]+(0,6mm));
+ fi;
+ if lp<9:
+ label.bot(TEX("\footnotesize\num{\fpeval{ceil("&decimal(valeur[1])&","&decimal(k+1)&")}}"),((lp+1)/10)[A[k],B[k]]+(0,6mm));
+ fi;
+ endfor;
+ Decomp=0;
+ for k=0 upto (NbEtages-1):
+ label.bot(TEX("\footnotesize\num{\fpeval{floor("&decimal(valeur[1])&","&decimal(k)&")}}"),A[k]+(0,6mm));
+ label.bot(TEX("\footnotesize\num{\fpeval{ceil("&decimal(valeur[1])&","&decimal(k)&")}}"),B[k]+(0,6mm));
+ endfor;
+ vardef tata(text t)=%on place les points
+ labeloffset:=labeloffset*2;
+ if AffichageNom>0:
+ for p_=t:
+ label.top(TEX("\footnotesize"&p_),unitp*(decomp[NbEtages+1],0)+(0,(-\useKV[ClesReperage]{Etages}+1)*cm));
+ endfor;
+ fi;
+ if AffichageCoord=3:
+ for p_=t:
+ drawarrow (unitp*(decomp[NbEtages+1],-1)+(0,(-\useKV[ClesReperage]{Etages}+1)*cm))--(unitp*(decomp[NbEtages+1],-0.3)+(0,(-\useKV[ClesReperage]{Etages}+1)*cm));
+ label.bot(TEX("\hbox to4em{\dotfill}"),(unitp*(decomp[NbEtages+1],-1))+(0,(-NbEtages+0.8)*cm));
+ endfor;
+ else:
+ label.bot(TEX("\footnotesize\num{\fpeval{"&decimal(valeur[1])&"}}"),unitp*(decomp[NbEtages+1],0)+(0,(-\useKV[ClesReperage]{Etages}+1)*cm));
+ fi;
+ labeloffset:=labeloffset/2;
+ enddef;
+ %%%
+ if NbEtages=EtagesMax:
+ tata(#2);
+ fi;
+ \end{mplibcode}
+ \fi
+}
+
+\NewDocumentCommand\ReperageZoom{o m}{%
+ \useKVdefault[ClesReperage]%
+ \setKV[ClesReperage]{#1}%
+ \setsepchar[*]{,*/}\ignoreemptyitems%
+ \readlist*\ListePointDroite{#2}%
+ \StrBefore{\ListePointDroite[1,1]}{.}[\PartieEntiere]%
+ \StrBehind{\ListePointDroite[1,1]}{.}[\PartieDecimale]%
+ \StrLen{\PartieDecimale}[\LongueurPartieDecimale]%
+ \ifboolKV[ClesReperage]{Niveaux}{}{
+ \setKV[ClesReperage]{Etages=\LongueurPartieDecimale}%
+ }
+ \xdef\Foo{\PartieEntiere}%
+ \xintFor* ##1 in {\xintSeq{1}{\LongueurPartieDecimale}}\do{%
+ \StrChar{\PartieDecimale}{##1}[\LettreActuelle]%
+ \xdef\Foo{\Foo,\LettreActuelle}%
+ }%
+ \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]}}%
+ \MPMultiZoom{\Listedesvaleursaplacersurlademidroite}{\the\toklistenompointdemidroite}{\Foo}%
+ \setsepchar{,}%
}% \ No newline at end of file
diff --git a/macros/latex/contrib/profcollege/latex/PfCRepresenterTableur.tex b/macros/latex/contrib/profcollege/latex/PfCRepresenterTableur.tex
index 8f15672708..fd505aa3e0 100644
--- a/macros/latex/contrib/profcollege/latex/PfCRepresenterTableur.tex
+++ b/macros/latex/contrib/profcollege/latex/PfCRepresenterTableur.tex
@@ -59,21 +59,21 @@
wc{20pt}Y*{\fpeval{\useKV[Tableur]{Colonnes}-1}}{X}}[hvlines]%
\CodeBefore
% on colorie en gris toute la première ligne
- \tikz\draw[fill=gray!15](row-1-|col-1) rectangle (row-2-|last);%
+ \tikz\fill[gray!15](row-1-|col-1) rectangle (row-2-|last);%
% on colorie en gris toute la première colonne
- \tikz\draw[fill=gray!15](row-1-|col-1) rectangle (last-|col-2);%
+ \tikz\fill[gray!15](row-1-|col-1) rectangle (last-|col-2);%
%
\xintifboolexpr{\useKV[Tableur]{Ligne}==0 || \useKV[Tableur]{Colonne}==0}{}{%
\ifboolKV[Tableur]{Selection}{%
\xdef\PfCTabCouleur{\useKV[Tableur]{Couleur}}%
% on colorie les cellules sans les tracer
- \tikz\draw[fill=\PfCTabCouleur!50](row-\fpeval{\useKV[Tableur]{Ligne}+1}-|col-\fpeval{\useKV[Tableur]{Colonne}+1}) rectangle (row-\fpeval{\useKV[Tableur]{Ligne}+1+\useKV[Tableur]{PasL}}-|col-\fpeval{\useKV[Tableur]{Colonne}+1+\useKV[Tableur]{PasC}});%
+ \tikz\fill[\PfCTabCouleur!50](row-\fpeval{\useKV[Tableur]{Ligne}+1}-|col-\fpeval{\useKV[Tableur]{Colonne}+1}) rectangle (row-\fpeval{\useKV[Tableur]{Ligne}+1+\useKV[Tableur]{PasL}}-|col-\fpeval{\useKV[Tableur]{Colonne}+1+\useKV[Tableur]{PasC}});%
% on trace la première cellule qui a servi à sélectionner
\tikz\draw[line width=1.25pt,fill=\PfCTabCouleur!50](row-\fpeval{\useKV[Tableur]{Ligne}+1}-|col-\fpeval{\useKV[Tableur]{Colonne}+1}) rectangle (row-\fpeval{\useKV[Tableur]{Ligne}+1+1}-|col-\fpeval{\useKV[Tableur]{Colonne}+1+1});%
% on colorie la zone nécessaire sur la première ligne
- \tikz\draw[fill=\PfCTabCouleur](row-1-|col-\fpeval{\useKV[Tableur]{Colonne}+1}) rectangle (row-2-|col-\fpeval{\useKV[Tableur]{Colonne}+1+\useKV[Tableur]{PasC}});%
+ \tikz\fill[\PfCTabCouleur](row-1-|col-\fpeval{\useKV[Tableur]{Colonne}+1}) rectangle (row-2-|col-\fpeval{\useKV[Tableur]{Colonne}+1+\useKV[Tableur]{PasC}});%
% on colorie la zone nécessaire sur la première colonne
- \tikz\draw[fill=\PfCTabCouleur](row-\fpeval{\useKV[Tableur]{Ligne}+1}-|col-1) rectangle (row-\fpeval{\useKV[Tableur]{Ligne}+1+\useKV[Tableur]{PasL}}-|col-2);%
+ \tikz\fill[\PfCTabCouleur](row-\fpeval{\useKV[Tableur]{Ligne}+1}-|col-1) rectangle (row-\fpeval{\useKV[Tableur]{Ligne}+1+\useKV[Tableur]{PasL}}-|col-2);%
}{%
\tikz\draw[line width=1.25pt](row-\fpeval{\useKV[Tableur]{Ligne}+1}-|col-\fpeval{\useKV[Tableur]{Colonne}+1}) rectangle (row-\fpeval{\useKV[Tableur]{Ligne}+1+\useKV[Tableur]{PasL}}-|col-\fpeval{\useKV[Tableur]{Colonne}+1+\useKV[Tableur]{PasC}});%
}%
diff --git a/macros/latex/contrib/profcollege/latex/PfCRondeInfernale.tex b/macros/latex/contrib/profcollege/latex/PfCRondeInfernale.tex
index 8426646d55..7917c5138b 100644
--- a/macros/latex/contrib/profcollege/latex/PfCRondeInfernale.tex
+++ b/macros/latex/contrib/profcollege/latex/PfCRondeInfernale.tex
@@ -46,17 +46,25 @@
\fi
}
-\setKVdefault[RondeInfernale]{Solution=false,Relatifs=false,Etapes=4,Perso=false,Cles=false,Vide,Rayon=2.5cm,Graines=false,Rectangle=false}%
-\defKV[RondeInfernale]{Graine=\setKV[RondeInfernale]{Graines}}%
+\setKVdefault[RondeInfernale]{Solution=false,Relatifs=false,Etapes=4,Perso=false,Cles=false,Vide,Rayon=2.5cm,Rectangle=false}%
+\defKV[RondeInfernale]{Graine=\PfCGraineAlea{#1}}
\defKV[RondeInfernale]{Cle=\setKV[RondeInfernale]{Cles}\setKV[RondeInfernale]{Vide=false}}%
\defKV[RondeInfernale]{ListeOperations=\setKV[RondeInfernale]{Perso}}%
\defKV[RondeInfernale]{ListeNombres=\setKV[RondeInfernale]{Perso}}%
-%
-\NewDocumentCommand\RondeInfernale{o}{%
+%
+
+\NewDocumentCommand\RondeInfernale{ }{%Mise en place pour les germanistes : le " est actif :(
+ \begingroup
+ \catcode`\"12
+ \RondeInfernaleaux
+}%
+
+\NewDocumentCommand\RondeInfernaleaux{o}{%
+ \endgroup
\useKVdefault[RondeInfernale]%
\setKV[RondeInfernale]{#1}%
% Graine
- \ifboolKV[RondeInfernale]{Graines}{\PfCGraineAlea{\useKV[RondeInfernale]{Graine}}}{}%
+% \ifboolKV[RondeInfernale]{Graines}{\PfCGraineAlea{\useKV[RondeInfernale]{Graine}}}{}%
% Nombre clé
\ifboolKV[RondeInfernale]{Cles}{%
\xdef\PfCRINombreCle{\useKV[RondeInfernale]{Cle}}%
diff --git a/macros/latex/contrib/profcollege/latex/PfCRose.tex b/macros/latex/contrib/profcollege/latex/PfCRose.tex
index 2c8ff3fd06..e238d42390 100644
--- a/macros/latex/contrib/profcollege/latex/PfCRose.tex
+++ b/macros/latex/contrib/profcollege/latex/PfCRose.tex
@@ -1,20 +1,257 @@
%%%
% Rose
%%%
-\setKVdefault[ClesRose]{Vide=false,Couleur=white,Produits=false,Solution=false,Rayon=2cm,Petales=7,Aide=false,FacteurMin=2,FacteurMax=10,ProduitVide=false,CaseVide=false,Polygone=false,Nom=Rose1}%
+\setKVdefault[ClesRose]{Vide=false,Couleur=white,Produits=false,Solution=false,Rayon=2cm,Petales=7,Aide=false,FacteurMin=2,FacteurMax=10,ProduitVide=false,CaseVide=false,Polygone=false,Nom=Rose1,Creation=false,Addition=false}%
+\defKV[ClesRose]{LesNombres=\setKV[ClesRose]{Creation}}%
+\defKV[ClesRose]{LesProduits=\setKV[ClesRose]{Creation}}%
+\defKV[ClesRose]{LesSommes=\setKV[ClesRose]{Addition}}%
+
+\def\UpdatetoksRM#1\nil{\addtotok\toklisterosemul{"#1",}}%
\NewDocumentCommand\RoseMul{o}{%
+ \newtoks\toklisterosemul%
\useKVdefault[ClesRose]%
\setKV[ClesRose]{#1}%
- \ifluatex%
- \ifboolKV[ClesRose]{Solution}{%
- \DessineRoseMulSol%
+ \ifboolKV[ClesRose]{Creation}{%
+ \xdef\PfCFooRoseMul{\useKV[ClesRose]{LesNombres}}%
+ \ifboolKV[ClesRose]{Addition}{%
+ \xdef\PfCFooRoseMul{\PfCFooRoseMul,\useKV[ClesRose]{LesSommes}}%
+ }{%
+ \xdef\PfCFooRoseMul{\PfCFooRoseMul,\useKV[ClesRose]{LesProduits}}%
+ }%
+ \setsepchar{,}%
+ \readlist*\ListeCompleteRoseMul{\PfCFooRoseMul}%
+ \foreachitem\compteur\in\ListeCompleteRoseMul{\expandafter\UpdatetoksRM\compteur\nil}%
+ \xdef\PfCRetiensLesFacteurs{}%
+ \foreachitem\compteur\in\ListeCompleteRoseMul{%
+ \StrLen{\ListeCompleteRoseMul[\compteurcnt]}[\PfCLongueurArg]%
+ \ifnum\PfCLongueurArg>0\relax%
+ \xdef\PfCRetiensLesFacteurs{\PfCRetiensLesFacteurs \ListeCompleteRoseMul[\compteurcnt],}%
+ \else%
+ \xdef\PfCRetiensLesFacteurs{\PfCRetiensLesFacteurs "a",}%
+ \fi%
+ }%
+ \DessineRoseMulPerso{\the\toklisterosemul}{\PfCRetiensLesFacteurs}%
}{%
- \DessineRoseMul%
+ \ifluatex%
+ \ifboolKV[ClesRose]{Solution}{%
+ \DessineRoseMulSol%
+ }{%
+ \DessineRoseMul%
+ }%
+ \else%
+ \DessineRoseMul%
+ \fi%
}%
- \else%
- \DessineRoseMul%
- \fi%
+}%
+
+\def\DessineRoseMulPersoCode{%
+ pair A[],B[],O;
+ O=(0,0);
+ path cc;
+ cc=cercles(O,Rayon);
+ for k=0 upto Petales:
+ A[k]=pointarc(cc,(360/Petales)*k);
+ endfor;
+ for k=0 upto Petales-1:
+ B[k]=iso(A[k],A[k+1]);
+ endfor;
+ B[Petales]=B[0];
+ path BoiteRec;
+ if Polygone:
+ BoiteRec=(pointarc(fullcircle,0) for k=1 upto Petales:--pointarc(fullcircle,k*(360/Petales)) endfor --cycle) scaled 1u;
+ else:
+ 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;
+ fi;
+ % On récupère la liste des nombres et facteurs
+ vardef RecupListe(text t)=
+ nbpetales:=0;
+ nbfacteur:=0;
+ nbproduit:=0;
+ numfacteurconnu:=0;
+ for p_=t:
+ if nbpetales<Petales:
+ if string p_:
+ else:
+ Facteur[nbfacteur]=p_;
+ NumFacteurConnu[numfacteurconnu]=nbfacteur;
+ FacteurConnu[numfacteurconnu]=p_;
+ numfacteurconnu:=numfacteurconnu+1;
+ fi;
+ nbfacteur:=nbfacteur+1;
+ else:
+ if string p_:
+ else:
+ Produit[nbproduit]=p_;
+ fi;
+ nbproduit:=nbproduit+1;
+ fi;
+ nbpetales:=nbpetales+1;
+ endfor;
+ if unknown Facteur[0]:
+ else:
+ Facteur[Petales]=Facteur[0];
+ fi;
+ if unknown Produit[0]:
+ else:
+ Produit[Petales]=Produit[0];
+ fi;
+ TotalFacteursConnus:=numfacteurconnu;
+ enddef;
+ %
+ vardef RechercheFacteurs=
+ if Solution:
+ for k=1 upto TotalFacteursConnus:
+ for l=(NumFacteurConnu[k-1]) downto 0:
+ if (known Produit[l-1]):
+ if (known Facteur[l]):
+ FacteurSol[l-1]:=Produit[l-1]/Facteur[l];
+ Facteur[l-1]:=FacteurSol[l-1];
+ fi;
+ fi;
+ endfor;
+ for l=(NumFacteurConnu[k-1]) upto Petales-1:
+ if (known Produit[l]):
+ if (known Facteur[l]):
+ FacteurSol[l+1]:=Produit[l]/Facteur[l];
+ Facteur[l+1]:=FacteurSol[l+1];
+ fi;
+ fi;
+ endfor;
+ endfor;
+ fi;
+ enddef;
+ vardef RechercheTermes=
+ if Solution:
+ for k=1 upto TotalFacteursConnus:
+ for l=(NumFacteurConnu[k-1]) downto 0:
+ if (known Produit[l-1]):
+ if (known Facteur[l]):
+ FacteurSol[l-1]:=Produit[l-1]-Facteur[l];
+ Facteur[l-1]:=FacteurSol[l-1];
+ fi;
+ fi;
+ endfor;
+ for l=(NumFacteurConnu[k-1]) upto Petales-1:
+ if (known Produit[l]):
+ if (known Facteur[l]):
+ FacteurSol[l+1]:=Produit[l]-Facteur[l];
+ Facteur[l+1]:=FacteurSol[l+1];
+ fi;
+ fi;
+ endfor;
+ endfor;
+ fi;
+ enddef;
+ % on labelise
+ vardef AffichagedelaListe(text t)=
+ nbpetales:=0;
+ for p_=t:
+ if nbpetales<Petales:
+ if p_="":
+ if Solution:
+ fill rotation(polygone(O,B[Petales-1],A[0],B[Petales]),O,nbpetales*(360/Petales)) withcolor Fond;
+ if unknown FacteurSol[nbpetales]:
+ else:
+ label(TEX("\num{"&decimal(FacteurSol[nbpetales])&"}"),(0.5[O,A[nbpetales]]-center BoiteRec));
+ fi;
+ fi;
+ else:
+ label(TEX("\num{"&p_&"}"),(0.5[O,A[nbpetales]]-center BoiteRec));
+ fi;
+ else:
+ if p_="":
+ if Solution:
+ fill (BoiteRec shifted (B[nbpetales-Petales]+0.5*Rayon*unitvector(B[nbpetales-Petales]))) withcolor Fond;
+ if Addition:
+ label(TEX("\num{\noexpand\fpeval{"&decimal(Facteur[nbpetales-Petales])&"+"&decimal(Facteur[nbpetales+1-Petales])&"}}"),(B[nbpetales-Petales]+0.5*Rayon*unitvector(B[nbpetales-Petales])));
+ else:
+ label(TEX("\num{\noexpand\fpeval{"&decimal(Facteur[nbpetales-Petales])&"*"&decimal(Facteur[nbpetales+1-Petales])&"}}"),(B[nbpetales-Petales]+0.5*Rayon*unitvector(B[nbpetales-Petales])));
+ fi;
+ fi;
+ else:
+ label(TEX("\num{"&p_&"}"),(B[nbpetales-Petales]+0.5*Rayon*unitvector(B[nbpetales-Petales])));
+ fi;
+ fi;
+ nbpetales:=nbpetales+1;
+ endfor;
+ enddef;
+}
+
+\NewDocumentCommand\DessineRoseMulPerso{mm}{%
+ \ifluatex%
+ \mplibforcehmode%
+ \begin{mplibcode}
+ Rayon=\useKV[ClesRose]{Rayon};
+ boolean Aide,Solution,Polygone,Addition;
+ Aide=\useKV[ClesRose]{Aide};
+ Solution=\useKV[ClesRose]{Solution};
+ Addition=\useKV[ClesRose]{Addition};
+ Polygone=\useKV[ClesRose]{Polygone};
+ Petales=\useKV[ClesRose]{Petales};
+ color Fond;
+ Fond=\useKV[ClesRose]{Couleur};
+ \DessineRoseMulPersoCode
+ RecupListe(#2);
+ if Addition:
+ RechercheTermes;
+ else:
+ RechercheFacteurs;
+ fi;
+ AffichagedelaListe(#1);
+ if Aide:
+ for k=0 upto Petales-1:
+ drawarrow (0.5[O,A[k]]--1.75[O,B[k]]) cutbefore segment(A[k],A[k+1]) cutafter BoiteRec shifted (B[k]+0.5*Rayon*unitvector(B[k])) 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 (B[k]+0.5*Rayon*unitvector(B[k])) dashed evenly scaled 0.5;
+ endfor;
+ fi;
+ trace A0 for k=1 upto Petales:--A[k] endfor --cycle;
+ for k=0 upto Petales-1:
+ trace segment(O,B[k]) dashed withdots scaled 0.25;
+ draw BoiteRec shifted (B[k]+0.5*Rayon*unitvector(B[k])) dashed evenly scaled 0.5;
+ endfor;
+ fill cercles(O,3mm) withcolor white;
+ draw cercles(O,3mm);
+ if Addition:
+ label(TEX("\Large$+$"),O);
+ else:
+ label(TEX("\Large$\times$"),O);
+ fi;
+ \end{mplibcode}
+ \else
+ \begin{mpost}[mpsettings={Rayon:=\useKV[ClesRose]{Rayon};
+ boolean Aide,Solution,Polygone;
+ Aide:=\useKV[ClesRose]{Aide};
+ Solution:=\useKV[ClesRose]{Solution};
+ Polygone:=\useKV[ClesRose]{Polygone};
+ Petales:=\useKV[ClesRose]{Petales};
+ color Fond;
+ Fond:=\useKV[ClesRose]{Couleur};
+ \PfCDessineRoseMulPersoCode
+ }]
+ RecupListe(#2);
+ RechercheFacteurs;
+ AffichagedelaListe(#1);
+ if Aide:
+ for k=0 upto Petales-1:
+ drawarrow (0.5[O,A[k]]--1.75[O,B[k]]) cutbefore segment(A[k],A[k+1]) cutafter BoiteRec shifted (B[k]+0.5*Rayon*unitvector(B[k])) 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 (B[k]+0.5*Rayon*unitvector(B[k])) dashed evenly scaled 0.5;
+ endfor;
+ fi;
+ trace A0 for k=1 upto Petales:--A[k] endfor --cycle;
+ for k=0 upto Petales-1:
+ trace segment(O,B[k]) dashed withdots scaled 0.25;
+ draw BoiteRec shifted (B[k]+0.5*Rayon*unitvector(B[k])) dashed evenly scaled 0.5;
+ endfor;
+ fill cercles(O,4mm) withcolor white;
+ draw cercles(O,4mm);
+ if Addition:
+ label(TEX("\Huge$+$"),O);
+ else:
+ label(TEX("\Huge$\times$"),O);
+ fi;
+ \end{mpost}
+ \fi
}%
\newcommand\DessineRoseMulSol{%
@@ -22,7 +259,8 @@
\mplibforcehmode%
\xdef\PfCNomRose{\useKV[ClesRose]{Nom}}%
\begin{mplibcode}[\PfCNomRose]
- boolean Aide,Produits,Solution,Vide,ProduitVide,CaseVide,Polygone;
+ boolean Aide,Produits,Solution,Vide,ProduitVide,CaseVide,Polygone,Addition;
+ Addition=\useKV[ClesRose]{Addition};
Aide:=\useKV[ClesRose]{Aide};
Vide:=\useKV[ClesRose]{Vide};
Solution:=\useKV[ClesRose]{Solution};
@@ -71,6 +309,13 @@
trace segment(O,B[k]) dashed withdots scaled 0.25;
draw BoiteRec shifted (B[k]+0.5*Rayon*unitvector(B[k])) dashed evenly scaled 0.5;
endfor;
+ fill cercles(O,3mm) withcolor white;
+ draw cercles(O,3mm);
+ if Addition:
+ label(TEX("\Large$+$"),O);
+ else:
+ label(TEX("\Large$\times$"),O);
+ fi;
\end{mplibcode}
\fi
}
@@ -108,7 +353,8 @@
enddef;
pair A[],B[],O;
Rayon:=\useKV[ClesRose]{Rayon};
- boolean Aide,Produits,Solution,Vide,ProduitVide,CaseVide,Polygone;
+ boolean Aide,Produits,Solution,Vide,ProduitVide,CaseVide,Polygone,Addition;
+ Addition=\useKV[ClesRose]{Addition};
Aide:=\useKV[ClesRose]{Aide};
Vide:=\useKV[ClesRose]{Vide};
Solution:=\useKV[ClesRose]{Solution};
@@ -145,7 +391,11 @@
endfor;
Facteur[Petales]:=Facteur[0];
for k=0 upto Petales-1:
+ if Addition:
+ Produit[k]:=Facteur[k]+Facteur[k+1];
+ else:
Produit[k]:=Facteur[k]*Facteur[k+1];
+ fi;
endfor;
%on labelise
if Vide=false:
@@ -187,6 +437,13 @@
trace segment(O,B[k]) dashed withdots scaled 0.25;
draw BoiteRec shifted (B[k]+0.5*Rayon*unitvector(B[k])) dashed evenly scaled 0.5;
endfor;
+ fill cercles(O,3mm) withcolor white;
+ draw cercles(O,3mm);
+ if Addition:
+ label(TEX("\Large$+$"),O);
+ else:
+ label(TEX("\Large$\times$"),O);
+ fi;
\end{mplibcode}
\else
\begin{mpost}[mpsettings={Rayon:=\useKV[ClesRose]{Rayon};
@@ -297,6 +554,13 @@
trace segment(O,B[k]) dashed withdots scaled 0.25;
draw BoiteRec shifted (B[k]+0.5*Rayon*unitvector(B[k])) dashed evenly scaled 0.5;
endfor;
+ fill cercles(O,3mm) withcolor white;
+ draw cercles(O,3mm);
+ if Addition:
+ label(TEX("\Large$+$"),O);
+ else:
+ label(TEX("\Large$\times$"),O);
+ fi;
\end{mpost}
\fi
}% \ No newline at end of file
diff --git a/macros/latex/contrib/profcollege/latex/PfCSolides.tex b/macros/latex/contrib/profcollege/latex/PfCSolides.tex
index ef0829af90..7ae73c4b00 100644
--- a/macros/latex/contrib/profcollege/latex/PfCSolides.tex
+++ b/macros/latex/contrib/profcollege/latex/PfCSolides.tex
@@ -8,8 +8,9 @@
\newcommand\MPSolideCylindre[3]{%
\ifluatex
- \mplibforcehmode
- \begin{mplibcode}
+ \mplibnumbersystem{double}
+ \mplibforcehmode
+ \begin{mplibcode}
input PfCSolid;
boolean NommeSommets,Code,Sections,Axes,RemplisSection;
@@ -213,6 +214,7 @@
\newcommand\MPSolidePyramide[4]{%
\ifluatex
+ \mplibnumbersystem{double}
\mplibforcehmode
\begin{mplibcode}
@@ -384,6 +386,7 @@
\newcommand\MPSolideCone[3]{%
\ifluatex
+ \mplibnumbersystem{double}
\mplibforcehmode
\begin{mplibcode}
boolean NommeSommets,Code,Sections,Axes,RemplisSection;
@@ -534,6 +537,7 @@
\newcommand\MPSolidePave[5]{%
\ifluatex
+ \mplibnumbersystem{double}
\mplibforcehmode
\begin{mplibcode}
input PfCSolid;
@@ -710,6 +714,7 @@
\newcommand\MPSolideSphere[3]{%
\ifluatex
+ \mplibnumbersystem{double}
\mplibforcehmode
\begin{mplibcode}
boolean NommeSommets,Code,Sections,Axes,RemplisSection;
@@ -866,5 +871,8 @@
{sphere}{%
\MPSolideSphere{\useKV[ClesSolides]{ListeSommets}}{\the\toksolidelistesommets}{\useKV[ClesSolides]{PointsSection}}%
}%
+ {boule}{%
+ \MPSolideSphere{\useKV[ClesSolides]{ListeSommets}}{\the\toksolidelistesommets}{\useKV[ClesSolides]{PointsSection}}%
+ }%
}%
}% \ No newline at end of file
diff --git a/macros/latex/contrib/profcollege/latex/PfCStatistiques.tex b/macros/latex/contrib/profcollege/latex/PfCStatistiques.tex
index 75913cc025..37952adfda 100644
--- a/macros/latex/contrib/profcollege/latex/PfCStatistiques.tex
+++ b/macros/latex/contrib/profcollege/latex/PfCStatistiques.tex
@@ -16,7 +16,7 @@
FreqVide=false,AngVide=false,ECCVide=false,TotalVide=false,Sondage=false,Liste=false,%
Tableau=false,Stretch=1,Frequence=false,EffectifTotal=false,%
Etendue=false,Moyenne=false,SET=false,ValeurExacte=false,MoyenneA,Somme,Mediane=false,DetailsMediane=false,UneMediane=false,QuartileUn=false,QuartileTrois=false,Total=false,Concret=false,%
-Largeur=1cm,Precision=2,PrecisionF=0,Donnee=Valeurs,Effectif=Effectif,Grille=false,Origine=0,Angle=false,SemiAngle=false,Qualitatif=false,Classes=false,TableauVide=false,ECC=false,Coupure=10,CouleurTab=gray!15,Graphique=false,Batons=true,%
+Largeur=1cm,Precision=2,PrecisionF=0,Donnee=Valeurs,Effectif=Effectif,Grille=false,Origine=0,Angle=false,SemiAngle=false,Qualitatif=false,Classes=false,TableauVide=false,ECC=false,Coupure=10,CouleurTab=gray!15,Graphique=false,Batons=true,Centre=false,CentreVide=false,Crochets=false,%
% Pour les diags batons
EpaisseurBatons=1,ListeCouleursB={a},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,CouleurDefaut=black,Date=false,GrandNombrey=false,GrandNombrex=false,%
% Pour les diags circulaires
@@ -1303,11 +1303,14 @@ Histogramme=false,UniteAire=1,MemeAmpli,DepartHisto=1%
\columncolor{\useKV[ClesStat]{CouleurTab}}{1}%
\Body
\useKV[ClesStat]{Donnee}\xintFor* ##1 in{\xintSeq{1}{\ListeDepartlen}}\do{%
- &$\num{\ListeDepart[##1,1]}\leqslant\dots<\num{\ListeDepart[##1,2]}$
+ &\ifboolKV[ClesStat]{Crochets}{$[\num{\ListeDepart[##1,1]}\,;\,\num{\ListeDepart[##1,2]}[$}{$\num{\ListeDepart[##1,1]}\leqslant\dots<\num{\ListeDepart[##1,2]}$}%
}\\
\useKV[ClesStat]{Effectif}\xintFor* ##1 in{\xintSeq{1}{\ListeDepartlen}}\do{%
&\ifboolKV[ClesStat]{EffVide}{}{\num{\ListeDepart[##1,3]}}%
- }\\
+ }\\
+ % centre
+ \ifboolKV[ClesStat]{Centre}{\stepcounter{PfCCompteLignes}Centre de la classe\xintFor* ##1 in {\xintSeq {1}{\ListeDepartlen}}\do{&\ifboolKV[ClesStat]{TableauVide}{}{\ifboolKV[ClesStat]{CentreVide}{}{\num{\fpeval{\ListeDepart[##1,2]-\ListeDepart[##1,1]}}}}}\\}{}%
+ %
\ifboolKV[ClesStat]{Frequence}{\stepcounter{PfCCompteLignes}Fr\'equence (\%)\xintFor* ##1 in {\xintSeq {1}{\ListeDepartlen}}\do{&\ifboolKV[ClesStat]{TableauVide}{}{\ifboolKV[ClesStat]{FreqVide}{}{\num{\CalculFrequenceClasses{##1}}}}}\\
}{}%
\ifboolKV[ClesStat]{ECC}{\stepcounter{PfCCompteLignes}E.C.C.\xintFor* ##1 in {\xintSeq {1}{\ListeDepartlen}}\do{&\ifboolKV[ClesStat]{TableauVide}{}{\ifboolKV[ClesStat]{ECCVide}{}{\CalculECCClasses{##1}}}}\\}{}%
@@ -1344,6 +1347,7 @@ Histogramme=false,UniteAire=1,MemeAmpli,DepartHisto=1%
\NewDocumentCommand\MPBuildHisto{mmmm}{%
\ifluatex
+% \mplibnumbersystem{double}
\mplibforcehmode
\begin{mplibcode}
maxx:=-infinity;
@@ -1396,8 +1400,8 @@ Histogramme=false,UniteAire=1,MemeAmpli,DepartHisto=1%
fi;
endfor;
enddef;
- % on r\'ecup\`ere les couleurs
Depart=\useKV[ClesStat]{DepartHisto};
+ % on r\'ecup\`ere les couleurs
color Col[],CoulDefaut;
CoulDefaut=white;
n:=0;
@@ -1486,11 +1490,11 @@ Histogramme=false,UniteAire=1,MemeAmpli,DepartHisto=1%
Ajout:=3;
fi;
drawoptions(withcolor 0.7white);
- for k=0 upto ((maxx-minx)/Pasx+2):
+ for k=0 upto ((maxx-minx)/Pasx+2+Depart):
trace (unitex*k,0)--(unitex*k,(maxy+Ajout)*unitey);%withcolor red;
endfor;
for k=0 upto (maxy+Ajout):
- trace (0,k*unitey)--(unitex*((maxx-minx)/Pasx+2),k*unitey);% withcolor blue;
+ trace (0,k*unitey)--(unitex*((maxx-minx)/Pasx+2+Depart),k*unitey);% withcolor blue;
endfor;
drawoptions();
enddef;
@@ -1603,13 +1607,13 @@ Histogramme=false,UniteAire=1,MemeAmpli,DepartHisto=1%
% fi;
fi;
% On trace l'axe des abscisses
- drawarrow (0,0)--unitex*((maxx-minx)/Pasx+2,0);
+ drawarrow (0,0)--unitex*((maxx-minx)/Pasx+2+Depart,0);
%On labelise l'axe des abscisses
dotlabel.bot(TEX("\num{"&decimal(X[1])&"}"),unitex*(Depart,0));
for k=2 step 2 until TotalAbscisses:
dotlabel.bot(TEX("\num{"&decimal(X[k])&"}"),unitex*(Depart+(X[k]-X[1])/Pasx,0));
endfor;
- label.rt(TEX("\useKV[ClesStat]{Donnee}"),(unitex*((maxx-minx)/Pasx+2),0));
+ label.rt(TEX("\useKV[ClesStat]{Donnee}"),(unitex*((maxx-minx)/Pasx+2+Depart),0));
%On affiche les données sup ou pas.
AfficheLegende(#2);
\end{mplibcode}
diff --git a/macros/latex/contrib/profcollege/latex/PfCTableauxUnites.tex b/macros/latex/contrib/profcollege/latex/PfCTableauxUnites.tex
index 8da863a7b1..23f8e431fe 100644
--- a/macros/latex/contrib/profcollege/latex/PfCTableauxUnites.tex
+++ b/macros/latex/contrib/profcollege/latex/PfCTableauxUnites.tex
@@ -9,6 +9,22 @@
\newlength\PfCTableauPuissances%
+\def\PfCCG{centaines de milliards}
+\def\PfCDG{dizaines de milliards}
+\def\PfCUG{unit\'es de milliards}
+\def\PfCCM{centaines de millions}
+\def\PfCDM{dizaines de millions}
+\def\PfCUM{unit\'es de millions}
+\def\PfCCm{centaines de milliers}
+\def\PfCDm{dizaines de milliers}
+\def\PfCUm{unit\'es de milliers}
+\def\PfCC{centaines}
+\def\PfCD{dizaines}
+\def\PfCU{unit\'es}
+\def\PfCd{dixi\`emes}
+\def\PfCc{centi\'emes}
+\def\PfCm{milli\`emes}
+
\newcommand\Tableau[2][]{%
\useKVdefault[ClesTableaux]%
\setKV[ClesTableaux]{#1}%
@@ -543,26 +559,26 @@
}%ok
\hline
\ifboolKV[ClesTableaux]{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}%
- &\Block[draw]{}{\fontsize{5}{5}\selectfont dizaines de millions}%
- &\Block[draw]{}{\fontsize{5}{5}\selectfont unit\'es de millions}%
+ \Block[draw]{}{\fontsize{\TailleFonte}{\TailleFonte}\selectfont\PfCCG}%
+ &\Block[draw]{}{\fontsize{5}{5}\selectfont\PfCDG}%
+ &\Block[draw]{}{\fontsize{5}{5}\selectfont\PfCUG}%
+ &\Block[draw]{}{\fontsize{5}{5}\selectfont\PfCCM}%
+ &\Block[draw]{}{\fontsize{5}{5}\selectfont\PfCDM}%
+ &\Block[draw]{}{\fontsize{5}{5}\selectfont\PfCUM}%
&
}{}
\ifboolKV[ClesTableaux]{Millions}{%
- \Block[draw]{}{\fontsize{5}{5}\selectfont centaines de millions}%
- &\Block[draw]{}{\fontsize{5}{5}\selectfont dizaines de millions}%
- &\Block[draw]{}{\fontsize{5}{5}\selectfont unit\'es de millions}%
+ \Block[draw]{}{\fontsize{5}{5}\selectfont\PfCCM}%
+ &\Block[draw]{}{\fontsize{5}{5}\selectfont\PfCDM}%
+ &\Block[draw]{}{\fontsize{5}{5}\selectfont\PfCUM}%
&
}{}
- \Block[draw]{}{\fontsize{5}{5}\selectfont centaines de milliers}%
- &\Block[draw]{}{\fontsize{5}{5}\selectfont dizaines de milliers}%
- &\Block[draw]{}{\fontsize{5}{5}\selectfont unit\'es de milliers}%
- &\Block[draw]{}{\fontsize{5}{5}\selectfont centaines}%
- &\Block[draw]{}{\fontsize{5}{5}\selectfont dizaines}%
- &\Block[draw]{}{\fontsize{5}{5}\selectfont unit\'es}\\%
+ \Block[draw]{}{\fontsize{5}{5}\selectfont\PfCCm}%
+ &\Block[draw]{}{\fontsize{5}{5}\selectfont\PfCDm}%
+ &\Block[draw]{}{\fontsize{5}{5}\selectfont\PfCUm}%
+ &\Block[draw]{}{\fontsize{5}{5}\selectfont\PfCC}%
+ &\Block[draw]{}{\fontsize{5}{5}\selectfont\PfCD}%
+ &\Block[draw]{}{\fontsize{5}{5}\selectfont\PfCU}\\%
\ifboolKV[ClesTableaux]{Nombres}{%
\xdef\DecalageLigne{\fpeval{\DecalageLigne+1}}%
\ifboolKV[ClesTableaux]{Milliards}{%
@@ -707,7 +723,7 @@
\ifboolKV[ClesTableaux]{Milliards}{\xdef\PfCDerniereColonne{16}}{\ifboolKV[ClesTableaux]{Millions}{\xdef\PfCDerniereColonne{13}}{\xdef\PfCDerniereColonne{10}}}%
\begin{NiceTabular}{*{\ifboolKV[ClesTableaux]{Milliards}{12}{%
\ifboolKV[ClesTableaux]{Millions}{9}{6}%
- }}{m{4.75em}}>{\columncolor{gray!15}}{c}*{3}{m{4.75em}}}%
+ }}{m{\useKV[ClesTableaux]{Largeur}}}>{\columncolor{gray!15}}{c}*{3}{m{\useKV[ClesTableaux]{Largeur}}}}%
%
%%% Prise en compte de la cl\'e Partie
%
@@ -741,33 +757,33 @@
}{}%
%
%%% Valeurs ci-dessous par d\'efaut
- %
+ %
\hline
\ifboolKV[ClesTableaux]{Milliards}{%
- \Block[borders={left,right}]{}{\fontsize{5}{5}\selectfont centaines de milliards}%
- &\Block[borders={right}]{}{\fontsize{5}{5}\selectfont dizaines de milliards}%
- &\Block[borders={right}]{}{\fontsize{5}{5}\selectfont unit\'es de milliards}%
- &\Block[borders={right}]{}{\fontsize{5}{5}\selectfont centaines de millions}%
- &\Block[borders={right}]{}{\fontsize{5}{5}\selectfont dizaines de millions}%
- &\Block[]{}{\fontsize{5}{5}\selectfont unit\'es de millions}%
+ \Block[borders={left,right}]{}{\fontsize{5}{5}\selectfont\PfCCG}%
+ &\Block[borders={right}]{}{\fontsize{5}{5}\selectfont\PfCDG}%
+ &\Block[borders={right}]{}{\fontsize{5}{5}\selectfont\PfCUG}%
+ &\Block[borders={right}]{}{\fontsize{5}{5}\selectfont\PfCCM}%
+ &\Block[borders={right}]{}{\fontsize{5}{5}\selectfont\PfCDM}%
+ &\Block[]{}{\fontsize{5}{5}\selectfont\PfCUM}%
&
}{}%
\ifboolKV[ClesTableaux]{Millions}{%
- \Block[borders={left,right}]{}{\fontsize{5}{5}\selectfont centaines de millions}%
- &\Block[borders={right}]{}{\fontsize{5}{5}\selectfont dizaines de millions}%
- &\Block[]{}{\fontsize{5}{5}\selectfont unit\'es de millions}%
+ \Block[borders={left,right}]{}{\fontsize{5}{5}\selectfont\PfCCM}%
+ &\Block[borders={right}]{}{\fontsize{5}{5}\selectfont\PfCDM}%
+ &\Block[]{}{\fontsize{5}{5}\selectfont\PfCUM}%
&
}{}%
- \Block[borders={left,right}]{}{\fontsize{5}{5}\selectfont centaines de milliers}%
- &\Block[borders={right}]{}{\fontsize{5}{5}\selectfont dizaines de milliers}%
- &\Block[borders={right}]{}{\fontsize{5}{5}\selectfont unit\'es de milliers}%
- &\Block[borders={right}]{}{\fontsize{5}{5}\selectfont centaines}%
- &\Block[borders={right}]{}{\fontsize{5}{5}\selectfont dizaines}%
- &\Block[borders={right}]{}{\fontsize{5}{5}\selectfont unit\'es}%
+ \Block[borders={left,right}]{}{\fontsize{5}{5}\selectfont\PfCCm}%
+ &\Block[borders={right}]{}{\fontsize{5}{5}\selectfont\PfCDm}%
+ &\Block[borders={right}]{}{\fontsize{5}{5}\selectfont\PfCUm}%
+ &\Block[borders={right}]{}{\fontsize{5}{5}\selectfont\PfCC}%
+ &\Block[borders={right}]{}{\fontsize{5}{5}\selectfont\PfCD}%
+ &\Block[borders={right}]{}{\fontsize{5}{5}\selectfont\PfCU}%
&\Block[borders={right}]{}{\ifboolKV[ClesTableaux]{Virgule}{,}{}}%
- &\Block[borders={right}]{}{\fontsize{5}{5}\selectfont dixi\`emes}%
- &\Block[borders={right}]{}{\fontsize{5}{5}\selectfont centi\`emes}%
- &\Block[borders={right}]{}{\fontsize{5}{5}\selectfont milli\`emes}\\
+ &\Block[borders={right}]{}{\fontsize{5}{5}\selectfont\PfCd}%
+ &\Block[borders={right}]{}{\fontsize{5}{5}\selectfont\PfCc}%
+ &\Block[borders={right}]{}{\fontsize{5}{5}\selectfont\PfCm}\\
%
%%% Prise en compte de la cl\'e Nombres
%
diff --git a/macros/latex/contrib/profcollege/latex/PfCVueCubes.tex b/macros/latex/contrib/profcollege/latex/PfCVueCubes.tex
index 91f90c96d2..5f284e051e 100644
--- a/macros/latex/contrib/profcollege/latex/PfCVueCubes.tex
+++ b/macros/latex/contrib/profcollege/latex/PfCVueCubes.tex
@@ -1,7 +1,7 @@
%%%
% Vue Cubes
%%%
-\setKVdefault[VueCubes]{Solution=false,Hauteur=5,Profondeur=4,Largeur=3,Angle=60,Nom=Ex1,Trou=false,Echelle=0.25,CouleurCube=LightSteelBlue,CouleurFleche=LightGray,Face=false,Creation=false,Grilles=false}
+\setKVdefault[VueCubes]{Solution=false,Hauteur=5,Profondeur=4,Largeur=3,Angle=60,Nom=Ex1,Trou=false,Echelle=0.25,CouleurCube=LightSteelBlue,CouleurFleche=LightGray,Face=false,Creation=false,Grilles=false,Seul=false}
\newtoks\toklisteVueCube%
\def\UpdatetoksVueCube#1\nil{\addtotok\toklisteVueCube{#1,}}%
@@ -162,8 +162,9 @@
endfor;
fi;
\end{mplibcode}
+ \ifboolKV[VueCubes]{Seul}{}{%
\ifboolKV[VueCubes]{Grilles}{}{%
- \hspace*{1.5cm}
+% \hspace*{1.5cm}
\begin{mplibcode}[\PfCVueCubeNom]
input PfCSolid;
@@ -216,6 +217,7 @@
DessineFusion;
\end{mplibcode}
}%
+ }%
\fi
}%
diff --git a/macros/latex/contrib/profcollege/latex/ProfCollege.sty b/macros/latex/contrib/profcollege/latex/ProfCollege.sty
index 7be8c2783f..c51b7afc58 100644
--- a/macros/latex/contrib/profcollege/latex/ProfCollege.sty
+++ b/macros/latex/contrib/profcollege/latex/ProfCollege.sty
@@ -2,9 +2,9 @@
% licence : Released under the LaTeX Project Public License v1.3c
% or later, see http://www.latex-project.org/lppl.txtf
\NeedsTeXFormat{LaTeX2e}%
-\def\filedate{2023/07/05}%
+\def\filedate{2023/08/01}%
\let\PfCfiledate\filedate%
-\def\fileversion{0.99-z-o}%
+\def\fileversion{0.99-z-p}%
\let\PfCfileversion\fileversion%
\ProvidesPackage{ProfCollege}[\filedate\space v\fileversion\space Aide pour utiliser LaTeX au college]%
@@ -95,13 +95,13 @@
\RequirePackage{xlop}%
\RequirePackage{xfp}%
-\RequirePackage[most]{tcolorbox}%
+\RequirePackage{tcolorbox}%
+\tcbuselibrary{breakable,external,fitting,hooks,magazine,poster,raster,skins,theorems,listings,listingsutf8}
\RequirePackage{tikz}%
% https://tex.stackexchange.com/questions/349259/curved-arrow-describing-a-step-in-a-equation-derivation
%https://tex.stackexchange.com/questions/58656/best-way-to-draw-a-chevron-diagram-using-tikz
-\usetikzlibrary{calc,shapes,arrows,tikzmark,chains,positioning,shapes.symbols,babel,fit}%
-\usetikzlibrary{backgrounds}%
+\usetikzlibrary{calc,shapes,arrows,tikzmark,chains,positioning,shapes.symbols,babel,fit,backgrounds}%
\RequirePackage{suffix}%pour la commande étoilée
@@ -571,7 +571,12 @@
\draw[thick] (0,0) circle (2ex);
}%\emoticon
}%\raisebox
-}
+}%
+\input{PfCGrimuku}
+\input{PfCHorloge}
+\input{PfCCible}
+\input{PfCMulPiecesPuzzle}
+\input{PfCPyraVoca}
\input{PfCAutomatismes}
\input{PfCNumberHive}
\input{PfCPatronPaves}
diff --git a/macros/latex/contrib/profcollege/latex/dobblePfC.lua b/macros/latex/contrib/profcollege/latex/dobblePfC.lua
index 83cf8f6218..06df34391b 100644
--- a/macros/latex/contrib/profcollege/latex/dobblePfC.lua
+++ b/macros/latex/contrib/profcollege/latex/dobblePfC.lua
@@ -8,7 +8,7 @@ function dobble(p)
-- du même nombre de symboles
-- on va générer un tableau où chaque case correspond
-- à une carte et contient la liste des numéros de symbole à mettre
- for i=1,7 do
+ for i=1,1+p+p*p do
symbole[i] = "\\PfCListeSymboleDobble["..i.."]"
end
local cartes={};
diff --git a/macros/latex/contrib/profcollege/metapost/PfCCalculatrice.mp b/macros/latex/contrib/profcollege/metapost/PfCCalculatrice.mp
index 406f720594..633b3ab6a7 100644
--- a/macros/latex/contrib/profcollege/metapost/PfCCalculatrice.mp
+++ b/macros/latex/contrib/profcollege/metapost/PfCCalculatrice.mp
@@ -38,7 +38,7 @@ Math=true;
decahoriz:=0;
-vardef Test(expr cptk,cptnt)=
+vardef Test(expr cptk)(text cptnt)=
pair Decalage;
if nblignes mod 2=0:
Decalage:=u*((LargeurEcran,-8*(nblignes-1))-6*(length(cptnt)-cptk,0));
@@ -192,9 +192,17 @@ vardef LCD(text nt)(text rep)(expr NB)=
Ecran:=(u*(0,-1)--u*(LargeurEcran,-1)--u*(LargeurEcran,7)--u*(0,7)--cycle) shifted(u*(0,-8*(nblignes-1)));
fill Ecran withcolor if print=true:0.8white else:CouleurEcran fi;
draw Ecran withcolor if print=true:0.8white else:CouleurEcran fi;
+ if Calcul:
+ string toto;
+ toto=decimal(rep);
+ for k=0 upto length(toto)-1:
+ Test(k,toto);
+ endfor;
+ else:
for k=0 upto length(rep)-1:
Test(k,rep);
endfor;
+ fi;
enddef;
endinput;
diff --git a/macros/latex/contrib/profcollege/metapost/PfCLabyNombre.mp b/macros/latex/contrib/profcollege/metapost/PfCLabyNombre.mp
index 1ef8c39607..18a4e97931 100644
--- a/macros/latex/contrib/profcollege/metapost/PfCLabyNombre.mp
+++ b/macros/latex/contrib/profcollege/metapost/PfCLabyNombre.mp
@@ -193,7 +193,47 @@ vardef TraceLabyrinthe=
fi;
);
$
-enddef;
+enddef;
+
+vardef InitialisationLabyrintheMul(expr long,larg)=
+ LargeurLaby:=larg;
+ LongueurLaby:=long;
+ uh=2u;
+ uv=2u;
+ pair M[][],N[][];%centre de la case, coinbg de la case
+ boolean CaseExploree[][];%Case Exploree ou pas
+ %on initialise les cases comme non explorées pour celles qui sont à l'intérieur du labyrinthe
+ for k=-1 upto larg:
+ for l=-1 upto long:
+ M[k][l]:=(5mm,-uv+5mm)+(l*uh,-k*uv);
+ N[k][l]:=(l*uh,(-k-1)*uv);
+ if (k=-1) or (k=larg) or (l=-1) or (l=long):
+ CaseExploree[k][l]:=true;
+ else:
+ CaseExploree[k][l]:=false;
+ fi;
+ endfor;
+ endfor;
+enddef;
+
+vardef TraceLabyrintheMul=
+ save $;
+ picture $;
+ $=image(
+ n:=0;
+ for k=0 upto LargeurLaby-1:
+ for l=0 upto LongueurLaby-1:
+ n:=n+1;
+ if (n mod 2)=1:
+ draw (Fullcircle scaled 10mm) shifted N[k][l];
+ else:
+ draw (unitsquare scaled 10mm) shifted N[k][l];
+ fi;
+ endfor;
+ endfor;
+ );
+ $
+enddef;
vardef murgauche=
save $;
diff --git a/macros/latex/contrib/profcollege/metapost/PfCObjets.mp b/macros/latex/contrib/profcollege/metapost/PfCObjets.mp
index 6998c54e26..0fe551dc9c 100644
--- a/macros/latex/contrib/profcollege/metapost/PfCObjets.mp
+++ b/macros/latex/contrib/profcollege/metapost/PfCObjets.mp
@@ -18,7 +18,7 @@ boolean creux; creux=false;%pour gérer les solides creux
boolean transformation; transformation=false;%pour gérer les transformations
boolean Ferme[];%pour gérer les faces : si le solide est fermé, toutes les faces non vues ne sont pas intégrées aux calculs
boolean perso[];%pour gérer les gestions personnelles des couleurs
-for k=0 upto 100:
+for k=0 upto 1000:
perso[k]=false;
endfor;
boolean numeroteface;
diff --git a/macros/latex/contrib/profcollege/metapost/PfCSolid.mp b/macros/latex/contrib/profcollege/metapost/PfCSolid.mp
index b5f90b3ae4..765533109d 100644
--- a/macros/latex/contrib/profcollege/metapost/PfCSolid.mp
+++ b/macros/latex/contrib/profcollege/metapost/PfCSolid.mp
@@ -121,12 +121,13 @@ vardef Projette(expr M)=
elseif typerepre="cabinet":
% (0.5*cosd(30)*Xpart(GCoord(M)),0.75*sind(30)*Ypart(GCoord(M)))*unit*DE
% (Xpart(M)+0.5*cosd(30)*Zpart(M),Ypart(M)+0.5*sind(30)*Zpart(M))*20
- %(Xpart(M)+0.5*cosd(30)*Ypart(M),Zpart(M)+0.5*sind(30)*Ypart(M))*20
- %(Ypart(M)+0.5*cosd(30)*Xpart(M),Zpart(M)+0.5*sind(30)*Xpart(M))*20%Good avec Theta=-20/Phi=-10
+% (Xpart(M)+0.5*cosd(30)*Ypart(M),Zpart(M)+0.5*sind(30)*Ypart(M))*20
+% (Ypart(M)+0.5*cosd(30)*Xpart(M),Zpart(M)+0.5*sind(30)*Xpart(M))*20%Good avec Theta=-20/Phi=-10
%(Ypart(GCoord(M))+0.5*cosd(-30)*Xpart(GCoord(M)),Zpart(GCoord(M))+0.5*sind(-30)*Xpart(GCoord(M)))*20%Good avec Theta=-20/Phi=-10
- (Xpart(GCoord(M))*cosd(90-30),Ypart(GCoord(M))*sind(90-30)*0.5)*DE%à garder peut-être
-% (Zpart(GCoord(M))+0.5*cosd(-30)*Ypart(GCoord(M)),Xpart(GCoord(M))+0.5*sind(-30)*Ypart(GCoord(M)))*20
- % (0.5*cosd(45)*Xpart(GCoord(M)),0.5*sind(45)*Ypart(GCoord(M)))*unit*DE
+% (Xpart(GCoord(M))*cosd(90-30),Ypart(GCoord(M))*sind(90-30)*0.5)*DE%à garder peut-être ?
+ (Xpart(GCoordcabinet(M)),Ypart(GCoordcabinet(M)))*DE%
+ %(Zpart(GCoord(M))+0.5*cosd(-30)*Ypart(GCoord(M)),Xpart(GCoord(M))+0.5*sind(-30)*Ypart(GCoord(M)))*20
+% (0.5*cosd(45)*Xpart(GCoord(M)),0.5*sind(45)*Ypart(GCoord(M)))*unit*DE
% (Xpart(GCoord(M)),Ypart(GCoord(M)))*unit*DE
%(Xpart(GCoord(M)),Ypart(GCoord(M)))*10
fi
diff --git a/macros/latex/contrib/siunitx/CHANGELOG.md b/macros/latex/contrib/siunitx/CHANGELOG.md
index 003c810d2b..235ce5fbfa 100644
--- a/macros/latex/contrib/siunitx/CHANGELOG.md
+++ b/macros/latex/contrib/siunitx/CHANGELOG.md
@@ -7,6 +7,49 @@ Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to
## [Unreleased]
+## [v3.3.0] - 2023-07-31
+
+### Added
+- Support for Italian (see issue
+ [\#650](https://github.com/josephwright/siunitx/issues/650))
+- Abbreviations `\T`, `\mT`, `\uT` (see issue
+ [\#670](https://github.com/josephwright/siunitx/issues/670))
+- Option `range-open-phrase`
+- Option `round-direction` to allow 'truncation' of rounded
+ values (see issue
+ [\#664](https://github.com/josephwright/siunitx/issues/664))
+- Option `uncertainty-round-direction` (see issue
+ [\#628](https://github.com/josephwright/siunitx/issues/628))
+- Support for asymmetrical uncertainties, including new option
+ `input-uncertainty-divider` (see issue
+ [\#675](https://github.com/josephwright/siunitx/issues/675))
+- Options for bracket control:
+ - `compound-close-bracket`
+ - `compound-open-bracket`
+ - `list-close-bracket`
+ - `list-open-bracket`
+ - `product-close-bracket`
+ - `product-open-bracket`
+ - `range-close-bracket`
+ - `range-open-bracket`
+ (see issue
+ [\#262](https://github.com/josephwright/siunitx/issues/262))
+- Option `table-model-setup` (see issue
+ [\#659](https://github.com/josephwright/siunitx/issues/659))
+- Options `list-input-separator` and `product-input-separator` (see issue
+ [\#603](https://github.com/josephwright/siunitx/issues/603))
+- Options `compound-independent-prefix`, `list-independent-prefix`,
+ `product-independent-prefix` and `range-independent-prefix` (see issue
+ [\#554](https://github.com/josephwright/siunitx/issues/554))
+- Hint for overloading `\num` and `\qty` (see issue
+ [\#648](https://github.com/josephwright/siunitx/issues/648))
+
+### Changed
+
+- Support bracing of decimal marker in tables as an alternative
+ to `\mathord` (see issue
+ [\#527](https://github.com/josephwright/siunitx/issues/527))
+
## [v3.2.9] - 2023-07-26
### Fixed
@@ -1928,7 +1971,8 @@ Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to
### Added
- First public testing release (as `si`)
-[Unreleased]: https://github.com/josephwright/siunitx/compare/v3.2.9...HEAD
+[Unreleased]: https://github.com/josephwright/siunitx/compare/v3.3.0...HEAD
+[v3.3.0]: https://github.com/josephwright/siunitx/compare/v3.2.9...v3.3.0
[v3.2.9]: https://github.com/josephwright/siunitx/compare/v3.2.8...v3.2.9
[v3.2.8]: https://github.com/josephwright/siunitx/compare/v3.2.7...v3.2.8
[v3.2.7]: https://github.com/josephwright/siunitx/compare/v3.2.6...v3.2.7
diff --git a/macros/latex/contrib/siunitx/siunitx-abbreviation.dtx b/macros/latex/contrib/siunitx/siunitx-abbreviation.dtx
index 152f56608a..2d4e60e1d4 100644
--- a/macros/latex/contrib/siunitx/siunitx-abbreviation.dtx
+++ b/macros/latex/contrib/siunitx/siunitx-abbreviation.dtx
@@ -127,6 +127,10 @@
% Abbreviations for charge.
% \end{function}
%
+% \begin{function}{\T, \mT \uT}
+% Abbreviations for magneticc field.
+% \end{function}
+%
% \begin{function}{\dB}
% Abbreviation for decibel.
% \end{function}
@@ -306,6 +310,14 @@
\siunitx_declare_unit:Nn \mC { \milli \coulomb }
% \end{macrocode}
% \end{macro}
+% \begin{macro}{\T, \uT, \mT}
+% Magnetic field.
+% \begin{macrocode}
+\siunitx_declare_unit:Nn \T { \tesla }
+\siunitx_declare_unit:Nn \uT { \micro \tesla }
+\siunitx_declare_unit:Nn \mT { \milli \tesla }
+% \end{macrocode}
+% \end{macro}
% \begin{macro}{\N, \mN, \kN, \MN}
% Forces.
% \begin{macrocode}
diff --git a/macros/latex/contrib/siunitx/siunitx-angle.dtx b/macros/latex/contrib/siunitx/siunitx-angle.dtx
index a2335a2c9b..69bb9a53fb 100644
--- a/macros/latex/contrib/siunitx/siunitx-angle.dtx
+++ b/macros/latex/contrib/siunitx/siunitx-angle.dtx
@@ -337,6 +337,30 @@
% \end{macrocode}
% \end{variable}
%
+% \begin{macro}{\@@_suppress_exp_uncert:, \@@_suppress_comp_sign:}
+% Pre-compilation of keys to suppress uncertainties and exponents,
+% and
+% \begin{macrocode}
+\keys_precompile:nnN
+ { siunitx }
+ {
+ input-close-uncertainty = ,
+ input-exponent-markers = ,
+ input-open-uncertainty = ,
+ input-uncertainty-signs =
+ }
+ \l_@@_tmp_tl
+\cs_set_protected:Npx \@@_suppress_exp_uncert:
+ { \exp_not:V \l_@@_tmp_tl }
+\keys_precompile:nnN
+ { siunitx }
+ { input-comparators = , input-signs = }
+ \l_@@_tmp_tl
+\cs_set_protected:Npx \@@_suppress_comp_sign:
+ { \exp_not:V \l_@@_tmp_tl }
+% \end{macrocode}
+% \end{macro}
+%
% \begin{macro}{\@@_arc_sign:nnn}
% \begin{macro}{\@@_arc_sign:nn}
% \begin{macro}{\@@_extract_sign:nnnnnnnn}
@@ -348,13 +372,7 @@
\cs_new_protected:Npn \@@_arc_sign:nnn #1#2#3
{
\group_begin:
- \keys_set:nn { siunitx }
- {
- input-close-uncertainty = ,
- input-exponent-markers = ,
- input-open-uncertainty = ,
- input-uncertainty-signs =
- }
+ \@@_suppress_exp_uncert:
\tl_clear:N \l_@@_sign_tl
\@@_arc_sign:nn {#1} { degrees }
\@@_arc_sign:nn {#2} { minutes }
@@ -420,8 +438,7 @@
\tl_set:cn { l_@@_ #8 _tl }
{ {#1} { } {#3} {#4} {#5} {#6} {#7} }
\tl_set:Nn \l_@@_sign_tl {#2}
- \keys_set:nn { siunitx }
- { input-comparators = , input-signs = }
+ \@@_suppress_comp_sign:
}
}
\cs_new:Npn \@@_sign:nnnnnnn #1#2#3#4#5#6#7
diff --git a/macros/latex/contrib/siunitx/siunitx-code.pdf b/macros/latex/contrib/siunitx/siunitx-code.pdf
index 8a2b8e5992..fdc1658a42 100644
--- a/macros/latex/contrib/siunitx/siunitx-code.pdf
+++ b/macros/latex/contrib/siunitx/siunitx-code.pdf
Binary files differ
diff --git a/macros/latex/contrib/siunitx/siunitx-compound.dtx b/macros/latex/contrib/siunitx/siunitx-compound.dtx
index 51701c6915..b16aa63f30 100644
--- a/macros/latex/contrib/siunitx/siunitx-compound.dtx
+++ b/macros/latex/contrib/siunitx/siunitx-compound.dtx
@@ -137,6 +137,35 @@
% Phrase (or similar) used between limits of a range.
% \end{variable}
%
+% \begin{function}{compound-boundary-mode}
+% \begin{syntax}
+% |compound-boundary-mode| = |number|\verb"|"|text|
+% \end{syntax}
+% Choice which determines whether the material at the start and
+% end of a compound quantity are typeset a |number| or as |text|;
+% the latter is the standard setting.
+% \end{function}
+%
+% \begin{function}{compound-close-boundary, compound-open-boundary}
+% \begin{syntax}
+% |compound-close-boundary| = \meta{tokens}\\
+% |compound-open-boundary| = \meta{tokens}
+% \end{syntax}
+% Literals which are inserted at the opening and closing boundary of a compound
+% quantity; they are not used when the number of items is one.
+% The standard settings set these empty.
+% \end{function}
+%
+% \begin{function}{compound-close-bracket, compound-open-bracket}
+% \begin{syntax}
+% |compound-close-bracket| = \meta{token} \\
+% |compound-open-bracket| = \meta{token}
+% \end{syntax}
+% Literals containing the tokens inserted at the start and end of a compound
+% value when |compounds-units| is set to |bracket|. The standard settings are
+% |(| and |)|.
+% \end{function}
+%
% \begin{function}{compound-exponents}
% \begin{syntax}
% |compound-exponents| = |combine|\verb"|"|combine-bracket|\verb"|"|individual|
@@ -149,6 +178,15 @@
% \end{syntax}
% \end{function}
%
+% \begin{function}{compound-independent-prefix}
+% \begin{syntax}
+% |compound-independent-prefix| = |true|\verb"|"|false|
+% \end{syntax}
+% Switch which determines whether unit prefixes are calculated
+% independently when units are repeated. The standard setting is
+% |false|.
+% \end{function}
+%
% \begin{function}{compound-pair-separator}
% \begin{syntax}
% |compound-pair-separator| = \meta{text}
@@ -165,6 +203,9 @@
% \begin{syntax}
% |compound-separator-mode| = |number|\verb"|"|text|
% \end{syntax}
+% Choice which determines whether the separators between components
+% of compound quantity are typeset a |number| or as |text|;
+% the latter is the standard setting.
% \end{function}
%
% \begin{function}{compound-units}
@@ -173,6 +214,15 @@
% \end{syntax}
% \end{function}
%
+% \begin{function}{list-close-bracket, list-open-bracket}
+% \begin{syntax}
+% |list-close-bracket| = \meta{token} \\
+% |list-open-bracket| = \meta{token}
+% \end{syntax}
+% Literals containing the tokens inserted at the start and end of a list when
+% |list-units| is set to |bracket|. The standard settings are |(| and |)|.
+% \end{function}
+%
% \begin{function}{list-exponents}
% \begin{syntax}
% |list-exponents| = |combine|\verb"|"|combine-bracket|\verb"|"|individual|
@@ -185,6 +235,15 @@
% \end{syntax}
% \end{function}
%
+% \begin{function}{list-independent-prefix}
+% \begin{syntax}
+% |list-independent-prefix| = |true|\verb"|"|false|
+% \end{syntax}
+% Switch which determines whether unit prefixes are calculated
+% independently when units are repeated. The standard setting is
+% |false|.
+% \end{function}
+%
% \begin{function}{list-pair-separator}
% \begin{syntax}
% |list-pair-separator| = \meta{text}
@@ -203,12 +262,31 @@
% \end{syntax}
% \end{function}
%
+% \begin{function}{product-close-bracket, product-open-bracket}
+% \begin{syntax}
+% |product-close-bracket| = \meta{token} \\
+% |product-open-bracket| = \meta{token}
+% \end{syntax}
+% Literals containing the tokens inserted at the start and end of a product
+% when |product-units| is set to |bracket|. The standard settings are |(|
+% and |)|.
+% \end{function}
+%
% \begin{function}{product-exponents}
% \begin{syntax}
% |product-exponents| = |combine|\verb"|"|combine-bracket|\verb"|"|individual|
% \end{syntax}
% \end{function}
%
+% \begin{function}{product-independent-prefix}
+% \begin{syntax}
+% |product-independent-prefix| = |true|\verb"|"|false|
+% \end{syntax}
+% Switch which determines whether unit prefixes are calculated
+% independently when units are repeated. The standard setting is
+% |false|.
+% \end{function}
+%
% \begin{function}{product-mode}
% \begin{syntax}
% |product-mode| = |phrase|\verb"|"|choice|
@@ -233,10 +311,40 @@
% \end{syntax}
% \end{function}
%
+% \begin{function}{range-close-bracket, range-open-bracket}
+% \begin{syntax}
+% |range-close-bracket| = \meta{token} \\
+% |range-open-bracket| = \meta{token}
+% \end{syntax}
+% Literals containing the tokens inserted at the start and end of a range when
+% |range-units| is set to |bracket|. The standard settings are |(| and |)|.
+% \end{function}
+%
+% \begin{function}{range-independent-prefix}
+% \begin{syntax}
+% |range-independent-prefix| = |true|\verb"|"|false|
+% \end{syntax}
+% Switch which determines whether unit prefixes are calculated
+% independently when units are repeated. The standard setting is
+% |false|.
+% \end{function}
+%
+% \begin{function}{range-open-phrase}
+% \begin{syntax}
+% |range-open-phrase| = \meta{text}
+% \end{syntax}
+% Literal containing the material to be inserted at the start of a range.
+% The standard setting is empty.
+% \end{function}
+%
% \begin{function}{range-phrase}
% \begin{syntax}
% |range-phrase| = \meta{text}
% \end{syntax}
+% Literal containing the material to be inserted between the start and end
+% of a range. The standard setting contains the word \texttt{to} inside the
+% \cs{text} command, along with appropriate spacing commands to allow this
+% material to work in both math and text typesetting modes.
% \end{function}
%
% \begin{function}{range-units}
@@ -258,6 +366,7 @@
%
% \begin{macrocode}
\cs_generate_variant:Nn \keys_set:nn { nx }
+\cs_generate_variant:Nn \seq_use:Nnnn { NVVV }
% \end{macrocode}
%
% \subsection{General mechanism}
@@ -318,29 +427,26 @@
% \end{macrocode}
% \end{variable}
%
-% \begin{variable}{\l_@@_bracket_close_tl, \l_@@_bracket_open_tl}
-% Purely internal for the present.
-% \begin{macrocode}
-\tl_new:N \l_@@_bracket_close_tl
-\tl_new:N \l_@@_bracket_open_tl
-\tl_set:Nn \l_@@_bracket_open_tl { ( }
-\tl_set:Nn \l_@@_bracket_close_tl { ) }
-% \end{macrocode}
-% \end{variable}
-%
% \begin{variable}
% {
+% \l_@@_boundary_close_tl ,
+% \l_@@_bracket_close_tl ,
+% \l_@@_independent_bool ,
% \l_@@_separator_final_tl ,
% \l_@@_separator_pair_tl ,
+% \l_@@_boundary_open_tl ,
+% \l_@@_bracket_open_tl ,
% \l_@@_separator_tl ,
% \l_@@_separator_text_bool ,
% \l_@@_exp_bracket_bool ,
% \l_@@_exp_combine_bool ,
% \l_@@_unit_bracket_bool ,
-% \l_@@_unit_repeat_bool
+% \l_@@_unit_power_bool ,
+% \l_@@_unit_repeat_bool ,
% }
% List options.
% \begin{macrocode}
+\bool_new:N \l_@@_boundary_text_bool
\bool_new:N \l_@@_exp_bracket_bool
\bool_new:N \l_@@_exp_combine_bool
\bool_new:N \l_@@_separator_text_bool
@@ -349,6 +455,15 @@
\bool_new:N \l_@@_unit_repeat_bool
\keys_define:nn { siunitx }
{
+ compound-boundary-mode .choice: ,
+ compound-boundary-mode / number .code:n =
+ { \bool_set_false:N \l_@@_delim_text_bool } ,
+ compound-boundary-mode / text .code:n =
+ { \bool_set_true:N \l_@@_delim_text_bool } ,
+ compound-close-boundary .tl_set:N =
+ \l_@@_boundary_close_tl ,
+ compound-close-bracket .tl_set:N =
+ \l_@@_bracket_close_tl ,
compound-exponents .choice: ,
compound-exponents / combine .code:n =
{
@@ -367,8 +482,14 @@
} ,
compound-final-separator .tl_set:N =
\l_@@_separator_final_tl ,
+ compound-independent-prefix .bool_set:N =
+ \l_@@_independent_bool ,
compound-pair-separator .tl_set:N =
\l_@@_separator_pair_tl ,
+ compound-open-boundary .tl_set:N =
+ \l_@@_boundary_open_tl ,
+ compound-open-bracket .tl_set:N =
+ \l_@@_bracket_open_tl ,
compound-separator .tl_set:N =
\l_@@_separator_tl ,
compound-separator-mode .choice: ,
@@ -406,7 +527,7 @@
\bool_set_false:N \l_@@_unit_bracket_bool
\bool_set_false:N \l_@@_unit_power_bool
\bool_set_false:N \l_@@_unit_repeat_bool
- }
+ }
}
% \end{macrocode}
% \end{variable}
@@ -664,7 +785,12 @@
% \end{macro}
% \end{macro}
%
-% \begin{macro}{\siunitx_compound_quantity:nn}
+% \begin{macro}
+% {
+% \siunitx_compound_quantity:nn ,
+% \@@_quantity_auxi:nn ,
+% \@@_quantity_auxii:nn
+% }
% For quantities, life is more complex as there are interactions between the
% options for exponents and units. The \cs{c_empty_tl} suppresses any
% leading \texttt{1} if the unit starts \cs{per}; the \pkg{siunitx-print}
@@ -673,37 +799,76 @@
\cs_new_protected:Npn \siunitx_compound_quantity:nn #1#2
{
\group_begin:
- \bool_if:NT \l_@@_unit_bracket_bool
- { \bool_set_true:N \l_@@_exp_bracket_bool }
- \bool_if:NT \l_@@_unit_repeat_bool
- { \bool_set_false:N \l_@@_exp_combine_bool }
- \bool_lazy_or:nnT
- { \l_@@_unit_bracket_bool }
- { ! \l_@@_unit_repeat_bool }
- { \bool_set_false:N \l_siunitx_number_bracket_ambiguous_bool }
- \bool_set_true:N \l_@@_unit_bool
- \@@_format:nn {#1} {#2}
- \bool_if:NF \l_siunitx_number_parse_bool
- { \siunitx_unit_format:nN {#2} \l_@@_unit_tl }
- \str_if_eq:VnT \l_siunitx_quantity_prefix_mode_tl { combine-exponent }
- { \tl_clear:N \l_@@_exp_tl }
- \bool_if:NTF \l_@@_unit_repeat_bool
- { \@@_print:N \@@_print_quantity:x }
+ \bool_lazy_all:nTF
{
- \bool_lazy_and:nnTF
- { \l_@@_unit_bracket_bool }
- { \tl_if_empty_p:N \l_@@_exp_tl }
- {
- \siunitx_print_number:V \l_@@_bracket_open_tl
- \@@_print:N \siunitx_print_number:x
- \siunitx_print_number:V \l_@@_bracket_close_tl
- }
- { \@@_print:N \siunitx_print_number:x }
- \@@_print_quantity:n { \c_empty_tl }
+ { \l_@@_independent_bool }
+ {
+ \str_if_eq_p:Vn
+ \l_siunitx_quantity_prefix_mode_tl
+ { combine-exponent }
+ }
+ { \int_compare_p:nNn { \tl_count:n {#1} } > 1 }
}
+ { \@@_quantity_auxi:nn }
+ { \@@_quantity_auxii:nn }
+ {#1} {#2}
\group_end:
}
% \end{macrocode}
+% The rather special case where all units are printed independently:
+% we just convert to a simple sequence then print.
+% \begin{macrocode}
+\cs_new_protected:Npn \@@_quantity_auxi:nn #1#2
+ {
+ \@@_print_boundary:V \l_@@_boundary_close_tl
+ \seq_clear:N \l_@@_tmp_seq
+ \tl_map_inline:nn {#1}
+ {
+ \seq_put_right:Nn \l_@@_tmp_seq
+ { \siunitx_quantity:nn {##1} {#2} }
+ }
+ \seq_use:NVVV \l_@@_tmp_seq
+ \l_@@_separator_pair_tl
+ \l_@@_separator_tl
+ \l_@@_separator_final_tl
+ \@@_print_boundary:V \l_@@_boundary_close_tl
+ }
+% \end{macrocode}
+% The business end for all other cases.
+% \begin{macrocode}
+\cs_new_protected:Npn \@@_quantity_auxii:nn #1#2
+ {
+ \bool_if:NT \l_@@_unit_bracket_bool
+ { \bool_set_true:N \l_@@_exp_bracket_bool }
+ \bool_if:NT \l_@@_unit_repeat_bool
+ { \bool_set_false:N \l_@@_exp_combine_bool }
+ \bool_lazy_or:nnT
+ { \l_@@_unit_bracket_bool }
+ { ! \l_@@_unit_repeat_bool }
+ { \bool_set_false:N \l_siunitx_number_bracket_ambiguous_bool }
+ \bool_set_true:N \l_@@_unit_bool
+ \@@_format:nn {#1} {#2}
+ \bool_if:NF \l_siunitx_number_parse_bool
+ { \siunitx_unit_format:nN {#2} \l_@@_unit_tl }
+ \str_if_eq:VnT \l_siunitx_quantity_prefix_mode_tl { combine-exponent }
+ { \tl_clear:N \l_@@_exp_tl }
+ \bool_if:NTF \l_@@_unit_repeat_bool
+ { \@@_print:N \@@_print_quantity:x }
+ {
+ \bool_lazy_and:nnTF
+ { \l_@@_unit_bracket_bool }
+ { \tl_if_empty_p:N \l_@@_exp_tl }
+ {
+ \siunitx_print_number:V \l_@@_bracket_open_tl
+ \@@_print:N \siunitx_print_number:x
+ \siunitx_print_number:V \l_@@_bracket_close_tl
+ }
+ { \@@_print:N \siunitx_print_number:x }
+ \@@_print_quantity:n { \c_empty_tl }
+ }
+ }
+% \end{macrocode}
+% \end{macro}
% \end{macro}
%
% \begin{macro}{\@@_print:N}
@@ -712,7 +877,11 @@
% \begin{macro}{\@@_print_aux:n}
% \begin{macro}{\@@_print_aux:nn}
% \begin{macro}{\@@_print_quantity:n, \@@_print_quantity:x}
-% \begin{macro}{\@@_print_separator:n, \@@_print_separator:V}
+% \begin{macro}
+% {
+% \@@_print_boundary:n, \@@_print_boundary:V,
+% \@@_print_separator:n, \@@_print_separator:V
+% }
% We now need to know how many entries there are: the reason we don't use
% \cs{seq_use:Nnnn} is that we want to be able to insert
% \cs{siunitx_print_\dots:n} in a controlled way.
@@ -757,6 +926,7 @@
}
{ 2 }
{
+ \@@_print_boundary:V \l_@@_boundary_open_tl
#4
{
\exp_not:n {#2}
@@ -768,6 +938,7 @@
\seq_item:Nn \l_@@_tmp_seq { 2 }
\exp_not:n {#3}
}
+ \@@_print_boundary:V \l_@@_boundary_open_tl
}
}
{
@@ -775,9 +946,11 @@
\tl_set:Nn \l_@@_start_tl {#2}
\tl_set:Nn \l_@@_end_tl {#3}
\cs_set_eq:NN \@@_print_aux:n #4
+ \@@_print_boundary:V \l_@@_boundary_open_tl
\seq_map_indexed_function:NN
\l_@@_tmp_seq
\@@_print_aux:nn
+ \@@_print_boundary:V \l_@@_boundary_close_tl
}
}
\cs_new_protected:Npn \@@_print_aux:n #1 { }
@@ -816,6 +989,16 @@
\cs_new_protected:Npn \@@_print_quantity:n #1
{ \siunitx_quantity_print:nV {#1} \l_@@_unit_tl }
\cs_generate_variant:Nn \@@_print_quantity:n { x }
+\cs_new_protected:Npn \@@_print_boundary:n #1
+ {
+ \tl_if_blank:nF {#1}
+ {
+ \bool_if:NTF \l_@@_boundary_text_bool
+ { #1 }
+ { \siunitx_print_number:n {#1} }
+ }
+ }
+\cs_generate_variant:Nn \@@_print_boundary:n { V }
\cs_new_protected:Npn \@@_print_separator:n #1
{
\bool_if:NTF \l_@@_separator_text_bool
@@ -872,8 +1055,11 @@
%
% \begin{variable}
% {
+% \l_@@_bracket_close_tl ,
+% \l_@@_independent_bool ,
% \l_siunitx_list_separator_tl ,
% \l_siunitx_list_separator_final_tl ,
+% \l_@@_bracket_open_tl ,
% \l_siunitx_list_separator_pair_tl ,
% \l_@@_exp_tl ,
% \l_@@_units_tl
@@ -884,14 +1070,20 @@
\tl_new:N \l_@@_units_tl
\keys_define:nn { siunitx }
{
+ list-close-bracket .tl_set:N =
+ \l_@@_bracket_close_tl ,
list-exponents .choices:nn =
{ combine , combine-bracket , individual }
{ \tl_set_eq:NN \l_@@_exp_tl \l_keys_choice_tl } ,
list-final-separator .tl_set:N = \l_siunitx_list_separator_final_tl ,
+ list-independent-prefix .bool_set:N =
+ \l_@@_independent_bool ,
+ list-open-bracket .tl_set:N =
+ \l_@@_bracket_open_tl ,
list-pair-separator .tl_set:N = \l_siunitx_list_separator_pair_tl ,
list-separator .tl_set:N = \l_siunitx_list_separator_tl ,
list-units .choices:nn =
- { bracket , repeat , single }
+ { bracket , independent , repeat , single }
{ \tl_set_eq:NN \l_@@_units_tl \l_keys_choice_tl }
}
% \end{macrocode}
@@ -920,15 +1112,23 @@
{
\keys_set:nx { siunitx }
{
- compound-exponents = \l_@@_exp_tl ,
- compound-final-separator =
+ compound-close-bracket =
+ { \exp_not:V \l_@@_bracket_close_tl } ,
+ compound-close-boundary = ,
+ compound-exponents = \l_@@_exp_tl ,
+ compound-final-separator =
{ \exp_not:V \l_siunitx_list_separator_final_tl } ,
- compound-pair-separator =
+ compound-independent-prefix =
+ \bool_if:NTF \l_@@_independent_bool { true } { false } ,
+ compound-open-boundary = ,
+ compound-open-bracket =
+ { \exp_not:V \l_@@_bracket_open_tl } ,
+ compound-pair-separator =
{ \exp_not:V \l_siunitx_list_separator_pair_tl } ,
- compound-separator =
+ compound-separator =
{ \exp_not:V \l_siunitx_list_separator_tl } ,
- compound-separator-mode = text ,
- compound-units = \l_@@_units_tl
+ compound-separator-mode = text ,
+ compound-units = \l_@@_units_tl
}
}
% \end{macrocode}
@@ -946,10 +1146,13 @@
%
% \begin{variable}
% {
-% \l_@@_exp_tl ,
-% \l_@@_phrase_bool ,
-% \l_@@_phrase_tl ,
-% \l_@@_symbol_tl ,
+% \l_@@_bracket_close_tl ,
+% \l_@@_exp_tl ,
+% \l_@@_independent_bool ,
+% \l_@@_bracket_open_tl ,
+% \l_@@_phrase_bool ,
+% \l_@@_phrase_tl ,
+% \l_@@_symbol_tl ,
% \l_@@_units_tl
% }
% Options for products.
@@ -959,18 +1162,24 @@
\tl_new:N \l_@@_units_tl
\keys_define:nn { siunitx }
{
+ product-close-bracket .tl_set:N =
+ \l_@@_bracket_close_tl ,
product-exponents .choices:nn =
{ combine , combine-bracket , individual }
{ \tl_set_eq:NN \l_@@_exp_tl \l_keys_choice_tl } ,
+ product-independent-prefix .bool_set:N =
+ \l_@@_independent_bool ,
product-mode .choice: ,
product-mode / phrase .code:n =
{ \bool_set_true:N \l_@@_phrase_bool } ,
product-mode / symbol .code:n =
{ \bool_set_false:N \l_@@_phrase_bool } ,
+ product-open-bracket .tl_set:N =
+ \l_@@_bracket_open_tl ,
product-phrase .tl_set:N = \l_@@_phrase_tl ,
product-symbol .tl_set:N = \l_@@_symbol_tl ,
product-units .choices:nn =
- { bracket , bracket-power , power , repeat , single }
+ { bracket , bracket-power , independent , power , repeat , single }
{ \tl_set_eq:NN \l_@@_units_tl \l_keys_choice_tl }
}
% \end{macrocode}
@@ -1006,13 +1215,21 @@
{
\keys_set:nx { siunitx }
{
- compound-exponents = \l_@@_exp_tl ,
- compound-final-separator = { \exp_not:n {#1} } ,
- compound-pair-separator = { \exp_not:n {#1} } ,
- compound-separator = { \exp_not:n {#1} } ,
- compound-separator-mode =
+ compound-close-boundary = ,
+ compound-close-bracket =
+ { \exp_not:V \l_@@_bracket_close_tl } ,
+ compound-exponents = \l_@@_exp_tl ,
+ compound-final-separator = { \exp_not:n {#1} } ,
+ compound-independent-prefix =
+ \bool_if:NTF \l_@@_independent_bool { true } { false } ,
+ compound-open-boundary = ,
+ compound-open-bracket =
+ { \exp_not:V \l_@@_bracket_open_tl } ,
+ compound-pair-separator = { \exp_not:n {#1} } ,
+ compound-separator = { \exp_not:n {#1} } ,
+ compound-separator-mode =
\bool_if:NTF \l_@@_phrase_bool { text } { number } ,
- compound-units = \l_@@_units_tl
+ compound-units = \l_@@_units_tl
}
}
\cs_generate_variant:Nn \@@_aux:n { x }
@@ -1032,7 +1249,11 @@
%
% \begin{variable}
% {
+% \l_@@_bracket_close_tl ,
% \l_@@_exp_tl ,
+% \l_@@_independent_bool ,
+% \l_@@_bracket_open_tl ,
+% \l_@@_open_tl ,
% \l_siunitx_range_phrase_tl ,
% \l_@@_units_tl
% }
@@ -1042,12 +1263,19 @@
\tl_new:N \l_@@_units_tl
\keys_define:nn { siunitx }
{
+ range-close-bracket .tl_set:N =
+ \l_@@_bracket_close_tl ,
range-exponents .choices:nn =
{ combine , combine-bracket , individual }
{ \tl_set_eq:NN \l_@@_exp_tl \l_keys_choice_tl } ,
+ range-independent-prefix .bool_set:N =
+ \l_@@_independent_bool ,
+ range-open-bracket .tl_set:N =
+ \l_@@_bracket_open_tl ,
+ range-open-phrase .tl_set:N = \l_@@_open_tl ,
range-phrase .tl_set:N = \l_siunitx_range_phrase_tl ,
range-units .choices:nn =
- { bracket , repeat , single }
+ { bracket , independent , repeat , single }
{ \tl_set_eq:NN \l_@@_units_tl \l_keys_choice_tl }
}
% \end{macrocode}
@@ -1076,10 +1304,20 @@
{
\keys_set:nx { siunitx }
{
- compound-exponents = \l_@@_exp_tl ,
- compound-pair-separator = { \exp_not:V \l_siunitx_range_phrase_tl } ,
- compound-separator-mode = text ,
- compound-units = \l_@@_units_tl
+ compound-boundary-mode = text ,
+ compound-close-boundary = ,
+ compound-close-bracket =
+ { \exp_not:V \l_@@_bracket_close_tl } ,
+ compound-exponents = \l_@@_exp_tl ,
+ compound-independent-prefix =
+ \bool_if:NTF \l_@@_independent_bool { true } { false } ,
+ compound-open-boundary = { \exp_not:V \l_@@_open_tl } ,
+ compound-open-bracket =
+ { \exp_not:V \l_@@_bracket_open_tl } ,
+ compound-pair-separator =
+ { \exp_not:V \l_siunitx_range_phrase_tl } ,
+ compound-separator-mode = text ,
+ compound-units = \l_@@_units_tl
}
}
% \end{macrocode}
@@ -1095,57 +1333,73 @@
% \begin{macrocode}
\keys_set:nn { siunitx }
{
- compound-exponents = individual ,
- compound-final-separator =
+ compound-boundary-mode = text ,
+ compound-close-boundary = , % (
+ compound-close-bracket = ) ,
+ compound-exponents = individual ,
+ compound-final-separator =
{
\ifmmode \ \else \space \fi
\text { and }
\ifmmode \ \else \space \fi
} ,
- compound-pair-separator =
+ compound-independent-prefix = false ,
+ compound-open-boundary = ,
+ compound-open-bracket = ( , % )
+ compound-pair-separator =
{
\ifmmode \ \else \space \fi
\text { and }
\ifmmode \ \else \space \fi
} ,
- compound-separator =
+ compound-separator =
{ , \ifmmode \ \else \space \fi } ,
- compound-separator-mode = text ,
- compound-units = repeat ,
- list-exponents = individual ,
- list-final-separator =
+ compound-separator-mode = text ,
+ compound-units = repeat , % (
+ list-close-bracket = ) ,
+ list-exponents = individual ,
+ list-final-separator =
{
\ifmmode \ \else \space \fi
\text { and }
\ifmmode \ \else \space \fi
} ,
- list-pair-separator =
+ list-independent-prefix = false ,
+ list-open-bracket = ( , % )
+ list-pair-separator =
{
\ifmmode \ \else \space \fi
\text { and }
\ifmmode \ \else \space \fi
} ,
- list-separator =
+ list-separator =
{ , \ifmmode \ \else \space \fi } ,
- list-units = repeat ,
- product-exponents = individual ,
- product-mode = symbol ,
- product-phrase =
+ list-units = repeat , % (
+ product-close-bracket = ) ,
+ product-exponents = individual ,
+ product-independent-prefix = false ,
+ product-mode = symbol ,
+ product-open-bracket = ( , % )
+ product-phrase =
{
\ifmmode \ \else \space \fi
\text { by }
\ifmmode \ \else \space \fi
} ,
- product-symbol = \times ,
- product-units = repeat ,
- range-exponents = individual ,
- range-phrase =
+ product-symbol = \times ,
+ product-units = repeat , % (
+ range-close-bracket = ) ,
+ range-exponents = individual ,
+ range-independent-prefix = false ,
+ range-open-bracket = ( , % )
+ range-open-phrase = ,
+ range-phrase =
{
\ifmmode \ \else \space \fi
\text { to }
\ifmmode \ \else \space \fi
} ,
- range-units = repeat
+ range-units = repeat
}
% \end{macrocode}
%
diff --git a/macros/latex/contrib/siunitx/siunitx-locale.dtx b/macros/latex/contrib/siunitx/siunitx-locale.dtx
index 43f432733a..da12029bc9 100644
--- a/macros/latex/contrib/siunitx/siunitx-locale.dtx
+++ b/macros/latex/contrib/siunitx/siunitx-locale.dtx
@@ -108,6 +108,12 @@
inter-unit-product = \, ,
output-decimal-marker = { , }
} ,
+ locale / IT .meta:n =
+ {
+ exponent-product = \times ,
+ inter-unit-product = \, ,
+ output-decimal-marker = { , }
+ } ,
locale / PL .meta:n =
{
exponent-product = \cdot ,
@@ -150,6 +156,7 @@
{
\RequirePackage { translations }
\DeclareTranslation { Catalan } { and } { i }
+ \DeclareTranslation { Italian } { and } { e }
\DeclareTranslation { Portuguese } { and } { e }
\DeclareTranslation { Slovene } { and } { in }
\DeclareTranslation { Brazilian } { to~(numerical~range) } { a }
@@ -157,6 +164,7 @@
\DeclareTranslation { English } { to~(numerical~range) } { to }
\DeclareTranslation { French } { to~(numerical~range) } { à }
\DeclareTranslation { German } { to~(numerical~range) } { bis }
+ \DeclareTranslation { Italian } { to~(numerical~range) } { a }
\DeclareTranslation { Polish } { to~(numerical~range) } { do }
\DeclareTranslation { Portuguese } { to~(numerical~range) } { a }
\DeclareTranslation { Slovene } { to~(numerical~range) } { do }
diff --git a/macros/latex/contrib/siunitx/siunitx-number.dtx b/macros/latex/contrib/siunitx/siunitx-number.dtx
index 8bc0a2dd71..faf216ac67 100644
--- a/macros/latex/contrib/siunitx/siunitx-number.dtx
+++ b/macros/latex/contrib/siunitx/siunitx-number.dtx
@@ -411,6 +411,12 @@
% \end{syntax}
% \end{function}
%
+% \begin{function}{input-uncertainty-divider}
+% \begin{syntax}
+% |input-uncertainty-divider| = \meta{tokens}
+% \end{syntax}
+% \end{function}
+%
% \begin{function}{minimum-decimal-digits}
% \begin{syntax}
% |minimum-decimal-digits| = \meta{min}
@@ -522,6 +528,18 @@
% The standard setting is |false|.
% \end{function}
%
+% \begin{function}{round-direction}
+% \begin{syntax}
+% |round-direction| = |down|\verb"|"|nearest|\verb"|"|up|
+% \end{syntax}
+% Choice which determines how values values are rounded. The setting
+% |up| means that the value is always rounded away from zero, whereas the
+% setting |down| means that the value will be rounded toward zero. The
+% setting |nearest| means that the value will be rounded to the nearest
+% (either up or down), taking account of the setting of |round-half|.
+% The standard setting is |nearest|
+% \end{function}
+%
% \begin{function}{round-half}
% \begin{syntax}
% |round-half| = |even|\verb"|"|up|
@@ -636,6 +654,18 @@
% |full| style is used. The standard setting is |compact|.
% \end{function}
%
+% \begin{function}{uncertainty-round-direction}
+% \begin{syntax}
+% |uncertainty-round-direction| = |down|\verb"|"|nearest|\verb"|"|up|
+% \end{syntax}
+% Choice which determines how uncertainty values are rounded. The setting
+% |up| means that the uncertainty is always rounded away from zero, whereas
+% the setting |down| means that the uncertainty will be rounded toward zero.
+% The setting |nearest| means that the uncertainty will be rounded to the
+% nearest (either up or down), taking account of the setting of |round-half|.
+% The standard setting is |nearest|
+% \end{function}
+%
% \begin{function}{uncertainty-separator}
% \begin{syntax}
% |uncertainty-separator| = \meta{separator}
@@ -776,6 +806,12 @@
% containing an identifier, then zero or more brace groups which contain
% the uncertainty data. In this release, the known uncertainty types are
% \begin{itemize}
+% \item \texttt{A}: An unsymmetrical uncertainty made up of two values.
+% Each is stored as uncertainty in significant digits, with no radix point
+% in the stored value. The two parts are stored within one brace group,
+% within which are two brace groups: the first contains the positive
+% component, the second the negative component. Neither component has a
+% sign.
% \item \texttt{S}: A symmetrical statistical uncertainty made up of
% a single value. These are stored as uncertainty in significant digits,
% with no radix point in the stored value.
@@ -797,6 +833,7 @@
% \l_siunitx_number_input_exponent_tl ,
% \l_@@_input_ignore_tl ,
% \l_@@_input_uncert_open_tl ,
+% \l_@@_input_uncert_divide_tl ,
% \l_siunitx_number_input_sign_tl ,
% \l_@@_input_uncert_sign_tl ,
% \l_@@_explicit_decimal_bool ,
@@ -838,6 +875,8 @@
{ \tl_put_right:Nn \l_siunitx_number_input_sign_tl {##1} }
}
} ,
+ input-uncertainty-divider .tl_set:N =
+ \l_@@_input_uncert_divide_tl ,
parse-numbers .bool_set:N =
\l_siunitx_number_parse_bool ,
retain-explicit-decimal-marker .bool_set:N =
@@ -911,11 +950,21 @@
% \end{macrocode}
% \end{variable}
%
-% \begin{variable}{\l_@@_uncert_tl}
+% \begin{variable}
+% {
+% \l_@@_tolerance_tl ,
+% \l_@@_uncert_tl ,
+% \l_@@_uncert_offset_int,
+% \l_@@_uncert_types_tl
+% }
% To allow multiple uncertainties, we want to build this up as possibly
-% multiple entries.
+% multiple entries. For asymmetrical uncertainties/tolerances, we need
+% an additional store.
% \begin{macrocode}
+\tl_new:N \l_@@_tolerance_tl
\tl_new:N \l_@@_uncert_tl
+\int_new:N \l_@@_uncert_offset_int
+\tl_new:N \l_@@_uncert_types_tl
% \end{macrocode}
% \end{variable}
%
@@ -992,6 +1041,7 @@
\group_begin:
\tl_clear:N \l_@@_parsed_tl
\tl_clear:N \l_@@_uncert_tl
+ \tl_clear:N \l_@@_uncert_types_tl
\tl_map_inline:Nn \l_@@_input_ignore_tl
{
\token_if_macro:NT ##1
@@ -1576,7 +1626,6 @@
\cs_new_protected:Npn \@@_parse_loop_main_uncert:NN #1#2
{
\@@_parse_loop_main_store:NNN #1 #2 \c_false_bool
- \tl_clear:N \l_@@_uncert_tl
\@@_parse_uncert:N
}
% \end{macrocode}
@@ -1647,6 +1696,7 @@
{
\tl_clear:N \l_@@_flex_tl
\tl_clear:N \l_@@_parsed_tl
+ \tl_clear:N \l_@@_uncert_tl
}
% \end{macrocode}
% \end{macro}
@@ -1695,14 +1745,21 @@
%
% \begin{macro}{\@@_parse_uncert:N}
% \begin{macro}{\@@_parse_uncert:NNN}
-% \begin{macro}{\@@_parse_uncert_auxi:N, \@@_parse_uncert_auxii:N}
-% \begin{macro}{\@@_parse_uncert_auxii:}
+% \begin{macro}
+% {
+% \@@_parse_uncert_auxi:N ,
+% \@@_parse_uncert_auxii:N ,
+% \@@_parse_uncert_auxiv:N
+% }
+% \begin{macro}{\@@_parse_uncert_auxiv:}
% \begin{macro}{\@@_parse_uncert_marker:}
% \begin{macro}{\@@_parse_uncert_marker:nnn}
% \begin{macro}{\@@_parse_uncert_marker:nnnw}
% \begin{macro}{\@@_parse_uncert_marker:Nnnn}
% \begin{macro}{\@@_parse_uncert_marker:w}
% \begin{macro}{\@@_parse_uncert_marker:nnnnN}
+% \begin{macro}{\@@_parse_uncert_marker:nnnnnN}
+% \begin{macro}{\@@_parse_uncert_marker:nnnnnnN}
% \begin{macro}{\@@_parse_uncert_after:N}
% Parsing a combined uncertainty has a very restricted range of allowed
% tokens. A closing uncertainty token in the first place is an error,
@@ -1754,7 +1811,7 @@
{
\tl_if_in:NnTF \l_siunitx_number_input_decimal_tl {#1}
{ \@@_parse_uncert_marker: }
- { \@@_parse_loop_break:w }
+ { \@@_parse_uncert_auxiv:N #1 }
}
}
\cs_new_protected:Npn \@@_parse_uncert_auxii:N #1
@@ -1764,7 +1821,7 @@
\@@_parse_uncert_auxiii:
\@@_parse_uncert_after:N
}
- { \@@_parse_loop_break:w }
+ { \@@_parse_uncert_auxiv:N #1 }
}
% \end{macrocode}
% Deal with the closing bracket, which might leave us with nothing if there
@@ -1778,6 +1835,24 @@
{ \tl_set:Nn \l_@@_partial_tl { 0 } }
}
% \end{macrocode}
+% A common auxiliary for the case where the token is not a digit, a
+% decimal mark or a closing parenthesis.
+% \begin{macrocode}
+\cs_new_protected:Npn \@@_parse_uncert_auxiv:N #1
+ {
+ \tl_if_empty:NTF \l_@@_tolerance_tl
+ {
+ \tl_if_in:NnTF \l_@@_input_uncert_divide_tl {#1}
+ {
+ \cs_set_eq:NN \l_@@_tolerance_tl \l_@@_partial_tl
+ \tl_clear:N \l_@@_partial_tl
+ \@@_parse_uncert:N
+ }
+ { \@@_parse_loop_break:w }
+ }
+ { \@@_parse_loop_break:w }
+ }
+% \end{macrocode}
% Handling a decimal marker in the uncertainty is a bit tricky: we need to make
% sure it's valid. First, we need to be sure that the integer part of the captured
% uncertainty is not too long. Then we need to check that the decimal part is
@@ -1785,7 +1860,7 @@
% Both of these require data from the collected partial number,
% so we extract that first. Checking the decimal part needs the length of the
% not-yet-collected uncertainty. There may be one or more parts to that, so
-% we have to grab p to the \emph{first} closing token to count the length:
+% we have to grab up to the \emph{first} closing token to count the length:
% just grabbing everything only works if there is only a single uncertainty.
% We take protective steps against an entirely-missing closing token so that
% there is not an uncontrolled error.
@@ -1826,22 +1901,62 @@
% With the separated out main part and the current uncertainty part
% available, we can pad the main part if required then restart the
% collection of the uncertainty having thrown away the decimal marker
-% and with the lengths lined up.
+% and with the lengths lined up. To account for asymmetrical
+% uncertainties, there is a bit of work in tracking.
% \begin{macrocode}
\cs_new_protected:Npn \@@_parse_uncert_marker:nnnnN #1#2#3#4#5
{
+ \tl_set:Nx \l_@@_tmp_tl { \tl_head:V \l_@@_input_uncert_divide_tl }
+ \tl_if_empty:NTF \l_@@_tmp_tl
+ { \@@_parse_uncert_marker:nnnnnN {#1} {#2} {#3} {#4} { } #5 }
+ {
+ \use:x
+ {
+ \cs_set_protected:Npn \exp_not:N \@@_parse_uncert_marker:w
+ ####1 \l_@@_tmp_tl ####2 \l_@@_tmp_tl ####3 \exp_not:N \q_stop
+ {
+ \exp_not:N \tl_if_blank:nTF {####2}
+ {
+ \@@_parse_uncert_marker:nnnnnN
+ \exp_not:n { {#1} {#2} {#3} }
+ {####1} { }
+ }
+ {
+ \@@_parse_uncert_marker:nnnnnN
+ \exp_not:n { {#1} {#2} {#3} }
+ {####1} { \l_@@_tmp_tl ####2 }
+ }
+ \exp_not:N #5
+ }
+ \exp_not:N \@@_parse_uncert_marker:w #4
+ \l_@@_tmp_tl \l_@@_tmp_tl \exp_not:N \q_stop
+ }
+ }
+ }
+\cs_new_protected:Npn \@@_parse_uncert_marker:nnnnnN #1#2#3#4#5#6
+ {
+ \exp_args:Ne \@@_parse_uncert_marker:nnnnnnN
+ { \int_eval:n { \tl_count:n {#4} } }
+ {#1} {#2} {#3} {#4} {#5} #6
+ }
+\cs_new_protected:Npn \@@_parse_uncert_marker:nnnnnnN #1#2#3#4#5#6#7
+ {
+ \bool_lazy_and:nnF
+ { \tl_if_empty_p:N \l_@@_tolerance_tl }
+ { \tl_if_empty_p:N \l_@@_uncert_types_tl }
+ {
+ \int_compare:nNnF {#1} = \l_@@_uncert_offset_int
+ { \@@_parse_loop_break:w }
+ }
+ \int_set:Nn \l_@@_uncert_offset_int {#1}
\tl_set:Nx \l_@@_parsed_tl
{
- {#1}
{#2}
+ {#3}
{
- #3
+ #4
\prg_replicate:nn
- {
- \int_max:nn
- { 0 }
- { \tl_count:n {#4} - \tl_count:n {#3} }
- }
+ { \int_max:nn { 0 } { #1 - \tl_count:n {#4} } }
{ 0 }
}
}
@@ -1854,7 +1969,7 @@
\@@_parse_uncert:NNN \c_true_bool
\@@_parse_uncert_auxii:N
}
- #4#5
+ #5#6#7
}
% \end{macrocode}
% At the end of collection, we can either start another one or be done:
@@ -1866,9 +1981,26 @@
{
\exp_not:V \l_@@_uncert_tl
\tl_if_empty:NF \l_@@_partial_tl
- { { \exp_not:V \l_@@_partial_tl } }
+ {
+ {
+ \tl_if_empty:NTF \l_@@_tolerance_tl
+ { \exp_not:V \l_@@_partial_tl }
+ {
+ { \exp_not:V \l_@@_tolerance_tl }
+ { \exp_not:V \l_@@_partial_tl }
+ }
+ }
+ }
+ }
+ \tl_set:Nx \l_@@_uncert_types_tl
+ {
+ \l_@@_uncert_types_tl
+ \tl_if_empty:NTF \l_@@_tolerance_tl
+ { S }
+ { A }
}
\tl_clear:N \l_@@_partial_tl
+ \tl_clear:N \l_@@_tolerance_tl
\quark_if_recursion_tail_stop_do:Nn #1
{
\tl_set:Nx \l_@@_parsed_tl
@@ -1877,17 +2009,14 @@
{
\tl_if_empty:NF \l_@@_uncert_tl
{
- {
- \prg_replicate:nn
- { \tl_count:N \l_@@_uncert_tl }
- { S }
- }
+ { \l_@@_uncert_types_tl }
\exp_not:V \l_@@_uncert_tl
}
}
}
\tl_clear:N \l_@@_partial_tl
\tl_clear:N \l_@@_uncert_tl
+ \int_zero:N \l_@@_uncert_offset_int
}
\tl_if_in:NnTF \l_@@_input_uncert_open_tl {#1}
{ \@@_parse_uncert:N }
@@ -1905,6 +2034,8 @@
% \end{macro}
% \end{macro}
% \end{macro}
+% \end{macro}
+% \end{macro}
%
% \subsection{Processing numbers}
%
@@ -1917,11 +2048,13 @@
% \l_@@_exponent_fixed_int ,
% \l_@@_min_decimal_int ,
% \l_@@_min_integer_int ,
+% \l_@@_round_dir_tl ,
% \l_@@_round_half_even_bool ,
% \l_@@_round_mode_tl ,
% \l_@@_round_pad_bool ,
% \l_@@_round_precision_int ,
-% \l_@@_round_positive_bool
+% \l_@@_round_positive_bool ,
+% \l_@@_round_uncert_dir_tl
% }
% \begin{macrocode}
\keys_define:nn { siunitx }
@@ -1943,6 +2076,9 @@
\l_@@_min_decimal_int ,
minimum-integer-digits .int_set:N =
\l_@@_min_integer_int ,
+ round-direction .choices:nn =
+ { down , nearest , up }
+ { \tl_set_eq:NN \l_@@_round_dir_tl \l_keys_choice_tl } ,
round-half .choice: ,
round-half / even .code:n =
{ \bool_set_true:N \l_@@_round_half_even_bool } ,
@@ -1958,11 +2094,16 @@
round-precision .int_set:N =
\l_@@_round_precision_int ,
round-zero-positive .bool_set:N =
- \l_@@_round_positive_bool
+ \l_@@_round_positive_bool ,
+ uncertainty-round-direction .choices:nn =
+ { down , nearest , up }
+ { \tl_set_eq:NN \l_@@_round_uncert_dir_tl \l_keys_choice_tl } ,
}
\bool_new:N \l_@@_round_half_even_bool
\tl_new:N \l_@@_exponent_mode_tl
+\tl_new:N \l_@@_round_dir_tl
\tl_new:N \l_@@_round_mode_tl
+\tl_new:N \l_@@_round_uncert_dir_tl
% \end{macrocode}
% \end{variable}
%
@@ -2611,15 +2752,16 @@
% \end{macro}
%
% \begin{macro}[EXP]{\@@_round:nnn, \@@_round:fnn}
+% \begin{macro}[EXP]{\@@_round:nnnn, \@@_round:Vnnn}
% \begin{macro}[EXP]
% {
-% \@@_round_auxi:nnnN ,
-% \@@_round_auxii:nnnN ,
-% \@@_round_auxiii:nnnN
+% \@@_round_auxi:nnnnN ,
+% \@@_round_auxii:nnnnN ,
+% \@@_round_auxiii:nnnnN ,
+% \@@_round_auxiv:nnnnN
% }
-% \begin{macro}[EXP]{\@@_round_auxiv:nnN, \@@_round_auxv:nnN}
-% \begin{macro}[EXP]{\@@_round_auxvi:nN}
-% \begin{macro}[EXP]{\@@_round_auxvii:nnTF}
+% \begin{macro}[EXP]{\@@_round_auxv:nnnN, \@@_round_auxvi:nnnN}
+% \begin{macro}[EXP]{\@@_round_auxvii:nnnTF}
% \begin{macro}[EXP]{\@@_round_auxviii:nnN, \@@_round_auxix:nnN}
% \begin{macro}[EXP]{\@@_round_final_integer:nnw, \@@_round_final_decimal:nnw}
% \begin{macro}[EXP]{\@@_round_final_signicant:n}
@@ -2648,34 +2790,40 @@
% \begin{macrocode}
\cs_new:Npn \@@_round:nnn #1#2#3
{
- \@@_round_auxi:nnnN {#1} {#2} { }
- #3 \q_recursion_tail \q_recursion_stop
+ \@@_round:Vnnn \l_@@_round_dir_tl
+ {#1} {#2} {#3}
}
\cs_generate_variant:Nn \@@_round:nnn { f }
-\cs_new:Npn \@@_round_auxi:nnnN #1#2#3#4
+\cs_new:Npn \@@_round:nnnn #1#2#3#4
{
- \quark_if_recursion_tail_stop_do:Nn #4
+ \@@_round_auxi:nnnnN {#1} {#2} {#3} { }
+ #4 \q_recursion_tail \q_recursion_stop
+ }
+\cs_generate_variant:Nn \@@_round:nnnn { V }
+\cs_new:Npn \@@_round_auxi:nnnnN #1#2#3#4#5
+ {
+ \quark_if_recursion_tail_stop_do:Nn #5
{
- \@@_round_auxii:nnnN {#1} {#3} { } #2
+ \@@_round_auxii:nnnnN {#1} {#2} {#4} { } #3
\q_recursion_tail \q_recursion_stop
}
- \@@_round_auxi:nnnN {#1} {#2} {#4#3}
+ \@@_round_auxi:nnnnN {#1} {#2} {#3} {#5#4}
}
-\cs_new:Npn \@@_round_auxii:nnnN #1#2#3#4
+\cs_new:Npn \@@_round_auxii:nnnnN #1#2#3#4#5
{
- \quark_if_recursion_tail_stop_do:Nn #4
+ \quark_if_recursion_tail_stop_do:Nn #5
{
- \tl_if_blank:nTF {#2}
+ \tl_if_blank:nTF {#3}
{
- \@@_round_auxiv:nnnN {#1} { } { } #3
+ \@@_round_auxiv:nnnnN {#2} {#1} { } { } #4
\q_recursion_tail \q_recursion_stop
}
{
- \@@_round_auxiii:nnnN {#1} {#3} { } #2
+ \@@_round_auxiii:nnnnN {#2} {#1} {#4} { } #3
\q_recursion_tail \q_recursion_stop
}
}
- \@@_round_auxii:nnnN {#1} {#2} {#4#3}
+ \@@_round_auxii:nnnnN {#1} {#2} {#3} {#5#4}
}
% \end{macrocode}
% We now have the input reversed plus how many digits we need to discard
@@ -2688,74 +2836,87 @@
% of the integer: that may product a value of $1\dots$: we tidy up the
% case where it comes out as $0$ later.
% \begin{macrocode}
-\cs_new:Npn \@@_round_auxiii:nnnN #1#2#3#4
+\cs_new:Npn \@@_round_auxiii:nnnnN #1#2#3#4#5
{
- \quark_if_recursion_tail_stop_do:Nn #4
+ \quark_if_recursion_tail_stop_do:Nn #5
{
- \@@_round_auxiv:nnnN {#1} { } {#3} #2
+ \@@_round_auxiv:nnnnN {#1} {#2} { } {#4} #3
\q_recursion_tail \q_recursion_stop
}
\int_compare:nNnTF {#1} > 0
{
- \exp_args:Nf \@@_round_auxiii:nnnN
- { \int_eval:n { #1 - 1 } } {#2} { #4#3 }
+ \exp_args:Nf \@@_round_auxiii:nnnnN
+ { \int_eval:n { #1 - 1 } } {#2} {#3} { #5#4 }
}
- { \@@_round_auxv:nnN {#3} {#2} #4 }
+ { \@@_round_auxv:nnnN {#2} {#4} {#3} #5 }
}
-\cs_new:Npn \@@_round_auxiv:nnnN #1#2#3#4
+\cs_new:Npn \@@_round_auxiv:nnnnN #1#2#3#4#5
{
- \quark_if_recursion_tail_stop_do:Nn #4
+ \quark_if_recursion_tail_stop_do:Nn #5
{
\int_compare:nNnTF {#1} = 0
{
- \@@_round_auxvi:nnN {#3} {#2}
+ \@@_round_auxvi:nnnN {#2} {#4} {#3}
0 \q_recursion_tail \q_recursion_stop
}
{ { 0 } { } }
}
\int_compare:nNnTF {#1} > 0
{
- \exp_args:Nf \@@_round_auxiv:nnnN
- { \int_eval:n { #1 - 1 } } { #2 0 } { #4#3 }
+ \exp_args:Nf \@@_round_auxiv:nnnnN
+ { \int_eval:n { #1 - 1 } } {#2} { #3 0 } { #5#4 }
}
- { \@@_round_auxvi:nnN {#3} {#2} #4 }
+ { \@@_round_auxvi:nnnN {#2} {#4} {#3} #5 }
}
% \end{macrocode}
-% The lead off to rounding proper needs to deal with the half-even rule:
-% it can only apply at this stage, when the \emph{discarded} value can
-% be exactly half.
+% We now have the discarded digits, the matching filler and the
+% next digit. So we can make the decision on rounding: that
+% is handled by a common auxiliary.
% \begin{macrocode}
-\cs_new:Npn \@@_round_auxv:nnN #1#2#3
+\cs_new:Npn \@@_round_auxv:nnnN #1#2#3#4
{
- \quark_if_recursion_tail_stop_do:Nn #3
+ \quark_if_recursion_tail_stop_do:Nn #4
{
- \@@_round_auxvi:nnN
- {#1} { } #2 \q_recursion_tail \q_recursion_stop
+ \@@_round_auxvi:nnnN
+ {#1} {#2} { } #3 \q_recursion_tail \q_recursion_stop
}
- \@@_round_auxvii:nnTF {#1} {#3}
+ \@@_round_auxvii:nnnTF {#1} {#2} {#4}
{ \@@_round_final_decimal:nnw }
{ \@@_round_auxviii:nnN }
- {#2} { } #3
+ {#3} { } #4
}
-\cs_new:Npn \@@_round_auxvi:nnN #1#2#3
+\cs_new:Npn \@@_round_auxvi:nnnN #1#2#3#4
{
- \quark_if_recursion_tail_stop_do:Nn #3
+ \quark_if_recursion_tail_stop_do:Nn #4
{ { 0 } { } }
- \@@_round_auxvii:nnTF {#1} {#3}
+ \@@_round_auxvii:nnnTF {#1} {#2} {#4}
{ \@@_round_final_integer:nnw }
{ \@@_round_auxix:nnN }
- { } {#2} #3
+ { } {#3} #4
}
-\cs_new:Npn \@@_round_auxvii:nnTF #1#2
+% \end{macrocode}
+% For rounding up or down, the decision here is easy: pick the appropriate
+% branch. For rounding to nearest, we need to deal with the half-even rule:
+% it can only apply at this stage, when the \emph{discarded} value can
+% be exactly half.
+% \begin{macrocode}
+\cs_new:Npn \@@_round_auxvii:nnnTF #1#2#3
{
- \bool_lazy_or:nnTF
- { \int_compare_p:nNn { 0 \tl_head:n {#1} } < 5 }
+ \str_case:nnF {#1}
+ {
+ { down } { \use_i:nn }
+ { up } { \use_ii:nn }
+ }
{
- \bool_lazy_all_p:n
+ \bool_lazy_or:nnTF
+ { \int_compare_p:nNn { 0 \tl_head:n {#2} } < 5 }
{
- { \l_@@_round_half_even_bool }
- { ! \int_if_odd_p:n {#2} }
- { \@@_round_if_half_p:n {#1} }
+ \bool_lazy_all_p:n
+ {
+ { \l_@@_round_half_even_bool }
+ { ! \int_if_odd_p:n {#3} }
+ { \@@_round_if_half_p:n {#2} }
+ }
}
}
}
@@ -3271,8 +3432,9 @@
\use:e
{
\exp_not:N \@@_round_uncertainty:nnnnnn
- \@@_round:nnn {#1} { } {#4}
- {#2} {#3} {#1} {#4}
+ \@@_round:Vnnn
+ \l_@@_round_uncert_dir_tl {#1} { } {#4}
+ {#2} {#3} {#1} {#4}
}
}
% \end{macrocode}
@@ -4240,6 +4402,7 @@
\@@_output_uncert_A:nnnn
\cs_new:Npx \@@_output_uncert_A:nnnnn #1#2#3#4#5
{
+ { }
^
{
+
@@ -4631,6 +4794,7 @@
retain-explicit-plus = false ,
retain-negative-zero = false ,
retain-zero-uncertainty = false ,
+ round-direction = nearest ,
round-half = up ,
round-minimum = 0 ,
round-mode = none ,
@@ -4642,15 +4806,19 @@
uncertainty-descriptor-separator = \ ,
uncertainty-descriptors = ,
uncertainty-mode = compact ,
+ uncertainty-round-direction = nearest ,
uncertainty-separator = ,
zero-decimal-as-symbol = false ,
zero-symbol = \mbox { --- }
}
% \end{macrocode}
-% One awkward setting.
+% Two awkward settings.
% \begin{macrocode}
\keys_set:nx { siunitx }
- { exponent-thresholds = -3 \c_colon_str 3 }
+ {
+ exponent-thresholds = -3 \c_colon_str 3 ,
+ input-uncertainty-divider = \c_colon_str
+ }
% \end{macrocode}
%
% \begin{macrocode}
diff --git a/macros/latex/contrib/siunitx/siunitx-table.dtx b/macros/latex/contrib/siunitx/siunitx-table.dtx
index 823a20edef..3fe8d34a5d 100644
--- a/macros/latex/contrib/siunitx/siunitx-table.dtx
+++ b/macros/latex/contrib/siunitx/siunitx-table.dtx
@@ -190,6 +190,15 @@
% the same size.
% \end{function}
%
+% \begin{function}{table-model-setup}
+% \begin{syntax}
+% |table-model-setup| = \meta{commands}
+% \end{syntax}
+% Additional commands to be inserted when using the |table-format| to
+% create a model for alignment of cells. Typically this will be used to
+% handle variable-width fonts in columns. The standard setting is empty.
+% \end{function}
+%
% \begin{function}{table-number-alignment}
% \begin{syntax}
% |table-number-alignment| = |center|\verb"|"|left|\verb"|"|right|
@@ -818,7 +827,12 @@
% \end{macro}
%
% \begin{variable}
-% {\l_@@_auto_round_bool, \l_@@_align_mode_tl, \l_@@_align_number_tl}
+% {
+% \l_@@_auto_round_bool,
+% \l_@@_model_setup_tl ,
+% \l_@@_align_mode_tl ,
+% \l_@@_align_number_tl
+% }
% Options for tables with defined space.
% \begin{macrocode}
\keys_define:nn { siunitx }
@@ -842,6 +856,8 @@
\exp_args:NV \@@_generate_model:n \l_@@_model_tl
\tl_set:Nn \l_@@_align_mode_tl { format }
} ,
+ table-model-setup .tl_set:N =
+ \l_@@_model_setup_tl ,
table-number-alignment .choices:nn =
{ center , left , right }
{ \tl_set_eq:NN \l_@@_align_number_tl \l_keys_choice_tl }
@@ -1174,7 +1190,12 @@
% \@@_print_format_auxxii:w ,
% \@@_print_format_auxxiii:w
% }
-% \begin{macro}{\@@_print_format_box:Nn}
+% \begin{macro}
+% {
+% \@@_print_format_box:Nn, \@@_print_format_box:No ,
+% \@@_print_model_box:Nn, \@@_print_model_box:No
+% }
+% \begin{macro}{\@@_print_format_box:nNn, \@@_print_format_box:VNn}
% \begin{macro}{\@@_print_format_after:N}
% \begin{macro}{\@@_print_none:nnn}
% \begin{macrocode}
@@ -1325,7 +1346,7 @@
#1 \q_nil #2 \q_mark #3 \q_nil #4 \q_stop
{
\@@_color_check:w #3 \q_nil \q_stop
- \@@_print_format_box:Nn \l_@@_tmp_box {#1}
+ \@@_print_model_box:Nn \l_@@_tmp_box {#1}
\bool_if:NTF \l_@@_align_before_bool
{
\hbox_set_to_wd:Nnn \l_@@_integer_box
@@ -1365,7 +1386,7 @@
\cs_new_protected:Npn \@@_print_format_auxii:w
#1 \q_nil #2 \q_nil #3 \q_mark #4 \q_nil #5 \q_nil #6 \q_stop
{
- \@@_print_format_box:Nn \l_@@_tmp_box {#1#2}
+ \@@_print_model_box:Nn \l_@@_tmp_box {#1#2}
\dim_set:Nn \l_@@_tmp_dim { \box_wd:N \l_@@_tmp_box }
\@@_print_format_box:Nn \l_@@_tmp_box {#4#5}
\dim_compare:nNnT { \box_wd:N \l_@@_tmp_box } > \l_@@_tmp_dim
@@ -1425,19 +1446,20 @@
\@@_fil:
\hbox_unpack:N \l_@@_before_box
}
- \@@_print_format_auxiii:w #3 \q_mark #6 \q_stop
+ \@@_print_format_auxiii:w ? #3 \q_mark ? #6 \q_stop
}
% \end{macrocode}
% We now deal with the decimal part: there is nothing already in the
% |decimal| box, so the basics are easy. We need to \enquote{carry forward}
% any white space, as where it gets inserted depends on the options for
-% subsequent parts.
+% subsequent parts. The \cs{use_none:n} here remove the two |?| above:
+% those are added to preserve braces around the decimal marker.
% \begin{macrocode}
\cs_new_protected:Npn \@@_print_format_auxiii:w
#1 \q_nil #2 \q_nil #3 \q_mark #4 \q_nil #5 \q_nil #6 \q_stop
{
- \@@_print_format_box:Nn \l_@@_tmp_box {#1#2}
- \@@_print_format_box:Nn \l_@@_decimal_box {#4#5}
+ \@@_print_model_box:No \l_@@_tmp_box { \use_none:n #1#2 }
+ \@@_print_format_box:No \l_@@_decimal_box { \use_none:n #4#5 }
\dim_set:Nn \l_@@_carry_dim
{
\box_wd:N \l_@@_tmp_box
@@ -1505,7 +1527,7 @@
#1 \q_nil #2 \q_nil #3 \q_mark
#4 \q_nil #5 \q_nil #6 \q_stop
{
- \@@_print_format_box:Nn \l_@@_tmp_box {#1#2}
+ \@@_print_model_box:Nn \l_@@_tmp_box {#1#2}
\hbox_set_to_wd:Nnn \l_@@_tmp_box
{
\box_wd:N \l_@@_uncert_box
@@ -1535,7 +1557,7 @@
#1 \q_nil #2 \q_mark
#3 \q_nil #4 \q_stop
{
- \@@_print_format_box:Nn \l_@@_tmp_box { { } #1 }
+ \@@_print_model_box:Nn \l_@@_tmp_box { { } #1 }
\dim_set:Nn \l_@@_tmp_dim { \box_wd:N \l_@@_tmp_box }
\@@_print_format_box:Nn \l_@@_tmp_box { { } #3 }
\@@_print_format_auxxii:w #2 \q_mark #4 \q_stop
@@ -1562,7 +1584,7 @@
{
\tl_if_blank:nF {#2}
{
- \@@_print_format_box:Nn \l_@@_tmp_box { { } #1#2 }
+ \@@_print_model_box:Nn \l_@@_tmp_box { { } #1#2 }
\dim_set:Nn \l_@@_tmp_dim { \box_wd:N \l_@@_tmp_box }
\@@_print_format_box:Nn \l_@@_tmp_box
{
@@ -1570,7 +1592,7 @@
{ \l_@@_align_exponent_bool }
{ \tl_if_blank_p:n {#3} }
{
- \@@_print_format_box:Nn \l_@@_tmp_box { { } #1 { } }
+ \@@_print_model_box:Nn \l_@@_tmp_box { { } #1 { } }
\@@_skip:n { \box_wd:N \l_@@_tmp_box }
}
{ } #3#4
@@ -1580,16 +1602,27 @@
}
% \end{macrocode}
% A simple auxiliary to avoid relatively expensive use of the print routine
-% for empty parts.
+% for empty parts. There is a separate function for the model as this allows
+% for the case where different font widths are in use.
% \begin{macrocode}
\cs_new_protected:Npn \@@_print_format_box:Nn #1#2
+ { \@@_print_format_box:nNn { } #1 {#2} }
+\cs_generate_variant:Nn \@@_print_format_box:Nn { No }
+\cs_new_protected:Npn \@@_print_model_box:Nn #1#2
+ { \@@_print_format_box:VNn \l_@@_model_setup_tl #1 {#2} }
+\cs_generate_variant:Nn \@@_print_model_box:Nn { No }
+\cs_new_protected:Npn \@@_print_format_box:nNn #1#2#3
{
- \hbox_set:Nn #1
+ \hbox_set:Nn #2
{
- \tl_if_blank:nF {#2}
- { \siunitx_print_number:n {#2} }
+ \tl_if_blank:nF {#3}
+ {
+ #1
+ \siunitx_print_number:n {#3}
+ }
}
}
+\cs_generate_variant:Nn \@@_print_format_box:nNn { V }
% \end{macrocode}
% A common routine for placing material after the decimal marker and
% \enquote{shuffling}.
@@ -1653,6 +1686,7 @@
% \end{macro}
% \end{macro}
% \end{macro}
+% \end{macro}
%
% \subsection{Standard settings for module options}
%
diff --git a/macros/latex/contrib/siunitx/siunitx.dtx b/macros/latex/contrib/siunitx/siunitx.dtx
index d33a8c24b2..52dacc5c54 100644
--- a/macros/latex/contrib/siunitx/siunitx.dtx
+++ b/macros/latex/contrib/siunitx/siunitx.dtx
@@ -122,7 +122,7 @@
%
% Identify the package and give the over all version information.
% \begin{macrocode}
-\ProvidesExplPackage {siunitx} {2023-07-26} {3.2.9}
+\ProvidesExplPackage {siunitx} {2023-07-31} {3.3.0}
{A comprehensive (SI) units package}
% \end{macrocode}
%
@@ -184,16 +184,22 @@
%
% \subsection{Load time options}
%
-% \begin{variable}{\l_@@_column_type_tl}
+% \begin{variable}{\l_@@_list_tl, \l_@@_product_tl, \l_@@_column_type_tl}
% \begin{macrocode}
\keys_define:nn { siunitx }
{
+ list-input-separator .tl_set:N =
+ \l_@@_list_tl ,
+ product-input-separator .tl_set:N =
+ \l_@@_product_tl ,
table-column-type .tl_set:N =
\l_@@_column_type_tl
}
\keys_set:nn { siunitx }
{
- table-column-type = S
+ list-input-separator = ; ,
+ product-input-separator = x ,
+ table-column-type = S
}
% \end{macrocode}
% \end{variable}
@@ -257,7 +263,11 @@
% \begin{macrocode}
\IfFormatAtLeastTF { 2020-10-01 }
{ }
- { \RequirePackage { xparse } }
+ {
+ \RequirePackage { xparse }
+ \providecommand \ExpandArgs [1]
+ { \cs_if_exist_use:c { exp_args:N #1 } }
+ }
% \end{macrocode}
%
% \subsubsection{Preamble commands}
@@ -375,8 +385,12 @@
% {\qtylist, \numlist, \qtyproduct, \numproduct, \qtyrange, \numproduct}
% Interfaces for compound values.
% \begin{macrocode}
-\NewDocumentCommand \qtylist
- { O { } > { \SplitList { ; } } m > { \TrimSpaces } m }
+\ExpandArgs { Ne } \NewDocumentCommand \qtylist
+ {
+ O { }
+ > { \SplitList { \exp_not:V \l_@@_list_tl } } m
+ > { \TrimSpaces } m
+ }
{
\mode_leave_vertical:
\group_begin:
@@ -385,7 +399,11 @@
\siunitx_quantity_list:nn {#2} {#3}
\group_end:
}
-\NewDocumentCommand \numlist { O { } > { \SplitList { ; } } m }
+\ExpandArgs { Ne } \NewDocumentCommand \numlist
+ {
+ O { }
+ > { \SplitList { \exp_not:V \l_@@_list_tl } } m
+ }
{
\mode_leave_vertical:
\group_begin:
@@ -393,8 +411,12 @@
\siunitx_number_list:nn {#2}
\group_end:
}
-\NewDocumentCommand \qtyproduct
- { O { } > { \SplitList { x } } m > { \TrimSpaces } m }
+\ExpandArgs { Ne } \NewDocumentCommand \qtyproduct
+ {
+ O { }
+ > { \SplitList { \exp_not:V \l_@@_product_tl } } m
+ > { \TrimSpaces } m
+ }
{
\mode_leave_vertical:
\group_begin:
@@ -403,8 +425,11 @@
\siunitx_quantity_product:nn {#2} {#3}
\group_end:
}
-\NewDocumentCommand \numproduct
- { O { } > { \SplitList { x } } > { \TrimSpaces } m }
+\ExpandArgs { Ne } \NewDocumentCommand \numproduct
+ {
+ O { }
+ > { \SplitList { \exp_not:V \l_@@_product_tl } } m
+ }
{
\mode_leave_vertical:
\group_begin:
@@ -435,11 +460,8 @@
% \begin{macro}{\complexnum, \complexqty}
% Interfaces for complex numbers.
% \begin{macrocode}
-\use:e
- {
- \NewDocumentCommand \exp_not:N \complexnum
- { O { } > { \SplitArgument { 1 } { \c_colon_str } } m }
- }
+\ExpandArgs { Ne } \NewDocumentCommand \complexnum
+ { O { } > { \SplitArgument { 1 } { \c_colon_str } } m }
{
\mode_leave_vertical:
\group_begin:
@@ -447,11 +469,8 @@
\@@_complex_number_aux:nn #2
\group_end:
}
-\use:e
- {
- \NewDocumentCommand \exp_not:N \complexqty
- { O { } > { \SplitArgument { 1 } { \c_colon_str } } m m }
- }
+\ExpandArgs { Ne } \NewDocumentCommand \complexqty
+ { O { } > { \SplitArgument { 1 } { \c_colon_str } } m m }
{
\mode_leave_vertical:
\group_begin:
diff --git a/macros/latex/contrib/siunitx/siunitx.ins b/macros/latex/contrib/siunitx/siunitx.ins
index 6250eed33a..b2a35b2d4e 100644
--- a/macros/latex/contrib/siunitx/siunitx.ins
+++ b/macros/latex/contrib/siunitx/siunitx.ins
@@ -81,11 +81,11 @@ This work consists of the files siunitx.dtx,
\file{siunitx.sty}
{%
\from{siunitx.dtx} {package,init}
+ \from{siunitx-number.dtx} {package}
\from{siunitx-angle.dtx} {package}
\from{siunitx-complex.dtx} {package}
\from{siunitx-compound.dtx} {package}
\from{siunitx-locale.dtx} {package}
- \from{siunitx-number.dtx} {package}
\from{siunitx-print.dtx} {package}
\from{siunitx-table.dtx} {package}
\from{siunitx-unit.dtx} {package}
diff --git a/macros/latex/contrib/siunitx/siunitx.pdf b/macros/latex/contrib/siunitx/siunitx.pdf
index 5b832eb7e1..299ec6f781 100644
--- a/macros/latex/contrib/siunitx/siunitx.pdf
+++ b/macros/latex/contrib/siunitx/siunitx.pdf
Binary files differ
diff --git a/macros/latex/contrib/siunitx/siunitx.tex b/macros/latex/contrib/siunitx/siunitx.tex
index c3fad6bbc7..7b7221f66a 100644
--- a/macros/latex/contrib/siunitx/siunitx.tex
+++ b/macros/latex/contrib/siunitx/siunitx.tex
@@ -1,6 +1,6 @@
\iffalse meta-comment
-File: siunitx.tex Copyright (C) 2014-2022 Joseph Wright
+File: siunitx.tex Copyright (C) 2014-2023 Joseph Wright
It may be distributed and/or modified under the conditions of the
LaTeX Project Public License (LPPL), either version 1.3c of this
@@ -640,9 +640,9 @@ The spelling \enquote{\cs{deka}} is provided for US users as an alternative to
\DescribePrefix{hecto} & 2 \\
\DescribePrefix{yocto} & -24 &
\DescribePrefix{kilo} & 3 \\
- \DescribePrefix{atto} & -18 &
- \DescribePrefix{mega} & 6 \\
\DescribePrefix{zepto} & -21 &
+ \DescribePrefix{mega} & 6 \\
+ \DescribePrefix{atto} & -18 &
\DescribePrefix{giga} & 9 \\
\DescribePrefix{femto} & -15 &
\DescribePrefix{tera} & 12 \\
@@ -883,6 +883,12 @@ occur (for example with the standard \cs{pm} symbol).
\midrule
+ \DescribeUnit[tesla]{T} \\
+ \DescribeUnit[millitesla]{mT} \\
+ \DescribeUnit[microtesla]{uT} \\
+
+ \midrule
+
\DescribeUnit[kelvin]{K} \\
\midrule
@@ -1305,6 +1311,7 @@ Table~\ref{tab:opt:num:in}.
input-ignore & Literal & \meta{none} \\
input-open-uncertainty & Literal & ( \\ ^^A )
input-signs & Literal & +-\cs{pm}\cs{mp} \\
+ input-uncertainty-divider & Literal & : \\
input-uncertainty-signs & Literal & \cs{pm} \\
parse-numbers & Switch & true \\
retain-explicit-decimal-marker & Switch & false \\
@@ -1364,18 +1371,38 @@ Uncertainties which cross the decimal marker may be given with or without a
decimal marker in \enquote{compact} form. These are treated as equivalent by
the code.\footnote{The package author favors the form without a decimal marker,
and formal guidance is ambiguous on which is correct. The form with a decimal
-marker is seen in for example some \acro{NIST} publications.}
+marker is seen in for example some \acro{NIST} publications.} Where multiple
+uncertainty values cross the decimal marker, they should all have the same
+number of digits.
\begin{LaTeXdemo}
\num{123.4(12)} \\
\num{123.4(1.2)}
\end{LaTeXdemo}
-Multiple uncertainties may also be given: these must all either be in the short
-or the long form.
+Multiple symmetrical uncertainties may also be given: these must all either be
+in the short or the long form.
\begin{LaTeXdemo}
\num{123.4(12)(45)} \\
\num{123.4 \pm 1.2 \pm 4.5}
\end{LaTeXdemo}
+\DescribeOption{input-uncertainty-divider}
+In some areas, uncertainties (or tolerances) are given in an asymmetric format.
+This is supported in the \enquote{compact} input form in \pkg{siunitx}, with
+the positive and negative parts of the uncertainty divided by a symbol listed
+in \opt{input-uncertainty-divider}. When given in this divided form, the
+two parts are interpreted as first the positive and then the negative
+component. Asymmetric uncertainties which cross the decimal marker are
+supported provided both components have the same number of digits.
+\begin{LaTeXdemo}
+ \num{10.56(12:34)} \\
+ \num{123.4(4.6:7.8)}
+\end{LaTeXdemo}
+Symmetrical and asymmetrical uncertainties may be intermixed.
+\begin{LaTeXdemo}
+ \num{10.56(1:2)(3)} \\
+ \num{6.45(2)(3:4)}
+\end{LaTeXdemo}
+
\DescribeOption{parse-numbers}
The \opt{parse-numbers} option turns the entire parsing system on and off. The
option is made available for two reasons. First, if all of the numbers in a
@@ -1445,20 +1472,22 @@ way; the options are summarised in Table~\ref{tab:opt:num:post}.
Type &
\multicolumn{1}{l@{}}{Default} \\
\midrule
- drop-exponent & Switch & false \\
- drop-uncertainty & Switch & false \\
- drop-zero-decimal & Switch & false \\
- exponent-mode & Switch & input \\
- exponent-thresholds & Literal & -3:3 \\
- fixed-exponent & Integer & 0 \\
- minimum-integer-digits & Integer & 0 \\
- minimum-decimal-digits & Integer & 0 \\
- round-half & Choice & up \\
- round-minimum & Literal & 0 \\
- round-mode & Choice & none \\
- round-pad & Switch & true \\
- round-precision & Integer & 2 \\
- round-zero-positive & Switch & true \\
+ drop-exponent & Switch & false \\
+ drop-uncertainty & Switch & false \\
+ drop-zero-decimal & Switch & false \\
+ exponent-mode & Switch & input \\
+ exponent-thresholds & Literal & -3:3 \\
+ fixed-exponent & Integer & 0 \\
+ minimum-integer-digits & Integer & 0 \\
+ minimum-decimal-digits & Integer & 0 \\
+ round-direction & Choice & nearest \\
+ round-half & Choice & up \\
+ round-minimum & Literal & 0 \\
+ round-mode & Choice & none \\
+ round-pad & Switch & true \\
+ round-precision & Integer & 2 \\
+ round-zero-positive & Switch & true \\
+ uncertainty-round-direction & Choice & nearest \\
\bottomrule
\end{tabular}
\end{table}
@@ -1593,11 +1622,31 @@ is controlled by the switch \opt{round-pad}, which is \opt{true} as standard.
\num[round-pad = false]{12.3}
\end{LaTeXdemo}
+\DescribeOption{round-direction}
\DescribeOption{round-half}
-In cases where the rounded part of a number is exactly half, there are two
-common methods for \enquote{breaking the tie}. The choice of method is
-determined by the option \opt{round-half}, which recognises the choices
-\opt{up} and \opt{even}.
+The detail of which approach to use for rounding may be adjusted using the
+options \opt{round-direction} and \opt{round-half}. The option
+\opt{round-direction} determines which direction a value is rounded toward: a
+choice of \opt{nearest}, \opt{up} or \opt{down}. The standard setting,
+\opt{nearest}, gives the common outcome that values round depending on whether
+the preceding digit is greater or less than \num{5}. The options \opt{up} and
+\opt{down} mean that values are always rounded in one direction: the \opt{down}
+option may be thought of as \enquote{truncation}.
+\begin{LaTeXdemo}
+ \sisetup{round-mode = places}
+ \num{0.054} \\
+ \num{0.046} \\
+ \sisetup{round-direction = down}%
+ \num{0.054} \\
+ \num{0.046} \\
+ \sisetup{round-direction = up}%
+ \num{0.054} \\
+ \num{0.046}
+\end{LaTeXdemo}
+For rounding to \opt{nearest}, where the rounded part of a number is exactly
+half, there are two common methods for \enquote{breaking the tie}. The choice
+of method is determined by the option \opt{round-half}, which recognises the
+choices \opt{up} and \opt{even}.
\begin{LaTeXdemo}
\sisetup{
round-mode = figures,
@@ -1611,6 +1660,17 @@ determined by the option \opt{round-half}, which recognises the choices
\num{0.045}
\end{LaTeXdemo}
+\DescribeOption{uncertainty-round-direction}
+When rounding with uncertainties, the direction to round the uncertainty part
+may be set independently of the main number: this is typically used to round
+the uncertainty strictly upward.
+\begin{LaTeXdemo}
+ \sisetup{round-mode = uncertainty}
+ \num{0.123(41)} \\
+ \sisetup{uncertainty-round-direction = up}%
+ \num{0.123(41)}
+\end{LaTeXdemo}
+
\DescribeOption{round-minimum}
There are cases in which rounding will result in the number reaching zero. It
may be desirable to show such results as below a threshold value. This can be
@@ -1944,20 +2004,30 @@ specialised options, which apply to these more unusual input forms
\multicolumn{1}{l}{Option name} &
Type &
\multicolumn{1}{l}{Default\tnote{*}} \\
- \midrule
- list-exponents & Choice & individual \\
- list-final-separator & Literal & \verb*= \text{and} = \\
- list-pair-separator & Literal & \verb*= \text{and} = \\
- list-separator & Literal & \verb*=\text{,} = \\
- list-units & Choice & repeat \\
- product-exponents & Choice & individual \\
- product-mode & Choice & symbol \\
- product-phrase & Literal & \verb*= \text{by} = \\
- product-symbol & Literal & \cs{times} \\
- product-units & Choice & repeat \\
- range-exponents & Choice & individual \\
- range-phrase & Literal & \verb*= \text{to} = \\
- range-units & Choice & repeat \\
+ \midrule % (
+ list-close-bracket & Literal & ) \\
+ list-exponents & Choice & individual \\
+ list-final-separator & Literal & \verb*= \text{and} = \\
+ list-independent-prefix & Switch & false \\
+ list-open-bracket & Literal & ( \\ % )
+ list-pair-separator & Literal & \verb*= \text{and} = \\
+ list-separator & Literal & \verb*=\text{,} = \\
+ list-units & Choice & repeat \\ % (
+ product-close-bracket & Literal & ) \\
+ product-exponents & Choice & individual \\
+ product-independent-prefix & Switch & false \\
+ product-mode & Choice & symbol \\
+ product-open-bracket & Literal & ( \\ % )
+ product-phrase & Literal & \verb*= \text{by} = \\
+ product-symbol & Literal & \cs{times} \\
+ product-units & Choice & repeat \\ % (
+ range-close-bracket & Literal & ) \\
+ range-exponents & Choice & individual \\
+ range-independent-prefix & Switch & false \\
+ range-open-bracket & Literal & ( \\ % )
+ range-open-phrase & Literal & \meta{empty} \\
+ range-phrase & Literal & \verb*= \text{to} = \\
+ range-units & Choice & repeat \\
\bottomrule
\end{tabular}
\footnotesize
@@ -2008,6 +2078,7 @@ as for numbers.
\numproduct[product-phrase = { BY }]{5 x 100 x 2} \\
\end{LaTeXdemo}
+\DescribeOption{range-open-phrase}
\DescribeOption{range-phrase}
Ranges of numbers can be given as input. These will have an appropriate word or
symbol inserted between the two entries: this is stored using the
@@ -2017,6 +2088,12 @@ extra space is added. The phrase is always printed in text mode.
\numrange{5}{100} \\
\numrange[range-phrase = --]{5}{100}
\end{LaTeXdemo}
+In some languages, an opening phrase is \emph{required}; this is supported
+using the \opt{range-open-phrase} key.
+\begin{LaTeXdemo}
+ \numrange{10}{12} \\
+ \numrange[range-open-phrase = {\text{from} }]{5}{100}
+\end{LaTeXdemo}
\DescribeOption{list-exponents}
\DescribeOption{product-exponents}
@@ -2078,6 +2155,48 @@ The option \opt{product-units} also offers the settings \opt{bracket-power} and
\qtyproduct[product-units = bracket-power]{2 x 4}{\metre} \\
\qtyproduct[product-units = power]{2 x 4}{\metre}
\end{LaTeXdemo}
+\DescribeOption{list-close-bracket}
+\DescribeOption{list-open-bracket}
+\DescribeOption{product-close-bracket}
+\DescribeOption{product-open-bracket}
+\DescribeOption{range-close-bracket}
+\DescribeOption{range-open-bracket}
+The brackets used can be customised using the relevant \texttt{\dots-close-bracket}
+and \texttt{\dots-open-bracket} options.
+\begin{LaTeXdemo}
+ \sisetup{
+ list-units = bracket ,
+ list-open-bracket = ( ,
+ list-close-bracket = )
+ }
+ \numlist{5e3;7e3;9e3;1e4} \\
+ \sisetup{
+ product-units = bracket ,
+ product-open-bracket = ( ,
+ product-close-bracket = )
+ }
+ \numproduct{5e3 x 7e3 x 9e3 x 1e4} \\
+ \sisetup{
+ range-units = bracket ,
+ range-open-bracket = ( ,
+ range-close-bracket = )
+ }
+ \qtyrange{2}{4}{\degreeCelsius}
+\end{LaTeXdemo}
+
+\DescribeOption{list-independent-prefix}
+\DescribeOption{product-independent-prefix}
+\DescribeOption{range-independent-prefix}
+When converting exponents to prefixes, there are two possible approaches to the
+case where units are repeated. They can all be converted to use the same
+(initial) prefix, or they can be processed separately. The
+\texttt{\dots-independent-prefix} options are used to control this outcome.
+\begin{LaTeXdemo}
+ \sisetup{exponent-to-prefix = true}%
+ \qtyrange{1e3}{1e9}{\watt}\\
+ \sisetup{range-independent-prefix = true}%
+ \qtyrange{1e3}{1e9}{\watt}
+\end{LaTeXdemo}
\subsection{Complex numbers}
@@ -2664,19 +2783,20 @@ to the layout of tabular material (Table~\ref{tab:opt:tables}).
Type &
\multicolumn{1}{l@{}}{Default} \\
\midrule
- table-align-comparator & Switch & true \\
- table-align-exponent & Switch & true \\
- table-align-text-after & Switch & true \\
- table-align-text-before & Switch & true \\
- table-align-uncertainty & Switch & true \\
- table-alignment & Meta & center \\
- table-alignment-mode & Choice & marker \\
- table-auto-round & Switch & false \\
- table-column-width & Length & 0pt \\
- table-fixed-width & Switch & false \\
- table-format & Special & 2.2 \\
- table-number-alignment & Choice & center \\
- table-text-alignment & Choice & center \\
+ table-align-comparator & Switch & true \\
+ table-align-exponent & Switch & true \\
+ table-align-text-after & Switch & true \\
+ table-align-text-before & Switch & true \\
+ table-align-uncertainty & Switch & true \\
+ table-alignment & Meta & center \\
+ table-alignment-mode & Choice & marker \\
+ table-auto-round & Switch & false \\
+ table-column-width & Length & 0pt \\
+ table-fixed-width & Switch & false \\
+ table-format & Special & 2.2 \\
+ table-model-setup & Literal & \meta{empty} \\
+ table-number-alignment & Choice & center \\
+ table-text-alignment & Choice & center \\
\bottomrule
\end{tabular}
\end{table}
@@ -2794,6 +2914,12 @@ table format argument are set to be absent (the number of figures is set to
zero). Setting the \opt{table-format} option also resets
\opt{table-alignment-mode} to \opt{format}.
+\DescribeOption{table-model-setup}
+In some tables (particularly those using bold extended fonts), it may be
+necessary to insert additional information when creating the \enquote{model}.
+This is handled using the \opt{table-model-setup} key. An example of the use of
+this key is given in Section~\ref{sec:hint:heading}.
+
Space for material before and after the \texttt{S} column can be reserved by
giving model text as part of the \opt{table-format} key. This is then used to
provide the necessary gap while maintaining alignment (Table~\ref{tab:S:ends}).
@@ -3122,6 +3248,15 @@ option is used to switch to a particular locale.
\subsection{Preamble-only options}
+\DescribeOption{list-input-separator}
+\DescribeOption{product-input-separator}
+The separator between \emph{input} elements of lists (\cs{numlist},
+\cs{qtylist}) and products (\cs{numproduct}, \cs{qtyproduct}) can be adjusted
+using the options \opt{list-input-separator} and \opt{product-input-separator},
+respectively. These are load-time only options as the separator here is part of
+the \enquote{document interface} rather than part of the individual number(s).
+The supplied value should be a \emph{single} marker.
+
\DescribeOption{table-column-type}
The letter(s) used to create table columns can be adjusted using the
\opt{table-column-type} option. The standard setting is |S|, but one or more
@@ -3753,20 +3888,30 @@ best approach is to make the \cs{bfseries} macro \enquote{robust} (as
demonstrated in Section~\ref{sec:hint:expanding}), then to use this macro to
make the heading cells bold. This approach is illustrated in
Table~\ref{tab:xmpl:headers}, along with the use of \cs{rowcolor} to provide a
-background color.
+background color. Some typical \LaTeX{} font arrangements use a wider
+(extended) width for the bold font compared with the normal font. This will
+disturb the alignment if the \opt{table-format} is not symmetrical. For these
+cases, the \opt{table-model-setup} key may be used to apply the wider font to
+the \enquote{model} used in ensuring alignment.
\begin{LaTeXdemo}[code and float]
\begin{table}
\caption{Header row in a table.%
\label{tab:xmpl:headers}}
\robustify\bfseries
\centering
+ \sisetup{text-series-to-math}
\begin{tabular}
- {@{}S[text-series-to-math, table-format = 3.3]@{}}
+ {
+ @{}
+ S[table-format = 3.3]
+ S[table-format = 3.6, table-model-setup = \bfseries]
+ @{}
+ }
\rowcolor[gray]{0.9}
- \bfseries 123.456 \\
- 23.45 \\
- 123.4 \\
- 3.456 \\
+ \bfseries 123.456 & \bfseries 123.456789 \\
+ 23.45 & 23.45 \\
+ 123.4 & 123.4 \\
+ 3.456 & 3.456 \\
\end{tabular}
\end{table}
\end{LaTeXdemo}
@@ -3852,6 +3997,63 @@ be loaded in the preamble using
\input{siunitx-local-units}
\end{LaTeXdemo}
+\subsection{Overloading the standard interfaces%
+ \label{sec:hint:overload}}
+
+The interfaces in \pkg{siunitx} deliberately split up different types of
+numerical input (ranges, products, etc.) for semantic reasons. This also means
+that there is less chance of confusion in parsing input. However, some users
+would prefer to overload the \cs{num} and \cs{qty} commands such that they
+accept multiple different types of input. There is a code-level interface that
+could be used for this, but most end-users will likely want to avoid this. A
+possible approach that covers most of the common cases is.
+\begin{LaTeXdemo}[code only]
+ \ExplSyntaxOn
+ \cs_gset_eq:NN \ifstrpresent \tl_if_in:nnTF
+ \ExplSyntaxOff
+ \NewCommandCopy\oldnum\num
+ \NewCommandCopy\oldnumrange\numrange
+ \RenewDocumentCommand\num{O{}m}{%
+ \ifstrpresent{#2}{x}
+ {\numproduct[#1]{#2}}
+ {%
+ \ifstrpresent{#2}{;}
+ {\numlist[#1]{#2}}
+ {%
+ \ifstrpresent{#2}{:}
+ {\numrange[#1]{#2}}
+ {\oldnum[#1]{#2}}%
+ }%
+ }%
+ }
+ \RenewDocumentCommand\numrange{O{}>{\SplitList{:}}m}
+ {\oldnumrange[#1]#2}
+\end{LaTeXdemo}
+for the \cs{num} command and
+\begin{LaTeXdemo}[code only]
+ \ExplSyntaxOn
+ \cs_gset_eq:NN \ifstrpresent \tl_if_in:nnTF
+ \ExplSyntaxOff
+ \NewCommandCopy\oldqty\qty
+ \NewCommandCopy\oldqtyrange\qtyrange
+ \RenewDocumentCommand\qty{O{}mm}{%
+ \ifstrpresent{#2}{x}
+ {\qtyproduct[#1]{#2}{#3}}
+ {%
+ \ifstrpresent{#2}{;}
+ {\qtylist[#1]{#2}{#3}}
+ {%
+ \ifstrpresent{#2}{:}
+ {\qtyrange[#1]{#2}{#3}}
+ {\oldqty[#1]{#2}{#3}}%
+ }%
+ }%
+ }
+ \RenewDocumentCommand\qtyrange{O{}>{\SplitList{:}}mm}
+ {\oldqtyrange[#1]#2{#3}}
+\end{LaTeXdemo}
+for \cs{qty}.
+
\section{Using (\acro{SI}) units}
Consistent and logical units are a necessity for scientific work, and have
diff --git a/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl b/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
index 43539b589f..61e98fc5ee 100644
--- a/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
+++ b/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
@@ -161,6 +161,7 @@ $mirrors = {
},
'Sweden' => {
'https://ftp.acc.umu.se/mirror/CTAN/' => 1,
+ 'https://ftpmirror1.infania.net/mirror/CTAN/' => 1,
},
'Switzerland' => {
'https://mirror.foobar.to/CTAN/' => 1,
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb b/systems/texlive/tlnet/tlpkg/texlive.tlpdb
index 27d18f3a8c..dfca280685 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb
@@ -26,11 +26,11 @@ depend container_split_src_files/1
depend frozen/0
depend minrelease/2016
depend release/2023
-depend revision/67774
+depend revision/67783
name 00texlive.image
category TLCore
-revision 67756
+revision 67779
shortdesc TeX Live files only in the source repository
longdesc The files here are not copied by the installer and containers
longdesc are not built for them; they exist only in the source
@@ -3635,6 +3635,7 @@ runfiles size=13036
tlpkg/tlpsrc/quattrocento.tlpsrc
tlpkg/tlpsrc/quickreaction.tlpsrc
tlpkg/tlpsrc/quicktype.tlpsrc
+ tlpkg/tlpsrc/quiver.tlpsrc
tlpkg/tlpsrc/quiz2socrative.tlpsrc
tlpkg/tlpsrc/quizztex.tlpsrc
tlpkg/tlpsrc/quotchap.tlpsrc
@@ -4770,7 +4771,7 @@ depend setting_available_architectures:aarch64-linux amd64-freebsd amd64-netbsd
name 00texlive.installer
category TLCore
-revision 67768
+revision 67776
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
@@ -72360,7 +72361,7 @@ containerchecksum 741f1b490883381bc88913b165f02126c140facfc70b95cf120feb90c59818
name collection-mathscience
category Collection
-revision 67725
+revision 67779
shortdesc Mathematics, natural sciences, computer science packages
relocated 1
depend 12many
@@ -72552,6 +72553,7 @@ depend pseudocode
depend pythonhighlight
depend qsharp
depend quickreaction
+depend quiver
depend rank-2-roots
depend rbt-mathnotes
depend rec-thy
@@ -72618,7 +72620,7 @@ depend yquant
depend ytableau
depend zx-calculus
containersize 1688
-containerchecksum 80fede23abcd4b6a12e0a4ae43c121e1b2ce1b611cc0dc3a5fc063f1442000731634e4614183551c4448c742ac05994936492e6806fea7f70bc65f5046a8134e
+containerchecksum 9d941556fb8a61cd88d3f57cd4e15d399199f48917e84961f9f732a54746ddf0b39ebaf630dcf41a1155ffd7dfcbd37e79bb63addeb50e59b38ebc8c941804c4
name collection-metapost
category Collection
@@ -99581,7 +99583,7 @@ catalogue-version 1.031
name dtk
category Package
-revision 67766
+revision 67781
shortdesc Document class for the journal of DANTE
relocated 1
longdesc The bundle provides a class and style file for typesetting "Die
@@ -99589,10 +99591,10 @@ longdesc TeXnische Komodie" -- the communications of the German TeX
longdesc Users Group DANTE e.V. The arrangement means that the class may
longdesc be used by article writers to typeset a single article, as well
longdesc as to produce the complete journal.
-containersize 14632
-containerchecksum d91e4b9f660ec113c49bab824e6617585bfca01c6d069732ab95c0bc959a1ab7b77c5689a93fccb3a06515e7078e3158c894ece4898d7ee49699dbbac641ac59
-doccontainersize 79124
-doccontainerchecksum f8390cba6b82659a77f93e50df0c191472abcde116c9c2e3f94132c577af61fd2e795112a7c83415d7dab7d22629d7a4844ca8fa2bae5577a5d5f87cd03ddac7
+containersize 14620
+containerchecksum 8ff18a26f2e36610fb5094ccee492cbf7df790a38b648b00491982beb1dbde5ddf52d60031f91fc2177e06b1d3b7b58d0b479e22fe86f62a813940f47a800a17
+doccontainersize 79072
+doccontainerchecksum 92f3c2b1bd2c3650bc79adc84d04a007584d4af5ec8f180ed519079ddc18267ae393d968268aaac4bd66a93f6d98484d6536d4d89bd00d4d17d49569ea5f0af9
docfiles size=28
RELOC/doc/latex/dtk/README.md details="Readme"
RELOC/doc/latex/dtk/doc/beispiel.bib
@@ -99617,7 +99619,6 @@ catalogue-contact-repository https://github.com/rolfn/dtk
catalogue-ctan /usergrps/dante/dtk
catalogue-license lppl1.3c
catalogue-topics journalpub class
-catalogue-version 2.10a
name dtk-bibliography
category Package
@@ -225098,7 +225099,7 @@ catalogue-version 1.0
name newtx
category Package
-revision 67763
+revision 67778
shortdesc Alternative uses of the TX fonts, with improved metrics
relocated 1
longdesc The bundle splits txfonts.sty (from the TX fonts distribution)
@@ -225113,10 +225114,10 @@ longdesc garamondx package, thus offering a garamond-alike
longdesc text-with-maths combination.
depend kastrup
execute addMap newtx.map
-containersize 6492576
-containerchecksum 4fdbafc4978825215b1ec553f02f8172e49c833f9402a1cab2152a78de69631a2ccf86c35c653f8ab85e329be8befdfd806f9224219b92c1e215bc491aa860fe
-doccontainersize 1053036
-doccontainerchecksum 009d04a6f08efd5ddbf5aa60d189bb37402627282fc4adf9193d2967f5b4781cd07954be3cc013933e0e2c2a50b207d1e4a2d7cf00e65f7e4c85c05070fe9e53
+containersize 6492612
+containerchecksum 38939c6843c9292dd3cde0d767f292614fb2beaba2d81b17f86b15fb05f4d772b4810f804d57244ed6bbbcb85c29cc74e0eb62f3ff5486ba1cabf6fb14b04a48
+doccontainersize 1053072
+doccontainerchecksum 7e0498bfc3c93f63a2f0f154f390929f47fe0f527ac86bc064ab3c17d2473576080fd34233b8da4e7295a45411b1bd2d70a712011cf1394ab370080e11536d33
docfiles size=334
RELOC/doc/fonts/newtx/MANIFEST-newtx.txt
RELOC/doc/fonts/newtx/README details="Readme"
@@ -226149,7 +226150,7 @@ catalogue-also minion2newtx
catalogue-ctan /fonts/newtx
catalogue-license lppl1.3
catalogue-topics font font-body font-maths font-serif font-proportional font-type1 font-otf font-supp font-t1enc
-catalogue-version 1.722
+catalogue-version 1.723
name newtxsf
category Package
@@ -268027,6 +268028,36 @@ catalogue-license lppl1.3
catalogue-topics shortcut
catalogue-version 0.1
+name quiver
+category Package
+revision 67779
+shortdesc Draw commutative diagrams exported from https://q.uiver.app
+relocated 1
+longdesc Quiver is a modern graphical editor for commutative and pasting
+longdesc diagrams, capable of rendering high-quality diagrams for screen
+longdesc viewing, and exporting to LaTeX. This LaTeX package is intended
+longdesc to be used in conjunction with the editor, and provides the
+longdesc packages and styles that are used by diagrams exported from the
+longdesc editor.
+containersize 1344
+containerchecksum b7eda520bdfeebff570458d36e22b1779bd16c14070192072987c7f1131efa33c6f1e7ff8c16f73c338fbfe6ef80e656c2ef061ad9ee15885b7f5e8f1195ffc0
+doccontainersize 184544
+doccontainerchecksum 42bff285adfadd6655941b0221b2cf0d9a457a638997591220b564040acb94b4c57bb9dfccf90679c81e301618e8e4b5ea19c1dad9fb478dbabe1c2dbe4da991
+docfiles size=50
+ RELOC/doc/latex/quiver/README.md details="Readme"
+ RELOC/doc/latex/quiver/quiver-doc.pdf details="Package documentation"
+ RELOC/doc/latex/quiver/quiver-doc.tex
+runfiles size=1
+ RELOC/tex/latex/quiver/quiver.sty
+catalogue-contact-announce https://twitter.com/q_uiver_app
+catalogue-contact-bugs https://github.com/varkor/quiver/issues
+catalogue-contact-home https://q.uiver.app/
+catalogue-contact-repository https://github.com/varkor/quiver
+catalogue-ctan /graphics/pgf/contrib/quiver
+catalogue-license mit
+catalogue-topics graphics graphics-in-tex pgf-tikz diagram-comm
+catalogue-version 1.3.0
+
name quiz2socrative
category Package
revision 52276
@@ -285315,7 +285346,7 @@ catalogue-version 1.36
name siunitx
category Package
-revision 67737
+revision 67780
shortdesc A comprehensive (SI) units package
relocated 1
longdesc Typesetting values with units requires care to ensure that the
@@ -285340,18 +285371,18 @@ longdesc The package relies on LaTeX 3 support from the l3kernel and
longdesc l3packages bundles.
depend l3kernel
depend l3packages
-containersize 66244
-containerchecksum ed7de8cfad727354c01af18135b0c2eb262bf94e7bf1f327b4963995a0baa0e7cc9c18825a98eda3359d740f00242d0c1e29a53f30492221eafd12e6934f35fb
-doccontainersize 1269716
-doccontainerchecksum e892d4b6a7d49e89f8f43090099cdd3b0c5b92b294df67a3f5e73a4df5bf8406e44c49dfc64fff7ca07b371395813c072a16f2c26c9593cbe8f2c7013adf23ec
-docfiles size=346
+containersize 67352
+containerchecksum f37990c043dc85c4ae5a7dbe84c02625ee59788ab1a248dc9115ac799a3f3186f49dc1dd199d2e09a628b50775a5280a5cb22ce4a42606133371ff8cfa927e71
+doccontainersize 1289804
+doccontainerchecksum 8ed8657dbe3abace112fb4e0faa777407500d31cf289201bb3d3615982b36bf95e23693c55e23b7c23dcaadb84638f843bf413e6299088a46ff88beac27d91f9
+docfiles size=352
RELOC/doc/latex/siunitx/CHANGELOG.md
RELOC/doc/latex/siunitx/README.md details="Readme"
RELOC/doc/latex/siunitx/siunitx-code.pdf details="Code documentation"
RELOC/doc/latex/siunitx/siunitx.pdf details="User manual"
-srccontainersize 118400
-srccontainerchecksum 8901175658c2abf51bc35e245fe35ddaeb28dc94239eba0a9899b17b51fed20e42e39d61364e12bac0599a73f05291c93c5db8ced2dd870d79d02cc53cd1087b
-srcfiles size=183
+srccontainersize 122220
+srccontainerchecksum 45211fcebe8be9e17517b5fb4a67d01cc66f93f39348978d10e42e393fdff4089b273493ad6017d8788825bffc4942639f69c6c7e299bafa48f281f74a91efd7
+srcfiles size=188
RELOC/source/latex/siunitx/siunitx-abbreviation.dtx
RELOC/source/latex/siunitx/siunitx-angle.dtx
RELOC/source/latex/siunitx/siunitx-binary.dtx
@@ -285370,7 +285401,7 @@ srcfiles size=183
RELOC/source/latex/siunitx/siunitx.dtx
RELOC/source/latex/siunitx/siunitx.ins
RELOC/source/latex/siunitx/siunitx.tex
-runfiles size=155
+runfiles size=158
RELOC/tex/latex/siunitx/siunitx-abbreviations.cfg
RELOC/tex/latex/siunitx/siunitx-binary.cfg
RELOC/tex/latex/siunitx/siunitx-v2.sty
@@ -285382,7 +285413,7 @@ catalogue-contact-repository https://github.com/josephwright/siunitx
catalogue-ctan /macros/latex/contrib/siunitx
catalogue-license lppl1.3c
catalogue-topics units scientific-docs expl3
-catalogue-version 3.2.9
+catalogue-version 3.3.0
name skak
category Package
@@ -313811,7 +313842,7 @@ docfiles size=376
name texlive-scripts
category TLCore
-revision 67768
+revision 67776
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.
@@ -313819,10 +313850,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 114060
-containerchecksum cc3819e7fac5596f19a96725afad4cfa9c4a0ca3a0de90613346c0c7e1e3d0b57a2d4827a67b496fcee2c1d51a9e04aaddb1b62a8a639bfbc42ab8ce5e7eedc3
+containersize 114072
+containerchecksum 8ea919eb6deb3a76e0c331c0c50dfbe03836bb7a98e8ae0636a0dc37614689a3f67f2364ad5e55aad147b5eec8ad323b6797c2be93e89611d25d8e23d2382547
doccontainersize 428160
-doccontainerchecksum f74fb397b23bf2adbc64cf6e81d91aee18139db6587f25bfe2ae688c21379334ad358b713a69147a21af5c732e5dd896ae4a3e5aeec92a3fc371ddbce7e46cee
+doccontainerchecksum d062ca8071d963080adb58b0097a775a3e76e467bbd9dec29fbef5461a2f08800b0fdf722f3ad5752336f66b9c388784a95ce97f51bd7d336de01eefa1a25536
docfiles size=547
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 edabfb84a8..de2debed17 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
@@ -1 +1 @@
-7d9f8679c7d7f8537b621ed820c127da texlive.tlpdb
+aeb58aea370d86fb5f4b968320062d16 texlive.tlpdb
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
index eb5ad75de6..adf35a41fe 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
@@ -1 +1 @@
-d37976f4ba5c997035c1d7110e9656aba0fec5cd375e313ac444f671dd3ded6385f884b9d6b777272541d2b072b35f34745db06e9b676630037c6ce28a3e5703 texlive.tlpdb
+c563aeddb240b81c2fdd309f07040feafd0fc0c02508a022e0f6fdb8065382a9919d6715a5ba226caa4bec1bc920860e29b4bc093dd43dd677c9a16eeecee0c2 texlive.tlpdb
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
index 6b52377e14..c7f72324b8 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
@@ -1,11 +1,11 @@
-----BEGIN PGP SIGNATURE-----
-iQEzBAEBCgAdFiEE2PL4YFeoV+QqiBBqTOGHfhlDjHAFAmTG9ewACgkQTOGHfhlD
-jHCMIgf+MszbcBMYGlsUc0+o/8U0/I+/Cua8jQdmmlkkwDn6hycaqCr4ZXIQpWON
-F6bvWV4tuPeZOgSUI9kWDDlpFfe4J48SfCnB2yqU+8m/mpM9I/jYH3v6yaoQMi6h
-EWqLLXdOpA92EGYVd8H7Q+lj2CP8GPuyAYn/XFc7HQfBklxg1SgFpf0x7NaZ7BAR
-B1y/GuOPXnthp6wDktLeb4Mg391yfFf/BNbezmUWWcg2TkjlJ60R/eZdEDW2aNs4
-2kB+J8QJFW+Qw3Smdj0xGuQ/x99/6dm9AqdfkrgKdJeLVGyhCFUkNJW+zlUDJb9m
-0bJzj2UgddRvaXlo1K4MJM6vdxGSaw==
-=9qem
+iQEzBAEBCgAdFiEE2PL4YFeoV+QqiBBqTOGHfhlDjHAFAmTIR/0ACgkQTOGHfhlD
+jHCluAf/YVfLBB+GfxaY+1bBpGJRVjT+gYrHUM40BhG2CF88j+yhl70j4K5lGOEu
+frYY/ibboxMEU1uEoWP91FVqlNgTOx1q9jjmLUFEThe/asvVYRwpljPfDPL4WhaL
+b28D/ZS7wIeuiL9sPWdMRD245i+yLorI0OrkBnTJKFnpNWrf6f7qcExBbAxoiyyF
+cusrg2QZRPTC4KBMZSUonWnv3aqI/Thm6Ox1JBYEvU83V0X8G5w/gsaXniK4IJAr
+K0mJCnNNlj0yDNpTbUXXiRcxcOS+ZeU5qSNSxTgAKj0VkKbiaW/nJdi5unr2SHF5
+u01KOdXvNRBeNM5LlATQgZ83WcIRMA==
+=TtmM
-----END PGP SIGNATURE-----
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
index b9116737bb..be5249baf9 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
Binary files differ
diff --git a/timestamp b/timestamp
index 4032c34b0d..be210c85c3 100644
--- a/timestamp
+++ b/timestamp
@@ -2,4 +2,4 @@
# The source CTAN of this site's material:
dante.ctan.org
# The year-month-day-hour-minute of this site's material:
-2023-07-31-02-02
+2023-08-01-02-02
diff --git a/usergrps/dante/dtk/README.md b/usergrps/dante/dtk/README.md
index 1e536871e2..836f916da4 100644
--- a/usergrps/dante/dtk/README.md
+++ b/usergrps/dante/dtk/README.md
@@ -1,5 +1,3 @@
# dtk
LaTeX class for the journal »Die TeXnische Komödie« (new implementation).
-
-Rolf Niepraschk <Rolf.Niepraschk@gmx.de> and Herbert Voss <hvoss@tug.org>
diff --git a/usergrps/dante/dtk/doc/beispiel.pdf b/usergrps/dante/dtk/doc/beispiel.pdf
index 29a0bb33f0..77883b0b68 100644
--- a/usergrps/dante/dtk/doc/beispiel.pdf
+++ b/usergrps/dante/dtk/doc/beispiel.pdf
Binary files differ
diff --git a/usergrps/dante/dtk/dtk-ruecken.tex b/usergrps/dante/dtk/dtk-ruecken.tex
index cf4988cabe..d637a9ba8b 100644
--- a/usergrps/dante/dtk/dtk-ruecken.tex
+++ b/usergrps/dante/dtk/dtk-ruecken.tex
@@ -1,5 +1,5 @@
\documentclass[11pt,a4paper]{article}
-\usepackage[T1]{fontenc}
+%\usepackage[T1]{fontenc}
\usepackage{libertinus}
\oddsidemargin=-1in %
\unitlength=1mm %
diff --git a/usergrps/dante/dtk/dtk-url.sty b/usergrps/dante/dtk/dtk-url.sty
index fc52c397e8..08533df689 100644
--- a/usergrps/dante/dtk/dtk-url.sty
+++ b/usergrps/dante/dtk/dtk-url.sty
@@ -2,7 +2,7 @@
%%
%% LaTeX Class for ``Die TeXnische Komoedie''.
%%
-%% Copyright (C) 2015-2019
+%% Copyright (C) 2015-2023
%% Rolf Niepraschk, Herbert Voss
%%
%% It may be distributed and/or modified under the
@@ -14,7 +14,7 @@
%% version 2005/12/01 or later.
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{dtk-url}[2019/12/04 v1.5 Urls (qrcode) for DTK (HO,hv,rn)]
+\ProvidesPackage{dtk-url}[2023/07/31 v1.6 Urls (qrcode) for DTK (HO,hv,rn)]
\RequirePackage{url}[2006/04/12]
\RequirePackage{xcolor}
@@ -100,7 +100,7 @@
}%
\x
\DTK@UrlWrite{\DTK@UrlType}{\DTK@Raw}%
- \pdfstartlink attr{%
+ \pdfextension startlink attr{%
/H/I%
/C[1 0 0]% red
/Border[1 0 0]%
@@ -115,7 +115,7 @@
>>%
}%
#1%
- \pdfendlink
+ \pdfextension endlink
}%
% Implement writing of file \DTK@UrlFile