summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--FILES.byname379
-rw-r--r--FILES.byname.gzbin2646819 -> 2646695 bytes
-rw-r--r--FILES.last07days449
-rw-r--r--biblio/ctan-bibdata/ctan.bib30
-rw-r--r--graphics/pgf/contrib/tikzducks/t-tikzducks.mkiv2
-rw-r--r--graphics/pgf/contrib/tikzducks/tikzducks-doc-settings.sty183
-rw-r--r--graphics/pgf/contrib/tikzducks/tikzducks-doc.pdfbin471679 -> 416529 bytes
-rw-r--r--graphics/pgf/contrib/tikzducks/tikzducks-doc.tex477
-rw-r--r--graphics/pgf/contrib/tikzducks/tikzducks-generic.tex45
-rw-r--r--graphics/pgf/contrib/tikzducks/tikzducks.sty2
-rw-r--r--macros/latex/contrib/easybook/easybook.dtx88
-rw-r--r--macros/latex/contrib/easybook/easybook.pdfbin608631 -> 609380 bytes
-rw-r--r--macros/latex/contrib/easybook/easybook.tex31
-rw-r--r--macros/latex/contrib/fadingimage/README.md6
-rw-r--r--macros/latex/contrib/fadingimage/doc/fadingimage.pdfbin228555 -> 138677 bytes
-rw-r--r--macros/latex/contrib/fadingimage/doc/fadingimage.tex69
-rw-r--r--macros/latex/contrib/fadingimage/tex/fadingimage.sty42
-rw-r--r--macros/latex/contrib/notebeamer/doc/figures/beamerdemo.pdf (renamed from macros/latex/contrib/notebeamer/doc/images/newnote3sdemo.pdf)bin311010 -> 274146 bytes
-rw-r--r--macros/latex/contrib/notebeamer/doc/figures/paperdemo.pdfbin0 -> 2670286 bytes
-rw-r--r--macros/latex/contrib/notebeamer/doc/images/HDU.pdfbin84691 -> 0 bytes
-rw-r--r--macros/latex/contrib/notebeamer/doc/images/Inuyasa.jpgbin39979 -> 0 bytes
-rw-r--r--macros/latex/contrib/notebeamer/doc/images/newnote4sdemo.pdfbin1075706 -> 0 bytes
-rw-r--r--macros/latex/contrib/notebeamer/doc/images/newnotedemo.pdfbin8075486 -> 0 bytes
-rw-r--r--macros/latex/contrib/notebeamer/doc/images/titlepage1.pdfbin286314 -> 0 bytes
-rw-r--r--macros/latex/contrib/notebeamer/doc/images/titlepage2.pdfbin12057 -> 0 bytes
-rw-r--r--macros/latex/contrib/notebeamer/doc/notebeamer-demo.pdfbin2963011 -> 0 bytes
-rw-r--r--macros/latex/contrib/notebeamer/doc/notebeamer-demo.tex29
-rw-r--r--macros/latex/contrib/notebeamer/doc/notebeamer-doc.pdfbin3033387 -> 0 bytes
-rw-r--r--macros/latex/contrib/notebeamer/doc/notebeamer-doc.tex285
-rw-r--r--macros/latex/contrib/notebeamer/doc/notebeamer.pdfbin0 -> 1357620 bytes
-rw-r--r--macros/latex/contrib/notebeamer/doc/notebeamer.tex135
-rw-r--r--macros/latex/contrib/notebeamer/tex/notebeamer.cls314
-rw-r--r--macros/latex/contrib/notebeamer/tex/notebeamer.sty160
-rw-r--r--macros/latex/contrib/profcollege/doc/ProfCollege-doc.pdfbin10211376 -> 10283168 bytes
-rw-r--r--macros/latex/contrib/profcollege/latex/PfCAssemblagesSolides.tex497
-rw-r--r--macros/latex/contrib/profcollege/latex/PfCCartographie.tex3
-rw-r--r--macros/latex/contrib/profcollege/latex/PfCConversion.tex19
-rw-r--r--macros/latex/contrib/profcollege/latex/PfCDecomposerNombrePremier.tex8
-rw-r--r--macros/latex/contrib/profcollege/latex/PfCOperationsTrou.tex226
-rw-r--r--macros/latex/contrib/profcollege/latex/PfCPixelArt.tex118
-rw-r--r--macros/latex/contrib/profcollege/latex/PfCPythagore.tex2
-rw-r--r--macros/latex/contrib/profcollege/latex/PfCReperage.tex12
-rw-r--r--macros/latex/contrib/profcollege/latex/PfCStatistiques.tex9
-rw-r--r--macros/latex/contrib/profcollege/latex/PfCThales.tex14
-rw-r--r--macros/latex/contrib/profcollege/latex/PfCTrigonometrie.tex4
-rw-r--r--macros/latex/contrib/profcollege/latex/PfCTrio.tex37
-rw-r--r--macros/latex/contrib/profcollege/latex/ProfCollege.sty45
-rw-r--r--macros/latex/contrib/profcollege/metapost/PfCObjets.mp257
-rw-r--r--macros/latex/contrib/profcollege/metapost/PfCScratch.mp7
-rw-r--r--macros/luatex/generic/luamplib/NEWS3
-rw-r--r--macros/luatex/generic/luamplib/luamplib.dtx235
-rw-r--r--macros/luatex/generic/luamplib/luamplib.pdfbin168963 -> 170008 bytes
-rw-r--r--macros/luatex/generic/luamplib/test-luamplib-latex.tex2
-rw-r--r--systems/texlive/tlnet/tlpkg/TeXLive/TLUtils.pm11
-rw-r--r--systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl4
-rw-r--r--systems/texlive/tlnet/tlpkg/texlive.tlpdb533
-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.xzbin2564664 -> 2566816 bytes
-rw-r--r--timestamp2
61 files changed, 3002 insertions, 1792 deletions
diff --git a/FILES.byname b/FILES.byname
index 62e9eeee12..5328aec261 100644
--- a/FILES.byname
+++ b/FILES.byname
@@ -2076,12 +2076,12 @@
2024/03/12 | 1837 | biblio/citation-style-language/README.md
2024/03/12 | 12878 | biblio/citation-style-language/vancouver.csl
2024/03/12 | 4553440 | biblio/citation-style-language.zip
-2024/04/18 | 1678 | biblio/ctan-bibdata/biblatex-ctan/ctan.bbx
+2024/04/19 | 1678 | biblio/ctan-bibdata/biblatex-ctan/ctan.bbx
2022/10/08 | 127 | biblio/ctan-bibdata/biblatex-ctan/ctan.cbx
-2024/04/18 | 2862729 | biblio/ctan-bibdata/ctan.bib
-2024/04/18 | 3708800 | biblio/ctan-bibdata/ctan.pdf
+2024/04/19 | 2862727 | biblio/ctan-bibdata/ctan.bib
+2024/04/19 | 3708800 | biblio/ctan-bibdata/ctan.pdf
2023/01/16 | 1489 | biblio/ctan-bibdata/README
-2024/04/18 | 4120564 | biblio/ctan-bibdata.zip
+2024/04/19 | 4120548 | 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
@@ -5443,7 +5443,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
-2024/04/18 | 75746 | FILES.last07days
+2024/04/19 | 53860 | 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
@@ -173445,15 +173445,16 @@
2024/01/11 | 7237 | graphics/pgf/contrib/tikzdotncross/latex/tikzdotncross.sty
2024/01/11 | 1989 | graphics/pgf/contrib/tikzdotncross/README.md
2024/01/11 | 224064 | graphics/pgf/contrib/tikzdotncross.zip
-2023/04/05 | 562 | graphics/pgf/contrib/tikzducks/README.md
-2023/04/05 | 471679 | graphics/pgf/contrib/tikzducks/tikzducks-doc.pdf
-2023/04/05 | 42752 | graphics/pgf/contrib/tikzducks/tikzducks-doc.tex
-2023/04/05 | 101701 | graphics/pgf/contrib/tikzducks/tikzducks-generic.tex
-2023/04/05 | 1330 | graphics/pgf/contrib/tikzducks/tikzducks-plain.tex
-2023/04/05 | 1302 | graphics/pgf/contrib/tikzducks/tikzducks.sty
-2023/04/05 | 590 | graphics/pgf/contrib/tikzducks/tikzlibraryducks.code.tex
-2023/04/05 | 1705 | graphics/pgf/contrib/tikzducks/t-tikzducks.mkiv
-2023/04/05 | 495889 | graphics/pgf/contrib/tikzducks.zip
+2024/04/19 | 562 | graphics/pgf/contrib/tikzducks/README.md
+2024/04/19 | 416529 | graphics/pgf/contrib/tikzducks/tikzducks-doc.pdf
+2024/04/19 | 5927 | graphics/pgf/contrib/tikzducks/tikzducks-doc-settings.sty
+2024/04/19 | 39184 | graphics/pgf/contrib/tikzducks/tikzducks-doc.tex
+2024/04/19 | 104883 | graphics/pgf/contrib/tikzducks/tikzducks-generic.tex
+2024/04/19 | 1330 | graphics/pgf/contrib/tikzducks/tikzducks-plain.tex
+2024/04/19 | 1302 | graphics/pgf/contrib/tikzducks/tikzducks.sty
+2024/04/19 | 590 | graphics/pgf/contrib/tikzducks/tikzlibraryducks.code.tex
+2024/04/19 | 1705 | graphics/pgf/contrib/tikzducks/t-tikzducks.mkiv
+2024/04/19 | 444335 | graphics/pgf/contrib/tikzducks.zip
2023/04/02 | 23619 | graphics/pgf/contrib/tikz-ext/doc/tikz-ext-manual.bib
2023/03/15 | 4175 | graphics/pgf/contrib/tikz-ext/doc/tikz-ext-manual-en-calendar.tex
2023/03/15 | 1190 | graphics/pgf/contrib/tikz-ext/doc/tikz-ext-manual-en-intro.tex
@@ -207012,7 +207013,7 @@
2016/09/02 | 108688 | install/macros/luatex/generic/cstypo.tds.zip
2015/10/01 | 154538 | install/macros/luatex/generic/ctablestack.tds.zip
2023/08/20 | 288576 | install/macros/luatex/generic/lualibs.tds.zip
-2024/04/12 | 225419 | install/macros/luatex/generic/luamplib.tds.zip
+2024/04/19 | 227390 | install/macros/luatex/generic/luamplib.tds.zip
2024/02/28 | 1996110 | install/macros/luatex/generic/luaotfload.tds.zip
2015/10/04 | 277014 | install/macros/luatex/generic/luatexbase.tds.zip
2024/03/11 | 1408589 | install/macros/luatex/generic/lua-widow-control.tds.zip
@@ -232501,12 +232502,12 @@
2008/02/10 | 19110 | macros/latex/contrib/ean13isbn/License.txt
2021/01/24 | 422 | macros/latex/contrib/ean13isbn/README
2021/01/24 | 322624 | macros/latex/contrib/ean13isbn.zip
-2024/04/02 | 77113 | macros/latex/contrib/easybook/easybook.dtx
+2024/04/19 | 78068 | macros/latex/contrib/easybook/easybook.dtx
2024/01/04 | 2081 | macros/latex/contrib/easybook/easybook.ins
-2024/04/02 | 608631 | macros/latex/contrib/easybook/easybook.pdf
-2024/04/02 | 93232 | macros/latex/contrib/easybook/easybook.tex
+2024/04/19 | 609380 | macros/latex/contrib/easybook/easybook.pdf
+2024/04/19 | 94557 | macros/latex/contrib/easybook/easybook.tex
2024/01/03 | 801 | macros/latex/contrib/easybook/README.md
-2024/04/02 | 653091 | macros/latex/contrib/easybook.zip
+2024/04/19 | 654293 | macros/latex/contrib/easybook.zip
2009/06/17 | 82589 | macros/latex/contrib/easy/doc/docbib.pdf
2009/06/17 | 78378 | macros/latex/contrib/easy/doc/docbmat.pdf
2009/06/17 | 99132 | macros/latex/contrib/easy/doc/doceqn.pdf
@@ -234162,12 +234163,12 @@
2022/01/22 | 1400113 | macros/latex/contrib/factura.zip
2005/04/30 | 22317 | macros/latex/contrib/fac.zip
2024/03/08 | 94115 | macros/latex/contrib/fadingimage/doc/Beautiful-realities.jpeg
-2024/03/17 | 228555 | macros/latex/contrib/fadingimage/doc/fadingimage.pdf
-2024/03/17 | 3259 | macros/latex/contrib/fadingimage/doc/fadingimage.tex
+2024/04/19 | 138677 | macros/latex/contrib/fadingimage/doc/fadingimage.pdf
+2024/04/19 | 2844 | macros/latex/contrib/fadingimage/doc/fadingimage.tex
2024/03/08 | 19101 | macros/latex/contrib/fadingimage/License
-2024/03/08 | 592 | macros/latex/contrib/fadingimage/README.md
-2024/03/17 | 3805 | macros/latex/contrib/fadingimage/tex/fadingimage.sty
-2024/03/17 | 327747 | macros/latex/contrib/fadingimage.zip
+2024/04/17 | 594 | macros/latex/contrib/fadingimage/README.md
+2024/04/17 | 3048 | macros/latex/contrib/fadingimage/tex/fadingimage.sty
+2024/04/19 | 237793 | macros/latex/contrib/fadingimage.zip
2023/07/04 | 4107 | macros/latex/contrib/fail-fast/fail-fast.dtx
2023/07/04 | 2627 | macros/latex/contrib/fail-fast/fail-fast.ins
2023/07/04 | 309689 | macros/latex/contrib/fail-fast/fail-fast.pdf
@@ -244500,21 +244501,14 @@
2023/03/30 | 1190 | macros/latex/contrib/nostarch/recycled.png
2023/03/30 | 63756 | macros/latex/contrib/nostarch/vitruvian.jpg
2023/07/19 | 733287 | macros/latex/contrib/nostarch.zip
-2023/11/01 | 84691 | macros/latex/contrib/notebeamer/doc/images/HDU.pdf
-2023/11/09 | 39979 | macros/latex/contrib/notebeamer/doc/images/Inuyasa.jpg
-2023/11/08 | 311010 | macros/latex/contrib/notebeamer/doc/images/newnote3sdemo.pdf
-2023/11/09 | 1075706 | macros/latex/contrib/notebeamer/doc/images/newnote4sdemo.pdf
-2023/11/04 | 8075486 | macros/latex/contrib/notebeamer/doc/images/newnotedemo.pdf
-2023/11/08 | 286314 | macros/latex/contrib/notebeamer/doc/images/titlepage1.pdf
-2023/11/01 | 12057 | macros/latex/contrib/notebeamer/doc/images/titlepage2.pdf
-2023/11/15 | 2963011 | macros/latex/contrib/notebeamer/doc/notebeamer-demo.pdf
-2023/11/15 | 1488 | macros/latex/contrib/notebeamer/doc/notebeamer-demo.tex
-2023/11/15 | 3033387 | macros/latex/contrib/notebeamer/doc/notebeamer-doc.pdf
-2023/11/15 | 17559 | macros/latex/contrib/notebeamer/doc/notebeamer-doc.tex
+2024/04/19 | 274146 | macros/latex/contrib/notebeamer/doc/figures/beamerdemo.pdf
+2024/04/19 | 2670286 | macros/latex/contrib/notebeamer/doc/figures/paperdemo.pdf
+2024/04/19 | 1357620 | macros/latex/contrib/notebeamer/doc/notebeamer.pdf
+2024/04/19 | 5250 | macros/latex/contrib/notebeamer/doc/notebeamer.tex
2023/11/01 | 19101 | macros/latex/contrib/notebeamer/License
2023/11/04 | 820 | macros/latex/contrib/notebeamer/README.md
-2023/11/15 | 17613 | macros/latex/contrib/notebeamer/tex/notebeamer.cls
-2023/11/16 | 15254377 | macros/latex/contrib/notebeamer.zip
+2024/04/19 | 8931 | macros/latex/contrib/notebeamer/tex/notebeamer.sty
+2024/04/19 | 4150209 | macros/latex/contrib/notebeamer.zip
2019/09/28 | 56740 | macros/latex/contrib/notes2bib/notes2bib.dtx
2019/09/28 | 238756 | macros/latex/contrib/notes2bib/notes2bib.pdf
2019/09/28 | 1584 | macros/latex/contrib/notes2bib/README.md
@@ -247135,51 +247129,52 @@
2024/04/08 | 142766 | macros/latex/contrib/prociagssymp/procIAGssymp.pdf
2024/04/08 | 1286 | macros/latex/contrib/prociagssymp/README.txt
2024/04/08 | 143201 | macros/latex/contrib/prociagssymp.zip
-2024/03/24 | 10211376 | macros/latex/contrib/profcollege/doc/ProfCollege-doc.pdf
-2024/03/24 | 5713946 | macros/latex/contrib/profcollege/doc/ProfCollege-doc.zip
-2024/03/24 | 987 | macros/latex/contrib/profcollege/latex/PfCAllumettes.tex
-2024/03/24 | 11046 | macros/latex/contrib/profcollege/latex/PfCAutomatismes.tex
-2024/03/24 | 10966 | macros/latex/contrib/profcollege/latex/PfCAutonomie.tex
-2024/03/24 | 2939 | macros/latex/contrib/profcollege/latex/PfCBarreNiveaux.tex
-2024/03/24 | 3431 | macros/latex/contrib/profcollege/latex/PfCBarresCalculs.tex
-2024/03/24 | 8956 | macros/latex/contrib/profcollege/latex/PfCBillard.tex
-2024/03/24 | 1055 | macros/latex/contrib/profcollege/latex/PfCBonbon.tex
-2024/03/24 | 2072 | macros/latex/contrib/profcollege/latex/PfCBonSortie.tex
-2024/03/24 | 4958 | macros/latex/contrib/profcollege/latex/PfCCalculatrice.tex
-2024/03/24 | 12153 | macros/latex/contrib/profcollege/latex/PfCCalculsCroises.tex
-2024/03/24 | 7845 | macros/latex/contrib/profcollege/latex/PfCCalculsFractions.tex
-2024/03/24 | 9078 | macros/latex/contrib/profcollege/latex/PfCCalisson.tex
-2024/03/24 | 14304 | macros/latex/contrib/profcollege/latex/PfCCAN.tex
-2024/03/24 | 31573 | macros/latex/contrib/profcollege/latex/PfCCartesJeux.tex
-2024/03/24 | 1586 | macros/latex/contrib/profcollege/latex/PfCCartesMentales.tex
-2024/03/24 | 13159 | macros/latex/contrib/profcollege/latex/PfCCartographie.tex
-2024/03/24 | 10470 | macros/latex/contrib/profcollege/latex/PfCCibleQOp.tex
-2024/03/24 | 7538 | macros/latex/contrib/profcollege/latex/PfCCible.tex
-2024/03/24 | 7088 | macros/latex/contrib/profcollege/latex/PfCColorilude.tex
-2024/03/24 | 11298 | macros/latex/contrib/profcollege/latex/PfCCompteBon.tex
-2024/03/24 | 5424 | macros/latex/contrib/profcollege/latex/PfCConversion.tex
-2024/03/24 | 4690 | macros/latex/contrib/profcollege/latex/PfCCritere.tex
-2024/03/24 | 4749 | macros/latex/contrib/profcollege/latex/PfCCryptarithme.tex
-2024/03/24 | 9902 | macros/latex/contrib/profcollege/latex/PfCDecDeci.tex
-2024/03/24 | 3618 | macros/latex/contrib/profcollege/latex/PfCDecompFracDeci.tex
-2024/03/24 | 25479 | macros/latex/contrib/profcollege/latex/PfCDecomposerNombrePremier.tex
-2024/03/24 | 3652 | macros/latex/contrib/profcollege/latex/PfCDefiCalc.tex
-2024/03/24 | 11629 | macros/latex/contrib/profcollege/latex/PfCDefiTables.tex
-2024/03/24 | 11161 | macros/latex/contrib/profcollege/latex/PfCDessinAlgo.tex
-2024/03/24 | 14269 | macros/latex/contrib/profcollege/latex/PfCDessinerRatio.tex
-2024/03/24 | 7962 | macros/latex/contrib/profcollege/latex/PfCDessinGradue.tex
-2024/03/24 | 4664 | macros/latex/contrib/profcollege/latex/PfCDiagrammeRadar.tex
-2024/03/24 | 60167 | macros/latex/contrib/profcollege/latex/PfCDistributivite.tex
+2024/04/19 | 10283168 | macros/latex/contrib/profcollege/doc/ProfCollege-doc.pdf
+2024/04/19 | 5696000 | macros/latex/contrib/profcollege/doc/ProfCollege-doc.zip
+2024/04/19 | 987 | macros/latex/contrib/profcollege/latex/PfCAllumettes.tex
+2024/04/19 | 14276 | macros/latex/contrib/profcollege/latex/PfCAssemblagesSolides.tex
+2024/04/19 | 11046 | macros/latex/contrib/profcollege/latex/PfCAutomatismes.tex
+2024/04/19 | 10966 | macros/latex/contrib/profcollege/latex/PfCAutonomie.tex
+2024/04/19 | 2939 | macros/latex/contrib/profcollege/latex/PfCBarreNiveaux.tex
+2024/04/19 | 3431 | macros/latex/contrib/profcollege/latex/PfCBarresCalculs.tex
+2024/04/19 | 8956 | macros/latex/contrib/profcollege/latex/PfCBillard.tex
+2024/04/19 | 1055 | macros/latex/contrib/profcollege/latex/PfCBonbon.tex
+2024/04/19 | 2072 | macros/latex/contrib/profcollege/latex/PfCBonSortie.tex
+2024/04/19 | 4958 | macros/latex/contrib/profcollege/latex/PfCCalculatrice.tex
+2024/04/19 | 12153 | macros/latex/contrib/profcollege/latex/PfCCalculsCroises.tex
+2024/04/19 | 7845 | macros/latex/contrib/profcollege/latex/PfCCalculsFractions.tex
+2024/04/19 | 9078 | macros/latex/contrib/profcollege/latex/PfCCalisson.tex
+2024/04/19 | 14304 | macros/latex/contrib/profcollege/latex/PfCCAN.tex
+2024/04/19 | 31573 | macros/latex/contrib/profcollege/latex/PfCCartesJeux.tex
+2024/04/19 | 1586 | macros/latex/contrib/profcollege/latex/PfCCartesMentales.tex
+2024/04/19 | 13213 | macros/latex/contrib/profcollege/latex/PfCCartographie.tex
+2024/04/19 | 10470 | macros/latex/contrib/profcollege/latex/PfCCibleQOp.tex
+2024/04/19 | 7538 | macros/latex/contrib/profcollege/latex/PfCCible.tex
+2024/04/19 | 7088 | macros/latex/contrib/profcollege/latex/PfCColorilude.tex
+2024/04/19 | 11298 | macros/latex/contrib/profcollege/latex/PfCCompteBon.tex
+2024/04/19 | 5680 | macros/latex/contrib/profcollege/latex/PfCConversion.tex
+2024/04/19 | 4690 | macros/latex/contrib/profcollege/latex/PfCCritere.tex
+2024/04/19 | 4749 | macros/latex/contrib/profcollege/latex/PfCCryptarithme.tex
+2024/04/19 | 9902 | macros/latex/contrib/profcollege/latex/PfCDecDeci.tex
+2024/04/19 | 3618 | macros/latex/contrib/profcollege/latex/PfCDecompFracDeci.tex
+2024/04/19 | 25516 | macros/latex/contrib/profcollege/latex/PfCDecomposerNombrePremier.tex
+2024/04/19 | 3652 | macros/latex/contrib/profcollege/latex/PfCDefiCalc.tex
+2024/04/19 | 11629 | macros/latex/contrib/profcollege/latex/PfCDefiTables.tex
+2024/04/19 | 11161 | macros/latex/contrib/profcollege/latex/PfCDessinAlgo.tex
+2024/04/19 | 14269 | macros/latex/contrib/profcollege/latex/PfCDessinerRatio.tex
+2024/04/19 | 7962 | macros/latex/contrib/profcollege/latex/PfCDessinGradue.tex
+2024/04/19 | 4664 | macros/latex/contrib/profcollege/latex/PfCDiagrammeRadar.tex
+2024/04/19 | 60167 | macros/latex/contrib/profcollege/latex/PfCDistributivite.tex
2023/08/01 | 2734 | macros/latex/contrib/profcollege/latex/PfCdobble.lua
-2024/03/24 | 831 | macros/latex/contrib/profcollege/latex/PfCDobble.tex
-2024/03/24 | 4166 | macros/latex/contrib/profcollege/latex/PfCDomino.tex
-2024/03/24 | 6120 | macros/latex/contrib/profcollege/latex/PfCDontCountDots.tex
-2024/03/24 | 12476 | macros/latex/contrib/profcollege/latex/PfCEcrireunQCM.tex
-2024/03/24 | 2477 | macros/latex/contrib/profcollege/latex/PfCEcritureLettres.tex
-2024/03/24 | 15102 | macros/latex/contrib/profcollege/latex/PfCEcritureUnites.tex
-2024/03/24 | 2644 | macros/latex/contrib/profcollege/latex/PfCEngrenagesBase.tex
-2024/03/24 | 10633 | macros/latex/contrib/profcollege/latex/PfCEnigmeAire.tex
-2024/03/24 | 3765 | macros/latex/contrib/profcollege/latex/PfCEnquete.tex
+2024/04/19 | 831 | macros/latex/contrib/profcollege/latex/PfCDobble.tex
+2024/04/19 | 4166 | macros/latex/contrib/profcollege/latex/PfCDomino.tex
+2024/04/19 | 6120 | macros/latex/contrib/profcollege/latex/PfCDontCountDots.tex
+2024/04/19 | 12476 | macros/latex/contrib/profcollege/latex/PfCEcrireunQCM.tex
+2024/04/19 | 2477 | macros/latex/contrib/profcollege/latex/PfCEcritureLettres.tex
+2024/04/19 | 15102 | macros/latex/contrib/profcollege/latex/PfCEcritureUnites.tex
+2024/04/19 | 2644 | macros/latex/contrib/profcollege/latex/PfCEngrenagesBase.tex
+2024/04/19 | 10633 | macros/latex/contrib/profcollege/latex/PfCEnigmeAire.tex
+2024/04/19 | 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/12/02 | 13318 | macros/latex/contrib/profcollege/latex/PfCEquationModeleBarre.tex
@@ -247187,100 +247182,100 @@
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
-2024/03/24 | 3808 | macros/latex/contrib/profcollege/latex/PfCEratosthene.tex
-2024/03/24 | 21452 | macros/latex/contrib/profcollege/latex/PfCFactorisation.tex
-2024/03/24 | 3280 | macros/latex/contrib/profcollege/latex/PfCFicheMemo.tex
-2024/03/24 | 16387 | macros/latex/contrib/profcollege/latex/PfCFonctionAffine.tex
-2024/03/24 | 4178 | macros/latex/contrib/profcollege/latex/PfCFractionAireCarre.tex
-2024/03/24 | 12516 | macros/latex/contrib/profcollege/latex/PfCFractionNombre.tex
-2024/03/24 | 7244 | macros/latex/contrib/profcollege/latex/PfCFrise.tex
-2024/03/24 | 3466 | macros/latex/contrib/profcollege/latex/PfCFubuki.tex
-2024/03/24 | 4692 | macros/latex/contrib/profcollege/latex/PfCFutoshiki.tex
-2024/03/24 | 2173 | macros/latex/contrib/profcollege/latex/PfCGaram.tex
-2024/03/24 | 4968 | macros/latex/contrib/profcollege/latex/PfCGeometrie.tex
-2024/03/24 | 2285 | macros/latex/contrib/profcollege/latex/PfCGrades.tex
-2024/03/24 | 6941 | macros/latex/contrib/profcollege/latex/PfCGrimuku.tex
-2024/03/24 | 2211 | macros/latex/contrib/profcollege/latex/PfCHiddenMessage.tex
-2024/03/24 | 7105 | macros/latex/contrib/profcollege/latex/PfCHorloge.tex
-2024/03/24 | 1000 | macros/latex/contrib/profcollege/latex/PfCJeton.tex
-2024/03/24 | 4369 | macros/latex/contrib/profcollege/latex/PfCJeuRangement.tex
-2024/03/24 | 2605 | macros/latex/contrib/profcollege/latex/PfCKakurasu.tex
-2024/03/24 | 2322 | macros/latex/contrib/profcollege/latex/PfCKakuro.tex
-2024/03/24 | 3884 | macros/latex/contrib/profcollege/latex/PfCKenKen.tex
-2024/03/24 | 9501 | macros/latex/contrib/profcollege/latex/PfCLabyrintheJeu.tex
-2024/03/24 | 29363 | macros/latex/contrib/profcollege/latex/PfCLabyrintheNombre.tex
-2024/03/24 | 4329 | macros/latex/contrib/profcollege/latex/PfCLego.tex
+2024/04/19 | 3808 | macros/latex/contrib/profcollege/latex/PfCEratosthene.tex
+2024/04/19 | 21452 | macros/latex/contrib/profcollege/latex/PfCFactorisation.tex
+2024/04/19 | 3280 | macros/latex/contrib/profcollege/latex/PfCFicheMemo.tex
+2024/04/19 | 16387 | macros/latex/contrib/profcollege/latex/PfCFonctionAffine.tex
+2024/04/19 | 4178 | macros/latex/contrib/profcollege/latex/PfCFractionAireCarre.tex
+2024/04/19 | 12516 | macros/latex/contrib/profcollege/latex/PfCFractionNombre.tex
+2024/04/19 | 7244 | macros/latex/contrib/profcollege/latex/PfCFrise.tex
+2024/04/19 | 3466 | macros/latex/contrib/profcollege/latex/PfCFubuki.tex
+2024/04/19 | 4692 | macros/latex/contrib/profcollege/latex/PfCFutoshiki.tex
+2024/04/19 | 2173 | macros/latex/contrib/profcollege/latex/PfCGaram.tex
+2024/04/19 | 4968 | macros/latex/contrib/profcollege/latex/PfCGeometrie.tex
+2024/04/19 | 2285 | macros/latex/contrib/profcollege/latex/PfCGrades.tex
+2024/04/19 | 6941 | macros/latex/contrib/profcollege/latex/PfCGrimuku.tex
+2024/04/19 | 2211 | macros/latex/contrib/profcollege/latex/PfCHiddenMessage.tex
+2024/04/19 | 7105 | macros/latex/contrib/profcollege/latex/PfCHorloge.tex
+2024/04/19 | 1000 | macros/latex/contrib/profcollege/latex/PfCJeton.tex
+2024/04/19 | 4369 | macros/latex/contrib/profcollege/latex/PfCJeuRangement.tex
+2024/04/19 | 2605 | macros/latex/contrib/profcollege/latex/PfCKakurasu.tex
+2024/04/19 | 2322 | macros/latex/contrib/profcollege/latex/PfCKakuro.tex
+2024/04/19 | 3884 | macros/latex/contrib/profcollege/latex/PfCKenKen.tex
+2024/04/19 | 9501 | macros/latex/contrib/profcollege/latex/PfCLabyrintheJeu.tex
+2024/04/19 | 29363 | macros/latex/contrib/profcollege/latex/PfCLabyrintheNombre.tex
+2024/04/19 | 4329 | macros/latex/contrib/profcollege/latex/PfCLego.tex
2023/11/13 | 54466 | macros/latex/contrib/profcollege/latex/PfCLogoNumberHive.png
-2024/03/24 | 6525 | macros/latex/contrib/profcollege/latex/PfCMentalo.tex
-2024/03/24 | 5365 | macros/latex/contrib/profcollege/latex/PfCMidpoint.tex
-2024/03/24 | 16033 | macros/latex/contrib/profcollege/latex/PfCModeleBarre.tex
-2024/03/24 | 4548 | macros/latex/contrib/profcollege/latex/PfCMosaique.tex
-2024/03/24 | 2975 | macros/latex/contrib/profcollege/latex/PfCMotsCodes.tex
-2024/03/24 | 2222 | macros/latex/contrib/profcollege/latex/PfCMotsCroises.tex
-2024/03/24 | 1856 | macros/latex/contrib/profcollege/latex/PfCMotsEmpiles.tex
-2024/03/24 | 15005 | macros/latex/contrib/profcollege/latex/PfCMulArt.tex
-2024/03/24 | 6616 | macros/latex/contrib/profcollege/latex/PfCMulJal.tex
-2024/03/24 | 7875 | macros/latex/contrib/profcollege/latex/PfCMulJap.tex
-2024/03/24 | 4125 | macros/latex/contrib/profcollege/latex/PfCMulPiecesPuzzle.tex
-2024/03/24 | 7305 | macros/latex/contrib/profcollege/latex/PfCNombreAstral.tex
-2024/03/24 | 14120 | macros/latex/contrib/profcollege/latex/PfCNonogramme.tex
-2024/03/24 | 59542 | macros/latex/contrib/profcollege/latex/PfCNotionFonction.tex
-2024/03/24 | 12296 | macros/latex/contrib/profcollege/latex/PfCNumberHive.tex
-2024/03/24 | 7422 | macros/latex/contrib/profcollege/latex/PfCNumerationsAnciennes.tex
-2024/03/24 | 9396 | macros/latex/contrib/profcollege/latex/PfCOperationsTrou.tex
-2024/03/24 | 10168 | macros/latex/contrib/profcollege/latex/PfCPapiers.tex
-2024/03/24 | 5824 | macros/latex/contrib/profcollege/latex/PfCPatronPaves.tex
-2024/03/24 | 19160 | macros/latex/contrib/profcollege/latex/PfCPattern.tex
-2024/03/24 | 25681 | macros/latex/contrib/profcollege/latex/PfCPavageAvecMotifImage.tex
-2024/03/24 | 35829 | macros/latex/contrib/profcollege/latex/PfCPavage.tex
-2024/03/24 | 4236 | macros/latex/contrib/profcollege/latex/PfCPixelArt.tex
-2024/03/24 | 8166 | macros/latex/contrib/profcollege/latex/PfCPourcentage.tex
-2024/03/24 | 7733 | macros/latex/contrib/profcollege/latex/PfCProbabilites.tex
-2024/03/24 | 12420 | macros/latex/contrib/profcollege/latex/PfCProgrammeCalcul.tex
-2024/03/24 | 15947 | macros/latex/contrib/profcollege/latex/PfCPropor.tex
-2024/03/24 | 11131 | macros/latex/contrib/profcollege/latex/PfCProprietesDroites.tex
-2024/03/24 | 7142 | macros/latex/contrib/profcollege/latex/PfCPuissanceQuatre.tex
-2024/03/24 | 7102 | macros/latex/contrib/profcollege/latex/PfCPuzzleSommePyramide.tex
-2024/03/24 | 9404 | macros/latex/contrib/profcollege/latex/PfCPyramideCalculs.tex
-2024/03/24 | 1287 | macros/latex/contrib/profcollege/latex/PfCPyraVoca.tex
-2024/03/24 | 27316 | macros/latex/contrib/profcollege/latex/PfCPythagore.tex
-2024/03/24 | 25321 | macros/latex/contrib/profcollege/latex/PfCQuestionsFlash.tex
-2024/03/24 | 4119 | macros/latex/contrib/profcollege/latex/PfCQuestionsRelier.tex
-2024/03/24 | 2617 | macros/latex/contrib/profcollege/latex/PfCQuiSuisJe.tex
-2024/03/24 | 7650 | macros/latex/contrib/profcollege/latex/PfCRangementNombres.tex
-2024/03/24 | 1793 | macros/latex/contrib/profcollege/latex/PfCRapido.tex
-2024/03/24 | 28129 | macros/latex/contrib/profcollege/latex/PfCRappelsFormules.tex
-2024/03/24 | 12035 | macros/latex/contrib/profcollege/latex/PfCRecyclage.tex
-2024/03/24 | 78774 | macros/latex/contrib/profcollege/latex/PfCReperage.tex
-2024/03/24 | 15355 | macros/latex/contrib/profcollege/latex/PfCRepresentationGraphique.tex
-2024/03/24 | 6570 | macros/latex/contrib/profcollege/latex/PfCRepresenterEntier.tex
-2024/03/24 | 16319 | macros/latex/contrib/profcollege/latex/PfCRepresenterFraction.tex
-2024/03/24 | 7569 | macros/latex/contrib/profcollege/latex/PfCRepresenterTableur.tex
-2024/03/24 | 9435 | macros/latex/contrib/profcollege/latex/PfCReseauxSociaux.tex
-2024/03/24 | 16401 | macros/latex/contrib/profcollege/latex/PfCResoudreEquation.tex
-2024/03/24 | 3049 | macros/latex/contrib/profcollege/latex/PfCRLE.tex
-2024/03/24 | 17795 | macros/latex/contrib/profcollege/latex/PfCRondeInfernale.tex
-2024/03/24 | 20355 | macros/latex/contrib/profcollege/latex/PfCRose.tex
-2024/03/24 | 1767 | macros/latex/contrib/profcollege/latex/PfCScratch.tex
-2024/03/24 | 10662 | macros/latex/contrib/profcollege/latex/PfCSerpent.tex
-2024/03/24 | 8711 | macros/latex/contrib/profcollege/latex/PfCShikaku.tex
-2024/03/24 | 11734 | macros/latex/contrib/profcollege/latex/PfCSimplifierFraction.tex
-2024/03/24 | 30830 | macros/latex/contrib/profcollege/latex/PfCSolides.tex
-2024/03/24 | 11738 | macros/latex/contrib/profcollege/latex/PfCSommeAngles.tex
-2024/03/24 | 2499 | macros/latex/contrib/profcollege/latex/PfCSquaro.tex
-2024/03/24 | 83798 | macros/latex/contrib/profcollege/latex/PfCStatistiques.tex
-2024/03/24 | 94595 | macros/latex/contrib/profcollege/latex/PfCTableauxUnites.tex
-2024/03/24 | 5312 | macros/latex/contrib/profcollege/latex/PfCTablesOperations.tex
-2024/03/24 | 6030 | macros/latex/contrib/profcollege/latex/PfCTectonic.tex
-2024/03/24 | 57260 | macros/latex/contrib/profcollege/latex/PfCThales.tex
-2024/03/24 | 7696 | macros/latex/contrib/profcollege/latex/PfCTicketCaisse.tex
-2024/03/24 | 8307 | macros/latex/contrib/profcollege/latex/PfCTortueBase.tex
-2024/03/24 | 24802 | macros/latex/contrib/profcollege/latex/PfCTrigonometrie.tex
-2024/03/24 | 9951 | macros/latex/contrib/profcollege/latex/PfCTriominos.tex
-2024/03/24 | 21701 | macros/latex/contrib/profcollege/latex/PfCTrio.tex
-2024/03/24 | 9734 | macros/latex/contrib/profcollege/latex/PfCVueCubes.tex
-2024/03/24 | 8676 | macros/latex/contrib/profcollege/latex/PfCYohaku.tex
-2024/03/24 | 23214 | macros/latex/contrib/profcollege/latex/ProfCollege.sty
+2024/04/19 | 6525 | macros/latex/contrib/profcollege/latex/PfCMentalo.tex
+2024/04/19 | 5365 | macros/latex/contrib/profcollege/latex/PfCMidpoint.tex
+2024/04/19 | 16033 | macros/latex/contrib/profcollege/latex/PfCModeleBarre.tex
+2024/04/19 | 4548 | macros/latex/contrib/profcollege/latex/PfCMosaique.tex
+2024/04/19 | 2975 | macros/latex/contrib/profcollege/latex/PfCMotsCodes.tex
+2024/04/19 | 2222 | macros/latex/contrib/profcollege/latex/PfCMotsCroises.tex
+2024/04/19 | 1856 | macros/latex/contrib/profcollege/latex/PfCMotsEmpiles.tex
+2024/04/19 | 15005 | macros/latex/contrib/profcollege/latex/PfCMulArt.tex
+2024/04/19 | 6616 | macros/latex/contrib/profcollege/latex/PfCMulJal.tex
+2024/04/19 | 7875 | macros/latex/contrib/profcollege/latex/PfCMulJap.tex
+2024/04/19 | 4125 | macros/latex/contrib/profcollege/latex/PfCMulPiecesPuzzle.tex
+2024/04/19 | 7305 | macros/latex/contrib/profcollege/latex/PfCNombreAstral.tex
+2024/04/19 | 14120 | macros/latex/contrib/profcollege/latex/PfCNonogramme.tex
+2024/04/19 | 59542 | macros/latex/contrib/profcollege/latex/PfCNotionFonction.tex
+2024/04/19 | 12296 | macros/latex/contrib/profcollege/latex/PfCNumberHive.tex
+2024/04/19 | 7422 | macros/latex/contrib/profcollege/latex/PfCNumerationsAnciennes.tex
+2024/04/19 | 17835 | macros/latex/contrib/profcollege/latex/PfCOperationsTrou.tex
+2024/04/19 | 10168 | macros/latex/contrib/profcollege/latex/PfCPapiers.tex
+2024/04/19 | 5824 | macros/latex/contrib/profcollege/latex/PfCPatronPaves.tex
+2024/04/19 | 19160 | macros/latex/contrib/profcollege/latex/PfCPattern.tex
+2024/04/19 | 25681 | macros/latex/contrib/profcollege/latex/PfCPavageAvecMotifImage.tex
+2024/04/19 | 35829 | macros/latex/contrib/profcollege/latex/PfCPavage.tex
+2024/04/19 | 8104 | macros/latex/contrib/profcollege/latex/PfCPixelArt.tex
+2024/04/19 | 8166 | macros/latex/contrib/profcollege/latex/PfCPourcentage.tex
+2024/04/19 | 7733 | macros/latex/contrib/profcollege/latex/PfCProbabilites.tex
+2024/04/19 | 12420 | macros/latex/contrib/profcollege/latex/PfCProgrammeCalcul.tex
+2024/04/19 | 15947 | macros/latex/contrib/profcollege/latex/PfCPropor.tex
+2024/04/19 | 11131 | macros/latex/contrib/profcollege/latex/PfCProprietesDroites.tex
+2024/04/19 | 7142 | macros/latex/contrib/profcollege/latex/PfCPuissanceQuatre.tex
+2024/04/19 | 7102 | macros/latex/contrib/profcollege/latex/PfCPuzzleSommePyramide.tex
+2024/04/19 | 9404 | macros/latex/contrib/profcollege/latex/PfCPyramideCalculs.tex
+2024/04/19 | 1287 | macros/latex/contrib/profcollege/latex/PfCPyraVoca.tex
+2024/04/19 | 27371 | macros/latex/contrib/profcollege/latex/PfCPythagore.tex
+2024/04/19 | 25321 | macros/latex/contrib/profcollege/latex/PfCQuestionsFlash.tex
+2024/04/19 | 4119 | macros/latex/contrib/profcollege/latex/PfCQuestionsRelier.tex
+2024/04/19 | 2617 | macros/latex/contrib/profcollege/latex/PfCQuiSuisJe.tex
+2024/04/19 | 7650 | macros/latex/contrib/profcollege/latex/PfCRangementNombres.tex
+2024/04/19 | 1793 | macros/latex/contrib/profcollege/latex/PfCRapido.tex
+2024/04/19 | 28129 | macros/latex/contrib/profcollege/latex/PfCRappelsFormules.tex
+2024/04/19 | 12035 | macros/latex/contrib/profcollege/latex/PfCRecyclage.tex
+2024/04/19 | 78780 | macros/latex/contrib/profcollege/latex/PfCReperage.tex
+2024/04/19 | 15355 | macros/latex/contrib/profcollege/latex/PfCRepresentationGraphique.tex
+2024/04/19 | 6570 | macros/latex/contrib/profcollege/latex/PfCRepresenterEntier.tex
+2024/04/19 | 16319 | macros/latex/contrib/profcollege/latex/PfCRepresenterFraction.tex
+2024/04/19 | 7569 | macros/latex/contrib/profcollege/latex/PfCRepresenterTableur.tex
+2024/04/19 | 9435 | macros/latex/contrib/profcollege/latex/PfCReseauxSociaux.tex
+2024/04/19 | 16401 | macros/latex/contrib/profcollege/latex/PfCResoudreEquation.tex
+2024/04/19 | 3049 | macros/latex/contrib/profcollege/latex/PfCRLE.tex
+2024/04/19 | 17795 | macros/latex/contrib/profcollege/latex/PfCRondeInfernale.tex
+2024/04/19 | 20355 | macros/latex/contrib/profcollege/latex/PfCRose.tex
+2024/04/19 | 1767 | macros/latex/contrib/profcollege/latex/PfCScratch.tex
+2024/04/19 | 10662 | macros/latex/contrib/profcollege/latex/PfCSerpent.tex
+2024/04/19 | 8711 | macros/latex/contrib/profcollege/latex/PfCShikaku.tex
+2024/04/19 | 11734 | macros/latex/contrib/profcollege/latex/PfCSimplifierFraction.tex
+2024/04/19 | 30830 | macros/latex/contrib/profcollege/latex/PfCSolides.tex
+2024/04/19 | 11738 | macros/latex/contrib/profcollege/latex/PfCSommeAngles.tex
+2024/04/19 | 2499 | macros/latex/contrib/profcollege/latex/PfCSquaro.tex
+2024/04/19 | 83984 | macros/latex/contrib/profcollege/latex/PfCStatistiques.tex
+2024/04/19 | 94595 | macros/latex/contrib/profcollege/latex/PfCTableauxUnites.tex
+2024/04/19 | 5312 | macros/latex/contrib/profcollege/latex/PfCTablesOperations.tex
+2024/04/19 | 6030 | macros/latex/contrib/profcollege/latex/PfCTectonic.tex
+2024/04/19 | 57262 | macros/latex/contrib/profcollege/latex/PfCThales.tex
+2024/04/19 | 7696 | macros/latex/contrib/profcollege/latex/PfCTicketCaisse.tex
+2024/04/19 | 8307 | macros/latex/contrib/profcollege/latex/PfCTortueBase.tex
+2024/04/19 | 24804 | macros/latex/contrib/profcollege/latex/PfCTrigonometrie.tex
+2024/04/19 | 9951 | macros/latex/contrib/profcollege/latex/PfCTriominos.tex
+2024/04/19 | 22067 | macros/latex/contrib/profcollege/latex/PfCTrio.tex
+2024/04/19 | 9734 | macros/latex/contrib/profcollege/latex/PfCVueCubes.tex
+2024/04/19 | 8676 | macros/latex/contrib/profcollege/latex/PfCYohaku.tex
+2024/04/19 | 23958 | 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
@@ -247494,17 +247489,17 @@
2023/07/30 | 7465 | macros/latex/contrib/profcollege/metapost/PfCLabyNombre.mp
2023/07/30 | 1682 | macros/latex/contrib/profcollege/metapost/PfCLaTeX.mp
2024/01/06 | 10399 | macros/latex/contrib/profcollege/metapost/PfCLego.mp
-2024/03/24 | 43558 | macros/latex/contrib/profcollege/metapost/PfCMonde.mp
+2024/04/19 | 43558 | macros/latex/contrib/profcollege/metapost/PfCMonde.mp
2023/07/30 | 9412 | macros/latex/contrib/profcollege/metapost/PfCMosaique.mp
-2024/03/24 | 79267 | macros/latex/contrib/profcollege/metapost/PfCObjets.mp
+2024/04/19 | 86996 | macros/latex/contrib/profcollege/metapost/PfCObjets.mp
2023/07/30 | 63245 | macros/latex/contrib/profcollege/metapost/PfCPseudo.mp
-2024/03/24 | 108047 | macros/latex/contrib/profcollege/metapost/PfCScratch.mp
+2024/04/19 | 108251 | macros/latex/contrib/profcollege/metapost/PfCScratch.mp
2023/09/07 | 109388 | macros/latex/contrib/profcollege/metapost/PfCScratchpdf.mp
-2024/03/24 | 28122 | macros/latex/contrib/profcollege/metapost/PfCSolid.mp
+2024/04/19 | 28122 | 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
-2024/03/24 | 18286587 | macros/latex/contrib/profcollege.zip
+2024/04/19 | 18333875 | 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
@@ -258582,14 +258577,14 @@
2023/08/20 | 3334 | macros/luatex/generic/lualibs/NEWS
2023/08/20 | 4823 | macros/luatex/generic/lualibs/README.md
2023/08/20 | 282788 | macros/luatex/generic/lualibs.zip
-2024/04/12 | 111024 | macros/luatex/generic/luamplib/luamplib.dtx
-2024/04/12 | 168963 | macros/luatex/generic/luamplib/luamplib.pdf
-2024/04/12 | 2752 | macros/luatex/generic/luamplib/Makefile
-2024/04/12 | 13249 | macros/luatex/generic/luamplib/NEWS
-2024/04/12 | 2058 | macros/luatex/generic/luamplib/README
-2024/04/12 | 6473 | macros/luatex/generic/luamplib/test-luamplib-latex.tex
-2024/04/12 | 3896 | macros/luatex/generic/luamplib/test-luamplib-plain.tex
-2024/04/12 | 207900 | macros/luatex/generic/luamplib.zip
+2024/04/19 | 112443 | macros/luatex/generic/luamplib/luamplib.dtx
+2024/04/19 | 170008 | macros/luatex/generic/luamplib/luamplib.pdf
+2024/04/19 | 2752 | macros/luatex/generic/luamplib/Makefile
+2024/04/19 | 13304 | macros/luatex/generic/luamplib/NEWS
+2024/04/19 | 2058 | macros/luatex/generic/luamplib/README
+2024/04/19 | 6474 | macros/luatex/generic/luamplib/test-luamplib-latex.tex
+2024/04/19 | 3896 | macros/luatex/generic/luamplib/test-luamplib-plain.tex
+2024/04/19 | 209410 | macros/luatex/generic/luamplib.zip
2024/02/28 | 18714 | macros/luatex/generic/luaotfload/COPYING
2024/02/28 | 40007 | macros/luatex/generic/luaotfload/filegraph.pdf
2024/02/28 | 8597 | macros/luatex/generic/luaotfload/filegraph.tex
@@ -300675,7 +300670,7 @@
2021/05/03 | 629 | support/TeX4ht/doc/README
2020/08/24 | 358454 | support/TeX4ht/doc/TeX4ht-doc.tex
2021/05/11 | 262 | support/TeX4ht/README
-2024/04/11 | 250403 | support/TeX4ht/source/ChangeLog
+2024/04/19 | 250773 | support/TeX4ht/source/ChangeLog
2021/05/03 | 1375 | support/TeX4ht/source/checklog.lua
2021/05/03 | 1189 | support/TeX4ht/source/common-code.tex
2021/05/03 | 2727 | support/TeX4ht/source/common-info.tex
@@ -300683,11 +300678,11 @@
2021/05/06 | 15 | support/TeX4ht/source/extra-bin/vcss
2021/05/06 | 15 | support/TeX4ht/source/extra-bin/xmllint
2024/04/11 | 29016 | support/TeX4ht/source/Makefile
-2024/03/05 | 8955 | support/TeX4ht/source/mktex4ht-cnf.tex
+2024/04/19 | 9001 | support/TeX4ht/source/mktex4ht-cnf.tex
2021/05/03 | 1121 | support/TeX4ht/source/README
2021/05/03 | 1744 | support/TeX4ht/source/t1fontmake.lua
2021/05/03 | 297 | support/TeX4ht/source/t1fontsample.tex
-2024/04/11 | 1188322 | support/TeX4ht/source/tex4ht-4ht.tex
+2024/04/19 | 1189580 | support/TeX4ht/source/tex4ht-4ht.tex
2021/05/03 | 7127 | support/TeX4ht/source/tex4ht-auto-script.tex
2021/05/16 | 1539 | support/TeX4ht/source/tex4ht-bibtex2.tex
2023/10/16 | 21307 | support/TeX4ht/source/tex4ht-cond4ht.tex
@@ -300709,7 +300704,7 @@
2022/07/16 | 187196 | support/TeX4ht/source/tex4ht-fonts-mnsymbol.tex
2023/03/29 | 703260 | support/TeX4ht/source/tex4ht-fonts-modern.tex
2023/11/19 | 297980 | support/TeX4ht/source/tex4ht-fonts-newtx.tex
-2024/03/05 | 1663645 | support/TeX4ht/source/tex4ht-fonts-noncjk.tex
+2024/04/19 | 1666028 | support/TeX4ht/source/tex4ht-fonts-noncjk.tex
2023/05/14 | 207863 | support/TeX4ht/source/tex4ht-fonts-opensans.tex
2023/05/14 | 207441 | support/TeX4ht/source/tex4ht-fonts-spectral.tex
2023/05/14 | 162204 | support/TeX4ht/source/tex4ht-fonts-stix2.tex
@@ -330049,7 +330044,7 @@
2014/07/05 | 611 | systems/win32/yandy/README
2014/07/05 | 1004628 | systems/win32/yandy/yandy-src.tar.xz
2014/07/05 | 1012416 | systems/win32/yandy.zip
-2024/04/19 | 186 | timestamp
+2024/04/20 | 186 | timestamp
2002/08/26 | 61898 | usergrps/dante/antrag.pdf
2002/08/26 | 118217 | usergrps/dante/antrag.ps
2021/11/11 | 917 | usergrps/dante/dtk/doc/beispiel.bib
diff --git a/FILES.byname.gz b/FILES.byname.gz
index e9fa731d1c..e7ffa6f55f 100644
--- a/FILES.byname.gz
+++ b/FILES.byname.gz
Binary files differ
diff --git a/FILES.last07days b/FILES.last07days
index 108257e654..0cb82b34f9 100644
--- a/FILES.last07days
+++ b/FILES.last07days
@@ -1,3 +1,186 @@
+2024/04/19 | 9951 | macros/latex/contrib/profcollege/latex/PfCTriominos.tex
+2024/04/19 | 9902 | macros/latex/contrib/profcollege/latex/PfCDecDeci.tex
+2024/04/19 | 987 | macros/latex/contrib/profcollege/latex/PfCAllumettes.tex
+2024/04/19 | 9734 | macros/latex/contrib/profcollege/latex/PfCVueCubes.tex
+2024/04/19 | 9501 | macros/latex/contrib/profcollege/latex/PfCLabyrintheJeu.tex
+2024/04/19 | 94595 | macros/latex/contrib/profcollege/latex/PfCTableauxUnites.tex
+2024/04/19 | 94557 | macros/latex/contrib/easybook/easybook.tex
+2024/04/19 | 9435 | macros/latex/contrib/profcollege/latex/PfCReseauxSociaux.tex
+2024/04/19 | 9404 | macros/latex/contrib/profcollege/latex/PfCPyramideCalculs.tex
+2024/04/19 | 9078 | macros/latex/contrib/profcollege/latex/PfCCalisson.tex
+2024/04/19 | 9001 | support/TeX4ht/source/mktex4ht-cnf.tex
+2024/04/19 | 8956 | macros/latex/contrib/profcollege/latex/PfCBillard.tex
+2024/04/19 | 8931 | macros/latex/contrib/notebeamer/tex/notebeamer.sty
+2024/04/19 | 8711 | macros/latex/contrib/profcollege/latex/PfCShikaku.tex
+2024/04/19 | 86996 | macros/latex/contrib/profcollege/metapost/PfCObjets.mp
+2024/04/19 | 8676 | macros/latex/contrib/profcollege/latex/PfCYohaku.tex
+2024/04/19 | 83984 | macros/latex/contrib/profcollege/latex/PfCStatistiques.tex
+2024/04/19 | 831 | macros/latex/contrib/profcollege/latex/PfCDobble.tex
+2024/04/19 | 8307 | macros/latex/contrib/profcollege/latex/PfCTortueBase.tex
+2024/04/19 | 8166 | macros/latex/contrib/profcollege/latex/PfCPourcentage.tex
+2024/04/19 | 8104 | macros/latex/contrib/profcollege/latex/PfCPixelArt.tex
+2024/04/19 | 7962 | macros/latex/contrib/profcollege/latex/PfCDessinGradue.tex
+2024/04/19 | 78780 | macros/latex/contrib/profcollege/latex/PfCReperage.tex
+2024/04/19 | 7875 | macros/latex/contrib/profcollege/latex/PfCMulJap.tex
+2024/04/19 | 7845 | macros/latex/contrib/profcollege/latex/PfCCalculsFractions.tex
+2024/04/19 | 78068 | macros/latex/contrib/easybook/easybook.dtx
+2024/04/19 | 7733 | macros/latex/contrib/profcollege/latex/PfCProbabilites.tex
+2024/04/19 | 7696 | macros/latex/contrib/profcollege/latex/PfCTicketCaisse.tex
+2024/04/19 | 7650 | macros/latex/contrib/profcollege/latex/PfCRangementNombres.tex
+2024/04/19 | 7569 | macros/latex/contrib/profcollege/latex/PfCRepresenterTableur.tex
+2024/04/19 | 7538 | macros/latex/contrib/profcollege/latex/PfCCible.tex
+2024/04/19 | 7422 | macros/latex/contrib/profcollege/latex/PfCNumerationsAnciennes.tex
+2024/04/19 | 7305 | macros/latex/contrib/profcollege/latex/PfCNombreAstral.tex
+2024/04/19 | 7244 | macros/latex/contrib/profcollege/latex/PfCFrise.tex
+2024/04/19 | 7142 | macros/latex/contrib/profcollege/latex/PfCPuissanceQuatre.tex
+2024/04/19 | 7105 | macros/latex/contrib/profcollege/latex/PfCHorloge.tex
+2024/04/19 | 7102 | macros/latex/contrib/profcollege/latex/PfCPuzzleSommePyramide.tex
+2024/04/19 | 7088 | macros/latex/contrib/profcollege/latex/PfCColorilude.tex
+2024/04/19 | 6941 | macros/latex/contrib/profcollege/latex/PfCGrimuku.tex
+2024/04/19 | 6616 | macros/latex/contrib/profcollege/latex/PfCMulJal.tex
+2024/04/19 | 6570 | macros/latex/contrib/profcollege/latex/PfCRepresenterEntier.tex
+2024/04/19 | 654293 | macros/latex/contrib/easybook.zip
+2024/04/19 | 6525 | macros/latex/contrib/profcollege/latex/PfCMentalo.tex
+2024/04/19 | 6474 | macros/luatex/generic/luamplib/test-luamplib-latex.tex
+2024/04/19 | 6120 | macros/latex/contrib/profcollege/latex/PfCDontCountDots.tex
+2024/04/19 | 609380 | macros/latex/contrib/easybook/easybook.pdf
+2024/04/19 | 6030 | macros/latex/contrib/profcollege/latex/PfCTectonic.tex
+2024/04/19 | 60167 | macros/latex/contrib/profcollege/latex/PfCDistributivite.tex
+2024/04/19 | 59542 | macros/latex/contrib/profcollege/latex/PfCNotionFonction.tex
+2024/04/19 | 5927 | graphics/pgf/contrib/tikzducks/tikzducks-doc-settings.sty
+2024/04/19 | 590 | graphics/pgf/contrib/tikzducks/tikzlibraryducks.code.tex
+2024/04/19 | 5824 | macros/latex/contrib/profcollege/latex/PfCPatronPaves.tex
+2024/04/19 | 57262 | macros/latex/contrib/profcollege/latex/PfCThales.tex
+2024/04/19 | 5696000 | macros/latex/contrib/profcollege/doc/ProfCollege-doc.zip
+2024/04/19 | 5680 | macros/latex/contrib/profcollege/latex/PfCConversion.tex
+2024/04/19 | 562 | graphics/pgf/contrib/tikzducks/README.md
+2024/04/19 | 5365 | macros/latex/contrib/profcollege/latex/PfCMidpoint.tex
+2024/04/19 | 5312 | macros/latex/contrib/profcollege/latex/PfCTablesOperations.tex
+2024/04/19 | 5250 | macros/latex/contrib/notebeamer/doc/notebeamer.tex
+2024/04/19 | 4968 | macros/latex/contrib/profcollege/latex/PfCGeometrie.tex
+2024/04/19 | 4958 | macros/latex/contrib/profcollege/latex/PfCCalculatrice.tex
+2024/04/19 | 4749 | macros/latex/contrib/profcollege/latex/PfCCryptarithme.tex
+2024/04/19 | 4692 | macros/latex/contrib/profcollege/latex/PfCFutoshiki.tex
+2024/04/19 | 4690 | macros/latex/contrib/profcollege/latex/PfCCritere.tex
+2024/04/19 | 4664 | macros/latex/contrib/profcollege/latex/PfCDiagrammeRadar.tex
+2024/04/19 | 4548 | macros/latex/contrib/profcollege/latex/PfCMosaique.tex
+2024/04/19 | 444335 | graphics/pgf/contrib/tikzducks.zip
+2024/04/19 | 4369 | macros/latex/contrib/profcollege/latex/PfCJeuRangement.tex
+2024/04/19 | 43558 | macros/latex/contrib/profcollege/metapost/PfCMonde.mp
+2024/04/19 | 4329 | macros/latex/contrib/profcollege/latex/PfCLego.tex
+2024/04/19 | 4178 | macros/latex/contrib/profcollege/latex/PfCFractionAireCarre.tex
+2024/04/19 | 4166 | macros/latex/contrib/profcollege/latex/PfCDomino.tex
+2024/04/19 | 416529 | graphics/pgf/contrib/tikzducks/tikzducks-doc.pdf
+2024/04/19 | 4150209 | macros/latex/contrib/notebeamer.zip
+2024/04/19 | 4125 | macros/latex/contrib/profcollege/latex/PfCMulPiecesPuzzle.tex
+2024/04/19 | 4120548 | biblio/ctan-bibdata.zip
+2024/04/19 | 4119 | macros/latex/contrib/profcollege/latex/PfCQuestionsRelier.tex
+2024/04/19 | 39184 | graphics/pgf/contrib/tikzducks/tikzducks-doc.tex
+2024/04/19 | 3896 | macros/luatex/generic/luamplib/test-luamplib-plain.tex
+2024/04/19 | 3884 | macros/latex/contrib/profcollege/latex/PfCKenKen.tex
+2024/04/19 | 3808 | macros/latex/contrib/profcollege/latex/PfCEratosthene.tex
+2024/04/19 | 3765 | macros/latex/contrib/profcollege/latex/PfCEnquete.tex
+2024/04/19 | 3708800 | biblio/ctan-bibdata/ctan.pdf
+2024/04/19 | 3652 | macros/latex/contrib/profcollege/latex/PfCDefiCalc.tex
+2024/04/19 | 3618 | macros/latex/contrib/profcollege/latex/PfCDecompFracDeci.tex
+2024/04/19 | 35829 | macros/latex/contrib/profcollege/latex/PfCPavage.tex
+2024/04/19 | 3466 | macros/latex/contrib/profcollege/latex/PfCFubuki.tex
+2024/04/19 | 3431 | macros/latex/contrib/profcollege/latex/PfCBarresCalculs.tex
+2024/04/19 | 3280 | macros/latex/contrib/profcollege/latex/PfCFicheMemo.tex
+2024/04/19 | 31573 | macros/latex/contrib/profcollege/latex/PfCCartesJeux.tex
+2024/04/19 | 30830 | macros/latex/contrib/profcollege/latex/PfCSolides.tex
+2024/04/19 | 3049 | macros/latex/contrib/profcollege/latex/PfCRLE.tex
+2024/04/19 | 2975 | macros/latex/contrib/profcollege/latex/PfCMotsCodes.tex
+2024/04/19 | 2939 | macros/latex/contrib/profcollege/latex/PfCBarreNiveaux.tex
+2024/04/19 | 29363 | macros/latex/contrib/profcollege/latex/PfCLabyrintheNombre.tex
+2024/04/19 | 2862727 | biblio/ctan-bibdata/ctan.bib
+2024/04/19 | 2844 | macros/latex/contrib/fadingimage/doc/fadingimage.tex
+2024/04/19 | 28129 | macros/latex/contrib/profcollege/latex/PfCRappelsFormules.tex
+2024/04/19 | 28122 | macros/latex/contrib/profcollege/metapost/PfCSolid.mp
+2024/04/19 | 2752 | macros/luatex/generic/luamplib/Makefile
+2024/04/19 | 274146 | macros/latex/contrib/notebeamer/doc/figures/beamerdemo.pdf
+2024/04/19 | 27371 | macros/latex/contrib/profcollege/latex/PfCPythagore.tex
+2024/04/19 | 2670286 | macros/latex/contrib/notebeamer/doc/figures/paperdemo.pdf
+2024/04/19 | 2644 | macros/latex/contrib/profcollege/latex/PfCEngrenagesBase.tex
+2024/04/19 | 2617 | macros/latex/contrib/profcollege/latex/PfCQuiSuisJe.tex
+2024/04/19 | 2605 | macros/latex/contrib/profcollege/latex/PfCKakurasu.tex
+2024/04/19 | 25681 | macros/latex/contrib/profcollege/latex/PfCPavageAvecMotifImage.tex
+2024/04/19 | 25516 | macros/latex/contrib/profcollege/latex/PfCDecomposerNombrePremier.tex
+2024/04/19 | 25321 | macros/latex/contrib/profcollege/latex/PfCQuestionsFlash.tex
+2024/04/19 | 250773 | support/TeX4ht/source/ChangeLog
+2024/04/19 | 2499 | macros/latex/contrib/profcollege/latex/PfCSquaro.tex
+2024/04/19 | 24804 | macros/latex/contrib/profcollege/latex/PfCTrigonometrie.tex
+2024/04/19 | 2477 | macros/latex/contrib/profcollege/latex/PfCEcritureLettres.tex
+2024/04/19 | 23958 | macros/latex/contrib/profcollege/latex/ProfCollege.sty
+2024/04/19 | 237793 | macros/latex/contrib/fadingimage.zip
+2024/04/19 | 2322 | macros/latex/contrib/profcollege/latex/PfCKakuro.tex
+2024/04/19 | 2285 | macros/latex/contrib/profcollege/latex/PfCGrades.tex
+2024/04/19 | 227390 | install/macros/luatex/generic/luamplib.tds.zip
+2024/04/19 | 2222 | macros/latex/contrib/profcollege/latex/PfCMotsCroises.tex
+2024/04/19 | 2211 | macros/latex/contrib/profcollege/latex/PfCHiddenMessage.tex
+2024/04/19 | 22067 | macros/latex/contrib/profcollege/latex/PfCTrio.tex
+2024/04/19 | 2173 | macros/latex/contrib/profcollege/latex/PfCGaram.tex
+2024/04/19 | 21452 | macros/latex/contrib/profcollege/latex/PfCFactorisation.tex
+2024/04/19 | 209410 | macros/luatex/generic/luamplib.zip
+2024/04/19 | 2072 | macros/latex/contrib/profcollege/latex/PfCBonSortie.tex
+2024/04/19 | 2058 | macros/luatex/generic/luamplib/README
+2024/04/19 | 20355 | macros/latex/contrib/profcollege/latex/PfCRose.tex
+2024/04/19 | 19160 | macros/latex/contrib/profcollege/latex/PfCPattern.tex
+2024/04/19 | 1856 | macros/latex/contrib/profcollege/latex/PfCMotsEmpiles.tex
+2024/04/19 | 18333875 | macros/latex/contrib/profcollege.zip
+2024/04/19 | 1793 | macros/latex/contrib/profcollege/latex/PfCRapido.tex
+2024/04/19 | 17835 | macros/latex/contrib/profcollege/latex/PfCOperationsTrou.tex
+2024/04/19 | 17795 | macros/latex/contrib/profcollege/latex/PfCRondeInfernale.tex
+2024/04/19 | 1767 | macros/latex/contrib/profcollege/latex/PfCScratch.tex
+2024/04/19 | 1705 | graphics/pgf/contrib/tikzducks/t-tikzducks.mkiv
+2024/04/19 | 170008 | macros/luatex/generic/luamplib/luamplib.pdf
+2024/04/19 | 1678 | biblio/ctan-bibdata/biblatex-ctan/ctan.bbx
+2024/04/19 | 1666028 | support/TeX4ht/source/tex4ht-fonts-noncjk.tex
+2024/04/19 | 16401 | macros/latex/contrib/profcollege/latex/PfCResoudreEquation.tex
+2024/04/19 | 16387 | macros/latex/contrib/profcollege/latex/PfCFonctionAffine.tex
+2024/04/19 | 16319 | macros/latex/contrib/profcollege/latex/PfCRepresenterFraction.tex
+2024/04/19 | 16033 | macros/latex/contrib/profcollege/latex/PfCModeleBarre.tex
+2024/04/19 | 15947 | macros/latex/contrib/profcollege/latex/PfCPropor.tex
+2024/04/19 | 1586 | macros/latex/contrib/profcollege/latex/PfCCartesMentales.tex
+2024/04/19 | 15355 | macros/latex/contrib/profcollege/latex/PfCRepresentationGraphique.tex
+2024/04/19 | 15102 | macros/latex/contrib/profcollege/latex/PfCEcritureUnites.tex
+2024/04/19 | 15005 | macros/latex/contrib/profcollege/latex/PfCMulArt.tex
+2024/04/19 | 14304 | macros/latex/contrib/profcollege/latex/PfCCAN.tex
+2024/04/19 | 14276 | macros/latex/contrib/profcollege/latex/PfCAssemblagesSolides.tex
+2024/04/19 | 14269 | macros/latex/contrib/profcollege/latex/PfCDessinerRatio.tex
+2024/04/19 | 14120 | macros/latex/contrib/profcollege/latex/PfCNonogramme.tex
+2024/04/19 | 138677 | macros/latex/contrib/fadingimage/doc/fadingimage.pdf
+2024/04/19 | 1357620 | macros/latex/contrib/notebeamer/doc/notebeamer.pdf
+2024/04/19 | 1330 | graphics/pgf/contrib/tikzducks/tikzducks-plain.tex
+2024/04/19 | 13304 | macros/luatex/generic/luamplib/NEWS
+2024/04/19 | 13213 | macros/latex/contrib/profcollege/latex/PfCCartographie.tex
+2024/04/19 | 1302 | graphics/pgf/contrib/tikzducks/tikzducks.sty
+2024/04/19 | 1287 | macros/latex/contrib/profcollege/latex/PfCPyraVoca.tex
+2024/04/19 | 12516 | macros/latex/contrib/profcollege/latex/PfCFractionNombre.tex
+2024/04/19 | 12476 | macros/latex/contrib/profcollege/latex/PfCEcrireunQCM.tex
+2024/04/19 | 12420 | macros/latex/contrib/profcollege/latex/PfCProgrammeCalcul.tex
+2024/04/19 | 12296 | macros/latex/contrib/profcollege/latex/PfCNumberHive.tex
+2024/04/19 | 12153 | macros/latex/contrib/profcollege/latex/PfCCalculsCroises.tex
+2024/04/19 | 12035 | macros/latex/contrib/profcollege/latex/PfCRecyclage.tex
+2024/04/19 | 1189580 | support/TeX4ht/source/tex4ht-4ht.tex
+2024/04/19 | 11738 | macros/latex/contrib/profcollege/latex/PfCSommeAngles.tex
+2024/04/19 | 11734 | macros/latex/contrib/profcollege/latex/PfCSimplifierFraction.tex
+2024/04/19 | 11629 | macros/latex/contrib/profcollege/latex/PfCDefiTables.tex
+2024/04/19 | 11298 | macros/latex/contrib/profcollege/latex/PfCCompteBon.tex
+2024/04/19 | 112443 | macros/luatex/generic/luamplib/luamplib.dtx
+2024/04/19 | 11161 | macros/latex/contrib/profcollege/latex/PfCDessinAlgo.tex
+2024/04/19 | 11131 | macros/latex/contrib/profcollege/latex/PfCProprietesDroites.tex
+2024/04/19 | 11046 | macros/latex/contrib/profcollege/latex/PfCAutomatismes.tex
+2024/04/19 | 10966 | macros/latex/contrib/profcollege/latex/PfCAutonomie.tex
+2024/04/19 | 108251 | macros/latex/contrib/profcollege/metapost/PfCScratch.mp
+2024/04/19 | 10662 | macros/latex/contrib/profcollege/latex/PfCSerpent.tex
+2024/04/19 | 10633 | macros/latex/contrib/profcollege/latex/PfCEnigmeAire.tex
+2024/04/19 | 1055 | macros/latex/contrib/profcollege/latex/PfCBonbon.tex
+2024/04/19 | 104883 | graphics/pgf/contrib/tikzducks/tikzducks-generic.tex
+2024/04/19 | 10470 | macros/latex/contrib/profcollege/latex/PfCCibleQOp.tex
+2024/04/19 | 10283168 | macros/latex/contrib/profcollege/doc/ProfCollege-doc.pdf
+2024/04/19 | 10168 | macros/latex/contrib/profcollege/latex/PfCPapiers.tex
+2024/04/19 | 1000 | macros/latex/contrib/profcollege/latex/PfCJeton.tex
2024/04/18 | 9955 | macros/latex/contrib/ufrgscca/latex/ufrgscca-forms.sty
2024/04/18 | 918998 | macros/latex/contrib/acmart/acmart.pdf
2024/04/18 | 8475 | macros/latex/contrib/ufrgscca/latex/ufrgscca-cover.sty
@@ -30,12 +213,10 @@
2024/04/18 | 438780 | fonts/lato-math/LatoMath.otf
2024/04/18 | 43164 | systems/texlive/tlnet/archive/eplain.r70971.tar.xz
2024/04/18 | 41316 | macros/luatex/latex/lua-typo/lua-typo-2023-03-08.sty
-2024/04/18 | 4120564 | biblio/ctan-bibdata.zip
2024/04/18 | 400681 | macros/latex/contrib/acmart/samples/sample-acmengage.pdf
2024/04/18 | 39521 | macros/latex/contrib/acmart/samples/samples.dtx
2024/04/18 | 3749 | macros/luatex/latex/lua-typo/README.md
2024/04/18 | 37262 | graphics/pgf/contrib/bodeplot/bodeplot-2024-02-06.sty
-2024/04/18 | 3708800 | biblio/ctan-bibdata/ctan.pdf
2024/04/18 | 350638 | macros/luatex/latex/lua-typo.zip
2024/04/18 | 34425577 | systems/texlive/tlnet/install-tl.zip
2024/04/18 | 3422 | macros/latex/contrib/ufrgscca/latex/ufrgscca-lists.sty
@@ -47,7 +228,6 @@
2024/04/18 | 292953 | macros/latex/contrib/acmart/acmart.dtx
2024/04/18 | 288964 | systems/texlive/tlnet/archive/eplain.source.r70971.tar.xz
2024/04/18 | 28774 | macros/latex/contrib/ufrgscca/latex/ufrgscca-coord.sty
-2024/04/18 | 2862729 | biblio/ctan-bibdata/ctan.bib
2024/04/18 | 27950 | fonts/lato-math/LatoMath.ltx
2024/04/18 | 2773 | macros/latex/contrib/acmart/acmart.bib
2024/04/18 | 27718255 | systems/texlive/tlnet/install-tl-windows.exe
@@ -71,7 +251,6 @@
2024/04/18 | 19229 | macros/latex/contrib/ufrgscca/latex/ufrgscca-terms-ptBR.tex
2024/04/18 | 1901 | macros/latex/contrib/ufrgscca/latex/ufrgscca-base-ptBR.def
2024/04/18 | 16859 | macros/luatex/latex/lua-typo/doc/lua-typo-demo.pdf
-2024/04/18 | 1678 | biblio/ctan-bibdata/biblatex-ctan/ctan.bbx
2024/04/18 | 16521 | fonts/lato-math/unimath-lato.ltx
2024/04/18 | 1560 | macros/latex/contrib/acmart/samples/samples.ins
2024/04/18 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
@@ -109,6 +288,7 @@
2024/04/17 | 657 | macros/eplain/doc/AUTHORS
2024/04/17 | 635 | graphics/pgf/contrib/tikzmarmots/tikzlibrarymarmots.code.tex
2024/04/17 | 610 | graphics/pgf/contrib/tikzmarmots/tikzmarmots.sty
+2024/04/17 | 594 | macros/latex/contrib/fadingimage/README.md
2024/04/17 | 554980 | systems/texlive/tlnet/archive/litesolution.doc.r70965.tar.xz
2024/04/17 | 5160 | systems/texlive/tlnet/archive/lscapeenhanced.source.r70967.tar.xz
2024/04/17 | 4768 | systems/texlive/tlnet/archive/pixelarttikz.r70964.tar.xz
@@ -120,6 +300,7 @@
2024/04/17 | 36739 | macros/eplain/tex/btxmac.tex
2024/04/17 | 3672 | systems/texlive/tlnet/archive/litesolution.r70965.tar.xz
2024/04/17 | 33928 | support/texfot/texfot.pdf
+2024/04/17 | 3048 | macros/latex/contrib/fadingimage/tex/fadingimage.sty
2024/04/17 | 27480 | systems/texlive/tlnet/archive/bithesis.source.r70966.tar.xz
2024/04/17 | 259129 | macros/eplain/source/eplain-source-3.14.zip
2024/04/17 | 257652 | systems/texlive/tlnet/archive/lscapeenhanced.doc.r70967.tar.xz
@@ -418,11 +599,9 @@
2024/04/13 | 4704 | systems/texlive/tlnet/archive/huaz.r70927.tar.xz
2024/04/13 | 464217 | fonts/minion2newtx.zip
2024/04/13 | 4489 | macros/generic/crossrefenum/doc/TEMPLATE_crossrefenum.context
-2024/04/13 | 425543 | fonts/minion2newtx/doc/minion2newtxdoc.pdf
2024/04/13 | 4048 | graphics/pgf/contrib/fancyqr/README.md
2024/04/13 | 402537 | macros/latex/contrib/profmaquette.zip
2024/04/13 | 36783 | macros/latex/contrib/numspell/numspell-latin.sty
-2024/04/13 | 3676 | fonts/minion2newtx/README
2024/04/13 | 3483 | macros/generic/crossrefenum/README.md
2024/04/13 | 3475304 | systems/texlive/tlnet/archive/simpleicons.r70925.tar.xz
2024/04/13 | 34039 | macros/generic/crossrefenum/doc/crossrefenum.md
@@ -454,261 +633,3 @@
2024/04/13 | 107 | graphics/pgf/contrib/fancyqr/fancyqr-style-frame.code
2024/04/13 | 1041 | graphics/pgf/contrib/fancyqr/qr-example.tex
2024/04/13 | 103215 | macros/latex/contrib/profmaquette/doc/ProfMaquette-doc.zip
-2024/04/12 | 9999 | macros/latex-dev/required/l3kernel/l3news10.tex
-2024/04/12 | 9670 | macros/latex-dev/required/l3backend/l3backend-opacity.dtx
-2024/04/12 | 950 | macros/latex/contrib/tagpdf/ex-formula-problem.tex
-2024/04/12 | 9465 | macros/latex-dev/required/l3kernel/l3news08.tex
-2024/04/12 | 9452 | systems/texlive/tlnet/archive/cs-techrep.source.r70915.tar.xz
-2024/04/12 | 9445 | macros/latex-dev/required/l3kernel/l3fp-assign.dtx
-2024/04/12 | 93008 | macros/latex-dev/required/l3kernel/l3int.dtx
-2024/04/12 | 91719 | macros/latex-dev/required/l3kernel/l3skip.dtx
-2024/04/12 | 907792 | macros/latex-dev/required/l3backend/l3backend-code.pdf
-2024/04/12 | 88794 | macros/latex-dev/required/l3kernel/l3expan.dtx
-2024/04/12 | 88241 | macros/latex-dev/required/l3kernel/l3coffins.dtx
-2024/04/12 | 87821 | macros/latex-dev/required/l3kernel/l3box.dtx
-2024/04/12 | 8481 | macros/latex-dev/required/l3kernel/l3news11.tex
-2024/04/12 | 84789 | macros/latex-dev/required/l3kernel/l3fp-basics.dtx
-2024/04/12 | 83169 | macros/latex-dev/required/l3kernel/l3clist.dtx
-2024/04/12 | 83081 | macros/latex-dev/required/l3kernel/l3msg.dtx
-2024/04/12 | 8281 | macros/latex/contrib/tagpdf/global-ex.png
-2024/04/12 | 827 | macros/latex/contrib/tagpdf/ex-softhyphen.tex
-2024/04/12 | 82732 | macros/latex-dev/required/l3kernel/l3prefixes.pdf
-2024/04/12 | 82462 | macros/latex-dev/required/l3kernel/l3str.dtx
-2024/04/12 | 80270 | macros/latex-dev/required/l3kernel/l3names.dtx
-2024/04/12 | 7854 | macros/latex/contrib/tagpdf/ex-formula-problem-luatex.pdf
-2024/04/12 | 7831 | macros/latex-dev/required/l3kernel/l3fp-functions.dtx
-2024/04/12 | 76534 | macros/latex-dev/required/l3kernel/l3fp.dtx
-2024/04/12 | 76368 | macros/latex-dev/required/l3kernel/l3text-case.dtx
-2024/04/12 | 7624184 | macros/latex-dev/required/l3kernel/source3.pdf
-2024/04/12 | 74253 | macros/latex/contrib/tagpdf/tagpdf-struct.dtx
-2024/04/12 | 73845 | macros/latex-dev/required/l3kernel/l3fp-trig.dtx
-2024/04/12 | 7275 | macros/latex/contrib/tagpdf/tagpdf-space.dtx
-2024/04/12 | 71456 | macros/latex-dev/required/l3kernel/expl3.dtx
-2024/04/12 | 70830 | macros/latex-dev/required/l3kernel/l3prg.dtx
-2024/04/12 | 7079 | macros/latex-dev/required/l3kernel/l3term-glossary.tex
-2024/04/12 | 700 | macros/latex/contrib/tagpdf/ex-spaceglyph-listings.tex
-2024/04/12 | 698 | macros/latex/contrib/tagpdf/ex-tagpdf-template.tex
-2024/04/12 | 693 | macros/latex/contrib/huaz/README
-2024/04/12 | 6677 | macros/latex-dev/required/l3kernel/l3news02.tex
-2024/04/12 | 6626 | macros/latex/contrib/tagpdf/ex-attribute-luatex.pdf
-2024/04/12 | 6482 | macros/latex-dev/required/l3kernel/l3news03.tex
-2024/04/12 | 6473 | macros/luatex/generic/luamplib/test-luamplib-latex.tex
-2024/04/12 | 6433 | macros/latex-dev/required/l3kernel/l3news06.tex
-2024/04/12 | 6429 | macros/latex-dev/required/l3kernel/l3.ins
-2024/04/12 | 6335132 | fonts/simpleicons.zip
-2024/04/12 | 63041 | macros/latex-dev/required/l3kernel/l3tl-analysis.dtx
-2024/04/12 | 6219 | macros/latex-dev/required/l3kernel/l3syntax-changes.tex
-2024/04/12 | 612911 | macros/latex/contrib/writeongrid/doc/WriteOnGrid-doc-fr.pdf
-2024/04/12 | 610072 | macros/latex-dev/required/l3kernel/expl3.pdf
-2024/04/12 | 5984 | systems/texlive/tlnet/archive/fgruler.r70917.tar.xz
-2024/04/12 | 59454 | macros/latex-dev/required/l3kernel/CHANGELOG.md
-2024/04/12 | 565293 | macros/latex-dev/required/l3kernel/l3doc.pdf
-2024/04/12 | 5524 | macros/latex/contrib/tagpdf/tagpdfdocu-patches.sty
-2024/04/12 | 549 | macros/latex-dev/required/l3backend/README.md
-2024/04/12 | 5440 | systems/texlive/tlnet/archive/iaria.source.r70919.tar.xz
-2024/04/12 | 5429 | macros/latex-dev/required/l3kernel/l3news04.tex
-2024/04/12 | 51091 | macros/latex-dev/required/l3kernel/l3fp-extended.dtx
-2024/04/12 | 50238 | macros/latex-dev/required/l3backend/l3backend-pdf.dtx
-2024/04/12 | 4977 | macros/latex-dev/required/l3kernel/l3news07.tex
-2024/04/12 | 4937 | macros/latex-dev/required/l3kernel/l3news01.tex
-2024/04/12 | 49321 | macros/latex-dev/required/l3kernel/l3fp-expo.dtx
-2024/04/12 | 4927 | macros/latex-dev/required/l3backend/l3backend.ins
-2024/04/12 | 4911 | macros/latex-dev/required/l3kernel/l3fp-types.dtx
-2024/04/12 | 48984 | macros/latex-dev/required/l3kernel/l3text.dtx
-2024/04/12 | 4890 | macros/latex-dev/required/l3kernel/l3news.tex
-2024/04/12 | 48386 | macros/latex-dev/required/l3kernel/l3prefixes.csv
-2024/04/12 | 476435 | macros/latex/contrib/writeongrid/doc/WriteOnGrid-doc-en.pdf
-2024/04/12 | 47237 | macros/latex-dev/required/l3kernel/l3fp-aux.dtx
-2024/04/12 | 4716 | macros/latex-dev/required/l3kernel/l3news05.tex
-2024/04/12 | 471644 | systems/texlive/tlnet/archive/fgruler.doc.r70917.tar.xz
-2024/04/12 | 45775 | macros/latex/contrib/tagpdf/tagpdf-roles.dtx
-2024/04/12 | 4570 | macros/latex-dev/required/l3kernel/l3legacy.dtx
-2024/04/12 | 4556 | systems/texlive/tlnet/archive/iaria-lite.source.r70918.tar.xz
-2024/04/12 | 4524 | systems/texlive/tlnet/archive/cs-techrep.r70915.tar.xz
-2024/04/12 | 44951 | macros/latex/contrib/tagpdf/tagpdf-backend.dtx
-2024/04/12 | 44218 | macros/latex/contrib/tagpdf/tagpdf-user.dtx
-2024/04/12 | 4349 | macros/latex/contrib/tagpdf/tagpdfsetup-keys.tex
-2024/04/12 | 43211 | macros/latex-dev/required/l3kernel/l3sys.dtx
-2024/04/12 | 41860 | macros/latex-dev/required/l3kernel/l3debug.dtx
-2024/04/12 | 41764 | macros/latex-dev/required/l3backend/l3backend-color.dtx
-2024/04/12 | 410652 | systems/texlive/tlnet/archive/dvipdfmx.x86_64-cygwin.r70914.tar.xz
-2024/04/12 | 4102 | macros/latex/contrib/tagpdf/ex-alt-actualtext.tex
-2024/04/12 | 40727 | macros/latex-dev/required/l3kernel/l3sort.dtx
-2024/04/12 | 402149 | macros/latex-dev/required/l3kernel/l3news.pdf
-2024/04/12 | 3959 | macros/latex/contrib/tagpdf/tagpdf.ins
-2024/04/12 | 3906 | fonts/simpleicons/enc/simpleiconsfive.enc
-2024/04/12 | 3896 | macros/luatex/generic/luamplib/test-luamplib-plain.tex
-2024/04/12 | 3877 | fonts/simpleicons/enc/simpleiconsone.enc
-2024/04/12 | 379932 | systems/texlive/tlnet/archive/jsonparse.doc.r70920.tar.xz
-2024/04/12 | 376 | fonts/simpleicons/tfm/SimpleIcons--simpleiconsonethree.tfm
-2024/04/12 | 3746 | fonts/simpleicons/enc/simpleiconsthree.enc
-2024/04/12 | 3725 | fonts/simpleicons/enc/simpleiconsoneone.enc
-2024/04/12 | 36943 | macros/latex/contrib/tagpdf/tagpdf-data.dtx
-2024/04/12 | 3669 | fonts/simpleicons/enc/simpleiconsseven.enc
-2024/04/12 | 3664 | fonts/simpleicons/enc/simpleiconstwo.enc
-2024/04/12 | 3663 | fonts/simpleicons/enc/simpleiconsonezero.enc
-2024/04/12 | 36260 | macros/latex/contrib/tagpdf/tagpdf-checks.dtx
-2024/04/12 | 3622 | fonts/simpleicons/enc/simpleiconseight.enc
-2024/04/12 | 3602 | fonts/simpleicons/enc/simpleiconsnine.enc
-2024/04/12 | 3564 | fonts/simpleicons/enc/simpleiconsonetwo.enc
-2024/04/12 | 35640 | macros/latex-dev/required/l3kernel/l3unicode.dtx
-2024/04/12 | 3547 | fonts/simpleicons/enc/simpleiconsfour.enc
-2024/04/12 | 35218 | macros/latex-dev/required/l3kernel/l3quark.dtx
-2024/04/12 | 3499 | fonts/simpleicons/enc/simpleiconssix.enc
-2024/04/12 | 34902 | macros/latex/contrib/writeongrid/doc/WriteOnGrid-doc-fr.tex
-2024/04/12 | 34447 | macros/latex-dev/required/l3kernel/l3cctab.dtx
-2024/04/12 | 34295 | macros/latex/contrib/tagpdf/ex-alt-actualtext.pdf
-2024/04/12 | 34115 | macros/latex-dev/required/l3backend/l3backend-draw.dtx
-2024/04/12 | 332588 | macros/latex/contrib/huaz.zip
-2024/04/12 | 33188 | macros/latex/contrib/writeongrid/tex/WriteOnGrid.sty
-2024/04/12 | 3284 | systems/texlive/tlnet/archive/jsonparse.r70920.tar.xz
-2024/04/12 | 328438 | macros/latex/contrib/huaz/huaz.pdf
-2024/04/12 | 31553 | macros/latex/contrib/tagpdf/ex-list.pdf
-2024/04/12 | 31531 | macros/latex-dev/required/l3kernel/l3intarray.dtx
-2024/04/12 | 312248 | systems/texlive/tlnet/archive/cs-techrep.doc.r70915.tar.xz
-2024/04/12 | 31020 | macros/latex-dev/required/l3kernel/l3kernel-functions.dtx
-2024/04/12 | 3078 | macros/latex-dev/required/l3kernel/README.md
-2024/04/12 | 305486 | macros/latex-dev/required/l3kernel/l3regex.dtx
-2024/04/12 | 300295 | fonts/simpleicons/tex/simpleiconsglyphs-pdftex.tex
-2024/04/12 | 296269 | macros/latex-dev/required/l3kernel/l3styleguide.pdf
-2024/04/12 | 29614 | macros/latex-dev/required/l3backend/l3backend-graphics.dtx
-2024/04/12 | 293474 | fonts/simpleicons/tex/simpleiconsglyphs-xeluatex.tex
-2024/04/12 | 28595 | macros/latex/contrib/tagpdf/tagpdf-mc-generic.dtx
-2024/04/12 | 285564 | systems/texlive/tlnet/archive/iaria.doc.r70919.tar.xz
-2024/04/12 | 284500 | systems/texlive/tlnet/archive/iaria-lite.doc.r70918.tar.xz
-2024/04/12 | 2821 | macros/latex-dev/required/l3kernel/l3prefixes.tex
-2024/04/12 | 279 | fonts/simpleicons/tex/usimpleiconsonethree.fd
-2024/04/12 | 2752 | macros/luatex/generic/luamplib/Makefile
-2024/04/12 | 274 | fonts/simpleicons/tex/usimpleiconsonezero.fd
-2024/04/12 | 269 | fonts/simpleicons/tex/usimpleiconsonetwo.fd
-2024/04/12 | 269 | fonts/simpleicons/tex/usimpleiconsoneone.fd
-2024/04/12 | 26541 | macros/latex-dev/required/l3kernel/l3pdf.dtx
-2024/04/12 | 264 | fonts/simpleicons/tex/usimpleiconsthree.fd
-2024/04/12 | 264 | fonts/simpleicons/tex/usimpleiconsseven.fd
-2024/04/12 | 264 | fonts/simpleicons/tex/usimpleiconseight.fd
-2024/04/12 | 2643 | macros/latex/contrib/tagpdf/tagpdf.bib
-2024/04/12 | 259 | fonts/simpleicons/tex/usimpleiconsnine.fd
-2024/04/12 | 259 | fonts/simpleicons/tex/usimpleiconsfour.fd
-2024/04/12 | 259 | fonts/simpleicons/tex/usimpleiconsfive.fd
-2024/04/12 | 256114 | macros/latex-dev/required/l3kernel/l3news09.pdf
-2024/04/12 | 254 | fonts/simpleicons/tex/usimpleiconstwo.fd
-2024/04/12 | 254 | fonts/simpleicons/tex/usimpleiconssix.fd
-2024/04/12 | 254 | fonts/simpleicons/tex/usimpleiconsone.fd
-2024/04/12 | 2526611 | fonts/simpleicons/doc/simpleicons.pdf
-2024/04/12 | 24881 | macros/latex-dev/required/l3kernel/l3deprecation.dtx
-2024/04/12 | 24880 | macros/latex/contrib/tagpdf/ex-mc-manual-para-split-obsolete.pdf
-2024/04/12 | 24830 | macros/latex-dev/required/l3kernel/source3body.tex
-2024/04/12 | 24806 | macros/latex/contrib/tagpdf/ex-structure-obsolete.pdf
-2024/04/12 | 2440004 | fonts/simpleicons/opentype/SimpleIcons.otf
-2024/04/12 | 2434 | fonts/simpleicons/enc/simpleiconsonethree.enc
-2024/04/12 | 241905 | macros/latex-dev/required/l3kernel/l3term-glossary.pdf
-2024/04/12 | 24131 | macros/latex/contrib/tagpdf/tagpdf.dtx
-2024/04/12 | 2384 | macros/latex-dev/required/l3kernel/l3docstrip.dtx
-2024/04/12 | 23830 | macros/latex-dev/required/l3kernel/l3luatex.dtx
-2024/04/12 | 23581 | macros/latex-dev/required/l3kernel/l3fp-random.dtx
-2024/04/12 | 23311 | macros/latex/contrib/tagpdf/acrobat.png
-2024/04/12 | 23206 | macros/latex-dev/required/l3kernel/l3fp-logic.dtx
-2024/04/12 | 231115 | macros/latex-dev/required/l3kernel/l3syntax-changes.pdf
-2024/04/12 | 2282 | macros/latex-dev/required/l3kernel/source3.tex
-2024/04/12 | 2280 | macros/latex/contrib/tagpdf/tagpdf-code.tex
-2024/04/12 | 2258347 | fonts/simpleicons/type1/SimpleIcons.pfb
-2024/04/12 | 225419 | install/macros/luatex/generic/luamplib.tds.zip
-2024/04/12 | 21970 | macros/latex/contrib/tagpdf/ex-AF-file.pdf
-2024/04/12 | 21727 | macros/latex/contrib/huaz/huaz.tex
-2024/04/12 | 216372 | macros/latex/contrib/hulipsum.zip
-2024/04/12 | 2115 | macros/latex/contrib/tagpdf/ex-mc-manual-para-split-obsolete.tex
-2024/04/12 | 210972 | macros/latex-dev/required/l3kernel/l3news12.pdf
-2024/04/12 | 207900 | macros/luatex/generic/luamplib.zip
-2024/04/12 | 2058 | macros/luatex/generic/luamplib/README
-2024/04/12 | 20589 | macros/latex/contrib/tagpdf/tagpdf-tree.dtx
-2024/04/12 | 20460 | macros/latex-dev/required/l3kernel/l3text-purify.dtx
-2024/04/12 | 20314 | macros/latex/contrib/huaz/huaz.sty
-2024/04/12 | 20310 | macros/latex-dev/required/l3kernel/l3fp-symbolic.dtx
-2024/04/12 | 2022 | macros/latex/contrib/tagpdf/link-figure-input.tex
-2024/04/12 | 20066 | macros/latex/contrib/tagpdf/ex-formula-problem.pdf
-2024/04/12 | 19637 | macros/latex-dev/required/l3kernel/l3fp-convert.dtx
-2024/04/12 | 19547 | macros/latex-dev/required/l3kernel/l3bitset.dtx
-2024/04/12 | 1949 | macros/latex-dev/required/l3kernel/interface3.tex
-2024/04/12 | 19236 | macros/latex/contrib/tagpdf/ex-softhyphen.pdf
-2024/04/12 | 19203 | macros/latex/contrib/tagpdf/ex-tagpdf-template.pdf
-2024/04/12 | 19015 | macros/latex/contrib/tagpdf/ex-attribute.pdf
-2024/04/12 | 18671 | macros/latex/contrib/writeongrid/doc/WriteOnGrid-doc-en.tex
-2024/04/12 | 1856 | systems/texlive/tlnet/archive/iaria.r70919.tar.xz
-2024/04/12 | 18528 | macros/latex-dev/required/l3kernel/l3fp-round.dtx
-2024/04/12 | 18461 | macros/latex/contrib/tagpdf/ex-patch-sectioning-koma-luatex.pdf
-2024/04/12 | 1813 | fonts/simpleicons/doc/simpleicons.tex
-2024/04/12 | 1801762 | macros/latex-dev/required/l3kernel/interface3.pdf
-2024/04/12 | 178913 | fonts/simpleicons/doc/bindings.tex
-2024/04/12 | 17742 | macros/latex/contrib/tagpdf/ex-alt-actualtext-luatex.pdf
-2024/04/12 | 176893 | macros/latex/contrib/hulipsum/hulipsum.dtx
-2024/04/12 | 176082 | macros/latex-dev/required/l3kernel/l3news11.pdf
-2024/04/12 | 1745 | fonts/simpleicons/tex/simpleicons.sty
-2024/04/12 | 1713045 | macros/latex/contrib/tagpdf/tagpdf-code.pdf
-2024/04/12 | 168963 | macros/luatex/generic/luamplib/luamplib.pdf
-2024/04/12 | 16624 | macros/latex-dev/required/l3kernel/l3text-map.dtx
-2024/04/12 | 16528 | macros/latex/contrib/tagpdf/ex-spaceglyph-listings.pdf
-2024/04/12 | 163496 | macros/latex-dev/required/l3kernel/l3news08.pdf
-2024/04/12 | 16348 | macros/latex/contrib/tagpdf/tagpdf-mc-luacode.dtx
-2024/04/12 | 16213 | macros/latex-dev/required/l3backend/l3backend-basics.dtx
-2024/04/12 | 159891 | macros/latex-dev/required/l3kernel/l3doc.dtx
-2024/04/12 | 15955 | macros/latex/contrib/tagpdf/tagpdf-mc-shared.dtx
-2024/04/12 | 156507 | macros/latex/contrib/hulipsum/hulipsum.pdf
-2024/04/12 | 156270 | macros/latex-dev/required/l3kernel/l3news10.pdf
-2024/04/12 | 154694 | macros/latex-dev/required/l3kernel/l3news03.pdf
-2024/04/12 | 1532 | systems/texlive/tlnet/archive/iaria-lite.r70918.tar.xz
-2024/04/12 | 151602 | macros/latex-dev/required/l3kernel/l3news06.pdf
-2024/04/12 | 150996 | macros/latex-dev/required/l3kernel/l3docstrip.pdf
-2024/04/12 | 150932 | macros/latex-dev/required/l3kernel/l3news02.pdf
-2024/04/12 | 149691 | macros/latex-dev/required/l3kernel/l3tl.dtx
-2024/04/12 | 14913 | macros/latex-dev/required/l3kernel/l3news12.tex
-2024/04/12 | 14823 | macros/latex-dev/required/l3backend/l3backend-header.dtx
-2024/04/12 | 1476 | fonts/simpleicons/map/simpleicons.map
-2024/04/12 | 1445 | macros/latex/contrib/tagpdf/ex-structure-obsolete.tex
-2024/04/12 | 144422 | macros/latex-dev/required/l3kernel/l3file.dtx
-2024/04/12 | 14433 | macros/latex-dev/required/l3backend/l3backend-box.dtx
-2024/04/12 | 14410436 | install/macros/latex-dev/required/l3kernel-dev.tds.zip
-2024/04/12 | 14152 | macros/latex-dev/required/l3kernel/l3flag.dtx
-2024/04/12 | 141163 | macros/latex/contrib/tagpdf/pac3.PNG
-2024/04/12 | 138821 | macros/latex-dev/required/l3kernel/l3basics.dtx
-2024/04/12 | 1350861 | macros/latex/contrib/writeongrid.zip
-2024/04/12 | 1344 | macros/latex-dev/required/l3backend/l3backend-code.tex
-2024/04/12 | 13292 | macros/latex-dev/required/l3kernel/l3tl-build.dtx
-2024/04/12 | 1325 | macros/latex/contrib/tagpdf/ex-attribute.tex
-2024/04/12 | 13249 | macros/luatex/generic/luamplib/NEWS
-2024/04/12 | 130500 | macros/latex-dev/required/l3kernel/l3keys.dtx
-2024/04/12 | 130313 | macros/latex/contrib/tagpdf/tagpdf.tex
-2024/04/12 | 12955 | macros/latex-dev/required/l3kernel/l3bootstrap.dtx
-2024/04/12 | 12945 | macros/latex-dev/required/l3kernel/l3fparray.dtx
-2024/04/12 | 128356 | macros/latex-dev/required/l3kernel/l3news07.pdf
-2024/04/12 | 12832 | macros/latex-dev/required/l3kernel/l3fp-traps.dtx
-2024/04/12 | 1236 | fonts/simpleicons/tfm/SimpleIcons--simpleiconsnine.tfm
-2024/04/12 | 1232 | fonts/simpleicons/tfm/SimpleIcons--simpleiconstwo.tfm
-2024/04/12 | 1232 | fonts/simpleicons/tfm/SimpleIcons--simpleiconsthree.tfm
-2024/04/12 | 1232 | fonts/simpleicons/tfm/SimpleIcons--simpleiconssix.tfm
-2024/04/12 | 1232 | fonts/simpleicons/tfm/SimpleIcons--simpleiconsseven.tfm
-2024/04/12 | 1232 | fonts/simpleicons/tfm/SimpleIcons--simpleiconsonezero.tfm
-2024/04/12 | 1232 | fonts/simpleicons/tfm/SimpleIcons--simpleiconsonetwo.tfm
-2024/04/12 | 1232 | fonts/simpleicons/tfm/SimpleIcons--simpleiconsone.tfm
-2024/04/12 | 1232 | fonts/simpleicons/tfm/SimpleIcons--simpleiconsoneone.tfm
-2024/04/12 | 1232 | fonts/simpleicons/tfm/SimpleIcons--simpleiconsfour.tfm
-2024/04/12 | 1232 | fonts/simpleicons/tfm/SimpleIcons--simpleiconsfive.tfm
-2024/04/12 | 1232 | fonts/simpleicons/tfm/SimpleIcons--simpleiconseight.tfm
-2024/04/12 | 122973 | macros/latex-dev/required/l3kernel/l3news01.pdf
-2024/04/12 | 1207 | fonts/simpleicons/README.md
-2024/04/12 | 12012 | systems/texlive/tlnet/archive/fgruler.source.r70917.tar.xz
-2024/04/12 | 1194 | macros/latex/contrib/tagpdf/README.md
-2024/04/12 | 11882 | macros/latex-dev/required/l3kernel/l3styleguide.tex
-2024/04/12 | 117222 | macros/latex-dev/required/l3kernel/l3token.dtx
-2024/04/12 | 1171785 | macros/latex/contrib/tagpdf/tagpdf.pdf
-2024/04/12 | 1160 | macros/latex/contrib/tagpdf/ex-AF-file.tex
-2024/04/12 | 114764 | macros/latex-dev/required/l3kernel/l3news04.pdf
-2024/04/12 | 113735 | macros/latex-dev/required/l3kernel/l3str-convert.dtx
-2024/04/12 | 112536 | macros/latex-dev/required/l3kernel/l3news05.pdf
-2024/04/12 | 112260 | macros/latex-dev/required/l3kernel/l3color.dtx
-2024/04/12 | 11157 | macros/latex-dev/required/l3backend/CHANGELOG.md
-2024/04/12 | 111024 | macros/luatex/generic/luamplib/luamplib.dtx
-2024/04/12 | 107383 | macros/latex-dev/required/l3kernel/l3news09.tex
-2024/04/12 | 1063 | macros/latex/contrib/tagpdf/ex-list.tex
-2024/04/12 | 105275 | macros/latex-dev/required/l3kernel/l3prop.dtx
-2024/04/12 | 105022 | macros/latex-dev/required/l3kernel/l3fp-parse.dtx
-2024/04/12 | 100486 | macros/latex-dev/required/l3kernel/l3seq.dtx
diff --git a/biblio/ctan-bibdata/ctan.bib b/biblio/ctan-bibdata/ctan.bib
index 75e0aba733..8986909cf2 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 19-04-2024, 02:00:03
+%% created at 20-04-2024, 02:00:04
%%
%% This file is provided under the terms of the LPPL v1.3 or
@@ -20838,8 +20838,8 @@
title = {The \texttt{easybook} package},
subtitle = {Easily typesetting Chinese theses or books},
author = {Qu Yi},
- date = {2024-04-02},
- version = {2024ar},
+ date = {2024-04-19},
+ version = {2024as},
license = {lppl1.3c},
mirror = {https://mirror.ctan.org/macros/latex/contrib/easybook},
url = {https://ctan.org/pkg/easybook},
@@ -24662,8 +24662,8 @@
title = {The \texttt{FadingImage} package},
subtitle = {Add full width fading pictures at the top or bottom of a page},
author = {Mingyu Xia},
- date = {2024-03-17},
- version = {0.1d},
+ date = {2024-04-19},
+ version = {0.2a},
license = {lppl1.3c},
mirror = {https://mirror.ctan.org/macros/latex/contrib/fadingimage},
url = {https://ctan.org/pkg/fadingimage},
@@ -42550,8 +42550,8 @@
title = {The \texttt{luamplib} package},
subtitle = {Use LuaTeX’s built-in MetaPost interpreter},
author = {Hans Hagen and Taco Hoekwater and Élie Roux and Manuel Pégourié-Gonnard and Philipp Gesang and Dohyun Kim},
- date = {2024-04-12},
- version = {2.28.0},
+ date = {2024-04-19},
+ version = {2.28.1},
license = {gpl2},
mirror = {https://mirror.ctan.org/macros/luatex/generic/luamplib},
url = {https://ctan.org/pkg/luamplib},
@@ -49833,8 +49833,8 @@
title = {The \texttt{NoteBeamer} package},
subtitle = {A template for printing presentations on notepaper},
author = {Mingyu Xia},
- date = {2023-11-16},
- version = {2.3a},
+ date = {2024-04-19},
+ version = {3.0a},
license = {lppl1.3c},
mirror = {https://mirror.ctan.org/macros/latex/contrib/notebeamer},
url = {https://ctan.org/pkg/notebeamer},
@@ -55783,8 +55783,8 @@
title = {The \texttt{ProfCollege} package},
subtitle = {A \LaTeX{} package for French maths teachers in college},
author = {Christophe Poulain},
- date = {2024-03-24},
- version = {0.99-A-b},
+ date = {2024-04-19},
+ version = {0.99-A-c},
license = {lppl1.3c},
mirror = {https://mirror.ctan.org/macros/latex/contrib/profcollege},
url = {https://ctan.org/pkg/profcollege},
@@ -71208,8 +71208,8 @@
title = {The \texttt{TikZducks} package},
subtitle = {A little fun package for using rubber ducks in TikZ},
author = {{Unknown}},
- date = {2023-04-05},
- version = {1.6},
+ date = {2024-04-19},
+ version = {1.7},
license = {lppl1.3c},
mirror = {https://mirror.ctan.org/graphics/pgf/contrib/tikzducks},
url = {https://ctan.org/pkg/tikzducks},
@@ -74175,8 +74175,8 @@
title = {The \texttt{ufrgscca} package},
subtitle = {A bundle for undergraduate students final work/report (tcc) at UFRGS/EE},
author = {Alceu Frigeri},
- date = {2024-03-22},
- version = {2.8},
+ date = {2024-04-19},
+ version = {2.9},
license = {lppl1.3c,gpl},
mirror = {https://mirror.ctan.org/macros/latex/contrib/ufrgscca},
url = {https://ctan.org/pkg/ufrgscca},
diff --git a/graphics/pgf/contrib/tikzducks/t-tikzducks.mkiv b/graphics/pgf/contrib/tikzducks/t-tikzducks.mkiv
index 93b587b169..efaaab5c6e 100644
--- a/graphics/pgf/contrib/tikzducks/t-tikzducks.mkiv
+++ b/graphics/pgf/contrib/tikzducks/t-tikzducks.mkiv
@@ -14,7 +14,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% Code for this ConTeXt User Module kindly provided by @JairoAdelRio https://github.com/samcarter/tikzducks/pull/25
-\writestatus{loading}{ConTeXt User Module / TikZDucks 2023/04/05 version v1.6 Draw rubber ducks in TikZ}
+\writestatus{loading}{ConTeXt User Module / TikZDucks 2024/04/19 version v1.7 Draw rubber ducks in TikZ}
\setupcolors[state=start]
\usemodule[tikz]
diff --git a/graphics/pgf/contrib/tikzducks/tikzducks-doc-settings.sty b/graphics/pgf/contrib/tikzducks/tikzducks-doc-settings.sty
new file mode 100644
index 0000000000..710f370f0c
--- /dev/null
+++ b/graphics/pgf/contrib/tikzducks/tikzducks-doc-settings.sty
@@ -0,0 +1,183 @@
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Personal helper theme for package documentations
+% Copyright samcarter
+%
+% This file may be distributed and/or modified
+% under the LaTeX Project Public License 1.3c or later
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+% Usage:
+% ln ~/Life/latex/beamertheme-sam/themesam.sty package-doc-settings.sty
+% \usepackage[
+% themecolor=samdblue
+% ]{\jobname-settings}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Colours
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\RequirePackage{xcolor}
+\definecolor{samyellow}{RGB}{246,193,65}
+\definecolor{samorange}{RGB}{241,147,45}
+\definecolor{samred}{RGB}{191,26,46}% TikZbricks
+\definecolor{sammagenta}{RGB}{170,42,104}% TikZmarmots
+\definecolor{samviolet}{RGB}{136,46,114}% TikZlings
+\definecolor{samlila}{RGB}{101,67,159}% Rainbow beamer theme
+\definecolor{samdblue}{RGB}{0,51,134}% beamer theme
+\definecolor{samlblue}{RGB}{22,89,155}% TikZducks
+\definecolor{samteal}{RGB}{25,143,157}% Tcolorbox beamer theme
+\definecolor{samlgreen}{RGB}{68,170,153}% Jigsaw
+\definecolor{samdgreen}{RGB}{78,178,125}
+\definecolor{samlgray}{RGB}{160,160,185}
+\definecolor{samdgray}{RGB}{60,60,85}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Package options
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\RequirePackage{xkeyval}
+\DeclareOptionX{themecolor}[samdblue]{\colorlet{themecolor}{#1}}
+\DeclareOptionX{listingcolor}[samlblue]{\colorlet{listingcolor}{#1}}
+\ExecuteOptionsX{themecolor,listingcolor}
+\ProcessOptionsX
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Packages
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\@ifclassloaded{beamer}{}{%
+ \RequirePackage[english]{babel}
+ \RequirePackage[paper=a4paper,margin=2.9cm]{geometry}
+ \RequirePackage{scrlayer-scrpage}
+ \let\hrulefillx\hrulefill
+ \RequirePackage[bitstream-charter]{mathdesign}
+ \let\hrulefill\hrulefillx
+ \RequirePackage[hang,flushmargin,bottom]{footmisc}
+ \RequirePackage[colorlinks=true,breaklinks=true,allcolors=themecolor]{hyperref}
+}
+\RequirePackage[T1]{fontenc}
+\RequirePackage{xspace}
+\RequirePackage{inconsolata}% mono font with bold, but italic is missing
+% \RequirePackage[scale=0.85]{cascadia-code}
+% \AddToHook{cmd/ttfamily/before}{\fontseries{sl}}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Listings
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\RequirePackage[
+ cachedir=./build/
+]{minted}
+
+% smuggling custom pygmentize style in cache folder
+% (a real pygmentise style would need installtion in some python folder)
+\begin{filecontents*}[noheader]{./build/sam.pygstyle}
+\makeatletter
+\def\PYG@reset{\let\PYG@it=\relax \let\PYG@bf=\relax%
+ \let\PYG@ul=\relax \let\PYG@tc=\relax%
+ \let\PYG@bc=\relax \let\PYG@ff=\relax}
+\def\PYG@tok#1{\csname PYG@tok@#1\endcsname}
+\def\PYG@toks#1+{\ifx\relax#1\empty\else%
+ \PYG@tok{#1}\expandafter\PYG@toks\fi}
+\def\PYG@do#1{\PYG@bc{\PYG@tc{\PYG@ul{%
+ \PYG@it{\PYG@bf{\PYG@ff{#1}}}}}}}
+\def\PYG#1#2{\PYG@reset\PYG@toks#1+\relax+\PYG@do{#2}}
+
+% optional arguments
+\expandafter\def\csname PYG@tok@na\endcsname{\def\PYG@tc##1{\textcolor{black}{##1}}}
+
+% macros
+\expandafter\def\csname PYG@tok@k\endcsname{\def\PYG@tc##1{\textcolor{listingcolor}{\bfseries ##1}}}
+% curly brakets
+\expandafter\def\csname PYG@tok@nb\endcsname{\def\PYG@tc##1{\textcolor{listingcolor}{\bfseries ##1}}}
+
+% comments (italics won't work with the inconsolata font)
+\expandafter\def\csname PYG@tok@c\endcsname{\def\PYG@tc##1{\textcolor{gray}{##1}}}
+
+\def\PYGZbs{\char`\\}
+\def\PYGZus{\char`\_}
+\def\PYGZob{\char`\{}
+\def\PYGZcb{\char`\}}
+\def\PYGZca{\char`\^}
+\def\PYGZam{\char`\&}
+\def\PYGZlt{\char`\<}
+\def\PYGZgt{\char`\>}
+\def\PYGZsh{\char`\#}
+\def\PYGZpc{\char`\%}
+\def\PYGZdl{\char`\$}
+\def\PYGZhy{\char`\-}
+\def\PYGZsq{\char`\'}
+\def\PYGZdq{\char`\"}
+\def\PYGZti{\char`\~}
+% for compatibility with earlier versions
+\def\PYGZat{@}
+\def\PYGZlb{[}
+\def\PYGZrb{]}
+\makeatother
+\end{filecontents*}
+
+\usemintedstyle{sam}
+\setminted{
+ breaksymbolleft={},
+ tabsize=2,
+ breaklines=true,
+}
+\newminted[samcode]{latex}{}
+\newmintinline[saminline]{latex}{}
+
+% use non-bold and all coloured for inline code in articles
+\ifdefined\insertaspectratio\else
+ \patchcmd{\minted@inputpyg@inline}{\minted@input}{\color{listingcolor}\renewcommand\textcolor[3][]{##3}\renewcommand\bfseries{}\minted@input}{}{}
+\fi
+
+\RequirePackage[most]{tcolorbox}
+\tcbuselibrary{minted}
+\tcbset{%
+ colframe=themecolor,
+ arc=2mm,
+ fonttitle=\bfseries,
+ sidebyside,
+ center lower,
+ righthand width=5.7cm,
+ bottom=2pt,
+ top=2pt,
+ sidebyside gap=10pt,
+ lower separated=false,
+ listing engine=minted,
+ minted language=latex,
+ colback=themecolor!10
+}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% document settings
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\@ifclassloaded{scrartcl}{%
+ \KOMAoptions{parskip=half}
+ \addtokomafont{sectioning}{\color{themecolor}}
+ \addtokomafont{date}{\normalsize}
+ \addtokomafont{author}{\normalsize}
+ \setlength{\footnotemargin}{0.7em}
+}{}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Custom macros
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\providecommand*{\CTAN}{\textsc{CTAN}\xspace}
+\providecommand*{\TikZ}{Ti\emph{k}Z\xspace}
+\providecommand*{\miktex}{MiK\TeX\xspace}
+\providecommand*{\texlive}{\TeX{}Live\xspace}
+\providecommand*{\tikzbrick}{Ti\emph{k}Zbrick\xspace}
+\providecommand*{\tikzducks}{Ti\emph{k}Zducks\xspace}
+\providecommand*{\tikzlings}{Ti\emph{k}Zlings\xspace}
+\providecommand*{\tikzmarmots}{Ti\emph{k}Zmarmots\xspace}
+\providecommand*{\ConTeXt}{C\kern-.0333emon\-\kern-.0667em\TeX\kern-.0333emt} \ No newline at end of file
diff --git a/graphics/pgf/contrib/tikzducks/tikzducks-doc.pdf b/graphics/pgf/contrib/tikzducks/tikzducks-doc.pdf
index c294bfd56f..c46d0fc44b 100644
--- a/graphics/pgf/contrib/tikzducks/tikzducks-doc.pdf
+++ b/graphics/pgf/contrib/tikzducks/tikzducks-doc.pdf
Binary files differ
diff --git a/graphics/pgf/contrib/tikzducks/tikzducks-doc.tex b/graphics/pgf/contrib/tikzducks/tikzducks-doc.tex
index 0caac48b15..39532183aa 100644
--- a/graphics/pgf/contrib/tikzducks/tikzducks-doc.tex
+++ b/graphics/pgf/contrib/tikzducks/tikzducks-doc.tex
@@ -11,113 +11,56 @@
% See http://www.latex-project.org/lppl.txt
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\documentclass[parskip=half]{scrartcl}
+% !TeX program = txs:///arara
+% arara: latexmk: {
+% arara: --> engine: pdflatex,
+% arara: --> options: [
+% arara: --> '-shell-escape',
+% arara: --> '-synctex=1',
+% arara: --> '-interaction=nonstopmode',
+% arara: --> ]
+% arara: --> }
+\documentclass{scrartcl}
+
+% meta %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\title{The \texorpdfstring{\tikzducks}{tikzducks} package}
+\subtitle{using ducks in \TikZ}
+\author{%
+ \texorpdfstring{
+ \begin{tikzpicture}
+ \duck
+ \end{tikzpicture}\\[0.8em]
+ \texttt{samcarter}\\
+ \url{https://github.com/samcarter/tikzducks}\\
+ \url{https://www.ctan.org/pkg/tikzducks}
+ }{samcarter}}
+\date{Version v1.7 \textendash{} 2024/04/19}
+
+\usepackage[
+ themecolor=samlblue
+]{\jobname-settings}
+
+\colorlet{blue}{samlblue}
+\colorlet{red}{samred}
% packages %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\usepackage[T1]{fontenc}
-\usepackage[utf8]{inputenc}
-\usepackage[english]{babel}
-\usepackage[bitstream-charter]{mathdesign}
\usepackage{tikzducks}
\usetikzlibrary{ducks,3d}
-\usepackage[most]{tcolorbox}
-\usepackage[paper=a4paper,margin=3cm,foot=2cm]{geometry}
-\usepackage{url}
-\usepackage{xspace}
-\usepackage{scrlayer-scrpage}
\usepackage{marvosym}
\usepackage{fontawesome}
-\usepackage[hang,flushmargin,bottom]{footmisc}
-\usepackage{imakeidx}
-\usepackage[colorlinks=true,breaklinks=true,urlcolor=duckblue,linkcolor=duckblue,citecolor=duckblue,filecolor=duckblue]{hyperref}
-
-% macros %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\newcommand{\CTAN}{\textsc{CTAN}\xspace}
-\newcommand{\TikZ}{Ti\emph{k}Z\xspace}
-\newcommand{\tikzducks}{Ti\emph{k}Zducks\xspace}
-\newcommand{\miktex}{MiK\TeX\xspace}
-\newcommand{\texlive}{\TeX{}Live\xspace}
-\newcommand{\ConTeXt}{C\kern-.0333emon\-\kern-.0667em\TeX\kern-.0333emt}
% customisation %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\definecolor{duckblue}{RGB}{0,70,140}
-\addtokomafont{sectioning}{\color{duckblue}}
-\addtokomafont{date}{\normalsize}
-\addtokomafont{author}{\normalsize}
-\setlength{\footnotemargin}{0.7em}
-
-\lstdefinestyle{duckstyle}{%
- language={[latex]TeX},
- tabsize=2,
- breaklines,
- basicstyle=\footnotesize\ttfamily,
- commentstyle={\color{green!50!black}\slshape},
- columns=fullflexible,
- emphstyle=\color{orange!70!black},
- emph=[1]{water,body,head,eye,pupil,bill,grumpy,tshirt,jacket,tie,cape,shorthair,longhair,crazyhair,recedinghair,eyebrow,beard,glasses,sunglasses,alien,hat,cap,santa,chef,cheese,graduate,tassel,beret,crown,unicorn,icecream,flavoura,flavourb,flavourc,book,bookcolour,signpost,signcolour,signback,magichat,magicstars,magicwand,witch,cricket,rollingpin,lightsaber,torch,cake,pizza,hockey,baguette,wing,football,mask,bunny,inear,necklace,milkshake,wine,peakedcap,prison,tophat,speech,bubblecolour,think,buttons,sheep,squareglasses,tail,basket,easter,egga,eggb,eggc,mohican,mullet,horsetail,darthvader,crozier,queencrown,kingcrown,wing,laughing,parrot,stethoscope,niuqelrah,harlequin,neckerchief,woggle,snowduck,invisible,strawhat,ribbon,vampire,parting,crystalball,helmet,shovel,pickaxe,bowtie,lapel,umbrella,umbrellaclosed,handbag,cocktail,viking,devil,aodai,conicalhat,overleaf,sailor,bobblehat,scarf,strawbroom, strawbroomstick, strawbroomribbon, broom, broomstick},
- texcsstyle=*\color{duckblue}\bfseries,
- keywordstyle=\color{red!60!black}\bfseries,
- morekeywords={tikzpicture,picture,scope,patterns,calc,pgfinterruptboundingbox},
- moretexcs={duck,picduck,path,definecolor,duckpathjacket,duckpathbody,duckpathgrumpybill,duckpathbill,duckpathtshirt,duckpathcape,duckpathshorthair,duckpathlonghair,duckpathcrazyhair,duckpathrecedinghair,duckpathcrown,scalebox,foreach,node,draw,PassOptionsToPackage,usetikzlibrary,selectcolormodel,colorlet,insignia,stripes,color,includegraphics,mcap,setboardfontcolors,setboardfontencoding,WhiteQueenOnWhite,WhiteKingOnWhite,superstripes,shuffleducks,randuck,randomhead,randomaccessories,duckpathmohican,duckpathmullet,duckpathqueencrown,duckpathkingcrown,duckpathdarthvader,duckpathhorsetail,tikzset,duckpathwing,shade,duckhookbackground,duckhookbody,duckhookclothing,duckhookhair,duckhookhat,duckhookforeground},
- delim ={[s][\ttfamily\color{green!50!black}]{$}{$}},
- moredelim=[is][\footnotesize\ttfamily\color{orange!70!black}]{|}{|},
- index=[1][emph]
-}
-
-\tcbset{%
- colframe=duckblue,
- arc=2mm,
- fonttitle=\bfseries,
- sidebyside,
- listing options={style=duckstyle},
- center lower,
- righthand width=6.5cm,
- bottom=0pt,
- top=0pt,
- before lower={%
- \setlength{\parskip}{0.5cm}%
- \spaceskip=5\fontdimen2\font%
- },
-}
-
-\lstset{style=duckstyle}
-\pgfkeys{/duck/|stripes|/.style={stripes={#1}}}
-
\pgfmathsetseed{2}
\setlength{\footheight}{41pt}
\newlength{\duckoffset}
\cfoot{%
- \tikzset{external/export=false}%
\shuffleducks
\begin{tikzpicture}[scale=0.5]
\duck[signpost=\scalebox{0.6}{\thepage},\randomhead]
\end{tikzpicture}
}
\pagestyle{scrheadings}
-\indexsetup{firstpagestyle=scrheadings}
-\makeindex[columns=3]
-
-\usetikzlibrary{external}
-\ifnum\pdfshellescape=1
- \tikzexternalize[prefix=./tikzducks-doc-figures/]
-\fi
-
-% meta %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\title{The \texorpdfstring{\tikzducks}{tikzducks} package}
-\subtitle{using ducks in \TikZ}
-\author{%
- \texorpdfstring{\texttt{samcarter} (alias
- \tikzset{external/export=false}%
- \begin{tikzpicture}[scale=0.3,baseline=3pt]
- \duck[body=yellow!50!brown!50!white,
- longhair=red!50!brown,
- jacket=blue!50!black]
- \end{tikzpicture})\\[0.8em]
- \url{https://github.com/samcarter/tikzducks}\\
- \url{https://www.ctan.org/pkg/tikzducks}
- }{samcarter}}
-\date{Version v1.6 \textendash{} 2023/04/05}
\begin{document}
\maketitle
@@ -146,7 +89,7 @@ Ulrike Fischer for her useful \TikZ advices and contributions to the package and
Many other users contributed to this package (in random order):
%
-Enrico Gregorio helped to implement the \lstinline|\tikzset{}| interface which makes it much easier to adjust the properties of the ducks to fit the user needs,
+Enrico Gregorio helped to implement the \saminline|\tikzset{}| interface which makes it much easier to adjust the properties of the ducks to fit the user needs,
%
Andrew Stacey contributed the \TikZ Library ``ducks'',
%
@@ -154,7 +97,7 @@ Symbol~1 solved a few problems with default key values,
%
Mihikma created the duck's beard,
%
-Yudai Nakata helped with problems of \lstinline|\pdfrandomseed|,
+Yudai Nakata helped with problems of \saminline|\pdfrandomseed|,
%
@marmot for his seemingly infinite knowledge of \TikZ which he shared with the world,
%
@@ -162,18 +105,8 @@ Yudai Nakata helped with problems of \lstinline|\pdfrandomseed|,
%
and last but not least my thanks go to Martin Schr\"oder for his feedback to the code review.
-\pagebreak
The ducks mostly consist of basic geometric shapes drawn in \TikZ. Some of the more complex shapes (e.g.\ the different hair styles) are first drawn in \texttt{inkscape} (\url{https://inkscape.org}) and then exported to \TikZ paths using the \texttt{svg2tikz} extension (\url{https://github.com/xyz2tex/svg2tikz}).
-\subsection{Dependencies}
-
-The \tikzducks package loads \lstinline|expl3| and \TikZ, which in turn loads the \lstinline|xcolor| package (amongst others). If you require one of these packages to be loaded with some option, please consider loading it yourself before the \tikzducks package or use, e.g.
-
-\begin{lstlisting}[morekeywords={xcolor,svgnames}]
- \PassOptionsToPackage{svgnames}{xcolor}
-\end{lstlisting}
-It also uses the \lstinline|\usetikzlibrary{patterns}| and \lstinline|\usetikzlibrary{calc}|.
-
\subsection{License}
Copyright \raisebox{0.2em}{\tiny\fontfamily{cmr}\selectfont\textcopyright}
@@ -190,7 +123,7 @@ The basic usage is fairly simple, to draw a duck:
\end{tikzpicture}
\end{tcblisting}
-To customise this basic duck, the package uses \lstinline|pgf| keys. For almost all parts the colour can be changed using \lstinline|<shape name>=<colour name>|. For example to change the colour of the duck:
+To customise this basic duck, the package uses \saminline|pgf| keys. For almost all parts the colour can be changed using \saminline|<shape name>=<colour name>|. For example to change the colour of the duck:
\begin{tcblisting}{title={Blue duck}}
\begin{tikzpicture}
\duck[body=blue]
@@ -199,23 +132,22 @@ To customise this basic duck, the package uses \lstinline|pgf| keys. For almost
If the keyword consists of multiples words, it works both with and without spaces. In the following usually the version without spaces is given.
-\clearpage
-In addition to the keys defined in this package, all usual \TikZ and \lstinline|pgf| keys can also be used. For example if the size of the ducks should be changed or shifted:
+In addition to the keys defined in this package, all usual \TikZ and \saminline|pgf| keys can also be used. For example if the size of the ducks should be changed or shifted:
\begin{tcblisting}{title={Scaled duck and \emph{The Ugly Duckling}}, righthand width=3cm}
\begin{tikzpicture}[scale=0.6]
\duck
\duck[xshift=90pt, scale=.3, yshift=150pt]
\duck[xshift=60pt, scale=.3, yshift=100pt]
- \duck[body=gray!50!white,head=gray!50!white,
- xshift=80pt, scale=.3, yshift=50pt]
+ \duck[body=gray!50!white, head=gray!50!white,
+ xshift=80pt, scale=.3, yshift=50pt]
\end{tikzpicture}
\end{tcblisting}
-To make the usage easier for the \TikZ-savvy users, Andrew Stacey contributed a \TikZ library. It can be loaded with \lstinline|\usetikzlibrary{ducks}|. In addition to the normal functionality of the \tikzducks package, the ducks are now also available as \lstinline|pic|. A short example:
+To make the usage easier for the \TikZ-savvy users, Andrew Stacey contributed a \TikZ library. It can be loaded with \saminline|\usetikzlibrary{ducks}|. In addition to the normal functionality of the \tikzducks package, the ducks are now also available as \saminline|pic|. A short example:
\begin{tcolorbox}[title={\TikZ library ``ducks''}]
-\begin{lstlisting}[morekeywords={ducks,duck,standalone,tikz,document}]
+\begin{samcode}
\documentclass{standalone}
\usepackage{tikz}
@@ -225,7 +157,7 @@ To make the usage easier for the \TikZ-savvy users, Andrew Stacey contributed a
\begin{tikzpicture}
\draw (0,0) pic[
- duck/water=green,
+ duck/water=blue,
duck/alien,
] {duck};
\draw (4,0) pic[
@@ -234,13 +166,13 @@ To make the usage easier for the \TikZ-savvy users, Andrew Stacey contributed a
\end{tikzpicture}
\end{document}
-\end{lstlisting}
+\end{samcode}
\tcblower
\begin{tikzpicture}
\draw (0,0) pic[
- duck/water=green,
- duck/alien,
+ duck/water=blue,
+ duck/alien=samdgreen,
] {duck};
\draw (2,1) pic[
scale=1.4,
@@ -272,7 +204,7 @@ For the \TeX{} purists, there is also a picture mode variant:
And thanks to @JairoAdelRio there is even a \ConTeXt{} User Module available. Some of the colours might look different and not being a \ConTeXt{} user myself, I can't guarantee maintenance of this module.
\begin{tcolorbox}[title={\ConTeXt{} User Module}]
-\begin{lstlisting}[morekeywords={usemodule,usecolors,starttext,stoptext,starttikzpicture,stoptikzpicture}]
+\begin{samcode}
\usemodule[tikzducks]
\usecolors[xwi]
\starttext
@@ -282,18 +214,18 @@ And thanks to @JairoAdelRio there is even a \ConTeXt{} User Module available. So
\stoptikzpicture
\stoptext
-\end{lstlisting}
+\end{samcode}
\tcblower
\begin{tikzpicture}
-\duck[tophat,bowtie]
+ \duck[tophat,bowtie]
\end{tikzpicture}
\end{tcolorbox}
For those who prefer to work with pdf\TeX:
\begin{tcolorbox}[title={pdfTeX}]
-\begin{lstlisting}[morekeywords={endtikzpicture,bye,input}]
+\begin{samcode}
\input tikzducks-plain.tex
\tikzpicture
@@ -301,28 +233,28 @@ For those who prefer to work with pdf\TeX:
\endtikzpicture
\bye
-\end{lstlisting}
+\end{samcode}
\tcblower
\begin{tikzpicture}
-\duck[bobblehat,cheese]
+ \duck[bobblehat,cheese]
\end{tikzpicture}
\end{tcolorbox}
\subsection{Body parts}
-The various parts of the duck can also be coloured independently, i.e.\ \lstinline|body|, \lstinline|head| or \lstinline|bill|:
+The various parts of the duck can also be coloured independently, i.e.\ \saminline|body|, \saminline|head| or \saminline|bill|:
\begin{tcblisting}{title={Harlequin duck}}
\begin{tikzpicture}
\duck[body=yellow,
- head=yellow!50!orange,
- bill=red,
- eye=green]
+ head=yellow!50!orange,
+ bill=red,
+ eye=green]
\end{tikzpicture}
\end{tcblisting}
-Furthermore using the keywords \lstinline|grumpy|, \lstinline|laughing| or \lstinline|parrot| the shape of the bill can be changed:
+Furthermore using the keywords \saminline|grumpy|, \saminline|laughing| or \saminline|parrot| the shape of the bill can be changed:
\begin{tcblisting}{title={Grumpy duck}}
\begin{tikzpicture}
@@ -405,7 +337,7 @@ And of course the colour of each hair style can be adjusted:
\end{tikzpicture}
\end{tcblisting}
-Eyebrows and a beard are also part of the package. The colour choice is more tricky for them -- if a colour is explicitly specified (\lstinline|eyebrow=<colour name>| or \lstinline|beard=<colour name>|) this colour is of course used, but if no colour is given, it first falls back to the hair colour and only if the duck does not have any hairs, the default colour is applied.
+Eyebrows and a beard are also part of the package. The colour choice is more tricky for them -- if a colour is explicitly specified (\saminline|eyebrow=<colour name>| or \saminline|beard=<colour name>|) this colour is of course used, but if no colour is given, it first falls back to the hair colour and only if the duck does not have any hairs, the default colour is applied.
\begin{tcblisting}{title={Eye brow duck}}
\begin{tikzpicture}
@@ -431,7 +363,7 @@ Eyebrows and a beard are also part of the package. The colour choice is more tri
\end{tcblisting}
\footnotetext[\thefootnote]{The beard is based on an answer by Mihikma, see \url{https://tex.stackexchange.com/a/401777/36296}}
-Please note that not all of the accessories, especially hats, shown in the following sections, will suite every hairstyle. In case the desired combination of hair style and hat does not work well, there is always the possibility to look up the original definition of the hat in the \lstinline|tikzducks| source code and recreate it with a more suitable position or size.
+Please note that not all of the accessories, especially hats, shown in the following sections, will suite every hairstyle. In case the desired combination of hair style and hat does not work well, there is always the possibility to look up the original definition of the hat in the \saminline|tikzducks| source code and recreate it with a more suitable position or size.
\subsection{Clothing}
@@ -452,24 +384,23 @@ A respectable duck needs a suitable wardrobe. It can choose from several differe
\begin{tcblisting}{title={Tie duck}}
\begin{tikzpicture}
\duck[tshirt,
- jacket=gray,
- tie]
+ jacket=gray,
+ tie]
\end{tikzpicture}
\end{tcblisting}
\begin{tcblisting}{title={Bowtie duck}}
\begin{tikzpicture}
\duck[tshirt,
- jacket=gray,
- bowtie]
+ jacket=gray,
+ bowtie]
\end{tikzpicture}
\end{tcblisting}
\begin{tcblisting}{title={Ão dài duck}}
\begin{tikzpicture}
\duck[tshirt=cyan,
- aodai=blue!50!black
- ]
+ aodai=blue!65!black]
\end{tikzpicture}
\end{tcblisting}
@@ -512,7 +443,8 @@ There is a multitude of things a duck might need. The following examples all als
\begin{tcblisting}{title={Strawhat duck}}
\begin{tikzpicture}
- \duck[strawhat=brown!50!white, ribbon=gray]
+ \duck[strawhat=brown!50!white,
+ ribbon=gray]
\end{tikzpicture}
\end{tcblisting}
@@ -537,7 +469,8 @@ There is a multitude of things a duck might need. The following examples all als
\begin{tcblisting}{title={Graduate duck}}
\begin{tikzpicture}
- \duck[graduate=gray!20!black,tassel=red!70!black]
+ \duck[graduate=gray!20!black,
+ tassel=red!70!black]
\end{tikzpicture}
\end{tcblisting}
@@ -556,7 +489,7 @@ There is a multitude of things a duck might need. The following examples all als
\begin{tcblisting}{title={Harlequin duck}}
\begin{tikzpicture}
\duck[harlequin=blue,
- niuqelrah=red]
+ niuqelrah=red]
\end{tikzpicture}
\end{tcblisting}
@@ -574,15 +507,15 @@ There is a multitude of things a duck might need. The following examples all als
\begin{tcblisting}{title={Crown duck}}
\begin{tikzpicture}
-\duck[body=black!75!white,
- crown=yellow!70!brown]
+ \duck[body=black!75!white,
+ crown=yellow!70!brown]
\end{tikzpicture}
\begin{tikzpicture}
-\duck[queencrown=gray]
+ \duck[queencrown=gray]
\end{tikzpicture}
\begin{tikzpicture}
-\duck[kingcrown=brown!70!red]
+ \duck[kingcrown=brown!70!red]
\end{tikzpicture}
\end{tcblisting}
@@ -607,18 +540,20 @@ There is a multitude of things a duck might need. The following examples all als
\begin{tcblisting}{title={Unicorn duck}}
\begin{tikzpicture}
\duck[body=pink,
- unicorn=magenta!60!violet,
- longhair=magenta!60!violet]
+ unicorn=magenta!60!violet,
+ longhair=magenta!60!violet]
\end{tikzpicture}
\end{tcblisting}
\addtocounter{footnote}{1}
\begin{tcblisting}{title={Bunny duck$^{\thefootnote}$}}
\begin{tikzpicture}
-\duck[body=white!80!brown, bill=white!60!brown, bunny]
+ \duck[body=white!80!brown,
+ bill=white!60!brown,
+ bunny]
\end{tikzpicture}
\begin{tikzpicture}
-\duck[bunny=red,inear=blue]
+ \duck[bunny=red,inear=blue]
\end{tikzpicture}
\end{tcblisting}
\footnotetext[\thefootnote]{Unless an explicit colour is specified, the bunny ears will take the body colour as default colour, the inner parts will be drawn in a lighter shade.}
@@ -626,7 +561,9 @@ There is a multitude of things a duck might need. The following examples all als
\addtocounter{footnote}{1}
\begin{tcblisting}{title={Sheep duck$^{\thefootnote}$}}
\begin{tikzpicture}
-\duck[body=white!80!brown, bill=white!60!brown, sheep]
+ \duck[body=white!80!brown,
+ bill=white!60!brown,
+ sheep]
\end{tikzpicture}
\end{tcblisting}
\footnotetext[\thefootnote]{The in-ear colour of the sheep chosen to be the same as the bill}
@@ -634,7 +571,9 @@ There is a multitude of things a duck might need. The following examples all als
\addtocounter{footnote}{1}
\begin{tcblisting}{title={Horse duck$^{\thefootnote}$}}
\begin{tikzpicture}
-\duck[body=brown!80!white, longhair=brown!50!black, horsetail]
+ \duck[body=brown!80!white,
+ longhair=brown!50!black,
+ horsetail]
\end{tikzpicture}
\end{tcblisting}
\footnotetext[\thefootnote]{If no colour is specified, the horse tail will have the same colour as the hair}
@@ -682,27 +621,30 @@ There is a multitude of things a duck might need. The following examples all als
\begin{tcblisting}{title={Signpost duck}}
\begin{tikzpicture}
- \duck[signpost=42]
+ \duck[signpost=42]
\end{tikzpicture}
\begin{tikzpicture}
-\duck[signpost=\scalebox{0.4}{
- \parbox{2cm}{\color{black}
- \centering Science\\ first}},
- signcolour=brown!70!gray,
- signback=white!80!brown]
+ \duck[signpost=\scalebox{0.4}{
+ \parbox{2cm}{\color{black}
+ \centering Science\\ first}},
+ signcolour=brown!70!gray,
+ signback=white!80!brown]
\end{tikzpicture}
\end{tcblisting}
\addtocounter{footnote}{1}
\begin{tcblisting}{title={Speaking duck$^{\thefootnote}$}}
\begin{tikzpicture}
- \duck[speech={Bla},bubblecolour=cyan!20!white,laughing]
+ \duck[speech={Bla},
+ bubblecolour=cyan!20!white,
+ laughing]
\end{tikzpicture}
\end{tcblisting}
\begin{tcblisting}{title={Thinking duck$^{\thefootnote}$}}
\begin{tikzpicture}
- \duck[think={Blub},bubblecolour=white!95!yellow]
+ \duck[think={Blub},
+ bubblecolour=white!95!yellow]
\end{tikzpicture}
\end{tcblisting}
\footnotetext[\thefootnote]{Both the speech and thought bubble are inspired by the wonderful \href{https://www.ctan.org/pkg/ducksay}{ducksay package}}
@@ -720,7 +662,8 @@ There is a multitude of things a duck might need. The following examples all als
\begin{tcblisting}{title={Dinner jacket duck}}
\begin{tikzpicture}
- \duck[jacket=gray,lapel=black,buttons]
+ \duck[jacket=gray,
+ lapel=black,buttons]
\end{tikzpicture}
\end{tcblisting}
@@ -729,7 +672,8 @@ There is a multitude of things a duck might need. The following examples all als
\duck[book=\scalebox{0.5}{\TeX}]
\end{tikzpicture}
\begin{tikzpicture}
-\duck[book=\scalebox{0.6}{$\pi$}, bookcolour=blue!50!black]
+ \duck[book=\scalebox{0.6}{$\pi$},
+ bookcolour=blue!50!black]
\end{tikzpicture}
\end{tcblisting}
@@ -756,7 +700,8 @@ There is a multitude of things a duck might need. The following examples all als
\addtocounter{footnote}{1}
\begin{tcblisting}{title={Lightsaber duck$^{\thefootnote}$}}
\begin{tikzpicture}
- \duck[lightsaber=red,darthvader=black!30!gray]
+ \duck[lightsaber=red,
+ darthvader=black!30!gray]
\end{tikzpicture}
\end{tcblisting}
\footnotetext[\thefootnote]{Dedicated to the Counter Wizard (aka Christian Hupfer)}
@@ -801,7 +746,7 @@ There is a multitude of things a duck might need. The following examples all als
\begin{tcblisting}{title={Chef duck$^{\thefootnote}$}}
\begin{tikzpicture}
\duck[chef=white!95!yellow,
- rollingpin=brown!80!black]
+ rollingpin=brown!80!black]
\end{tikzpicture}
\end{tcblisting}
\footnotetext[\thefootnote]{The chef duck is based on an idea by Carla Maggi, please see the following link for a more sophisticated version of the toque and the rolling pin: \url{https://tex.stackexchange.com/a/387126/36296}}
@@ -850,12 +795,20 @@ There is a multitude of things a duck might need. The following examples all als
\end{tikzpicture}
\end{tcblisting}
-\begin{tcblisting}{title={Wing duck}}
+\addtocounter{footnote}{1}
+\begin{tcblisting}{title={Banana duck$^{\thefootnote}$}}
\begin{tikzpicture}
- \duck[wing=yellow!90!brown]
+ \duck[banana=yellow!80!orange]
\end{tikzpicture}
\end{tcblisting}
+\begin{tcblisting}{title={Stick duck$^{\thefootnote}$}}
+\begin{tikzpicture}
+ \duck[stick=red!60!green,leaf=green!70!red]
+\end{tikzpicture}
+\end{tcblisting}
+\footnotetext[\thefootnote]{The banana and the stick were kindly contributed by @NuzzleTOO}
+
\addtocounter{footnote}{1}
\begin{tcblisting}{title={Basket duck$^{\thefootnote}$}}
\begin{tikzpicture}
@@ -868,12 +821,18 @@ There is a multitude of things a duck might need. The following examples all als
\duck[bunny,easter]
\end{tikzpicture}
\begin{tikzpicture}
- \duck[bunny,easter=brown,
- egga=cyan,eggb=orange,eggc=teal]
+ \duck[bunny,easter=brown,egga=cyan,
+ eggb=orange,eggc=teal]
\end{tikzpicture}
\end{tcblisting}
\footnotetext[\thefootnote]{The basket and Easter basket was kindly contributed by Benito van der Zander}
+\begin{tcblisting}{title={Wing duck}}
+\begin{tikzpicture}
+ \duck[wing=yellow!90!brown]
+\end{tikzpicture}
+\end{tcblisting}
+
\begin{tcblisting}{title={Ducktor}}
\begin{tikzpicture}
\duck[stethoscope=gray!80!black]
@@ -883,14 +842,14 @@ There is a multitude of things a duck might need. The following examples all als
\begin{tcblisting}{title={Neckerchief duck}}
\begin{tikzpicture}
\duck[neckerchief=red!70!black,
- woggle=blue!60!black]
+ woggle=blue!60!black]
\end{tikzpicture}
\end{tcblisting}
\begin{tcblisting}{title={Winter duck}}
\begin{tikzpicture}
\duck[bobblehat=red!70!black,
- scarf=red!70!black]
+ scarf=red!70!black]
\end{tikzpicture}
\end{tcblisting}
@@ -930,17 +889,13 @@ There is a multitude of things a duck might need. The following examples all als
\begin{tcblisting}{title={Sweeping Duck}}
\begin{tikzpicture}
- \duck[
- strawbroom=brown!50!white,
- strawbroomstick=brown,
- strawbroomribbon=red!50!black
- ]
+ \duck[strawbroom=brown!50!white,
+ strawbroomstick=brown,
+ strawbroomribbon=red!50!black]
\end{tikzpicture}
\begin{tikzpicture}
- \duck[
- broom=brown,
- broomstick=gray!50!black
- ]
+ \duck[broom=brown,
+ broomstick=gray!50!black]
\end{tikzpicture}
\end{tcblisting}
@@ -953,12 +908,6 @@ There is a multitude of things a duck might need. The following examples all als
\end{tikzpicture}
\end{tcblisting}
-\begin{tcblisting}{title={Handbag Duck}}
-\begin{tikzpicture}
- \duck[handbag=red!70!black]
-\end{tikzpicture}
-\end{tcblisting}
-
\addtocounter{footnote}{1}
\begin{tcblisting}{title={Overleaf Duck$^{\thefootnote}$}}
\begin{tikzpicture}
@@ -967,9 +916,14 @@ There is a multitude of things a duck might need. The following examples all als
\end{tcblisting}
\footnotetext[\thefootnote]{added to celebrate that \tikzducks are now also available on overleaf, see \url{https://www.overleaf.com/blog/tex-live-upgrade-september-2019}}
-\clearpage
+\begin{tcblisting}{title={Handbag Duck}}
+\begin{tikzpicture}
+ \duck[handbag=red!70!black]
+\end{tikzpicture}
+\end{tcblisting}
+
\section{Random ducks}
-With all these available accessories it might be hard to decide which one to choose, but don't worry the \tikzducks provide a solution for this dilemma, the random duck, or short \lstinline|\randuck|, which automatically creates a duck with a randomly chosen accessories and something on top of the head (hair, a hat, ears, alien antenna ...)
+With all these available accessories it might be hard to decide which one to choose, but don't worry the \tikzducks provide a solution for this dilemma, the random duck, or short \saminline|\randuck|, which automatically creates a duck with a randomly chosen accessories and something on top of the head (hair, a hat, ears, alien antenna ...)
\begin{tcblisting}{title={Random duck}}
\begin{tikzpicture}
@@ -978,7 +932,7 @@ With all these available accessories it might be hard to decide which one to cho
\end{tikzpicture}
\end{tcblisting}
-In case the duck should not be completely random, but only some of the random elements are desired, these can be accessed independently by using \lstinline|\randomhead| and \lstinline|\randomaccessories| for a random headpiece and a random accessories, respectively. Small caveat: Before using \lstinline|\randomhead| or \lstinline|\randomaccessories|, \lstinline|\shuffleducks| has to be used to provide the random items (for \lstinline|\randuck| this is done automatically).
+In case the duck should not be completely random, but only some of the random elements are desired, these can be accessed independently by using \saminline|\randomhead| and \saminline|\randomaccessories| for a random headpiece and a random accessories, respectively. Small caveat: Before using \saminline|\randomhead| or \saminline|\randomaccessories|, \saminline|\shuffleducks| has to be used to provide the random items (for \saminline|\randuck| this is done automatically).
\begin{tcblisting}{title={Random head gear and accessories}}
\begin{tikzpicture}
@@ -989,7 +943,7 @@ In case the duck should not be completely random, but only some of the random el
\section{Further customisation}
-This package will never be able to do everything every potential user might want to do, as this number quickly approaches $\infty$ -- but as the ducks are simply things inside \lstinline|tikzpicture|s, all the heavy weapons of the \TikZ package are available for further customisation.
+This package will never be able to do everything every potential user might want to do, as this number quickly approaches $\infty$ -- but as the ducks are simply things inside \saminline|tikzpicture|s, all the heavy weapons of the \TikZ package are available for further customisation.
\begin{tcblisting}{title={Adding things to the duck}}
\begin{tikzpicture}
@@ -1010,20 +964,26 @@ For convenience the more complex paths of this package are stored in macros, whi
\begin{tcblisting}{title={Redraw parts}}
\begin{tikzpicture}
\duck
- \path[preaction={fill, red!50!black},pattern=fivepointed stars, pattern color=yellow]
- \duckpathlonghair;
+ \path[preaction={fill, red!50!black},
+ pattern=fivepointed stars,
+ pattern color=yellow]
+ \duckpathlonghair;
\end{tikzpicture}
\end{tcblisting}
In detail, the following paths are available:
-\begin{lstlisting}[aboveskip=1.2em,breakindent=0pt]
-\duckpathbody, \duckpathgrumpybill, \duckpathbill, \duckpathtshirt, \duckpathjacket,\duckpathcape, \duckpathshorthair, \duckpathlonghair, \duckpathcrazyhair, \duckpathrecedinghair, \duckpathcrown, \duckpathmohican, \duckpathmullet, \duckpathqueencrown, \duckpathkingcrown, \duckpathdarthvader, \duckpathhorsetail
-\end{lstlisting}
+\begin{samcode}
+\duckpathbody, \duckpathgrumpybill, \duckpathbill, \duckpathtshirt,
+\duckpathjacket,\duckpathcape, \duckpathshorthair, \duckpathlonghair,
+\duckpathcrazyhair, \duckpathrecedinghair, \duckpathcrown,
+\duckpathmohican, \duckpathmullet, \duckpathqueencrown,
+\duckpathkingcrown, \duckpathdarthvader, \duckpathhorsetail
+\end{samcode}
-In case one of the other shapes is needed, please have a look at the package source code, which can be found in \lstinline|tikzducks.sty|.
+In case one of the other shapes is needed, please have a look at the package source code, which can be found in \saminline|tikzducks.sty|.
-To ease the placement of further accessories, some particular spots of the duck are marked with \TikZ coordinates, namely the \lstinline|wing|, \lstinline|head|, \lstinline|bill| and \lstinline|tail|.
+To ease the placement of further accessories, some particular spots of the duck are marked with \TikZ coordinates, namely the \saminline|wing|, \saminline|head|, \saminline|bill| and \saminline|tail|.
{
\footnotesize\ttfamily
@@ -1042,25 +1002,25 @@ To ease the placement of further accessories, some particular spots of the duck
\end{tcblisting}
}
-To distinguish coordinates from multiple ducks in the same \lstinline|tikzpicture|, one can name the ducks using the option \lstinline[emph={name}]|name|. If this option is used, the coordinates are prefixed with the respective name and a dash: \lstinline|<name>-<coordinate>|.
+To distinguish coordinates from multiple ducks in the same \saminline|tikzpicture|, one can name the ducks using the option \saminline|name|. If this option is used, the coordinates are prefixed with the respective name and a dash: \saminline|<name>-<coordinate>|.
\begin{tcblisting}{title={Named coordinates},listing options={style={duckstyle}, emph={name,wing}}}
\begin{tikzpicture}
\duck[name=foo]
- \duck[name=bar,xshift=90pt,
- scale=.3,yshift=150pt]
+ \duck[name=bar,xshift=90pt,
+ scale=.3,yshift=150pt]
\draw (foo-wing) -- (bar-wing);
\end{tikzpicture}
\end{tcblisting}
-Sometimes it might desirable to add things at a specific z-position, for example re-draw a t-shirt with some pattern that should be below the duck's hair and accessories. To facilitate this the \tikzducks provide a couple of hooks: \lstinline|\duckhookbackground|, \lstinline|\duckhookbody|, \lstinline|\duckhookclothing|, \lstinline|\duckhookhair|, \lstinline|\duckhookhat| and \lstinline|\duckhookforeground|.
+Sometimes it might desirable to add things at a specific z-position, for example re-draw a t-shirt with some pattern that should be below the duck's hair and accessories. To facilitate this the \tikzducks provide a couple of hooks: \saminline|\duckhookbackground|, \saminline|\duckhookbody|, \saminline|\duckhookclothing|, \saminline|\duckhookhair|, \saminline|\duckhookhat| and \saminline|\duckhookforeground|.
\begin{center}
\footnotesize\ttfamily \textbackslash duckhook\dots
\begin{tikzpicture}
\newcommand{\planes}{\fill[gray!20!white,opacity=0.9] (-0.1,-0.1) rectangle (2.4,2.4);}
- \newcommand{\hooks}{\draw[duckblue, rounded corners=3pt, line width=1pt] (-0.1,-0.1) rectangle (2.4,2.4);}
+ \newcommand{\hooks}{\draw[themecolor, rounded corners=3pt, line width=1pt] (-0.1,-0.1) rectangle (2.4,2.4);}
\node[font=\footnotesize\ttfamily] at (-0.8,-1.4) {\strut background};
\begin{scope}[canvas is zy plane at x=0]
\hooks
@@ -1113,7 +1073,11 @@ These hooks can be defined by the user as needed:
\begin{tcblisting}{title={Hooks}}
\begin{tikzpicture}
\begingroup
- \newcommand{\duckhookclothing}{\path[pattern=fivepointed stars, pattern color=yellow] \duckpathjacket;}
+ \newcommand{\duckhookclothing}{
+ \path[pattern=fivepointed stars,
+ pattern color=yellow]
+ \duckpathjacket;
+ }
\duck[witch=black!50!gray,
longhair=red!80!black,
jacket=black!50!gray,
@@ -1129,7 +1093,7 @@ These hooks can be defined by the user as needed:
\tikzducks are huge sports fans! They do a lot of different sports themselves (see all the piece of sports equipment amongst the accessories), but to cheer their favourite teams, they need suitable fan clothing. In \href{https://tex.stackexchange.com/a/387126/36296}{The Duck Pond} Carla Maggi was so kind to contribute the necessary code to dress the ducks in their team's colours.
\addtocounter{footnote}{1}
-A (non-representative) survey$^{\thefootnote}$\footnotetext[\thefootnote]{see the selection of jerseys in \url{https://tex.stackexchange.com/a/387126/36296}} showed that most sports jerseys can be emulated by drawing stripes of various colours, sizes and orientations -- and this is exactly what the \lstinline|stripes| macro does, drawing stripes across the shape of the duck's jacket. In order to preserve the whole flexibility of this powerful macro, it was integrated as an independent command into the \tikzducks package, this means it can simply be used on top of a drawn duck:
+A (non-representative) survey$^{\thefootnote}$\footnotetext[\thefootnote]{see the selection of jerseys in \url{https://tex.stackexchange.com/a/387126/36296}} showed that most sports jerseys can be emulated by drawing stripes of various colours, sizes and orientations -- and this is exactly what the \saminline|stripes| macro does, drawing stripes across the shape of the duck's jacket. In order to preserve the whole flexibility of this powerful macro, it was integrated as an independent command into the \tikzducks package, this means it can simply be used on top of a drawn duck:
\begin{tcblisting}{title={\texttt{stripes} macro}}
\begin{tikzpicture}
@@ -1138,121 +1102,122 @@ A (non-representative) survey$^{\thefootnote}$\footnotetext[\thefootnote]{see th
\end{tikzpicture}
\end{tcblisting}
-This may be impractical as the stripes are drawn on top of any accessories or hair the duck may have. Therefore the option \lstinline|stripes| let's you inject any code you would normally use to draw the stripes at the correct layer above the duck's clothing but beneath the hair and accessories:
+This may be impractical as the stripes are drawn on top of any accessories or hair the duck may have. Therefore the option \saminline|stripes| let's you inject any code you would normally use to draw the stripes at the correct layer above the duck's clothing but beneath the hair and accessories:
\begin{tcblisting}{title={Using \texttt{stripes} for \texttt{tikzducks}}}
\begin{tikzpicture}
- \duck[longhair,|stripes|={\stripes}]
+ \duck[longhair,stripes={\stripes}]
\end{tikzpicture}
\end{tcblisting}
Not all teams wear vertically stripped jerseys, therefore many parameters can be adjusted to best emulate your favourite teams jerseys. The available options are:
\begin{tabular}{@{}ll@{}}
- \lstinline|color| & colour of the stripes, default:
- \lstinline|black| \\
- \lstinline|distance| & periodicity length of the stripes, default:
- \lstinline|0.3| \\
- \lstinline|width| & stripe width, default: \lstinline|0.15| \\
- \lstinline|height| & length of the stripes, default:
- \lstinline|2.7| \\
- \lstinline|initialx| & x coordinate of staring point, default:
- \lstinline|0.1| \\
- \lstinline|initialy| & y coordinate of staring point, default:
- \lstinline|-0.3| \\
- \lstinline|rotate| & rotation angle in degree, default:
- \lstinline|-10|\\
- \lstinline|emblem| & possibility to add logos etc., default: empty\\
+ \saminline|color| & colour of the stripes, default:
+ \saminline|black| \\
+ \saminline|distance| & periodicity length of the stripes, default:
+ \saminline|0.3| \\
+ \saminline|width| & stripe width, default: \saminline|0.15| \\
+ \saminline|height| & length of the stripes, default:
+ \saminline|2.7| \\
+ \saminline|initialx| & x coordinate of staring point, default:
+ \saminline|0.1| \\
+ \saminline|initialy| & y coordinate of staring point, default:
+ \saminline|-0.3| \\
+ \saminline|rotate| & rotation angle in degree, default:
+ \saminline|-10|\\
+ \saminline|emblem| & possibility to add logos etc., default: empty\\
\end{tabular}
-Please note that the colour of the stripes only affects the stripes themselves, to influence the colour of the empty space between the stripes, clothe the duck with a \lstinline|tshirt| or \lstinline|jacket| of the desired colour underneath the stripes.
+Please note that the colour of the stripes only affects the stripes themselves, to influence the colour of the empty space between the stripes, clothe the duck with a \saminline|tshirt| or \saminline|jacket| of the desired colour underneath the stripes.
\begin{tcblisting}{title={\texttt{stripes} options}}
\begin{tikzpicture}
\duck[stripes]
\end{tikzpicture}
\begin{tikzpicture}
- \duck[|stripes|={
- \stripes[color=blue]}]
+ \duck[stripes={\stripes[color=blue]}]
\end{tikzpicture}
\begin{tikzpicture}
-\duck[|stripes|={
- \stripes[distance=0.6]}]
+ \duck[stripes={\stripes[distance=0.6]}]
\end{tikzpicture}
\begin{tikzpicture}
-\duck[|stripes|={
- \stripes[width=0.03]}]
+ \duck[stripes={\stripes[width=0.03]}]
\end{tikzpicture}
\begin{tikzpicture}
-\duck[|stripes|={\stripes[emblem={\includegraphics[width=0.3cm]{example-image-a}}]}]
+\duck[stripes={\stripes[emblem={
+\includegraphics[width=.3cm]{example-image-a}
+}]}]
\end{tikzpicture}
\begin{tikzpicture}
-\duck[|stripes|={
- \stripes[height=1.0]}]
+ \duck[stripes={\stripes[height=1.0]}]
\end{tikzpicture}
\begin{tikzpicture}
-\duck[|stripes|={
- \stripes[initialx=1]}]
+ \duck[stripes={\stripes[initialx=1]}]
\end{tikzpicture}
\begin{tikzpicture}
-\duck[|stripes|={
- \stripes[initialy=0.8]}]
+ \duck[stripes={\stripes[initialy=0.8]}]
\end{tikzpicture}
\begin{tikzpicture}
-\duck[|stripes|={
- \stripes[rotate=45]}]
+ \duck[stripes={\stripes[rotate=45]}]
\end{tikzpicture}
\begin{tikzpicture}
-\duck[|stripes|={
- \stripes[rotate=-45]}]
+ \duck[stripes={\stripes[rotate=-45]}]
\end{tikzpicture}
\end{tcblisting}
For more complex or multicoloured designs the stripes can easily be stacked on top of each other:
\begin{tcblisting}{title={multicoloured \texttt{stripes}}}
\begin{tikzpicture}
-\duck[tshirt=red, |stripes|={
-\stripes[color=yellow, width=0.1]
-\stripes[color=orange, width=0.1, initialx=0.0]}]
+ \duck[tshirt=red, stripes={
+ \stripes[color=yellow, width=0.1]
+ \stripes[color=orange, width=0.1,
+ initialx=0.0]}]
\end{tikzpicture}
\end{tcblisting}
-\tcbset{righthand width=3cm}
-A few examples to see \lstinline|stripes| in action:
+A few examples to see \saminline|stripes| in action:
\begin{tcblisting}{title={Inter duck}}
\definecolor{blueinter}{RGB}{0,102,170}%
\begin{tikzpicture}
-\duck[tshirt=black,|stripes|={\stripes[color=blueinter]},football]
+ \duck[tshirt=black,
+ stripes={\stripes[color=blueinter]},
+ football]
\end{tikzpicture}
\end{tcblisting}
\begin{tcblisting}{title={Juve duck}}
\begin{tikzpicture}
-\duck[tshirt=black,|stripes|={\stripes[color=white]},football]
+ \duck[tshirt=black,
+ stripes={\stripes[color=white]},
+ football]
\end{tikzpicture}
\end{tcblisting}
\begin{tcblisting}{title={Milan duck}}
\begin{tikzpicture}
-\duck[tshirt=black,|stripes|={\stripes[color=red]},football]
+ \duck[tshirt=black,
+ stripes={\stripes[color=red]},
+ football]
\end{tikzpicture}
\end{tcblisting}
\begin{tcblisting}{title={M\"{o}nchengladbach duck}}
\definecolor{mggreen}{RGB}{37,166,89}%
\begin{tikzpicture}
-\duck[tshirt=mggreen,|stripes|={\stripes},football]
+ \duck[tshirt=mggreen,
+ stripes={\stripes},football]
\end{tikzpicture}
\end{tcblisting}
\begin{tcblisting}{title={Palmeiras duck}}
\definecolor{verdep}{RGB}{0,100,55}%
\begin{tikzpicture}
-\duck[tshirt=green,jacket=verdep,football]
+ \duck[tshirt=green,jacket=verdep,football]
\end{tikzpicture}
\end{tcblisting}
@@ -1260,27 +1225,38 @@ A few examples to see \lstinline|stripes| in action:
\definecolor{rossocagliari}{RGB}{149,20,38}%
\definecolor{blucagliari}{RGB}{23,52,84}%
\begin{tikzpicture}
-\duck[tshirt=white, jacket=blucagliari,|stripes|={
-\stripes[color=rossocagliari, width=0.46, distance=3]},football]
+ \duck[tshirt=white,
+ jacket=blucagliari,
+ stripes={
+ \stripes[color=rossocagliari,
+ width=0.46, distance=3]},
+ football]
\end{tikzpicture}
\end{tcblisting}
\begin{tcblisting}{title={Sampdoria duck}}
\begin{tikzpicture}
-\duck[tshirt=blue, jacket=blue,|stripes|={
-\stripes[color=white,rotate=-90,width=0.6,distance=1]
-\stripes[color=red,rotate=-90,width=0.2,distance=1.2]
-\stripes[color=black,rotate=-90,width=0.1,distance=1.3]
-},football]
+ \duck[tshirt=blue, jacket=blue,stripes={
+ \stripes[color=white,rotate=-90,
+ width=0.6,distance=1]
+ \stripes[color=red,rotate=-90,
+ width=0.2,distance=1.2]
+ \stripes[color=black,rotate=-90,
+ width=0.1,distance=1.3]
+ },football]
\end{tikzpicture}
\end{tcblisting}
\begin{tcblisting}{title={Brescia duck}}
\begin{tikzpicture}
-\duck[tshirt=blue, jacket=blue,|stripes|={
- \stripes[color=white, rotate=-70, width=0.22,distance=1.1, initialy=0.01]
- \stripes[color=white, rotate=40, width=0.2, distance=1.8, initialy=1.0,initialx=0.285]
-},football]
+ \duck[tshirt=blue, jacket=blue,stripes={
+ \stripes[color=white, rotate=-70,
+ width=0.22,distance=1.1,
+ initialy=0.01]
+ \stripes[color=white, rotate=40,
+ width=0.2, distance=1.8,
+ initialy=1.0,initialx=0.285]
+ },football]
\end{tikzpicture}
\end{tcblisting}
@@ -1290,7 +1266,4 @@ To see more examples of what can be done with the \tikzducks, you are invited to
If you have created a duck you would like to share with the community, I would be happy to add it to this collection, just make a pull request or open an issue in the bug tracking system.
-\clearpage
-\printindex
-
\end{document}
diff --git a/graphics/pgf/contrib/tikzducks/tikzducks-generic.tex b/graphics/pgf/contrib/tikzducks/tikzducks-generic.tex
index 019e65e2b7..25acd13301 100644
--- a/graphics/pgf/contrib/tikzducks/tikzducks-generic.tex
+++ b/graphics/pgf/contrib/tikzducks/tikzducks-generic.tex
@@ -115,6 +115,8 @@
\newif\ifduck@handbag
\newif\ifduck@cocktail
\newif\ifduck@overleaf
+\newif\ifduck@banana
+\newif\ifduck@stick
\tikzset{
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -519,13 +521,21 @@
handbag/.code = \duck@handbagtrue
\def\duck@handbag{#1},
handbag/.default = red!70!black,
- cocktail/.code = \duck@cocktailtrue,
+ cocktail/.code = \duck@cocktailtrue,
overleaf/.code = \duck@overleaftrue
\def\duck@body{duck@overleafcol}
\duck@graduatetrue
\def\duck@graduate{black}
\duck@squareglassestrue
- \def\duck@squareglasses{black}
+ \def\duck@squareglasses{black},
+ banana/.code = \duck@bananatrue
+ \def\duck@banana{#1},
+ banana/.default = yellow!80!orange,
+ stick/.code = \duck@sticktrue
+ \def\duck@stick{#1},
+ stick/.default = red!60!green,
+ leaf/.code = \def\duck@leaf{#1},
+ leaf = green!70!red
}
\def\duck@draw{
@@ -1381,6 +1391,37 @@
\fill[red!80!black] (0.94,0.72) circle[radius=0.01];
\fi
%
+% banana %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\ifduck@banana
+ \begin{scope}[yshift=10,xshift=19,rotate=-25,scale=1.3]
+ \fill[\duck@banana!30!] (0.02,0) .. controls (0.21,0.20) and (0.21,0.40) .. (0.02,0.6) arc [start angle=60,end angle=120, radius =0.04] .. controls (0.07,0.40) and (0.07,0.20) .. (-0.02,0) --cycle ;
+ %peel
+ \begin{scope}
+ \clip (-0.04,-0.01) rectangle (0.20,0.3);
+ \fill[\duck@banana] (0.03,0) .. controls (0.22,0.20) and (0.22,0.40) .. (0.03,0.6) arc [start angle=60,end angle=120, radius =0.06] .. controls (0.06,0.40) and (0.06,0.20) .. (-0.03,0);
+ \end{scope}
+ \fill[\duck@banana!60!] (0.12,0.3) arc [start angle=140, end angle=-100, y radius=0.20, x radius=0.06] arc [start angle=-90, end angle=90, y radius=0.15, x radius=0.02] (0.12,0.3) arc [start angle=60, end angle=270, y radius=0.15, x radius=0.1] arc [start angle=270, end angle=90, y radius=0.13, x radius=0.04];
+ \end{scope}
+\fi
+%
+% stick %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\ifduck@stick
+ \begin{scope}[rotate=-30,yshift=16,xshift=12]
+ %leaf
+ \begin{scope}[rotate=60, xshift=8.2,yshift=8.1]
+ \fill[\duck@leaf] (-0.01,0) .. controls (-0.1,0) and (-0.02, 0.2) .. (0,0.2) .. controls (0.02, 0.2) and (0.1,0) .. (0.01,0.0);
+ \path[clip] (-0.04,-0.04)-- (-0.01,0) .. controls (-0.1,0) and (-0.02, 0.2) .. (0,0.2) .. controls (0.02, 0.2) and (0.1,0) .. (0.01,0)-- (0.04,-0.04) --cycle;
+ \draw[\duck@leaf!80!, line width=0.1] (0,-0.04) -- (0,0.2) \foreach \i in {0.02,0.04,...,0.2} {(0,\i) -- ++(0.1,\i) (0,\i) -- ++(-0.1,\i)} ;
+ \end{scope}
+ %stick itself
+ \fill[\duck@stick!90!red] (-0.04,0.8) -- (-0.04,0.4) arc[start angle=345,end angle=270,radius=0.03] -- ++(0,-0.01) arc[start angle=90,end angle=15,radius=0.03] -- (-0.04,0) arc [start angle=180, end angle=360 ,x radius=0.04, y radius=0.02] -- (0.04, 0.4) arc [start angle=180, end angle=120, radius=0.08] arc [start angle=-90, end angle=90, x radius=0.02, y radius=0.04] arc [start angle=240, end angle=180, radius=0.08] -- (0.04,0.75) arc [start angle=0, end angle=120 ,x radius=0.04, y radius=0.02] --cycle;
+ \fill[\duck@stick!90!] (0.08, 0.51) ellipse [x radius=0.02, y radius=0.04] (0,0.75) ellipse [x radius=0.04, y radius=0.02] ;
+ \draw[\duck@stick!90!red, line width=0.06] (0.08, 0.51) ellipse [x radius=0.016, y radius=0.032]
+ ellipse [x radius=0.012, y radius=0.024] ellipse [x radius=0.008, y radius=0.016] (0,0.75) ellipse [y radius=0.016, x radius=0.032] ellipse [y radius=0.012, x radius=0.024] ellipse [y radius=0.008, x radius=0.016] ;
+ \fill[\duck@stick!90!red] (0.08, 0.51) ellipse [x radius=0.004, y radius=0.008] (0,0.75) ellipse [x radius=0.008, y radius=0.004];
+ \end{scope}
+\fi
+%
% overleaf duck %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ifduck@overleaf
\fill[white] \duckpathoverleaf;
diff --git a/graphics/pgf/contrib/tikzducks/tikzducks.sty b/graphics/pgf/contrib/tikzducks/tikzducks.sty
index 843658c93a..3a6f5b584e 100644
--- a/graphics/pgf/contrib/tikzducks/tikzducks.sty
+++ b/graphics/pgf/contrib/tikzducks/tikzducks.sty
@@ -12,7 +12,7 @@
% See http://www.latex-project.org/lppl.txt
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\ProvidesPackage{tikzducks}[2023/04/05 version v1.6 Draw rubber ducks in TikZ]
+\ProvidesPackage{tikzducks}[2024/04/19 version v1.7 Draw rubber ducks in TikZ]
\RequirePackage{expl3}
\RequirePackage{tikz}
diff --git a/macros/latex/contrib/easybook/easybook.dtx b/macros/latex/contrib/easybook/easybook.dtx
index 64ece3b038..b1e774981d 100644
--- a/macros/latex/contrib/easybook/easybook.dtx
+++ b/macros/latex/contrib/easybook/easybook.dtx
@@ -15,7 +15,7 @@
%<*class>
\NeedsTeXFormat{LaTeX2e}[2021/11/15]
\RequirePackage{l3keys2e}
-\ProvidesExplClass{easybook}{2024/04/02}{2024ar}
+\ProvidesExplClass{easybook}{2024/04/19}{2024as}
{Easily typesetting Chinese theses or books}
\bool_new:N \l__eb_compile_draft_bool
@@ -297,7 +297,7 @@
%<*package>
\NeedsTeXFormat{LaTeX2e}[2021/11/15]
\RequirePackage{l3keys2e,etoolbox}
-\ProvidesExplPackage{easybase}{2024/04/02}{2024ar}
+\ProvidesExplPackage{easybase}{2024/04/19}{2024as}
{Easily typesetting Chinese theses or books}
\cs_generate_variant:Nn \dim_set:Nn { NV }
@@ -1519,19 +1519,6 @@
\seq_put_right:Nn \c__ctex_headings_seq { figure }
\seq_put_right:Nn \c__ctex_headings_seq { lstlisting }
\seq_remove_duplicates:N \c__ctex_headings_seq
-\cs_new_protected:Npn \eb_toc_entry_if_hang:n #1
- {
- \bool_if:NTF \l__eb_toc_entry_hang_bool
- { \contentspush }
- { \use:n }
- {
- \bool_if:NTF \l__eb_toc_number_color_bool
- { \textcolor{ctex@toc@number} }
- { \use:n }
- { \thecontentslabel }
- \tl_use:c { l__eb_toc_#1_after_tl }
- }
- }
\cs_new_protected:Npn \eb_toc_format_define:n #1
{
\ctex_define:n
@@ -1541,30 +1528,71 @@
#1/tocformat+ .code:n = \tl_put_right:cn { l__eb_toc_#1_format_tl } {##1},
#1/tocformat~+ .code:n = \tl_put_right:cn { l__eb_toc_#1_format_tl } {##1},
#1/tocindent .tl_set:c = l__eb_toc_#1_indent_tl,
+ #1/toclabel .cs_set:cp = { eb_toc_entry_#1:nnn } ##1##2##3,
#1/tocrule .tl_set:c = l__eb_toc_#1_rule_tl,
#1/tocafter .tl_set:c = l__eb_toc_#1_after_tl,
- #1/tocbelow .tl_set:c = l__eb_toc_#1_below_tl
+ #1/tocbelow .tl_set:c = l__eb_toc_#1_below_tl,
+ #1/tocbegin .meta:n = { #1/tocbelow = {##1} },
+ #1/tocsep .tl_set:c = l__eb_toc_#1_sep_tl,
+ #1/tocend .tl_set:c = l__eb_toc_#1_end_tl
}
}
-\cs_new_protected:Npn \eb_toc_format_initial:n #1
+\tl_new:N \l_eb_tmpa_tl
+\tl_new:N \l_eb_tmpb_tl
+\cs_new_protected:Npn \eb_toc_format_initial:nn #1#2
{
- \titlecontents{#1}
- [\tl_use:c { l__eb_toc_#1_indent_tl }]
- {\tl_use:c { l__eb_toc_#1_format_tl }}
- {\eb_toc_entry_if_hang:n {#1}}{}
- {\tl_use:c { l__eb_toc_#1_rule_tl }}
- [\tl_use:c { l__eb_toc_#1_below_tl }]
- \ctex_set:nn {#1}
+ \exp_last_unbraced:Nx
+ \use:n
+ {
+ \exp_not:N
+ \titlecontents
+ \tl_use:N \l_eb_tmpa_tl
+ \exp_not:n
+ {
+ {#2}
+ [\tl_use:c { l__eb_toc_#2_indent_tl }]
+ {\tl_use:c { l__eb_toc_#2_format_tl }}
+ {\use:c { eb_toc_entry_#2:nnn } { \thecontentslabel } {#2} {#1}}{}
+ {\tl_use:c { l__eb_toc_#2_rule_tl }}
+ [\tl_use:c { l__eb_toc_#2_below_tl }]
+ }
+ \exp_not:o { \l_eb_tmpb_tl }
+ }
+ \ctex_set:nn {#2}
{
tocindent = 0em,
- tocrule = \tocrule{$\cdot$},
- tocafter = \hspace{1em}
+ tocrule = \IfBooleanTF{#1}{,~\thecontentspage}{\tocrule{$\cdot$}},
+ toclabel =
+ {
+ \bool_if:NTF \l__eb_toc_entry_hang_bool
+ { \IfBooleanTF{##3}{\use:n}{\contentspush} }
+ { \use:n }
+ {
+ \bool_if:NTF \l__eb_toc_number_color_bool
+ { \textcolor{ctex@toc@number} }
+ { \use:n }
+ { ##1 }
+ \tl_use:c { l__eb_toc_##2_after_tl }
+ }
+ },
+ tocafter = \hspace{1em},
+ tocsep = .—,
+ tocend = .
}
}
-\cs_new_protected:Npn \RegisterTocName #1
+\NewDocumentCommand{\RegisterTocName}{sm}
{
- \eb_toc_format_define:n {#1}
- \eb_toc_format_initial:n {#1}
+ \IfBooleanT{#1}
+ {
+ \tl_set:Nn \l_eb_tmpa_tl {*}
+ \tl_set:Nn \l_eb_tmpb_tl
+ {
+ [\tl_use:c { l__eb_toc_#2_sep_tl }]
+ [\tl_use:c { l__eb_toc_#2_end_tl }]
+ }
+ }
+ \eb_toc_format_define:n {#2}
+ \eb_toc_format_initial:nn {#1} {#2}
}
\seq_map_function:NN
\c__ctex_headings_seq \RegisterTocName
@@ -2392,7 +2420,7 @@
}
%</package>
%<*tcolorbox>
-\ProvidesExplFile{eb-tcolorbox.cfg}{2024/04/02}{2024ar}
+\ProvidesExplFile{eb-tcolorbox.cfg}{2024/04/19}{2024as}
{Customization of tcolorbox for easybook}
\cs_set_protected:Npn \addtotcbstyle #1#2
diff --git a/macros/latex/contrib/easybook/easybook.pdf b/macros/latex/contrib/easybook/easybook.pdf
index 505b625244..f2c68334c9 100644
--- a/macros/latex/contrib/easybook/easybook.pdf
+++ b/macros/latex/contrib/easybook/easybook.pdf
Binary files differ
diff --git a/macros/latex/contrib/easybook/easybook.tex b/macros/latex/contrib/easybook/easybook.tex
index edd3c476ce..d4025ca7e0 100644
--- a/macros/latex/contrib/easybook/easybook.tex
+++ b/macros/latex/contrib/easybook/easybook.tex
@@ -23,8 +23,8 @@
name = easybook,
color-scheme = blue,
title = EASYBOOK使用手册,
- version = v2024ar,
- date = 2024/04/02,
+ version = v2024as,
+ date = 2024/04/19,
authors = 瞿毅,
info = 简便地排版中文学ä½è®ºæ–‡æˆ–书ç±,
email = toquyi@163.com,
@@ -113,6 +113,7 @@
\IfBooleanF{#1}{\cnltx@checkdefault{\hfill\newline}}
}
\newnote{\newtag}[1][New]{\fbox{#1}}
+\newnote{\newtagv}[2][New]{#1\\#2}
% Multi-row values alignment when there are many choices
\newcommand{\leftfillchoice}[2]
{
@@ -831,6 +832,8 @@
\command{tocrule}[\sarg\harg\oarg{引导点间è·}\darg{放大因å­}\marg{引导点}\oarg{页ç æ ¼å¼}]
生æˆç›®å½•å¼•å¯¼çº¿çš„命令,需è¦åœ¨å¼•å¯¼çº¿é€‰é¡¹ \option{tocrule} 中使用。带有星å·çš„命令与 \keyis{dotalign}{false} 效果相åŒã€‚命令带 \harg{} å·å‚æ•°ä¸æ·»åŠ ç›®å½•é¡µç ï¼Œæ­¤æ—¶æ— æ ¼å¼çš„页ç è¢«ä¿å­˜åœ¨ \cs{thecontentspage} 命令中,å¯ä»¥é…åˆç›’å­å‘½ä»¤è®¾ç½®ä¸åŒçš„页ç å·¦å³é—´è·å’Œå¯¹é½æ–¹å¼ã€‚\meta{引导点间è·} 需带有长度å•ä½ï¼Œ\meta{放大因å­} 为 \meta{引导点} 的放大å€æ•°ã€‚\meta{页ç æ ¼å¼} 中最åŽä¸€ä¸ªå‘½ä»¤å¯ä»¥å¸¦æœ‰ä¸€ä¸ªå‚数为页ç ç¼–å·ã€‚
\end{commands}
+ \keyval{toclabel}{标题标签格å¼}\dtag\newtagv{2024as}%
+ 目录中å„类型æ¡ç›®æ ‡é¢˜æ ‡ç­¾çš„æ ¼å¼ï¼Œå¯ä¸Ž \option{tocline} 选项è”用设置标题。其中å‚æ•° \code{\#1} ä»£è¡¨æ ‡ç­¾çš„ç¼–å· \cs{thecontentslabel},å‚æ•° \code{\#2} 代表 \meta{æ¡ç›®å}。
\keyval{tocafter}{è·ç¦»å‘½ä»¤}\dtag\Default{\cs*{hspace}\Marg{1em}}
目录æ¡ç›®æ ‡ç­¾ä¸Žæ ‡é¢˜é—´çš„代ç ï¼Œé»˜è®¤ä¸ºæ’å…¥ \code{1em} 横å‘è·ç¦»ã€‚
\keyval{tocbelow}{è·ç¦»å‘½ä»¤}\dtag
@@ -847,14 +850,23 @@
tocrule = \tocrule[0.6pc](1.1){.}[\zihao{5}],
tocline = \CTEXnumberline{#1}#2
},
- section/tocrule = \tocrule-{}\makebox[1cm]{\rlap{\thecontentspage}}
+ section/toclabel = \contentspush{#1\hspace{0.5em}},
+ section/tocrule = \tocrule-{}\makebox[1cm]{\rlap{\thecontentspage}}
}
\end{ctexexam}
\end{options}
\begin{commands}
- \command{RegisterTocName}[\marg{æ¡ç›®å}]
- ç»™æ¡ç›®ç±»åž‹å称为 \meta{æ¡ç›®å} 的标题注册用于设置目录样å¼çš„选项,å³é€‰é¡¹å‰æœ‰ç¬¦å· \ding{73} 表示需è¦æ³¨å†ŒåŽä½¿ç”¨ã€‚å‰é¢æ到的æ¡ç›®ç±»åž‹å‡å·²æ³¨å†Œï¼Œæ–°ç±»åž‹çš„æ¡ç›®æ³¨å†ŒåŽé€‰é¡¹åˆå§‹å€¼ä¸Žå›¾è¡¨æ¡ç›®ç›¸åŒã€‚
+ \command{RegisterTocName}[\sarg\marg{æ¡ç›®å}]
+ ç»™æ¡ç›®ç±»åž‹å称为 \meta{æ¡ç›®å} 的标题注册用于设置目录样å¼çš„选项,å³é€‰é¡¹å‰æœ‰ç¬¦å· \ding{73} 表示需è¦æ³¨å†ŒåŽä½¿ç”¨ã€‚å‰é¢æ到的æ¡ç›®ç±»åž‹å‡å·²æ³¨å†Œï¼Œæ–°ç±»åž‹çš„æ¡ç›®æ³¨å†ŒåŽé€‰é¡¹åˆå§‹å€¼ä¸Žå›¾è¡¨æ¡ç›®ç›¸åŒã€‚带有星å·å‚数的命令使注册目录的æ¡ç›®å½¢æˆä¸€ä¸ªæ®µè½ï¼Œæ­¤æ—¶å¤šå‡ºä¸‹é¢ä¸‰ä¸ªé€‰é¡¹å¯ç”¨ï¼š
+ \begin{options}
+ \keyval{tocbegin}{开始代ç }\dtag\newtagv{2024as}%
+ 当å‰çº§åˆ«ç›®å½•æ¡ç›®ç¬¬ä¸€ä¸ªæ ‡é¢˜å‰çš„代ç ï¼Œä»…在存在更高级别的æ¡ç›®æ—¶æœ‰æ•ˆã€‚
+ \keyval{tocsep}{中间代ç }\dtag\Default{\Marg{.—}}\newtagv{2024as}%
+ 当å‰çº§åˆ«ç›®å½•æ¡ç›®æ¯ä¸ªæ ‡é¢˜ä¹‹é—´çš„代ç ã€‚
+ \keyval{tocend}{结æŸä»£ç }\dtag\Default{\Marg{.}}\newtagv{2024as}%
+ 当å‰çº§åˆ«ç›®å½•æ¡ç›®æœ€åŽä¸€ä¸ªæ ‡é¢˜åŽçš„代ç ã€‚
+ \end{options}
\command{contentsuse}[\marg{æ¡ç›®å}\marg{扩展å}]
激活æ¡ç›®ç±»åž‹å称为 \meta{æ¡ç›®å} 的目录定制功能,它使用的目录文件åŽç¼€ä¸º \meta{扩展å}。需è¦åœ¨æ¿€æ´»æ¡ç›®åŽå†ä½¿ç”¨å‘½ä»¤ \cs{RegisterTocName} 注册选项。
\command{DeclareFloatList}[\marg{æ¡ç›®å}\marg{扩展å}]
@@ -869,7 +881,7 @@
\DeclareFloatList{algorithm}{loa}
\listofalgorithms[multoc] % 在正文中输出åŒæ ç®—法目录
\end{ctexexam}
- \command{AllotCaptionExt}[\marg{æ¡ç›®å}\marg{扩展å}]\newtag%
+ \command{AllotCaptionExt}[\marg{æ¡ç›®å}\marg{扩展å}]
ç»™æ¡ç›®ç±»åž‹å称为 \meta{æ¡ç›®å} 的标题分é…目录文件 \meta{扩展å}ï¼Œæ³¨æ„ \meta{扩展å} 需è¦è¢«å®šä¹‰åœ¨ \cs*{ext@}\meta{æ¡ç›®å} 命令中æ‰æœ‰æ•ˆï¼ˆ\pkg*{caption} å®åŒ…的默认定义形å¼ï¼‰ã€‚å¯ä»¥ä½¿ä¸åŒçš„ \meta{æ¡ç›®å} 共享一个目录:
\begin{ctexexam}
\AllotCaptionExt{table}{lof}
@@ -1421,6 +1433,13 @@
\item 新增目录文件扩展å分é…命令 \cs{AllotCaptionExt}。
\end{version}
\shortversion{v = 2024aq,date = 2022/03/31,changes = ä¿®å¤å‘½ä»¤ \cs{ebifbitoc} 用于æ¡ç›®ç¼©è¿›é€‰é¡¹ \option{tocindent} 失效的问题。}
+ \begin{version}[v = 2024as,date = 2024/04/19]
+ \changed
+ \item 目录æ¡ç›®æ ·å¼æ³¨å†Œå‘½ä»¤ \cs{RegisterTocName} 增加星å·å‚数,支æŒè®¾ç½®æ®µè½åž‹ç›®å½•ã€‚
+ \added
+ \item 新增目录æ¡ç›®æ ‡é¢˜æ ‡ç­¾è®¾ç½®çš„选项 \option{toclabel}。
+ \item 新增段è½åž‹ç›®å½•æ¡ç›®é™„加代ç çš„选项 \option{tocbegin}ã€\option{tocsep} å’Œ \option{tocend}。
+ \end{version}
\end{changelog}
\nocite{*}
diff --git a/macros/latex/contrib/fadingimage/README.md b/macros/latex/contrib/fadingimage/README.md
index 7140d126e3..d62c0a6078 100644
--- a/macros/latex/contrib/fadingimage/README.md
+++ b/macros/latex/contrib/fadingimage/README.md
@@ -1,9 +1,9 @@
-# The `FadingImage` package
+# The `fadingimage` package
-This package provides two commands for adding fading full width picture at the top or bottom of a page.
+This package provides three commands for adding fading full width picture at the top or bottom of a page.
**Welcome to pull requests
-[here](https://github.com/xiamyphys/FadingImage).**
+[here](https://github.com/xiamyphys/fadingimage).**
## License
diff --git a/macros/latex/contrib/fadingimage/doc/fadingimage.pdf b/macros/latex/contrib/fadingimage/doc/fadingimage.pdf
index f0e81ecf62..85856e112f 100644
--- a/macros/latex/contrib/fadingimage/doc/fadingimage.pdf
+++ b/macros/latex/contrib/fadingimage/doc/fadingimage.pdf
Binary files differ
diff --git a/macros/latex/contrib/fadingimage/doc/fadingimage.tex b/macros/latex/contrib/fadingimage/doc/fadingimage.tex
index 043d13b129..2aa6637e95 100644
--- a/macros/latex/contrib/fadingimage/doc/fadingimage.tex
+++ b/macros/latex/contrib/fadingimage/doc/fadingimage.tex
@@ -1,60 +1,55 @@
-\documentclass[11pt]{article}
-\usepackage{geometry,indentfirst,titlesec,authblk,hyperref}
+\documentclass[11pt,svgnames]{article}
+\usepackage{geometry,titlesec,authblk,hyperref,hologo}
\titleformat*{\section}{\bfseries\large}
-\usepackage{datetime}
-\usepackage[libertine,mono=false]{libertine}
+\hologoFontSetup{general=\sffamily}
+\usepackage{datetime}\yyyymmdddate
+\usepackage[libertine,mono=false]{newtx}
\usepackage{fadingimage}
-\hypersetup{colorlinks,urlcolor=moducolor}
-\definecolor{pkgcolor}{Hsb}{103,.8,.5}
-\definecolor{moducolor}{Hsb}{290,.8,.5}
-\definecolor{cmdcolor}{Hsb}{188,.8,.5}
-\def\pkg#1{\texorpdfstring{\textcolor{pkgcolor}{
- \href{https://ctan.org/pkg/#1}{\textsf{#1}}}}{“#1â€}}
-\def\mode#1{\texorpdfstring{\textcolor{moducolor}{\textsf{#1}}}{“#1â€}}
-\def\cmd#1{\texorpdfstring{\textcolor{cmdcolor}{\textsf{#1}}}{“#1â€}}
-\def\datechange#1#2{%
- \noindent{\makebox[\textwidth][r]{\color{H7}\rule{1.15\textwidth}{.4pt}}}
- \noindent\makebox[0pt][r]{\makebox[-3em][r]{\small\textbf{\textcolor{H7}{#1}}}\;\;}{\sffamily Update: \ignorespaces#2}}
-
-\title{\bfseries The \pkg{FadingImage} Package}
-\author{Hsia Mingyu, \href{https://www.hdu.edu.cn}{Hangzhou Dianzi University}}
-\yyyymmdddate\date{\today}
-\affil{\href{mailto:xiamyphys@gmail.com}{\ttfamily xiamyphys@gmail.com}}
-\date{\today\quad Version 0.1d\thanks{\url{https://github.com/xiamyphys/FadingImage}}}
-\begin{document}
+\hypersetup{colorlinks,urlcolor=MidnightBlue}
+\def\pkg#1{\textcolor{DarkGreen}{\textsf{#1}}}
+\def\mode#1{\textcolor{Indigo}{\textsf{#1}}}
+\def\cmd#1{\textcolor{MidnightBlue}{\texttt{\string#1}}}
+
+\title{\bfseries The \pkg{fadingimage} Package}
+\author{Mingyu Hsia, \href{mailto:xiamyphys@gmail.com}{\ttfamily xiamyphys@gmail.com}}
+\affil{Hangzhou Dianzi University}
+\date{\today\quad Version 0.2a\thanks{\url{https://github.com/xiamyphys/fadingimage}}}
+\begin{document}
\maketitle
\UPFadingImage[trim={0 {.96\paperheight} 0 0},clip]{Beautiful-realities}
\LOWFadingImage[trim={0 0 0 {.96\paperheight}},clip]{Beautiful-realities}
\vspace{-6ex}
\begin{abstract}
-This is \textsf{\textbf{not only the document but also the demo}} for the \pkg{FadingImage} package, which provides three commands for adding fading full width picture at the top, bottom or both of them on a page. And this package is used for my template \pkg{LiteBook} and \pkg{LiteSolution}.
+
+This is \textsf{\textbf{not only the document but also the demo}} for the \pkg{fadingimage} package, which provides three commands for adding fading full width picture at the top, bottom or both of them on a page. This package is contained in the \pkg{LiteBook} and \pkg{LiteSolution} class.
+
+Welcome to feedback bugs or ideas via email \href{mailto:xiamyphys@gmail.com}{\ttfamily xiamyphys@gmail.com} or \href{https://github.com/xiamyphys/fadingimage}{GitHub}.
+
\end{abstract}
-\section{The purpose of this package}
-This package provides three commands for adding fading full width picture at the top or bottom of a page. Welcome to feedback bugs or ideas via email \href{mailto:xiamyphys@gmail.com}{\ttfamily xiamyphys@gmail.com} or \href{https://github.com/xiamyphys/fadingimage}{GitHub}.
+\section{Installing \pkg{fadingimage} and loading it}
This package requires \pkg{tikz} package to node images and \pkg{fading} library to support fading image.
-\section{Loading \pkg{FadingImage}}
-I strongly advise you to use terminal/cmd to implement the commands to update all the packages (and install this package) to the latest version or switch to portable version instead
+Simply download \verb|fadingimage.cls| file from \href{https://github.com/xiamyphys/fadingimage}{GitHub} or \href{https://ctan.org/pkg/fadingimage}{CTAN} and save it under your working directory. However, I strongly suggest to use terminal to install and update all packages to the latest version
+
\begin{verbatim}
- sudo tlmgr update --self --all
+ sudo tlmgr update --self --all
\end{verbatim}
+To learn more, please refer to \href{https://tex.stackexchange.com/questions/55437/how-do-i-update-my-tex-distribution}{How do I update my \hologo{TeX} distribution?}
+
\section{Commands \cmd{UPFadingImage}, \cmd{LOWFadingImage} and \cmd{UPLOWFadingImage}}
-\begin{small}
-\begin{verbatim}
- \UPFadingImage [<keyval list>]{<file>} \LOWFadingImage[<keyval list>]{<file>}
- \UPFadingImage [<keyval list>]{<file>} [<keyval list>]{<file>}
-\end{verbatim}
-\end{small}
-The first two commands all have 2 variables and the first one is optional. The second variable of the commands can assign the image that you want to insert, and the first one can assign the parameters of command \cmd{includegraphics}, such as clip to the inserted image.
+\begin{small}\begin{verbatim}
+ \UPFadingImage [<keyval list>]{<file>} \LOWFadingImage[<keyval list>]{<file>}
+ \UPLOWFadingImage[<keyval list>]{<file>}[<keyval list>]{<file>}
+\end{verbatim}\end{small}
-The third command is a combination of the first two commands and it will call the \cmd{tikz} environment for only once time to reduce compile time.
+The first two commands all have 2 variables and the first one is optional. The second variable of the commands can assign the image that you want to insert, and the first one can assign the parameters of command \cmd{includegraphics}, such as clip to the inserted image.
-If a star (*) is added after the commands (such as \verb|\UPFadingImage*[...]{...}|), then the image you inserted won't be faded.
+The third command is just a combination of the first two commands. If a star (*) is added after the commands above, the image you inserted won't be faded.
\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/fadingimage/tex/fadingimage.sty b/macros/latex/contrib/fadingimage/tex/fadingimage.sty
index 2b63cf0cbe..6cfceced3b 100644
--- a/macros/latex/contrib/fadingimage/tex/fadingimage.sty
+++ b/macros/latex/contrib/fadingimage/tex/fadingimage.sty
@@ -1,24 +1,25 @@
-%% ****************************************************************************************************
-%% Copyright 2024 by Mingyu Hsia <xiamyphys@gmail.com> *
-%% *
-%% This work may be distributed and/or modified under * ***** * * *
-%% the conditions of the LaTeX Project Public License * ** * * *** * * *
-%% * * ** * * * ** *
-%% http://www.latex-project.org/lppl.txt * * * * ***** ** *
-%% * * ** * * * * *
-%% either version 1.3c of this license or any later ***** ** * * *** * * *
-%% version. *
-%% *
-%% This work has the LPPL maintenance status `maintained'. *
-%% *
-%% The Current Maintainer of this work is Mingyu Hsia. *
-%% *
-%% This work consists of the files fadingimage.sty, *
-%% and README.md. *
-%% available at https://github.com/xiamyphys/FadingImage *
-%% ****************************************************************************************************
+%% ***********************************************************
+%% Copyright 2024 by Mingyu Hsia <xiamyphys@gmail.com> *
+%% *
+%% This work may be distributed and/or modified under *
+%% the conditions of the LaTeX Project Public License *
+%% *
+%% http://www.latex-project.org/lppl.txt *
+%% *
+%% either version 1.3c of this license or any later *
+%% version. *
+%% *
+%% This work has the LPPL maintenance status `maintained'. *
+%% *
+%% The Current Maintainer of this work is Mingyu Hsia. *
+%% *
+%% This work consists of the files fadingimage.cls, *
+%% and README.md. *
+%% available at https://github.com/xiamyphys/fadingimage *
+%% ***********************************************************
+% !Mode:: "TeX:UTF-8"
\NeedsTeXFormat{LaTeX2e}[2020/10/01]
-\ProvidesPackage{fadingimage}[2024/03/17/ v0.1d Package for adding fading full width picture at the top or bottom of a page.]
+\ProvidesPackage{fadingimage}[2024/04/19/ v0.2a Package for adding fading full width picture at the top and bottom of a page.]
\RequirePackage{tikz,xcolor}
\usetikzlibrary{fadings}
@@ -32,7 +33,6 @@
\node[scope fading=south,below,inner sep=0pt,outer sep=auto] at (current page.north) {\includegraphics[width=\paperwidth,#2]{#3}};
}
}
-
\NewDocumentCommand{\LOWFadingImage}{ s O{} m }{
\IfBooleanTF{#1}
{
diff --git a/macros/latex/contrib/notebeamer/doc/images/newnote3sdemo.pdf b/macros/latex/contrib/notebeamer/doc/figures/beamerdemo.pdf
index 4df7320730..d4b3615265 100644
--- a/macros/latex/contrib/notebeamer/doc/images/newnote3sdemo.pdf
+++ b/macros/latex/contrib/notebeamer/doc/figures/beamerdemo.pdf
Binary files differ
diff --git a/macros/latex/contrib/notebeamer/doc/figures/paperdemo.pdf b/macros/latex/contrib/notebeamer/doc/figures/paperdemo.pdf
new file mode 100644
index 0000000000..158ef35fe8
--- /dev/null
+++ b/macros/latex/contrib/notebeamer/doc/figures/paperdemo.pdf
Binary files differ
diff --git a/macros/latex/contrib/notebeamer/doc/images/HDU.pdf b/macros/latex/contrib/notebeamer/doc/images/HDU.pdf
deleted file mode 100644
index cb9ba414c8..0000000000
--- a/macros/latex/contrib/notebeamer/doc/images/HDU.pdf
+++ /dev/null
Binary files differ
diff --git a/macros/latex/contrib/notebeamer/doc/images/Inuyasa.jpg b/macros/latex/contrib/notebeamer/doc/images/Inuyasa.jpg
deleted file mode 100644
index 3d473bf869..0000000000
--- a/macros/latex/contrib/notebeamer/doc/images/Inuyasa.jpg
+++ /dev/null
Binary files differ
diff --git a/macros/latex/contrib/notebeamer/doc/images/newnote4sdemo.pdf b/macros/latex/contrib/notebeamer/doc/images/newnote4sdemo.pdf
deleted file mode 100644
index 581fbd1b1d..0000000000
--- a/macros/latex/contrib/notebeamer/doc/images/newnote4sdemo.pdf
+++ /dev/null
Binary files differ
diff --git a/macros/latex/contrib/notebeamer/doc/images/newnotedemo.pdf b/macros/latex/contrib/notebeamer/doc/images/newnotedemo.pdf
deleted file mode 100644
index 5c0c4ab077..0000000000
--- a/macros/latex/contrib/notebeamer/doc/images/newnotedemo.pdf
+++ /dev/null
Binary files differ
diff --git a/macros/latex/contrib/notebeamer/doc/images/titlepage1.pdf b/macros/latex/contrib/notebeamer/doc/images/titlepage1.pdf
deleted file mode 100644
index fd79019286..0000000000
--- a/macros/latex/contrib/notebeamer/doc/images/titlepage1.pdf
+++ /dev/null
Binary files differ
diff --git a/macros/latex/contrib/notebeamer/doc/images/titlepage2.pdf b/macros/latex/contrib/notebeamer/doc/images/titlepage2.pdf
deleted file mode 100644
index bd9ddb1eb2..0000000000
--- a/macros/latex/contrib/notebeamer/doc/images/titlepage2.pdf
+++ /dev/null
Binary files differ
diff --git a/macros/latex/contrib/notebeamer/doc/notebeamer-demo.pdf b/macros/latex/contrib/notebeamer/doc/notebeamer-demo.pdf
deleted file mode 100644
index ffb1857726..0000000000
--- a/macros/latex/contrib/notebeamer/doc/notebeamer-demo.pdf
+++ /dev/null
Binary files differ
diff --git a/macros/latex/contrib/notebeamer/doc/notebeamer-demo.tex b/macros/latex/contrib/notebeamer/doc/notebeamer-demo.tex
deleted file mode 100644
index 4944572ba3..0000000000
--- a/macros/latex/contrib/notebeamer/doc/notebeamer-demo.tex
+++ /dev/null
@@ -1,29 +0,0 @@
-\documentclass[darker,libertinus,colorful]{notebeamer}
-\begin{document}
- % Assign the author & mail address
- \author{Axia} \mail{xiamyphys@gmail.com}
- % Assign the titlepage, sitcker and logo file
- \flyleaf{titlepage1.pdf} \sticker{Inuyasa.jpg}
- % Assign the logo link and info
- \logo[https://sci.hdu.edu.cn]{HDU.pdf}[Hangzhou·Zhejiang]
- % Create a cover page with color H6, title and subtitle
- \notebook[H6]{Quantum Transport}[Dirac Fermion Discussion Group]
- % Assign the chapter title and the file will be inserted after
- \chapter[PHYSICAL REVIEW B VOLUME 50, NUMBER 8]{newnotedemo.pdf}
- % Insert the page 3--4 of the file with the format 1 image per page
- \newnote{3}{4}
- % Change the titlepage in the subsequent notebooks
- \flyleaf{titlepage2.pdf}
- % Create a cover page with color H5, title
- \notebook[H5]{AQM \& SPD}
- \chapter[Introduction \& Fundamental Concepts]{newnote3sdemo.pdf}
- % Insert the page 1--2, 4--6 of the file with the format 3 images per page
- \newnotesss{1}{2} \newnotesss{3}{6}
- \chapter*[SPD Basic: Transport]{newnote4sdemo.pdf}
- % Insert the page 1--2, 4--6, 7--10 of the file with the format 4 images per page
- \newnotessss{1}{2} \newnotessss{4}{6} \newnotessss{7}{10}
- % Create an empty note paper with no page number
- \emptynote*[2]
- % Create an empty note paper with logo and info but no page number
- \emptyhdunote*[2]
-\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/notebeamer/doc/notebeamer-doc.pdf b/macros/latex/contrib/notebeamer/doc/notebeamer-doc.pdf
deleted file mode 100644
index 5d7eac9fb8..0000000000
--- a/macros/latex/contrib/notebeamer/doc/notebeamer-doc.pdf
+++ /dev/null
Binary files differ
diff --git a/macros/latex/contrib/notebeamer/doc/notebeamer-doc.tex b/macros/latex/contrib/notebeamer/doc/notebeamer-doc.tex
deleted file mode 100644
index 8df6c4bb8a..0000000000
--- a/macros/latex/contrib/notebeamer/doc/notebeamer-doc.tex
+++ /dev/null
@@ -1,285 +0,0 @@
-%% ******************************************************
-%% * This work may be distributed and/or modified under *
-%% * the conditions of the LaTeX Project Public License *
-%% * http://www.latex-project.org/lppl.txt *
-%% * either version 1.3c of this license or any later *
-%% * version. *
-%% ******************************************************
-\documentclass[11pt]{article}
-\usepackage{geometry}
-\usepackage{pdfpages}
-\usepackage[level]{datetime}
-\usepackage{unicode-math}
-\usepackage{authblk}
-\setmainfont{Libertinus Serif}
-\setsansfont{Libertinus Sans}
-\setmonofont{NotoSansMono}[
- Scale=MatchLowercase,
- Extension=.ttf,
- UprightFont=*-Light,
- BoldFont=*-Medium
-]
-\makeatletter
-\usepackage{listings,dirtree}
-\lstdefinestyle{TeX}{
- language = [LaTeX]TeX,
- texcsstyle = *\color{H7},
- numbers = none,
- basicstyle = {\small\color{H6}\tt},
- mathescape = false,
- breaklines = true,
- columns = fixed,
- keywordstyle = \color{H3},
- commentstyle = \color{darkgray},
- tabsize = 2,
- keywords = {mail,flyleaf,sticker,logo,notebook,chapter,newnote,newnotesss,newnotessss,emptynote,emptyhdunote}
-}
-\usepackage{hyperref,xcolor,verbatim}
-\definecolor{pkgcolor}{Hsb}{103,.8,.5}
-\definecolor{moducolor}{Hsb}{290,.8,.5}
-\definecolor{cmdcolor}{Hsb}{188,.8,.5}
-\definecolor{filecolor}{Hsb}{207,.6,.7}
-\definecolor{H1}{Hsb}{349,.8,.8}% 海棠紅 (Hangzhou MTR L 1 )
-\definecolor{H2}{Hsb}{23, .8,.8}% 丹桂橙 (Hangzhou Metro 2 )
-\definecolor{H3}{Hsb}{48, .8,.8}% 柠檬黄 (Hangzhou Metro 3 )
-\definecolor{H4}{Hsb}{103,.8,.8}% 香樟绿 (Hangzhou Metro 4 )
-\definecolor{H5}{Hsb}{188,.8,.8}% é’è—色 (Hangzhou MTR L 5 )
-\definecolor{H6}{Hsb}{207,.8,.8}% æµ·æ´‹è“ (Hangzhou Metro 6 )
-\definecolor{H7}{Hsb}{290,.8,.8}% 浪漫紫 (Hangzhou Metro 7 )
-\hypersetup{colorlinks,urlcolor=H1,linkcolor=H2,filecolor=filecolor,pdfstartview=FitH,pdfview=FitH,pdfcreator=XeTeX output}
-
-\renewcommand*\l@subsection{\@dottedtocline{2}{1.5em}{2.1em}}
-\def\@pkg#1{\texorpdfstring{\href{https://www.ctan.org/pkg/#1}{\textcolor{pkgcolor}{\textsf{#1}}}}{“#1â€}}
-\def\s@pkg#1{\texorpdfstring{\textcolor{pkgcolor}{\textsf{#1}}}{“#1â€}}
-\DeclareRobustCommand\pkg{\@ifstar\s@pkg\@pkg}
-\def\mode#1{\texorpdfstring{\textcolor{moducolor}{\textsf{#1}}}{“#1â€}}
-\def\cmd#1{\texorpdfstring{\textcolor{cmdcolor}{\textsf{#1}}}{“#1â€}}
-\def\datechange#1#2{%
- \noindent{\makebox[\textwidth][r]{\color{H7}\rule{1.15\textwidth}{.4pt}}}
- \noindent\makebox[0pt][r]{\makebox[-3em][r]{\small\textbf{\textcolor{H7}{#1}}}\;\;}{\sffamily Update: \ignorespaces#2}}
-\makeatother
-
-\title{The \pkg{NoteBeamer} Template}
-\author[1]{Xia Ming Yu, \href{https://www.hdu.edu.cn}{Hangzhou Dianzi University}}
-\yyyymmdddate
-\date{\today}
-\affil[1]{\href{mailto:xiamyphys@gmail.com}{\texttt{xiamyphys@gmail.com}}}
-\date{\today\quad Version 2.3a}
-\begin{document}
-\maketitle
-
-\begin{abstract}
-This is the document for \pkg{NoteBeamer} template, which provides a method to input Beamers on note papers and make notebook quickly.
-
-GitHub issues: \url{https://github.com/xiamyphys/NoteBeamer/issues}
-
-\end{abstract}
-
-\tableofcontents
-
-\section{Introduction}
-
-\subsection{The purpose of this template}
-This template provides an easy way to input Beamers on note papers and make notebook quickly. It's optimized for Goodnotes' default paper size and there won't have difference between papers.
-
-If you meet bugs when using this template, or you have better suggestions or ideas, or you want to participate in the development of the template or other templates by me, feel free to contact me on GitHub \href{https://github.com/xiamyphys/NoteBeamer/issues}{issues} or via email \href{mailto:xiamyphys@gmail.com}{xiamyphys@gmail.com}.
-
-Also, you can join my \textsf\LaTeX{} Template Discussion \href{https://qm.qq.com/q/OnHzbNvVAG}{QQ Group: 760570712} to communicate with me and get the insider preview edition of the template.
-
-\subsection{Packages required}
-This template is based on the template \pkg{standalone}. And it requires \pkg{tikz} package to plot some graphics, \pkg{kvoptions} and \pkg{etoolbox} packages to provide global options, \pkg{graphics} package to provide the \mode{draft} mode, \pkg{hyperref} package provides link jump function, \pkg{ctex} package to support the \textbf{Chinese, Simplified} language and \pkg{fontawesome5} package to provide a set of beautiful icons.
-
-I strongly suggest that you should use cmd to implement the commands to update all the packages to the latest version or switch to portable version instead.
-\begin{verbatim}
- tlmgr update --self
- tlmgr update --all
-\end{verbatim}
-
-Remember to choose the proper mirror source in your region. To learn more, please refer to \href{https://tex.stackexchange.com/questions/55437/how-do-i-update-my-tex-distribution}{How do I update my TEX distribution?}
-
-\subsection{Loading \pkg{NoteBeamer} and its modes}
-Update your \sffamily\TeX distribution or just save the file \verb|notebeamer.cls| to your project's root directory, then create a \verb|.tex| file, just input the command \verb|\documentclass{notebeamer}| on the first line.
-
-The template provides three modes: \mode{draft}, \mode{color} and \mode{font}. Just add the options of the modes separately by commas in the square bracket of the command in your \verb|.tex| file, such as
-
-\begin{verbatim}
- \documentclass[draft,darker,libertinus]{notebeamer}
-\end{verbatim}
-
-\section{Modes of \pkg{NoteBeamer}}
-
-
-\subsection{The \mode{draft} mode}
-Like most of the templates, this template also provide all modes provided by \pkg{graphics} package such as \mode{draft}, \sffamily\TeX{} will only read for size info of pages you input, and a box of the correct size is printed with the filename in.
-
-This can accelerate the speed of compile, and you can preview the effect quickly when you input a file with too many pages and (or) its size is too large. After you make sure that there's no formatting errors, you can cancel this mode just to wait until compiled.
-
-The files corresponding to the commands \cmd{sticker}, \cmd{logo} and \cmd{flyleaf} can be stored in a folder named \verb|figure(s)|, \verb|image(s)|, \verb|graphic(s)| or \verb|picture(s)|, and you needn't to write these directories again in these commands because this template has already set these directories as indexes. Just as shown in the file tree in the example in \nameref{dirtree}.
-
-\subsection{The \mode{saturation} mode}
-This mode has three options, \mode{lighter} \mode{light}, \mode{normal}, \mode{dark} and \mode{darker}, which can make the color of the covers you create in this template get lighter or darker, and the default option is \mode{normal}.
-
-\subsection{The \mode{color} mode}
-This mode has two options, \mode{main} and \mode{colorful}, which can make the color of the note line remains or keep the same hues as the cover, and the default option is \mode{main}.
-
-\subsection{The \mode{font} mode}
-This mode has two options, \mode{times} and \mode{libertinus}, which can deside which font the notebook will use: The default \emph{New Times Roman} font or the \emph{Libertinus} font. You can use Libertinus fonts if you've installed it on your computer, and the default option is \mode{times}.
-
-\section{Commands of \pkg{NoteBeamer}}
-
-\subsection{The \cmd{author}, \cmd{mail}, \cmd{flyleaf}, \cmd{sticker} and \cmd{logo} commands}
-\begin{verbatim}
- \author{Your Name} \mail{Your Mail Address}
- \flyleaf{titlepage.pdf} \sticker{sticker.png}
- \logo[link]{logofile.pdf}[info]
-\end{verbatim}
-\begin{itemize}
- \item \cmd{author}, \cmd{mail} and \cmd{flyleaf} command.
-
- There will be an author's name or (and) mail on the cover page after you use the command \cmd{author} or (and) \cmd{mail}, also a hyperlink will be added to the email address. A title page will automatically be added after the cover page after you use the command \cmd{flyleaf}.
-
- \item \cmd{sticker} and \cmd{logo} command.
-
- There will be a sticker on the southeast of the note paper after you add, and there will be a logo on the northwest corner of the cover page and HDU note paper; otherwise it won't.
-
- The first and third variable of the command \cmd{logo} can assign the link and info of the logo, which are optional.
-\end{itemize}
-
-\paragraph{The commands above are all repeatable, which can reassign the values that these commands assigned before.}
-
-\subsection{The \cmd{notebook} command}
-
-\begin{verbatim}
- \notebook[color]{title}[subtitle]
-\end{verbatim}
-
-This command can create a cover. There are 7 colors for the cover, these colors' Hues are from Hangzhou MTR line 1 -- 7, they are \textcolor{H1}{H1. \textsf{\href{https://en.wikipedia.org/wiki/Malus_spectabilis}{Haitang} Red}}, \textcolor{H2}{H2. \textsf{Dangui orange}}, \textcolor{H3}{H3. \textsf{Lemon yellow}}, \textcolor{H4}{H4. \textsf{Camphor green}}, \textcolor{H5}{H5. \textsf{Cyan}}, \textcolor{H6}{H6.\textsf{ Ocean Blue}} and \textcolor{H7}{H7. \textsf{Romantic purple}}.
-
-Here, the second value \verb|title| is mandatory, and it can add the title above the center of the cover page while the third value \verb|subtitle| is optional, and it can add the subtitle vertically to the lower left of the center. The first variable is from \textcolor{H1}{H1} to \textcolor{H7}{H7} and the default value is \textcolor{H5}{H5}.
-
-If a star (*) is added after this command, there will be an empty note after the cover page (or the title page if you assigned in the command \cmd{flyleaf}) automatically.
-
-\subsection{The \cmd{chapter} command}
-\begin{verbatim}
- \chapter[chaptertitle]{filename} \chapter*[chaptertitle]{filename}
-\end{verbatim}
-
-This command has 2 variables: \verb|chaptertitle| and \verb|filename|, will assign the following chapter title and the file (such as PDF made from \textsf\LaTeX{}) will be inputted. Here, the value \verb|chaptertitle| is optional.
-
-If a star (*) is added after this command, the counter \verb|chap| won't take effect.
-
-\subsection{The \cmd{emptynote} \& \cmd{emptyhdunote} commands}
-\begin{verbatim}
- \emptynote \emptynote* \emptyhdunote \emptyhdunote*
- \emptynote[1] \emptynote*[2] \emptyhdunote[3] \emptyhdunote*[4]
-\end{verbatim}
-
-Command \cmd{emptynote} will create an empty note paper with the chapter title before and page number following the previous page, and command \cmd{emptyhdunote} will create an empty note paper with logo (may include link) and info were assigned by the command \cmd{logo} but without chapter title on the top of the note paper.
-
-If a star (*) is added after this command, then the note paper created won't include the chapter title and page number. Also, the counter \verb|page| won't take effect.
-
-There's one optional variable of these command, it decides the number of note papers you will create, and the default value is 1, certainly.
-
-\subsection{The \cmd{newnote (sss) (ssss)} commands}
-\begin{verbatim}
- \newnote{start page}{end page} % insert 1 image per page
- \newnotesss{start page}{end page} % insert 3 images per page
- \newnotessss{start page}{end page} % insert 4 images per page
-\end{verbatim}
-
-These commands will create note papers that were inserted images on the left side, the two variables is the start page number and the end page number of the file that was already assigned by the second variable of the command \cmd{chapter}.
-
-\section{Version History}
-
-In the Advanced Quantum Mechanics class on 19 October 2023, my \emph{obsessive-compulsive disorder} forced me to copy all the content projected by the teacher onto the whiteboard on my iPad, and I found that I only got a few pages full of notes without any knowledge understood in my brain after a class is over. Then, an idea suddenly occurred me: Why not create an automated program to quickly insert the Beamers given by the teacher before class with the format of several images per page? So I can just annotate on it and pay more attention to listen to the teacher. After the class ended that day, I went back to my dormitory and started writing programs in \textsf\LaTeX{}.
-
-\textsf{\bfseries Version 1.0} was finished developing on 22 October 2023 and released on \href{https://www.latexstudio.net/index/details/index/mid/3720.html}{LaTeX Studio} (Xiaoshan, Hangzhou) and \href{https://www.xiaohongshu.com/user/profile/61e7ad870000000010005642}{Xiaohongshu}, where won the favor of many people and even some people who have already retired from \textsf\LaTeX{} want to re-enter.
-
-On 24 October 2023, a member in the CMC competition WeChat group praised for my template, and proposed his idea: the template could be magically changed to insert a slightly smaller page of notes on the left side and take notes on the right side, because he found that he can only write in the corners when annotating some notes. It's a good idea, then I'm setting about developing the next version of the template.
-
-While considering the suggestions from friends, I am also thinking about how to simplify the previous code. Because in version 1.0, if one want to insert a Beamer with 78 images and make 3 images per page, then he should write the command \cmd{newnotesss} for 26 times, it's so inelegant... However, no matter how I write the loop, it can't meet my expectations or report errors. Then, I asked stackexchange for help, and finally a LaTeX programmer \href{https://tex.stackexchange.com/users/51799/wipet}{wipet} wrote the loop module for me. Here, I want to express my gratitude to him.
-
-\textsf{\bfseries Version 2.0a} was finished developing on 1 November 2023. This version not only simplified the commands to insert Beamers from to dozens of commands to only 1 command, but redesigned some details and functions. Firstly, this version supports to insert only one page of notes on the left side. What's more, this version supports to insert your school's logo on the cover page and empty note paper. Also, this version supports insert empty note papers without page number and chapter title with just add a star (*) after the command. Finally, this version can add a subtitle on the cover page, and redesign the colors (chosen from Hangzhou MTR) of the cover pages.
-
-\textsf{\bfseries Version 2.1a} was finished developing on 9 November 2023. This version has fixed some bugs, and now supports inserting non-consecutive page numbers of the same file, and you can insert a certain number of empty note papers with only one command. Also, this version has redesigned the top and bottom margins and the height between note lines in response to the suggestion from \href{https://qm.qq.com/q/OnHzbNvVAG}{QQ Group} member. What's more, this version supports the `Libertinus' font, which can make users have a better visual effect.
-
-\textsf{\bfseries Version 2.2b} was finished developing on 11 November 2023. This version has fixed some bugs, and partial commands in this version has changed to use \sffamily\LaTeX{2e} original commands.
-
-\textsf{\bfseries Version 2.3a} was finished developing on 15 November 2023. This version added the option to make the note lines colorful, and removed the packages that already available in the kernel.
-
-\newpage
-\datechange{2023/11/01}{Version 2.0a}
-\begin{itemize}
- \item Simplify the command of inserting 3 \& 4 images per page.
- \item Redesign the cover page \& note paper title.
- \item Add commands to create empty note paper with(out) chapter title \& page number.
- \item Add commands to create empty note paper with logo and info on the top.
-\end{itemize}
-
-\datechange{2023/11/09}{Version 2.1a}
-\begin{itemize}
- \item Fixed the bug of page number errors when inserting the title page.
- \item Fixed the bug of picture string position when inserting the first page number of courseware when the page number is not 1.
- \item Supports inserting non-consecutive page numbers of the same file.
- \item Supports inserting a certain number of empty note papers \& HDU empty note papers with only one command.
- \item Support the `Libertinus' font.
- \item Increased the top and bottom margins of the page by 18.8\% than before.
- \item Other detailed adjustments.
-\end{itemize}
-
-\datechange{2023/11/11}{Version 2.2b}
-\begin{itemize}
- \item Fixed the image position error when inserting 3 and 4 images per note page.
- \item Partially using \sffamily\LaTeX{2e} original commands.
-\end{itemize}
-
-\datechange{\today}{Version 2.3a}
-\begin{itemize}
- \item Added the option to make the note lines colorful.
- \item Added another options in the mode \mode{saturation}.
- \item Removed the packages that already available in the kernel.
-\end{itemize}
-
-\newpage
-\appendix
-\section{Document Example}
-\lstinputlisting[style=TeX]{notebeamer-demo.tex}
-
-\vspace{0.5em}\hrule\vspace{0.5em}
-
-\label{dirtree}
-\begin{minipage}{0.48\textwidth}
- \dirtree{%
- .1 notebeamer/.
- .2 doc/.
- .3 images/.
- .3 notebeamer-demo.tex.
- .3 notebeamer-demo.pdf.
- .3 notebeamer-doc.tex.
- .3 notebeamer-doc.pdf.
- .2 tex/.
- .3 notebeamer.cls.
- .2 License.
- .2 README.md.
- }
-\end{minipage}
-\hfill
-\begin{minipage}{0.48\textwidth}
- \dirtree{%
- .1 doc/.
- .2 images/.
- .3 HDU.pdf.
- .3 Inuyasa.jpg.
- .3 titlepage1.pdf.
- .3 titlepage2.pdf.
- .3 newnotedemo.pdf.
- .3 newnote3sdemo.pdf.
- .3 newnote4sdemo.pdf.
- .2 notebeamer-demo.tex.
- .2 notebeamer-demo.pdf.
- }
-\end{minipage}
-
-
-\includepdf[pages=-,nup=4x4]{notebeamer-demo.pdf}
-\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/notebeamer/doc/notebeamer.pdf b/macros/latex/contrib/notebeamer/doc/notebeamer.pdf
new file mode 100644
index 0000000000..804e18b158
--- /dev/null
+++ b/macros/latex/contrib/notebeamer/doc/notebeamer.pdf
Binary files differ
diff --git a/macros/latex/contrib/notebeamer/doc/notebeamer.tex b/macros/latex/contrib/notebeamer/doc/notebeamer.tex
new file mode 100644
index 0000000000..79f518807f
--- /dev/null
+++ b/macros/latex/contrib/notebeamer/doc/notebeamer.tex
@@ -0,0 +1,135 @@
+\documentclass[11pt,svgnames]{article}
+\usepackage[notelinecolor=MidnightBlue,notemargin=.75in]{notebeamer}
+\usepackage{geometry,titlesec,authblk,hyperref,hologo,pgfpages,lipsum}
+\titleformat*{\section}{\bfseries\large}
+\titleformat*{\subsection}{\bfseries\normalsize}
+\hologoFontSetup{general=\sffamily}
+\usepackage{datetime}\yyyymmdddate
+\usepackage[libertine,mono=false]{newtx}
+\usepackage{listings}
+\lstset{language=[LaTeX]TeX,basicstyle=\ttfamily,breaklines=true,columns=flexible}
+\hypersetup{colorlinks,urlcolor=MidnightBlue}
+\def\pkg#1{\textcolor{DarkGreen}{\textsf{#1}}}
+\def\mode#1{\textcolor{Indigo}{\textsf{#1}}}
+\def\cmd#1{\textcolor{MidnightBlue}{\texttt{\string#1}}}
+
+\title{\bfseries The \pkg{notebeamer} Package}
+\author{Mingyu Hsia, \href{mailto:xiamyphys@gmail.com}{\ttfamily xiamyphys@gmail.com}}
+\affil{Hangzhou Dianzi University}
+\date{\today\quad Version 3.0a\thanks{\url{https://github.com/xiamyphys/notebeamer}}}
+
+\begin{document}
+\maketitle
+
+\begin{abstract}
+
+This is the document for the \pkg{notebeamer} package, which provides an easy way to input slides on notepages quickly for making annotations.
+
+Welcome to feedback bugs or ideas via email \href{mailto:xiamyphys@gmail.com}{\ttfamily xiamyphys@gmail.com} or \href{https://github.com/xiamyphys/fadingimage}{GitHub}.
+
+\end{abstract}
+
+\section{Installing \pkg{notebeamer} and loading it}
+
+Simply download \verb|notebeamer.cls| file from \href{https://github.com/xiamyphys/notebeamer}{GitHub} or \href{https://ctan.org/pkg/fadingimage}{CTAN} and save it under your working directory. However, I strongly suggest to use terminal to install and update all packages to the latest version
+
+\begin{verbatim}
+ sudo tlmgr update --self --all
+\end{verbatim}
+
+To learn more, please refer to \href{https://tex.stackexchange.com/questions/55437/how-do-i-update-my-tex-distribution}{How do I update my \hologo{TeX} distribution?}
+
+\section{Key values of this package}
+
+\begin{verbatim}
+ \usepackage[notelinecolor=<color>,notemargin=<margin>]{notebeamer}
+\end{verbatim}
+
+This package has two keys: \cmd{notelinecolor} and \cmd{notemargin}.
+
+The \cmd{notelinecolor} key can set the color notelines, the \cmd{notemargin} key can set the margin of notepages.
+
+If you have not set the keys, the default values of the four keys will be applied
+
+\begin{verbatim}
+ notelinecolor=MidnightBlue, notemargin=.75in
+\end{verbatim}
+
+Please set the geometry for the whole document \textbf{after} you set the notemargin, that is
+
+\begin{verbatim}
+ \usepackage[notemargin=<margin>]{notebeamer} \geometry{<keyval list>}
+\end{verbatim}
+
+otherwise the notemargin configuration won't work.
+
+\section{The margin of notepages}
+
+The relation of the margin of notepages and the margin configuration of package \pkg{geometry} satisfies the following expression
+
+\begin{verbatim}
+ topmargin = bottommargin = (\paperwidth-\textwidth)/3
+ leftmargin = rightmargin = (2\paperheight-2\textheight)/5
+\end{verbatim}
+
+\section{Commands of \pkg{notebeamer}}
+
+\subsection{The \cmd{notechap} command}
+
+\begin{verbatim}
+ \notechap [<notetitle>] {<filename>}
+\end{verbatim}
+
+This command can assign the following notetitle and the PDF file you want to input.
+
+\subsection{The \cmd{notelinenum} and \cmd{notecolumnratio} commands}
+
+\begin{verbatim}
+ \notelinenum{<number>} \notecolumnratio{<number>}
+\end{verbatim}
+
+The two commands can assign the number of notelines and the ratio of columns on following notepages respectively. The default value of the number of notelines is \verb|27| and that of the ratio of columns is \verb|0.5|.
+
+\subsection{The \cmd{hidenotelinetrue} and \cmd{hidenotelinefalse} commands}
+
+Notepages after the \cmd{hidenotelinetrue} command the notelines will be hidden while notepages after command \cmd{hidenotelinefalse} the notelines will be restored.
+
+\subsection{The \cmd{newnotepage}}
+
+\begin{verbatim}
+ \newnotepage[<number>] \newnotepage*[<number>]
+\end{verbatim}
+
+The \cmd{newnotepage} command can create empty notepage(s). If a star (*) is added after the command, the created empty notepage(s) won't have column rule.
+
+\subsection{The \cmd{includebeamer} command}
+
+\begin{verbatim}
+ \includebeamer[<number of slides per page>]{<start page>}{<end page>}
+\end{verbatim}
+
+This commands will create notepages that were inserted images on the left sidnumber of slides per page and the last two variables can set the start page and end page of the PDF file you want to insert that assigned by the command \cmd{notechap}.
+
+\appendix
+\section{The \pkg{litesolution} class}
+
+This class provides a lite design for typesetting solutions of exams, textbooks or other exercises. The \pkg{notebeamer} package is contained in the \pkg{litesolution} class now.
+
+\clearpage
+\pgfpagesuselayout{4 on 1}[letterpaper]
+
+\notelinenum{27}\pagecolor{yellow!2}
+
+\notechap[Chapter 1. Introduction \& Fundamental Concepts]{figures/beamerdemo.pdf}
+\notecolumnratio{.57}
+\hidenotelinefalse \includebeamer[3]{2}{4}
+\notecolumnratio{.43}
+\hidenotelinetrue \includebeamer[4]{3}{6}
+
+\notechap[Phys. Rev. B. Volume 50, Number 8]{figures/paperdemo.pdf}
+\notecolumnratio{.72}
+\hidenotelinefalse \includebeamer[1]{2}{2}
+
+\notecolumnratio{.5} \newnotepage
+
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/notebeamer/tex/notebeamer.cls b/macros/latex/contrib/notebeamer/tex/notebeamer.cls
deleted file mode 100644
index fef627cad0..0000000000
--- a/macros/latex/contrib/notebeamer/tex/notebeamer.cls
+++ /dev/null
@@ -1,314 +0,0 @@
-%% ************************************************************************************************************
-%% ****************************************************** *
-%% * This work may be distributed and/or modified under * * ***** * * *
-%% * the conditions of the LaTeX Project Public License * * ** * * *** * * *
-%% * http://www.latex-project.org/lppl.txt * * * ** * ***** * *
-%% * either version 1.3c of this license or any later * * * ** * ***** * *
-%% * version. * * * ** * * * * *
-%% ****************************************************** ***** ** * * *** * * *
-%% start of file `notebeamer.cls'. *
-%% Copyright 2023 LiteLaTeX (xiamyphys@gmail.com) *
-%% available at https://github.com/xiamyphys/NoteBeamer *
-%% Thanks `wipet' (https://petr.olsak.net/) provides Beamers automatically inserts module *
-%% !Mode:: "TeX:UTF-8" *
-%% ************************************************************************************************************
-
-\NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{notebeamer}[2023/11/15 v2.3a NoteBeamer document class]
-
-%% Global opinions
-\RequirePackage{kvoptions}
-\RequirePackage{etoolbox}
-\SetupKeyvalOptions{family=NB, prefix=NB@, setkeys=\kvsetkeys}
-\def\ekv#1{\kvsetkeys{NB}{#1}}
-
-\DeclareStringOption[normal]{saturation}
-\DeclareVoidOption{lighter}{\ekv{saturation=lighter}}
-\DeclareVoidOption{light}{\ekv{saturation=light}}
-\DeclareVoidOption{normal}{\ekv{saturation=normal}}
-\DeclareVoidOption{dark}{\ekv{saturation=dark}}
-\DeclareVoidOption{darker}{\ekv{saturation=darker}}
-
-\DeclareStringOption[main]{color}
-\DeclareVoidOption{main}{\ekv{color=main}}
-\DeclareVoidOption{colorful}{\ekv{color=colorful}}
-
-\DeclareStringOption[times]{font}
-\DeclareVoidOption{times}{\ekv{font=times}}
-\DeclareVoidOption{libertinus}{\ekv{font=libertinus}}
-
-\DeclareDefaultOption{\PassOptionsToClass{\CurrentOption}{standalone}}
-\ProcessKeyvalOptions*\relax
-\PassOptionsToPackage{quiet}{fontspec}
-\LoadClass[tikz]{standalone}
-
-%% Packages
-\RequirePackage[colorlinks,linkcolor=black,urlcolor=black]{hyperref}
-\RequirePackage{ctex}
-\RequirePackage{fontawesome5}
-
-%% Global definitions
-\def\notewidth{6.32}
-\def\noteheight{8.18}
-\def\author#1{\gdef\@author{#1}}
-\def\mail#1{\gdef\@mail{\href{mailto:#1}{\nolinkurl{#1}}}}
-\NewDocumentCommand\chapter{s o m}{
- \IfBooleanTF{#1}{}{\refstepcounter{chap}}
- \gdef\@chapter{#2}
- \gdef\@courseware{#3}
- \setcounter{note}{0}
-}
-\def\flyleaf#1{\gdef\@flyleaf{#1}}
-\def\sticker#1{\gdef\@sticker{#1}}
-\NewDocumentCommand\logo{O{https://www.hdu.edu.cn} m O{Hangzhou·Zhejiang}}{\gdef\@edu{#1}\gdef\@logo{#2}\gdef\@address{#3}}
-
-%% Fonts
-\ifdefstring{\NB@font}{libertinus}{
-\setmainfont{Libertinus Serif}
-\setsansfont{Libertinus Sans}
-\setmonofont{NotoSansMono}[
- Scale=MatchLowercase,
- Extension=.ttf,
- UprightFont=*-Light,
- BoldFont=*-Medium
-]
-}{\relax}
-
-%% notepages
-\RequirePackage{graphics}
-\graphicspath{{./beamer/}{./figure/}{./figures/}{./image/}{./images/}{./graphics/}{./graphic/}{./pictures/}{./picture/}}% Paths
-\definecolor{pagecolor}{HTML}{F7F6E9}
-\definecolor{main}{HTML}{223A70}
-\newcounter{chap}
-\newcounter{note}
-\def\chaptername{\faIcon{seedling} Chapter}
-
-%%%% 1 note per page
-\def\newnote#1#2{
- \refstepcounter{note}
- \addtocounter{note}{-1}
- \foreach \n in {#1,...,#2}{
- \begin{tikzpicture}
- \fill [pagecolor!50] (0,0) rectangle (\notewidth in,\noteheight in);% 边界
- \ifcsname @sticker\endcsname\node [anchor=south east,opacity=0.24,inner sep=0pt] at (0.985*\notewidth in,0.012*\noteheight in) {\includegraphics[height=1.07158 in]{\@sticker}};\fi
-
- %%%%%% imput file
- \node [yshift=(\thenote+1)*33*0.028*\noteheight in,inner sep=0pt] at (0.4*\notewidth in,0.038*\noteheight in-12.5*0.028*\noteheight in) {\ifcsname @chapter\endcsname\includegraphics[height=5.61148 in,page=\n]{\@courseware}\fi};
-
- %%%%%% draw lines & dots: right
- \foreach \a in {9,...,33}
- \foreach \b in {24,...,29}
- \fill [fill=main!50!gray,xshift=\b*0.03*\notewidth in,yshift=\a*\noteheight*0.028 in] (0.05*\notewidth in,0.038*\noteheight in) circle (0.006);% 点
- \foreach \a in {9,...,32}
- \draw [line cap=round,opacity=0.5,main!80!gray!80,yshift=\a*\noteheight*0.028 in] (0.75*\notewidth in+0.25*0.028*\notewidth in,0.038*\noteheight in) --++ (0.2*\notewidth in-0.25*0.028*\notewidth in,0);% 横线
-
- %%%%%% draw lines & dots: bottom
- \foreach \a in {0,...,8,8}
- \foreach \b in {1,...,29}
- \fill [fill=main!50!gray,xshift=\b*0.03*\notewidth in,yshift=\a*\noteheight*0.028 in] (0.05*\notewidth in,0.038*\noteheight in) circle (0.006);% 点
- \foreach \a in {1,...,8,8}
- \draw [line cap=round,opacity=0.5,main!80!gray!80,yshift=\a*\noteheight*0.028 in] (0.05*\notewidth in,0.038*\noteheight in) --++ (0.9*\notewidth in,0);% 横线
-
- \draw [line cap=round,main!80,thick] (0.05*\notewidth in,0.038*\noteheight in) --++ (0.9*\notewidth in,0);% 底部粗线
-
- \draw [line cap=round,main!80,thick,yshift=33*0.028*\noteheight in] (0.05*\notewidth in,0.038*\noteheight in) --++ (0.9*\notewidth in,0) node [anchor=south west,at start] {\small\color{main}\bfseries\sffamily\chaptername~\ifcsname @chapter\endcsname\thechap. \@chapter\fi} node [anchor=south east] {\small\color{main}\bfseries\sffamily Page \thepage\quad};% 顶部粗线
-
- \draw [line cap=round,thick,opacity=0.4,main!50!gray] (0.75*\notewidth in,0.038*\noteheight in+8.25*0.028*\noteheight in) -- (0.75*\notewidth in,0.038*\noteheight in+32.75*0.028*\noteheight in);% 分æ çº¿
- \end{tikzpicture}
- }
-}
-
-%%%% 3 beamers per page
-\def\threebeamers#1#2#3{
- \refstepcounter{note}
- \begin{tikzpicture}
- \fill [pagecolor!50] (0,0) rectangle (\notewidth in,\noteheight in);% 边界
- \ifcsname @sticker\endcsname\node [anchor=south east,opacity=0.24,inner sep=0pt] at (0.985*\notewidth in,0.012*\noteheight in) {\includegraphics[height=1.07158 in]{\@sticker}};\fi
-
- %%%%%% imput file
- \foreach \n in {#1,#2,#3}
- \node [yshift=(27.5-(\n-#1)*11)*0.028*\noteheight in,inner sep=0pt] at (0.3125*\notewidth in,0.038*\noteheight in) {\ifcsname @chapter\endcsname\includegraphics[height=2.40492 in,page=\n]{\@courseware}\fi};
-
- %%%%%% draw lines & dots
- \foreach \a in {0,...,33}
- \foreach \b in {18,...,29}
- \fill [fill=main!50!gray,xshift=\b*0.03*\notewidth in,yshift=\a*\noteheight*0.028 in] (0.05*\notewidth in,0.038*\noteheight in) circle (0.006);% 点
- \foreach \a in {1,...,32}
- \draw [line cap=round,opacity=0.5,main!80!gray!80,yshift=\a*\noteheight*0.028 in] (0.575*\notewidth in+0.25*0.028*\notewidth in,0.038*\noteheight in) --++ (0.375*\notewidth in-0.25*0.028*\notewidth in,0);% 横线
-
- \draw [line cap=round,main!80,thick] (0.05*\notewidth in,0.038*\noteheight in) --++ (0.9*\notewidth in,0);% 底部粗线
-
- \draw [line cap=round,main!80,thick,yshift=33*0.028*\noteheight in] (0.05*\notewidth in,0.038*\noteheight in) --++ (0.9*\notewidth in,0) node [anchor=south west,at start] {\small\color{main}\bfseries\sffamily\chaptername~\ifcsname @chapter\endcsname\thechap. \@chapter\fi} node [anchor=south east] {\small\color{main}\bfseries\sffamily Page \thepage\quad};% 顶部粗线
-
- \draw [line cap=round,thick,opacity=0.4,main!50!gray] (0.575*\notewidth in,0.038*\noteheight in+0.25*0.028*\noteheight in) -- (0.575*\notewidth in,0.038*\noteheight in+32.75*0.028*\noteheight in);% 分æ çº¿
- \end{tikzpicture}
-}
-
-%%%%%% Simplify loop 3
-\newcount\tmpnum
-\def\newnotesss#1#2{%
-\addtocounter{note}{-1}
- \def\maxnum{#2}\tmpnum=#1
- \loop
- \unless\ifnum\tmpnum>#2 \threebeamers{\valnum0}{\valnum1}{\valnum2}
- \advance\tmpnum by3
- \repeat
-}
-\def\valnum#1{%
- \ifnum\maxnum>\numexpr\tmpnum+#1\relax
- \the\numexpr\tmpnum+#1\relax \else \maxnum\fi
-}
-
-%%%% 4 slides per page
-\def\fourbeamers#1#2#3#4{
- \refstepcounter{note}
- \begin{tikzpicture}
- \fill [pagecolor!50] (0,0) rectangle (\notewidth in,\noteheight in);% 边界
- \ifcsname @sticker\endcsname\node [anchor=south east,opacity=0.24,inner sep=0pt] at (0.985*\notewidth in,0.012*\noteheight in) {\includegraphics[height=1.07158 in]{\@sticker}};\fi
- %%%%%% imput file
- \foreach \n in {#1,#2,#3,#4}
- \node [yshift=(28.875-(\n-#1)*8.25)*0.028*\noteheight in,inner sep=0pt] at (0.3125*\notewidth in,0.038*\noteheight in) {\ifcsname @chapter\endcsname\includegraphics[height=1.77506 in,page=\n]{\@courseware}\fi};
-
- \foreach \a in {0,...,33}
- \foreach \b in {18,...,29}
- \fill [fill=main!50!gray,xshift=\b*0.03*\notewidth in,yshift=\a*\noteheight*0.028 in] (0.05*\notewidth in,0.038*\noteheight in) circle (0.006);% 点
- \foreach \a in {1,...,32}
- \draw [line cap=round,opacity=0.5,main!80!gray!80,yshift=\a*\noteheight*0.028 in] (0.575*\notewidth in+0.25*0.028*\notewidth in,0.038*\noteheight in) --++ (0.375*\notewidth in-0.25*0.028*\notewidth in,0);% 横线
-
- \draw [line cap=round,main!80,thick] (0.05*\notewidth in,0.038*\noteheight in) --++ (0.9*\notewidth in,0);% 底部粗线
-
- \draw [line cap=round,main!80,thick,yshift=33*0.028*\noteheight in] (0.05*\notewidth in,0.038*\noteheight in) --++ (0.9*\notewidth in,0) node [anchor=south west,at start] {\small\color{main}\bfseries\sffamily\chaptername~\ifcsname @chapter\endcsname\thechap. \@chapter\fi} node [anchor=south east] {\small\color{main}\bfseries\sffamily Page \thepage\quad};% 顶部粗线
-
- \draw [line cap=round,thick,opacity=0.4,main!50!gray] (0.575*\notewidth in,0.038*\noteheight in+0.25*0.028*\noteheight in) -- (0.575*\notewidth in,0.038*\noteheight in+32.75*0.028*\noteheight in);% 分æ çº¿
- \end{tikzpicture}
-}
-
-%%%%%% Simplify loop 4
-\newcount\tmpnum
-\def\newnotessss#1#2{%
-\addtocounter{note}{-1}
- \def\maxnum{#2}\tmpnum=#1
- \loop
- \unless\ifnum\tmpnum>#2 \fourbeamers{\valnum0}{\valnum1}{\valnum2}{\valnum3}
- \advance\tmpnum by4
- \repeat
-}
-\def\valnum#1{%
- \ifnum\maxnum>\numexpr\tmpnum+#1\relax
- \the\numexpr\tmpnum+#1\relax \else \maxnum\fi
-}
-
-%%%% emptynote (*without chapter title & page number)
-\NewDocumentCommand\clearnote{s}{
-\begin{tikzpicture}
- \fill [pagecolor!50] (0,0) rectangle (\notewidth in,\noteheight in);% 边界
- \ifcsname @sticker\endcsname\node [anchor=south east,opacity=0.24,inner sep=0pt] at (0.985*\notewidth in,0.012*\noteheight in) {\includegraphics[height=1.07158 in]{\@sticker}};\fi
- \foreach \a in {0,...,33}
- \foreach \b in {1,...,29}
- \fill [fill=main!50!gray,xshift=\b*0.03*\notewidth in,yshift=\a*\noteheight*0.028 in] (0.05*\notewidth in,0.038*\noteheight in) circle (0.006);% 点
- \foreach \a in {1,...,32}
- \draw [line cap=round,opacity=0.5,main!80!gray!80,yshift=\a*\noteheight*0.028 in] (0.05*\notewidth in,0.038*\noteheight in) --++ (0.9*\notewidth in,0);% 横线
-
- \draw [line cap=round,main!80,thick] (0.05*\notewidth in,0.038*\noteheight in) --++ (0.9*\notewidth in,0);% 底部粗线
-
- \IfBooleanTF{#1}
- {
- \draw [line cap=round,main!80,thick,yshift=33*0.028*\noteheight in] (0.05*\notewidth in,0.038*\noteheight in) --++ (0.9*\notewidth in,0) node [anchor=south west,at start] {\small\color{main}\bfseries\sffamily\chaptername} node [anchor=south east] {\small\color{main}\bfseries\sffamily Page\addtocounter{page}{-1}\quad\quad};% 顶部粗线
- }
- {
- \draw [line cap=round,main!80,thick,yshift=33*0.028*\noteheight in] (0.05*\notewidth in,0.038*\noteheight in) --++ (0.9*\notewidth in,0) node [anchor=south west,at start] {\small\color{main}\bfseries\sffamily\chaptername~\ifcsname @chapter\endcsname\thechap. \@chapter\fi} node [anchor=south east] {\small\color{main}\bfseries\sffamily Page \thepage\quad};% 顶部粗线
- }
-
- \draw [line cap=round,thick,opacity=0.4,main!50!gray] (0.5*\notewidth in,0.038*\noteheight in+0.25*0.028*\noteheight in) -- (0.5*\notewidth in,0.038*\noteheight in+32.75*0.028*\noteheight in);% 分æ çº¿
-\end{tikzpicture}
-}
-
-\NewDocumentCommand\emptynote{s O{1}}
-{\IfBooleanTF{#1}{
- \Repeat{#2}{\clearnote*}
- }{
- \Repeat{#2}{\clearnote}
- }
-}
-
-%%%% emptynote with school title (*without chapter title & page number)
-\NewDocumentCommand\clearhdunote{s}{
-\begin{tikzpicture}
- \fill [pagecolor!50] (0,0) rectangle (\notewidth in,\noteheight in);% 边界
- \ifcsname @sticker\endcsname\node [anchor=south east,opacity=0.24,inner sep=0pt] at (0.985*\notewidth in,0.012*\noteheight in) {\includegraphics[height=1.07158 in]{\@sticker}};\fi
- \foreach \a in {0,...,32}
- \foreach \b in {1,...,29}
- \fill [fill=main!50!gray,xshift=\b*0.03*\notewidth in,yshift=\a*\noteheight*0.028 in] (0.05*\notewidth in,0.038*\noteheight in) circle (0.006);% 点
- \foreach \a in {1,...,31}
- \draw [line cap=round,opacity=0.5,main!80!gray!80,yshift=\a*\noteheight*0.028 in] (0.05*\notewidth in,0.038*\noteheight in) --++ (0.9*\notewidth in,0);% 横线
-
- \IfBooleanTF{#1}
- {
- \draw [line cap=round,main!80,thick] (0.05*\notewidth in,0.038*\noteheight in) --++ (0.9*\notewidth in,0) node [anchor=north east,darkgray] {\small\color{main}\bfseries\sffamily Page\addtocounter{page}{-1}\quad\quad};% 底部粗线
- }{
- \draw [line cap=round,main!80,thick] (0.05*\notewidth in,0.038*\noteheight in) --++ (0.9*\notewidth in,0) node [anchor=north east,darkgray] {\small\color{main}\bfseries\sffamily Page \thepage\quad};% 底部粗线
- }
-
- \draw [line cap=round,main!80,thick,yshift=32*0.028*\noteheight in] (0.05*\notewidth in,0.038*\noteheight in) --++ (0.9*\notewidth in,0)\ifcsname @logo\endcsname node [anchor=west,at start,yshift=0.033*\noteheight in,inner sep=0pt] {\href{\@edu}{\includegraphics[height=0.45808 in]{\@logo}}} node [anchor=east,yshift=0.033*\noteheight in] {\bfseries\heiti\color{main}\faIcon{map-pin} \@address\quad\quad}\fi;% 顶部粗线
-
- \draw [line cap=round,thick,opacity=0.4,main!50!gray] (0.5*\notewidth in,0.038*\noteheight in+0.25*0.028*\noteheight in) -- (0.5*\notewidth in,0.038*\noteheight in+31.75*0.028*\noteheight in);% 分æ çº¿
-\end{tikzpicture}
-}
-
-\NewDocumentCommand\emptyhdunote{s O{1}}
-{\IfBooleanTF{#1}{
- \Repeat{#2}{\clearhdunote*}
- }{
- \Repeat{#2}{\clearhdunote}
- }
-}
-
-%% covers
-\ifdefstring{\NB@saturation}{lighter}{\def\@saturation{.18}}{\relax}
-\ifdefstring{\NB@saturation}{light}{\def\@saturation{.15}}{\relax}
-\ifdefstring{\NB@saturation}{normal}{\def\@saturation{.12}}{\relax}
-\ifdefstring{\NB@saturation}{dark}{\def\@saturation{.09}}{\relax}
-\ifdefstring{\NB@saturation}{darker}{\def\@saturation{.06}}{\relax}
-
-\definecolor{H1}{Hsb}{349,\@saturation,.9}% 海棠紅 (Hangzhou MTR L 1 )
-\definecolor{H1*}{HTML}{702230}
-\definecolor{H2}{Hsb}{23, \@saturation,.9}% 丹桂橙 (Hangzhou Metro 2 )
-\definecolor{H2*}{HTML}{703F22}
-\definecolor{H3}{Hsb}{48, \@saturation,.9}% 柠檬黄 (Hangzhou Metro 3 )
-\definecolor{H3*}{HTML}{706022}
-\definecolor{H4}{Hsb}{103,\@saturation,.9}% 香樟绿 (Hangzhou Metro 4 )
-\definecolor{H4*}{HTML}{387022}
-\definecolor{H5}{Hsb}{188,\@saturation,.9}% é’è—色 (Hangzhou MTR L 5 )
-\definecolor{H5*}{HTML}{226570}
-\definecolor{H6}{Hsb}{207,\@saturation,.9}% æµ·æ´‹è“ (Hangzhou Metro 6 )
-\definecolor{H6*}{HTML}{224C70}
-\definecolor{H7}{Hsb}{290,\@saturation,.9}% 浪漫紫 (Hangzhou Metro 7 )
-\definecolor{H7*}{HTML}{632270}
-
-\NewDocumentCommand\notebook{s O{H5} m O{}}{
- \setcounter{chap}{0}
- \setcounter{page}{0}
- \begin{tikzpicture}
- \fill [#2] (0,0) rectangle (\notewidth in,\noteheight in);% 边界
- \fill [white,opacity=0.17] (0.2*\notewidth in,0.6*\noteheight in) rectangle (\notewidth in,0);
- \fill [white,opacity=0.17] (0.3*\notewidth in,0.7*\noteheight in) rectangle (\notewidth in,0);
- \node at (0.65*\notewidth in,0.65*\noteheight in) {\LARGE\bfseries\sffamily #3};
- \node [rotate=90,opacity=0.4] at (0.25*\notewidth in,0.3*\noteheight in) {\sffamily\Large\bfseries\MakeUppercase{#4}};
- \draw [thick,line cap=round] (0.65*\notewidth in,0.05*\noteheight in) --++ (0.25*\notewidth in,0) node [anchor=south west] {\large\faIcon{feather-alt}} \ifcsname @mail\endcsname node [midway,anchor=south] {\bfseries\texttt{\@mail}}\fi node [midway,anchor=south,yshift=2em] {\bfseries\sffamily\large\ifcsname @author\endcsname\@author\fi};
- \ifcsname @logo\endcsname\node [anchor=north west] at (0.025*\notewidth in,0.991*\noteheight in) {\href{\@edu}{\includegraphics[width=2.212 in]{\@logo}}};\fi
- \end{tikzpicture}
- \ifdefstring{\NB@color}{colorful}{\colorlet{main}{main}}{\relax}
- \ifdefstring{\NB@color}{colorful}{\colorlet{main}{#2*}}{\relax}
- \ifcsname @flyleaf\endcsname
- \addtocounter{page}{-1}
- \begin{tikzpicture}
- \node [inner sep=0pt] at (0.5*\notewidth in,0.5*\noteheight in) {\includegraphics[width=\notewidth in]{\@flyleaf}};
- \end{tikzpicture}
- \fi
- \IfBooleanTF{#1}{\emptynote*}{}
-}
-
-%% LaTeX 3 \Repeat supports
-\ExplSyntaxOn
-\cs_new_eq:NN \Repeat \prg_replicate:nn
-\ExplSyntaxOff \ No newline at end of file
diff --git a/macros/latex/contrib/notebeamer/tex/notebeamer.sty b/macros/latex/contrib/notebeamer/tex/notebeamer.sty
new file mode 100644
index 0000000000..84e06bf49a
--- /dev/null
+++ b/macros/latex/contrib/notebeamer/tex/notebeamer.sty
@@ -0,0 +1,160 @@
+%% ***********************************************************
+%% Copyright 2024 by Mingyu Hsia <xiamyphys@gmail.com> *
+%% *
+%% This work may be distributed and/or modified under *
+%% the conditions of the LaTeX Project Public License *
+%% *
+%% http://www.latex-project.org/lppl.txt *
+%% *
+%% either version 1.3c of this license or any later *
+%% version. *
+%% *
+%% This work has the LPPL maintenance status `maintained'. *
+%% *
+%% The Current Maintainer of this work is Mingyu Hsia. *
+%% *
+%% This work consists of the files notebeamer.sty, *
+%% and README.md. *
+%% available at https://github.com/xiamyphys/notebeamer *
+%% Thanks `wipet' (https://petr.olsak.net/) provides *
+%% Beamers automatically inserts module *
+%% ***********************************************************
+% !Mode:: "TeX:UTF-8"
+\NeedsTeXFormat{LaTeX2e}[2020/10/01]
+\ProvidesPackage{notebeamer}[2024/04/19 v3.0a notebeamer package]
+\RequirePackage{xkeyval}
+
+\DeclareOptionX{notelinecolor}{\gdef\@notelinecolor{#1}}
+\ExecuteOptionsX{notelinecolor=darkgray}
+\DeclareOptionX{notemargin}{\gdef\@notemargin{#1}}
+\ExecuteOptionsX{notemargin=.75in}
+
+\DeclareOptionX*{\PackageWarning{notebeamer}{`\CurrentOption' ignored}}
+\ProcessOptionsX\relax
+
+\RequirePackage{geometry,calc,tikz}
+\newgeometry{margin=\@notemargin}
+\tikzset{every picture/.append style={%
+ line join=round,line cap=round,thick}}
+\usetikzlibrary{calc}
+
+\newcounter{note}
+\NewDocumentCommand\notechap{o m}{
+ \gdef\@notechap{#1}
+ \gdef\@beamer{#2}
+ \setcounter{note}{0}}
+
+\newlength\hnotemargin\newlength\vnotemargin
+\setlength\hnotemargin{(\paperwidth-\textwidth)/3}
+\setlength\vnotemargin{(2\paperheight-2\textheight)/5}
+\newlength\notewidth\newlength\noteheight
+\setlength\notewidth{\paperwidth-2\hnotemargin}
+\setlength\noteheight{\paperheight-2\vnotemargin}
+\newlength\notelinespace
+
+\def\notelinenum#1{%
+ \gdef\@notelinenum{#1}
+ \setlength\notelinespace{\noteheight/#1}}
+\ifcsname @notelinenum\endcsname
+\else
+ \gdef\@notelinenum{27}
+ \setlength\notelinespace{\noteheight/27}
+\fi
+\def\notecolumnratio#1{\gdef\@notecolumnratio{#1}}
+\ifcsname @notecolumnratio\endcsname
+\else
+ \gdef\@notecolumnratio{.5}
+\fi
+
+\newif\ifhidenoteline
+
+\def\@onepaper#1{
+ \refstepcounter{note}\addtocounter{note}{-1}
+ \clearpage\thispagestyle{empty}
+ \begin{tikzpicture}[remember picture,overlay]
+ %%%%%% notepage lines
+ \draw [\@notelinecolor,opacity=.8,very thick] ($(current page.north west)+(\hnotemargin,-\vnotemargin)$) --++ (\notewidth,0) node [above right,at start,yshift=1ex] {\large\bfseries\sffamily\ifcsname @notechap\endcsname\@notechap\fi} node [above left,yshift=1ex] {\large\bfseries\sffamily Page \thepage\quad}; % 顶部粗线
+ \draw [\@notelinecolor,opacity=.8,thick] ($(current page.south west)+(\hnotemargin,\vnotemargin)$) --++ (\notewidth,0); % 底部粗线
+ \ifhidenoteline\else
+ \foreach \a in {2,...,\@notelinenum}
+ \draw [\@notelinecolor,opacity=.4,thick] ($(current page.south west)+(\hnotemargin,{\vnotemargin+(\a-1)*\notelinespace})$) --++ (\notewidth,0); % 横线
+ \fi
+ %%%%%% imput file
+ \node [below,yshift=\thenote*\noteheight-1ex,inner sep=0pt] at ($(current page.north west)+(\hnotemargin+.5*\@notecolumnratio*\notewidth,-\vnotemargin)$) {\ifcsname @notechap\endcsname\includegraphics[width=\dimeval{\@notecolumnratio\notewidth},page=#1]{\@beamer}\fi};
+ \end{tikzpicture}
+}
+
+\def\@threebeamer#1#2#3{
+ \refstepcounter{note}\addtocounter{note}{-1}
+ \clearpage\thispagestyle{empty}
+ \begin{tikzpicture}[remember picture,overlay]
+ %%%%%% notepage lines
+ \draw [\@notelinecolor,opacity=.8,very thick] ($(current page.north west)+(\hnotemargin,-\vnotemargin)$) --++ (\notewidth,0) node [above right,at start,yshift=1ex] {\large\bfseries\sffamily\ifcsname @notechap\endcsname\@notechap\fi} node [above left,yshift=1ex] {\large\bfseries\sffamily Page \thepage\quad}; % 顶部粗线
+ \draw [\@notelinecolor,opacity=.8,thick] ($(current page.south west)+(\hnotemargin,\vnotemargin)$) --++ (\notewidth,0); % 底部粗线
+ \ifhidenoteline\else
+ \foreach \a in {2,...,\@notelinenum}
+ \draw [\@notelinecolor,opacity=.4,thick] ($(current page.south west)+(\hnotemargin+\@notecolumnratio*\notewidth+1ex,{\vnotemargin+(\a-1)*\notelinespace})$) --++ ({(1-\@notecolumnratio)*\notewidth-1ex},0); % 横线
+ \fi
+ \draw [\@notelinecolor!80,opacity=.5,very thick] ($(current page.south west)+(\hnotemargin+\@notecolumnratio*\notewidth,\vnotemargin+1ex)$) --++ (0,\noteheight-2ex); % 分æ çº¿
+ %%%%%% imput file
+ \foreach \n in {#1,#2,#3}
+ \node [yshift=(2*#1-2*\n-1)*\noteheight/6+\thenote*\noteheight,inner sep=0pt] at ($(current page.north west)+(\hnotemargin+.5*\@notecolumnratio*\notewidth,-\vnotemargin)$) {\ifcsname @notechap\endcsname\includegraphics[height=\dimeval{\noteheight/3-2ex},page=\n]{\@beamer}\fi};
+ \end{tikzpicture}
+}
+
+\def\@fourbeamer#1#2#3#4{
+ \refstepcounter{note}\addtocounter{note}{-1}
+ \clearpage\thispagestyle{empty}
+ \begin{tikzpicture}[remember picture,overlay]
+ \draw [\@notelinecolor,opacity=.8,very thick] ($(current page.north west)+(\hnotemargin,-\vnotemargin)$) --++ (\notewidth,0) node [above right,at start,yshift=1ex] {\large\bfseries\sffamily\ifcsname @notechap\endcsname\@notechap\fi} node [above left,yshift=1ex] {\large\bfseries\sffamily Page \thepage\quad}; % 顶部粗线
+ \draw [\@notelinecolor,opacity=.8,thick] ($(current page.south west)+(\hnotemargin,\vnotemargin)$) --++ (\notewidth,0); % 底部粗线
+ \ifhidenoteline\else
+ \foreach \a in {2,...,\@notelinenum}
+ \draw [opacity=.5,\@notelinecolor,opacity=.4,thick] ($(current page.south west)+(\hnotemargin+\@notecolumnratio*\notewidth+1ex,{\vnotemargin+(\a-1)*\notelinespace})$) --++ ({(1-\@notecolumnratio)*\notewidth-1ex},0); % 横线
+ \fi
+ \draw [\@notelinecolor,opacity=.5,very thick] ($(current page.south west)+(\hnotemargin+\@notecolumnratio*\notewidth,\vnotemargin+1ex)$) --++ (0,\noteheight-2ex); % 分æ çº¿
+ %%%%%% imput file
+ \foreach \n in {#1,#2,#3,#4}
+ \node [yshift=(2*#1-2*\n-1)*\noteheight/8+\thenote*\noteheight,inner sep=0pt] at ($(current page.north west)+(\hnotemargin+.5*\@notecolumnratio*\notewidth,-\vnotemargin)$) {\ifcsname @notechap\endcsname\includegraphics[height=\dimeval{\noteheight/4-2ex},page=\n]{\@beamer}\fi};
+ \end{tikzpicture}
+}
+
+\ExplSyntaxOn\cs_new_eq:NN \Repeat \prg_replicate:nn\ExplSyntaxOff
+\NewDocumentCommand\newnotepage{s O{1}}{\Repeat{#2}{
+ \refstepcounter{note}
+ \clearpage\thispagestyle{empty}
+ \begin{tikzpicture}[remember picture,overlay]
+ \draw [\@notelinecolor,opacity=.8,very thick] ($(current page.north west)+(\hnotemargin,-\vnotemargin)$) --++ (\notewidth,0) node [above right,at start,yshift=1ex] {\large\bfseries\sffamily\ifcsname @notechap\endcsname\@notechap\fi} node [above left,yshift=1ex] {\large\bfseries\sffamily Page \thepage\quad}; % 顶部粗线
+ \draw [\@notelinecolor,opacity=.8,thick] ($(current page.south west)+(\hnotemargin,\vnotemargin)$) --++ (\notewidth,0); % 底部粗线
+ \ifhidenoteline\else
+ \foreach \a in {2,...,\@notelinenum}
+ \draw [\@notelinecolor,opacity=.4,thick] ($(current page.south west)+(\hnotemargin,{\vnotemargin+(\a-1)*\notelinespace})$) --++ (\notewidth,0); % 横线
+ \fi
+ \IfBooleanF{#1}{% 分æ çº¿
+ \draw [\@notelinecolor,opacity=.5,very thick] ($(current page.south west)+(\hnotemargin+\@notecolumnratio*\notewidth,\vnotemargin+1ex)$) --++ (0,\noteheight-2ex);}
+\end{tikzpicture}}
+}
+
+\newcount\tmpnum
+\def\valnum#1{%
+ \ifnum\maxnum>\numexpr\tmpnum+#1\relax
+ \the\numexpr\tmpnum+#1\relax \else \maxnum\fi}
+\NewDocumentCommand\includebeamer{ o m m }{%
+ \ifnum #1=1
+ \def\maxnum{#3}\tmpnum=#2
+ \loop
+ \unless\ifnum\tmpnum>#3 \@onepaper{\valnum0}
+ \advance\tmpnum by1
+ \repeat\fi
+ \ifnum #1=3
+ \def\maxnum{#3}\tmpnum=#2
+ \loop
+ \unless\ifnum\tmpnum>#3 \@threebeamer{\valnum0}{\valnum1}{\valnum2}
+ \advance\tmpnum by3
+ \repeat\fi
+ \ifnum #1=4
+ \def\maxnum{#3}\tmpnum=#2
+ \loop
+ \unless\ifnum\tmpnum>#3 \@fourbeamer{\valnum0}{\valnum1}{\valnum2}{\valnum3}
+ \advance\tmpnum by4
+ \repeat\fi} \ No newline at end of file
diff --git a/macros/latex/contrib/profcollege/doc/ProfCollege-doc.pdf b/macros/latex/contrib/profcollege/doc/ProfCollege-doc.pdf
index 2d23d813a7..206f5547a1 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/PfCAssemblagesSolides.tex b/macros/latex/contrib/profcollege/latex/PfCAssemblagesSolides.tex
new file mode 100644
index 0000000000..9ac580e644
--- /dev/null
+++ b/macros/latex/contrib/profcollege/latex/PfCAssemblagesSolides.tex
@@ -0,0 +1,497 @@
+%%%
+% Assemblages solides
+%%%
+\setKVdefault[Assemblage]{Phi=30,Theta=20,Distance=50,Anglez=0,Anglex=0,Largeur=1.5,Profondeur=0.75,Hauteur=1,RayonBoule=1,RayonCone=1,RayonCylindre=1,HauteurPrisme=1,HauteurPyramideA=1,HauteurPyramideB=1,HauteurConeA=1,HauteurConeB=1,HauteurCylindre=1,Cotes=3,Trace=false,Type=Pyramides}%
+\defKV[Assemblage]{Traces=\setKV[Assemblage]{Trace}}%
+
+\NewDocumentCommand\AssemblageSolides{o}{%
+ \useKVdefault[Assemblage]%
+ \setKV[Assemblage]{#1}%
+ \IfStrEqCase{\useKV[Assemblage]{Type}}{%
+ {Pyramides}{\MPAssemblagePyramides{\useKV[Assemblage]{Cotes}}}%
+ {PavePyramide}{\MPAssemblagePavePyramide}%
+ {PyramidePave}{\MPAssemblagePavePyramide}%
+ {PavePyramides}{\MPAssemblagePavePyramides}%
+ {PyramidesPave}{\MPAssemblagePavePyramides}%
+ {PrismePyramide}{\MPAssemblagePrismePyramide{\useKV[Assemblage]{Cotes}}}%
+ {PyramidePrisme}{\MPAssemblagePrismePyramide{\useKV[Assemblage]{Cotes}}}%
+ {CylindreCone}{\MPAssemblageCylindreCone}%
+ {ConeCylindre}{\MPAssemblageCylindreCone}%
+ {CylindreCones}{\MPAssemblageCylindreCones}%
+ {ConesCylindre}{\MPAssemblageCylindreCones}%
+ {CylindreConeBoule}{\MPAssemblageCylindreConeBoule}%
+ {CylindreBouleCone}{\MPAssemblageCylindreConeBoule}%
+ {ConeCylindreBoule}{\MPAssemblageCylindreConeBoule}%
+ {ConeBouleCylindre}{\MPAssemblageCylindreConeBoule}%
+ {BouleCylindreCone}{\MPAssemblageCylindreConeBoule}%
+ {BouleConeCylindre}{\MPAssemblageCylindreConeBoule}%
+ {CylindreBoule}{\MPAssemblageCylindreBoule}%
+ {BouleCylindre}{\MPAssemblageCylindreBoule}%
+ {CylindreBoules}{\MPAssemblageCylindreBoules}%
+ {BoulesCylindre}{\MPAssemblageCylindreBoules}%
+ {ConeBoule}{\MPAssemblageConeBoule}%
+ {BouleCone}{\MPAssemblageConeBoule}%
+ }%
+}%
+
+\NewDocumentCommand\MPAssemblagePyramides{m}{%
+ \ifluatex
+ \mplibforcehmode
+ \begin{mplibcode}
+ input PfCSolid;
+
+ Initialisation(1500,\useKV[Assemblage]{Phi},\useKV[Assemblage]{Theta},\useKV[Assemblage]{Distance});
+ angx:=\useKV[Assemblage]{Anglex};
+ angz:=\useKV[Assemblage]{Anglez};
+
+ HautA=\useKV[Assemblage]{HauteurPyramideA};
+ HautB=\useKV[Assemblage]{HauteurPyramideB};
+
+ boolean Trace;
+ Trace=\useKV[Assemblage]{Trace};
+
+ color Sommet[];
+
+ NbS:=#1+2;
+ angbase=360/#1;
+
+ for k=0 upto #1-1:
+ Sommet[k]:=(cosd(k*angbase),sind(k*angbase),0);
+ endfor;
+ Sommet[NbS-1]:=(0,0,HautA);
+ Sommet[NbS]:=(0,0,-HautB);
+ for k=0 upto NbS:
+ Sommet[k]:=Image(Sommet[k]);
+ endfor;
+ %% Faces
+ NF:=2*#1;
+ for k=1 upto #1:
+ Fc[k*100]:=3;Fc[k*100+1]:=(k+1) mod #1;Fc[k*100+3]:=k mod #1;Fc[k*100+2]:=NbS-1;
+ endfor;
+ for k=#1+1 upto 2*#1:
+ Fc[k*100]:=3;Fc[k*100+1]:=k mod #1;Fc[k*100+3]:=(k+1) mod #1;Fc[k*100+2]:=NbS;
+ endfor;
+ %
+ DessineObjet;
+ %
+ if Trace:
+ \useKV[Assemblage]{Traces};
+ fi;
+ \end{mplibcode}
+ \fi
+}%
+
+\NewDocumentCommand\MPAssemblagePavePyramide{}{%
+ \ifluatex
+ \mplibforcehmode
+ \begin{mplibcode}
+ input PfCSolid;
+
+ Initialisation(1500,\useKV[Assemblage]{Phi},\useKV[Assemblage]{Theta},\useKV[Assemblage]{Distance});
+ angx:=\useKV[Assemblage]{Anglex};
+ angz:=\useKV[Assemblage]{Anglez};
+
+ Larg=\useKV[Assemblage]{Hauteur};
+ Long=\useKV[Assemblage]{Largeur};
+ Prof=\useKV[Assemblage]{Profondeur};
+ HautA=\useKV[Assemblage]{HauteurPyramideA};
+
+ boolean Trace;
+ Trace=\useKV[Assemblage]{Trace};
+
+ color Sommet[];
+ NbS:=9;
+
+ Sommet1:=(Long,0,0);
+ Sommet2:=(Long,Prof,0);
+ Sommet3:=(0,Prof,0);
+ Sommet4:=(0,0,0);
+ Sommet5:=(0,0,Larg);
+ Sommet6:=(Long,0,Larg);
+ Sommet7:=(Long,Prof,Larg);
+ Sommet8:=(0,Prof,Larg);
+ Sommet9:=(Sommet5+Sommet6+Sommet7+Sommet8)/4+(0,0,HautA);
+ for k=1 upto 9:
+ Sommet[k]:=Image(Sommet[k]);
+ endfor;
+ %% Faces
+ NF:=9;
+ Fc[100]:=4;Fc[101]:=1;Fc[102]:=4;Fc[103]:=3;Fc[104]:=2;
+ Fc[200]:=4;Fc[201]:=4;Fc[202]:=5;Fc[203]:=8;Fc[204]:=3;
+ Fc[300]:=4;Fc[301]:=1;Fc[302]:=6;Fc[303]:=5;Fc[304]:=4;
+ Fc[400]:=4;Fc[401]:=2;Fc[402]:=3;Fc[403]:=8;Fc[404]:=7;
+ Fc[500]:=4;Fc[501]:=1;Fc[502]:=2;Fc[503]:=7;Fc[504]:=6;
+ Fc[600]:=3;Fc[601]:=8;Fc[602]:=5;Fc[603]:=9;
+ Fc[700]:=3;Fc[701]:=5;Fc[702]:=6;Fc[703]:=9;
+ Fc[800]:=3;Fc[801]:=6;Fc[802]:=7;Fc[803]:=9;
+ Fc[900]:=3;Fc[901]:=7;Fc[902]:=8;Fc[903]:=9;
+ %
+ DessineObjet;
+ %
+ %
+ if Trace:
+ \useKV[Assemblage]{Traces};
+ fi;
+ \end{mplibcode}
+ \fi
+}%
+
+\NewDocumentCommand\MPAssemblagePavePyramides{}{%
+ \ifluatex
+ \mplibforcehmode
+ \begin{mplibcode}
+ input PfCSolid;
+
+ Initialisation(1500,\useKV[Assemblage]{Phi},\useKV[Assemblage]{Theta},\useKV[Assemblage]{Distance});
+ angx:=\useKV[Assemblage]{Anglex};
+ angz:=\useKV[Assemblage]{Anglez};
+
+ Larg=\useKV[Assemblage]{Hauteur};
+ Long=\useKV[Assemblage]{Largeur};
+ Prof=\useKV[Assemblage]{Profondeur};
+ HautA=\useKV[Assemblage]{HauteurPyramideA};
+ HautB=\useKV[Assemblage]{HauteurPyramideB};
+
+ boolean Trace;
+ Trace=\useKV[Assemblage]{Trace};
+
+ color Sommet[];
+ NbS:=10;
+
+ Sommet1:=(Long,0,0);
+ Sommet2:=(Long,Prof,0);
+ Sommet3:=(0,Prof,0);
+ Sommet4:=(0,0,0);
+ Sommet5:=(0,0,Larg);
+ Sommet6:=(Long,0,Larg);
+ Sommet7:=(Long,Prof,Larg);
+ Sommet8:=(0,Prof,Larg);
+ Sommet9:=(Sommet5+Sommet6+Sommet7+Sommet8)/4+(0,0,HautA);
+ Sommet10:=(Sommet1+Sommet2+Sommet3+Sommet4)/4+(0,0,-HautB);
+ for k=1 upto 10:
+ Sommet[k]:=Image(Sommet[k]);
+ endfor;
+ %% Faces
+ NF:=12;
+ Fc[100]:=4;Fc[101]:=4;Fc[102]:=5;Fc[103]:=8;Fc[104]:=3;
+ Fc[200]:=4;Fc[201]:=1;Fc[202]:=6;Fc[203]:=5;Fc[204]:=4;
+ Fc[300]:=4;Fc[301]:=2;Fc[302]:=3;Fc[303]:=8;Fc[304]:=7;
+ Fc[400]:=4;Fc[401]:=1;Fc[402]:=2;Fc[403]:=7;Fc[404]:=6;
+ %
+ Fc[500]:=3;Fc[501]:=8;Fc[502]:=5;Fc[503]:=9;
+ Fc[600]:=3;Fc[601]:=5;Fc[602]:=6;Fc[603]:=9;
+ Fc[700]:=3;Fc[701]:=6;Fc[702]:=7;Fc[703]:=9;
+ Fc[800]:=3;Fc[801]:=7;Fc[802]:=8;Fc[803]:=9;
+ %
+ Fc[900]:=3;Fc[901]:=4;Fc[902]:=3;Fc[903]:=10;
+ Fc[1000]:=3;Fc[1001]:=1;Fc[1002]:=4;Fc[1003]:=10;
+ Fc[1100]:=3;Fc[1101]:=2;Fc[1102]:=1;Fc[1103]:=10;
+ Fc[1200]:=3;Fc[1201]:=3;Fc[1202]:=2;Fc[1203]:=10;
+ %
+ DessineObjet;
+ %
+ if Trace:
+ \useKV[Assemblage]{Traces};
+ fi;
+ \end{mplibcode}
+ \fi
+}%
+
+\NewDocumentCommand\MPAssemblagePrismePyramide{m}{%
+ \ifluatex
+ \mplibforcehmode
+ \begin{mplibcode}
+ input PfCSolid;
+
+ Initialisation(1500,\useKV[Assemblage]{Phi},\useKV[Assemblage]{Theta},\useKV[Assemblage]{Distance});
+ angx:=\useKV[Assemblage]{Anglex};
+ angz:=\useKV[Assemblage]{Anglez};
+
+ HautP=\useKV[Assemblage]{HauteurPrisme};
+ HautA=\useKV[Assemblage]{HauteurPyramideA};
+
+ boolean Trace;
+ Trace=\useKV[Assemblage]{Trace};
+
+ color Sommet[];
+
+ NbS:=2*#1+1;
+ angbase=360/#1;
+
+ for k=0 upto #1-1:
+ Sommet[k]:=(cosd(k*angbase),sind(k*angbase),0);
+ endfor;
+
+ for k=#1 upto 2*#1-1:
+ Sommet[k]:=Sommet[k-#1]+(0,0,-HautP);
+ endfor;
+ Sommet[NbS-1]:=(0,0,HautA);
+ for k=0 upto NbS-1:
+ Sommet[k]:=Image(Sommet[k]);
+ endfor;
+ %% Faces
+ NF:=2*#1+1;
+ %latérale pyramide
+ for k=1 upto #1:
+ Fc[k*100]:=3;Fc[k*100+1]:=k mod #1;Fc[k*100+2]:=(k+1) mod #1;Fc[k*100+3]:=NbS-1;
+ endfor;
+ % face latérales prisme
+ for k=1 upto #1:
+ rang:=k+#1;
+ Fc[rang*100]:=4;Fc[rang*100+1]:=(k mod #1)+#1;Fc[rang*100+2]:=((k+1) mod #1)+#1;Fc[rang*100+3]:=(k+1) mod #1;Fc[rang*100+4]:=(k) mod #1;
+ endfor;
+ %face base du prisme
+ Fc[(2*#1+1)*100]:=#1;
+ for k=1 upto #1:
+ Fc[(2*#1+1)*100+k]:=((#1-k) mod #1)+#1;
+ endfor;
+ %
+ DessineObjet;
+ %
+ if Trace:
+ \useKV[Assemblage]{Traces};
+ fi;
+ \end{mplibcode}
+ \fi
+}%
+
+\NewDocumentCommand\MPAssemblageCylindreCone{}{%
+ \ifluatex
+ \mplibforcehmode
+ \begin{mplibcode}
+ input PfCSolid;
+
+ Initialisation(1500,\useKV[Assemblage]{Phi},\useKV[Assemblage]{Theta},\useKV[Assemblage]{Distance});
+
+ angx:=\useKV[Assemblage]{Anglex};
+ angz:=\useKV[Assemblage]{Anglez};
+
+ Rayon=\useKV[Assemblage]{RayonCylindre};
+ HautC=\useKV[Assemblage]{HauteurCylindre};
+ HautCo=\useKV[Assemblage]{HauteurConeA};
+
+ boolean Trace;
+ Trace=\useKV[Assemblage]{Trace};
+
+ nb:=36;
+ subh:=1;
+ incolor:=white;
+ outcolor:=0.8white;
+ Ferme1:=true;
+ Objetcylindre1("r="&"Rayon","h="&"HautC");
+ TR:=(0,-HautC*sind(angx),HautC*cosd(angx));
+ nb:=72;
+ Objetcone2("r="&"Rayon","h="&"HautCo");
+ AffichageObjetCylindre1;
+ AffichageObjetCone2;
+ if Trace:
+ \useKV[Assemblage]{Traces};
+ fi;
+ \end{mplibcode}
+ \fi
+}%
+
+\NewDocumentCommand\MPAssemblageCylindreCones{}{%
+ % à faire
+ \ifluatex
+ \mplibforcehmode
+ \begin{mplibcode}
+ input PfCSolid;
+
+ Initialisation(1500,\useKV[Assemblage]{Phi},\useKV[Assemblage]{Theta},\useKV[Assemblage]{Distance});
+
+ angx:=\useKV[Assemblage]{Anglex};
+ angz:=\useKV[Assemblage]{Anglez};
+
+ Rayon=\useKV[Assemblage]{RayonCylindre};
+ HautC=\useKV[Assemblage]{HauteurCylindre};
+ HautCo=\useKV[Assemblage]{HauteurConeA};
+ HautCob=\useKV[Assemblage]{HauteurConeB};
+
+ boolean Trace;
+ Trace=\useKV[Assemblage]{Trace};
+
+ nb:=36;
+ subh:=1;
+ incolor:=white;
+ outcolor:=0.8white;
+ Ferme1:=true;
+ Objetcylindre1("r="&"Rayon","h="&"HautC");
+ nb:=72;
+ TR:=(0,-HautC*sind(angx),HautC*cosd(angx));
+ Objetcone2("r="&"Rayon","h="&"HautCo");
+ TR:=(0,0,0);
+ angx:=180+angx;
+ Objetcone3("r="&"Rayon","h="&"HautCob");
+ angx:=0;
+ AffichageObjetCylindreSansBase1;
+ AffichageObjetCone2;
+ AffichageObjetCone3;
+ if Trace:
+ \useKV[Assemblage]{Traces};
+ fi;
+ \end{mplibcode}
+ \fi
+}%
+
+\NewDocumentCommand\MPAssemblageCylindreConeBoule{}{%
+ % à faire
+ \ifluatex
+ \mplibforcehmode
+ \begin{mplibcode}
+ input PfCSolid;
+
+ Initialisation(1500,\useKV[Assemblage]{Phi},\useKV[Assemblage]{Theta},\useKV[Assemblage]{Distance});
+
+ angx:=\useKV[Assemblage]{Anglex};
+ angz:=\useKV[Assemblage]{Anglez};
+
+ Rayon=\useKV[Assemblage]{RayonCylindre};
+ HautC=\useKV[Assemblage]{HauteurCylindre};
+ HautCo=\useKV[Assemblage]{HauteurConeA};
+
+ boolean Trace;
+ Trace=\useKV[Assemblage]{Trace};
+
+ nb:=36;%36
+ subh:=1;%
+ incolor:=white;
+ outcolor:=0.8white;
+ Ferme1:=true;
+ Objetcylindre1("r="&"Rayon","h="&"HautC");
+ TR:=(0,-HautC*sind(angx),HautC*cosd(angx));
+ Objetcone2("r="&"Rayon","h="&"HautCo");
+ TR:=(0,0,0);
+ nb:=12;
+ subh:=72;
+ angx:=180+angx;
+ Objetcalotte3("R="&"Rayon","phib="&"-pi/36","phih="&"pi/2");
+ angx:=0;
+ AffichageObjetCylindreSansBase1;
+ AffichageObjetCone2;
+ AffichageObjetCalotte3;
+ %
+ if Trace:
+ \useKV[Assemblage]{Traces};
+ fi;
+ \end{mplibcode}
+ \fi
+}%
+
+\NewDocumentCommand\MPAssemblageCylindreBoule{}{%
+ % à faire
+ \ifluatex
+ \mplibforcehmode
+ \begin{mplibcode}
+ input PfCSolid;
+
+ Initialisation(1500,\useKV[Assemblage]{Phi},\useKV[Assemblage]{Theta},\useKV[Assemblage]{Distance});
+
+ angx:=\useKV[Assemblage]{Anglex};
+ angz:=\useKV[Assemblage]{Anglez};
+
+ Rayon=\useKV[Assemblage]{RayonCylindre};
+ HautC=\useKV[Assemblage]{HauteurCylindre};
+
+ boolean Trace;
+ Trace=\useKV[Assemblage]{Trace};
+
+ nb:=36;%36
+ subh:=1;%
+ incolor:=white;
+ outcolor:=0.8white;
+ Ferme1:=true;
+ Objetcylindre1("r="&"Rayon","h="&"HautC");
+ TR:=(0,-HautC*sind(angx),HautC*cosd(angx));
+ nb:=12;
+ subh:=72;%
+ Objetcalotte2("R="&"Rayon","phib="&"-pi/36","phih="&"pi/2");
+ TR:=(0,0,0);
+ AffichageObjetCylindreSansBase1;
+ AffichageObjetCalotte2;
+ %
+ if Trace:
+ \useKV[Assemblage]{Traces};
+ fi;
+ \end{mplibcode}
+ \fi
+}%
+
+\NewDocumentCommand\MPAssemblageCylindreBoules{}{%
+ % à faire
+ \ifluatex
+ \mplibforcehmode
+ \begin{mplibcode}
+ input PfCSolid;
+
+ Initialisation(1500,\useKV[Assemblage]{Phi},\useKV[Assemblage]{Theta},\useKV[Assemblage]{Distance});
+
+ angx:=\useKV[Assemblage]{Anglex};
+ angz:=\useKV[Assemblage]{Anglez};
+
+ Rayon=\useKV[Assemblage]{RayonCylindre};
+ HautC=\useKV[Assemblage]{HauteurCylindre};
+
+ boolean Trace;
+ Trace=\useKV[Assemblage]{Trace};
+
+ Initialisation(1500,22,20,50);
+
+ nb:=36;
+ subh:=1;
+ incolor:=white;
+ outcolor:=0.8white;
+ Ferme1:=true;
+ Objetcylindre1("r="&"Rayon","h="&"HautC");
+ TR:=(0,-HautC*sind(angx),HautC*cosd(angx));
+ nb:=12;
+ subh:=72;%
+ Objetcalotte2("R="&"Rayon","phib="&"0","phih="&"pi/2");
+ TR:=(0,0,0);
+ angx:=180+angx;
+ TR:=(0,0,0);
+ Objetcalotte3("R="&"Rayon","phib="&"0","phih="&"pi/2");
+ TR:=(0,0,0);
+ AffichageObjetCylindreSansBase1;
+ AffichageObjetCalotte2;
+ AffichageObjetCalotte3;
+ \end{mplibcode}
+ \fi
+}%
+
+\NewDocumentCommand\MPAssemblageConeBoule{}{%
+ % à faire
+ \ifluatex
+ \mplibforcehmode
+ \begin{mplibcode}
+ input PfCSolid;
+
+ Initialisation(1500,\useKV[Assemblage]{Phi},\useKV[Assemblage]{Theta},\useKV[Assemblage]{Distance});
+
+ angx:=\useKV[Assemblage]{Anglex};
+ angz:=\useKV[Assemblage]{Anglez};
+
+ Rayon=\useKV[Assemblage]{RayonCone};
+ HautCa=\useKV[Assemblage]{HauteurConeA};
+
+ boolean Trace;
+ Trace=\useKV[Assemblage]{Trace};
+
+ Initialisation(1500,22,20,50);
+
+ nb:=72;%36
+ subh:=1;%
+ incolor:=white;
+ outcolor:=0.8white;
+ Ferme1:=true;
+ Objetcone1("r="&"Rayon","h="&"HautCa");
+ angx:=180+angx;
+ nb:=12;
+ subh:=72;%
+ Objetcalotte2("R="&"Rayon","phib="&"0","phih="&"pi/2");
+ TR:=(0,0,0);
+ AffichageObjetConeAvecBase1;
+ AffichageObjetCalotte2;%Cone3;
+ \end{mplibcode}
+ \fi
+}% \ No newline at end of file
diff --git a/macros/latex/contrib/profcollege/latex/PfCCartographie.tex b/macros/latex/contrib/profcollege/latex/PfCCartographie.tex
index cf9aeaf66f..ec56dceb89 100644
--- a/macros/latex/contrib/profcollege/latex/PfCCartographie.tex
+++ b/macros/latex/contrib/profcollege/latex/PfCCartographie.tex
@@ -222,6 +222,9 @@
% \mplibforcehmode
\begin{mplibcode}
input PfCMonde;
+
+ Allegee:=\useKV[Cartographie]{Allegee};
+
defaultcolormodel:=\useKV[Cartographie]{ModeleCouleur};
string arborescence;
arborescence:=\useKV[Cartographie]{Arborescence};
diff --git a/macros/latex/contrib/profcollege/latex/PfCConversion.tex b/macros/latex/contrib/profcollege/latex/PfCConversion.tex
index 78fa6d0351..e6ed80f012 100644
--- a/macros/latex/contrib/profcollege/latex/PfCConversion.tex
+++ b/macros/latex/contrib/profcollege/latex/PfCConversion.tex
@@ -1,7 +1,10 @@
-\setKVdefault[ClesConversion]{Longueur,Aire=false,Vol=false,Masses=false,Capas=false,Sans=false,Complete=40pt}%
+\setKVdefault[ClesConversion]{Longueur,Aire=false,Vol=false,Masses=false,Capas=false,Sans=false,Completes=false}%
+\defKV[ClesConversion]{Complete=\setKV[ClesConversion]{Completes}}%
\defKV[ClesConversion]{Masse=\setKV[ClesConversion]{Longueur=false}\setKV[ClesConversion]{Masses}}%
\defKV[ClesConversion]{Capa=\setKV[ClesConversion]{Longueur=false}\setKV[ClesConversion]{Capas}}%
+\newlength{\PfCConversionLongueur}%
+
\NewDocumentCommand\ChoixUniteD{m}{%
\IfStrEqCase{#1}{%
{G}{\DeclareSIUnit{\TempoPrefixeD}{\giga}\xdef\ExposantD{9}}%
@@ -41,21 +44,21 @@
\NewDocumentCommand\Convertir{somm}{%
\useKVdefault[ClesConversion]%
\setKV[ClesConversion]{#2}%
- \StrBefore{#3}{>}[\PrefixeDepart]
- \StrBehind{#3}{>}[\PrefixeArrivee]
+ \StrBefore{#3}{>}[\PrefixeDepart]%
+ \StrBehind{#3}{>}[\PrefixeArrivee]%
\ChoixUniteD{\PrefixeDepart}%
\ChoixUniteA{\PrefixeArrivee}%
\ifboolKV[ClesConversion]{Aire}{%
\DeclareSIUnit{\TempoAvant}{\square}%
\DeclareSIUnit{\TempoBase}{\meter}
- \xdef\PfCConvExposant{2}
+ \xdef\PfCConvExposant{2}%
}{\ifboolKV[ClesConversion]{Vol}{%
\DeclareSIUnit{\TempoAvant}{\cubic}%
\DeclareSIUnit{\TempoBase}{\meter}
- \xdef\PfCConvExposant{3}
+ \xdef\PfCConvExposant{3}%
}{%
\DeclareSIUnit{\TempoAvant}{}%
- \xdef\PfCConvExposant{1}
+ \xdef\PfCConvExposant{1}%
}%
}%
\ifboolKV[ClesConversion]{Masses}{%
@@ -67,14 +70,14 @@
\ifboolKV[ClesConversion]{Capas}{%
\DeclareSIUnit{\TempoBase}{\liter}%
}{}%
- \ensuremath{
+ \ensuremath{%
\IfBooleanTF{#1}{%
\IfStrEq{\PrefixeDepart}{t}{\DeclareSIUnit{\TempoBase}{\relax}}{}\IfStrEq{\PrefixeDepart}{q}{\DeclareSIUnit{\TempoBase}{\relax}}{}
\SI{#4}{\TempoAvant\TempoPrefixeD\TempoBase}
\IfStrEq{\PrefixeDepart}{t}{\DeclareSIUnit{\TempoBase}{\gram}}{}\IfStrEq{\PrefixeDepart}{q}{\DeclareSIUnit{\TempoBase}{\gram}}{}
=
\IfStrEq{\PrefixeArrivee}{t}{\DeclareSIUnit{\TempoBase}{\relax}}{}\IfStrEq{\PrefixeArrivee}{q}{\DeclareSIUnit{\TempoBase}{\relax}}{}
- \PointsSuspension{\fpeval{#4*(10**((\ExposantD-(\ExposantA))*\PfCConvExposant))}\fpeval{#4*(10**((\ExposantD-(\ExposantA))*\PfCConvExposant))}}~\si{\TempoAvant\TempoPrefixeA\TempoBase}
+ \ifboolKV[ClesConversion]{Completes}{\setlength{\PfCConversionLongueur}{\useKV[ClesConversion]{Complete}}\pointilles[\PfCConversionLongueur]}{\PointsSuspension{\fpeval{#4*(10**((\ExposantD-(\ExposantA))*\PfCConvExposant))}\fpeval{#4*(10**((\ExposantD-(\ExposantA))*\PfCConvExposant))}}}~\si{\TempoAvant\TempoPrefixeA\TempoBase}
\IfStrEq{\PrefixeArrivee}{t}{\DeclareSIUnit{\TempoBase}{\gram}}{}\IfStrEq{\PrefixeArrivee}{q}{\DeclareSIUnit{\TempoBase}{\gram}}{}
}{%
\ifboolKV[ClesConversion]{Sans}{%
diff --git a/macros/latex/contrib/profcollege/latex/PfCDecomposerNombrePremier.tex b/macros/latex/contrib/profcollege/latex/PfCDecomposerNombrePremier.tex
index 3f11bb05b7..bf1a28e333 100644
--- a/macros/latex/contrib/profcollege/latex/PfCDecomposerNombrePremier.tex
+++ b/macros/latex/contrib/profcollege/latex/PfCDecomposerNombrePremier.tex
@@ -43,7 +43,7 @@
Ancre0:=(0,0);
racine:=#1;
- label(btex \num{#1} etex,(0,0));
+ label(TEX("\num{#1}"),(0,0));
forever:
PremierSimple(racine);
exitif racine=1;
@@ -829,10 +829,12 @@
\end{tabular}%
\else%
\begin{tabular}{c|c}
- 1&\num{#1}\\
+ 1&\num{#1}
+ \ifnum\cnpT>2\relax\\
\xintFor* ##1 in {\xintSeq {1}{\fpeval{\cnpT/2}}}\do{%
\DiviseurNumero{#1}{##1}\num{\fpeval{\dnpT}}\uppercase{&}\DiviseurNumero{#1}{##1}\num{\fpeval{#1/\dnpT}}\\
- }
+ }
+ \fi
\end{tabular}%
\fi%
}%
diff --git a/macros/latex/contrib/profcollege/latex/PfCOperationsTrou.tex b/macros/latex/contrib/profcollege/latex/PfCOperationsTrou.tex
index d26dbade32..347ca499bc 100644
--- a/macros/latex/contrib/profcollege/latex/PfCOperationsTrou.tex
+++ b/macros/latex/contrib/profcollege/latex/PfCOperationsTrou.tex
@@ -105,7 +105,7 @@ transform canvas={xshift=0em,yshift=0em}},rectangle,fill=PfCSolOp,rounded corner
\fi
\opmul[decimalsepsymbol={,},lineheight=2em,columnwidth=1.5em,voperator=bottom,intermediarystyle=\stepcounter{divxlop}\color{PfCSolOp}\PfCchiffre{A\thedivxlop},resultstyle=\stepcounter{divxlop}\color{PfCSolOp}\PfCchiffre{A\thedivxlop},resultstyle.d=\color{PfCCouleurVirgule}]{#2}{#3}%
\foreach \i in {1,...,\thedivxlop}{%
- \PfCentoure{A\i}{A\i}%
+ \PfCentoure{A\i}{A\i}%
}%
\endgroup
}
@@ -168,4 +168,228 @@ transform canvas={xshift=0em,yshift=0em}},rectangle,fill=PfCSolOp,rounded corner
\foreach \i in {1,...,\thedivxlop}{%
\PfCentoure{A\i}{A\i}%
}%
+}%
+
+%%%%%%%%%%%%%%%%%%%%% Colorees %%%%%%%%%%%%%%%%%%%
+% Merci JCC
+%%% Seule ligne à modifier selon la convenance %%%
+\newcommand\couleurs{blue,red,green,blue,red,green,blue,red,green,blue,red,green}%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\newcount\numint%
+\newcount\indint%
+\newcount\ind%
+\def\nnil{\nil}%
+\def\ExtraitCouleurs{%
+ \ind=0%
+ \expandafter\ExtraitCouleursAux\couleurs,\nil,%
+}%
+\def\ExtraitCouleursAux#1,{%
+ \def\arg{#1}%
+ \ifx\arg\nnil%
+ \edef\cmax{\the\ind}%
+ \else%
+ \def\couleur{#1}%
+ \stepcounter{coulxlop}%
+ \stepcounter{coulxlopa}%
+ \stepcounter{coulxlopd}%
+ \expandafter\edef\csname PfCOpCouleurs\Roman{coulxlop}\endcsname{\couleur}%
+ \expandafter\edef
+ \csname op@operandstyle.1.\the\numexpr\ind+1\endcsname{%
+ \noexpand\PfCchiffre{CA\thecoulxlop}%
+ }%
+ \expandafter\edef
+ \csname op@operandstyle.2.\the\numexpr\ind+1\endcsname{%
+ \noexpand\PfCchiffre{CB\thecoulxlopa}%
+ }%
+ \expandafter\edef
+ \csname op@resultstyle.\the\numexpr\ind+1\endcsname{%
+ \noexpand\PfCchiffre{CC\thecoulxlopd}%
+ }%
+ \numint = \numexpr\ind+1
+ \indint = 1
+ \ConstruitIntermediaire
+ \advance\ind by 1
+ \expandafter\ExtraitCouleursAux
+ \fi
+}
+\def\ConstruitIntermediaire{%
+ \ifnum\numint>0
+ \stepcounter{coulxlopi}%
+ \expandafter\edef\csname PfCOpCouleursi\Roman{coulxlopi}\endcsname{\couleur}%
+ \expandafter\edef
+ \csname op@intermediarystyle.\the\numint.\the\indint\endcsname{%
+ \noexpand\PfCchiffre{CD\thecoulxlopi}%
+ }%
+ \advance\indint by 1
+ \advance\numint by -1
+ \expandafter\ConstruitIntermediaire
+ \fi
+ }
+ \def\ConstruitRemainder{%
+ \ifnum\numint>0
+ \stepcounter{coulxlopidiv}%
+ \expandafter\edef\csname PfCOpCouleursid\Roman{coulxlopidiv}\endcsname{\couleur}%
+ \expandafter\edef
+ \csname op@remainderystyle.\the\numint.\the\indint\endcsname{%
+ \noexpand\PfCchiffre{CE\thecoulxlopidiv}%
+ }%
+ \advance\indint by 1
+ \advance\numint by -1
+ \expandafter\ConstruitRemainder
+ \fi
+ }
+
+\newcounter{coulxlop}%
+\newcounter{coulxlopi}%
+\newcounter{coulxlopa}%
+\newcounter{coulxlopd}%
+\newcounter{coulxlopidiv}%
+\newcounter{coulxlopcoul}%
+
+\newcommand\PfCentoureColor[2]{%
+ \expandafter\edef\csname RetiensCouleur\endcsname{\csname PfCOpCouleurs\Roman{coulxlopcoul}\endcsname}\colorlet{CouleurCadre}{\RetiensCouleur}%
+ \tikz[remember picture,overlay] \node[preaction={draw={CouleurCadre},ultra thick,opacity=1,
+ transform canvas={xshift=0em,yshift=0em}},rectangle,rounded corners,ultra thick,inner sep=.55em,fit=(#1.center)(#2.center)]{};}
+
+\newcommand\PfCentoureColorR[3]{%
+ \expandafter\edef\csname RetiensCouleur\endcsname{\csname PfCOpCouleurs\Roman{coulxlopcoul}\endcsname}\colorlet{CouleurCadre}{\RetiensCouleur}%
+ \tikz[remember picture,overlay] \node[preaction={draw={CouleurCadre},ultra thick,opacity=1,
+ transform canvas={xshift=0em,yshift=0em}},rectangle,fill=PfCSolOp,rounded corners,ultra thick,inner sep=.55em,fit=(#1.center)(#2.center)]{};}
+
+\newcommand\PfCentoureColorI[2]{%
+ \expandafter\edef\csname RetiensCouleur\endcsname{\csname PfCOpCouleursi\Roman{coulxlopcoul}\endcsname}\colorlet{CouleurCadre}{\RetiensCouleur}%
+ \tikz[remember picture,overlay] \node[preaction={draw={CouleurCadre},ultra thick,opacity=1,
+ transform canvas={xshift=0em,yshift=0em}},rectangle,rounded corners,ultra thick,inner sep=.55em,fit=(#1.center)(#2.center)]{};}
+
+\newcommand\PfCentoureColorIR[2]{%
+ \expandafter\edef\csname RetiensCouleur\endcsname{\csname PfCOpCouleursi\Roman{coulxlopcoul}\endcsname}\colorlet{CouleurCadre}{\RetiensCouleur}%
+ \tikz[remember picture,overlay] \node[preaction={draw={CouleurCadre},ultra thick,opacity=1,
+ transform canvas={xshift=0em,yshift=0em}},rectangle,fill=PfCSolOp,rounded corners,ultra thick,inner sep=.55em,fit=(#1.center)(#2.center)]{};}
+
+\newcommand\PfCentoureColorIdiv[2]{%
+ \expandafter\edef\csname RetiensCouleur\endcsname{\csname PfCOpCouleursid\Roman{coulxlopcoul}\endcsname}\colorlet{CouleurCadre}{\RetiensCouleur}%
+ \tikz[remember picture,overlay] \node[preaction={draw={CouleurCadre},ultra thick,opacity=1,
+transform canvas={xshift=0em,yshift=0em}},rectangle,rounded corners,ultra thick,inner sep=.55em,fit=(#1.center)(#2.center)]{};}
+
+\makeatletter
+\long\def\ifnodedefined#1#2#3{%
+ \@ifundefined{pgf@sh@ns@#1}{#3}{#2}%
+}
+\makeatother
+
+\NewDocumentCommand\MultiplicationColore{omm}{%
+ \useKVdefault[ClesOperations]%
+ \setKV[ClesOperations]{#1}%
+ \setcounter{coulxlop}{0}%
+ \setcounter{coulxlopa}{0}%
+ \setcounter{coulxlopd}{0}%
+ \setcounter{coulxlopi}{0}%
+ \setcounter{coulxlopcoul}{0}%
+ \ifboolKV[ClesOperations]{Solution}{\colorlet{PfCSolOp}{\useKV[ClesOperations]{CouleurSolution}}}{\colorlet{PfCSolOp}{\useKV[ClesOperations]{CouleurFond}}}%
+ \ExtraitCouleurs%
+ \begingroup%
+ \setlength{\baselineskip}{1.75em}%
+ \StrLen{#3}[\PfCLongueurFacteurDeux]%
+ \ifnum\PfCLongueurFacteurDeux=1\relax%
+ \opset{lineheight=\baselineskip} % nécessaire
+ \else%
+ \opset{lineheight=\baselineskip,displayintermediary=all,displayshiftintermediary=all} % nécessaire
+ \fi%
+ \opmul[decimalsepsymbol={,},lineheight=1.75em,columnwidth=1.5em,voperator=bottom]{#2}{#3}%
+ \endgroup%
+ \foreach \i in {1,...,\thecoulxlop}{%
+ \stepcounter{coulxlopcoul}%
+ \ifnodedefined{CA\i}{%
+ \PfCentoureColor{CA\i}{CA\i}%
+ }{}
+ }%
+ \setcounter{coulxlopcoul}{0}%
+ \foreach \i in {1,...,\thecoulxlopa}{%
+ \stepcounter{coulxlopcoul}%
+ \ifnodedefined{CB\i}{%
+ \PfCentoureColor{CB\i}{CB\i}%
+ }{}
+ }%
+ \setcounter{coulxlopcoul}{0}%
+ \foreach \i in {1,...,\thecoulxlopd}{%
+ \stepcounter{coulxlopcoul}%
+ \ifnodedefined{CC\i}{%
+ \ifboolKV[ClesOperations]{Solution}{\PfCentoureColor{CC\i}{CC\i}}{\PfCentoureColorR{CC\i}{CC\i}}%
+ }{}
+ }%
+ \setcounter{coulxlopcoul}{0}%
+ \foreach \i in {1,...,\thecoulxlopi}{%
+ \stepcounter{coulxlopcoul}%
+% La couleur est
+ \ifnodedefined{CD\i}{%
+ \ifboolKV[ClesOperations]{Solution}{\PfCentoureColorI{CD\i}{CD\i}}{\PfCentoureColorIR{CD\i}{CD\i}}%
+ }{}%
+ }%
+}%
+
+\newcommand\AdditionColore[3][]{%
+ \useKVdefault[ClesOperations]%
+ \setKV[ClesOperations]{#1}%
+ \ifboolKV[ClesOperations]{Solution}{\colorlet{PfCSolOp}{\useKV[ClesOperations]{CouleurSolution}}}{\colorlet{PfCSolOp}{\useKV[ClesOperations]{CouleurFond}}}%
+ \setcounter{coulxlop}{0}%
+ \setcounter{coulxlopa}{0}%
+ \setcounter{coulxlopd}{0}%
+ \setcounter{coulxlopi}{0}%
+ \setcounter{coulxlopcoul}{0}%
+ \ExtraitCouleurs%
+ \opadd[decimalsepsymbol={,},lineheight=1.75em,columnwidth=1.5em,voperator=bottom]{#2}{#3}%
+ \foreach \i in {1,...,\thecoulxlop}{%
+ \stepcounter{coulxlopcoul}%
+ \ifnodedefined{CA\i}{%
+ \PfCentoureColor{CA\i}{CA\i}%
+ }{}%
+ }%
+ \setcounter{coulxlopcoul}{0}%
+ \foreach \i in {1,...,\thecoulxlopa}{%
+ \stepcounter{coulxlopcoul}%
+ \ifnodedefined{CB\i}{%
+ \PfCentoureColor{CB\i}{CB\i}%
+ }{}%
+ }%
+ \setcounter{coulxlopcoul}{0}%
+ \foreach \i in {1,...,\thecoulxlopd}{%
+ \stepcounter{coulxlopcoul}%
+ \ifnodedefined{CC\i}{%
+ \ifboolKV[ClesOperations]{Solution}{\PfCentoureColor{CC\i}{CC\i}}{\PfCentoureColorR{CC\i}{CC\i}}%
+ }{}%
+ }%
+}%
+
+\newcommand\SoustractionColore[3][]{%
+ \useKVdefault[ClesOperations]%
+ \setKV[ClesOperations]{#1}%
+ \ifboolKV[ClesOperations]{Solution}{\colorlet{PfCSolOp}{\useKV[ClesOperations]{CouleurSolution}}}{\colorlet{PfCSolOp}{\useKV[ClesOperations]{CouleurFond}}}%
+ \setcounter{coulxlop}{0}%
+ \setcounter{coulxlopa}{0}%
+ \setcounter{coulxlopd}{0}%
+ \setcounter{coulxlopi}{0}%
+ \setcounter{coulxlopcoul}{0}%
+ \ExtraitCouleurs%
+ \opsub[decimalsepsymbol={,},lineheight=1.75em,columnwidth=1.5em,voperator=bottom]{#2}{#3}%
+\foreach \i in {1,...,\thecoulxlop}{%
+ \stepcounter{coulxlopcoul}%
+ \ifnodedefined{CA\i}{%
+ \PfCentoureColor{CA\i}{CA\i}%
+ }{}
+ }%
+ \setcounter{coulxlopcoul}{0}%
+ \foreach \i in {1,...,\thecoulxlopa}{%
+ \stepcounter{coulxlopcoul}%
+ \ifnodedefined{CB\i}{%
+ \PfCentoureColor{CB\i}{CB\i}%
+ }{}
+ }%
+ \setcounter{coulxlopcoul}{0}%
+ \foreach \i in {1,...,\thecoulxlopd}{%
+ \stepcounter{coulxlopcoul}%
+ \ifnodedefined{CC\i}{%
+ \ifboolKV[ClesOperations]{Solution}{\PfCentoureColor{CC\i}{CC\i}}{\PfCentoureColorR{CC\i}{CC\i}}%
+ }{}
+ }%
}% \ No newline at end of file
diff --git a/macros/latex/contrib/profcollege/latex/PfCPixelArt.tex b/macros/latex/contrib/profcollege/latex/PfCPixelArt.tex
index 06d0cfe95a..77eecfcb42 100644
--- a/macros/latex/contrib/profcollege/latex/PfCPixelArt.tex
+++ b/macros/latex/contrib/profcollege/latex/PfCPixelArt.tex
@@ -4,8 +4,8 @@
\newtoks\toklistePANombre%
\def\UpdatetoksPANombre#1\nil{\addtotok\toklistePANombre{"#1",}}%
-\setKVdefault[ClesPixelArt]{Largeur=29,Hauteur=29,Solution=false,Lettres=ABCDEFGHIJK,Nombres=false,ListeCouleurs={Orange,Red,LightGray,Maroon,Purple,black,black,Plum,Orange,White,White},Unite=5mm}
-\defKV[ClesPixelArt]{ListeNombres=\setKV[ClesPixelArt]{Nombres}}
+\setKVdefault[ClesPixelArt]{Largeur=29,Hauteur=29,Solution=false,Lettres=ABCDEFGHIJK,Nombres=false,ListeCouleurs={Orange,Red,LightGray,Maroon,Purple,black,black,Plum,Orange,White,White},Unite=5mm,Geant=false,HauteurD=1,LargeurD=1,Complet=false,Numero=1,Separations=false}%
+\defKV[ClesPixelArt]{ListeNombres=\setKV[ClesPixelArt]{Nombres}}%
\NewDocumentCommand\PixelArt{o m}{%
\toklistePANombre{}%
@@ -16,7 +16,24 @@
\setsepchar{,}%
\readlist*\ListePANombre{\ListeAvantNombres}%
\foreachitem\compteur\in\ListePANombre{\expandafter\UpdatetoksPANombre\compteur\nil}%
- \BuildPixelArt{#2}{\useKV[ClesPixelArt]{Lettres}}{\ListeAvantCouleurs}{\the\toklistePANombre}%
+ \ifboolKV[ClesPixelArt]{Geant}{%
+ % Découpe en hauteur : \fpeval{\useKV[ClesPixelArt]{Hauteur}/\useKV[ClesPixelArt]{HauteurD}}\\
+ % Découpe en largeur : \fpeval{\useKV[ClesPixelArt]{Largeur}/\useKV[ClesPixelArt]{LargeurD}-1}}\par
+ \ifboolKV[ClesPixelArt]{Complet}{%
+ \xintFor* ##1 in{\xintSeq{0}{\fpeval{\useKV[ClesPixelArt]{Hauteur}/\useKV[ClesPixelArt]{HauteurD}-1}}}\do{%
+ \xintFor* ##2 in{\xintSeq{0}{\fpeval{\useKV[ClesPixelArt]{Largeur}/\useKV[ClesPixelArt]{LargeurD}-1}}}\do{%
+ \fpeval{##1*\useKV[ClesPixelArt]{Hauteur}/\useKV[ClesPixelArt]{HauteurD}+##2} : \BuildPixelArtGeant{#2}{\useKV[ClesPixelArt]{Lettres}}{\ListeAvantCouleurs}{\the\toklistePANombre}{##1}{##2}\\%
+ }%
+ }%
+ }{%
+ \quotient{\fpeval{\useKV[ClesPixelArt]{Numero}-1}}{\fpeval{\useKV[ClesPixelArt]{Hauteur}/\useKV[ClesPixelArt]{HauteurD}}}%
+ \modulo{\fpeval{\useKV[ClesPixelArt]{Numero}-1}}{\fpeval{\useKV[ClesPixelArt]{Hauteur}/\useKV[ClesPixelArt]{HauteurD}}}%
+% quotient = \the\intquotient -- remainder = \the\remainder :
+ \BuildPixelArtGeant{#2}{\useKV[ClesPixelArt]{Lettres}}{\ListeAvantCouleurs}{\the\toklistePANombre}{\the\intquotient}{\the\remainder}%
+ }%
+ }{%
+ \BuildPixelArt{#2}{\useKV[ClesPixelArt]{Lettres}}{\ListeAvantCouleurs}{\the\toklistePANombre}%
+ }%
}%
\NewDocumentCommand\BuildPixelArt{m m m m}{%
@@ -25,10 +42,15 @@
\begin{mplibcode}
largeur:=\useKV[ClesPixelArt]{Largeur};
hauteur:=\useKV[ClesPixelArt]{Hauteur};
+ largeurd:=\useKV[ClesPixelArt]{LargeurD};
+ hauteurd:=\useKV[ClesPixelArt]{HauteurD};
Unite:=\useKV[ClesPixelArt]{Unite};
- boolean Solution,Nombres;
+
+ boolean Solution,Nombres,Separations;
Solution:=\useKV[ClesPixelArt]{Solution};
Nombres:=\useKV[ClesPixelArt]{Nombres};
+ Separations:=\useKV[ClesPixelArt]{Separations};
+
string BaseLettres;
BaseLettres=str #2;
numeric EchelleScale;
@@ -84,6 +106,16 @@
enddef;
Lecturecsv("#1");
+ if Separations:
+ drawoptions(withcolor Purple);
+ for k=hauteur step -hauteurd until 0:
+ draw (Unite*(-1,k-0.5)--Unite*(largeur,k-0.5)) withpen pencircle scaled 1.25;
+ endfor;
+ for k=0 step largeurd until largeur:
+ draw (Unite*(k-0.5,hauteur+0.125)--Unite*(k-0.5,-0.875)) withpen pencircle scaled 1.25;
+ endfor;
+ drawoptions();
+ fi;
\end{mplibcode}
\else
\begin{mpost}[mpsettings={largeur:=\useKV[ClesPixelArt]{Largeur}; hauteur:=\useKV[ClesPixelArt]{Hauteur}; Unite:=\useKV[ClesPixelArt]{Unite}; boolean Solution,Nombres; Solution:=\useKV[ClesPixelArt]{Solution}; Nombres:=\useKV[ClesPixelArt]{Nombres};}]
@@ -142,4 +174,82 @@
Lecturecsv("#1");
\end{mpost}
\fi
+}
+
+\NewDocumentCommand\BuildPixelArtGeant{m m m m m m}{%
+ \ifluatex
+ \mplibforcehmode
+ \begin{mplibcode}
+ largeur:=\useKV[ClesPixelArt]{Largeur};
+ hauteur:=\useKV[ClesPixelArt]{Hauteur};
+ largeurd:=\useKV[ClesPixelArt]{LargeurD};
+ hauteurd:=\useKV[ClesPixelArt]{HauteurD};
+
+ Unite:=\useKV[ClesPixelArt]{Unite};
+
+ boolean Solution,Nombres;
+ Solution:=\useKV[ClesPixelArt]{Solution};
+ Nombres:=\useKV[ClesPixelArt]{Nombres};
+
+ string BaseLettres;
+ BaseLettres=str #2;
+
+ numeric EchelleScale;
+ EchelleScale=Unite/5mm;
+
+ color ColorEntier[],ColFond;
+ n:=0;
+ for p_=#3:
+ n:=n+1;
+ ColorEntier[n]:=p_;
+ endfor;
+
+ string RetiensNombres[];
+ if Nombres:
+ n:=0;
+ for p_=#4:
+ n:=n+1;
+ RetiensNombres[n]=p_;
+ endfor;
+ fi;
+
+ vardef Lecturecsv(expr nomfichier)=
+ % for h=hauteur-#5*hauteurd downto hauteur-(#5+1)*hauteurd:
+ for h=hauteur downto 1:
+ string p_;
+ p_=readfrom nomfichier;
+ l:=0;
+ if (h>hauteur-(#5+1)*hauteurd) and (h<hauteur-#5*hauteurd+1):
+ for p=2*#6*largeurd step 2 until 2*(#6+1)*largeurd-2:
+ l:=l+1;
+ if (substring(p,p+1) of p_)="-":
+ else:
+ if Nombres:
+ for m=0 upto (length BaseLettres-1):
+ if (substring(p,p+1) of p_)=substring(m,m+1) of BaseLettres:
+ label(TEX(RetiensNombres[m+1]) scaled EchelleScale,((l-1)*Unite,(h-1)*Unite));
+ fi;
+ endfor;
+ else:
+ label(TEX(substring(p,p+1) of p_) scaled EchelleScale,((l-1)*Unite,(h-1)*Unite));
+ fi;
+ if Solution:
+ for m=0 upto (length BaseLettres-1):
+ if (substring(p,p+1) of p_)=substring(m,m+1) of BaseLettres:
+ ColFond:=ColorEntier[m+1];
+ fi;
+ endfor;
+ if unknown ColFond: else: fill (unitsquare scaled Unite) shifted ((l-1)*Unite-0.5*Unite,(h-1)*Unite-0.5*Unite) withcolor ColFond fi;
+ fi;
+ trace (unitsquare scaled Unite) shifted ((l-1)*Unite-0.5*Unite,(h-1)*Unite-0.5*Unite);
+ fi;
+ endfor;
+ fi;
+ endfor;
+ closefrom nomfichier;
+ enddef;
+
+ Lecturecsv("#1");
+ \end{mplibcode}
+ \fi
} \ No newline at end of file
diff --git a/macros/latex/contrib/profcollege/latex/PfCPythagore.tex b/macros/latex/contrib/profcollege/latex/PfCPythagore.tex
index fa6b138d6f..5c922d98b0 100644
--- a/macros/latex/contrib/profcollege/latex/PfCPythagore.tex
+++ b/macros/latex/contrib/profcollege/latex/PfCPythagore.tex
@@ -284,7 +284,7 @@
\NomA\NomC^2&=\ifboolKV[ClesPythagore]{EnchaineA}{\opexport{a1}{\Aun}\num{\Aun}}{\opmul*{A1}{A1}{a1}\opexport{a1}{\Aun}\num{\Aun}}+\ifboolKV[ClesPythagore]{EnchaineB}{\opexport{a2}{\Adeux}\num{\Adeux}}{\opmul*{A2}{A2}{a2}\opexport{a2}{\Adeux}\num{\Adeux}}\\
\NomA\NomC^2&=\opadd*{a1}{a2}{a3}\opexport{a3}{\Atrois}\num{\Atrois}%\\
\ifboolKV[ClesPythagore]{AvantRacine}{}{%
- \ifboolKV[ClesPythagore]{Entier}{}{\\\NomA\NomC&=\sqrt{\opexport{a3}{\Atrois}\num{\Atrois}}}
+ \ifboolKV[ClesPythagore]{Entier}{}{\\\NomA\NomC&=\sqrt{\opexport{a3}{\Atrois}\num{\Atrois}}\ifboolKV[ClesPythagore]{Racine}{~\si{\PfCPythaUnit}}{}}
\ifboolKV[ClesPythagore]{Racine}{}{\\\NomA\NomC&\IfStrEq{\ResultatApproche}{\ResultatAttendu}{=}{\approx}\opsqrt[maxdivstep=5]{a3}{a4}\opround{a4}{pres}{a4}\opunzero{a4}\opexport{a4}{\Aquatre}\SI{\Aquatre}{\PfCPythaUnit}}%\\
}
\end{align*}
diff --git a/macros/latex/contrib/profcollege/latex/PfCReperage.tex b/macros/latex/contrib/profcollege/latex/PfCReperage.tex
index e363b35e8d..23e7bd2775 100644
--- a/macros/latex/contrib/profcollege/latex/PfCReperage.tex
+++ b/macros/latex/contrib/profcollege/latex/PfCReperage.tex
@@ -1313,12 +1313,12 @@
maxx:=\useKV[ClesReperage]{ValeurMax};
fi;
% Pour gérer les cas des droites où toutes les valeurs sont soit positives soit négatives
- if maxx<pasx:
- maxx:=pasx+1;
- fi;
- if minx>-pasx:
- minx:=-pasx-1;
- fi;
+% if maxx<pasx:
+% maxx:=pasx+1;
+% fi;
+% if minx>-pasx:
+% minx:=-pasx-1;
+% fi;
%
if DemiDroite:
minx:=0;
diff --git a/macros/latex/contrib/profcollege/latex/PfCStatistiques.tex b/macros/latex/contrib/profcollege/latex/PfCStatistiques.tex
index 0ae0894e96..6223f887cd 100644
--- a/macros/latex/contrib/profcollege/latex/PfCStatistiques.tex
+++ b/macros/latex/contrib/profcollege/latex/PfCStatistiques.tex
@@ -20,7 +20,7 @@ Largeur=1cm,Precision=2,PrecisionF=0,Donnee=Valeurs,Effectif=Effectif,Grille=fal
% 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,PasGrillex=1,PasGrilley=1,%
% Pour les diags circulaires
-Rayon=3cm,AffichageAngle=false,AffichageDonnee=false,ListeCouleurs={white},Hachures=false,ListeHachures={60},LectureInverse=false,EcartHachures=0.25,EpaisseurHachures=1,Legende,LegendeVide=false,ACompleter=false,DebutAngle=0,%
+Rayon=3cm,AffichageAngle=false,AffichageDonnee=false,ListeCouleurs={white},Hachures=false,ListeHachures={60},LectureInverse=false,EcartHachures=0.25,EpaisseurHachures=1,Legende,LegendeVide=false,ACompleter=false,DebutAngle=0,%on utilisera également la clé CouleurDefaut
%Pour les représentations
Representation=false,%
%Pour les barres horizontales
@@ -856,6 +856,8 @@ ModeleCouleur=5%
Retour=false;
ACompleter=\useKV[ClesStat]{ACompleter};
DebutAngle=\useKV[ClesStat]{DebutAngle};
+ color CoulDefaut;
+ CoulDefaut=\useKV[ClesStat]{CouleurDefaut};
%
pair A[],O,B[],C[],D[];
O=(0,0);
@@ -965,7 +967,12 @@ ModeleCouleur=5%
n:=0;
for p_=#3:
n:=n+1;
+ % Col[n]=p_;
+ if color p_:
Col[n]=p_;
+ else:
+ Col[n]=CoulDefaut;
+ fi;
endfor;
% on r\'ecup\`ere les angles d'hachures
numeric anglehach[];
diff --git a/macros/latex/contrib/profcollege/latex/PfCThales.tex b/macros/latex/contrib/profcollege/latex/PfCThales.tex
index ea01972c25..d4adb5be01 100644
--- a/macros/latex/contrib/profcollege/latex/PfCThales.tex
+++ b/macros/latex/contrib/profcollege/latex/PfCThales.tex
@@ -175,10 +175,10 @@
% #4 point sur le segment #1#2
% #5 point sur le segment #1#3
\ifluatex
- \mplibcodeinherit{enable}
+% \mplibcodeinherit{enable}
\mplibforcehmode
\begin{mplibcode}
- defaultcolormodel := \useKV[ClesThales]{ModeleCouleur};
+ defaultcolormodel := \useKV[ClesThales]{ModeleCouleur};
u:=\useKV[ClesThales]{Echelle};
pair A,B,C,M,N,O;%
%On place les points A,B,C sur le cercle de mani\`ere \`a faciliter la rotation de la figure
@@ -213,7 +213,7 @@
fill (fullcircle scaled 0.75mm) shifted (cotes1 intersectionpoint cotes4);
fill (fullcircle scaled 0.75mm) shifted (cotes3 intersectionpoint cotes4);
\end{mplibcode}
- \mplibcodeinherit{disable}
+% \mplibcodeinherit{disable}
\else
\begin{mpost}[mpsettings={u:=\useKV[ClesThales]{Echelle};}]
pair A,B,C,M,N,O;%
@@ -261,7 +261,7 @@
% #5 point sur la droite #1#3
\ifluatex
\mplibforcehmode
- \mplibcodeinherit{enable}
+% \mplibcodeinherit{enable}
\begin{mplibcode}
defaultcolormodel := \useKV[ClesThales]{ModeleCouleur};
u:=\useKV[ClesThales]{Echelle};
@@ -343,7 +343,7 @@
label(btex $//$ etex ,K);
drawoptions();
\end{mplibcode}
- \mplibcodeinherit{disable}
+% \mplibcodeinherit{disable}
\else
\begin{mpost}[mpsettings={u:=\useKV[ClesThales]{Echelle};boolean CouleursNum,CouleursDen;
CouleursNum=\useKV[ClesThales]{CouleursNum};
@@ -435,7 +435,7 @@
% #5 point sur la droite #1#3
\ifluatex
\mplibforcehmode
- \mplibcodeinherit{enable}
+% \mplibcodeinherit{enable}
\begin{mplibcode}
defaultcolormodel := \useKV[ClesThales]{ModeleCouleur};
u:=\useKV[ClesThales]{Echelle};
@@ -479,7 +479,7 @@
fill (fullcircle scaled 0.75mm) shifted (cotes1 intersectionpoint cotes2);
fill (fullcircle scaled 0.75mm) shifted (cotes3 intersectionpoint cotes2);
\end{mplibcode}
- \mplibcodeinherit{disable}
+% \mplibcodeinherit{disable}
\else
\begin{mpost}[mpsettings={u:=\useKV[ClesThales]{Echelle};}]
pair A,B,C,M,N,O;%
diff --git a/macros/latex/contrib/profcollege/latex/PfCTrigonometrie.tex b/macros/latex/contrib/profcollege/latex/PfCTrigonometrie.tex
index c31076e010..38fe05ce60 100644
--- a/macros/latex/contrib/profcollege/latex/PfCTrigonometrie.tex
+++ b/macros/latex/contrib/profcollege/latex/PfCTrigonometrie.tex
@@ -209,7 +209,7 @@
% #6 hyp
% #7 angle de rotation
\ifluatex
- \mplibcodeinherit{enable}
+% \mplibcodeinherit{enable}
\mplibforcehmode
\begin{mplibcode}
defaultcolormodel := \useKV[ClesTrigo]{ModeleCouleur};
@@ -278,7 +278,7 @@
fi;
fi;
\end{mplibcode}
-\mplibcodeinherit{disable}
+%\mplibcodeinherit{disable}
\else
\begin{mpost}[mpsettings={u:=\useKV[ClesTrigo]{Echelle};}]
u:=1cm;
diff --git a/macros/latex/contrib/profcollege/latex/PfCTrio.tex b/macros/latex/contrib/profcollege/latex/PfCTrio.tex
index beee6278fa..560258ff59 100644
--- a/macros/latex/contrib/profcollege/latex/PfCTrio.tex
+++ b/macros/latex/contrib/profcollege/latex/PfCTrio.tex
@@ -1,7 +1,7 @@
\newlength\PfCTrioHauteur%
\newcounter{PfCTrioLettre}%
-\setKVdefault[Trio]{Largeur=15pt,Graines=false,Repere=false,Cibles=false,Ligne=1,Colonne=1,Vide=false,VideRepere=false,Relatifs=false,Ecole=false,Horizontal=false,Vertical=false,DiagonaleM=false,DiagonaleD=false,NonAlea=false,NbSolutions=false}%
+\setKVdefault[Trio]{Largeur=15pt,Graines=false,Repere=false,Cibles=false,Ligne=1,Colonne=1,Vide=false,VideRepere=false,Relatifs=false,Ecole=false,Horizontal=false,Vertical=false,DiagonaleM=false,DiagonaleD=false,NonAlea=false,NbSolutions=false,IntroRelatifs=false}%
\defKV[Trio]{Graine=\setKV[Trio]{Graines}}%
\defKV[Trio]{Cible=\setKV[Trio]{Cibles}}%
\defKV[Trio]{Liste=\setKV[Trio]{NonAlea}}%
@@ -20,18 +20,29 @@
}%
\NewDocumentCommand\TrioTestCible{O{\useKV[Trio]{Cible}}mmm}{%
- \xintifboolexpr{%
- \fpeval{#2*#3+#4}==#1%
- || \fpeval{#2*#3-#4}==#1%
- || \fpeval{#3*#4+#2}==#1%
- || \fpeval{#3*#4-#2}==#1%
- || \fpeval{#4*#2+#3}==#1%
- || \fpeval{#4*#2-#3}==#1%
- % ajout pour une cible négative
- || \fpeval{#3-#4*#2}==#1%
- || \fpeval{#4-#2*#3}==#1%
- || \fpeval{#2-#3*#4}==#1%
- }{\xdef\PfCRetourTestCible{1}}{\xdef\PfCRetourTestCible{0}}%
+ \ifboolKV[Trio]{IntroRelatifs}{%
+ \xintifboolexpr{%
+ \fpeval{#2*#3+#4}==#1%
+ || \fpeval{#2*#3-#4}==#1%
+ || \fpeval{#3*#4+#2}==#1%
+ || \fpeval{#3*#4-#2}==#1%
+ || \fpeval{#4*#2+#3}==#1%
+ || \fpeval{#4*#2-#3}==#1%
+ % ajout pour une cible négative
+ || \fpeval{#3-#4*#2}==#1%
+ || \fpeval{#4-#2*#3}==#1%
+ || \fpeval{#2-#3*#4}==#1%
+ }{\xdef\PfCRetourTestCible{1}}{\xdef\PfCRetourTestCible{0}}%
+ }{%
+ \xintifboolexpr{%
+ \fpeval{#2*#3+#4}==#1%
+ || \fpeval{#2*#3-#4}==#1%
+ || \fpeval{#3*#4+#2}==#1%
+ || \fpeval{#3*#4-#2}==#1%
+ || \fpeval{#4*#2+#3}==#1%
+ || \fpeval{#4*#2-#3}==#1%
+ }{\xdef\PfCRetourTestCible{1}}{\xdef\PfCRetourTestCible{0}}%
+ }%
}%
\NewDocumentCommand\Trio{o}{%
diff --git a/macros/latex/contrib/profcollege/latex/ProfCollege.sty b/macros/latex/contrib/profcollege/latex/ProfCollege.sty
index d09cfda988..3963e71e7d 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{2024/03/24}%
+\def\filedate{2024/04/20}%
\let\PfCfiledate\filedate%
-\def\fileversion{0.99-A-b}%
+\def\fileversion{0.99-A-c}%
\let\PfCfileversion\fileversion%
\ProvidesPackage{ProfCollege}[\filedate\space v\fileversion\space Aide pour utiliser LaTeX au college]%
@@ -39,7 +39,7 @@
% mathématiques
\RequirePackage{siunitx}%
\sisetup{%
- locale=FR,%mode = match,
+ locale=FR,mode = match,
propagate-math-font = true,%
reset-math-version = false, reset-text-family = false,%
reset-text-series = false, reset-text-shape = false,%
@@ -326,12 +326,40 @@
\IfNoValueTF{#1}{\Dotfill}{\makebox[#1]{\Dotfill}}%
}%
+%\NewDocumentCommand\Lignespointilles{m}{%
+% \xintifboolexpr{\fpeval{#1}>1}{%
+% \xintFor* ##1 in {\xintSeq {1}{\fpeval{#1}}}\do{%
+% \pointilles\par%
+% }%
+% }{}%
+%}%
+
+\NewDocumentCommand\PfCNbLignesRestantes{}{%
+ \edef\measurepage{\dimexpr\pagegoal-\pagetotal\relax}%
+ \xintifboolexpr{\fpeval{\the\measurepage}>\fpeval{\the\textheight}}{
+% Toto
+ \edef\measurepage{\dimexpr\textheight\relax}
+ }{}
+ \xdef\PfCResteLignes{\fpeval{trunc((\the\measurepage)/(\baselineskip),0)}}%
+}%
+
+\NewDocumentCommand\PfCLignesFinales{}{%
+ \PfCNbLignesRestantes%
+ \xintFor* ##1 in {\xintSeq {1}{\PfCResteLignes}}\do{%
+ \pointilles\par%
+ }%
+}%
+
\NewDocumentCommand\Lignespointilles{m}{%
- \xintifboolexpr{\fpeval{#1}>1}{%
- \xintFor* ##1 in {\xintSeq {1}{\fpeval{#1}}}\do{%
- \pointilles\par%
- }%
- }{}%
+ \ifx\bla#1\bla%
+ \par\PfCLignesFinales%
+ \else%
+ \xintifboolexpr{\fpeval{#1}>1}{%
+ \xintFor* ##1 in {\xintSeq {1}{#1}}\do{%
+ \pointilles\par%
+ }%
+ }{}%
+ \fi
}%
%https://tex.stackexchange.com/questions/128991/frac-or-inference-rule-with-dotted-line
@@ -759,6 +787,7 @@
\def\PfCSymbolTimes{\times}%
\def\PfCSymbolDiv{\div}%
+\input{PfCAssemblagesSolides}
\input{PfCTicketCaisse}
\input{PfCRecyclage}
\input{PfCDontCountDots}
diff --git a/macros/latex/contrib/profcollege/metapost/PfCObjets.mp b/macros/latex/contrib/profcollege/metapost/PfCObjets.mp
index 3b47a88983..fd2fbe0f2d 100644
--- a/macros/latex/contrib/profcollege/metapost/PfCObjets.mp
+++ b/macros/latex/contrib/profcollege/metapost/PfCObjets.mp
@@ -42,6 +42,263 @@ Transparence:=false;
boolean couleurz;%pour gérer l'affichage "des lignes" de niveaux
couleurz:=false;
+ vardef AffichageObjetCylindre[]=
+ save _affi;
+ picture _affi;
+ color Fc[][];color cou[];
+ tapj:=0;
+ for k=0 upto apj.@:
+ cpt[tapj]:=tapj;
+ Fc[tapj].nb:=OTFc.@[k].nb;
+ for l=1 upto Fc[tapj].nb:
+ Fc[tapj][l]:=OTFc.@[k][l];
+ endfor;
+ Fc[tapj].iso:=OTFc.@[k].iso;
+ cou[tapj]:=if perso.@:scantokens(couleurperso) else: coul.@[k] fi;
+ ALT[tapj]:=ALT.@[k];
+ Vue[tapj]:=Vue.@[k];
+ tapj:=tapj+1;
+ endfor;
+ tapj:=tapj-1;
+ QS(0,tapj);
+ for k=0 step 1 until tapj:
+ if Vue[cpt[k]]=false:
+ draw Projette(Fc[cpt[k]][1])--Projette(Fc[cpt[k]][2]) dashed dashpattern(on0.5 off2) withpen pencircle scaled0.25;
+ draw Projette(Fc[cpt[k]][3])--Projette(Fc[cpt[k]][4]) dashed dashpattern(on0.5 off2) withpen pencircle scaled0.25;
+ fi;
+ endfor;
+ n:=0;
+ for k=0 step 1 until tapj:
+ if Vue[cpt[k]]:
+% label(""&decimal(cpt[k])&"",Projette(Fc[cpt[k]].iso));
+ n:=n+1;
+ if n<3:
+ if cpt[k]>1:
+ vala[n]=cpt[k];
+% label.top(decimal(n)&"--"&decimal(vala[n]),n*u*(1,0));
+ else:
+ n:=n-1;
+ fi;
+ fi;
+ if cpt[k]<1:
+ draw for l=1 upto Fc[cpt[k]].nb:
+ Projette(Fc[cpt[k]][l])--
+ endfor
+ cycle;% withpen pencircle scaled0.25;
+ fi;
+ if cpt[k]>1:
+ draw Projette(Fc[cpt[k]][1])--Projette(Fc[cpt[k]][2]);% withpen pencircle scaled0.25;
+ draw Projette(Fc[cpt[k]][3])--Projette(Fc[cpt[k]][4]);% withpen pencircle scaled0.25;
+ fi;
+ fi;
+ endfor;
+ if vala[1]<vala[2]:
+ draw Projette(Fc[vala[1]][2])--Projette(Fc[vala[1]][3]);% withpen pencircle scaled0.25;
+ draw Projette(Fc[vala[2]][1])--Projette(Fc[vala[2]][4]);% withpen pencircle scaled0.25;
+ else:
+ draw Projette(Fc[vala[1]][1])--Projette(Fc[vala[1]][4]);% withpen pencircle scaled0.25;
+ draw Projette(Fc[vala[2]][2])--Projette(Fc[vala[2]][3]);% withpen pencircle scaled0.25;
+ fi;
+enddef;
+
+ vardef AffichageObjetCylindreSansBase[]=
+ save _affi;
+ picture _affi;
+ color Fc[][];color cou[];
+ tapj:=0;
+ for k=0 upto apj.@:
+ cpt[tapj]:=tapj;
+ Fc[tapj].nb:=OTFc.@[k].nb;
+ for l=1 upto Fc[tapj].nb:
+ Fc[tapj][l]:=OTFc.@[k][l];
+ endfor;
+ Fc[tapj].iso:=OTFc.@[k].iso;
+ cou[tapj]:=if perso.@:scantokens(couleurperso) else: coul.@[k] fi;
+ ALT[tapj]:=ALT.@[k];
+ Vue[tapj]:=Vue.@[k];
+ tapj:=tapj+1;
+ endfor;
+ tapj:=tapj-1;
+ QS(0,tapj);
+ for k=0 step 1 until tapj:
+ if Vue[cpt[k]]=false:
+ draw Projette(Fc[cpt[k]][1])--Projette(Fc[cpt[k]][2]) dashed dashpattern(on0.5 off2) withpen pencircle scaled0.25;
+ draw Projette(Fc[cpt[k]][3])--Projette(Fc[cpt[k]][4]) dashed dashpattern(on0.5 off2) withpen pencircle scaled0.25;
+ fi;
+ endfor;
+ n:=0;
+ for k=0 step 1 until tapj:
+ if Vue[cpt[k]]:
+% label(""&decimal(cpt[k])&"",Projette(Fc[cpt[k]].iso));
+ n:=n+1;
+ if n<3:
+ if cpt[k]>1:
+ vala[n]=cpt[k];
+% label.top(decimal(n)&"--"&decimal(vala[n]),n*u*(1,0));
+ else:
+ n:=n-1;
+ fi;
+ fi;
+ %if cpt[k]<1:
+ %draw for l=1 upto Fc[cpt[k]].nb:
+ % Projette(Fc[cpt[k]][l])--
+ % endfor
+ % cycle withpen pencircle scaled0.25;
+ % fi;
+ if cpt[k]>1:
+ draw Projette(Fc[cpt[k]][1])--Projette(Fc[cpt[k]][2]);% withpen pencircle scaled0.25;
+ draw Projette(Fc[cpt[k]][3])--Projette(Fc[cpt[k]][4]);% withpen pencircle scaled0.25;
+ fi;
+ fi;
+ endfor;
+ if vala[1]<vala[2]:
+ draw Projette(Fc[vala[1]][2])--Projette(Fc[vala[1]][3]);% withpen pencircle scaled0.25;
+ draw Projette(Fc[vala[2]][1])--Projette(Fc[vala[2]][4]);% withpen pencircle scaled0.25;
+ else:
+ draw Projette(Fc[vala[1]][1])--Projette(Fc[vala[1]][4]);% withpen pencircle scaled0.25;
+ draw Projette(Fc[vala[2]][2])--Projette(Fc[vala[2]][3]);% withpen pencircle scaled0.25;
+ fi;
+enddef;
+
+vardef AffichageObjetCone[]=
+ save _affi;
+ picture _affi;
+ color Fc[][];color cou[];
+ tapj:=0;
+ for k=0 upto apj.@:
+ cpt[tapj]:=tapj;
+ Fc[tapj].nb:=OTFc.@[k].nb;
+ for l=1 upto Fc[tapj].nb:
+ Fc[tapj][l]:=OTFc.@[k][l];
+ endfor;
+ Fc[tapj].iso:=OTFc.@[k].iso;
+ cou[tapj]:=if perso.@:scantokens(couleurperso) else: coul.@[k] fi;
+ ALT[tapj]:=ALT.@[k];
+ Vue[tapj]:=Vue.@[k];
+ tapj:=tapj+1;
+ endfor;
+ tapj:=tapj-1;
+ QS(0,tapj);
+ n:=0;
+ for k=0 upto tapj:
+ if Vue[cpt[k]]:
+ %label(""&decimal(cpt[k])&"",Projette(Fc[cpt[k]].iso));
+ if cpt[k]>0:
+ n:=n+1;
+ if n<3:
+ if cpt[k]>1:
+ vala[n]:=cpt[k];
+% label.top(decimal(n)&"--"&decimal(vala[n]),n*u*(1,0));
+ else:
+ n:=n-1;
+ fi;
+ fi;
+ draw Projette(Fc[cpt[k]][1])--Projette(Fc[cpt[k]][2]);%withpen pencircle scaled0.25bp;
+ fi;
+ fi;
+ endfor;
+ if vala[1]<vala[2]:
+ draw Projette(Fc[vala[1]][2])--Projette(Fc[vala[1]][3]);% withpen pencircle scaled0.25;
+ draw Projette(Fc[vala[2]][1])--Projette(Fc[vala[2]][4]);% withpen pencircle scaled0.25;
+ else:
+ draw Projette(Fc[vala[1]][1])--Projette(Fc[vala[1]][4]);% withpen pencircle scaled0.25;
+ draw Projette(Fc[vala[2]][2])--Projette(Fc[vala[2]][3]);% withpen pencircle scaled0.25;
+ fi;
+ enddef;
+
+ vardef AffichageObjetConeAvecBase[]=
+ save _affi;
+ picture _affi;
+ color Fc[][];color cou[];
+ tapj:=0;
+ for k=0 upto apj.@:
+ cpt[tapj]:=tapj;
+ Fc[tapj].nb:=OTFc.@[k].nb;
+ for l=1 upto Fc[tapj].nb:
+ Fc[tapj][l]:=OTFc.@[k][l];
+ endfor;
+ Fc[tapj].iso:=OTFc.@[k].iso;
+ cou[tapj]:=if perso.@:scantokens(couleurperso) else: coul.@[k] fi;
+ ALT[tapj]:=ALT.@[k];
+ Vue[tapj]:=Vue.@[k];
+ tapj:=tapj+1;
+ endfor;
+ tapj:=tapj-1;
+ QS(0,tapj);
+ for k=0 upto tapj:
+ if Vue[cpt[k]]=false:
+ draw Projette(Fc[cpt[k]][1])--Projette(Fc[cpt[k]][2])
+ dashed dashpattern(on0.5 off2) withpen pencircle scaled0.25bp;
+ fi;
+ endfor;
+ n:=0;
+ for k=0 upto tapj:
+ if Vue[cpt[k]]:
+ %label(""&decimal(cpt[k])&"",Projette(Fc[cpt[k]].iso));
+ if cpt[k]>0:
+ n:=n+1;
+ if n<3:
+ if cpt[k]>1:
+ vala[n]:=cpt[k];
+% label.top(decimal(n)&"--"&decimal(vala[n]),n*u*(1,0));
+ else:
+ n:=n-1;
+ fi;
+ fi;
+ draw Projette(Fc[cpt[k]][1])--Projette(Fc[cpt[k]][2]);%withpen pencircle scaled0.25bp;
+ fi;
+ fi;
+ endfor;
+ if vala[1]<vala[2]:
+ draw Projette(Fc[vala[1]][2])--Projette(Fc[vala[1]][3]);% withpen pencircle scaled0.25;
+ draw Projette(Fc[vala[2]][1])--Projette(Fc[vala[2]][4]);% withpen pencircle scaled0.25;
+ else:
+ draw Projette(Fc[vala[1]][1])--Projette(Fc[vala[1]][4]);% withpen pencircle scaled0.25;
+ draw Projette(Fc[vala[2]][2])--Projette(Fc[vala[2]][3]);% withpen pencircle scaled0.25;
+ fi;
+enddef;
+
+ vardef AffichageObjetCalotte[]=
+ save _affi;
+ picture _affi;
+ color Fc[][];color cou[];
+ tapj:=0;
+ for k=0 upto apj.@:
+ cpt[tapj]:=tapj;
+ Fc[tapj].nb:=OTFc.@[k].nb;
+ for l=1 upto Fc[tapj].nb:
+ Fc[tapj][l]:=OTFc.@[k][l];
+ endfor;
+ Fc[tapj].iso:=OTFc.@[k].iso;
+ cou[tapj]:=if perso.@:scantokens(couleurperso) else: coul.@[k] fi;
+ ALT[tapj]:=ALT.@[k];
+ Vue[tapj]:=Vue.@[k];
+ tapj:=tapj+1;
+ endfor;
+ tapj:=tapj-1;
+ QS(0,tapj);
+ minvue:=4000;
+ for k=1 step 1 until tapj:
+ if cpt[k]>1:
+ if Vue[cpt[k]]:
+ if cpt[k]<minvue:
+ minvue:=cpt[k];
+ fi;
+ fi;
+ fi;
+ endfor;
+ for k=0 upto 11:
+ draw for l=1 upto 2:%Fc[minvue+k*72].nb:
+ Projette(Fc[minvue+k*72][l])--
+ endfor
+ cycle;% withpen pencircle scaled0.25bp;
+ draw for l=3 upto 4:%Fc[minvue+k*72].nb:
+ Projette(Fc[minvue+35+k*72][l])--
+ endfor
+ cycle;% withpen pencircle scaled0.25bp;
+ endfor;
+enddef;
+
vardef AffichagePfC[]=
save _affi;
picture _affi;
diff --git a/macros/latex/contrib/profcollege/metapost/PfCScratch.mp b/macros/latex/contrib/profcollege/metapost/PfCScratch.mp
index 2a7ce304e2..6e2e7beb59 100644
--- a/macros/latex/contrib/profcollege/metapost/PfCScratch.mp
+++ b/macros/latex/contrib/profcollege/metapost/PfCScratch.mp
@@ -1689,8 +1689,11 @@ $=image(
fill cadre withcolor if print : coefprint*White else : if unknown colControle : LightOrange else : colControle fi fi;
draw cadre withcolor if print : coefprint*White else : if unknown colControle : LightOrange else : colControle fi fi;
AA:=ahangle;
- ahangle:=90;
- drawarrow (lrcorner texto+(-0.625cm,0.15cm)){dir-15}..{dir90}(urcorner texto+(-0.25cm,-0.1cm)) withpen pencircle scaled2bp if print=false : withcolor white fi;
+ BB:=ahlength;
+ ahangle:=90;%90
+ ahlength:=ahlength/2;
+% drawarrow (lrcorner texto+(-0.625cm,0.15cm)){dir-15}..{dir90}(urcorner texto+(-0.25cm,-0.1cm)) withpen pencircle scaled1.5 if print=false : withcolor white fi;
+ drawarrow (lrcorner texto+(-0.25cm,0.15cm)){dir-30}..{dir90}(urcorner texto+(-0.125cm,-0.1cm)) withpen pencircle scaled1 if print=false : withcolor white fi;
ahangle:=AA;
draw (coindebutbloc[numblocrep]+(0.0625+0.5cm+eb,0.125)){dir180}..
{dir-90}(coindebutbloc[numblocrep]+(0.5cm,-eb))--
diff --git a/macros/luatex/generic/luamplib/NEWS b/macros/luatex/generic/luamplib/NEWS
index 905444e354..52aacc7f62 100644
--- a/macros/luatex/generic/luamplib/NEWS
+++ b/macros/luatex/generic/luamplib/NEWS
@@ -1,5 +1,8 @@
History of the luamplib package
+2024/04/19 2.28.1
+ * fix spot color shading routine
+
2024/04/12 2.28.0
* provide a new metapost operator 'mplibgraphictext', which is similar
to ConTeXt's 'graphictext'. But the syntax is not the same:
diff --git a/macros/luatex/generic/luamplib/luamplib.dtx b/macros/luatex/generic/luamplib/luamplib.dtx
index eacb425835..28c6bc037e 100644
--- a/macros/luatex/generic/luamplib/luamplib.dtx
+++ b/macros/luatex/generic/luamplib/luamplib.dtx
@@ -85,7 +85,7 @@ See source file '\inFileName' for licencing and contact information.
%<*driver>
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{luamplib.drv}%
- [2024/04/12 v2.28.0 Interface for using the mplib library]%
+ [2024/04/19 v2.28.1 Interface for using the mplib library]%
\documentclass{ltxdoc}
\usepackage{metalogo,multicol,mdwlist,fancyvrb,xspace}
\usepackage[x11names]{xcolor}
@@ -153,7 +153,7 @@ See source file '\inFileName' for licencing and contact information.
% \author{Hans Hagen, Taco Hoekwater, Elie Roux, Philipp Gesang and Kim Dohyun\\
% Maintainer: LuaLaTeX Maintainers ---
% Support: \email{lualatex-dev@tug.org}}
-% \date{2024/04/12 v2.28.0}
+% \date{2024/04/19 v2.28.1}
%
% \maketitle
%
@@ -476,8 +476,8 @@ See source file '\inFileName' for licencing and contact information.
luatexbase.provides_module {
name = "luamplib",
- version = "2.28.0",
- date = "2024/04/12",
+ version = "2.28.1",
+ date = "2024/04/19",
description = "Lua package to typeset Metapost with LuaTeX's MPLib.",
}
@@ -535,7 +535,6 @@ local tableconcat = table.concat
local texsprint = tex.sprint
local textprint = tex.tprint
-local texget = tex.get
local texgettoks = tex.gettoks
local texgetbox = tex.getbox
local texruntoks = tex.runtoks
@@ -795,11 +794,6 @@ luamplib.finder = finder
% (Don't know which version of MPLib started to support
% |make_text| and |run_script|; let the users find it.)
% \begin{macrocode}
-if tonumber(mplib.version()) <= 1.50 then
- err("luamplib no longer supports mplib v1.50 or lower. "..
- "Please upgrade to the latest version of LuaTeX")
-end
-
local preamble = [[
boolean mplib ; mplib := true ;
let dump = endinput ;
@@ -894,13 +888,12 @@ local function luamplibload (name)
%
% Append our own MetaPost preamble to the preamble above.
% \begin{macrocode}
- local preamble = preamble .. luamplib.mplibcodepreamble
- if luamplib.legacy_verbatimtex then
- preamble = preamble .. luamplib.legacyverbatimtexpreamble
- end
- if luamplib.textextlabel then
- preamble = preamble .. luamplib.textextlabelpreamble
- end
+ local preamble = tableconcat{
+ preamble,
+ luamplib.mplibcodepreamble,
+ luamplib.legacy_verbatimtex and luamplib.legacyverbatimtexpreamble or "",
+ luamplib.textextlabel and luamplib.textextlabelpreamble or "",
+ }
local result, log
if not mpx then
result = { status = 99, error = "out of memory"}
@@ -966,6 +959,11 @@ end
% \end{macrocode}
%
+% |dvipdfmx| is supported, though nobody seems to use it.
+% \begin{macrocode}
+local pdfmode = tex.get"outputmode" > 0
+% \end{macrocode}
+%
% |make_text| and some |run_script| uses \LuaTeX's |tex.runtoks|,
% which made possible running \TeX\ code snippets inside |\directlua|.
% \begin{macrocode}
@@ -1010,9 +1008,9 @@ local texboxes = {
% \begin{macrocode}
local factor = 65536*(7227/7200)
-local textext_fmt = [[image(addto currentpicture doublepath unitsquare ]]..
- [[xscaled %f yscaled %f shifted (0,-%f) ]]..
- [[withprescript "mplibtexboxid=%i:%f:%f")]]
+local textext_fmt = 'image(addto currentpicture doublepath unitsquare \z
+xscaled %f yscaled %f shifted (0,-%f) \z
+withprescript "mplibtexboxid=%i:%f:%f")'
local function process_tex_text (str)
if str then
@@ -1059,14 +1057,17 @@ end
% Attempt to support l3color as well.
% \begin{macrocode}
local mplibcolorfmt = {
- xcolor = [[\begingroup\let\XC@mcolor\relax]]..
- [[\def\set@color{\global\mplibtmptoks\expandafter{\current@color}}]]..
- [[\color%s\endgroup]],
- l3color = [[\begingroup]]..
- [[\def\__color_select:N#1{\expandafter\__color_select:nn#1}]]..
- [[\def\__color_backend_select:nn#1#2{\global\mplibtmptoks{#1 #2}}]]..
- [[\def\__kernel_backend_literal:e#1{\global\mplibtmptoks\expandafter{\expanded{#1}}}]]..
- [[\color_select:n%s\endgroup]],
+ xcolor = tableconcat{
+ [[\begingroup\let\XC@mcolor\relax]],
+ [[\def\set@color{\global\mplibtmptoks\expandafter{\current@color}}]],
+ [[\color%s\endgroup]],
+ },
+ l3color = tableconcat{
+ [[\begingroup\def\__color_select:N#1{\expandafter\__color_select:nn#1}]],
+ [[\def\__color_backend_select:nn#1#2{\global\mplibtmptoks{#1 #2}}]],
+ [[\def\__kernel_backend_literal:e#1{\global\mplibtmptoks\expandafter{\expanded{#1}}}]],
+ [[\color_select:n%s\endgroup]],
+ },
}
local colfmt = is_defined'color_select:n' and "l3color" or "xcolor"
@@ -1081,16 +1082,15 @@ if colfmt == "l3color" then
"\\endgroup",
}
end
-
local ccexplat = luatexbase.registernumber"luamplibcctabexplat"
-local function process_color (str, filldraw)
+local function process_color (str, kind)
if str then
if not str:find("%b{}") then
str = format("{%s}",str)
end
local myfmt = mplibcolorfmt[colfmt]
- if colfmt == "l3color" and (is_defined"ver@xcolor.sty" or is_defined"ver@color.sty") then
+ if colfmt == "l3color" and is_defined"color" then
if str:find("%b[]") then
myfmt = mplibcolorfmt.xcolor
else
@@ -1105,17 +1105,28 @@ local function process_color (str, filldraw)
end
end
end
- if filldraw and filldraw ~= "shade" and myfmt == mplibcolorfmt.l3color then
- return str
- end
+ if myfmt == mplibcolorfmt.l3color and (kind == "fill" or kind == "draw") then return str end
run_tex_code(myfmt:format(str), ccexplat or catat11)
local t = texgettoks"mplibtmptoks"
- if filldraw then return t end
+ if not pdfmode and not t:find"^pdf" then
+ t = t:gsub("%a+ (.+)","pdf:bc [%1]")
+ end
+ if kind then return t end
return format('1 withprescript "MPlibOverrideColor=%s"', t)
end
return ""
end
+local function colorsplit (res)
+ local t, tt = { }, res:gsub("[%[%]]",""):explode()
+ local be = tt[1]:find"^%d" and 1 or 2
+ for i=be, #tt do
+ if tt[i]:find"^%a" then break end
+ table.insert(t, tt[i])
+ end
+ return t
+end
+
luamplib.outlinecolor = function (str, filldraw)
local nn = filldraw == "fill" and 'fn:=' or 'dn:='
local cc = filldraw == "fill" and 'fc:=' or 'dc:='
@@ -1123,19 +1134,14 @@ luamplib.outlinecolor = function (str, filldraw)
if res:match"{(.+)}" == str then
return format('%s"n"; %s"%s";', nn,cc,str)
end
- local tt, t = res:explode(), { }
- local be = tt[1]:find"^%d" and 1 or 2
- for i=be, #tt do
- if tt[i]:find"^%a" then break end
- table.insert(t, tt[i])
- end
+ local t = colorsplit(res)
local md = #t == 1 and 'gray' or #t == 3 and 'rgb' or #t == 4 and 'cmyk'
return format('%s"nn"; %s"%s}{%s";', nn, cc, md, tableconcat(t,','))
end
luamplib.shadecolor = function (str)
local res = process_color(str, "shade")
- if res:find" cs" then -- spot color shade: l3 only
+ if res:find" cs " or res:find"@pdf.obj" then -- spot color shade: l3 only
% \end{macrocode}
% An example of spot color shading:
% \begin{verbatim}
@@ -1191,16 +1197,24 @@ luamplib.shadecolor = function (str)
[[\color_export:nnN{]], str, [[}{backend}\mplib_@tempa]],
},ccexplat)
local name = get_macro'mplib_@tempa':match'{(.-)}{.+}'
- local value = res:explode()[3]
- return format('(%s) withprescript"mplib_spotcolor=%s:%s"', value,str,name)
- end
- local tt, t = res:explode(), { }
- local be = tt[1]:find"^%d" and 1 or 2
- for i=be, #tt do
- if tt[i]:find"^%a" then break end
- table.insert(t, tt[i])
+ local t, obj = res:explode()
+ if pdfmode then
+ obj = t[1]:match"^/(.+)"
+ if ltx.pdf and ltx.pdf.object_id then
+ obj = format("%s 0 R", ltx.pdf.object_id(obj))
+ else
+ run_tex_code({
+ [[\edef\mplib_@tempa{\pdf_object_ref:n{]], obj, "}}",
+ },ccexplat)
+ obj = get_macro'mplib_@tempa'
+ end
+ else
+ obj = t[2]
+ end
+ local value = t[3]:match"%[(.-)%]" or t[3]
+ return format('(%s) withprescript"mplib_spotcolor=%s:%s"', value,obj,name)
end
- return t
+ return colorsplit(res)
end
% \end{macrocode}
@@ -1753,13 +1767,6 @@ local function flushconcatpath(path,open)
end
end
-% \end{macrocode}
-%
-% |dvipdfmx| is supported, though nobody seems to use it.
-% \begin{macrocode}
-local pdfoutput = tonumber(texget("outputmode")) or tonumber(texget("pdfoutput"))
-local pdfmode = pdfoutput > 0
-
local function start_pdf_code()
if pdfmode then
pdf_literalcode("q")
@@ -1966,9 +1973,16 @@ local function sh_pdfpageresources(shtype,domain,colorspace,ca,cb,coordinates,st
"/Extend [true true]/AntiAlias true>>",
}
local on, new
- if colorspace == [[\pdffeedback lastobj 0 R]] then
- on, new = pdf.reserveobj(), true
- texsprint(format([[\immediate\pdfextension obj useobjnum %s{%s}]],on,os))
+ if colorspace == [[\pdf_object_ref_last:]] then
+ if pdfmode then
+ on, new = pdf.reserveobj(), true
+ texsprint(ccexplat, format([[\immediate\pdfextension obj useobjnum %s{%s}]],on,os))
+ else
+ local int = tex.getcount"g__pdf_backend_object_int"+1
+ tex.setcount("global","g__pdf_backend_object_int", int)
+ on, new = format("cs%s",int), true
+ texsprint(ccexplat, format("\\special{pdf:obj @mplibpdfobj%s %s}",on,os))
+ end
else
on, new = update_pdfobjs(os)
end
@@ -2054,11 +2068,7 @@ local function do_preobj_CR(object,prescript)
pdf_literalcode(override)
override = nil
else
- if override:find"^pdf:" then
- texsprint(format("\\special{%s}",override))
- else
- texsprint(format("\\special{color push %s}",override))
- end
+ texsprint(format("\\special{%s}",override))
prev_override_color = override
end
else
@@ -2069,11 +2079,7 @@ local function do_preobj_CR(object,prescript)
elseif not pdfmode then
override = prev_override_color
if override then
- if override:find"^pdf:" then
- texsprint(format("\\special{%s}",override))
- else
- texsprint(format("\\special{color push %s}",override))
- end
+ texsprint(format("\\special{%s}",override))
end
end
end
@@ -2084,6 +2090,7 @@ end
%
% shading
% \begin{macrocode}
+luamplib.clrspcs = { }
local function do_preobj_SH(object,prescript)
local shade_no
local sh_type = prescript and prescript.sh_type
@@ -2117,7 +2124,7 @@ local function do_preobj_SH(object,prescript)
end
end
end
- local model, ca, cb, colorspace, steps, fractions = 0
+ local ca, cb, colorspace, steps, fractions
ca = { prescript.sh_color_a_1 or prescript.sh_color_a or {0} }
cb = { prescript.sh_color_b_1 or prescript.sh_color_b or {1} }
steps = tonumber(prescript.sh_step) or 1
@@ -2130,29 +2137,70 @@ local function do_preobj_SH(object,prescript)
end
end
if prescript.mplib_spotcolor then
- local names, last = { }, ""
+ ca, cb = { }, { }
+ local names, pos, objref = { }, -1, ""
local script = object.prescript:explode"\13+"
for i=#script,1,-1 do
if script[i]:find"mplib_spotcolor" then
- local str, name = script[i]:match"mplib_spotcolor=(.-):(.+)"
- if str ~= last then
+ local name, value
+ objref, name = script[i]:match"=(.-):(.+)"
+ value = script[i+1]:match"=(.+)"
+ if not names[name] then
+ pos = pos+1
+ names[name] = pos
names[#names+1] = name
end
- last = str
+ local t = { }
+ for j=1,names[name] do t[#t+1] = 0 end
+ t[#t+1] = value
+ table.insert(#ca == #cb and ca or cb, t)
+ end
+ end
+ for _,t in ipairs{ca,cb} do
+ for _,tt in ipairs(t) do
+ for i=1,#names-#tt do tt[#tt+1] = 0 end
end
end
- texsprint(ccexplat,{
- [[\color_model_new:nnn{]], tableconcat(names),
- [[}{DeviceN}{names={]], tableconcat(names,","), [[}}]]
- })
- colorspace = [[\pdffeedback lastobj 0 R]]
- for n,t in ipairs{ca,cb} do
- for i=1,#t do
- for j=1, i+n-2 do table.insert(t[i], j, 0) end
- for j=i+n, #t+1 do table.insert(t[i], j, 0) end
+ if #names == 1 then
+ colorspace = objref
+ else
+ local name = tableconcat(names,"-")
+ local obj = luamplib.clrspcs[name] or 0
+ if type(obj) == "string" then
+ colorspace = obj
+ else
+ obj = obj+1
+ luamplib.clrspcs[name] = obj
+ colorspace = [[\pdf_object_ref_last:]]
+ local function put_devicen()
+ texsprint(ccexplat,{
+ [[\color_model_new:nnn]],
+ format("{mplibcolorspace_%s_%s}", name, obj),
+ format("{DeviceN}{names={%s}}", tableconcat(names,",")),
+ })
+ end
+ if obj == 1 then
+ put_devicen()
+ texsprint(ccexplat,"\\directlua{luamplib.clrspcs['",name,"']='",colorspace,"'}")
+ if is_defined'@auxout' then
+ texsprint(ccexplat,format("\\if@filesw\\immediate\\write\\@auxout{\z
+ \\string\\expandafter\\string\\gdef\\string\\csname\\space luamplib.colorspace.%s\z
+ \\string\\endcsname{%s}}\\fi", name, colorspace))
+ end
+ else
+ local auxobj = get_macro(format("luamplib.colorspace.%s",name))
+ colorspace = auxobj or colorspace
+ if not auxobj then put_devicen() end
+ if is_defined'@auxout' then
+ texsprint(format("\\directlua{ if luamplib.clrspcs['%s']=='%s' then else \z
+ texio.write_nl('term and log','Module luamplib Warning: Rerun to get smaller PDF \z
+ on input line %s','') end }", name, auxobj, tex.inputlineno))
+ end
+ end
end
end
else
+ local model = 0
for _,t in ipairs{ca,cb} do
for _,tt in ipairs(t) do
model = model > #tt and model or #tt
@@ -2196,7 +2244,7 @@ local function do_postobj_color(tr,over,sh)
pdf_literalcode("W n /MPlibSh%s sh Q",sh)
end
if over then
- texsprint("\\special{color pop}")
+ texsprint"\\special{pdf:ec}"
end
if tr then
pdf_literalcode("/MPlibTr%i gs",tr)
@@ -2480,7 +2528,7 @@ luamplib.colorconverter = colorconverter
\else
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{luamplib}
- [2024/04/12 v2.28.0 mplib package for LuaTeX]
+ [2024/04/19 v2.28.1 mplib package for LuaTeX]
\ifx\newluafunction\@undefined
\input ltluatex
\fi
@@ -2496,14 +2544,7 @@ luamplib.colorconverter = colorconverter
% \begin{macrocode}
\ifx\pdfoutput\undefined
\let\pdfoutput\outputmode
- \protected\def\pdfliteral{\pdfextension literal}
\fi
-% \end{macrocode}
-%
-% Unfortuantely there are still packages out there that think it is a good
-% idea to manually set \cs{pdfoutput} which defeats the above branch that
-% defines \cs{pdfliteral}. To cover that case we need an extra check.
-% \begin{macrocode}
\ifx\pdfliteral\undefined
\protected\def\pdfliteral{\pdfextension literal}
\fi
@@ -2523,11 +2564,9 @@ luamplib.colorconverter = colorconverter
\else
\def\mplibtoPDF#1{\special{pdf:literal direct #1}}
\ifcsname PackageInfo\endcsname
- \PackageInfo{luamplib}{take dvipdfmx path, no support for other dvi tools currently.}
+ \PackageInfo{luamplib}{only dvipdfmx is supported currently}
\else
- \write128{}
- \write128{luamplib Info: take dvipdfmx path, no support for other dvi tools currently.}
- \write128{}
+ \write128{luamplib Info: only dvipdfmx is supported currently}
\fi
\fi
% \end{macrocode}
diff --git a/macros/luatex/generic/luamplib/luamplib.pdf b/macros/luatex/generic/luamplib/luamplib.pdf
index daf99fd769..1a8934e0cc 100644
--- a/macros/luatex/generic/luamplib/luamplib.pdf
+++ b/macros/luatex/generic/luamplib/luamplib.pdf
Binary files differ
diff --git a/macros/luatex/generic/luamplib/test-luamplib-latex.tex b/macros/luatex/generic/luamplib/test-luamplib-latex.tex
index 339e27d838..a077f67736 100644
--- a/macros/luatex/generic/luamplib/test-luamplib-latex.tex
+++ b/macros/luatex/generic/luamplib/test-luamplib-latex.tex
@@ -1,4 +1,4 @@
-\DocumentMetadata{ uncompress }
+%\DocumentMetadata{ uncompress }
\documentclass{article}
\usepackage{fontspec}
\setmainfont{latin modern roman}
diff --git a/systems/texlive/tlnet/tlpkg/TeXLive/TLUtils.pm b/systems/texlive/tlnet/tlpkg/TeXLive/TLUtils.pm
index 7324230170..5df36bc188 100644
--- a/systems/texlive/tlnet/tlpkg/TeXLive/TLUtils.pm
+++ b/systems/texlive/tlnet/tlpkg/TeXLive/TLUtils.pm
@@ -1,4 +1,4 @@
-# $Id: TLUtils.pm 70794 2024-03-28 01:16:33Z karl $
+# $Id: TLUtils.pm 70991 2024-04-19 15:58:50Z karl $
# TeXLive::TLUtils.pm - the inevitable utilities for TeX Live.
# Copyright 2007-2024 Norbert Preining, Reinhard Kotucha
# This file is licensed under the GNU General Public License version 2
@@ -8,7 +8,7 @@ use strict; use warnings;
package TeXLive::TLUtils;
-my $svnrev = '$Revision: 70794 $';
+my $svnrev = '$Revision: 70991 $';
my $_modulerevision = ($svnrev =~ m/: ([0-9]+) /) ? $1 : "unknown";
sub module_revision { return $_modulerevision; }
@@ -4895,8 +4895,11 @@ sub report_tlpdb_differences {
info(" $f\n");
}
} else {
- # e.g., fmttriggers; don't bother making a nice report.
- info(" unknown differ $k\n");
+ # e.g., fmttriggers; don't bother making a complete report.
+ # The fmttriggers will differ when the global variables in
+ # 00texlive.autopatterns.tlpsrc change but we forget to
+ # tlforceincr all the packages that depend on the variables.
+ info(" $k differ\n");
}
}
}
diff --git a/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl b/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
index 310103696e..0ff606b5eb 100644
--- a/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
+++ b/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
@@ -38,6 +38,7 @@ $mirrors = {
'http://ctan.asis.ai/' => 1,
},
'Japan' => {
+ 'http://ring.airnet.ne.jp/archives/text/CTAN/' => 1,
'https://ftp.jaist.ac.jp/pub/CTAN/' => 1,
'https://ftp.kddilabs.jp/CTAN/' => 1,
'https://ftp.yz.yamagata-u.ac.jp/pub/CTAN/' => 1,
@@ -178,6 +179,9 @@ $mirrors = {
'https://mirror.quantum5.ca/CTAN/' => 1,
'https://muug.ca/mirror/ctan/' => 1,
},
+ 'Costa Rica' => {
+ 'https://mirrors.ucr.ac.cr/CTAN/' => 1,
+ },
'USA' => {
'http://mirrors.ibiblio.org/pub/mirrors/CTAN/' => 1,
'https://ctan.math.illinois.edu/' => 1,
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb b/systems/texlive/tlnet/tlpkg/texlive.tlpdb
index 7a4b560b26..59ab883af5 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/2024
-depend revision/70972
+depend revision/70998
name 00texlive.image
category TLCore
-revision 70972
+revision 70998
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
@@ -40,7 +40,7 @@ longdesc IgnorePatterns in the check_files routine in tlmgr.pl augment
longdesc this list. Those are not included in the source/ tarball. For
longdesc information on the 00texlive prefix see
longdesc 00texlive.installation(.tlpsrc)
-runfiles size=14462
+runfiles size=14464
.mkisofsrc
autorun.inf
texmf-dist/README
@@ -2529,9 +2529,11 @@ runfiles size=14462
tlpkg/tlpsrc/l2tabu-italian.tlpsrc
tlpkg/tlpsrc/l2tabu-spanish.tlpsrc
tlpkg/tlpsrc/l2tabu.tlpsrc
+ tlpkg/tlpsrc/l3backend-dev.tlpsrc
tlpkg/tlpsrc/l3backend.tlpsrc
tlpkg/tlpsrc/l3build.tlpsrc
tlpkg/tlpsrc/l3experimental.tlpsrc
+ tlpkg/tlpsrc/l3kernel-dev.tlpsrc
tlpkg/tlpsrc/l3kernel.tlpsrc
tlpkg/tlpsrc/l3packages.tlpsrc
tlpkg/tlpsrc/l3sys-query.tlpsrc
@@ -4884,7 +4886,7 @@ depend setting_available_architectures:aarch64-linux amd64-freebsd amd64-netbsd
name 00texlive.installer
category TLCore
-revision 70962
+revision 70988
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
@@ -9171,15 +9173,15 @@ catalogue-version 3.13g
name acmart
category Package
-revision 70944
+revision 70981
shortdesc Class for typesetting publications of ACM
relocated 1
longdesc This package provides a class for typesetting publications of
longdesc the Association for Computing Machinery (ACM).
containersize 43148
-containerchecksum 446f88add982f461478dfc89566763547e13c9c1f32d0df526c7c987d738f7b41f26f3d681c35e0cdfd5a9cc4ebdeeba58c8e821d7d51883317421bea64b35b6
-doccontainersize 4567660
-doccontainerchecksum 41d8ae4a6576934d24a35df1c242401cd39286f79563c571d1dc6a81175a6081efc74ab5fde856e784b02e0cf37fb89b9126a3a988bf96bb0d9077dba81de63c
+containerchecksum 8790eb2a23f51068996078c5d2425279f3c24b1a6e27980f55f516a9edafa2c8b8a95c9de80706689c935e3aaf207690e44b744d9b688e55c4ba6942e5494748
+doccontainersize 4568080
+doccontainerchecksum 21e35fcbaf324d1d1ef55a2e538416facb089138d526a176a628f943f886c49e06683a8c2756b11aa28ac9eda53fc88f2138c29f28f00114ded151ccdd8bb884
docfiles size=3268
RELOC/doc/latex/acmart/README details="Readme"
RELOC/doc/latex/acmart/acm-jdslogo.png
@@ -9226,8 +9228,8 @@ docfiles size=3268
RELOC/doc/latex/acmart/samples/samples.ins
RELOC/doc/latex/acmart/samples/sampleteaser.pdf
RELOC/doc/latex/acmart/samples/software.bib
-srccontainersize 62812
-srccontainerchecksum 42957a7fe849440cfa802aa77ff861867276d08577c649b3d1395a713a2177f080e7463d8730cd262931d6e23edb63a14957589482136f3ec26f3d015766d43c
+srccontainersize 62824
+srccontainerchecksum 40f91e64f43f5e3951a3ed8173d4c29b742689bf91b0348ceacab58432d0bc5c4b3258335215dabd2326e2f11315900a43d3d3b8e812b5aecc3527ff918163cd
srcfiles size=75
RELOC/source/latex/acmart/Makefile
RELOC/source/latex/acmart/acmart.dtx
@@ -9246,7 +9248,7 @@ catalogue-contact-repository https://github.com/borisveytsman/acmart/
catalogue-ctan /macros/latex/contrib/acmart
catalogue-license lppl1.3
catalogue-topics class comp-sci comp-theory engineering journalpub
-catalogue-version 2.06
+catalogue-version 2.07
name acmconf
category Package
@@ -72068,7 +72070,7 @@ containerchecksum 889eae40b82f31c7c4b3a17740399c763dabec7986fcb39261b252afff69a0
name collection-latexextra
category Collection
-revision 70967
+revision 70976
shortdesc LaTeX additional packages
relocated 1
longdesc A very large collection of add-on packages for LaTeX.
@@ -72837,7 +72839,9 @@ depend komacv
depend komacv-rg
depend korigamik
depend ktv-texdata
+depend l3backend-dev
depend l3build
+depend l3kernel-dev
depend labbook
depend labels
depend labels4easylist
@@ -73616,8 +73620,8 @@ depend zref-clever
depend zref-vario
depend zwgetfdate
depend zwpagelayout
-containersize 7148
-containerchecksum fbaa6d92e2f600a714dcc7af5704f6a61a7e93d037b35d1d842954b763c4cf407aeb7419adedf9506c98bb573cf81b8113b64e3ca54a4e0659218aa52ce2acf5
+containersize 7164
+containerchecksum fc6f83b91d840e195c0b7106498106265ad490b456bfb7e9d384685a41bd6632f10d0ccad18c76daa266a2508f1ddaf61efba52d0dc106fe6d2e45d935aef961
name collection-latexrecommended
category Collection
@@ -114018,7 +114022,7 @@ catalogue-topics font font-type1 font-archaic
name eplain
category Package
-revision 70971
+revision 70992
shortdesc Extended plain TeX macros
longdesc An extended version of the plain TeX format, adding support for
longdesc bibliographies, tables of contents, enumerated lists, verbatim
@@ -114029,26 +114033,17 @@ longdesc notably graphics, graphicx (an extended version of graphics),
longdesc color, autopict (a package instance of the LaTeX picture code),
longdesc psfrag, and url.
depend babel
-depend cm
depend dehyph
depend eplain.ARCH
-depend firstaid
depend hyph-utf8
-depend hyphen-base
depend knuth-lib
-depend l3backend
-depend l3kernel
-depend latex
-depend latex-fonts
depend pdftex
depend plain
-depend tex-ini-files
-depend unicode-data
-execute AddFormat name=eplain engine=pdftex patterns=language.dat options="-translate-file=cp227.tcx *eplain.ini" fmttriggers=babel,cm,firstaid,hyphen-base,l3backend,l3kernel,latex,latex-fonts,tex-ini-files,unicode-data,dehyph,hyph-utf8,knuth-lib,plain
-containersize 43164
-containerchecksum 5834793dcfb0fcdfba311c75d497324378a2cd7a9477531436da0f4896654c48fb0e5bd5f8f9ac2d015785d97d438ddbdcea4b24da5fefce416d00268b2406ae
-doccontainersize 1003732
-doccontainerchecksum 4016376a193ea4090bce79ddcef34740a45ad7261a052a35f3684ca74f11c11f94b92d5b34533813f5e0c63fc0bdee5702aad34cd312c347b48665db17e2725f
+execute AddFormat name=eplain engine=pdftex patterns=language.dat options="-translate-file=cp227.tcx *eplain.ini" fmttriggers=babel,dehyph,hyph-utf8,knuth-lib,plain
+containersize 43080
+containerchecksum 69834b9c47c16267e01be4b2f4a29849ebc6a2982d01c3e0c303ea43fb48a28b632ffdcd028904cce6b4e1fc60835f5ddb9237a06659e33712061b4858e99981
+doccontainersize 1003736
+doccontainerchecksum 9feceea26a079b4e50822dd2b2a12f0d4637f1cf03cb852cd80f5a21f9aa8a1f647a304ee54582e710389ea3d864cc780091f223a2277cf598667ffa74980817
docfiles size=552
texmf-dist/doc/eplain/AUTHORS
texmf-dist/doc/eplain/COPYING
@@ -114068,8 +114063,8 @@ docfiles size=552
texmf-dist/doc/info/eplain.info
texmf-dist/doc/man/man1/eplain.1
texmf-dist/doc/man/man1/eplain.man1.pdf
-srccontainersize 288964
-srccontainerchecksum 2b199995bb8963db15e9938be996f541a704633ecc66705d79378e6e81dd6832ada3c4720363645160a8ab3078c26f2d697d0ff2293a7fd99f9c0cc1faf9a4d0
+srccontainersize 288968
+srccontainerchecksum c9b2b4b5573575112ca1d2ab97c55eb7933279e9ae3382f1db637c17b10216fc6cc208dad8b1b2a09d541a3047e8f1344cb41cc782ed6b1bf5c4113ed4feb9c0
srcfiles size=110
texmf-dist/source/eplain/eplain-source-3.14.zip
texmf-dist/source/eplain/xeplain.tex
@@ -148350,7 +148345,7 @@ catalogue-version 0.0(beta)
name hitex
category TLCore
-revision 70015
+revision 70995
shortdesc A TeX extension writing HINT output for on-screen reading
longdesc An extension of TeX which generates HINT output. The HINT file
longdesc format is an alternative to the DVI and PDF formats which was
@@ -148378,12 +148373,12 @@ depend latex-fonts
depend plain
depend tex-ini-files
depend unicode-data
-execute AddFormat name=hilatex engine=hitex patterns=language.dat options="-etex -ltx hilatex.ini" fmttriggers=babel,cm,firstaid,hyphen-base,l3backend,l3kernel,latex,latex-fonts,tex-ini-files,unicode-data
+execute AddFormat name=hilatex engine=hitex patterns=language.dat options="-etex -ltx hilatex.ini" fmttriggers=l3backend,l3kernel,latex,latex,firstaid,babel,cm,hyphen-base,latex-fonts,tex-ini-files,unicode-data
execute AddFormat name=hitex engine=hitex patterns=language.def options="-etex -ltx hitex.ini" fmttriggers=cm,hyphen-base,etex,knuth-lib,plain
-containersize 5540
-containerchecksum 286229cdc2af5a0daee9e94d013996245e3c69a0e3f70fab4e87532646a6ad03bb6136ff18126d697b524b2dc89a476b4d5a3030d2972aea79bfd3080427b9e2
+containersize 5536
+containerchecksum 5fc595cca1edd88effb6c33368c84d2a0e1206199d6fd1deb4f96c982309013ae87bb83c59fc4d0f8d837b2d490e94ea743a267baceaaf3106acfe902c9e01cf
doccontainersize 2644972
-doccontainerchecksum c7e762db68d9a007f0ea037aafef3bc6a4af4c436c6723bad676d9ee98b8d9a0b0eb0c103fa2225fba875cdec9ea99f5b2b9ed226498b7589705e72abafe78c8
+doccontainerchecksum a45b2eed5702e36e173d8eb0824df5f980223a95485a095675cad6e019be9ed9d7b8e49caca73dc66e92e50ccff9e6ec132eb92a7c4fe51f46cb15dcbc4e7368
docfiles size=828
texmf-dist/doc/hitex/base/hiformat.hnt
texmf-dist/doc/hitex/base/hiformat.pdf
@@ -161576,7 +161571,7 @@ catalogue-version 2.7
name jadetex
category Package
-revision 70002
+revision 70995
shortdesc Macros supporting Jade DSSSL output
longdesc Macro package on top of LaTeX to typeset TeX output of the Jade
longdesc DSSSL implementation.
@@ -161635,12 +161630,12 @@ depend uniquecounter
depend url
depend wasysym
depend zapfding
-execute AddFormat name=jadetex engine=pdftex patterns=language.dat options="*jadetex.ini" fmttriggers=babel,cm,firstaid,hyphen-base,l3backend,l3kernel,latex,latex-fonts,tex-ini-files,unicode-data,amsfonts,auxhook,bigintcalc,bitset,colortbl,cyrillic,dehyph,ec,etoolbox,fancyhdr,gettitlestring,graphics,graphics-cfg,graphics-def,hycolor,hyperref,hyph-utf8,iftex,infwarerr,intcalc,kvdefinekeys,kvoptions,kvsetkeys,latex,latexconfig,letltxmacro,ltxcmds,marvosym,passivetex,pdfescape,pdftexcmds,psnfss,refcount,rerunfilecheck,stmaryrd,symbol,tipa,tools,ulem,uniquecounter,url,wasysym,zapfding
-execute AddFormat name=pdfjadetex engine=pdftex patterns=language.dat options="*pdfjadetex.ini" fmttriggers=babel,cm,firstaid,hyphen-base,l3backend,l3kernel,latex,latex-fonts,tex-ini-files,unicode-data,amsfonts,auxhook,bigintcalc,bitset,colortbl,cyrillic,dehyph,ec,etoolbox,fancyhdr,gettitlestring,graphics,graphics-cfg,graphics-def,hycolor,hyperref,hyph-utf8,iftex,infwarerr,intcalc,kvdefinekeys,kvoptions,kvsetkeys,latex,latexconfig,letltxmacro,ltxcmds,marvosym,passivetex,pdfescape,pdftexcmds,psnfss,refcount,rerunfilecheck,stmaryrd,symbol,tipa,tools,ulem,uniquecounter,url,wasysym,zapfding
-containersize 29908
-containerchecksum 4f61c4919b20bcae81cd5a9eaaae6c1a68f106959f342dd15e278da48019fe06c347839b8cf89590bbe756a088201db17e615d8b6959f9a8586ab329274c5311
+execute AddFormat name=jadetex engine=pdftex patterns=language.dat options="*jadetex.ini" fmttriggers=l3backend,l3kernel,latex,latex,firstaid,babel,cm,hyphen-base,latex-fonts,tex-ini-files,unicode-data,amsfonts,auxhook,bigintcalc,bitset,colortbl,cyrillic,dehyph,ec,etoolbox,fancyhdr,gettitlestring,graphics,graphics-cfg,graphics-def,hycolor,hyperref,hyph-utf8,iftex,infwarerr,intcalc,kvdefinekeys,kvoptions,kvsetkeys,latexconfig,letltxmacro,ltxcmds,marvosym,passivetex,pdfescape,pdftexcmds,psnfss,refcount,rerunfilecheck,stmaryrd,symbol,tipa,tools,ulem,uniquecounter,url,wasysym,zapfding
+execute AddFormat name=pdfjadetex engine=pdftex patterns=language.dat options="*pdfjadetex.ini" fmttriggers=l3backend,l3kernel,latex,latex,firstaid,babel,cm,hyphen-base,latex-fonts,tex-ini-files,unicode-data,amsfonts,auxhook,bigintcalc,bitset,colortbl,cyrillic,dehyph,ec,etoolbox,fancyhdr,gettitlestring,graphics,graphics-cfg,graphics-def,hycolor,hyperref,hyph-utf8,iftex,infwarerr,intcalc,kvdefinekeys,kvoptions,kvsetkeys,latexconfig,letltxmacro,ltxcmds,marvosym,passivetex,pdfescape,pdftexcmds,psnfss,refcount,rerunfilecheck,stmaryrd,symbol,tipa,tools,ulem,uniquecounter,url,wasysym,zapfding
+containersize 29904
+containerchecksum dff5dacde109dbbc86b1b0418dcb9ee825b598d72a5ae46e837941be52360dd4221e195855bd9ed423fbc04dc39018fbf23e904d2002821661a9499d3ef6ed6d
doccontainersize 31788
-doccontainerchecksum d3422a9e31485b2d280760ace278dfcf4bf1e8790daac8a8f84c62555b68d2d989ee1a128a9ae7a703d7298ce9af9b61d845c418c8bd1254265f204ff48279fd
+doccontainerchecksum e717a477373f40d22525e3951d6ca12566982d2a694c6e1055a8cd6733f19cd1a458666f75bcc5a7ee1405d8ed530a3f6964a30a7a6ef513d4e7b3152e61de5b
docfiles size=34
texmf-dist/doc/man/man1/jadetex.1
texmf-dist/doc/man/man1/jadetex.man1.pdf
@@ -161659,7 +161654,7 @@ docfiles size=34
texmf-dist/doc/otherformats/jadetex/base/releasenotes.dsl
texmf-dist/doc/otherformats/jadetex/base/releasenotes.xml
srccontainersize 19312
-srccontainerchecksum 0b048315cf74de4c7af1ef42d3dc81c4f3e566ea5611fbc1d0969fe7d6b42358c356193b8a9a86cd2f67415bb5274a1b9d95009623ffda72f8530e4b19424977
+srccontainerchecksum 00f624e8b0a9fb2338f6aa1d555f9244bafb9bb68266c9c3340db22d15404ab0040666dba1c47e754b14a89dea8694d84135a7a10358bc7ae6e06c4eecaf10b5
srcfiles size=21
texmf-dist/source/jadetex/base/Makefile
texmf-dist/source/jadetex/base/jadetex.dtx
@@ -179829,7 +179824,7 @@ catalogue-version 1.1
name l3backend
category Package
-revision 70637
+revision 70992
shortdesc LaTeX3 backend drivers
relocated 1
longdesc This package forms parts of expl3, and contains the code used
@@ -179838,17 +179833,17 @@ longdesc The functions here are defined differently depending on the
longdesc engine in use. As such, these are distributed separately from
longdesc l3kernel to allow this code to be updated on an independent
longdesc schedule.
-containersize 16288
-containerchecksum cc400af79918f4e7271ec7e1edcd94bd535ccbb0dc80e0ce765b040875a4fb30249edf50d1d9454633b2383106ff50c00efcc7780dcada0a1ae24c0c442335c9
-doccontainersize 863248
-doccontainerchecksum fe7d5ccfc8cd652db178f38913cf0b6d8e3f6245a80f8f31e121404cceb9f5b83714f4f885b5d9a02f8b7bed1ce3a1df0ac692c0297e35ec80b12f959eac61c6
+containersize 16280
+containerchecksum 96c1ee99601944dabc86b0a248e9ecf1c5d699a0ef2bb7360ab6fec74b4e325fd6373013a69dbff1b1d62e28947a7a5790aa693fe4f51619fb3eb31b5a18ea8f
+doccontainersize 863240
+doccontainerchecksum 2282d3eac98658f59e4d2433197009a5e4d57c91cc5888774cfe2ed39e8c7e9adf74d7ed129601bd11e71b4c4d62df3032e61f1d8bab99379f762769d2338e1b
docfiles size=227
RELOC/doc/latex/l3backend/CHANGELOG.md
RELOC/doc/latex/l3backend/README.md details="Readme"
RELOC/doc/latex/l3backend/l3backend-code.pdf details="Package documentation"
RELOC/doc/latex/l3backend/l3backend-code.tex
-srccontainersize 33848
-srccontainerchecksum 034a261e984bdea08892fbda2d89e82abccd59e57e5a0eec1991f6133edb1d479fd585ef0af1615e02059e4a7e45bdd7d91d3f29c857087aebe9aedff9d5dced
+srccontainersize 33840
+srccontainerchecksum b0834fc80e8787f6b2560a8d1fbdab3ba29c1ffcf127e88c51af199145160dc313b0183c03be7f2263ebfde789eac2e09b5eaffca66a0925ded7dc6f7d47ddb6
srcfiles size=58
RELOC/source/latex/l3backend/l3backend-basics.dtx
RELOC/source/latex/l3backend/l3backend-box.dtx
@@ -179875,6 +179870,48 @@ catalogue-ctan /macros/latex/contrib/l3backend
catalogue-license lppl1.3c
catalogue-topics latex3 expl3 macro-supp pre-release
+name l3backend-dev
+category Package
+revision 70977
+shortdesc LaTeX3 backend drivers (dev)
+relocated 1
+longdesc This is a pre-release version of the l3backend package. It
+longdesc accompanies the pre-testing kernel code (latex-base-dev), and
+longdesc is intended for testing by knowledgeable users.
+containersize 16132
+containerchecksum 9856451435e5e610f50dd5d65bed6f365697e15e7f74aff93ac4d6c0eec538b778bdb085bca73aa6ed5d08f95dec1c28914c8534232a76be78944717851bda47
+doccontainersize 862356
+doccontainerchecksum 749cf99b6eef9f512b8f6592044624eb67c6b08cb4acd9dd9453e4f2ddfd5b9d6c588a88e439649a303308dac8b46843ebd575538544ddf940431c4c7d25ac05
+docfiles size=227
+ RELOC/doc/latex-dev/l3backend/CHANGELOG.md
+ RELOC/doc/latex-dev/l3backend/README.md details="Readme"
+ RELOC/doc/latex-dev/l3backend/l3backend-code.pdf details="Package documentation"
+ RELOC/doc/latex-dev/l3backend/l3backend-code.tex
+srccontainersize 33820
+srccontainerchecksum c792ed443cb5a3c080208cf34cb87ef661669ec3af3ef4158a19c9f915dec48a73c4fc40bae2161f5893ab5c6b8d7dae5bb11562bb60ad694d14c5f330e3b21d
+srcfiles size=58
+ RELOC/source/latex-dev/l3backend/l3backend-basics.dtx
+ RELOC/source/latex-dev/l3backend/l3backend-box.dtx
+ RELOC/source/latex-dev/l3backend/l3backend-color.dtx
+ RELOC/source/latex-dev/l3backend/l3backend-draw.dtx
+ RELOC/source/latex-dev/l3backend/l3backend-graphics.dtx
+ RELOC/source/latex-dev/l3backend/l3backend-header.dtx
+ RELOC/source/latex-dev/l3backend/l3backend-opacity.dtx
+ RELOC/source/latex-dev/l3backend/l3backend-pdf.dtx
+ RELOC/source/latex-dev/l3backend/l3backend.ins
+runfiles size=51
+ RELOC/tex/latex-dev/l3backend/l3backend-dvipdfmx.def
+ RELOC/tex/latex-dev/l3backend/l3backend-dvips.def
+ RELOC/tex/latex-dev/l3backend/l3backend-dvips.pro
+ RELOC/tex/latex-dev/l3backend/l3backend-dvisvgm.def
+ RELOC/tex/latex-dev/l3backend/l3backend-luatex.def
+ RELOC/tex/latex-dev/l3backend/l3backend-luatex.lua
+ RELOC/tex/latex-dev/l3backend/l3backend-pdftex.def
+ RELOC/tex/latex-dev/l3backend/l3backend-xetex.def
+catalogue-ctan /macros/latex-dev/required/l3backend
+catalogue-license lppl1.3c
+catalogue-topics latex3 expl3 macro-supp pre-release
+
name l3build
category Package
revision 69748
@@ -180146,7 +180183,7 @@ catalogue-topics macro-supp layout latex3 pre-release
name l3kernel
category Package
-revision 70637
+revision 70992
shortdesc LaTeX3 programming conventions
relocated 1
longdesc The l3kernel bundle provides an implementation of the LaTeX3
@@ -180156,10 +180193,10 @@ longdesc LaTeX3 kernel and other future code are built: it is an API for
longdesc TeX programmers. The packages are set up so that the LaTeX3
longdesc conventions can be used with regular LaTeX2e packages.
depend l3backend
-containersize 179816
-containerchecksum 86a6b935393ac2e5fcf26a31e4121e902043f971bf5b23336f3cb0722ad705d25ce62f0873f0cce300952e9d4edd5e8b0841268540257a585cc8a86573b43b24
-doccontainersize 11960176
-doccontainerchecksum 5d67932e009fb5ad6edfe0643f9c84c942c19c7bcfc14fbe9fa634fb9342c842a20c8264ef26cb281c99c4a61fb13db25b765155be5a96afbeff052ab0466fe2
+containersize 179808
+containerchecksum 2bd400a6cba98a13383103b43d04c03dfd725b49e1e8cd52728dfec71e2576eda1613ab624823b6e99e620097974cbbc8820903b165622525f86212d527159f1
+doccontainersize 11960172
+doccontainerchecksum 49d39999da9e089545fae4dd4471f6135acddc66b3385994260f0a837ffa844ec92be05718a07cfcfc718d2d04f16cc83cc00534db678d9a2b41fd6778c3ec2e
docfiles size=3499
RELOC/doc/latex/l3kernel/CHANGELOG.md
RELOC/doc/latex/l3kernel/README.md details="Readme"
@@ -180207,8 +180244,8 @@ docfiles size=3499
RELOC/doc/latex/l3kernel/source3.pdf
RELOC/doc/latex/l3kernel/source3.tex
RELOC/doc/latex/l3kernel/source3body.tex
-srccontainersize 620608
-srccontainerchecksum b95509c0597a5cd39e4855d2e904670ab9c774e439363558e16afcb1bf8f48af57254827725cdb69d1c14f796ea0e9ba11a5c18fe77fede3ae20481c59697864
+srccontainersize 620604
+srccontainerchecksum 261971e44301442df3f830e1d015d08994c9a26591367f37167292f97537e3429257c582c0180c59d902dbe2c289facbcd95bc117ecbd2770cf36fb1102fed3c
srcfiles size=957
RELOC/source/latex/l3kernel/expl3.dtx
RELOC/source/latex/l3kernel/l3.ins
@@ -180304,6 +180341,159 @@ catalogue-ctan /macros/latex/contrib/l3kernel
catalogue-license lppl1.3c
catalogue-topics format latex3 pre-release
+name l3kernel-dev
+category Package
+revision 70976
+shortdesc Development pre-release of l3kernel
+relocated 1
+longdesc This is a pre-release version of the l3kernel package. It
+longdesc accompanies the pre-testing kernel code (latex-base-dev), and
+longdesc is intended for testing by knowledgeable users.
+depend l3backend-dev
+containersize 180216
+containerchecksum 0b6d0fdebe62b0a2b9996c68220c104854675ee0a513480073b6b44e22696253a0cc7d968df3c11a63bbe7179a47b4386556807042b4f70849e966d43216e0c6
+doccontainersize 12063500
+doccontainerchecksum cfc11ecb99534a7fc60964b03388c7dc3120abc563385abc5a71076dac5d11386e330a4b8c8b03ba39fee873c3d0190ea04641c0ad1d8d9f0cacf3c6441a4e97
+docfiles size=3519
+ RELOC/doc/latex-dev/l3kernel/CHANGELOG.md
+ RELOC/doc/latex-dev/l3kernel/README.md details="Readme"
+ RELOC/doc/latex-dev/l3kernel/expl3.pdf details="The LaTeX3 Programming Language"
+ RELOC/doc/latex-dev/l3kernel/interface3.pdf details="The LaTeX3 interfaces"
+ RELOC/doc/latex-dev/l3kernel/interface3.tex
+ RELOC/doc/latex-dev/l3kernel/l3doc.pdf
+ RELOC/doc/latex-dev/l3kernel/l3docstrip.pdf
+ RELOC/doc/latex-dev/l3kernel/l3news.pdf
+ RELOC/doc/latex-dev/l3kernel/l3news.tex
+ RELOC/doc/latex-dev/l3kernel/l3news01.pdf
+ RELOC/doc/latex-dev/l3kernel/l3news01.tex
+ RELOC/doc/latex-dev/l3kernel/l3news02.pdf
+ RELOC/doc/latex-dev/l3kernel/l3news02.tex
+ RELOC/doc/latex-dev/l3kernel/l3news03.pdf
+ RELOC/doc/latex-dev/l3kernel/l3news03.tex
+ RELOC/doc/latex-dev/l3kernel/l3news04.pdf
+ RELOC/doc/latex-dev/l3kernel/l3news04.tex
+ RELOC/doc/latex-dev/l3kernel/l3news05.pdf
+ RELOC/doc/latex-dev/l3kernel/l3news05.tex
+ RELOC/doc/latex-dev/l3kernel/l3news06.pdf
+ RELOC/doc/latex-dev/l3kernel/l3news06.tex
+ RELOC/doc/latex-dev/l3kernel/l3news07.pdf
+ RELOC/doc/latex-dev/l3kernel/l3news07.tex
+ RELOC/doc/latex-dev/l3kernel/l3news08.pdf
+ RELOC/doc/latex-dev/l3kernel/l3news08.tex
+ RELOC/doc/latex-dev/l3kernel/l3news09.pdf
+ RELOC/doc/latex-dev/l3kernel/l3news09.tex
+ RELOC/doc/latex-dev/l3kernel/l3news10.pdf
+ RELOC/doc/latex-dev/l3kernel/l3news10.tex
+ RELOC/doc/latex-dev/l3kernel/l3news11.pdf
+ RELOC/doc/latex-dev/l3kernel/l3news11.tex
+ RELOC/doc/latex-dev/l3kernel/l3news12.pdf
+ RELOC/doc/latex-dev/l3kernel/l3news12.tex
+ RELOC/doc/latex-dev/l3kernel/l3obsolete.txt
+ RELOC/doc/latex-dev/l3kernel/l3prefixes.csv
+ RELOC/doc/latex-dev/l3kernel/l3prefixes.pdf
+ RELOC/doc/latex-dev/l3kernel/l3prefixes.tex
+ RELOC/doc/latex-dev/l3kernel/l3styleguide.pdf details="LaTeX3 style guide"
+ RELOC/doc/latex-dev/l3kernel/l3styleguide.tex
+ RELOC/doc/latex-dev/l3kernel/l3syntax-changes.pdf details="Syntax changes"
+ RELOC/doc/latex-dev/l3kernel/l3syntax-changes.tex
+ RELOC/doc/latex-dev/l3kernel/l3term-glossary.pdf
+ RELOC/doc/latex-dev/l3kernel/l3term-glossary.tex
+ RELOC/doc/latex-dev/l3kernel/source3.pdf
+ RELOC/doc/latex-dev/l3kernel/source3.tex
+ RELOC/doc/latex-dev/l3kernel/source3body.tex
+srccontainersize 622280
+srccontainerchecksum 999b275473e84e01c708e8ee122331f607bd260c69939e46bdf4f036318ad4d3c3a266594bb25a8f6e41e5e9f10d8e4be8f9dd26435f151db24d7f560ab2dc85
+srcfiles size=960
+ RELOC/source/latex-dev/l3kernel/expl3.dtx
+ RELOC/source/latex-dev/l3kernel/l3.ins
+ RELOC/source/latex-dev/l3kernel/l3basics.dtx
+ RELOC/source/latex-dev/l3kernel/l3bitset.dtx
+ RELOC/source/latex-dev/l3kernel/l3bootstrap.dtx
+ RELOC/source/latex-dev/l3kernel/l3box.dtx
+ RELOC/source/latex-dev/l3kernel/l3cctab.dtx
+ RELOC/source/latex-dev/l3kernel/l3clist.dtx
+ RELOC/source/latex-dev/l3kernel/l3coffins.dtx
+ RELOC/source/latex-dev/l3kernel/l3color.dtx
+ RELOC/source/latex-dev/l3kernel/l3debug.dtx
+ RELOC/source/latex-dev/l3kernel/l3deprecation.dtx
+ RELOC/source/latex-dev/l3kernel/l3doc.dtx
+ RELOC/source/latex-dev/l3kernel/l3docstrip.dtx
+ RELOC/source/latex-dev/l3kernel/l3expan.dtx
+ RELOC/source/latex-dev/l3kernel/l3file.dtx
+ RELOC/source/latex-dev/l3kernel/l3flag.dtx
+ RELOC/source/latex-dev/l3kernel/l3fp-assign.dtx
+ RELOC/source/latex-dev/l3kernel/l3fp-aux.dtx
+ RELOC/source/latex-dev/l3kernel/l3fp-basics.dtx
+ RELOC/source/latex-dev/l3kernel/l3fp-convert.dtx
+ RELOC/source/latex-dev/l3kernel/l3fp-expo.dtx
+ RELOC/source/latex-dev/l3kernel/l3fp-extended.dtx
+ RELOC/source/latex-dev/l3kernel/l3fp-functions.dtx
+ RELOC/source/latex-dev/l3kernel/l3fp-logic.dtx
+ RELOC/source/latex-dev/l3kernel/l3fp-parse.dtx
+ RELOC/source/latex-dev/l3kernel/l3fp-random.dtx
+ RELOC/source/latex-dev/l3kernel/l3fp-round.dtx
+ RELOC/source/latex-dev/l3kernel/l3fp-symbolic.dtx
+ RELOC/source/latex-dev/l3kernel/l3fp-traps.dtx
+ RELOC/source/latex-dev/l3kernel/l3fp-trig.dtx
+ RELOC/source/latex-dev/l3kernel/l3fp-types.dtx
+ RELOC/source/latex-dev/l3kernel/l3fp.dtx
+ RELOC/source/latex-dev/l3kernel/l3fparray.dtx
+ RELOC/source/latex-dev/l3kernel/l3int.dtx
+ RELOC/source/latex-dev/l3kernel/l3intarray.dtx
+ RELOC/source/latex-dev/l3kernel/l3kernel-functions.dtx
+ RELOC/source/latex-dev/l3kernel/l3keys.dtx
+ RELOC/source/latex-dev/l3kernel/l3legacy.dtx
+ RELOC/source/latex-dev/l3kernel/l3luatex.dtx
+ RELOC/source/latex-dev/l3kernel/l3msg.dtx
+ RELOC/source/latex-dev/l3kernel/l3names.dtx
+ RELOC/source/latex-dev/l3kernel/l3pdf.dtx
+ RELOC/source/latex-dev/l3kernel/l3prg.dtx
+ RELOC/source/latex-dev/l3kernel/l3prop.dtx
+ RELOC/source/latex-dev/l3kernel/l3quark.dtx
+ RELOC/source/latex-dev/l3kernel/l3regex.dtx
+ RELOC/source/latex-dev/l3kernel/l3seq.dtx
+ RELOC/source/latex-dev/l3kernel/l3skip.dtx
+ RELOC/source/latex-dev/l3kernel/l3sort.dtx
+ RELOC/source/latex-dev/l3kernel/l3str-convert.dtx
+ RELOC/source/latex-dev/l3kernel/l3str.dtx
+ RELOC/source/latex-dev/l3kernel/l3sys.dtx
+ RELOC/source/latex-dev/l3kernel/l3text-case.dtx
+ RELOC/source/latex-dev/l3kernel/l3text-map.dtx
+ RELOC/source/latex-dev/l3kernel/l3text-purify.dtx
+ RELOC/source/latex-dev/l3kernel/l3text.dtx
+ RELOC/source/latex-dev/l3kernel/l3tl-analysis.dtx
+ RELOC/source/latex-dev/l3kernel/l3tl-build.dtx
+ RELOC/source/latex-dev/l3kernel/l3tl.dtx
+ RELOC/source/latex-dev/l3kernel/l3token.dtx
+ RELOC/source/latex-dev/l3kernel/l3unicode.dtx
+runfiles size=369
+ RELOC/tex/latex-dev/l3kernel/expl3-code.tex
+ RELOC/tex/latex-dev/l3kernel/expl3-generic.tex
+ RELOC/tex/latex-dev/l3kernel/expl3.ltx
+ RELOC/tex/latex-dev/l3kernel/expl3.lua
+ RELOC/tex/latex-dev/l3kernel/expl3.sty
+ RELOC/tex/latex-dev/l3kernel/l3debug.def
+ RELOC/tex/latex-dev/l3kernel/l3doc.cls
+ RELOC/tex/latex-dev/l3kernel/l3docstrip.tex
+ RELOC/tex/latex-dev/l3kernel/l3str-enc-iso88591.def
+ RELOC/tex/latex-dev/l3kernel/l3str-enc-iso885910.def
+ RELOC/tex/latex-dev/l3kernel/l3str-enc-iso885911.def
+ RELOC/tex/latex-dev/l3kernel/l3str-enc-iso885913.def
+ RELOC/tex/latex-dev/l3kernel/l3str-enc-iso885914.def
+ RELOC/tex/latex-dev/l3kernel/l3str-enc-iso885915.def
+ RELOC/tex/latex-dev/l3kernel/l3str-enc-iso885916.def
+ RELOC/tex/latex-dev/l3kernel/l3str-enc-iso88592.def
+ RELOC/tex/latex-dev/l3kernel/l3str-enc-iso88593.def
+ RELOC/tex/latex-dev/l3kernel/l3str-enc-iso88594.def
+ RELOC/tex/latex-dev/l3kernel/l3str-enc-iso88595.def
+ RELOC/tex/latex-dev/l3kernel/l3str-enc-iso88596.def
+ RELOC/tex/latex-dev/l3kernel/l3str-enc-iso88597.def
+ RELOC/tex/latex-dev/l3kernel/l3str-enc-iso88598.def
+ RELOC/tex/latex-dev/l3kernel/l3str-enc-iso88599.def
+catalogue-ctan /macros/latex-dev/required/l3kernel
+catalogue-license lppl1.3c
+catalogue-topics format latex3 pre-release
+
name l3packages
category Package
revision 70637
@@ -182389,7 +182579,7 @@ catalogue-version 2024-06-01 pre-release 2
name latex-bin
category TLCore
-revision 70501
+revision 70995
shortdesc LaTeX executables and man pages
depend babel
depend cm
@@ -182411,14 +182601,14 @@ depend luatex
depend pdftex
depend tex-ini-files
depend unicode-data
-execute AddFormat name=dvilualatex engine=luatex patterns=language.dat,language.dat.lua options="dvilualatex.ini" fmttriggers=babel,cm,firstaid,hyphen-base,l3backend,l3kernel,latex,latex-fonts,tex-ini-files,unicode-data,latex,lm,luaotfload
-execute AddFormat name=latex engine=pdftex patterns=language.dat options="-translate-file=cp227.tcx *latex.ini" fmttriggers=babel,cm,firstaid,hyphen-base,l3backend,l3kernel,latex,latex-fonts,tex-ini-files,unicode-data,latex,dehyph,hyph-utf8,latexconfig
-execute AddFormat name=lualatex engine=luahbtex patterns=language.dat,language.dat.lua options="lualatex.ini" fmttriggers=babel,cm,firstaid,hyphen-base,l3backend,l3kernel,latex,latex-fonts,tex-ini-files,unicode-data,latex,lm,luaotfload
-execute AddFormat name=pdflatex engine=pdftex patterns=language.dat options="-translate-file=cp227.tcx *pdflatex.ini" fmttriggers=babel,cm,firstaid,hyphen-base,l3backend,l3kernel,latex,latex-fonts,tex-ini-files,unicode-data,latex,dehyph,hyph-utf8,latexconfig
-containersize 592
-containerchecksum bdf854f19390c341cb0079c0f98b1f334511e090d3346349083d38d54d1f5955858fed6965b8defd3227d3e98b79073aafb945c6592019ac8350461f049119e5
-doccontainersize 53680
-doccontainerchecksum 684159d65fa27343508ddc31730400d489e1f3b4c1e2b88a4772a5a9e72b261a142d28715cb93ff3906d1666e2c1dd85263c8c91eca17ed79b6e7f3077742c1f
+execute AddFormat name=dvilualatex engine=luatex patterns=language.dat,language.dat.lua options="dvilualatex.ini" fmttriggers=l3backend,l3kernel,latex,latex,firstaid,babel,cm,hyphen-base,latex-fonts,tex-ini-files,unicode-data,lm,luaotfload
+execute AddFormat name=latex engine=pdftex patterns=language.dat options="-translate-file=cp227.tcx *latex.ini" fmttriggers=l3backend,l3kernel,latex,latex,firstaid,babel,cm,hyphen-base,latex-fonts,tex-ini-files,unicode-data,dehyph,hyph-utf8,latexconfig
+execute AddFormat name=lualatex engine=luahbtex patterns=language.dat,language.dat.lua options="lualatex.ini" fmttriggers=l3backend,l3kernel,latex,latex,firstaid,babel,cm,hyphen-base,latex-fonts,tex-ini-files,unicode-data,lm,luaotfload
+execute AddFormat name=pdflatex engine=pdftex patterns=language.dat options="-translate-file=cp227.tcx *pdflatex.ini" fmttriggers=l3backend,l3kernel,latex,latex,firstaid,babel,cm,hyphen-base,latex-fonts,tex-ini-files,unicode-data,dehyph,hyph-utf8,latexconfig
+containersize 584
+containerchecksum 9c3d008f633074454bc4e336c30070054c34e982e783fecae2eb16d2cba07c69a14ad092415ddd38002258c88b0144c5219d1f0a466e646a8781ad643e8b8581
+doccontainersize 53672
+doccontainerchecksum aa794c9b59d09c4a7133b9f1818a984a342b70adfdf30d236c610f02969c2713b2bf92c47a2dacf1235f7f5a4842c76c4e33bd705cd1c2f3344e0171bcb1a42e
docfiles size=32
texmf-dist/doc/man/man1/dvilualatex.1
texmf-dist/doc/man/man1/dvilualatex.man1.pdf
@@ -182431,18 +182621,16 @@ docfiles size=32
name latex-bin-dev
category TLCore
-revision 70015
+revision 70992
shortdesc LaTeX pre-release executables and formats
longdesc See the latex-base-dev package for information.
depend babel
depend cm
depend dehyph
-depend firstaid
depend hyph-utf8
depend hyphen-base
-depend l3backend
-depend l3kernel
-depend latex
+depend l3backend-dev
+depend l3kernel-dev
depend latex-base-dev
depend latex-bin-dev.ARCH
depend latex-firstaid-dev
@@ -182456,14 +182644,14 @@ depend luatex
depend pdftex
depend tex-ini-files
depend unicode-data
-execute AddFormat name=dvilualatex-dev engine=luatex patterns=language.dat,language.dat.lua options="dvilualatex.ini" fmttriggers=babel,cm,firstaid,hyphen-base,l3backend,l3kernel,latex,latex-fonts,tex-ini-files,unicode-data,latex-base-dev,latex-firstaid-dev,lm,luaotfload
-execute AddFormat name=latex-dev engine=pdftex patterns=language.dat options="-translate-file=cp227.tcx *latex.ini" fmttriggers=babel,cm,firstaid,hyphen-base,l3backend,l3kernel,latex,latex-fonts,tex-ini-files,unicode-data,latex-base-dev,latex-firstaid-dev,dehyph,hyph-utf8,latexconfig,pdftex
-execute AddFormat name=lualatex-dev engine=luahbtex patterns=language.dat,language.dat.lua options="lualatex.ini" fmttriggers=babel,cm,firstaid,hyphen-base,l3backend,l3kernel,latex,latex-fonts,tex-ini-files,unicode-data,latex-base-dev,latex-firstaid-dev,lm,luaotfload
-execute AddFormat name=pdflatex-dev engine=pdftex patterns=language.dat options="-translate-file=cp227.tcx *pdflatex.ini" fmttriggers=babel,cm,firstaid,hyphen-base,l3backend,l3kernel,latex,latex-fonts,tex-ini-files,unicode-data,latex-base-dev,latex-firstaid-dev,dehyph,hyph-utf8,latexconfig,pdftex
-containersize 644
-containerchecksum 23f4e23403a095d1d0751f3528a6570916d665e0d5fd91b0badbdeea60fd1de159212e89ed2e98a82f66cf7fe07171d82993a261a8c57dd03498fa72ece55ef6
+execute AddFormat name=dvilualatex-dev engine=luatex patterns=language.dat,language.dat.lua options="dvilualatex.ini" fmttriggers=l3backend-dev,l3kernel-dev,latex-base-dev,latex-firstaid-dev,babel,cm,hyphen-base,latex-fonts,tex-ini-files,unicode-data,lm,luaotfload
+execute AddFormat name=latex-dev engine=pdftex patterns=language.dat options="-translate-file=cp227.tcx *latex.ini" fmttriggers=l3backend-dev,l3kernel-dev,latex-base-dev,latex-firstaid-dev,babel,cm,hyphen-base,latex-fonts,tex-ini-files,unicode-data,dehyph,hyph-utf8,latexconfig,pdftex
+execute AddFormat name=lualatex-dev engine=luahbtex patterns=language.dat,language.dat.lua options="lualatex.ini" fmttriggers=l3backend-dev,l3kernel-dev,latex-base-dev,latex-firstaid-dev,babel,cm,hyphen-base,latex-fonts,tex-ini-files,unicode-data,lm,luaotfload
+execute AddFormat name=pdflatex-dev engine=pdftex patterns=language.dat options="-translate-file=cp227.tcx *pdflatex.ini" fmttriggers=l3backend-dev,l3kernel-dev,latex-base-dev,latex-firstaid-dev,babel,cm,hyphen-base,latex-fonts,tex-ini-files,unicode-data,dehyph,hyph-utf8,latexconfig,pdftex
+containersize 632
+containerchecksum 6158908115356d8a0675d1656d40181fe0703b791e1e712ca3cef0612acbeb2218f46c009e6bd773c3f614caeb78a53190623b6508ddf0d9ba8fd482396d6b97
doccontainersize 14000
-doccontainerchecksum c34cc9efbd2f8f61a3b05761ed67cbc8f85a2201bc32bcd03e29947444f4913814fcc28dacd47899a87bb8f0231a304efb5b625e55b62d8d4df77592b623e327
+doccontainerchecksum d43422d34bad20f9a60cc2a431c34b05af0f5b537547e39189af0165f643586ec2fa7d826893571c795bc46c427e8bd0930e5e24d6903c4d6fde8ffdbf662e82
docfiles size=35
texmf-dist/doc/man/man1/dvilualatex-dev.1
texmf-dist/doc/man/man1/dvilualatex-dev.man1.pdf
@@ -188689,23 +188877,23 @@ catalogue-version 3.3
name lato-math
category Package
-revision 70633
+revision 70982
shortdesc Lato based OpenType Math font for LuaTeX and XeTeX
relocated 1
longdesc This package provides a Unicode Math font LatoMath.otf meant to
longdesc be used together with Lato sans-serif TrueType Text fonts in
longdesc LuaLaTeX or XeLaTeX documents.
-containersize 273540
-containerchecksum cfb727834ea6396f1bec9550e78c0a06b3bb082e2fc23e280d83a82083893526f6b37740053ab156e5b0249ea583feda13f28f51487d5a873af73df387311b9d
-doccontainersize 2049452
-doccontainerchecksum 835a668186e09cfd5f77017bb373f9193a48b070a19248353cf3c5127693da2ef90742f6da93ba7c066d7a49fa6c6488ceef4b5dff086b54f770a09a10657022
-docfiles size=538
+containersize 273120
+containerchecksum cf732fb518f818873278316a3fe4a8e8d830d63305398eae3a7b7169417903e9a2390ff9dae75ed007bea35dfcf7c09d1d44a3212631e39f4c2ef893627acfa0
+doccontainersize 2048668
+doccontainerchecksum fdfc5fd3754f7c74f644fb14ac55b444a6503fab4e3fcb4b90bd8922a7ff9e7c19201f1aeb71a53b415ba3e9aca2f6637db492dafff9f8a26065b3e25ea558c2
+docfiles size=537
RELOC/doc/fonts/lato-math/LatoMath.ltx
RELOC/doc/fonts/lato-math/LatoMath.pdf details="Package documentation"
RELOC/doc/fonts/lato-math/README.md details="Readme"
RELOC/doc/fonts/lato-math/unimath-lato.ltx
RELOC/doc/fonts/lato-math/unimath-lato.pdf details="List of glyphs"
-runfiles size=140
+runfiles size=142
RELOC/fonts/opentype/public/lato-math/LatoMath-Bold.otf
RELOC/fonts/opentype/public/lato-math/LatoMath.otf
RELOC/tex/latex/lato-math/lato-math.sty
@@ -188714,7 +188902,7 @@ catalogue-contact-home https://github.com/abccsss/LatoMath
catalogue-ctan /fonts/lato-math
catalogue-license lppl1.3c ofl
catalogue-topics font-maths font-otf
-catalogue-version 0.36
+catalogue-version 0.37
name layaureo
category Package
@@ -203314,7 +203502,7 @@ catalogue-version 0.4.3
name lua-typo
category Package
-revision 69403
+revision 70978
shortdesc Highlighting typographical flaws with LuaLaTeX
relocated 1
longdesc Prints the list of pages on which typographical flaws were
@@ -203322,10 +203510,10 @@ longdesc found (i.e. widows, orphans, hyphenated words split across two
longdesc pages, consecutive lines ending with hyphens, paragraphs ending
longdesc on too short or nearly full lines, homeoarchy, etc).
longdesc Customisable colours are used to highlight these flaws.
-containersize 13004
-containerchecksum 177b89a930ed061d18e25bafc230b402976e25ebc88d09a0a42c70b5848fdf5b7964fa69160c3456a02f207dce39363c9fbf603c928cd50b373be6ba8a2c8ab3
-doccontainersize 297064
-doccontainerchecksum 60a9e3560c35583377d4629ee4885ad5e8bf52773927c9d3e2b06a2385196303df704bbcc6245a2e0fc93c396b4a6252309180af270d9bd13fada543c9f3b7b1
+containersize 13128
+containerchecksum e25188fdcff8a9054b709468cdcbe9b283a1cd097e1393b839846ab3665c9d6fae104b95355a40179d069b68fa17a0e37695255cc581ee03cb269c28fba7c6fc
+doccontainersize 295348
+doccontainerchecksum 830e58e342a3e7ce19c52e552738d8f4ff217a0dc8561df4ea8ee306e7929e9a3b86566d1917914c51d6689a3c9e4c8580dc08a02d6ccaa991225bc1505ae704
docfiles size=89
RELOC/doc/lualatex/lua-typo/README.md details="Readme"
RELOC/doc/lualatex/lua-typo/lua-typo-demo.pdf details="Example of use"
@@ -203334,8 +203522,8 @@ docfiles size=89
RELOC/doc/lualatex/lua-typo/lua-typo-fr.pdf details="Package documentation (French)" language="fr"
RELOC/doc/lualatex/lua-typo/lua-typo.ltx
RELOC/doc/lualatex/lua-typo/lua-typo.pdf details="Package documentation (English)"
-srccontainersize 29728
-srccontainerchecksum 65eac5cf5c4af2eebbc7d6412cf6ba17a4de37c6c47caf7667e047edc6697a0e93f9f3a334f3ace081127654b6337ebbe5db767d1de2eb48a275c22c0617ca08
+srccontainersize 30020
+srccontainerchecksum 5269bfcecb161c30fb37e62400fb75f16e1b1497fc339683e05aa038270a2b44df86744d80c57cb5de2503317c5b15258f2f7b0628a1d2c29e6670e37ef67ba3
srcfiles size=32
RELOC/source/lualatex/lua-typo/lua-typo.dtx
runfiles size=31
@@ -203346,7 +203534,7 @@ runfiles size=31
catalogue-ctan /macros/luatex/latex/lua-typo
catalogue-license lppl1.3c
catalogue-topics luatex text-layout
-catalogue-version 0.86
+catalogue-version 0.87
name lua-uca
category Package
@@ -204172,10 +204360,10 @@ binfiles arch=universal-darwin size=3673
name luahbtex.windows
category TLCore
-revision 70586
+revision 70990
shortdesc windows files of luahbtex
-containersize 1933476
-containerchecksum 223dbb3c208f3c2b059353f4f7a96e7fcaa403c0810f4775a361757274b60813becd0d8217c739882e48c5711953d00f3db2107fdd6fa845d6a2ab518ac90230
+containersize 1937596
+containerchecksum 29f5ce9f73f432decf67a13df8f29311b13a07d7105fd6054133a7425b41abc80aa396d8111d7306fbf584e8ec08f3a2f7936a00dc77c25c3c7540affbda5162
binfiles arch=windows size=1736
bin/windows/luahbtex.dll
bin/windows/luahbtex.exe
@@ -204496,10 +204684,10 @@ binfiles arch=universal-darwin size=6973
name luajittex.windows
category TLCore
-revision 70586
+revision 70990
shortdesc windows files of luajittex
-containersize 3935876
-containerchecksum f3d6059f90ef2949579e3c64edce638cd26a3df92a293fb78e926adb0afaf2bc8c53bbac43c71ead955b649073dca97ad4c0373f4647c935fa0e2c8d1c0739ca
+containersize 3942020
+containerchecksum bcc445074ae43f17fc19d86628f98c40d278ada2a761d8e3c6f5657985a64dcb80f2dd94be3b0f66de36de8fe28ce0b1bf39358a982c0490489eab11d80e48c5
binfiles arch=windows size=3947
bin/windows/luajit51w64.dll
bin/windows/luajithbtex.dll
@@ -205728,10 +205916,10 @@ binfiles arch=universal-darwin size=3159
name luatex.windows
category TLCore
-revision 70586
+revision 70975
shortdesc windows files of luatex
-containersize 2106328
-containerchecksum 036c6236e44899ad78443f4a7084ce657b2aa479dbbf8b3bd2aa40ae5d23322827817f7c3461b0006ce9612a874491bf41fa0054185da426479b992ec4f65258
+containersize 2105120
+containerchecksum a65d6f1af171628897ce67c237f5d737c3d8f33467018f2aa727131aa77cbd15d70a00ddccd1ff942121556d5aa6dc580fb497bd70d8a0065d85160b24069a98
binfiles arch=windows size=1931
bin/windows/api-ms-win-core-file-l1-2-0.dll
bin/windows/api-ms-win-core-file-l2-1-0.dll
@@ -220923,7 +221111,7 @@ catalogue-version 1.2
name mltex
category Package
-revision 70002
+revision 70995
shortdesc The MLTeX system
longdesc MLTeX is a modification of TeX version >=3.0 that allows the
longdesc hyphenation of words with accented letters using ordinary
@@ -220945,12 +221133,12 @@ depend mltex.ARCH
depend plain
depend tex-ini-files
depend unicode-data
-execute AddFormat name=mllatex engine=pdftex patterns=language.dat options="-translate-file=cp227.tcx -mltex *mllatex.ini" fmttriggers=babel,cm,firstaid,hyphen-base,l3backend,l3kernel,latex,latex-fonts,tex-ini-files,unicode-data,dehyph,hyph-utf8,latex,latexconfig
+execute AddFormat name=mllatex engine=pdftex patterns=language.dat options="-translate-file=cp227.tcx -mltex *mllatex.ini" fmttriggers=l3backend,l3kernel,latex,latex,firstaid,babel,cm,hyphen-base,latex-fonts,tex-ini-files,unicode-data,dehyph,hyph-utf8,latexconfig
execute AddFormat name=mltex engine=pdftex options="-translate-file=cp227.tcx -mltex mltex.ini" fmttriggers=cm,hyphen-base,knuth-lib,plain
-containersize 6420
-containerchecksum 10160076fdfd799a20ff92f48b4ae1a51f0aac808d1b790348da0c25119432047f5db94837cc5540948109d4edf8374df9e32f1417138b22c3a297229c67c58c
+containersize 6416
+containerchecksum 1060782f88b5b7012ebfa9ceae931c8db6e4c6116d697d0342bb3d92765f7fad26468c80cd6eb20b96253ea4af0c0fd8a5a792d503f917f4445d5bbd6a75f414
doccontainersize 8676
-doccontainerchecksum cd8cb09a368c2011a7466152f4c2011065b630acdcaa82a4d22a76f83c01b99b7dc77846f0491726a7d85f274463307983c3b97e10bd54121184eabd21c669bc
+doccontainerchecksum 2e14ff748ff038087b63381ad94052f7cf064ce0ec7975778f65c2c324638cb0b1d1773f490ef98c51a07e37a83b3ccfa964fcecc7cc246cf4ec4ed0458ffccf
docfiles size=9
texmf-dist/doc/latex/mltex/README
texmf-dist/doc/latex/mltex/mltex.txt
@@ -262051,7 +262239,7 @@ catalogue-version 0.1
name platex
category Package
-revision 70015
+revision 70995
shortdesc pLaTeX2e and miscellaneous macros for pTeX
longdesc The bundle provides pLaTeX2e and miscellaneous macros for pTeX
longdesc and e-pTeX. This is a community edition forked from the
@@ -262061,7 +262249,9 @@ depend cm
depend firstaid
depend hyphen-base
depend l3backend
+depend l3backend-dev
depend l3kernel
+depend l3kernel-dev
depend latex
depend latex-base-dev
depend latex-firstaid-dev
@@ -262072,12 +262262,12 @@ depend ptex-fonts
depend tex-ini-files
depend unicode-data
depend uptex
-execute AddFormat name=platex engine=euptex options="*platex.ini" patterns=language.dat fmttriggers=babel,cm,firstaid,hyphen-base,l3backend,l3kernel,latex,latex-fonts,tex-ini-files,unicode-data,ptex-fonts,latex
-execute AddFormat name=platex-dev engine=euptex options="*platex.ini" patterns=language.dat fmttriggers=babel,cm,firstaid,hyphen-base,l3backend,l3kernel,latex,latex-fonts,tex-ini-files,unicode-data,ptex-fonts,l3kernel,latex-base-dev,latex-firstaid-dev
-containersize 42272
-containerchecksum 102bb4eb877315aa66379147d083d97a06216c3e13e79eb9142a949e695c9895a043e411441db43addb6716a0c2418d5f76d263c9f7567947ad64efd4a273e9e
+execute AddFormat name=platex engine=euptex options="*platex.ini" patterns=language.dat fmttriggers=ptex-fonts,l3backend,l3kernel,latex,latex,firstaid,babel,cm,hyphen-base,latex-fonts,tex-ini-files,unicode-data
+execute AddFormat name=platex-dev engine=euptex options="*platex.ini" patterns=language.dat fmttriggers=ptex-fonts,l3backend-dev,l3kernel-dev,latex-base-dev,latex-firstaid-dev,babel,cm,hyphen-base,latex-fonts,tex-ini-files,unicode-data
+containersize 42284
+containerchecksum d1c42c409afd458cbeb6aa864401855c530e40be21303604c5c20927bb664356864efd9a76c75976b571d9a3bc0fc90c8804790d848cc2296465a59187893526
doccontainersize 1982656
-doccontainerchecksum 4bd645d616c4c4e2aa39d0bbece16569d0e2bbdce29391a8b444c988148433af6a38144cf066a6cf94c3fd3be6d501768220594d65d576644b14618123a2234c
+doccontainerchecksum 310fad3eab50c66ed7c9093380b44954b35eebbf49e2826abfaf74790babdb079466fcde37e18ae3d1ce54b5c8beb7fd05c9fb12fcfce0c4e1ddf13289a3ba9d
docfiles size=512
texmf-dist/doc/man/man1/platex.1
texmf-dist/doc/man/man1/platex.man1.pdf
@@ -262089,7 +262279,7 @@ docfiles size=512
texmf-dist/doc/platex/base/platexrelease.pdf
texmf-dist/doc/platex/base/pldoc.pdf
srccontainersize 140240
-srccontainerchecksum 10153bf2e628ace82388ba621bdc4e3e598186001392131fb291b425455350ad1ebe35f184abcd6f1bc0ac33e6d75520b1b7bab2115d4f1262b28776b66b47b6
+srccontainerchecksum d9a7932729948b5be9d8af67f624c4028afdd9f7855021cad253ff97e562a2e2e012d52dc1d47420b44d55e3549c85917b2c4339993821b1f61d561f0567b409
srcfiles size=218
texmf-dist/source/platex/base/Makefile
texmf-dist/source/platex/base/jclasses.dtx
@@ -313776,7 +313966,7 @@ binfiles arch=x86_64-solaris size=1
name tex4ht
category Package
-revision 70911
+revision 70983
shortdesc Convert (La)TeX to HTML/XML
longdesc A converter from TeX and LaTeX to SGML-based formats such as
longdesc (X)HTML, MathML, OpenDocument, and Docbook, providing a
@@ -313797,10 +313987,10 @@ longdesc files from them is nontrivial, and generally done with the
longdesc Makefile in development, from which the TeX4ht package in TeX
longdesc Live is updated.
depend tex4ht.ARCH
-containersize 1129584
-containerchecksum 959d10674b606ab47bda962f21c4052cdab61f68e97f56675ec9796c0e156f577a516079100458cadcbc80aa14c94a244028380ae1b3952f0896d852076dedcd
-doccontainersize 136388
-doccontainerchecksum 941de9c89da47bace19e3aa78e96a086534c6244adb941fefbf3a287414bf99bdf67d91bcb4817f806e00506f43bd952f5d31bdccb6044450cb02a5f115f870a
+containersize 1131896
+containerchecksum 68514273e5e2a345380b4e49bd1466499c8228a3a07e71fb0689e32c1f3afe8ac30253a4dc3bcaa0a34305f7a5fd2f77f7047f744c1e75dfef02a15ec96852a8
+doccontainersize 136384
+doccontainerchecksum 7ee0dd3b4c18eff96f4f7de4e412452065692cfdd484039cc1e7d30228e203a6089c1d7cc66d25edd260e713d9136bcee2607e1d214f63f5a3078efed4542c08
docfiles size=260
texmf-dist/doc/generic/tex4ht/Makefile
texmf-dist/doc/generic/tex4ht/README details="Readme"
@@ -313872,8 +314062,8 @@ docfiles size=260
texmf-dist/doc/generic/tex4ht/mn56.html
texmf-dist/doc/generic/tex4ht/mn5x.png
texmf-dist/doc/generic/tex4ht/mn6x.png
-srccontainersize 1491620
-srccontainerchecksum 38964df96a3b433ffe9d1ea451ff178623337bbe35f4e06837c9bf73aec22f88671e9cc04c83b746de82866f02c111311f712d646001ef06eb02f3b1e6239af6
+srccontainersize 1487708
+srccontainerchecksum d067f99b694c64133c0e0cb0cd07f60d94577afef2d049963e35e41471b861caa35460f0a683a5ddc3fc981670ab37e06f84fa5c54f6fc70fdc2c93e471647bc
srcfiles size=4647
texmf-dist/source/generic/tex4ht/ChangeLog
texmf-dist/source/generic/tex4ht/Makefile
@@ -313954,7 +314144,7 @@ srcfiles size=4647
texmf-dist/source/generic/tex4ht/update-htfonts
texmf-dist/source/generic/tex4ht/wripro.tex
texmf-dist/source/generic/tex4ht/xtpipes.tex
-runfiles size=13090
+runfiles size=13093
texmf-dist/scripts/tex4ht/ht.sh
texmf-dist/scripts/tex4ht/htcopy.pl
texmf-dist/scripts/tex4ht/htlatex.sh
@@ -314465,6 +314655,8 @@ runfiles size=13090
texmf-dist/tex/generic/tex4ht/xrhyper-hooks.4ht
texmf-dist/tex/generic/tex4ht/xskak.4ht
texmf-dist/tex/generic/tex4ht/xy.4ht
+ texmf-dist/tex/generic/tex4ht/xyling-hooks.4ht
+ texmf-dist/tex/generic/tex4ht/xyling.4ht
texmf-dist/tex4ht/base/unix/tex4ht.env
texmf-dist/tex4ht/base/win32/tex4ht.env
texmf-dist/tex4ht/bin/tex4ht.jar
@@ -322296,6 +322488,7 @@ runfiles size=13090
texmf-dist/tex4ht/ht-fonts/iso8859/1/xypic/xyatip.htf
texmf-dist/tex4ht/ht-fonts/iso8859/1/xypic/xybsql.htf
texmf-dist/tex4ht/ht-fonts/iso8859/1/xypic/xybtip.htf
+ texmf-dist/tex4ht/ht-fonts/iso8859/1/xypic/xycirc.htf
texmf-dist/tex4ht/ht-fonts/iso8859/1/xypic/xydash.htf
texmf-dist/tex4ht/ht-fonts/iso8859/1/xypic/xyebut.htf
texmf-dist/tex4ht/ht-fonts/iso8859/1/xypic/xymisc.htf
@@ -326298,7 +326491,7 @@ docfiles size=376
name texlive-scripts
category TLCore
-revision 70962
+revision 70996
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.
@@ -326306,11 +326499,11 @@ depend texlive-scripts.ARCH
depend texlive.infra
execute addMap mathpple.map
postaction shortcut type=menu name="TeX Live command-line" cmd=TEXDIR/tlpkg/installer/tl-cmd.bat
-containersize 114132
-containerchecksum d8fb06964944b5915ffca3e2d0c4c955164156e7e20accc3d025f02edd3e3cb1837209e6bd6f27641891ddb8f8c13437cc1c1654a8daa15048a9fdb2a2063d2d
-doccontainersize 434552
-doccontainerchecksum a71f00f1664d0d459669ddab6bec24d29bd124fb04702267494523398f1e7abf9b2cd07d4af886798c319c4980c40b0ff666316c7ed4fa559351ccf12a3b95cb
-docfiles size=567
+containersize 114168
+containerchecksum dc4cdeb8dec4a1155ae2c4e32d9544ff9f244356e6dcd112606d1665c43880b04c5ecbcdf98ea99670df8c0e6759a9bbc2af572bd36756750a420cae209312db
+doccontainersize 434980
+doccontainerchecksum 8208d28668da33e856ed86c400bcbe28fb7f703db5cd123771fdc3c62ca5809e74d85fcaebdb20da446840ee5ae651cfc62d102bd2a9b2b687660d845380166a
+docfiles size=568
doc.html
texmf-dist/doc/man/man1/fmtutil-sys.1
texmf-dist/doc/man/man1/fmtutil-sys.man1.pdf
@@ -330745,21 +330938,21 @@ catalogue-version 2.01
name thesis-ekf
category Package
-revision 70946
+revision 70980
shortdesc Thesis class for Eszterhazy Karoly Catholic University
relocated 1
longdesc This is a class file for theses and dissertations at the
longdesc Eszterhazy Karoly Catholic University (Eger, Hungary). The
longdesc documentation is in Hungarian.
-containersize 113100
-containerchecksum d0b94887567a4bebab82f1db6b721c00a93b141ef50ddf04ee6fcbf73b9f10f1741989352e299d3a220fbe970dcac7ca656a2e65819fd03dc297fddd89d07862
-doccontainersize 197932
-doccontainerchecksum ebce8ea3bd53bab52e0c60e190287bde8c260d6bc19518c61d926b3e609d91fa257f239723dc85c0d4009b072b19bf5c8204b944a6f0be0345b16879c431aaf2
+containersize 113128
+containerchecksum b87506ed888338a00e2b55e7a7fc5830b77afb0d7f18d4ba77d7e74fa3672147d7dbe74f48849e6f36badb7b2dee0c05c05f7be2e04c66337a2aba9abeeb30bc
+doccontainersize 197892
+doccontainerchecksum 1cedd9d40656b6ec1c21adce1aa25524374f0f50367812d13a618cb8b5b52ea1652557fc8d99df3941495f96ceb54e40679c630bc14e206cf486661b57529cfa
docfiles size=50
RELOC/doc/latex/thesis-ekf/README details="Readme"
RELOC/doc/latex/thesis-ekf/thesis-ekf.pdf details="Package documentation" language="hu"
-srccontainersize 8920
-srccontainerchecksum 0f8673bb6426fdbcaecb455318d28a3a1ed04ecede45980473b8d59c567e7e2230aac2cab03519326e89883508af4becbc78c1359bc684abe13aff01db731df6
+srccontainersize 8944
+srccontainerchecksum 29fe704cdbb6cf9aa26a0467e97fb5c4cac7221c117e4f7ca4bacce491e48dfd98538ddd353dae700fab51e1d01901bf9cca95e03cc6e543e1df5275fb94a755
srcfiles size=10
RELOC/source/latex/thesis-ekf/thesis-ekf.dtx
RELOC/source/latex/thesis-ekf/thesis-ekf.ins
@@ -330774,7 +330967,7 @@ runfiles size=71
catalogue-ctan /macros/latex/contrib/thesis-ekf
catalogue-license lppl1.2
catalogue-topics dissertation class hungarian
-catalogue-version 4.4
+catalogue-version 4.5
name thesis-gwu
category Package
@@ -347268,7 +347461,7 @@ catalogue-version 1.1.0
name ufrgscca
category Package
-revision 70740
+revision 70979
shortdesc A bundle for undergraduate students final work/report (tcc) at UFRGS/EE
relocated 1
longdesc This bundle is aimed at producing undergraduate students' final
@@ -347277,11 +347470,11 @@ longdesc University of Rio Grande do Sul), closely following ABNT rules
longdesc (Brazilian Association for Technical Norms). It is composed of
longdesc a main class, ufrgscca, and a set of auxiliary packages, some
longdesc of which can be used independently.
-containersize 25216
-containerchecksum 1e599ccdd39d3d5cde5338be70d6dd5ac47f9bbd809032f78b304a78f456b7dd7af0d6b9b4cec09345ae6d5d8199ea79c7ebd762a11049d439a923d66c05ca67
-doccontainersize 542820
-doccontainerchecksum 0fbdce15307b44de936721cf52cc4faf0ec537ba24f0b96b3a53489132edcc401207a69b029025c2a11131a860b6f38a362e6071268530721cbb80da5f7d6b99
-docfiles size=189
+containersize 25316
+containerchecksum a507b32bf27d454715a8b5ff7ba6ecdb8409fb9a9b7604f538edc302cc1bbba5d00805f780de4eb74e7e748731539b76da7d1c25e02d5d928430e227c528bbee
+doccontainersize 542888
+doccontainerchecksum 362bb8ac9288fdf586088d5131d3312a7f68c6e4b4ca9eaca5a6a9364fed32b835ba60b0df16e7a0016ac3a14d78c1f03293c97d07bf6e1af2906e80be147419
+docfiles size=188
RELOC/doc/latex/ufrgscca/README.md details="Readme"
RELOC/doc/latex/ufrgscca/ufrgscca-cover-ptBR.tex
RELOC/doc/latex/ufrgscca/ufrgscca-forms.tex
@@ -353004,7 +353197,7 @@ catalogue-version 0.2e
name uplatex
category Package
-revision 70015
+revision 70995
shortdesc pLaTeX2e and miscellaneous macros for upTeX
longdesc The bundle provides pLaTeX2e macros for upTeX by Takuji Tanaka.
longdesc This is a community edition syncing with platex. The bundle
@@ -353014,7 +353207,9 @@ depend cm
depend firstaid
depend hyphen-base
depend l3backend
+depend l3backend-dev
depend l3kernel
+depend l3kernel-dev
depend latex
depend latex-base-dev
depend latex-firstaid-dev
@@ -353025,12 +353220,12 @@ depend unicode-data
depend uplatex.ARCH
depend uptex
depend uptex-fonts
-execute AddFormat name=uplatex engine=euptex options="*uplatex.ini" patterns=language.dat fmttriggers=babel,cm,firstaid,hyphen-base,l3backend,l3kernel,latex,latex-fonts,tex-ini-files,unicode-data,uptex-fonts,platex,latex
-execute AddFormat name=uplatex-dev engine=euptex options="*uplatex.ini" patterns=language.dat fmttriggers=babel,cm,firstaid,hyphen-base,l3backend,l3kernel,latex,latex-fonts,tex-ini-files,unicode-data,uptex-fonts,platex,l3kernel,latex-base-dev,latex-firstaid-dev
-containersize 14800
-containerchecksum 553857278368888c569c26f054af2672d54f4506c5d2af56bf3f4e4c509266cbc175a534e5a5e1713e525321daf32cd7db8c8a669f978e73f677bdcc2fcfce74
-doccontainersize 776308
-doccontainerchecksum 94fcfa9e76de7258c466954735186f56cfdcb65b553ec7246d27839d67ea9040a979d051f1e076a880b2f55dc5a36bbf52b957d58519959b7e24feabd6d5e61b
+execute AddFormat name=uplatex engine=euptex options="*uplatex.ini" patterns=language.dat fmttriggers=uptex-fonts,platex,l3backend,l3kernel,latex,latex,firstaid,babel,cm,hyphen-base,latex-fonts,tex-ini-files,unicode-data
+execute AddFormat name=uplatex-dev engine=euptex options="*uplatex.ini" patterns=language.dat fmttriggers=uptex-fonts,platex,l3backend-dev,l3kernel-dev,latex-base-dev,latex-firstaid-dev,babel,cm,hyphen-base,latex-fonts,tex-ini-files,unicode-data
+containersize 14808
+containerchecksum 913030eeb0a4bb29b53dcd9ee54e01c0fe640b3aeb7a5e95d3645f939cfe4c9f9e184c1ddca2beb221eb3001ac1f731011ec3a22c3f9bca3efbb4ba3897de165
+doccontainersize 776312
+doccontainerchecksum 1453eb2f6ba397877b2821525b4e9cc003de38461a06af92b11924d10aa049e8774841af7874e00de60bbdcef191527dd88535b3fbfa72fbe50928874eb221e2
docfiles size=201
texmf-dist/doc/man/man1/uplatex.1
texmf-dist/doc/man/man1/uplatex.man1.pdf
@@ -353040,8 +353235,8 @@ docfiles size=201
texmf-dist/doc/uplatex/base/uplatex-en.pdf details="Package documentation"
texmf-dist/doc/uplatex/base/uplatex.pdf details="Package documentation" language="ja"
texmf-dist/doc/uplatex/base/upldoc.pdf
-srccontainersize 50744
-srccontainerchecksum d3952ac6d5adb7db7dc84d468a85c0581291bb21ab07c2bd9dca50cffb2abbeca3580b22c1e8f14ed4f86999230449698ffd3c772dae5a6ce5b5fa5a6a707bb2
+srccontainersize 50748
+srccontainerchecksum 87c584c1745438fc7ec1e6e642eeccba058a2914b6d94f300ef7259e8c642311224e559f6e56d0cee543e4d1b952965f7ce70bb50ffe909ce5b6e18c74f1029d
srcfiles size=73
texmf-dist/source/uplatex/base/Makefile
texmf-dist/source/uplatex/base/ujclasses.dtx
@@ -366880,14 +367075,12 @@ catalogue-version 0.3
name xelatex-dev
category TLCore
-revision 70002
+revision 70992
depend babel
depend cm
-depend firstaid
depend hyphen-base
-depend l3backend
-depend l3kernel
-depend latex
+depend l3backend-dev
+depend l3kernel-dev
depend latex-base-dev
depend latex-firstaid-dev
depend latex-fonts
@@ -366896,9 +367089,9 @@ depend tex-ini-files
depend unicode-data
depend xelatex-dev.ARCH
depend xetex
-execute AddFormat name=xelatex-dev engine=xetex patterns=language.dat options="-etex xelatex.ini" fmttriggers=babel,cm,firstaid,hyphen-base,l3backend,l3kernel,latex,latex-fonts,tex-ini-files,unicode-data,latex-base-dev,latex-firstaid-dev,lm
-containersize 448
-containerchecksum e5ad955b5e752aaa0ea4285ec1f49ad6e36df8b03bd3693be0080b31c2e5e2d7d4122eef0e8ac6e51956ab7508c546591eae1f5c5d15a56d6dc4f34f3a359ee6
+execute AddFormat name=xelatex-dev engine=xetex patterns=language.dat options="-etex xelatex.ini" fmttriggers=l3backend-dev,l3kernel-dev,latex-base-dev,latex-firstaid-dev,babel,cm,hyphen-base,latex-fonts,tex-ini-files,unicode-data,lm
+containersize 440
+containerchecksum 5d7e8975bf7ccc3a4ff2f8d971540f0e80532ae0d8ec41b69109defeb303acdfbfc6818f2107fd69aaadee396dc60c2583edd43903442d1fba27e38b5be3a629
name xelatex-dev.aarch64-linux
category TLCore
@@ -367307,7 +367500,7 @@ catalogue-version 2.1
name xetex
category TLCore
-revision 70088
+revision 70995
shortdesc An extended variant of TeX for use with Unicode sources
longdesc XeTeX is a TeX typesetting engine using Unicode and supporting
longdesc modern font technologies such as OpenType, TrueType or Apple
@@ -367338,13 +367531,13 @@ depend tex-ini-files
depend unicode-data
depend xetex.ARCH
depend xetexconfig
-execute AddFormat name=xelatex engine=xetex patterns=language.dat options="-etex xelatex.ini" fmttriggers=babel,cm,firstaid,hyphen-base,l3backend,l3kernel,latex,latex-fonts,tex-ini-files,unicode-data,lm
+execute AddFormat name=xelatex engine=xetex patterns=language.dat options="-etex xelatex.ini" fmttriggers=l3backend,l3kernel,latex,latex,firstaid,babel,cm,hyphen-base,latex-fonts,tex-ini-files,unicode-data,lm
execute AddFormat name=xetex engine=xetex patterns=language.def options="-etex xetex.ini" fmttriggers=cm,hyphen-base,tex-ini-files,unicode-data,etex,plain
postaction script file=tlpkg/tlpostcode/xetex.pl
-containersize 8000
-containerchecksum cb63da3f556c80e4c84425eeb289a7a49279d9fe2ca86888d02befd22a6b8b8c481238ced7dcdc7e9503562154085d8dec9f12261412a54d430b7d94c8068d00
+containersize 8004
+containerchecksum f56ce55481864692e01b62cfb2c880b94affe0f07f989c773ed58896e3fdd180c6dc3dd462840ccd9bce38f81bc15905840c32521cf7071b84ebe4bd1d034589
doccontainersize 634636
-doccontainerchecksum f25babc4c885e9b58160dbd7e579725685808e5886ee11d32f5c85843d884c300f8a58f9f8d9865864c2fd594d06d5082215e7c468ec2c8aef6c1dda7a7368f7
+doccontainerchecksum 38a0cf2e86545634ae2b24164991c5e8eab2e4ef52f3325730c2d75cfdf146223fb9cee428efe8256654b3a258081c89b8ecf54a5ae1fb87da346494d57d64ad
docfiles size=184
texmf-dist/doc/man/man1/xelatex-unsafe.1
texmf-dist/doc/man/man1/xelatex-unsafe.man1.pdf
@@ -369467,7 +369660,7 @@ binfiles arch=x86_64-solaris size=33
name xmltex
category Package
-revision 70875
+revision 70995
shortdesc Support for parsing XML documents
longdesc The package provides an implementation of a parser for
longdesc documents matching the XML 1.0 and XML Namespace
@@ -369493,12 +369686,12 @@ depend tex
depend tex-ini-files
depend unicode-data
depend xmltex.ARCH
-execute AddFormat name=pdfxmltex engine=pdftex patterns=language.dat options="*pdfxmltex.ini" fmttriggers=babel,cm,firstaid,hyphen-base,l3backend,l3kernel,latex,latex-fonts,tex-ini-files,unicode-data,dehyph,hyph-utf8,latex,latexconfig,tex-ini-files
-execute AddFormat name=xmltex engine=pdftex patterns=language.dat options="*xmltex.ini" fmttriggers=babel,cm,firstaid,hyphen-base,l3backend,l3kernel,latex,latex-fonts,tex-ini-files,unicode-data,dehyph,hyph-utf8,latex,latexconfig,tex-ini-files
+execute AddFormat name=pdfxmltex engine=pdftex patterns=language.dat options="*pdfxmltex.ini" fmttriggers=l3backend,l3kernel,latex,latex,firstaid,babel,cm,hyphen-base,latex-fonts,tex-ini-files,unicode-data,dehyph,hyph-utf8,latexconfig
+execute AddFormat name=xmltex engine=pdftex patterns=language.dat options="*xmltex.ini" fmttriggers=l3backend,l3kernel,latex,latex,firstaid,babel,cm,hyphen-base,latex-fonts,tex-ini-files,unicode-data,dehyph,hyph-utf8,latexconfig
containersize 18236
-containerchecksum 03b9cf9c1a707c0ed1e7d6cc549ce1d1f3b1b97b587206566398e45bd14d22b75463729dcfd3a2a0638c8cb3bfad9300851f3a1844dd2d02a7340e51fee2dbaf
+containerchecksum 8c309b8d2b8ef1bed82fd7eef0e2836037d1e06b04922c985431829f19f3a08ea377f0bab32ad332da2130d35406be7e1aec0672bca877d2130ae9ae9c305e0c
doccontainersize 17004
-doccontainerchecksum f486d65cfc6c12709d8af5cc23481d80cfe511a381c48c38830c92510b767a46927d88a5a115e1eda828208f72f798b4d8af278eb2bfaff5569b3d238655fcbf
+doccontainerchecksum 46311f5d30098023759b0a8064c5841900218e405713e2aa808afa35a26f956acd5f4e531efebcc6af8961a903ea1cfaad580f431395eb6be39d5195578a663b
docfiles size=32
texmf-dist/doc/otherformats/xmltex/base/englishutf16.xml
texmf-dist/doc/otherformats/xmltex/base/englishutf8.xml
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
index 96cfaf2239..e97276e630 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
@@ -1 +1 @@
-b4d02379ed7002886a5706252d17726c texlive.tlpdb
+7e90646c6e05ddfef14c07f0b703992c texlive.tlpdb
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
index d833dfd275..b0ba95114d 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
@@ -1 +1 @@
-4c12922cf6acae38500467b7b5c57d596844fa95bc3272ed0688193c282ab7738ecf12ecfd3d6ef0d052fe0c14ba09410f5ba4ec779af13e6204221e955c0b3d texlive.tlpdb
+62306705906e76c8e2c571a4040c9cf8eac552c988b85adf695270385d3f9463b5758ff7a47c74574570da3f631468c864eadd7862cbfc1fa4cb24d861b26694 texlive.tlpdb
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
index 1ccbb92b0a..9bb4a0acf2 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+QqiBBqTOGHfhlDjHAFAmYgXy4ACgkQTOGHfhlD
-jHApmAgAtRsbsDeDrYtmZOQT3WG+kWhgYZw7t5dTkP7Q35p6Yu1brbtZPaQrub/v
-g3LyOPTG3CkyNUykIxT4cWKjWSmmS7L+nVsAZQr5FBpb8n9DyxYk7o0tjHcLC6er
-qEHHRYXt7Lo2C/OFAAPYl8CuHaJa0QbobwVu3JgspNq37wqsfH8tF1V3CPPl7WxP
-mi310miJk1yY9fRb0pIO8wciMm4FxYz1Nuyk263IbC2hL5mbPUM0SlX9getcIYJm
-tzI6lcFVOIwWoZyb7i0W9LCDjM20uMUOxB/nG5C22mgk+TgJZto3V0B78spV93/i
-DryNWwSP7isMtcgseCIJ4LBd/u9kbA==
-=eUuS
+iQEzBAEBCgAdFiEE2PL4YFeoV+QqiBBqTOGHfhlDjHAFAmYinGUACgkQTOGHfhlD
+jHDQ9QgAhcH7IBg3T2wX/J2yj2vIcrCJC61K9UTMOspaxR3wcKNhpvcenfC6hCJ4
+HieWAw0RIEl8OBcXUV+DNeQvcp3gSYDk9aMQwVW5Yr9LMm4UEGI5Ngzhq2wWEM5c
+uj3JocYy0NtaLHULK7ocSbfVtIJ77jJYGdzJKOLm5+Gvb+9mjhWOwXuRFV3uMQAI
+SwV/Y/MTzRW2w2fNTwoj+he6i2VyQjlMpi4D1Zy/YcAUTt/YjBc5fkwZqDJ7On3s
+x9MwEfGwjei5tpjjDtQ1Tjcp3spMxA0lERcXK9CgOQRI29ACxFNAI+fe4Bphwi+4
+K7LES65iThmWwbw7kjqxK7VlC+etiw==
+=M2f8
-----END PGP SIGNATURE-----
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
index 06b3d5dd5d..054ecbb05f 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 c0c8d2c8c5..2db723f914 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:
-2024-04-19-02-02
+2024-04-20-02-02